From 38f96a6b1f2871a42c864c1804833a0a9dfaa223 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Fri, 18 Nov 2022 14:46:02 -0800 Subject: [PATCH] Update utils packages to v2 where possible --- .changeset/blue-bulldogs-turn.md | 2 + package-lock.json | 410 +++++++++++++------- package.json | 2 +- packages/integration-testsuite/package.json | 4 +- packages/plugin-response-cache/package.json | 4 +- packages/server/package.json | 14 +- 6 files changed, 273 insertions(+), 163 deletions(-) create mode 100644 .changeset/blue-bulldogs-turn.md diff --git a/.changeset/blue-bulldogs-turn.md b/.changeset/blue-bulldogs-turn.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/blue-bulldogs-turn.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/package-lock.json b/package-lock.json index c3c02f37cd9..a42fbdc9525 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "devDependencies": { "@apollo/client": "3.7.1", "@apollo/server-plugin-landing-page-graphql-playground": "4.0.0", - "@apollo/utils.createhash": "1.1.0", + "@apollo/utils.createhash": "2.0.0", "@changesets/changelog-github": "0.4.7", "@changesets/cli": "2.25.2", "@graphql-codegen/cli": "2.13.12", @@ -76,7 +76,7 @@ }, "engines": { "node": ">=14.16.0", - "npm": "^9.0.0" + "npm": ">=8.5.0" } }, "node_modules/@ampproject/remapping": { @@ -204,21 +204,23 @@ "link": true }, "node_modules/@apollo/utils.createhash": { - "version": "1.1.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.createhash/-/utils.createhash-2.0.0.tgz", + "integrity": "sha512-9GhGGD3J0HJF/VC+odwYpKi3Cg1NWrsO8GQvyGwDS5v/78I3154Hn8s4tpW+nqoaQ/lAvxdQQr3HM1b5HLM6Ww==", "dependencies": { - "@apollo/utils.isnodelike": "^1.1.0", + "@apollo/utils.isnodelike": "^2.0.0", "sha.js": "^2.4.11" }, "engines": { - "node": ">=12.13.0" + "node": ">=14" } }, "node_modules/@apollo/utils.dropunuseddefinitions": { - "version": "1.1.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-2.0.0.tgz", + "integrity": "sha512-BoPW+Z3kA8kLh0FCWyzOt+R77W5mVZWer5s6UyvVwZ/qROGiEgcHXFcI5TMMndpXoDo0xBSvQV0lIKYHbJQ7+g==", "engines": { - "node": ">=12.13.0" + "node": ">=14" }, "peerDependencies": { "graphql": "14.x || 15.x || 16.x" @@ -230,10 +232,11 @@ "integrity": "sha512-UOI25Q8kN6ADYxCPSzilMzMir2CNNFLif/+1WcTgMog9HbMGtG3LSlC9vStsSBcNGlwViaFFGP4ybgoZ2Ro5rQ==" }, "node_modules/@apollo/utils.isnodelike": { - "version": "1.1.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.isnodelike/-/utils.isnodelike-2.0.0.tgz", + "integrity": "sha512-77CiAM2qDXn0haQYrgX0UgrboQykb+bOHaz5p3KKItMwUZ/EFphzuB2vqHvubneIc9dxJcTx2L7MFDswRw/JAQ==", "engines": { - "node": ">=12.13.0" + "node": ">=14" } }, "node_modules/@apollo/utils.keyvaluecache": { @@ -256,69 +259,78 @@ "license": "MIT" }, "node_modules/@apollo/utils.printwithreducedwhitespace": { - "version": "1.1.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-2.0.0.tgz", + "integrity": "sha512-S+wyxFyuO0LJ8v+mg8c7rRwyKZ+9xlO5wXD/UgaysH3rcCe9NBHRWx/9cmdZ9nTqgKC5X01uHZ6Gsi6pOrUGgw==", "engines": { - "node": ">=12.13.0" + "node": ">=14" }, "peerDependencies": { "graphql": "14.x || 15.x || 16.x" } }, "node_modules/@apollo/utils.removealiases": { - "version": "1.0.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.removealiases/-/utils.removealiases-2.0.0.tgz", + "integrity": "sha512-PT5ICz2SfrMCRsR3DhW2E1anX6hcqVXE/uHpmRHbhqSoQODZKG34AlFm1tC8u3MC3eK5gcvtpGvPHF/cwVfakg==", "engines": { - "node": ">=12.13.0" + "node": ">=14" }, "peerDependencies": { "graphql": "14.x || 15.x || 16.x" } }, "node_modules/@apollo/utils.sortast": { - "version": "1.1.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.sortast/-/utils.sortast-2.0.0.tgz", + "integrity": "sha512-VKoVOh8xkvh5HabtyGTekIYbwXdyYFPodFuHpWp333Fo2KBmpczLY+RBMHEr3v2MLoXDn/WUMtR3JZmvFJ45zw==", "dependencies": { "lodash.sortby": "^4.7.0" }, "engines": { - "node": ">=12.13.0" + "node": ">=14" }, "peerDependencies": { "graphql": "14.x || 15.x || 16.x" } }, "node_modules/@apollo/utils.stripsensitiveliterals": { - "version": "1.2.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-2.0.0.tgz", + "integrity": "sha512-pzj1XINetE54uxIjc4bN6gVzDWYP8OZ/yB0xMTgvzttu1VLgXf3BTV76d9hlqLoe8cV0JiD+xLpJktrHOzmBJQ==", "engines": { - "node": ">=12.13.0" + "node": ">=14" }, "peerDependencies": { "graphql": "14.x || 15.x || 16.x" } }, "node_modules/@apollo/utils.usagereporting": { - "version": "1.0.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.usagereporting/-/utils.usagereporting-2.0.0.tgz", + "integrity": "sha512-9VvVgA/LzKkBEYEGwE9doL1Sl+VRULkbB3D7W+ImJ028jJuTllvlQsh4Xpqz8mJWprfKx4m/i2DwHtElHWU2vg==", "dependencies": { - "@apollo/utils.dropunuseddefinitions": "^1.1.0", - "@apollo/utils.printwithreducedwhitespace": "^1.1.0", - "@apollo/utils.removealiases": "1.0.0", - "@apollo/utils.sortast": "^1.1.0", - "@apollo/utils.stripsensitiveliterals": "^1.2.0", - "apollo-reporting-protobuf": "^3.3.1" + "@apollo/usage-reporting-protobuf": "^4.0.0", + "@apollo/utils.dropunuseddefinitions": "^2.0.0", + "@apollo/utils.printwithreducedwhitespace": "^2.0.0", + "@apollo/utils.removealiases": "2.0.0", + "@apollo/utils.sortast": "^2.0.0", + "@apollo/utils.stripsensitiveliterals": "^2.0.0" }, "engines": { - "node": ">=12.13.0" + "node": ">=14" }, "peerDependencies": { "graphql": "14.x || 15.x || 16.x" } }, "node_modules/@apollo/utils.withrequired": { - "version": "1.0.0", - "license": "MIT" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.withrequired/-/utils.withrequired-2.0.0.tgz", + "integrity": "sha512-+djpTu6AEE/A1etryZs9tmXRyDY6XXGe3G29MS/LB09uHq3pcl3n4Q5lvDTL5JWKuJixrulg5djePLDAooG8dQ==", + "engines": { + "node": ">=14" + } }, "node_modules/@apollographql/graphql-playground-html": { "version": "1.6.29", @@ -4707,44 +4719,6 @@ "node": ">= 8" } }, - "node_modules/apollo-reporting-protobuf": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.2.tgz", - "integrity": "sha512-j1tx9tmkVdsLt1UPzBrvz90PdjAeKW157WxGn+aXlnnGfVjZLIRXX3x5t1NWtXvB7rVaAsLLILLtDHW382TSoQ==", - "dependencies": { - "@apollo/protobufjs": "1.2.4" - } - }, - "node_modules/apollo-reporting-protobuf/node_modules/@apollo/protobufjs": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.4.tgz", - "integrity": "sha512-npVJ9NVU/pynj+SCU+fambvTneJDyCnif738DnZ7pCxdDtzeEz7WkpSIq5wNUmWm5Td55N+S2xfqZ+WP4hDLng==", - "hasInstallScript": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.0", - "@types/node": "^10.1.0", - "long": "^4.0.0" - }, - "bin": { - "apollo-pbjs": "bin/pbjs", - "apollo-pbts": "bin/pbts" - } - }, - "node_modules/apollo-reporting-protobuf/node_modules/@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" - }, "node_modules/arg": { "version": "4.1.3", "devOptional": true, @@ -9775,7 +9749,8 @@ }, "node_modules/lodash.sortby": { "version": "4.7.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==" }, "node_modules/lodash.startcase": { "version": "4.4.0", @@ -13045,8 +13020,8 @@ "@apollo/server": "4.1.1", "@apollo/server-plugin-landing-page-graphql-playground": "^4.0.0", "@apollo/usage-reporting-protobuf": "^4.0.0", - "@apollo/utils.createhash": "^1.1.0", - "@apollo/utils.keyvaluecache": "^1.0.1", + "@apollo/utils.createhash": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.0", "@josephg/resolvable": "^1.0.1", "body-parser": "^1.20.0", "express": "^4.18.1", @@ -13064,13 +13039,41 @@ "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.1", "license": "MIT", "dependencies": { - "@apollo/utils.createhash": "^1.1.0", - "@apollo/utils.keyvaluecache": "^1.0.1" + "@apollo/utils.createhash": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.0" }, "engines": { "node": ">=14.16.0" @@ -13080,6 +13083,34 @@ "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.1.1", @@ -13088,13 +13119,13 @@ "@apollo/cache-control-types": "^1.0.2", "@apollo/server-gateway-interface": "^1.0.5", "@apollo/usage-reporting-protobuf": "^4.0.0", - "@apollo/utils.createhash": "^1.1.0", - "@apollo/utils.fetcher": "^1.0.0", - "@apollo/utils.isnodelike": "^1.1.0", - "@apollo/utils.keyvaluecache": "^1.0.1", - "@apollo/utils.logger": "^1.0.0", - "@apollo/utils.usagereporting": "^1.0.0", - "@apollo/utils.withrequired": "^1.0.0", + "@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.logger": "^2.0.0", + "@apollo/utils.usagereporting": "^2.0.0", + "@apollo/utils.withrequired": "^2.0.0", "@graphql-tools/schema": "^9.0.0", "@josephg/resolvable": "^1.0.0", "@types/express": "^4.17.13", @@ -13137,9 +13168,38 @@ "graphql": "14.x || 15.x || 16.x" } }, + "packages/server/node_modules/@apollo/utils.fetcher": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.fetcher/-/utils.fetcher-2.0.0.tgz", + "integrity": "sha512-RC0twEwwBKbhk/y4B2X4YEciRG1xoKMgiPy5xQqNMd3pG78sR+ybctG/m7c/8+NaaQOS22UPUCBd6yS6WihBIg==", + "engines": { + "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", + "integrity": "sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==", + "engines": { + "node": ">=14" + } + }, "packages/server/node_modules/lru-cache": { - "version": "7.10.1", - "license": "ISC", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz", + "integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==", "engines": { "node": ">=12" } @@ -13227,13 +13287,13 @@ "@apollo/cache-control-types": "^1.0.2", "@apollo/server-gateway-interface": "^1.0.5", "@apollo/usage-reporting-protobuf": "^4.0.0", - "@apollo/utils.createhash": "^1.1.0", - "@apollo/utils.fetcher": "^1.0.0", - "@apollo/utils.isnodelike": "^1.1.0", - "@apollo/utils.keyvaluecache": "^1.0.1", - "@apollo/utils.logger": "^1.0.0", - "@apollo/utils.usagereporting": "^1.0.0", - "@apollo/utils.withrequired": "^1.0.0", + "@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.logger": "^2.0.0", + "@apollo/utils.usagereporting": "^2.0.0", + "@apollo/utils.withrequired": "^2.0.0", "@graphql-tools/schema": "^9.0.0", "@josephg/resolvable": "^1.0.0", "@types/express": "^4.17.13", @@ -13252,8 +13312,29 @@ "whatwg-mimetype": "^3.0.0" }, "dependencies": { + "@apollo/utils.fetcher": { + "version": "2.0.0", + "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.10.1" + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz", + "integrity": "sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ==" }, "uuid": { "version": "9.0.0", @@ -13279,8 +13360,8 @@ "@apollo/server": "4.1.1", "@apollo/server-plugin-landing-page-graphql-playground": "^4.0.0", "@apollo/usage-reporting-protobuf": "^4.0.0", - "@apollo/utils.createhash": "^1.1.0", - "@apollo/utils.keyvaluecache": "^1.0.1", + "@apollo/utils.createhash": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.0", "@josephg/resolvable": "^1.0.1", "body-parser": "^1.20.0", "express": "^4.18.1", @@ -13288,6 +13369,27 @@ "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": { @@ -13301,8 +13403,29 @@ "@apollo/server-plugin-response-cache": { "version": "file:packages/plugin-response-cache", "requires": { - "@apollo/utils.createhash": "^1.1.0", - "@apollo/utils.keyvaluecache": "^1.0.1" + "@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/usage-reporting-protobuf": { @@ -13312,14 +13435,18 @@ } }, "@apollo/utils.createhash": { - "version": "1.1.0", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.createhash/-/utils.createhash-2.0.0.tgz", + "integrity": "sha512-9GhGGD3J0HJF/VC+odwYpKi3Cg1NWrsO8GQvyGwDS5v/78I3154Hn8s4tpW+nqoaQ/lAvxdQQr3HM1b5HLM6Ww==", "requires": { - "@apollo/utils.isnodelike": "^1.1.0", + "@apollo/utils.isnodelike": "^2.0.0", "sha.js": "^2.4.11" } }, "@apollo/utils.dropunuseddefinitions": { - "version": "1.1.0", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-2.0.0.tgz", + "integrity": "sha512-BoPW+Z3kA8kLh0FCWyzOt+R77W5mVZWer5s6UyvVwZ/qROGiEgcHXFcI5TMMndpXoDo0xBSvQV0lIKYHbJQ7+g==", "requires": {} }, "@apollo/utils.fetcher": { @@ -13328,7 +13455,9 @@ "integrity": "sha512-UOI25Q8kN6ADYxCPSzilMzMir2CNNFLif/+1WcTgMog9HbMGtG3LSlC9vStsSBcNGlwViaFFGP4ybgoZ2Ro5rQ==" }, "@apollo/utils.isnodelike": { - "version": "1.1.0" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.isnodelike/-/utils.isnodelike-2.0.0.tgz", + "integrity": "sha512-77CiAM2qDXn0haQYrgX0UgrboQykb+bOHaz5p3KKItMwUZ/EFphzuB2vqHvubneIc9dxJcTx2L7MFDswRw/JAQ==" }, "@apollo/utils.keyvaluecache": { "version": "1.0.1", @@ -13346,36 +13475,48 @@ "version": "1.0.0" }, "@apollo/utils.printwithreducedwhitespace": { - "version": "1.1.0", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-2.0.0.tgz", + "integrity": "sha512-S+wyxFyuO0LJ8v+mg8c7rRwyKZ+9xlO5wXD/UgaysH3rcCe9NBHRWx/9cmdZ9nTqgKC5X01uHZ6Gsi6pOrUGgw==", "requires": {} }, "@apollo/utils.removealiases": { - "version": "1.0.0", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.removealiases/-/utils.removealiases-2.0.0.tgz", + "integrity": "sha512-PT5ICz2SfrMCRsR3DhW2E1anX6hcqVXE/uHpmRHbhqSoQODZKG34AlFm1tC8u3MC3eK5gcvtpGvPHF/cwVfakg==", "requires": {} }, "@apollo/utils.sortast": { - "version": "1.1.0", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.sortast/-/utils.sortast-2.0.0.tgz", + "integrity": "sha512-VKoVOh8xkvh5HabtyGTekIYbwXdyYFPodFuHpWp333Fo2KBmpczLY+RBMHEr3v2MLoXDn/WUMtR3JZmvFJ45zw==", "requires": { "lodash.sortby": "^4.7.0" } }, "@apollo/utils.stripsensitiveliterals": { - "version": "1.2.0", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-2.0.0.tgz", + "integrity": "sha512-pzj1XINetE54uxIjc4bN6gVzDWYP8OZ/yB0xMTgvzttu1VLgXf3BTV76d9hlqLoe8cV0JiD+xLpJktrHOzmBJQ==", "requires": {} }, "@apollo/utils.usagereporting": { - "version": "1.0.0", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.usagereporting/-/utils.usagereporting-2.0.0.tgz", + "integrity": "sha512-9VvVgA/LzKkBEYEGwE9doL1Sl+VRULkbB3D7W+ImJ028jJuTllvlQsh4Xpqz8mJWprfKx4m/i2DwHtElHWU2vg==", "requires": { - "@apollo/utils.dropunuseddefinitions": "^1.1.0", - "@apollo/utils.printwithreducedwhitespace": "^1.1.0", - "@apollo/utils.removealiases": "1.0.0", - "@apollo/utils.sortast": "^1.1.0", - "@apollo/utils.stripsensitiveliterals": "^1.2.0", - "apollo-reporting-protobuf": "^3.3.1" + "@apollo/usage-reporting-protobuf": "^4.0.0", + "@apollo/utils.dropunuseddefinitions": "^2.0.0", + "@apollo/utils.printwithreducedwhitespace": "^2.0.0", + "@apollo/utils.removealiases": "2.0.0", + "@apollo/utils.sortast": "^2.0.0", + "@apollo/utils.stripsensitiveliterals": "^2.0.0" } }, "@apollo/utils.withrequired": { - "version": "1.0.0" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@apollo/utils.withrequired/-/utils.withrequired-2.0.0.tgz", + "integrity": "sha512-+djpTu6AEE/A1etryZs9tmXRyDY6XXGe3G29MS/LB09uHq3pcl3n4Q5lvDTL5JWKuJixrulg5djePLDAooG8dQ==" }, "@apollographql/graphql-playground-html": { "version": "1.6.29", @@ -16853,41 +16994,6 @@ "picomatch": "^2.0.4" } }, - "apollo-reporting-protobuf": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.2.tgz", - "integrity": "sha512-j1tx9tmkVdsLt1UPzBrvz90PdjAeKW157WxGn+aXlnnGfVjZLIRXX3x5t1NWtXvB7rVaAsLLILLtDHW382TSoQ==", - "requires": { - "@apollo/protobufjs": "1.2.4" - }, - "dependencies": { - "@apollo/protobufjs": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.4.tgz", - "integrity": "sha512-npVJ9NVU/pynj+SCU+fambvTneJDyCnif738DnZ7pCxdDtzeEz7WkpSIq5wNUmWm5Td55N+S2xfqZ+WP4hDLng==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.0", - "@types/node": "^10.1.0", - "long": "^4.0.0" - } - }, - "@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" - } - } - }, "arg": { "version": "4.1.3", "devOptional": true @@ -20454,7 +20560,9 @@ "dev": true }, "lodash.sortby": { - "version": "4.7.0" + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==" }, "lodash.startcase": { "version": "4.4.0", diff --git a/package.json b/package.json index 73776737a24..8ea7dd40a1a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@apollo/client": "3.7.1", "@apollo/server-plugin-landing-page-graphql-playground": "4.0.0", - "@apollo/utils.createhash": "1.1.0", + "@apollo/utils.createhash": "2.0.0", "@changesets/changelog-github": "0.4.7", "@changesets/cli": "2.25.2", "@graphql-codegen/cli": "2.13.12", diff --git a/packages/integration-testsuite/package.json b/packages/integration-testsuite/package.json index 206bf384ce5..9d2501be338 100644 --- a/packages/integration-testsuite/package.json +++ b/packages/integration-testsuite/package.json @@ -30,8 +30,8 @@ "@apollo/client": "^3.6.9", "@apollo/server": "4.1.1", "@apollo/server-plugin-landing-page-graphql-playground": "^4.0.0", - "@apollo/utils.keyvaluecache": "^1.0.1", - "@apollo/utils.createhash": "^1.1.0", + "@apollo/utils.keyvaluecache": "^2.0.0", + "@apollo/utils.createhash": "^2.0.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@josephg/resolvable": "^1.0.1", "body-parser": "^1.20.0", diff --git a/packages/plugin-response-cache/package.json b/packages/plugin-response-cache/package.json index 79924f4d311..e630e976daa 100644 --- a/packages/plugin-response-cache/package.json +++ b/packages/plugin-response-cache/package.json @@ -29,8 +29,8 @@ "node": ">=14.16.0" }, "dependencies": { - "@apollo/utils.createhash": "^1.1.0", - "@apollo/utils.keyvaluecache": "^1.0.1" + "@apollo/utils.createhash": "^2.0.0", + "@apollo/utils.keyvaluecache": "^2.0.0" }, "peerDependencies": { "@apollo/server": "^4.0.1", diff --git a/packages/server/package.json b/packages/server/package.json index 75cf7902c54..9f244aa0d6d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -87,13 +87,13 @@ "@apollo/cache-control-types": "^1.0.2", "@apollo/server-gateway-interface": "^1.0.5", "@apollo/usage-reporting-protobuf": "^4.0.0", - "@apollo/utils.createhash": "^1.1.0", - "@apollo/utils.fetcher": "^1.0.0", - "@apollo/utils.isnodelike": "^1.1.0", - "@apollo/utils.keyvaluecache": "^1.0.1", - "@apollo/utils.logger": "^1.0.0", - "@apollo/utils.usagereporting": "^1.0.0", - "@apollo/utils.withrequired": "^1.0.0", + "@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.logger": "^2.0.0", + "@apollo/utils.usagereporting": "^2.0.0", + "@apollo/utils.withrequired": "^2.0.0", "@graphql-tools/schema": "^9.0.0", "@josephg/resolvable": "^1.0.0", "@types/express-serve-static-core": "^4.17.30",