diff --git a/package-lock.json b/package-lock.json index 6f07b5fed5..9346ab1162 100644 --- a/package-lock.json +++ b/package-lock.json @@ -94,7 +94,7 @@ "mock-mail-adapter": "file:spec/dependencies/mock-mail-adapter", "mongodb-runner": "5.9.3", "node-abort-controller": "3.1.1", - "node-fetch": "3.2.10", + "node-fetch": "3.3.2", "nyc": "17.1.0", "prettier": "3.8.1", "semantic-release": "25.0.3", @@ -13248,26 +13248,6 @@ "node": ">=16 || 14 >=14.17" } }, - "node_modules/gcp-metadata/node_modules/node-fetch": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", - "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, "node_modules/gcp-metadata/node_modules/rimraf": { "version": "5.0.10", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", @@ -13607,24 +13587,6 @@ "node": ">=18" } }, - "node_modules/google-auth-library/node_modules/node-fetch": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", - "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", - "license": "MIT", - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, "node_modules/google-gax": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-4.6.1.tgz", @@ -17038,10 +17000,10 @@ } }, "node_modules/node-fetch": { - "version": "3.2.10", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.10.tgz", - "integrity": "sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA==", - "dev": true, + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", + "license": "MIT", "dependencies": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", @@ -35898,18 +35860,6 @@ "optional": true, "peer": true }, - "node-fetch": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", - "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", - "optional": true, - "peer": true, - "requires": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - } - }, "rimraf": { "version": "5.0.10", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", @@ -36155,16 +36105,6 @@ "google-logging-utils": "^1.0.0", "json-bigint": "^1.0.0" } - }, - "node-fetch": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", - "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", - "requires": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - } } } }, @@ -38559,10 +38499,9 @@ } }, "node-fetch": { - "version": "3.2.10", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.10.tgz", - "integrity": "sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA==", - "dev": true, + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", "requires": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", diff --git a/package.json b/package.json index e829f6b025..2ab803928a 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "mock-mail-adapter": "file:spec/dependencies/mock-mail-adapter", "mongodb-runner": "5.9.3", "node-abort-controller": "3.1.1", - "node-fetch": "3.2.10", + "node-fetch": "3.3.2", "nyc": "17.1.0", "prettier": "3.8.1", "semantic-release": "25.0.3", diff --git a/spec/GraphQLQueryComplexity.spec.js b/spec/GraphQLQueryComplexity.spec.js index 324634e278..def95a6b51 100644 --- a/spec/GraphQLQueryComplexity.spec.js +++ b/spec/GraphQLQueryComplexity.spec.js @@ -2,7 +2,11 @@ const http = require('http'); const express = require('express'); -const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args)); +const fetch = (...args) => + import('node-fetch').then(({ default: fetch }) => { + const [url, options = {}] = args; + return fetch(url, { agent: new http.Agent({ keepAlive: false }), ...options }); + }); require('./helper'); const { ParseGraphQLServer } = require('../lib/GraphQL/ParseGraphQLServer'); diff --git a/spec/ParseGraphQLServer.spec.js b/spec/ParseGraphQLServer.spec.js index e36067afae..07bcd4efdf 100644 --- a/spec/ParseGraphQLServer.spec.js +++ b/spec/ParseGraphQLServer.spec.js @@ -1,7 +1,11 @@ const http = require('http'); const express = require('express'); const req = require('../lib/request'); -const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args)); +const fetch = (...args) => + import('node-fetch').then(({ default: fetch }) => { + const [url, options = {}] = args; + return fetch(url, { agent: new http.Agent({ keepAlive: false }), ...options }); + }); const FormData = require('form-data'); require('./helper'); const { updateCLP } = require('./support/dev'); diff --git a/spec/vulnerabilities.spec.js b/spec/vulnerabilities.spec.js index 105333fd0e..e41e4f9120 100644 --- a/spec/vulnerabilities.spec.js +++ b/spec/vulnerabilities.spec.js @@ -1,6 +1,10 @@ const http = require('http'); const express = require('express'); -const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args)); +const fetch = (...args) => + import('node-fetch').then(({ default: fetch }) => { + const [url, options = {}] = args; + return fetch(url, { agent: new http.Agent({ keepAlive: false }), ...options }); + }); const ws = require('ws'); const request = require('../lib/request'); const Config = require('../lib/Config');