diff --git a/.changeset/lucky-falcons-bake.md b/.changeset/lucky-falcons-bake.md new file mode 100644 index 00000000000..95ac87473c7 --- /dev/null +++ b/.changeset/lucky-falcons-bake.md @@ -0,0 +1,8 @@ +--- +'@apollo/server-gateway-interface': patch +'@apollo/server-integration-testsuite': patch +'@apollo/server-plugin-response-cache': patch +'@apollo/server': patch +--- + +Update `@apollo/utils.keyvaluecache` dependency to the latest patch which correctly specifies its version of `lru-cache`. diff --git a/package-lock.json b/package-lock.json index cd94d6cc601..e7e260babff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -234,6 +234,34 @@ "node": ">=14" } }, + "node_modules/@apollo/utils.keyvaluecache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.1.tgz", + "integrity": "sha512-F1v3m2pMXPD3rb2+F79qklBBFtNSWssV+8YJIAI0iLxRxoNdDAzfrBFUseUaBaeen/e5mR54QkeNCiq8EvQ/Eg==", + "dependencies": { + "@apollo/utils.logger": "^2.0.0", + "lru-cache": "^7.14.1" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@apollo/utils.keyvaluecache/node_modules/@apollo/utils.logger": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", + "integrity": "sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==", + "engines": { + "node": ">=14" + } + }, + "node_modules/@apollo/utils.keyvaluecache/node_modules/lru-cache": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", + "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "engines": { + "node": ">=12" + } + }, "node_modules/@apollo/utils.printwithreducedwhitespace": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-2.0.0.tgz", @@ -12988,7 +13016,7 @@ "dependencies": { "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.fetcher": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@apollo/utils.logger": "^2.0.0" }, "peerDependencies": { @@ -13003,18 +13031,6 @@ "node": ">=14" } }, - "packages/gateway-interface/node_modules/@apollo/utils.keyvaluecache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.0.tgz", - "integrity": "sha512-vf4gc2xr7IKU7EwCTzA5HDl1dxUNfvaJdauxXPNIXM96L9jhqEAyUFjJEQ7Ee85LGcjYCIWbr6yzmFRBYf1bbw==", - "dependencies": { - "@apollo/utils.logger": "^2.0.0", - "lru-cache": "^7.10.1 - 7.13.1" - }, - "engines": { - "node": ">=14" - } - }, "packages/gateway-interface/node_modules/@apollo/utils.logger": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", @@ -13023,14 +13039,6 @@ "node": ">=14" } }, - "packages/gateway-interface/node_modules/lru-cache": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz", - "integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==", - "engines": { - "node": ">=12" - } - }, "packages/integration-testsuite": { "name": "@apollo/server-integration-testsuite", "version": "4.2.0", @@ -13042,7 +13050,7 @@ "@apollo/server-plugin-landing-page-graphql-playground": "^4.0.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.createhash": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@josephg/resolvable": "^1.0.1", "body-parser": "^1.20.0", "express": "^4.18.1", @@ -13061,41 +13069,13 @@ "jest": "28.x || 29.x" } }, - "packages/integration-testsuite/node_modules/@apollo/utils.keyvaluecache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.0.tgz", - "integrity": "sha512-vf4gc2xr7IKU7EwCTzA5HDl1dxUNfvaJdauxXPNIXM96L9jhqEAyUFjJEQ7Ee85LGcjYCIWbr6yzmFRBYf1bbw==", - "dependencies": { - "@apollo/utils.logger": "^2.0.0", - "lru-cache": "^7.10.1 - 7.13.1" - }, - "engines": { - "node": ">=14" - } - }, - "packages/integration-testsuite/node_modules/@apollo/utils.logger": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", - "integrity": "sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==", - "engines": { - "node": ">=14" - } - }, - "packages/integration-testsuite/node_modules/lru-cache": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz", - "integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==", - "engines": { - "node": ">=12" - } - }, "packages/plugin-response-cache": { "name": "@apollo/server-plugin-response-cache", "version": "4.0.2", "license": "MIT", "dependencies": { "@apollo/utils.createhash": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0" + "@apollo/utils.keyvaluecache": "^2.0.1" }, "engines": { "node": ">=14.16.0" @@ -13105,34 +13085,6 @@ "graphql": "^16.6.0" } }, - "packages/plugin-response-cache/node_modules/@apollo/utils.keyvaluecache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.0.tgz", - "integrity": "sha512-vf4gc2xr7IKU7EwCTzA5HDl1dxUNfvaJdauxXPNIXM96L9jhqEAyUFjJEQ7Ee85LGcjYCIWbr6yzmFRBYf1bbw==", - "dependencies": { - "@apollo/utils.logger": "^2.0.0", - "lru-cache": "^7.10.1 - 7.13.1" - }, - "engines": { - "node": ">=14" - } - }, - "packages/plugin-response-cache/node_modules/@apollo/utils.logger": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", - "integrity": "sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==", - "engines": { - "node": ">=14" - } - }, - "packages/plugin-response-cache/node_modules/lru-cache": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz", - "integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==", - "engines": { - "node": ">=12" - } - }, "packages/server": { "name": "@apollo/server", "version": "4.2.0", @@ -13144,7 +13096,7 @@ "@apollo/utils.createhash": "^2.0.0", "@apollo/utils.fetcher": "^2.0.0", "@apollo/utils.isnodelike": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@apollo/utils.logger": "^2.0.0", "@apollo/utils.usagereporting": "^2.0.0", "@apollo/utils.withrequired": "^2.0.0", @@ -13198,18 +13150,6 @@ "node": ">=14" } }, - "packages/server/node_modules/@apollo/utils.keyvaluecache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.0.tgz", - "integrity": "sha512-vf4gc2xr7IKU7EwCTzA5HDl1dxUNfvaJdauxXPNIXM96L9jhqEAyUFjJEQ7Ee85LGcjYCIWbr6yzmFRBYf1bbw==", - "dependencies": { - "@apollo/utils.logger": "^2.0.0", - "lru-cache": "^7.10.1 - 7.13.1" - }, - "engines": { - "node": ">=14" - } - }, "packages/server/node_modules/@apollo/utils.logger": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", @@ -13312,7 +13252,7 @@ "@apollo/utils.createhash": "^2.0.0", "@apollo/utils.fetcher": "^2.0.0", "@apollo/utils.isnodelike": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@apollo/utils.logger": "^2.0.0", "@apollo/utils.usagereporting": "^2.0.0", "@apollo/utils.withrequired": "^2.0.0", @@ -13339,15 +13279,6 @@ "resolved": "https://registry.npmjs.org/@apollo/utils.fetcher/-/utils.fetcher-2.0.0.tgz", "integrity": "sha512-RC0twEwwBKbhk/y4B2X4YEciRG1xoKMgiPy5xQqNMd3pG78sR+ybctG/m7c/8+NaaQOS22UPUCBd6yS6WihBIg==" }, - "@apollo/utils.keyvaluecache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.0.tgz", - "integrity": "sha512-vf4gc2xr7IKU7EwCTzA5HDl1dxUNfvaJdauxXPNIXM96L9jhqEAyUFjJEQ7Ee85LGcjYCIWbr6yzmFRBYf1bbw==", - "requires": { - "@apollo/utils.logger": "^2.0.0", - "lru-cache": "^7.10.1 - 7.13.1" - } - }, "@apollo/utils.logger": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", @@ -13370,7 +13301,7 @@ "requires": { "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.fetcher": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@apollo/utils.logger": "^2.0.0" }, "dependencies": { @@ -13379,24 +13310,10 @@ "resolved": "https://registry.npmjs.org/@apollo/utils.fetcher/-/utils.fetcher-2.0.0.tgz", "integrity": "sha512-RC0twEwwBKbhk/y4B2X4YEciRG1xoKMgiPy5xQqNMd3pG78sR+ybctG/m7c/8+NaaQOS22UPUCBd6yS6WihBIg==" }, - "@apollo/utils.keyvaluecache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.0.tgz", - "integrity": "sha512-vf4gc2xr7IKU7EwCTzA5HDl1dxUNfvaJdauxXPNIXM96L9jhqEAyUFjJEQ7Ee85LGcjYCIWbr6yzmFRBYf1bbw==", - "requires": { - "@apollo/utils.logger": "^2.0.0", - "lru-cache": "^7.10.1 - 7.13.1" - } - }, "@apollo/utils.logger": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", "integrity": "sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==" - }, - "lru-cache": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz", - "integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==" } } }, @@ -13409,7 +13326,7 @@ "@apollo/server-plugin-landing-page-graphql-playground": "^4.0.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.createhash": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@josephg/resolvable": "^1.0.1", "body-parser": "^1.20.0", "express": "^4.18.1", @@ -13418,27 +13335,6 @@ "loglevel": "^1.8.0", "node-fetch": "^2.6.7", "supertest": "^6.2.3" - }, - "dependencies": { - "@apollo/utils.keyvaluecache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.0.tgz", - "integrity": "sha512-vf4gc2xr7IKU7EwCTzA5HDl1dxUNfvaJdauxXPNIXM96L9jhqEAyUFjJEQ7Ee85LGcjYCIWbr6yzmFRBYf1bbw==", - "requires": { - "@apollo/utils.logger": "^2.0.0", - "lru-cache": "^7.10.1 - 7.13.1" - } - }, - "@apollo/utils.logger": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", - "integrity": "sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==" - }, - "lru-cache": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz", - "integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==" - } } }, "@apollo/server-plugin-landing-page-graphql-playground": { @@ -13453,28 +13349,7 @@ "version": "file:packages/plugin-response-cache", "requires": { "@apollo/utils.createhash": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0" - }, - "dependencies": { - "@apollo/utils.keyvaluecache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.0.tgz", - "integrity": "sha512-vf4gc2xr7IKU7EwCTzA5HDl1dxUNfvaJdauxXPNIXM96L9jhqEAyUFjJEQ7Ee85LGcjYCIWbr6yzmFRBYf1bbw==", - "requires": { - "@apollo/utils.logger": "^2.0.0", - "lru-cache": "^7.10.1 - 7.13.1" - } - }, - "@apollo/utils.logger": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", - "integrity": "sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==" - }, - "lru-cache": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz", - "integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==" - } + "@apollo/utils.keyvaluecache": "^2.0.1" } }, "@apollo/usage-reporting-protobuf": { @@ -13503,6 +13378,27 @@ "resolved": "https://registry.npmjs.org/@apollo/utils.isnodelike/-/utils.isnodelike-2.0.0.tgz", "integrity": "sha512-77CiAM2qDXn0haQYrgX0UgrboQykb+bOHaz5p3KKItMwUZ/EFphzuB2vqHvubneIc9dxJcTx2L7MFDswRw/JAQ==" }, + "@apollo/utils.keyvaluecache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.0.1.tgz", + "integrity": "sha512-F1v3m2pMXPD3rb2+F79qklBBFtNSWssV+8YJIAI0iLxRxoNdDAzfrBFUseUaBaeen/e5mR54QkeNCiq8EvQ/Eg==", + "requires": { + "@apollo/utils.logger": "^2.0.0", + "lru-cache": "^7.14.1" + }, + "dependencies": { + "@apollo/utils.logger": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-2.0.0.tgz", + "integrity": "sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==" + }, + "lru-cache": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", + "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==" + } + } + }, "@apollo/utils.printwithreducedwhitespace": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-2.0.0.tgz", diff --git a/packages/gateway-interface/package.json b/packages/gateway-interface/package.json index 7b4e6786af0..287635e659d 100644 --- a/packages/gateway-interface/package.json +++ b/packages/gateway-interface/package.json @@ -20,7 +20,7 @@ "dependencies": { "@apollo/utils.fetcher": "^2.0.0", "@apollo/utils.logger": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@apollo/usage-reporting-protobuf": "^4.0.0" }, "peerDependencies": { diff --git a/packages/integration-testsuite/package.json b/packages/integration-testsuite/package.json index 9d2c7e48406..7e9c73362bd 100644 --- a/packages/integration-testsuite/package.json +++ b/packages/integration-testsuite/package.json @@ -30,7 +30,7 @@ "@apollo/client": "^3.6.9", "@apollo/server": "4.2.0", "@apollo/server-plugin-landing-page-graphql-playground": "^4.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@apollo/utils.createhash": "^2.0.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@josephg/resolvable": "^1.0.1", diff --git a/packages/integration-testsuite/tsconfig.cjs.json b/packages/integration-testsuite/tsconfig.cjs.json index 1ff20ca80ba..598c9830692 100644 --- a/packages/integration-testsuite/tsconfig.cjs.json +++ b/packages/integration-testsuite/tsconfig.cjs.json @@ -5,7 +5,10 @@ "moduleResolution": "node", "esModuleInterop": true, "rootDir": "./src", - "outDir": "./dist" + "outDir": "./dist", + // DOM types needed for @apollo/client + // Ref: https://github.com/apollographql/apollo-client/issues/6376 + "lib": ["es2020", "dom"] }, "include": ["src/**/*"], "references": [ diff --git a/packages/plugin-response-cache/package.json b/packages/plugin-response-cache/package.json index 79d6541f1ac..46df2f8b864 100644 --- a/packages/plugin-response-cache/package.json +++ b/packages/plugin-response-cache/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@apollo/utils.createhash": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0" + "@apollo/utils.keyvaluecache": "^2.0.1" }, "peerDependencies": { "@apollo/server": "^4.0.1", diff --git a/packages/server/package.json b/packages/server/package.json index 1cd9782de17..2626ec26e17 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -90,7 +90,7 @@ "@apollo/utils.createhash": "^2.0.0", "@apollo/utils.fetcher": "^2.0.0", "@apollo/utils.isnodelike": "^2.0.0", - "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.1", "@apollo/utils.logger": "^2.0.0", "@apollo/utils.usagereporting": "^2.0.0", "@apollo/utils.withrequired": "^2.0.0",