diff --git a/.circleci/config.yml b/.circleci/config.yml index c0c2337e9..90d593fc1 100644 --- 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,29 +52,27 @@ jobs: NodeJS 14: docker: - - image: cimg/node:14.18.1 + - image: cimg/node:14.19 steps: - common_test_steps NodeJS 16: docker: - - image: cimg/node:16.0.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 Types: description: "Assert generated GraphQL types are up to date" docker: - - image: cimg/node:14.18.1 + - image: cimg/node:16.15 steps: - - oss/install_specific_npm_version: - version: '7' - checkout - oss/npm_clean_install_with_caching - run: @@ -85,10 +81,8 @@ jobs: Error code Doc: description: "Ensure the error code documentation is up to date" docker: - - image: cimg/node:14.18.1 + - image: cimg/node:16.15 steps: - - oss/install_specific_npm_version: - version: '7' - checkout - oss/npm_clean_install_with_caching - run: @@ -97,10 +91,8 @@ jobs: Hints code Doc: description: "Ensure the hints code documentation is up to date" docker: - - image: cimg/node:14.18.1 + - image: cimg/node:16.15 steps: - - oss/install_specific_npm_version: - version: '7' - checkout - oss/npm_clean_install_with_caching - run: @@ -138,8 +130,8 @@ workflows: - NodeJS 16: name: "JS: Node 16" <<: *common_non_publish_filters - - NodeJS 17: - name: "JS: Node 17" + - NodeJS 18: + name: "JS: Node 18" <<: *common_non_publish_filters - GraphQL Types: name: "GraphQL Types (up to date)" @@ -157,7 +149,7 @@ workflows: - "JS: Node 12" - "JS: Node 14" - "JS: Node 16" - - "JS: Node 17" + - "JS: Node 18" - "GraphQL Types (up to date)" - "Error code Doc (up to date)" - oss/dry_run: @@ -167,7 +159,7 @@ workflows: - "JS: Node 12" - "JS: Node 14" - "JS: Node 16" - - "JS: Node 17" + - "JS: Node 18" - "GraphQL Types (up to date)" - "Error code Doc (up to date)" - oss/confirmation: diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md index 603ffd03f..92db22e06 100644 --- a/composition-js/CHANGELOG.md +++ b/composition-js/CHANGELOG.md @@ -2,6 +2,8 @@ This CHANGELOG pertains only to Apollo Federation packages in the 2.x range. The Federation v0.x equivalent for this package can be found [here](https://github.com/apollographql/federation/blob/version-0.x/federation-js/CHANGELOG.md) on the `version-0.x` branch of this repo. +- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884) + ## v2.0.1 - Use `for: SECURITY` in the core/link directive application in the supergraph for `@inaccessible` [PR #1715](https://github.com/apollographql/federation/pull/1715) diff --git a/composition-js/package.json b/composition-js/package.json index 4a4b7d5bc..5e3ca04cb 100644 --- a/composition-js/package.json +++ b/composition-js/package.json @@ -21,7 +21,7 @@ "author": "Apollo ", "license": "SEE LICENSE IN ./LICENSE", "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 index 04c9be46b..8997c6c94 100644 --- a/gateway-js/CHANGELOG.md +++ b/gateway-js/CHANGELOG.md @@ -5,6 +5,7 @@ This CHANGELOG pertains only to Apollo Federation packages in the 2.x range. The ## vNext - Add callback when fetching a supergraph from Apollo Uplink fails [PR #1812](https://github.com/apollographql/federation/pull/1812). +- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884) ## 2.0.5 diff --git a/gateway-js/package.json b/gateway-js/package.json index 6b70e80c8..182daffd8 100644 --- 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": "SEE LICENSE IN ./LICENSE", "publishConfig": { @@ -29,9 +29,9 @@ "@apollo/core-schema": "~0.3.0", "@apollo/federation-internals": "file:../internals-js", "@apollo/query-planner": "file:../query-planner-js", - "@apollo/utils.createhash": "^1.0.0", + "@apollo/utils.createhash": "^1.1.0", "@apollo/utils.fetcher": "^1.0.0", - "@apollo/utils.isnodelike": "^1.0.0", + "@apollo/utils.isnodelike": "^1.1.0", "@apollo/utils.logger": "^1.0.0", "@josephg/resolvable": "^1.0.1", "@opentelemetry/api": "^1.0.1", diff --git a/internals-js/CHANGELOG.md b/internals-js/CHANGELOG.md index 8a2624e82..014d03dfb 100644 --- a/internals-js/CHANGELOG.md +++ b/internals-js/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG for `@apollo/federation-internals` +## vNext + +- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884) + ## 2.0.4 - Fix issue when all root operations were defined in an `extend schema` [PR #1875](https://github.com/apollographql/federation/issues/1875). diff --git a/internals-js/package.json b/internals-js/package.json index ab129a8bd..aa241aee7 100644 --- a/internals-js/package.json +++ b/internals-js/package.json @@ -20,7 +20,7 @@ "author": "Apollo ", "license": "SEE LICENSE IN ./LICENSE", "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "dependencies": { "@apollo/core-schema": "~0.3.0", diff --git a/package-lock.json b/package-lock.json index 7b9c8cfa7..6c2bbb84f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ "winston-transport": "4.5.0" }, "engines": { - "node": ">=12.13.0 <18.0", + "node": ">=12.13.0", "npm": ">=7 <9" } }, @@ -74,7 +74,7 @@ "@apollo/query-graphs": "file:../query-graphs-js" }, "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "peerDependencies": { "graphql": "^16.0.0" @@ -98,9 +98,9 @@ "@apollo/core-schema": "~0.3.0", "@apollo/federation-internals": "file:../internals-js", "@apollo/query-planner": "file:../query-planner-js", - "@apollo/utils.createhash": "^1.0.0", + "@apollo/utils.createhash": "^1.1.0", "@apollo/utils.fetcher": "^1.0.0", - "@apollo/utils.isnodelike": "^1.0.0", + "@apollo/utils.isnodelike": "^1.1.0", "@apollo/utils.logger": "^1.0.0", "@josephg/resolvable": "^1.0.1", "@opentelemetry/api": "^1.0.1", @@ -116,7 +116,7 @@ "pretty-format": "^27.0.0" }, "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "peerDependencies": { "graphql": "^16.0.0" @@ -304,7 +304,7 @@ "js-levenshtein": "^1.1.6" }, "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "peerDependencies": { "graphql": "^16.0.0" @@ -414,15 +414,15 @@ "link": true }, "node_modules/@apollo/utils.createhash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.createhash/-/utils.createhash-1.0.0.tgz", - "integrity": "sha512-FsijruGzaD+mNdelqXKgO+PCvdxD16rbN275oHGcVbhQixvdXfUSgqwfjUJSPFJAQoW/QvyoNaVf7M51gJNiTw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.createhash/-/utils.createhash-1.1.0.tgz", + "integrity": "sha512-5fT4ZiW75515OlikWpIQzaVDws1yy9VgYSoHoJCrvI2UH6/7YNKXQjbjT5qVYu6ytch2wBxFMfFfYWMn/2bSCQ==", "dependencies": { - "@apollo/utils.isnodelike": "^1.0.0", + "@apollo/utils.isnodelike": "^1.1.0", "sha.js": "^2.4.11" }, "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" } }, "node_modules/@apollo/utils.dropunuseddefinitions": { @@ -442,11 +442,11 @@ "integrity": "sha512-SpJH69ffk91BoYSVb12Dt/jFQKVOrm4NE59XUeHXRsha1xBmxjvZNN6qvYySAcGjloW4TtFZYlPkBpwjMRWymw==" }, "node_modules/@apollo/utils.isnodelike": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.isnodelike/-/utils.isnodelike-1.0.0.tgz", - "integrity": "sha512-uS0TNODZXYDiKp5r+OXUtqLcjgcJ7s0GyY8m+TGnYOLu6CpqL4BiJSR54o4gXK+oxFGWy7Fs2NjVJtjFVt8ifg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.isnodelike/-/utils.isnodelike-1.1.0.tgz", + "integrity": "sha512-q/Q82kBUSEcx1ED11JO1TYBY781mWluUnBD8NvhjHVsu1K1C5R9BZVUxShyK/V8XcePcRUB5fdWOcBMGwS0KOA==", "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" } }, "node_modules/@apollo/utils.logger": { @@ -19338,7 +19338,7 @@ "ts-graphviz": "^0.16.0" }, "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "peerDependencies": { "graphql": "^16.0.0" @@ -19356,7 +19356,7 @@ "pretty-format": "^27.0.0" }, "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "peerDependencies": { "graphql": "^16.0.0" @@ -19370,7 +19370,7 @@ "@apollo/federation-internals": "file:../internals-js" }, "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "peerDependencies": { "graphql": "^16.0.0" @@ -19428,9 +19428,9 @@ "@apollo/core-schema": "~0.3.0", "@apollo/federation-internals": "file:../internals-js", "@apollo/query-planner": "file:../query-planner-js", - "@apollo/utils.createhash": "^1.0.0", + "@apollo/utils.createhash": "^1.1.0", "@apollo/utils.fetcher": "^1.0.0", - "@apollo/utils.isnodelike": "^1.0.0", + "@apollo/utils.isnodelike": "^1.1.0", "@apollo/utils.logger": "^1.0.0", "@josephg/resolvable": "^1.0.1", "@opentelemetry/api": "^1.0.1", @@ -19630,11 +19630,11 @@ } }, "@apollo/utils.createhash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.createhash/-/utils.createhash-1.0.0.tgz", - "integrity": "sha512-FsijruGzaD+mNdelqXKgO+PCvdxD16rbN275oHGcVbhQixvdXfUSgqwfjUJSPFJAQoW/QvyoNaVf7M51gJNiTw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.createhash/-/utils.createhash-1.1.0.tgz", + "integrity": "sha512-5fT4ZiW75515OlikWpIQzaVDws1yy9VgYSoHoJCrvI2UH6/7YNKXQjbjT5qVYu6ytch2wBxFMfFfYWMn/2bSCQ==", "requires": { - "@apollo/utils.isnodelike": "^1.0.0", + "@apollo/utils.isnodelike": "^1.1.0", "sha.js": "^2.4.11" } }, @@ -19650,9 +19650,9 @@ "integrity": "sha512-SpJH69ffk91BoYSVb12Dt/jFQKVOrm4NE59XUeHXRsha1xBmxjvZNN6qvYySAcGjloW4TtFZYlPkBpwjMRWymw==" }, "@apollo/utils.isnodelike": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.isnodelike/-/utils.isnodelike-1.0.0.tgz", - "integrity": "sha512-uS0TNODZXYDiKp5r+OXUtqLcjgcJ7s0GyY8m+TGnYOLu6CpqL4BiJSR54o4gXK+oxFGWy7Fs2NjVJtjFVt8ifg==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.isnodelike/-/utils.isnodelike-1.1.0.tgz", + "integrity": "sha512-q/Q82kBUSEcx1ED11JO1TYBY781mWluUnBD8NvhjHVsu1K1C5R9BZVUxShyK/V8XcePcRUB5fdWOcBMGwS0KOA==" }, "@apollo/utils.logger": { "version": "1.0.0", diff --git a/package.json b/package.json index 54cced8f0..d9317a781 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "hints-doc:check": "npm run hints-doc && git diff --exit-code" }, "engines": { - "node": ">=12.13.0 <18.0", + "node": ">=12.13.0", "npm": ">=7 <9" }, "dependencies": { diff --git a/query-graphs-js/CHANGELOG.md b/query-graphs-js/CHANGELOG.md index b2cba9429..a2cafbc98 100644 --- a/query-graphs-js/CHANGELOG.md +++ b/query-graphs-js/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG for `@apollo/query-graphs` +## vNext + +- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884) + ## 2.0.5 - Fix bug with unsatisfiable query branch when handling federation 1 supergraph [PR #1908](https://github.com/apollographql/federation/pull/1908). diff --git a/query-graphs-js/package.json b/query-graphs-js/package.json index e47ae31a0..d4b580ec1 100644 --- a/query-graphs-js/package.json +++ b/query-graphs-js/package.json @@ -20,7 +20,7 @@ "author": "Apollo ", "license": "SEE LICENSE IN ./LICENSE", "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "dependencies": { "@apollo/federation-internals": "file:../internals-js", diff --git a/query-planner-js/CHANGELOG.md b/query-planner-js/CHANGELOG.md index ad3bf4646..46bc24393 100644 --- a/query-planner-js/CHANGELOG.md +++ b/query-planner-js/CHANGELOG.md @@ -2,6 +2,8 @@ This CHANGELOG pertains only to Apollo Federation packages in the 2.x range. The Federation v0.x equivalent for this package can be found [here](https://github.com/apollographql/federation/blob/version-0.x/query-planner-js/CHANGELOG.md) on the `version-0.x` branch of this repo. +- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884) + ## 2.0.3 - Fix issue with `@requires` and conditional queries (`@include`/`@skip`) [1835](https://github.com/apollographql/federation/pull/1835). diff --git a/query-planner-js/package.json b/query-planner-js/package.json index fe768a580..96f385ef5 100644 --- 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": "SEE LICENSE IN ./LICENSE", "publishConfig": { diff --git a/subgraph-js/CHANGELOG.md b/subgraph-js/CHANGELOG.md index 2696ab564..fedfebd5e 100644 --- a/subgraph-js/CHANGELOG.md +++ b/subgraph-js/CHANGELOG.md @@ -2,6 +2,8 @@ This CHANGELOG pertains only to Apollo Federation packages in the 2.x range. The Federation v0.x equivalent for this package can be found [here](https://github.com/apollographql/federation/blob/version-0.x/subgraph-js/CHANGELOG.md) on the `version-0.x` branch of this repo. +- Expand support for Node.js v18 [PR #1884](https://github.com/apollographql/federation/pull/1884) + ## 2.0.3 - Fix output of `printSubgraphSchema` method, ensuring it can be read back by composition and `buildSubgraphSchema` [PR #1831](https://github.com/apollographql/federation/pull/1831). diff --git a/subgraph-js/package.json b/subgraph-js/package.json index 4ac523f63..13231687c 100644 --- a/subgraph-js/package.json +++ b/subgraph-js/package.json @@ -18,7 +18,7 @@ "author": "Apollo ", "license": "MIT", "engines": { - "node": ">=12.13.0 <18.0" + "node": ">=12.13.0" }, "publishConfig": { "access": "public"