From 494c15b5b27dd0175f0cae034cf30da826433dab Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Mon, 25 Apr 2022 16:23:25 +0300 Subject: [PATCH 1/3] test: fix failing integration tests on node@18 Context: https://github.com/nodejs/node/pull/41431#discussion_r841272416 --- .circleci/config.yml | 1 + .../server/src/__tests__/integration/apolloServerTests.ts | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8012addc7fe..fd22d90d91c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -87,6 +87,7 @@ workflows: - "14" - "16" - "17" + - "18" - "Check for FIXM\x45" - Prettier - Spell check diff --git a/packages/server/src/__tests__/integration/apolloServerTests.ts b/packages/server/src/__tests__/integration/apolloServerTests.ts index 99a0070f8dc..b06263f96ed 100644 --- a/packages/server/src/__tests__/integration/apolloServerTests.ts +++ b/packages/server/src/__tests__/integration/apolloServerTests.ts @@ -934,7 +934,8 @@ export function defineIntegrationTestSuiteApolloServerTests( const { family, address, port } = this.server.address() as AddressInfo; - if (family !== 'IPv4') { + // @ts-expect-error until https://github.com/DefinitelyTyped/DefinitelyTyped/pull/60042 + if (family !== 'IPv4' && family !== 4) { throw new Error(`The family was unexpectedly ${family}.`); } return new URL(`http://${address}:${port}`).toString(); @@ -1959,7 +1960,8 @@ export function defineIntegrationTestSuiteApolloServerTests( const { family, address, port } = fakeUsageReportingServer.address() as AddressInfo; - if (family !== 'IPv4') { + // @ts-expect-error until https://github.com/DefinitelyTyped/DefinitelyTyped/pull/60042 + if (family !== 'IPv4' && family !== 4) { throw new Error(`The family was unexpectedly ${family}.`); } From 8af2c0fba73a02e5db79a58cbdcdeee0045047db Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 26 Apr 2022 10:51:55 -0700 Subject: [PATCH 2/3] Update utils packages for node 18 compatibility --- package-lock.json | 8 ++++---- packages/server/package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index eed8b2e9423..d396439d6ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11854,9 +11854,9 @@ "license": "MIT", "dependencies": { "@apollo/usage-reporting-protobuf": "^3.3.0", - "@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", "@apollographql/graphql-playground-html": "1.6.29", "@graphql-tools/mock": "^8.1.2", @@ -11963,9 +11963,9 @@ "version": "file:packages/server", "requires": { "@apollo/usage-reporting-protobuf": "^3.3.0", - "@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", "@apollographql/graphql-playground-html": "1.6.29", "@graphql-tools/mock": "^8.1.2", diff --git a/packages/server/package.json b/packages/server/package.json index 476d3c2e58e..30be4aba0ce 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -26,8 +26,8 @@ }, "dependencies": { "@apollo/usage-reporting-protobuf": "^3.3.0", - "@apollo/utils.createhash": "^1.0.0", - "@apollo/utils.isnodelike": "^1.0.0", + "@apollo/utils.createhash": "^1.1.0", + "@apollo/utils.isnodelike": "^1.1.0", "@apollo/utils.logger": "^1.0.0", "@apollo/utils.fetcher": "^1.0.0", "@apollographql/graphql-playground-html": "1.6.29", From d292fb031213f512598232a1beca3f3efa80ebb2 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 26 Apr 2022 10:55:13 -0700 Subject: [PATCH 3/3] Remove v17 --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd22d90d91c..759e59f5445 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,7 +86,6 @@ workflows: node-version: - "14" - "16" - - "17" - "18" - "Check for FIXM\x45" - Prettier