Merge pull request #181 from apollographql/setup-fixes

Update router to latest version + minor fixes

README.md

@@ -162,7 +162,13 @@ You will need a GraphOS organization with an Enterprise plan or [Enterprise tria
    ```
 
    ```
-   npm run start:spotify && npm run start:playback
+   npm run start:spotify
+   ```
+
+   and in another terminal:
+
+   ```
+   npm run start:playback
    ```
 
    - Spotify Subgraph - http://localhost:4001

router/Dockerfile

@@ -1,11 +1,8 @@
-FROM ghcr.io/apollographql/router:v1.32.0
+FROM ghcr.io/apollographql/router:v1.40.1
 COPY router.yaml /dist/router.yaml
 COPY rhai /dist/rhai
 
 COPY ./entrypoint.sh ./entrypoint.sh
 COPY ./wait-for-it.sh ./wait-for-it.sh
-# better safe than sorry
-RUN chmod +x ./wait-for-it.sh && \
-    chmod +x ./entrypoint.sh
 
 ENTRYPOINT [ "./entrypoint.sh" ]

router/router.yaml

@@ -22,9 +22,9 @@ supergraph:
   introspection: true
   listen: 0.0.0.0:${env.PORT:-4000}
   query_planning:
-    experimental_cache:
+    cache:
       in_memory:
-        limit: 512 #This is the default value
+        limit: 512 # This is the default value
 homepage:
   enabled: false
 include_subgraph_errors:
@@ -44,7 +44,6 @@ apq:
     cache:
       in_memory:
         limit: 512 # This is the default value
-
 persisted_queries:
   enabled: true
   safelist:
@@ -66,7 +65,7 @@ persisted_queries:
 subscription:
   enabled: true
   mode:
-    preview_callback:
+    callback:
       public_url: ${env.CALLBACK_URL} # https://spotify-showcase-production-d157.up.railway.app/callback # The router's public URL
       listen: 0.0.0.0:${env.PORT:-4000} # The IP address and port the router will listen on for subscription callbacks
       path: /callback # The path of the router's callback endpoint

spotify.yaml

@@ -9,4 +9,4 @@ subgraphs:
     schema:
       file: subgraphs/playback/schema.graphql
 operations: {}
-federation_version: '=2.4.5'
+federation_version: '=2.7.1'

subgraphs/playback/package.json

@@ -25,8 +25,8 @@
     "lint:types": "tsc --noEmit"
   },
   "dependencies": {
-    "@apollo/server": "^4.9.3",
-    "@apollo/subgraph": "^2.5.5",
+    "@apollo/server": "^4.10.1",
+    "@apollo/subgraph": "^2.7.1",
     "@graphql-tools/mock": "^9.0.0",
     "@sentry/node": "^7.59.3",
     "@shared/field-synthetics": "*",
@@ -36,7 +36,7 @@
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "express": "^4.18.2",
-    "graphql": "^16.6.0",
+    "graphql": "^16.8.1",
     "graphql-tag": "latest",
     "graphql-ws": "^5.13.1",
     "lodash": "^4.17.21",