diff --git a/libraries/fetch-utils/package.json b/libraries/fetch-utils/package.json index 3a4e5eaee7..a0ac42e756 100644 --- a/libraries/fetch-utils/package.json +++ b/libraries/fetch-utils/package.json @@ -27,7 +27,7 @@ "dependencies": { "@overleaf/o-error": "*", "lodash": "^4.17.21", - "node-fetch": "^2.6.11", + "node-fetch": "^2.7.0", "selfsigned": "^2.4.1" } } diff --git a/libraries/fetch-utils/test/unit/FetchUtilsTests.js b/libraries/fetch-utils/test/unit/FetchUtilsTests.js index f5a07af929..03c9fe8642 100644 --- a/libraries/fetch-utils/test/unit/FetchUtilsTests.js +++ b/libraries/fetch-utils/test/unit/FetchUtilsTests.js @@ -1,5 +1,5 @@ const { expect } = require('chai') -const { FetchError } = require('node-fetch') +const { FetchError, AbortError } = require('node-fetch') const { Readable } = require('stream') const { once } = require('events') const { TestServer } = require('./helpers/TestServer') @@ -15,8 +15,6 @@ const { CustomHttpsAgent, } = require('../..') -const abortErrorMessage = 'The user aborted a request' - const HTTP_PORT = 30001 const HTTPS_PORT = 30002 @@ -106,8 +104,11 @@ describe('fetch-utils', function () { it('supports abort signals', async function () { await expect( - fetchJson(this.url('/hang'), { signal: AbortSignal.timeout(10) }) - ).to.be.rejectedWith(abortErrorMessage) + abortOnceReceived( + signal => fetchJson(this.url('/hang'), { signal }), + this.server + ) + ).to.be.rejectedWith(AbortError) await expectRequestAborted(this.server.lastReq) }) @@ -148,7 +149,7 @@ describe('fetch-utils', function () { body: stream, }) stream.destroy() - await expect(promise).to.be.rejectedWith(abortErrorMessage) + await expect(promise).to.be.rejectedWith(AbortError) await wait(80) expect(this.server.lastReq).to.be.undefined }) @@ -162,7 +163,7 @@ describe('fetch-utils', function () { }) await once(this.server.events, 'request-received') stream.destroy() - await expect(promise).to.be.rejectedWith(abortErrorMessage) + await expect(promise).to.be.rejectedWith(AbortError) await expectRequestAborted(this.server.lastReq) }) @@ -175,20 +176,27 @@ describe('fetch-utils', function () { it('supports abort signals', async function () { await expect( - fetchStream(this.url('/hang'), { signal: AbortSignal.timeout(10) }) - ).to.be.rejectedWith(abortErrorMessage) + abortOnceReceived( + signal => fetchStream(this.url('/hang'), { signal }), + this.server + ) + ).to.be.rejectedWith(AbortError) await expectRequestAborted(this.server.lastReq) }) it('destroys the request body when an error occurs', async function () { const stream = Readable.from(infiniteIterator()) await expect( - fetchStream(this.url('/hang'), { - method: 'POST', - body: stream, - signal: AbortSignal.timeout(10), - }) - ).to.be.rejectedWith(abortErrorMessage) + abortOnceReceived( + signal => + fetchStream(this.url('/hang'), { + method: 'POST', + body: stream, + signal, + }), + this.server + ) + ).to.be.rejectedWith(AbortError) expect(stream.destroyed).to.be.true }) }) @@ -206,7 +214,7 @@ describe('fetch-utils', function () { body: stream, }) stream.destroy() - await expect(promise).to.be.rejectedWith(abortErrorMessage) + await expect(promise).to.be.rejectedWith(AbortError) expect(this.server.lastReq).to.be.undefined }) @@ -219,7 +227,7 @@ describe('fetch-utils', function () { }) await once(this.server.events, 'request-received') stream.destroy() - await expect(promise).to.be.rejectedWith(abortErrorMessage) + await expect(promise).to.be.rejectedWith(AbortError) await wait(80) await expectRequestAborted(this.server.lastReq) }) @@ -238,20 +246,27 @@ describe('fetch-utils', function () { it('supports abort signals', async function () { await expect( - fetchNothing(this.url('/hang'), { signal: AbortSignal.timeout(10) }) - ).to.be.rejectedWith(abortErrorMessage) + abortOnceReceived( + signal => fetchNothing(this.url('/hang'), { signal }), + this.server + ) + ).to.be.rejectedWith(AbortError) await expectRequestAborted(this.server.lastReq) }) it('destroys the request body when an error occurs', async function () { const stream = Readable.from(infiniteIterator()) await expect( - fetchNothing(this.url('/hang'), { - method: 'POST', - body: stream, - signal: AbortSignal.timeout(10), - }) - ).to.be.rejectedWith(abortErrorMessage) + abortOnceReceived( + signal => + fetchNothing(this.url('/hang'), { + method: 'POST', + body: stream, + signal, + }), + this.server + ) + ).to.be.rejectedWith(AbortError) expect(stream.destroyed).to.be.true }) }) @@ -365,6 +380,18 @@ async function* infiniteIterator() { } } +/** + * @param {(signal: AbortSignal) => Promise} func + * @param {TestServer} server + */ +async function abortOnceReceived(func, server) { + const controller = new AbortController() + const promise = func(controller.signal) + await once(server.events, 'request-received') + controller.abort() + return await promise +} + async function expectRequestAborted(req) { if (!req.destroyed) { try { @@ -376,8 +403,8 @@ async function expectRequestAborted(req) { throw err } } - expect(req.destroyed).to.be.true } + expect(req.destroyed).to.be.true } const wait = ms => new Promise(resolve => setTimeout(resolve, ms)) diff --git a/libraries/fetch-utils/test/unit/helpers/TestServer.js b/libraries/fetch-utils/test/unit/helpers/TestServer.js index 56dc94b566..094664d061 100644 --- a/libraries/fetch-utils/test/unit/helpers/TestServer.js +++ b/libraries/fetch-utils/test/unit/helpers/TestServer.js @@ -12,6 +12,7 @@ class TestServer { this.app.use(bodyParser.json()) this.app.use((req, res, next) => { + this.events.emit('request-received') this.lastReq = req next() }) @@ -40,7 +41,6 @@ class TestServer { }) this.app.post('/sink', (req, res) => { - this.events.emit('request-received') req.on('data', () => {}) req.on('end', () => { res.status(204).end() diff --git a/package-lock.json b/package-lock.json index a0583ed4e8..fa30a51c95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,7 +63,7 @@ "bluebird": "^3.5.3", "glob": "^7.1.3", "googleapis": "^118.0.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "overleaf-editor-core": "*", "swagger-client": "^3.8.24", "tmp": "0.0.33" @@ -165,7 +165,7 @@ "dependencies": { "@overleaf/o-error": "*", "lodash": "^4.17.21", - "node-fetch": "^2.6.11", + "node-fetch": "^2.7.0", "selfsigned": "^2.4.1" }, "devDependencies": { @@ -178,44 +178,6 @@ "typescript": "^5.0.4" } }, - "libraries/fetch-utils/node_modules/node-fetch": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", - "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "libraries/fetch-utils/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "libraries/fetch-utils/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "libraries/fetch-utils/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "libraries/logger": { "name": "@overleaf/logger", "version": "3.1.1", @@ -5043,44 +5005,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/@google-cloud/logging-bunyan/node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/@google-cloud/logging-bunyan/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/@google-cloud/logging-bunyan/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/@google-cloud/logging-bunyan/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/@google-cloud/logging-bunyan/node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -5476,25 +5400,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/@google-cloud/logging/node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/@google-cloud/logging/node_modules/retry-request": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz", @@ -5523,11 +5428,6 @@ "node": ">=14" } }, - "node_modules/@google-cloud/logging/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "node_modules/@google-cloud/logging/node_modules/uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", @@ -5540,20 +5440,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/@google-cloud/logging/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/@google-cloud/logging/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/@google-cloud/opentelemetry-cloud-trace-exporter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@google-cloud/opentelemetry-cloud-trace-exporter/-/opentelemetry-cloud-trace-exporter-2.1.0.tgz", @@ -5794,25 +5680,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/@google-cloud/profiler/node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/@google-cloud/profiler/node_modules/retry-request": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-6.0.0.tgz", @@ -5854,11 +5721,6 @@ "node": ">=14" } }, - "node_modules/@google-cloud/profiler/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "node_modules/@google-cloud/profiler/node_modules/uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", @@ -5871,20 +5733,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/@google-cloud/profiler/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/@google-cloud/profiler/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/@google-cloud/profiler/node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -18396,11 +18244,11 @@ "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" }, "node_modules/cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", + "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", "dependencies": { - "node-fetch": "2.6.7" + "node-fetch": "^2.6.12" } }, "node_modules/cross-spawn": { @@ -24064,25 +23912,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/google-gax/node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/google-gax/node_modules/object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", @@ -24176,11 +24005,6 @@ "node": ">= 6" } }, - "node_modules/google-gax/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "node_modules/google-gax/node_modules/uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", @@ -24193,20 +24017,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/google-gax/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/google-gax/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/google-p12-pem": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.3.tgz", @@ -30250,9 +30060,9 @@ } }, "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -41829,7 +41639,7 @@ "chai-as-promised": "^7.1.1", "mocha": "^10.2.0", "mock-fs": "^5.1.2", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "sandboxed-module": "^2.0.4", "sinon": "~9.0.1", "sinon-chai": "^3.7.0", @@ -42147,7 +41957,7 @@ "express": "^4.21.0", "glob": "^7.1.6", "lodash.once": "^4.1.1", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "range-parser": "^1.2.1", "tiny-async-pool": "^1.1.0" }, @@ -42378,7 +42188,7 @@ "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "mocha": "^10.2.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "sinon": "^9.0.2", "swagger-client": "^3.10.0", "typescript": "^5.0.4", @@ -43855,7 +43665,7 @@ "minimatch": "^7.4.2", "minimist": "^1.2.8", "mongodb-legacy": "^6.0.1", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "p-limit": "^2.3.0" }, "devDependencies": { @@ -44133,7 +43943,7 @@ "mongoose": "8.5.3", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "nocache": "^2.1.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "nodemailer": "^6.7.0", "nodemailer-ses-transport": "^1.5.1", "on-headers": "^1.0.2", @@ -44312,7 +44122,6 @@ "mocha": "^10.2.0", "mocha-each": "^2.0.1", "mock-fs": "^5.1.2", - "node-fetch": "^2.6.7", "nvd3": "^1.8.6", "overleaf-editor-core": "*", "pdfjs-dist213": "npm:pdfjs-dist@2.13.216", @@ -48935,14 +48744,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, "retry-request": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz", @@ -48965,29 +48766,10 @@ "uuid": "^9.0.0" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } } } }, @@ -49081,33 +48863,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -49477,14 +49232,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, "retry-request": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-6.0.0.tgz", @@ -49514,30 +49261,11 @@ "uuid": "^9.0.0" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==" }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -51600,7 +51328,7 @@ "lodash": "^4.17.21", "mocha": "^10.2.0", "mock-fs": "^5.1.2", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "p-limit": "^3.1.0", "request": "^2.88.2", "sandboxed-module": "^2.0.4", @@ -51893,38 +51621,9 @@ "express": "^4.21.0", "lodash": "^4.17.21", "mocha": "^10.2.0", - "node-fetch": "^2.6.11", + "node-fetch": "^2.7.0", "selfsigned": "^2.4.1", "typescript": "^5.0.4" - }, - "dependencies": { - "node-fetch": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", - "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - } } }, "@overleaf/filestore": { @@ -51948,7 +51647,7 @@ "lodash.once": "^4.1.1", "mocha": "^10.2.0", "mongodb": "^6.1.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "range-parser": "^1.2.1", "sandboxed-module": "2.0.4", "sinon": "9.0.2", @@ -52582,7 +52281,7 @@ "minimist": "^1.2.8", "mocha": "^10.2.0", "mongodb-legacy": "^6.0.1", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "p-limit": "^2.3.0", "sandboxed-module": "^2.0.4", "sinon": "9.0.1", @@ -52964,7 +52663,7 @@ "mongoose": "8.5.3", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "nocache": "^2.1.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "nodemailer": "^6.7.0", "nodemailer-ses-transport": "^1.5.1", "nvd3": "^1.8.6", @@ -61674,11 +61373,11 @@ } }, "cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", + "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", "requires": { - "node-fetch": "2.6.7" + "node-fetch": "^2.6.12" } }, "cross-spawn": { @@ -65948,14 +65647,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, "object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", @@ -66029,29 +65720,10 @@ } } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } } } }, @@ -70779,7 +70451,7 @@ "bluebird": "^3.5.3", "glob": "^7.1.3", "googleapis": "^118.0.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "overleaf-editor-core": "*", "swagger-client": "^3.8.24", "tmp": "0.0.33" @@ -71333,9 +71005,9 @@ "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==" }, "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "requires": { "whatwg-url": "^5.0.0" }, @@ -71993,7 +71665,7 @@ "lodash": "^4.17.19", "mocha": "^10.2.0", "mongodb": "^6.2.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "overleaf-editor-core": "*", "pg": "^8.7.1", "sinon": "^9.0.2", diff --git a/patches/node-fetch+2.6.7.patch b/patches/node-fetch+2.7.0.patch similarity index 66% rename from patches/node-fetch+2.6.7.patch rename to patches/node-fetch+2.7.0.patch index 87077262aa..49d075252e 100644 --- a/patches/node-fetch+2.6.7.patch +++ b/patches/node-fetch+2.7.0.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/node-fetch/lib/index.js b/node_modules/node-fetch/lib/index.js -index e5b04f1..8c80924 100644 +index 567ff5d..8eb45f7 100644 --- a/node_modules/node-fetch/lib/index.js +++ b/node_modules/node-fetch/lib/index.js @@ -545,8 +545,8 @@ function clone(instance) { @@ -30,47 +30,47 @@ index e5b04f1..8c80924 100644 } } -@@ -1594,7 +1594,7 @@ function fetch(url, opts) { +@@ -1638,7 +1638,7 @@ function fetch(url, opts) { res.once('end', function () { if (signal) signal.removeEventListener('abort', abortAndFinalize); }); - let body = res.pipe(new PassThrough$1()); -+ let body = new PassThrough$1(); setTimeout(() => Stream.pipeline(res, body, (err) => { if (err) req.abort() }), 0); // Note: let the call-site attach event handler to "body" before we start streaming. ++ let body = Stream.pipeline(res, new PassThrough(), error => { if (error) reject(error); }); const response_options = { url: request.url, -@@ -1635,7 +1635,7 @@ function fetch(url, opts) { +@@ -1679,7 +1679,7 @@ function fetch(url, opts) { // for gzip if (codings == 'gzip' || codings == 'x-gzip') { - body = body.pipe(zlib.createGunzip(zlibOptions)); -+ const bodyGzip = zlib.createGunzip(zlibOptions); Stream.pipeline(body, bodyGzip, () => {}); body = bodyGzip; ++ body = Stream.pipeline(body, zlib.createGunzip(zlibOptions), error => { if (error) reject(error); }); response = new Response(body, response_options); resolve(response); return; -@@ -1645,13 +1645,13 @@ function fetch(url, opts) { +@@ -1689,13 +1689,13 @@ function fetch(url, opts) { if (codings == 'deflate' || codings == 'x-deflate') { // handle the infamous raw deflate response from old servers // a hack for old IIS and Apache servers - const raw = res.pipe(new PassThrough$1()); -+ const raw = new PassThrough$1(); setTimeout(() => Stream.pipeline(res, raw, () => {}), 0); // Note: delay piping into "raw" until we start piping into "body". ++ const raw = Stream.pipeline(res, new PassThrough(), error => { if (error) reject(error); }); raw.once('data', function (chunk) { // see http://stackoverflow.com/questions/37519828 if ((chunk[0] & 0x0F) === 0x08) { - body = body.pipe(zlib.createInflate()); -+ const bodyDeflate = zlib.createInflate(); Stream.pipeline(body, bodyDeflate, () => {}); body = bodyDeflate; ++ body = Stream.pipeline(body, zlib.createInflate(), error => { if (error) reject(error); }); } else { - body = body.pipe(zlib.createInflateRaw()); -+ const bodyDeflate = zlib.createInflateRaw(); Stream.pipeline(body, bodyDeflate, () => {}); body = bodyDeflate; ++ body = Stream.pipeline(body, zlib.createInflateRaw(), error => { if (error) reject(error); }); } response = new Response(body, response_options); resolve(response); -@@ -1661,7 +1661,7 @@ function fetch(url, opts) { +@@ -1712,7 +1712,7 @@ function fetch(url, opts) { // for br if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') { - body = body.pipe(zlib.createBrotliDecompress()); -+ const bodyBrotli = zlib.createBrotliDecompress(); Stream.pipeline(body, bodyBrotli, () => {}); body = bodyBrotli; ++ body = Stream.pipeline(body, zlib.createBrotliDecompress(), error => { if (error) reject(error); }); response = new Response(body, response_options); resolve(response); return; diff --git a/services/clsi/package.json b/services/clsi/package.json index 9e9bbea939..8df44c7150 100644 --- a/services/clsi/package.json +++ b/services/clsi/package.json @@ -42,7 +42,7 @@ "chai-as-promised": "^7.1.1", "mocha": "^10.2.0", "mock-fs": "^5.1.2", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "sandboxed-module": "^2.0.4", "sinon": "~9.0.1", "sinon-chai": "^3.7.0", diff --git a/services/filestore/package.json b/services/filestore/package.json index b8b0b8af9d..e680f54b2b 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -30,7 +30,7 @@ "express": "^4.21.0", "glob": "^7.1.6", "lodash.once": "^4.1.1", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "range-parser": "^1.2.1", "tiny-async-pool": "^1.1.0" }, diff --git a/services/history-v1/package.json b/services/history-v1/package.json index 6e890d06c0..68c3dfd8aa 100644 --- a/services/history-v1/package.json +++ b/services/history-v1/package.json @@ -43,7 +43,7 @@ "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "mocha": "^10.2.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "sinon": "^9.0.2", "swagger-client": "^3.10.0", "typescript": "^5.0.4", diff --git a/services/web/package.json b/services/web/package.json index fd2b9b2ff1..6d4ac29db1 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -141,7 +141,7 @@ "mongoose": "8.5.3", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "nocache": "^2.1.0", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "nodemailer": "^6.7.0", "nodemailer-ses-transport": "^1.5.1", "on-headers": "^1.0.2", @@ -320,7 +320,6 @@ "mocha": "^10.2.0", "mocha-each": "^2.0.1", "mock-fs": "^5.1.2", - "node-fetch": "^2.6.7", "nvd3": "^1.8.6", "overleaf-editor-core": "*", "pdfjs-dist213": "npm:pdfjs-dist@2.13.216", diff --git a/services/web/scripts/translations/package-lock.json b/services/web/scripts/translations/package-lock.json index 11408551e3..24a21a1165 100644 --- a/services/web/scripts/translations/package-lock.json +++ b/services/web/scripts/translations/package-lock.json @@ -6,8 +6,8 @@ "": { "dependencies": { "@brainly/onesky-utils": "https://github.com/overleaf/nodejs-onesky-utils/archive/main.tar.gz", - "node-fetch": "^2.6.7", - "sanitize-html": "^2.7.0", + "node-fetch": "^2.7.0", + "sanitize-html": "^2.12.1", "yargs": "^17.7.2" } }, @@ -524,9 +524,9 @@ } }, "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -1291,9 +1291,9 @@ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" }, "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "requires": { "whatwg-url": "^5.0.0" } diff --git a/services/web/scripts/translations/package.json b/services/web/scripts/translations/package.json index d420550e22..82176ed7d6 100644 --- a/services/web/scripts/translations/package.json +++ b/services/web/scripts/translations/package.json @@ -1,7 +1,7 @@ { "dependencies": { "@brainly/onesky-utils": "https://github.com/overleaf/nodejs-onesky-utils/archive/main.tar.gz", - "node-fetch": "^2.6.7", + "node-fetch": "^2.7.0", "sanitize-html": "^2.12.1", "yargs": "^17.7.2" }