From 2e935eb360530a4aa71b040f21cf5a2ae0d3fb18 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Wed, 28 Feb 2024 11:17:03 +0000 Subject: [PATCH] Merge pull request #17285 from overleaf/ae-nock Upgrade Polly.JS and nock GitOrigin-RevId: 508061bce503b8a84e7904caec16ed6b60e089d5 --- package-lock.json | 733 +++++++++----------------- services/project-history/package.json | 2 +- services/web/package.json | 8 +- 3 files changed, 260 insertions(+), 483 deletions(-) diff --git a/package-lock.json b/package-lock.json index 35a98c0544..d39b35c675 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6897,66 +6897,14 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@maxmind/geoip2-node": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/@maxmind/geoip2-node/-/geoip2-node-3.4.0.tgz", - "integrity": "sha512-XBB+IJSXQRXXHBvwULZu2nOYAPuC0pc77xw/xkDo0cWkBO/L2rUMr+xKGZwj47mFBEiG6tnTMBzxJajEJTrKAg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@maxmind/geoip2-node/-/geoip2-node-5.0.0.tgz", + "integrity": "sha512-ki+q5//oU4tZ3BAhegZJcB5czoZyic5JSTEKbrUAQB/BzAoAiGyLW0immEmQvVVyy2SMlvBTJ3zqyRj8K9BbwQ==", "dependencies": { - "camelcase-keys": "^7.0.0", "ip6addr": "^0.2.5", - "lodash.set": "^4.3.2", "maxmind": "^4.2.0" } }, - "node_modules/@maxmind/geoip2-node/node_modules/camelcase-keys": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz", - "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==", - "dependencies": { - "camelcase": "^6.3.0", - "map-obj": "^4.1.0", - "quick-lru": "^5.1.1", - "type-fest": "^1.2.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@maxmind/geoip2-node/node_modules/map-obj": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", - "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@maxmind/geoip2-node/node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@maxmind/geoip2-node/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@mdx-js/react": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz", @@ -8884,146 +8832,101 @@ } }, "node_modules/@pollyjs/adapter": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/adapter/-/adapter-4.3.0.tgz", - "integrity": "sha512-8/kELw/esDY+Mi6xiYRSX3EHKoVmPeqjRYk7DHFbHhXoMs6ENrPS0ay8Ajl0KHppAnutTk4YLqaI/3VqFCR5iw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/adapter/-/adapter-6.0.6.tgz", + "integrity": "sha512-szhys0NiFQqCJDMC0kpDyjhLqSI7aWc6m6iATCRKgcMcN/7QN85pb3GmRzvnNV8+/Bi2AUSCwxZljcsKhbYVWQ==", "dev": true, "dependencies": { - "@pollyjs/utils": "^4.3.0" + "@pollyjs/utils": "^6.0.6" } }, "node_modules/@pollyjs/adapter-node-http": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/adapter-node-http/-/adapter-node-http-4.3.0.tgz", - "integrity": "sha512-13LC4/9a6rv8Av0qMM2k+MhVm9Txxai8aLZQabX0XTbnY9e+4yxeIdBC96HAgzmHqWlq30r8Tkgypu3agiKA9w==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/adapter-node-http/-/adapter-node-http-6.0.6.tgz", + "integrity": "sha512-jdJG7oncmSHZAtVMmRgOxh5A56b7G8H9ULlk/ZaVJ+jNrlFXhLmPpx8OQoSF4Cuq2ugdiWmwmAjFXHStcpY3Mw==", "dev": true, "dependencies": { - "@pollyjs/adapter": "^4.3.0", - "@pollyjs/utils": "^4.3.0", - "lodash-es": "^4.17.11", - "nock": "^12.0.3" - } - }, - "node_modules/@pollyjs/adapter-node-http/node_modules/nock": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-12.0.3.tgz", - "integrity": "sha512-QNb/j8kbFnKCiyqi9C5DD0jH/FubFGj5rt9NQFONXwQm3IPB0CULECg/eS3AU1KgZb/6SwUa4/DTRKhVxkGABw==", - "dev": true, - "dependencies": { - "debug": "^4.1.0", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.13", - "propagate": "^2.0.0" - }, - "engines": { - "node": ">= 10.13" - } - }, - "node_modules/@pollyjs/adapter-node-http/node_modules/propagate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", - "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", - "dev": true, - "engines": { - "node": ">= 8" + "@pollyjs/adapter": "^6.0.6", + "@pollyjs/utils": "^6.0.6", + "lodash-es": "^4.17.21", + "nock": "^13.2.1" } }, "node_modules/@pollyjs/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/core/-/core-4.3.0.tgz", - "integrity": "sha512-8Fs0Lg19P39oO/GvzWoC/fkckrCSx9rL5DPmU4Ez/Q+WXnDzmWtHI1x/jmD+jv5JLc2ig/ueWugIpE0f9eZbAQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/core/-/core-6.0.6.tgz", + "integrity": "sha512-1ZZcmojW8iSFmvHGeLlvuudM3WiDV842FsVvtPAo3HoAYE6jCNveLHJ+X4qvonL4enj1SyTF3hXA107UkQFQrA==", "dev": true, "dependencies": { - "@pollyjs/utils": "^4.3.0", - "@sindresorhus/fnv1a": "^1.2.0", - "blueimp-md5": "^2.10.0", - "fast-json-stable-stringify": "^2.0.0", - "is-absolute-url": "^3.0.0", - "lodash-es": "^4.17.11", + "@pollyjs/utils": "^6.0.6", + "@sindresorhus/fnv1a": "^2.0.1", + "blueimp-md5": "^2.19.0", + "fast-json-stable-stringify": "^2.1.0", + "is-absolute-url": "^3.0.3", + "lodash-es": "^4.17.21", + "loglevel": "^1.8.0", "route-recognizer": "^0.3.4", - "slugify": "^1.3.4" + "slugify": "^1.6.3" } }, "node_modules/@pollyjs/node-server": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/node-server/-/node-server-4.3.0.tgz", - "integrity": "sha512-pGrX889RkJXleW7p1cMKJqEtuasABbosneU9VrHOUYOMlYnObIOTt5y/n3m0NMAh9SyyusgqC7yQ18/PnMCgfg==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/node-server/-/node-server-6.0.6.tgz", + "integrity": "sha512-nkP1+hdNoVOlrRz9R84haXVsaSmo8Xmq7uYK9GeUMSLQy4Fs55ZZ9o2KI6vRA8F6ZqJSbC31xxwwIoTkjyP7Vg==", "dev": true, "dependencies": { - "@pollyjs/utils": "^4.3.0", + "@pollyjs/utils": "^6.0.6", "body-parser": "^1.19.0", "cors": "^2.8.5", "express": "^4.17.1", - "fs-extra": "^8.0.1", - "http-graceful-shutdown": "^2.3.1", - "morgan": "^1.9.1", - "nocache": "^2.1.0" + "fs-extra": "^10.0.0", + "http-graceful-shutdown": "^3.1.5", + "morgan": "^1.10.0", + "nocache": "^3.0.1" } }, - "node_modules/@pollyjs/node-server/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/@pollyjs/node-server/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@pollyjs/node-server/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "node_modules/@pollyjs/node-server/node_modules/nocache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/nocache/-/nocache-3.0.4.tgz", + "integrity": "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw==", "dev": true, "engines": { - "node": ">= 4.0.0" + "node": ">=12.0.0" } }, "node_modules/@pollyjs/persister": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/persister/-/persister-4.3.0.tgz", - "integrity": "sha512-oKTl++rZdT/5tMoeHMsgUAHjnRf/4qLNv7kc7u8ddldjgZ4eDAIWlG6BwFkhDxjhV+ofVlnLxFnRjmK4qrrmqA==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/persister/-/persister-6.0.6.tgz", + "integrity": "sha512-9KB1p+frvYvFGur4ifzLnFKFLXAMXrhAhCnVhTnkG2WIqqQPT7y+mKBV/DKCmYFx8GPA9FiNGqt2pB53uJpIdw==", "dev": true, "dependencies": { - "@pollyjs/utils": "^4.3.0", + "@pollyjs/utils": "^6.0.6", + "@types/set-cookie-parser": "^2.4.1", "bowser": "^2.4.0", - "fast-json-stable-stringify": "^2.0.0", - "lodash-es": "^4.17.11", - "set-cookie-parser": "^2.3.5", + "fast-json-stable-stringify": "^2.1.0", + "lodash-es": "^4.17.21", + "set-cookie-parser": "^2.4.8", "utf8-byte-length": "^1.0.4" } }, "node_modules/@pollyjs/persister-fs": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/persister-fs/-/persister-fs-4.3.0.tgz", - "integrity": "sha512-2DUIyl/3mr5F1Orq6bnpW6Witz2I8ulMGsqCFrlh4LaA4DlSg2SwOv88bbjzMCfqGP1CN3U5Zu8o7tZlFxkd8w==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/persister-fs/-/persister-fs-6.0.6.tgz", + "integrity": "sha512-/ALVgZiH2zGqwLkW0Mntc0Oq1v7tR8LS8JD2SAyIsHpnSXeBUnfPWwjAuYw0vqORHFVEbwned6MBRFfvU/3qng==", "dev": true, "dependencies": { - "@pollyjs/node-server": "^4.3.0", - "@pollyjs/persister": "^4.3.0" + "@pollyjs/node-server": "^6.0.6", + "@pollyjs/persister": "^6.0.6" } }, "node_modules/@pollyjs/utils": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/utils/-/utils-4.3.0.tgz", - "integrity": "sha512-8BYWtP4nK6mAlDgZQ8j2+EZjQH2beoHaHnZDyG7GdspOLeILtXhHLeAxp371YSKN387t7OEBS0nIQSMppHuTQg==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/utils/-/utils-6.0.6.tgz", + "integrity": "sha512-nhVJoI3nRgRimE0V2DVSvsXXNROUH6iyJbroDu4IdsOIOFC1Ds0w+ANMB4NMwFaqE+AisWOmXFzwAGdAfyiQVg==", "dev": true, "dependencies": { - "qs": "^6.7.0", - "url-parse": "^1.4.7" + "qs": "^6.10.1", + "url-parse": "^1.5.3" } }, "node_modules/@popperjs/core": { @@ -10176,12 +10079,12 @@ "dev": true }, "node_modules/@sindresorhus/fnv1a": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/fnv1a/-/fnv1a-1.2.0.tgz", - "integrity": "sha512-5ezb/dBSTWtKQ4sLQwMgOJyREXJcZZkTMbendMwKrXTghUhWjZhstzkkmt4/WkFy/GSTSGzfJOKU7dEXv3C/XQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@sindresorhus/fnv1a/-/fnv1a-2.0.1.tgz", + "integrity": "sha512-suq9tRQ6bkpMukTG5K5z0sPWB7t0zExMzZCdmYm6xTSSIm/yCKNm7VCL36wVeyTsFr597/UhU1OAYdHGMDiHrw==", "dev": true, "engines": { - "node": ">=6" + "node": ">=10" } }, "node_modules/@sinonjs/commons": { @@ -16154,6 +16057,15 @@ "@types/node": "*" } }, + "node_modules/@types/set-cookie-parser": { + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/@types/set-cookie-parser/-/set-cookie-parser-2.4.7.tgz", + "integrity": "sha512-+ge/loa0oTozxip6zmhRIk8Z/boU51wl9Q6QdLZcokIGMzY5lFXYy/x7Htj2HTC6/KZP1hUbZ1ekx8DYXICvWg==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/shimmer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.2.tgz", @@ -19138,6 +19050,7 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, "engines": { "node": ">=10" }, @@ -27305,17 +27218,40 @@ } }, "node_modules/http-graceful-shutdown": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-2.4.0.tgz", - "integrity": "sha512-Wj42gVFxJ/MJPQP5aC45FdsZpBiw3yw78MVfDmbPbPEZCJa5HqtRmc5cKTCBZ4emWZLptNg5p05zuYJlCa4lSA==", + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.13.tgz", + "integrity": "sha512-Ci5LRufQ8AtrQ1U26AevS8QoMXDOhnAHCJI3eZu1com7mZGHxREmw3dNj85ftpQokQCvak8nI2pnFS8zyM1M+Q==", "dev": true, "dependencies": { - "debug": "^4.1.1" + "debug": "^4.3.4" }, "engines": { "node": ">=4.0.0" } }, + "node_modules/http-graceful-shutdown/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/http-graceful-shutdown/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, "node_modules/http-parser-js": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz", @@ -30518,11 +30454,6 @@ "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" }, - "node_modules/lodash.set": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", - "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=" - }, "node_modules/lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -30674,6 +30605,19 @@ "node": ">=8" } }, + "node_modules/loglevel": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz", + "integrity": "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + }, + "funding": { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/loglevel" + } + }, "node_modules/long": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", @@ -31846,7 +31790,7 @@ "node_modules/morgan/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, "node_modules/mpath": { @@ -32121,15 +32065,17 @@ } }, "node_modules/nock": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/nock/-/nock-0.15.2.tgz", - "integrity": "sha1-PDLBrmASzTmOuSQKBZJEtZUI3Y0=", + "version": "13.5.3", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.3.tgz", + "integrity": "sha512-2NlGmHIK2rTeyy7UaY1ZNg0YZfEJMxghXgZi0b4DBsUyoDNTTxZeCSG1nmirAWF44RkkoV8NnegLVQijgVapNQ==", "dev": true, - "engines": [ - "node >= 0.4.10" - ], "dependencies": { - "propagate": "0.2.x" + "debug": "^4.1.0", + "json-stringify-safe": "^5.0.1", + "propagate": "^2.0.0" + }, + "engines": { + "node": ">= 10.13" } }, "node_modules/node-abort-controller": { @@ -35525,13 +35471,13 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/propagate": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-0.2.2.tgz", - "integrity": "sha1-F6EW0l2vIJRCbX1oRNJiMsnWkms=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", + "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", "dev": true, - "engines": [ - "node >= 0.8.1" - ] + "engines": { + "node": ">= 8" + } }, "node_modules/property-expr": { "version": "2.0.5", @@ -38466,9 +38412,9 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "node_modules/set-cookie-parser": { - "version": "2.4.8", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz", - "integrity": "sha512-edRH8mBKEWNVIVMKejNnuJxleqYE/ZSdcT8/Nem9/mmosx12pctd80s2Oy00KNZzrogMZS5mauK2/ymL1bvlvg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", + "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==", "dev": true }, "node_modules/set-function-length": { @@ -41508,7 +41454,7 @@ "node_modules/utf8-byte-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", - "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=", + "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==", "dev": true }, "node_modules/util": { @@ -43119,9 +43065,9 @@ "yargs": "^17.0.0" }, "devDependencies": { - "@pollyjs/adapter-node-http": "^4.0.3", - "@pollyjs/core": "^4.0.2", - "@pollyjs/persister-fs": "^4.0.2", + "@pollyjs/adapter-node-http": "^6.0.6", + "@pollyjs/core": "^6.0.6", + "@pollyjs/persister-fs": "^6.0.6", "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "mocha": "^10.2.0", @@ -43935,7 +43881,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@maxmind/geoip2-node": "^3.4.0", + "@maxmind/geoip2-node": "^5.0.0", "@overleaf/fetch-utils": "*", "@overleaf/logger": "*", "@overleaf/metrics": "*", @@ -45584,36 +45530,13 @@ "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "mocha": "^10.2.0", - "nock": "^12.0.3", + "nock": "^13.5.3", "sinon": "~9.0.1", "sinon-chai": "^3.7.0", "timekeeper": "2.2.0", "typescript": "^5.0.4" } }, - "services/project-history/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "services/project-history/node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "services/project-history/node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -45623,30 +45546,6 @@ "node": ">=0.3.1" } }, - "services/project-history/node_modules/nock": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-12.0.3.tgz", - "integrity": "sha512-QNb/j8kbFnKCiyqi9C5DD0jH/FubFGj5rt9NQFONXwQm3IPB0CULECg/eS3AU1KgZb/6SwUa4/DTRKhVxkGABw==", - "dev": true, - "dependencies": { - "debug": "^4.1.0", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.13", - "propagate": "^2.0.0" - }, - "engines": { - "node": ">= 10.13" - } - }, - "services/project-history/node_modules/propagate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", - "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "services/project-history/node_modules/sinon": { "version": "9.0.3", "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.0.3.tgz", @@ -45849,7 +45748,6 @@ "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "mocha": "^10.2.0", - "nock": "0.15.2", "sandboxed-module": "^2.0.4", "sinon": "9.0.1", "sinon-chai": "^3.7.0", @@ -46224,7 +46122,6 @@ "mongoose": "^6.12.0", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "nocache": "^2.1.0", - "nock": "^13.1.3", "node-fetch": "^2.6.7", "nodemailer": "^6.7.0", "nodemailer-ses-transport": "^1.5.1", @@ -46295,9 +46192,9 @@ "@overleaf/ranges-tracker": "*", "@overleaf/stream-utils": "*", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", - "@pollyjs/adapter-node-http": "^4.2.1", - "@pollyjs/core": "^4.2.1", - "@pollyjs/persister-fs": "^4.2.1", + "@pollyjs/adapter-node-http": "^6.0.6", + "@pollyjs/core": "^6.0.6", + "@pollyjs/persister-fs": "^6.0.6", "@reach/tabs": "^0.15.0", "@replit/codemirror-emacs": "overleaf/codemirror-emacs#4394c03858f27053f8768258e9493866e06e938e", "@replit/codemirror-indentation-markers": "overleaf/codemirror-indentation-markers#1b1f93c0bcd04293aea6986aa2275185b2c56803", @@ -46399,7 +46296,6 @@ "mocha": "^10.2.0", "mocha-each": "^2.0.1", "mock-fs": "^5.1.2", - "nock": "^13.1.1", "node-fetch": "^2.6.7", "nvd3": "^1.8.6", "pdfjs-dist213": "npm:pdfjs-dist@2.13.216", @@ -47527,21 +47423,6 @@ "isarray": "0.0.1" } }, - "services/web/node_modules/nock": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.2.2.tgz", - "integrity": "sha512-PcBHuvl9i6zfaJ50A7LS55oU+nFLv8htXIhffJO+FxyfibdZ4jEvd9kTuvkrJireBFIGMZ+oUIRpMK5gU9h//g==", - "dev": true, - "dependencies": { - "debug": "^4.1.0", - "json-stringify-safe": "^5.0.1", - "lodash.set": "^4.3.2", - "propagate": "^2.0.0" - }, - "engines": { - "node": ">= 10.13" - } - }, "services/web/node_modules/p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -47583,15 +47464,6 @@ "url": "https://opencollective.com/preact" } }, - "services/web/node_modules/propagate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", - "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "services/web/node_modules/retry-request": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz", @@ -52249,42 +52121,12 @@ } }, "@maxmind/geoip2-node": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/@maxmind/geoip2-node/-/geoip2-node-3.4.0.tgz", - "integrity": "sha512-XBB+IJSXQRXXHBvwULZu2nOYAPuC0pc77xw/xkDo0cWkBO/L2rUMr+xKGZwj47mFBEiG6tnTMBzxJajEJTrKAg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@maxmind/geoip2-node/-/geoip2-node-5.0.0.tgz", + "integrity": "sha512-ki+q5//oU4tZ3BAhegZJcB5czoZyic5JSTEKbrUAQB/BzAoAiGyLW0immEmQvVVyy2SMlvBTJ3zqyRj8K9BbwQ==", "requires": { - "camelcase-keys": "^7.0.0", "ip6addr": "^0.2.5", - "lodash.set": "^4.3.2", "maxmind": "^4.2.0" - }, - "dependencies": { - "camelcase-keys": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz", - "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==", - "requires": { - "camelcase": "^6.3.0", - "map-obj": "^4.1.0", - "quick-lru": "^5.1.1", - "type-fest": "^1.2.1" - } - }, - "map-obj": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", - "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==" - }, - "quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==" - }, - "type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==" - } } }, "@mdx-js/react": { @@ -53514,9 +53356,9 @@ "@overleaf/redis-wrapper": "*", "@overleaf/settings": "*", "@overleaf/stream-utils": "^0.1.0", - "@pollyjs/adapter-node-http": "^4.0.3", - "@pollyjs/core": "^4.0.2", - "@pollyjs/persister-fs": "^4.0.2", + "@pollyjs/adapter-node-http": "^6.0.6", + "@pollyjs/core": "^6.0.6", + "@pollyjs/persister-fs": "^6.0.6", "bluebird": "^3.7.2", "body-parser": "^1.19.0", "bull": "^3.18.0", @@ -54471,7 +54313,7 @@ "mocha": "^10.2.0", "mongo-uri": "^0.1.2", "mongodb-legacy": "^6.0.1", - "nock": "^12.0.3", + "nock": "^13.5.3", "overleaf-editor-core": "*", "redis": "~0.10.1", "request": "^2.88.2", @@ -54482,47 +54324,12 @@ "typescript": "^5.0.4" }, "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - }, - "dependencies": { - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, - "nock": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-12.0.3.tgz", - "integrity": "sha512-QNb/j8kbFnKCiyqi9C5DD0jH/FubFGj5rt9NQFONXwQm3IPB0CULECg/eS3AU1KgZb/6SwUa4/DTRKhVxkGABw==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.13", - "propagate": "^2.0.0" - } - }, - "propagate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", - "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", - "dev": true - }, "sinon": { "version": "9.0.3", "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.0.3.tgz", @@ -54788,7 +54595,6 @@ "minimist": "^1.2.8", "mocha": "^10.2.0", "mongodb-legacy": "^6.0.1", - "nock": "0.15.2", "node-fetch": "^2.6.7", "p-limit": "^2.3.0", "request": "^2.88.2", @@ -55033,9 +54839,9 @@ "@overleaf/settings": "*", "@overleaf/stream-utils": "*", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", - "@pollyjs/adapter-node-http": "^4.2.1", - "@pollyjs/core": "^4.2.1", - "@pollyjs/persister-fs": "^4.2.1", + "@pollyjs/adapter-node-http": "^6.0.6", + "@pollyjs/core": "^6.0.6", + "@pollyjs/persister-fs": "^6.0.6", "@reach/tabs": "^0.15.0", "@replit/codemirror-emacs": "overleaf/codemirror-emacs#4394c03858f27053f8768258e9493866e06e938e", "@replit/codemirror-indentation-markers": "overleaf/codemirror-indentation-markers#1b1f93c0bcd04293aea6986aa2275185b2c56803", @@ -55191,7 +54997,6 @@ "mongoose": "^6.12.0", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "nocache": "^2.1.0", - "nock": "^13.1.1", "node-fetch": "^2.6.7", "nodemailer": "^6.7.0", "nodemailer-ses-transport": "^1.5.1", @@ -56065,18 +55870,6 @@ } } }, - "nock": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.2.2.tgz", - "integrity": "sha512-PcBHuvl9i6zfaJ50A7LS55oU+nFLv8htXIhffJO+FxyfibdZ4jEvd9kTuvkrJireBFIGMZ+oUIRpMK5gU9h//g==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "json-stringify-safe": "^5.0.1", - "lodash.set": "^4.3.2", - "propagate": "^2.0.0" - } - }, "p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -56102,12 +55895,6 @@ "integrity": "sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==", "dev": true }, - "propagate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", - "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", - "dev": true - }, "retry-request": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz", @@ -56294,138 +56081,100 @@ } }, "@pollyjs/adapter": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/adapter/-/adapter-4.3.0.tgz", - "integrity": "sha512-8/kELw/esDY+Mi6xiYRSX3EHKoVmPeqjRYk7DHFbHhXoMs6ENrPS0ay8Ajl0KHppAnutTk4YLqaI/3VqFCR5iw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/adapter/-/adapter-6.0.6.tgz", + "integrity": "sha512-szhys0NiFQqCJDMC0kpDyjhLqSI7aWc6m6iATCRKgcMcN/7QN85pb3GmRzvnNV8+/Bi2AUSCwxZljcsKhbYVWQ==", "dev": true, "requires": { - "@pollyjs/utils": "^4.3.0" + "@pollyjs/utils": "^6.0.6" } }, "@pollyjs/adapter-node-http": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/adapter-node-http/-/adapter-node-http-4.3.0.tgz", - "integrity": "sha512-13LC4/9a6rv8Av0qMM2k+MhVm9Txxai8aLZQabX0XTbnY9e+4yxeIdBC96HAgzmHqWlq30r8Tkgypu3agiKA9w==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/adapter-node-http/-/adapter-node-http-6.0.6.tgz", + "integrity": "sha512-jdJG7oncmSHZAtVMmRgOxh5A56b7G8H9ULlk/ZaVJ+jNrlFXhLmPpx8OQoSF4Cuq2ugdiWmwmAjFXHStcpY3Mw==", "dev": true, "requires": { - "@pollyjs/adapter": "^4.3.0", - "@pollyjs/utils": "^4.3.0", - "lodash-es": "^4.17.11", - "nock": "^12.0.3" - }, - "dependencies": { - "nock": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-12.0.3.tgz", - "integrity": "sha512-QNb/j8kbFnKCiyqi9C5DD0jH/FubFGj5rt9NQFONXwQm3IPB0CULECg/eS3AU1KgZb/6SwUa4/DTRKhVxkGABw==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.13", - "propagate": "^2.0.0" - } - }, - "propagate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", - "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", - "dev": true - } + "@pollyjs/adapter": "^6.0.6", + "@pollyjs/utils": "^6.0.6", + "lodash-es": "^4.17.21", + "nock": "^13.2.1" } }, "@pollyjs/core": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/core/-/core-4.3.0.tgz", - "integrity": "sha512-8Fs0Lg19P39oO/GvzWoC/fkckrCSx9rL5DPmU4Ez/Q+WXnDzmWtHI1x/jmD+jv5JLc2ig/ueWugIpE0f9eZbAQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/core/-/core-6.0.6.tgz", + "integrity": "sha512-1ZZcmojW8iSFmvHGeLlvuudM3WiDV842FsVvtPAo3HoAYE6jCNveLHJ+X4qvonL4enj1SyTF3hXA107UkQFQrA==", "dev": true, "requires": { - "@pollyjs/utils": "^4.3.0", - "@sindresorhus/fnv1a": "^1.2.0", - "blueimp-md5": "^2.10.0", - "fast-json-stable-stringify": "^2.0.0", - "is-absolute-url": "^3.0.0", - "lodash-es": "^4.17.11", + "@pollyjs/utils": "^6.0.6", + "@sindresorhus/fnv1a": "^2.0.1", + "blueimp-md5": "^2.19.0", + "fast-json-stable-stringify": "^2.1.0", + "is-absolute-url": "^3.0.3", + "lodash-es": "^4.17.21", + "loglevel": "^1.8.0", "route-recognizer": "^0.3.4", - "slugify": "^1.3.4" + "slugify": "^1.6.3" } }, "@pollyjs/node-server": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/node-server/-/node-server-4.3.0.tgz", - "integrity": "sha512-pGrX889RkJXleW7p1cMKJqEtuasABbosneU9VrHOUYOMlYnObIOTt5y/n3m0NMAh9SyyusgqC7yQ18/PnMCgfg==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/node-server/-/node-server-6.0.6.tgz", + "integrity": "sha512-nkP1+hdNoVOlrRz9R84haXVsaSmo8Xmq7uYK9GeUMSLQy4Fs55ZZ9o2KI6vRA8F6ZqJSbC31xxwwIoTkjyP7Vg==", "dev": true, "requires": { - "@pollyjs/utils": "^4.3.0", + "@pollyjs/utils": "^6.0.6", "body-parser": "^1.19.0", "cors": "^2.8.5", "express": "^4.17.1", - "fs-extra": "^8.0.1", - "http-graceful-shutdown": "^2.3.1", - "morgan": "^1.9.1", - "nocache": "^2.1.0" + "fs-extra": "^10.0.0", + "http-graceful-shutdown": "^3.1.5", + "morgan": "^1.10.0", + "nocache": "^3.0.1" }, "dependencies": { - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "nocache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/nocache/-/nocache-3.0.4.tgz", + "integrity": "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw==", "dev": true } } }, "@pollyjs/persister": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/persister/-/persister-4.3.0.tgz", - "integrity": "sha512-oKTl++rZdT/5tMoeHMsgUAHjnRf/4qLNv7kc7u8ddldjgZ4eDAIWlG6BwFkhDxjhV+ofVlnLxFnRjmK4qrrmqA==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/persister/-/persister-6.0.6.tgz", + "integrity": "sha512-9KB1p+frvYvFGur4ifzLnFKFLXAMXrhAhCnVhTnkG2WIqqQPT7y+mKBV/DKCmYFx8GPA9FiNGqt2pB53uJpIdw==", "dev": true, "requires": { - "@pollyjs/utils": "^4.3.0", + "@pollyjs/utils": "^6.0.6", + "@types/set-cookie-parser": "^2.4.1", "bowser": "^2.4.0", - "fast-json-stable-stringify": "^2.0.0", - "lodash-es": "^4.17.11", - "set-cookie-parser": "^2.3.5", + "fast-json-stable-stringify": "^2.1.0", + "lodash-es": "^4.17.21", + "set-cookie-parser": "^2.4.8", "utf8-byte-length": "^1.0.4" } }, "@pollyjs/persister-fs": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/persister-fs/-/persister-fs-4.3.0.tgz", - "integrity": "sha512-2DUIyl/3mr5F1Orq6bnpW6Witz2I8ulMGsqCFrlh4LaA4DlSg2SwOv88bbjzMCfqGP1CN3U5Zu8o7tZlFxkd8w==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/persister-fs/-/persister-fs-6.0.6.tgz", + "integrity": "sha512-/ALVgZiH2zGqwLkW0Mntc0Oq1v7tR8LS8JD2SAyIsHpnSXeBUnfPWwjAuYw0vqORHFVEbwned6MBRFfvU/3qng==", "dev": true, "requires": { - "@pollyjs/node-server": "^4.3.0", - "@pollyjs/persister": "^4.3.0" + "@pollyjs/node-server": "^6.0.6", + "@pollyjs/persister": "^6.0.6" } }, "@pollyjs/utils": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@pollyjs/utils/-/utils-4.3.0.tgz", - "integrity": "sha512-8BYWtP4nK6mAlDgZQ8j2+EZjQH2beoHaHnZDyG7GdspOLeILtXhHLeAxp371YSKN387t7OEBS0nIQSMppHuTQg==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@pollyjs/utils/-/utils-6.0.6.tgz", + "integrity": "sha512-nhVJoI3nRgRimE0V2DVSvsXXNROUH6iyJbroDu4IdsOIOFC1Ds0w+ANMB4NMwFaqE+AisWOmXFzwAGdAfyiQVg==", "dev": true, "requires": { - "qs": "^6.7.0", - "url-parse": "^1.4.7" + "qs": "^6.10.1", + "url-parse": "^1.5.3" } }, "@popperjs/core": { @@ -57188,9 +56937,9 @@ "dev": true }, "@sindresorhus/fnv1a": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/fnv1a/-/fnv1a-1.2.0.tgz", - "integrity": "sha512-5ezb/dBSTWtKQ4sLQwMgOJyREXJcZZkTMbendMwKrXTghUhWjZhstzkkmt4/WkFy/GSTSGzfJOKU7dEXv3C/XQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@sindresorhus/fnv1a/-/fnv1a-2.0.1.tgz", + "integrity": "sha512-suq9tRQ6bkpMukTG5K5z0sPWB7t0zExMzZCdmYm6xTSSIm/yCKNm7VCL36wVeyTsFr597/UhU1OAYdHGMDiHrw==", "dev": true }, "@sinonjs/commons": { @@ -61769,6 +61518,15 @@ "@types/node": "*" } }, + "@types/set-cookie-parser": { + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/@types/set-cookie-parser/-/set-cookie-parser-2.4.7.tgz", + "integrity": "sha512-+ge/loa0oTozxip6zmhRIk8Z/boU51wl9Q6QdLZcokIGMzY5lFXYy/x7Htj2HTC6/KZP1hUbZ1ekx8DYXICvWg==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/shimmer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.2.tgz", @@ -64104,7 +63862,8 @@ "camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==" + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true }, "camelcase-keys": { "version": "4.2.0", @@ -68871,7 +68630,7 @@ "freegeoip": { "version": "file:services/freegeoip", "requires": { - "@maxmind/geoip2-node": "^3.4.0", + "@maxmind/geoip2-node": "^5.0.0", "@overleaf/fetch-utils": "*", "@overleaf/logger": "*", "@overleaf/metrics": "*", @@ -70348,12 +70107,29 @@ } }, "http-graceful-shutdown": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-2.4.0.tgz", - "integrity": "sha512-Wj42gVFxJ/MJPQP5aC45FdsZpBiw3yw78MVfDmbPbPEZCJa5HqtRmc5cKTCBZ4emWZLptNg5p05zuYJlCa4lSA==", + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.13.tgz", + "integrity": "sha512-Ci5LRufQ8AtrQ1U26AevS8QoMXDOhnAHCJI3eZu1com7mZGHxREmw3dNj85ftpQokQCvak8nI2pnFS8zyM1M+Q==", "dev": true, "requires": { - "debug": "^4.1.1" + "debug": "^4.3.4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "http-parser-js": { @@ -73735,11 +73511,6 @@ "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" }, - "lodash.set": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", - "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=" - }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -73859,6 +73630,12 @@ } } }, + "loglevel": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz", + "integrity": "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==", + "dev": true + }, "long": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", @@ -74775,7 +74552,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true } } @@ -75009,12 +74786,14 @@ "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==" }, "nock": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/nock/-/nock-0.15.2.tgz", - "integrity": "sha1-PDLBrmASzTmOuSQKBZJEtZUI3Y0=", + "version": "13.5.3", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.3.tgz", + "integrity": "sha512-2NlGmHIK2rTeyy7UaY1ZNg0YZfEJMxghXgZi0b4DBsUyoDNTTxZeCSG1nmirAWF44RkkoV8NnegLVQijgVapNQ==", "dev": true, "requires": { - "propagate": "0.2.x" + "debug": "^4.1.0", + "json-stringify-safe": "^5.0.1", + "propagate": "^2.0.0" } }, "node-abort-controller": { @@ -77473,9 +77252,9 @@ } }, "propagate": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-0.2.2.tgz", - "integrity": "sha1-F6EW0l2vIJRCbX1oRNJiMsnWkms=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", + "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", "dev": true }, "property-expr": { @@ -79766,9 +79545,9 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-cookie-parser": { - "version": "2.4.8", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz", - "integrity": "sha512-edRH8mBKEWNVIVMKejNnuJxleqYE/ZSdcT8/Nem9/mmosx12pctd80s2Oy00KNZzrogMZS5mauK2/ymL1bvlvg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", + "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==", "dev": true }, "set-function-length": { @@ -82113,7 +81892,7 @@ "utf8-byte-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", - "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=", + "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==", "dev": true }, "util": { diff --git a/services/project-history/package.json b/services/project-history/package.json index f095214b2c..818f95573a 100644 --- a/services/project-history/package.json +++ b/services/project-history/package.json @@ -49,7 +49,7 @@ "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "mocha": "^10.2.0", - "nock": "^12.0.3", + "nock": "^13.5.3", "sinon": "~9.0.1", "sinon-chai": "^3.7.0", "timekeeper": "2.2.0", diff --git a/services/web/package.json b/services/web/package.json index b563a4f7f0..a82fcd52ba 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -134,7 +134,6 @@ "mongoose": "^6.12.0", "multer": "overleaf/multer#e1df247fbf8e7590520d20ae3601eaef9f3d2e9e", "nocache": "^2.1.0", - "nock": "^13.1.3", "node-fetch": "^2.6.7", "nodemailer": "^6.7.0", "nodemailer-ses-transport": "^1.5.1", @@ -205,9 +204,9 @@ "@overleaf/ranges-tracker": "*", "@overleaf/stream-utils": "*", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", - "@pollyjs/adapter-node-http": "^4.2.1", - "@pollyjs/core": "^4.2.1", - "@pollyjs/persister-fs": "^4.2.1", + "@pollyjs/adapter-node-http": "^6.0.6", + "@pollyjs/core": "^6.0.6", + "@pollyjs/persister-fs": "^6.0.6", "@reach/tabs": "^0.15.0", "@replit/codemirror-emacs": "overleaf/codemirror-emacs#4394c03858f27053f8768258e9493866e06e938e", "@replit/codemirror-indentation-markers": "overleaf/codemirror-indentation-markers#1b1f93c0bcd04293aea6986aa2275185b2c56803", @@ -309,7 +308,6 @@ "mocha": "^10.2.0", "mocha-each": "^2.0.1", "mock-fs": "^5.1.2", - "nock": "^13.1.1", "node-fetch": "^2.6.7", "nvd3": "^1.8.6", "pdfjs-dist213": "npm:pdfjs-dist@2.13.216",