Skip to content

Commit 47a7708

Browse files
authored
Merge pull request #646 from reactioncommerce/feat-aldeed-gql-no-beta
feat: remove `-beta` from GraphQL paths
2 parents e352a7c + 0fb7d9b commit 47a7708

File tree

5 files changed

+15
-45
lines changed

5 files changed

+15
-45
lines changed

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CANONICAL_URL=http://localhost:4000
22
ENABLE_SPA_ROUTING=true
3-
EXTERNAL_GRAPHQL_URL=http://localhost:3000/graphql-beta
4-
INTERNAL_GRAPHQL_URL=http://api.api.reaction.localhost:3000/graphql-beta
3+
EXTERNAL_GRAPHQL_URL=http://localhost:3000/graphql
4+
INTERNAL_GRAPHQL_URL=http://api.api.reaction.localhost:3000/graphql
55
OAUTH2_ADMIN_PORT=4445
66
OAUTH2_ADMIN_URL=http://hydra.auth.reaction.localhost:4445
77
OAUTH2_AUTH_URL=http://localhost:4444/oauth2/auth

.graphqlrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"request": {
3-
"url": "http://localhost:3000/graphql-beta"
3+
"url": "http://localhost:3000/graphql"
44
}
55
}

README.md

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@ This example storefront is built with [Next.js](https://nextjs.org/), [React](ht
2525

2626
Follow the [Reaction Platform docs](https://docs.reactioncommerce.com/docs/installation-reaction-platform) to install and run all the services necessary to run the storefront:
2727

28-
| Directory: Service | URL |
29-
| ------------------------------------------------------------------------------------------ | ------------------------------------------------------------ |
30-
| [`reaction`](https://github.com/reactioncommerce/reaction): GraphQL API | [localhost:3000/graphql-beta](localhost:3000/graphql-beta) |
31-
| [`reaction`](https://github.com/reactioncommerce/reaction): GraphiQL developer tool | [localhost:3000/graphql-beta](localhost:3000/graphql-beta) |
32-
| [`reaction`](https://github.com/reactioncommerce/reaction): Operator UI | [localhost:3000](localhost:3000) |
33-
| [`reaction`](https://github.com/reactioncommerce/reaction): MongoDB | [localhost:27017](localhost:27017) |
34-
| [`reaction-hydra`](https://github.com/reactioncommerce/reaction-hydra): Authentication | [localhost:4444](localhost:4444) |
35-
| [`example-storefront`](https://github.com/reactioncommerce/example-storefront): Storefront | [localhost:4000](localhost:4000) |
36-
37-
**Note**: The storefront has redirects so if you open any of the following URLs, you'll be redirected to the GraphiQL developer tool:
38-
- [localhost:4000/graphql]()
39-
- [localhost:4000/graphql-beta]()
40-
- [localhost:4000/graphiql]()
28+
| Directory: Service | URL |
29+
|-----------------------------------------------------------------------------------------------|--------------------------------------------------|
30+
| [`reaction`](https://github.com/reactioncommerce/reaction): GraphQL API | [localhost:3000/graphql](localhost:3000/graphql) |
31+
| [`reaction`](https://github.com/reactioncommerce/reaction): GraphQL Playground developer tool | [localhost:3000/graphql](localhost:3000/graphql) |
32+
| [`reaction`](https://github.com/reactioncommerce/reaction): Reaction Admin | [localhost:4080](localhost:4080) |
33+
| [`reaction`](https://github.com/reactioncommerce/reaction): MongoDB | [localhost:27017](localhost:27017) |
34+
| [`reaction-hydra`](https://github.com/reactioncommerce/reaction-hydra): Authentication | [localhost:4444](localhost:4444) |
35+
| [`example-storefront`](https://github.com/reactioncommerce/example-storefront): Storefront | [localhost:4000](localhost:4000) |
36+
37+
**Note**: The storefront has redirects so that if you open [http://localhost:4000/graphql](http://localhost:4000/graphql), you'll be redirected to the GraphQL Playground.
4138

4239
## Configuration
4340

@@ -78,7 +75,7 @@ docker-compose up -d && docker-compose logs -f
7875

7976
### Run in development against a production API
8077

81-
Change the `INTERNAL_GRAPHQL_URL` in `.env` to the production API URL. The URL should end in `/graphql-beta`, like: `https://my-website.com/graphql-beta`. Save the `.env` file and restart the application with:
78+
Change the `INTERNAL_GRAPHQL_URL` in `.env` to the production API URL. The URL should end in `/graphql`, like: `https://my-website.com/graphql`. Save the `.env` file and restart the application with:
8279

8380
```sh
8481
docker-compose run --rm --service-ports web yarn start
@@ -152,7 +149,7 @@ Sometimes we need to test the [Example Storefront Component Library](https://git
152149
1. After the build is done, `cd` into the new `dist` folder it just built and run `yarn link` to allow the library to be installed into the storefront. This will link `@reactioncommerce/components`
153150
1. Inside the `example-storefront` repo, temporarily rename your `.yarnrc` file to anything else (i.e. `.yarnrc-temp`)
154151
1. Run `yarn install` and then the command `yarn link "@reactioncommerce/components"` to set the local version as an override of the published npm version
155-
1. Inside your `.env` file, change `INTERNAL_GRAPHQL_URL` to equal `http://localhost:3030/graphql-beta`, the same as the `EXTERNAL_GRAPHQL_URL`
152+
1. Inside your `.env` file, change `INTERNAL_GRAPHQL_URL` to equal `http://localhost:3000/graphql`, the same as the `EXTERNAL_GRAPHQL_URL`
156153
1. Start the storefront locally by running the command `export $(cat .env | xargs) && yarn dev`
157154
1. Your storefront should now be running at `localhost:4000`
158155
- If you see errors about not being able to find peer dependency packages, that seems to be an issues with yarn linking. You can just temporarily `yarn add` each of those packages in the component library `package/dist` folder. (This folder is gitignored anyway.)

docs/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,3 @@ docker-compose run --rm web adr new "Implement the Torpedos"
2020

2121
- [Testing](testing.md)
2222
- [Patterns](testing.md#patterns)
23-
24-
## Tools and Utilities
25-
26-
- [Tools to help with development](utilities.md)
27-
- [GraphiQL App installation and setup](utilities.md#graphiql-app)

docs/utilities.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)