diff --git a/package-lock.json b/package-lock.json index 22067820d53..83dfa036750 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ ], "devDependencies": { "@apollo/client": "3.8.7", - "@apollo/gateway": "2.5.6", - "@apollo/subgraph": "2.5.6", + "@apollo/gateway": "2.5.7", + "@apollo/subgraph": "2.5.7", "@apollo/utils.createhash": "2.0.1", "@changesets/changelog-github": "0.4.8", "@changesets/cli": "2.26.2", @@ -35,7 +35,7 @@ "@types/node-fetch": "2.6.9", "@types/qs-middleware": "1.0.4", "@types/retry": "0.12.5", - "@types/superagent": "4.1.21", + "@types/superagent": "4.1.22", "@types/supertest": "2.0.16", "@types/test-listen": "1.1.2", "@types/type-is": "1.6.6", @@ -64,7 +64,7 @@ "lodash.sumby": "4.6.0", "nock": "13.3.8", "node-fetch": "2.7.0", - "prettier": "3.0.3", + "prettier": "3.1.0", "prettier-2": "npm:prettier@2.8.8", "qs-middleware": "1.0.3", "requisition": "1.7.0", @@ -144,13 +144,13 @@ } }, "node_modules/@apollo/composition": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.5.6.tgz", - "integrity": "sha512-px3xvqgb3tyh7PtRNSBm0I5U2wmI+KcJBoM4xIVMEA+9vk3Mc46U3yXc/fTSGd6EPQD90jXVC56fwdWw/+f7oA==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.5.7.tgz", + "integrity": "sha512-Yx0F+GqKU0Yy6GJF7Rw7wgC5wPLG3eoReN7FUibswpZavf8HNTNniZu0BcB/rtOrAmznwCXkLw97KfAHQoj6YA==", "dev": true, "dependencies": { - "@apollo/federation-internals": "2.5.6", - "@apollo/query-graphs": "2.5.6" + "@apollo/federation-internals": "2.5.7", + "@apollo/query-graphs": "2.5.7" }, "engines": { "node": ">=14.15.0" @@ -160,9 +160,9 @@ } }, "node_modules/@apollo/federation-internals": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.5.6.tgz", - "integrity": "sha512-ZNJdEcWfKXlFDRYtoCftApQBJl1/aDUBnBfFJeXeTXW4FVhyGotVkWbJUIBlCHMISGmQQDNfRay9Dcp7uIda9A==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.5.7.tgz", + "integrity": "sha512-+c7m2c4FG4lMURZhtjFP59mm4/0zM49w6C/9uxryXriZKG3l3n5Ay12V/w9LNm7laoQkZjIBECBU39yT40mdBw==", "dev": true, "dependencies": { "@types/uuid": "^9.0.0", @@ -191,14 +191,14 @@ } }, "node_modules/@apollo/gateway": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/gateway/-/gateway-2.5.6.tgz", - "integrity": "sha512-zec9agl5UOjVM+bSGvldHlyx0OjFu6Mt8i/IfPi4fkH+8LJYzbshDTOQK2rDtPfbJoJpmgpCSO8XPzWZVOGvog==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/gateway/-/gateway-2.5.7.tgz", + "integrity": "sha512-hLI15fg8O9FCCjo0f7H4CcMy6f2ux/U5MW1BU63xLtwJWCcxJhv2aaiEjdIkg4+RwbGB1JCPtQQ7EYZfNm+uXg==", "dev": true, "dependencies": { - "@apollo/composition": "2.5.6", - "@apollo/federation-internals": "2.5.6", - "@apollo/query-planner": "2.5.6", + "@apollo/composition": "2.5.7", + "@apollo/federation-internals": "2.5.7", + "@apollo/query-planner": "2.5.7", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", @@ -247,12 +247,12 @@ } }, "node_modules/@apollo/query-graphs": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.5.6.tgz", - "integrity": "sha512-W0Raf+hL93XgF3gNXE0eij1m7DGv1zfxsGEUG/GAuBtasOH3YMN5b4HZZm11IDCrQ45OltrnZtAZX8c6UqskrA==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.5.7.tgz", + "integrity": "sha512-6kWJw4dYrk70jLEy/5fcfDaKB0vaFYe+NoLwDEZu7K3U4Y191xxNwUbjxkmQZSBwQ95beGrtOu7XWmJCnzKPlA==", "dev": true, "dependencies": { - "@apollo/federation-internals": "2.5.6", + "@apollo/federation-internals": "2.5.7", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -278,13 +278,13 @@ } }, "node_modules/@apollo/query-planner": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.5.6.tgz", - "integrity": "sha512-7qrQl4/s1FOK0TZaa+0WwL17Us9Oy1I8bfpfjf+3xp8NtgOnFijXzJ32IOdjhW+mkt5EC4LrkBUWvygCULuMyQ==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.5.7.tgz", + "integrity": "sha512-WQ6UZNkd52M1OT+K1/OdfK/+8ktgj+KVr97QRm91eoydHldyG6oBuxC/1zdTKPY8wzL1ku6xNwRiAMUNe5cNZg==", "dev": true, "dependencies": { - "@apollo/federation-internals": "2.5.6", - "@apollo/query-graphs": "2.5.6", + "@apollo/federation-internals": "2.5.7", + "@apollo/query-graphs": "2.5.7", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", @@ -314,13 +314,13 @@ "link": true }, "node_modules/@apollo/subgraph": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/subgraph/-/subgraph-2.5.6.tgz", - "integrity": "sha512-Swn0+M32Xr7HHippE0zJU/1vfCZDfM86Yir199jdUEYH4/9tqmx+OSq3QSCaSwiPJnzJlGgVmZhDCcqG90pDUA==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/subgraph/-/subgraph-2.5.7.tgz", + "integrity": "sha512-XEpawcRL7JEmUbJsFOgFYsUDbsA+392kexch9EIlZWfc1afZmhLjzPOIAgn+KO9ohwOLkkmRjczehDwzQgYFkA==", "dev": true, "dependencies": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.5.6" + "@apollo/federation-internals": "2.5.7" }, "engines": { "node": ">=14.15.0" @@ -4826,9 +4826,9 @@ "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==" }, "node_modules/@types/superagent": { - "version": "4.1.21", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.21.tgz", - "integrity": "sha512-yrbAccEEY9+BSa1wji3ry8R3/BdW9kyWnjkRKctrtw5ebn/k2a2CsMeaQ7dD4iLfomgHkomBVIVgOFRMV4XYHA==", + "version": "4.1.22", + "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.22.tgz", + "integrity": "sha512-GMaOrnnUsjChvH8zlzdDPARRXky8bU3E8xsU/fOclgqsINekbwDu1+wzJzJaGzZP91SGpOutf5Te5pm5M/qCWg==", "dev": true, "dependencies": { "@types/cookiejar": "*", @@ -5955,11 +5955,13 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "license": "MIT", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6925,15 +6927,15 @@ } }, "node_modules/deep-equal": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz", - "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", + "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-get-iterator": "^1.1.3", - "get-intrinsic": "^1.2.1", + "get-intrinsic": "^1.2.2", "is-arguments": "^1.1.1", "is-array-buffer": "^3.0.2", "is-date-object": "^1.0.5", @@ -6943,11 +6945,14 @@ "object-is": "^1.1.5", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", + "regexp.prototype.flags": "^1.5.1", "side-channel": "^1.0.4", "which-boxed-primitive": "^1.0.2", "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6974,6 +6979,19 @@ "clone": "^1.0.2" } }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-properties": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", @@ -8444,14 +8462,14 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8600,7 +8618,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -8771,6 +8788,7 @@ }, "node_modules/has": { "version": "1.0.3", + "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.1" @@ -8806,7 +8824,6 @@ }, "node_modules/has-property-descriptors": { "version": "1.0.0", - "dev": true, "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.1" @@ -11979,9 +11996,9 @@ } }, "node_modules/prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", + "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -12365,14 +12382,14 @@ "dev": true }, "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -12781,6 +12798,34 @@ "dev": true, "license": "ISC" }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -14361,13 +14406,13 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" @@ -14761,19 +14806,19 @@ } }, "@apollo/composition": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.5.6.tgz", - "integrity": "sha512-px3xvqgb3tyh7PtRNSBm0I5U2wmI+KcJBoM4xIVMEA+9vk3Mc46U3yXc/fTSGd6EPQD90jXVC56fwdWw/+f7oA==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.5.7.tgz", + "integrity": "sha512-Yx0F+GqKU0Yy6GJF7Rw7wgC5wPLG3eoReN7FUibswpZavf8HNTNniZu0BcB/rtOrAmznwCXkLw97KfAHQoj6YA==", "dev": true, "requires": { - "@apollo/federation-internals": "2.5.6", - "@apollo/query-graphs": "2.5.6" + "@apollo/federation-internals": "2.5.7", + "@apollo/query-graphs": "2.5.7" } }, "@apollo/federation-internals": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.5.6.tgz", - "integrity": "sha512-ZNJdEcWfKXlFDRYtoCftApQBJl1/aDUBnBfFJeXeTXW4FVhyGotVkWbJUIBlCHMISGmQQDNfRay9Dcp7uIda9A==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.5.7.tgz", + "integrity": "sha512-+c7m2c4FG4lMURZhtjFP59mm4/0zM49w6C/9uxryXriZKG3l3n5Ay12V/w9LNm7laoQkZjIBECBU39yT40mdBw==", "dev": true, "requires": { "@types/uuid": "^9.0.0", @@ -14791,14 +14836,14 @@ } }, "@apollo/gateway": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/gateway/-/gateway-2.5.6.tgz", - "integrity": "sha512-zec9agl5UOjVM+bSGvldHlyx0OjFu6Mt8i/IfPi4fkH+8LJYzbshDTOQK2rDtPfbJoJpmgpCSO8XPzWZVOGvog==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/gateway/-/gateway-2.5.7.tgz", + "integrity": "sha512-hLI15fg8O9FCCjo0f7H4CcMy6f2ux/U5MW1BU63xLtwJWCcxJhv2aaiEjdIkg4+RwbGB1JCPtQQ7EYZfNm+uXg==", "dev": true, "requires": { - "@apollo/composition": "2.5.6", - "@apollo/federation-internals": "2.5.6", - "@apollo/query-planner": "2.5.6", + "@apollo/composition": "2.5.7", + "@apollo/federation-internals": "2.5.7", + "@apollo/query-planner": "2.5.7", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", @@ -14836,12 +14881,12 @@ } }, "@apollo/query-graphs": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.5.6.tgz", - "integrity": "sha512-W0Raf+hL93XgF3gNXE0eij1m7DGv1zfxsGEUG/GAuBtasOH3YMN5b4HZZm11IDCrQ45OltrnZtAZX8c6UqskrA==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.5.7.tgz", + "integrity": "sha512-6kWJw4dYrk70jLEy/5fcfDaKB0vaFYe+NoLwDEZu7K3U4Y191xxNwUbjxkmQZSBwQ95beGrtOu7XWmJCnzKPlA==", "dev": true, "requires": { - "@apollo/federation-internals": "2.5.6", + "@apollo/federation-internals": "2.5.7", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -14856,13 +14901,13 @@ } }, "@apollo/query-planner": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.5.6.tgz", - "integrity": "sha512-7qrQl4/s1FOK0TZaa+0WwL17Us9Oy1I8bfpfjf+3xp8NtgOnFijXzJ32IOdjhW+mkt5EC4LrkBUWvygCULuMyQ==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.5.7.tgz", + "integrity": "sha512-WQ6UZNkd52M1OT+K1/OdfK/+8ktgj+KVr97QRm91eoydHldyG6oBuxC/1zdTKPY8wzL1ku6xNwRiAMUNe5cNZg==", "dev": true, "requires": { - "@apollo/federation-internals": "2.5.6", - "@apollo/query-graphs": "2.5.6", + "@apollo/federation-internals": "2.5.7", + "@apollo/query-graphs": "2.5.7", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", @@ -14981,13 +15026,13 @@ } }, "@apollo/subgraph": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@apollo/subgraph/-/subgraph-2.5.6.tgz", - "integrity": "sha512-Swn0+M32Xr7HHippE0zJU/1vfCZDfM86Yir199jdUEYH4/9tqmx+OSq3QSCaSwiPJnzJlGgVmZhDCcqG90pDUA==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@apollo/subgraph/-/subgraph-2.5.7.tgz", + "integrity": "sha512-XEpawcRL7JEmUbJsFOgFYsUDbsA+392kexch9EIlZWfc1afZmhLjzPOIAgn+KO9ohwOLkkmRjczehDwzQgYFkA==", "dev": true, "requires": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.5.6" + "@apollo/federation-internals": "2.5.7" } }, "@apollo/usage-reporting-protobuf": { @@ -18659,9 +18704,9 @@ "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==" }, "@types/superagent": { - "version": "4.1.21", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.21.tgz", - "integrity": "sha512-yrbAccEEY9+BSa1wji3ry8R3/BdW9kyWnjkRKctrtw5ebn/k2a2CsMeaQ7dD4iLfomgHkomBVIVgOFRMV4XYHA==", + "version": "4.1.22", + "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.22.tgz", + "integrity": "sha512-GMaOrnnUsjChvH8zlzdDPARRXky8bU3E8xsU/fOclgqsINekbwDu1+wzJzJaGzZP91SGpOutf5Te5pm5M/qCWg==", "dev": true, "requires": { "@types/cookiejar": "*", @@ -19437,10 +19482,13 @@ } }, "call-bind": { - "version": "1.0.2", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" } }, "callsites": { @@ -20139,15 +20187,15 @@ "requires": {} }, "deep-equal": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz", - "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", + "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", "dev": true, "requires": { "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-get-iterator": "^1.1.3", - "get-intrinsic": "^1.2.1", + "get-intrinsic": "^1.2.2", "is-arguments": "^1.1.1", "is-array-buffer": "^3.0.2", "is-date-object": "^1.0.5", @@ -20157,11 +20205,11 @@ "object-is": "^1.1.5", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", + "regexp.prototype.flags": "^1.5.1", "side-channel": "^1.0.4", "which-boxed-primitive": "^1.0.2", "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.13" } }, "deep-is": { @@ -20180,6 +20228,16 @@ "clone": "^1.0.2" } }, + "define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "requires": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "define-properties": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", @@ -21284,14 +21342,14 @@ "version": "2.0.5" }, "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "get-package-type": { @@ -21383,7 +21441,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "requires": { "get-intrinsic": "^1.1.3" } @@ -21499,6 +21556,7 @@ }, "has": { "version": "1.0.3", + "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -21520,7 +21578,6 @@ }, "has-property-descriptors": { "version": "1.0.0", - "dev": true, "requires": { "get-intrinsic": "^1.1.1" } @@ -23745,9 +23802,9 @@ "dev": true }, "prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", + "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true }, "prettier-2": { @@ -24004,14 +24061,14 @@ "dev": true }, "regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" } }, "relay-runtime": { @@ -24284,6 +24341,28 @@ "version": "2.0.0", "dev": true }, + "set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "requires": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, + "set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "requires": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + } + }, "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -25415,13 +25494,13 @@ } }, "which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dev": true, "requires": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" diff --git a/package.json b/package.json index 634eb3684ff..b168960086b 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ }, "devDependencies": { "@apollo/client": "3.8.7", - "@apollo/gateway": "2.5.6", - "@apollo/subgraph": "2.5.6", + "@apollo/gateway": "2.5.7", + "@apollo/subgraph": "2.5.7", "@apollo/utils.createhash": "2.0.1", "@changesets/changelog-github": "0.4.8", "@changesets/cli": "2.26.2", @@ -63,7 +63,7 @@ "@types/node-fetch": "2.6.9", "@types/qs-middleware": "1.0.4", "@types/retry": "0.12.5", - "@types/superagent": "4.1.21", + "@types/superagent": "4.1.22", "@types/supertest": "2.0.16", "@types/test-listen": "1.1.2", "@types/type-is": "1.6.6", @@ -92,7 +92,7 @@ "lodash.sumby": "4.6.0", "nock": "13.3.8", "node-fetch": "2.7.0", - "prettier": "3.0.3", + "prettier": "3.1.0", "prettier-2": "npm:prettier@2.8.8", "qs-middleware": "1.0.3", "requisition": "1.7.0", @@ -109,6 +109,6 @@ }, "volta": { "node": "18.18.2", - "npm": "9.9.1" + "npm": "9.9.2" } } diff --git a/packages/server/src/ApolloServer.ts b/packages/server/src/ApolloServer.ts index 9455652e21f..4ed6eee4566 100644 --- a/packages/server/src/ApolloServer.ts +++ b/packages/server/src/ApolloServer.ts @@ -329,9 +329,9 @@ export class ApolloServer { config.csrfPrevention === true || config.csrfPrevention === undefined ? recommendedCsrfPreventionRequestHeaders : config.csrfPrevention === false - ? null - : config.csrfPrevention.requestHeaders ?? - recommendedCsrfPreventionRequestHeaders, + ? null + : config.csrfPrevention.requestHeaders ?? + recommendedCsrfPreventionRequestHeaders, status400ForVariableCoercionErrors: config.status400ForVariableCoercionErrors ?? false, __testing_incrementalExecutionResults: diff --git a/packages/server/src/plugin/landingPage/default/index.ts b/packages/server/src/plugin/landingPage/default/index.ts index 38522a9a177..f36fafdfe31 100644 --- a/packages/server/src/plugin/landingPage/default/index.ts +++ b/packages/server/src/plugin/landingPage/default/index.ts @@ -194,18 +194,18 @@ function ApolloServerPluginLandingPageDefault( nonce, ) : !('graphRef' in config) - ? getEmbeddedSandboxHTML( - sandboxVersion, - config, - apolloServerVersion, - nonce, - ) - : getNonEmbeddedLandingPageHTML( - apolloServerLandingPageVersion, - config, - apolloServerVersion, - nonce, - ) + ? getEmbeddedSandboxHTML( + sandboxVersion, + config, + apolloServerVersion, + nonce, + ) + : getNonEmbeddedLandingPageHTML( + apolloServerLandingPageVersion, + config, + apolloServerVersion, + nonce, + ) : getNonEmbeddedLandingPageHTML( apolloServerLandingPageVersion, config, diff --git a/packages/server/src/plugin/usageReporting/durationHistogram.ts b/packages/server/src/plugin/usageReporting/durationHistogram.ts index 52e46bb83d7..7d0231195ed 100644 --- a/packages/server/src/plugin/usageReporting/durationHistogram.ts +++ b/packages/server/src/plugin/usageReporting/durationHistogram.ts @@ -41,8 +41,8 @@ export class DurationHistogram { return unboundedBucket <= 0 || Number.isNaN(unboundedBucket) ? 0 : unboundedBucket >= DurationHistogram.BUCKET_COUNT - ? DurationHistogram.BUCKET_COUNT - 1 - : unboundedBucket; + ? DurationHistogram.BUCKET_COUNT - 1 + : unboundedBucket; } incrementDuration(durationNs: number, value = 1): DurationHistogram { diff --git a/packages/server/src/plugin/usageReporting/plugin.ts b/packages/server/src/plugin/usageReporting/plugin.ts index 53f5c826667..76038036aca 100644 --- a/packages/server/src/plugin/usageReporting/plugin.ts +++ b/packages/server/src/plugin/usageReporting/plugin.ts @@ -65,8 +65,8 @@ export function ApolloServerPluginUsageReporting( ? 1 / fieldLevelInstrumentationOption : 0 : fieldLevelInstrumentationOption - ? fieldLevelInstrumentationOption - : async () => true; + ? fieldLevelInstrumentationOption + : async () => true; let requestDidStartHandler: | (( @@ -627,8 +627,8 @@ export function ApolloServerPluginUsageReporting( policyIfCacheable.scope === 'PRIVATE' ? Trace.CachePolicy.Scope.PRIVATE : policyIfCacheable.scope === 'PUBLIC' - ? Trace.CachePolicy.Scope.PUBLIC - : Trace.CachePolicy.Scope.UNKNOWN, + ? Trace.CachePolicy.Scope.PUBLIC + : Trace.CachePolicy.Scope.UNKNOWN, // Convert from seconds to ns. maxAgeNs: policyIfCacheable.maxAge * 1e9, });