diff --git a/package-lock.json b/package-lock.json index 73d1ea7f68..bff1eb2fb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7364,9 +7364,9 @@ } }, "node_modules/async": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz", - "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" }, "node_modules/async-limiter": { "version": "1.0.1", @@ -32075,7 +32075,7 @@ "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^3.2.0", "body-parser": "^1.19.0", "express": "4.17.1", "mongodb": "^3.6.0" @@ -32092,11 +32092,6 @@ "timekeeper": "^2.2.0" } }, - "services/chat/node_modules/async": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - }, "services/chat/node_modules/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -32317,7 +32312,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "3.2.2", + "async": "3.2.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "diskusage": "^1.1.3", @@ -32417,7 +32412,7 @@ "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "^4.17.1", @@ -32434,6 +32429,14 @@ "timekeeper": "2.2.0" } }, + "services/contacts/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/contacts/node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -32482,7 +32485,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/object-persistor": "^1.0.1", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "celebrate": "^13.0.4", @@ -32536,6 +32539,14 @@ "node": ">=10" } }, + "services/docstore/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/docstore/node_modules/celebrate": { "version": "13.0.4", "resolved": "https://registry.npmjs.org/celebrate/-/celebrate-13.0.4.tgz", @@ -32657,7 +32668,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.1", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.5.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "diff-match-patch": "https://github.com/overleaf/diff-match-patch/archive/89805f9c671a77a263fc53461acd62aa7498f688.tar.gz", @@ -32677,6 +32688,14 @@ "timekeeper": "^2.0.0" } }, + "services/document-updater/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/document-updater/node_modules/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -33072,7 +33091,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "base64-stream": "^0.1.2", "body-parser": "^1.19.0", "bunyan": "^1.8.15", @@ -33093,6 +33112,14 @@ "timekeeper": "2.2.0" } }, + "services/github-sync/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/github-sync/node_modules/p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -33346,7 +33373,7 @@ "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "4.17.1", @@ -33363,6 +33390,14 @@ "sinon": "^9.2.4" } }, + "services/notifications/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/notifications/node_modules/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -33589,7 +33624,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", "archiver": "^5.3.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "^4.17.1", @@ -33636,6 +33671,14 @@ "node": ">=10" } }, + "services/project-archiver/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/project-archiver/node_modules/date-and-time": { "version": "0.14.2", "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.14.2.tgz", @@ -33726,7 +33769,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.5.0", "aws-sdk": "^2.650.0", "bluebird": "^3.7.2", "body-parser": "^1.19.0", @@ -33789,6 +33832,14 @@ "@hapi/hoek": "^8.3.0" } }, + "services/project-history/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/project-history/node_modules/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -34142,7 +34193,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^0.9.0", "base64id": "0.1.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", @@ -34167,6 +34218,11 @@ "uid-safe": "^2.1.5" } }, + "services/real-time/node_modules/async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + }, "services/real-time/node_modules/sandboxed-module": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-0.3.0.tgz", @@ -34205,7 +34261,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.1.2", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "^4.17.1", @@ -34224,6 +34280,14 @@ "sinon": "^9.2.4" } }, + "services/references/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/references/node_modules/uuid": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", @@ -34240,7 +34304,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "^4.17.1", @@ -34257,6 +34321,14 @@ "sinon": "^9.2.4" } }, + "services/spelling/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/spelling/node_modules/underscore": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", @@ -34270,7 +34342,7 @@ "@overleaf/settings": "^3.0.0", "algolia-search": "~1.5.5", "args-js": "0.10.12", - "async": "3.2.2", + "async": "3.2.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "4.17.1", @@ -34516,7 +34588,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.1", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "dropbox": "^10.24.0", @@ -34538,6 +34610,14 @@ "sinon-stub-promise": "^4.0.0" } }, + "services/third-party-datastore/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/third-party-datastore/node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -34609,7 +34689,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "^4.17.1", @@ -34629,6 +34709,14 @@ "sinon-chai": "^3.7.0" } }, + "services/third-party-references/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/third-party-references/node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -34704,7 +34792,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "aws-sdk": "^2.643.0", "body-parser": "^1.19.0", "bson": "^1.1.5", @@ -34735,6 +34823,14 @@ "timekeeper": "2.2.0" } }, + "services/track-changes/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, "services/track-changes/node_modules/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -35044,7 +35140,7 @@ "angular": "~1.8.0", "angular-sanitize": "~1.8.0", "archiver": "^5.3.0", - "async": "3.2.2", + "async": "0.6.2", "backbone": "^1.3.3", "basic-auth": "^2.0.1", "bcrypt": "^5.0.0", @@ -35327,6 +35423,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "services/web/node_modules/async": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.6.2.tgz", + "integrity": "sha1-Qf0DijgSwKi8GELs8IumPrA5K+8=" + }, "services/web/node_modules/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -40001,7 +40102,7 @@ "@overleaf/settings": "^3.0.0", "acorn": "^7.1.1", "ajv": "^6.12.0", - "async": "^3.2.2", + "async": "^3.2.0", "body-parser": "^1.19.0", "chai": "^4.3.6", "chai-as-promised": "^7.1.1", @@ -40014,11 +40115,6 @@ "timekeeper": "^2.2.0" }, "dependencies": { - "async": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -40204,7 +40300,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "3.2.2", + "async": "3.2.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -40291,7 +40387,7 @@ "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -40306,6 +40402,14 @@ "underscore": "~1.13.1" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -40347,7 +40451,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/object-persistor": "^1.0.1", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "celebrate": "^13.0.4", @@ -40395,6 +40499,14 @@ "xdg-basedir": "^4.0.0" } }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "celebrate": { "version": "13.0.4", "resolved": "https://registry.npmjs.org/celebrate/-/celebrate-13.0.4.tgz", @@ -40493,7 +40605,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.1", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.5.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -40511,6 +40623,14 @@ "timekeeper": "^2.0.0" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -40840,7 +40960,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "base64-stream": "^0.1.2", "body-parser": "^1.19.0", "bunyan": "^1.8.15", @@ -40859,6 +40979,14 @@ "timekeeper": "2.2.0" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -41017,7 +41145,7 @@ "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -41032,6 +41160,14 @@ "underscore": "1.13.1" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -41337,7 +41473,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", "archiver": "^5.3.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -41379,6 +41515,14 @@ "xdg-basedir": "^4.0.0" } }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "date-and-time": { "version": "0.14.2", "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.14.2.tgz", @@ -41452,7 +41596,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.5.0", "aws-sdk": "^2.650.0", "bluebird": "^3.7.2", "body-parser": "^1.19.0", @@ -41510,6 +41654,14 @@ "@hapi/hoek": "^8.3.0" } }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -41812,7 +41964,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^0.9.0", "base64id": "0.1.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", @@ -41835,6 +41987,11 @@ "underscore": "1.13.1" }, "dependencies": { + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + }, "sandboxed-module": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-0.3.0.tgz", @@ -41884,7 +42041,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.1.2", "body-parser": "^1.19.0", "bson": "^1.1.5", "bunyan": "^1.8.15", @@ -41901,6 +42058,14 @@ "uuid": "^7.0.3" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "uuid": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", @@ -41918,7 +42083,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -41933,6 +42098,14 @@ "underscore": "1.13.1" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "underscore": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", @@ -41948,7 +42121,7 @@ "@overleaf/settings": "^3.0.0", "algolia-search": "~1.5.5", "args-js": "0.10.12", - "async": "3.2.2", + "async": "3.2.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -42157,7 +42330,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.1", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -42177,6 +42350,14 @@ "uuid": "^8.3.2" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -42236,7 +42417,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "chai": "^4.3.6", @@ -42254,6 +42435,14 @@ "sinon-chai": "^3.7.0" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -42319,7 +42508,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "aws-sdk": "^2.643.0", "body-parser": "^1.19.0", "bson": "^1.1.5", @@ -42348,6 +42537,14 @@ "yazl": "^2.5.1" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -42630,7 +42827,7 @@ "angular-mocks": "~1.8.0", "angular-sanitize": "~1.8.0", "archiver": "^5.3.0", - "async": "3.2.2", + "async": "0.6.2", "autoprefixer": "^9.7.6", "babel-loader": "^8.2.4", "babel-plugin-angularjs-annotate": "^0.10.0", @@ -42874,6 +43071,11 @@ "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==", "dev": true }, + "async": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.6.2.tgz", + "integrity": "sha1-Qf0DijgSwKi8GELs8IumPrA5K+8=" + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -46558,9 +46760,9 @@ "dev": true }, "async": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz", - "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" }, "async-limiter": { "version": "1.0.1", diff --git a/services/chat/package.json b/services/chat/package.json index f8b2c802cb..8b03ea0824 100644 --- a/services/chat/package.json +++ b/services/chat/package.json @@ -19,7 +19,7 @@ "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^3.2.0", "body-parser": "^1.19.0", "express": "4.17.1", "mongodb": "^3.6.0" diff --git a/services/clsi/package.json b/services/clsi/package.json index 0835bf8a3a..33d5e56144 100644 --- a/services/clsi/package.json +++ b/services/clsi/package.json @@ -20,7 +20,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "3.2.2", + "async": "3.2.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "diskusage": "^1.1.3", diff --git a/services/contacts/package.json b/services/contacts/package.json index dc72fd9335..f44210499d 100644 --- a/services/contacts/package.json +++ b/services/contacts/package.json @@ -19,7 +19,7 @@ "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "^4.17.1", diff --git a/services/docstore/package.json b/services/docstore/package.json index 0320deec1e..bfb1725f20 100644 --- a/services/docstore/package.json +++ b/services/docstore/package.json @@ -21,7 +21,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/object-persistor": "^1.0.1", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "celebrate": "^13.0.4", diff --git a/services/document-updater/package.json b/services/document-updater/package.json index b670046d59..cd565f768b 100644 --- a/services/document-updater/package.json +++ b/services/document-updater/package.json @@ -21,7 +21,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.1", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.5.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "diff-match-patch": "https://github.com/overleaf/diff-match-patch/archive/89805f9c671a77a263fc53461acd62aa7498f688.tar.gz", diff --git a/services/notifications/package.json b/services/notifications/package.json index 99c7b62283..01173f003c 100644 --- a/services/notifications/package.json +++ b/services/notifications/package.json @@ -21,7 +21,7 @@ "@overleaf/logger": "^3.1.0", "@overleaf/metrics": "^4.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "4.17.1", diff --git a/services/real-time/package.json b/services/real-time/package.json index d46e5856f8..b1fc619a25 100644 --- a/services/real-time/package.json +++ b/services/real-time/package.json @@ -22,7 +22,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^0.9.0", "base64id": "0.1.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", diff --git a/services/spelling/package.json b/services/spelling/package.json index 83e883a539..34359d7c39 100644 --- a/services/spelling/package.json +++ b/services/spelling/package.json @@ -26,7 +26,7 @@ "@overleaf/metrics": "^4.0.0", "@overleaf/o-error": "^3.4.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "body-parser": "^1.19.0", "bunyan": "^1.8.15", "express": "^4.17.1", diff --git a/services/track-changes/app/js/UpdatesManager.js b/services/track-changes/app/js/UpdatesManager.js index df8ebff6cd..58962108cf 100644 --- a/services/track-changes/app/js/UpdatesManager.js +++ b/services/track-changes/app/js/UpdatesManager.js @@ -591,13 +591,11 @@ module.exports = UpdatesManager = { } // repeatedly get updates and pass them through the summariser to get an final output with user info return async.whilst( - cb => + () => // console.log "checking iterator.done", iterator.done() - cb( - null, - summarizedUpdates.length < options.min_count && - !iterator.done() - ), + summarizedUpdates.length < options.min_count && + !iterator.done(), + cb => iterator.next(function (err, partialUpdates) { if (err != null) { @@ -653,7 +651,7 @@ module.exports = UpdatesManager = { const accumulatedUserIds = new Set() async.whilst( - cb => cb(null, !iterator.done()), + () => !iterator.done(), cb => iterator.next((err, updatesFromASinglePack) => { diff --git a/services/track-changes/package.json b/services/track-changes/package.json index cc90cb4464..0d972f4bdd 100644 --- a/services/track-changes/package.json +++ b/services/track-changes/package.json @@ -21,7 +21,7 @@ "@overleaf/o-error": "^3.4.0", "@overleaf/redis-wrapper": "^2.0.0", "@overleaf/settings": "^3.0.0", - "async": "^3.2.2", + "async": "^2.6.3", "aws-sdk": "^2.643.0", "body-parser": "^1.19.0", "bson": "^1.1.5", diff --git a/services/web/app/src/Features/Exports/ExportsHandler.js b/services/web/app/src/Features/Exports/ExportsHandler.js index 71710268e1..8e738a73b9 100644 --- a/services/web/app/src/Features/Exports/ExportsHandler.js +++ b/services/web/app/src/Features/Exports/ExportsHandler.js @@ -72,7 +72,7 @@ module.exports = ExportsHandler = { // TODO: when we update async, signature will change from (cb, results) to (results, cb) rootDoc: [ 'project', - (results, cb) => + (cb, results) => ProjectRootDocManager.ensureRootDocumentIsValid( project_id, function (error) { diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 31288de8e0..c24a7a2a97 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -778,7 +778,7 @@ const ProjectController = { }, brandVariation: [ 'project', - (results, cb) => { + (cb, results) => { if ( (results.project != null ? results.project.brandVariationId diff --git a/services/web/app/src/Features/Project/ProjectRootDocManager.js b/services/web/app/src/Features/Project/ProjectRootDocManager.js index 3e984276d2..7e320e8266 100644 --- a/services/web/app/src/Features/Project/ProjectRootDocManager.js +++ b/services/web/app/src/Features/Project/ProjectRootDocManager.js @@ -95,7 +95,7 @@ module.exports = ProjectRootDocManager = { let doc = null return async.until( - cb => cb(null, doc != null || files.length === 0), + () => doc != null || files.length === 0, function (cb) { const file = files.shift() return fs.readFile( diff --git a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js index b30052bff5..dfc91aaee8 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js +++ b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js @@ -62,7 +62,7 @@ function buildUsersSubscriptionViewModel(user, callback) { }, recurlySubscription: [ 'personalSubscription', - ({ personalSubscription }, cb) => { + (cb, { personalSubscription }) => { if ( personalSubscription == null || personalSubscription.recurlySubscription_id == null || @@ -79,7 +79,7 @@ function buildUsersSubscriptionViewModel(user, callback) { ], recurlyCoupons: [ 'recurlySubscription', - ({ recurlySubscription }, cb) => { + (cb, { recurlySubscription }) => { if (!recurlySubscription) { return cb(null, null) } @@ -89,7 +89,7 @@ function buildUsersSubscriptionViewModel(user, callback) { ], plan: [ 'personalSubscription', - ({ personalSubscription }, cb) => { + (cb, { personalSubscription }) => { if (personalSubscription == null) { return cb() } diff --git a/services/web/package.json b/services/web/package.json index b061090a7e..a64735bd61 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -82,7 +82,7 @@ "angular": "~1.8.0", "angular-sanitize": "~1.8.0", "archiver": "^5.3.0", - "async": "3.2.2", + "async": "0.6.2", "backbone": "^1.3.3", "basic-auth": "^2.0.1", "bcrypt": "^5.0.0", diff --git a/services/web/test/unit/src/User/UserSessionsManagerTests.js b/services/web/test/unit/src/User/UserSessionsManagerTests.js index fa42300c56..7170958caf 100644 --- a/services/web/test/unit/src/User/UserSessionsManagerTests.js +++ b/services/web/test/unit/src/User/UserSessionsManagerTests.js @@ -89,7 +89,7 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) return done() }) }) @@ -144,7 +144,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -180,7 +181,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -225,7 +227,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(undefined) return done() }) }) @@ -280,7 +283,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -316,7 +320,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -358,7 +363,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -401,7 +407,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -467,7 +474,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -489,7 +497,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -515,7 +524,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -549,7 +559,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) }) @@ -587,7 +598,7 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call((err, sessions) => { - expect(err).to.not.exist + expect(err).to.equal(null) return done() }) }) @@ -624,7 +635,7 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call((err, sessions) => { - expect(err).to.not.exist + expect(err).to.equal(null) return done() }) }) @@ -702,7 +713,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(undefined) return done() }) }) @@ -724,7 +736,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(undefined) return done() }) }) @@ -749,7 +762,8 @@ describe('UserSessionsManager', function () { it('should not produce an error', function (done) { return this.call(err => { - expect(err).to.not.exist + expect(err).to.not.be.instanceof(Error) + expect(err).to.equal(null) return done() }) })