Expand support for node@18 (#1930)

* Expand support for node@18 (#1884) * Expand support for node@18 * Resolving package.json and circleci config.yml conflicts with version-0.x branch. * Correcting package-lock.json files. * Correcting comments. * Updating circleci config for GraphQL v15 Support step. Co-authored-by: Trevor Scheer <trevor.scheer@gmail.com> Co-authored-by: Jeff Jakub <jeffjakub@users.noreply.github.com>
apollographql · Oct 28, 2022 · c63bb1d · c63bb1d
1 parent 93459ba
commit c63bb1d
Show file tree

Hide file tree

Showing 14 changed files with 100 additions and 45 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,8 +17,6 @@ commands:
   common_test_steps:
     description: "Commands run on each Node.js job"
     steps:
-      - oss/install_specific_npm_version:
-          version: '7'
       - checkout
       - oss/npm_clean_install_with_caching
       - run:
@@ -39,7 +37,7 @@ jobs:
 
   NodeJS 12:
     docker:
-      - image: cimg/node:12.22.1
+      - image: cimg/node:12.22
     steps:
       - common_test_steps
       # We will save the results of this one particular invocation to use in
@@ -54,25 +52,25 @@ jobs:
 
   NodeJS 14:
     docker:
-      - image: cimg/node:14.16.1
+      - image: cimg/node:14.19
     steps:
       - common_test_steps
 
   NodeJS 16:
     docker:
-      - image: cimg/node:16.10.0
+      - image: cimg/node:16.15
     steps:
       - common_test_steps
-  
-  NodeJS 17:
+
+  NodeJS 18:
     docker:
-      - image: cimg/node:17.0.0
+      - image: cimg/node:18.2.0
     steps:
       - common_test_steps
 
   GraphQL v15 Support:
     docker:
-      - image: cimg/node:16.10.0
+      - image: cimg/node:16.18.0
     steps:
       - oss/install_specific_npm_version:
           version: '7'
@@ -93,10 +91,8 @@ jobs:
   GraphQL Types:
     description: "Assert generated GraphQL types are up to date"
     docker:
-      - image: cimg/node:14.16.1
+      - image: cimg/node:16.15
     steps:
-      - oss/install_specific_npm_version:
-          version: '7'
       - checkout
       - oss/npm_clean_install_with_caching
       - run:
@@ -137,10 +133,11 @@ workflows:
       - NodeJS 16:
           name: "JS: Node 16"
           <<: *common_non_publish_filters
+      - NodeJS 18:
+          name: "JS: Node 18"
+          <<: *common_non_publish_filters
       - GraphQL v15 Support:
           name: "Backcompat support: graphql@15"
-      - NodeJS 17:
-          name: "JS: Node 17"
           <<: *common_non_publish_filters
       - GraphQL Types:
           name: "GraphQL Types (up to date)"
@@ -152,7 +149,7 @@ workflows:
             - "JS: Node 12"
             - "JS: Node 14"
             - "JS: Node 16"
-            - "JS: Node 17"
+            - "JS: Node 18"
             - "Backcompat support: graphql@15"
             - "GraphQL Types (up to date)"
       - oss/dry_run:
@@ -162,7 +159,7 @@ workflows:
             - "JS: Node 12"
             - "JS: Node 14"
             - "JS: Node 16"
-            - "JS: Node 17"
+            - "JS: Node 18"
             - "Backcompat support: graphql@15"
             - "GraphQL Types (up to date)"
       - oss/confirmation:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,4 +14,5 @@
   },
   "typescript.tsdk": "./node_modules/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true,
+  "task.allowAutomaticTasks": "on",
 }
diff --git a/federation-js/CHANGELOG.md b/federation-js/CHANGELOG.md
@@ -4,9 +4,7 @@ This CHANGELOG pertains only to Apollo Federation packages in the `0.x` range. T
 
 ## vNEXT
 
-> The changes noted within this `vNEXT` section have not been released yet.  New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development.  When a release is being prepared, a new header will be (manually) created below and the appropriate changes within that release will be moved into the new section.
-
-- _Nothing yet! Stay tuned._
+- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884)
 
 ## v0.36.1
 

diff --git a/federation-js/package.json b/federation-js/package.json
@@ -17,7 +17,7 @@
   "author": "Apollo <packages@apollographql.com>",
   "license": "MIT",
   "engines": {
-    "node": ">=12.13.0 <18.0"
+    "node": ">=12.13.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/gateway-js/CHANGELOG.md b/gateway-js/CHANGELOG.md
@@ -3,9 +3,8 @@
 This CHANGELOG pertains only to Apollo Federation packages in the `0.x` range. The Federation v2 equivalent for this package can be found [here](https://github.com/apollographql/federation/blob/main/gateway-js/CHANGELOG.md) on the `main` branch of this repo.
 
 ## vNEXT
-> The changes noted within this `vNEXT` section have not been released yet.  New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development.  When a release is being prepared, a new header will be (manually)
 
-- Nothing yet! Stay tuned.
+- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884)
 
 ## v0.52.1
 - The change released in v0.52.0 which updates the TypeScript types relating to the gateway interface has been improved to be more compatible with Apollo Server 2. [PR #2080](https://github.com/apollographql/apollo-server/pull/2080)

diff --git a/gateway-js/package.json b/gateway-js/package.json
@@ -18,7 +18,7 @@
     "apollo"
   ],
   "engines": {
-    "node": ">=12.13.0 <18.0"
+    "node": ">=12.13.0"
   },
   "license": "MIT",
   "publishConfig": {

diff --git a/gateway-js/src/__generated__/graphqlTypes.ts b/gateway-js/src/__generated__/graphqlTypes.ts
diff --git a/lerna-debug.log b/lerna-debug.log
@@ -0,0 +1,23 @@
+0 silly argv {
+0 silly argv   _: [ 'run' ],
+0 silly argv   stream: true,
+0 silly argv   lernaVersion: '4.0.0',
+0 silly argv   '$0': '/Users/jeff/source/apollographql/federation/node_modules/.bin/lerna',
+0 silly argv   script: 'monorepo-prepare'
+0 silly argv }
+1 notice cli v4.0.0
+2 verbose rootPath /Users/jeff/source/apollographql/federation
+3 info versioning independent
+4 error JSONError: Unexpected token "<" (0x3C) in JSON at position 710 while parsing near ".../query-planner-js\",\n<<<<<<< HEAD\n    \"@a..." in gateway-js/package.json
+4 error
+4 error [0m [90m 29 |[39m     [32m"@apollo/federation"[39m[33m:[39m [32m"file:../federation-js"[39m[33m,[39m[0m
+4 error [0m [90m 30 |[39m     [32m"@apollo/query-planner"[39m[33m:[39m [32m"file:../query-planner-js"[39m[33m,[39m[0m
+4 error [0m[31m[1m>[22m[39m[90m 31 |[39m [33m<<[39m[33m<<[39m[33m<<[39m[33m<[39m [33mHEAD[39m[0m
+4 error [0m [90m    |[39m [31m[1m^[22m[39m[0m
+4 error [0m [90m 32 |[39m     [32m"@apollo/utils.createhash"[39m[33m:[39m [32m"^1.1.0"[39m[33m,[39m[0m
+4 error [0m [90m 33 |[39m [33m===[39m[33m===[39m[33m=[39m[0m
+4 error [0m [90m 34 |[39m     [32m"@apollo/server-gateway-interface"[39m[33m:[39m [32m"^1.0.2"[39m[33m,[39m[0m
+4 error
+4 error     at parseJson (/Users/jeff/source/apollographql/federation/node_modules/parse-json/index.js:29:21)
+4 error     at parse (/Users/jeff/source/apollographql/federation/node_modules/load-json-file/index.js:15:9)
+4 error     at module.exports (/Users/jeff/source/apollographql/federation/node_modules/load-json-file/index.js:18:47)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "codegen:check": "npm run codegen && git diff --exit-code"
   },
   "engines": {
-    "node": ">=12.13.0 <18.0",
+    "node": ">=12.13.0",
     "npm": ">=7 <9"
   },
   "dependencies": {

diff --git a/query-planner-js/CHANGELOG.md b/query-planner-js/CHANGELOG.md
@@ -4,9 +4,7 @@ This CHANGELOG pertains only to Apollo Federation packages in the `0.x` range. T
 
 ## vNEXT
 
-> The changes noted within this `vNEXT` section have not been released yet.  New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development.  When a release is being prepared, a new header will be (manually) created below and the appropriate changes within that release will be moved into the new section.
-
-- _Nothing yet! Stay tuned._
+- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884)
 
 ## v0.10.2
 

diff --git a/query-planner-js/package.json b/query-planner-js/package.json
@@ -18,7 +18,7 @@
     "apollo"
   ],
   "engines": {
-    "node": ">=12.13.0 <18.0"
+    "node": ">=12.13.0"
   },
   "license": "MIT",
   "publishConfig": {

diff --git a/subgraph-js/CHANGELOG.md b/subgraph-js/CHANGELOG.md
@@ -4,9 +4,7 @@ This CHANGELOG pertains only to Apollo Federation packages in the `0.x` range. T
 
 ## vNEXT
 
-> The changes noted within this `vNEXT` section have not been released yet.  New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development.  When a release is being prepared, a new header will be (manually) created below and the appropriate changes within that release will be moved into the new section.
-
-- Nothing yet! Stay tuned.
+- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884)
 
 ## v0.4.2
 

diff --git a/subgraph-js/package.json b/subgraph-js/package.json
@@ -18,7 +18,7 @@
   "author": "Apollo <packages@apollographql.com>",
   "license": "MIT",
   "engines": {
-    "node": ">=12.13.0 <18.0"
+    "node": ">=12.13.0"
   },
   "publishConfig": {
     "access": "public"