Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expand support for node@18 #1884

Merged
merged 9 commits into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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)"
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions composition-js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion composition-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"author": "Apollo <packages@apollographql.com>",
"license": "SEE LICENSE IN ./LICENSE",
"engines": {
"node": ">=12.13.0 <18.0"
"node": ">=12.13.0"
},
"publishConfig": {
"access": "public"
Expand Down
1 change: 1 addition & 0 deletions gateway-js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions gateway-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"apollo"
],
"engines": {
"node": ">=12.13.0 <18.0"
"node": ">=12.13.0"
},
"license": "SEE LICENSE IN ./LICENSE",
"publishConfig": {
Expand All @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions internals-js/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
2 changes: 1 addition & 1 deletion internals-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"author": "Apollo <packages@apollographql.com>",
"license": "SEE LICENSE IN ./LICENSE",
"engines": {
"node": ">=12.13.0 <18.0"
"node": ">=12.13.0"
},
"dependencies": {
"@apollo/core-schema": "~0.3.0",
Expand Down
54 changes: 27 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 4 additions & 0 deletions query-graphs-js/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
2 changes: 1 addition & 1 deletion query-graphs-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"author": "Apollo <packages@apollographql.com>",
"license": "SEE LICENSE IN ./LICENSE",
"engines": {
"node": ">=12.13.0 <18.0"
"node": ">=12.13.0"
},
"dependencies": {
"@apollo/federation-internals": "file:../internals-js",
Expand Down
2 changes: 2 additions & 0 deletions query-planner-js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion query-planner-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"apollo"
],
"engines": {
"node": ">=12.13.0 <18.0"
"node": ">=12.13.0"
},
"license": "SEE LICENSE IN ./LICENSE",
"publishConfig": {
Expand Down
2 changes: 2 additions & 0 deletions subgraph-js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion subgraph-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down