From d48321167797dfac01f851435105db787cd7a6c8 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 21 Feb 2023 09:06:58 +0000 Subject: [PATCH] Merge pull request #11909 from overleaf/jpa-update-build-scripts [misc] update build scripts GitOrigin-RevId: 1f7c62365190f70daeeff7909ee825b04aa864db --- package-lock.json | 479 +-------------------------- services/chat/Dockerfile | 2 +- services/chat/Makefile | 7 +- services/clsi/Dockerfile | 4 +- services/clsi/Makefile | 7 +- services/contacts/Dockerfile | 2 +- services/contacts/Makefile | 7 +- services/docstore/Dockerfile | 2 +- services/docstore/Makefile | 7 +- services/document-updater/Dockerfile | 2 +- services/document-updater/Makefile | 7 +- services/filestore/Dockerfile | 4 +- services/filestore/Makefile | 7 +- services/notifications/Dockerfile | 2 +- services/notifications/Makefile | 7 +- services/project-history/Dockerfile | 2 +- services/project-history/Makefile | 7 +- services/real-time/Dockerfile | 2 +- services/real-time/Makefile | 7 +- services/track-changes/Dockerfile | 2 +- services/track-changes/Makefile | 7 +- 21 files changed, 65 insertions(+), 508 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c6ed4b08c..5103f8d50d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9025,12 +9025,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, "node_modules/@uppy/companion-client": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/@uppy/companion-client/-/companion-client-1.10.2.tgz", @@ -17989,15 +17983,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true, - "engines": { - "node": ">=4.x" - } - }, "node_modules/gtoken": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.1.tgz", @@ -33516,260 +33501,7 @@ "devDependencies": { "chai": "^4.3.6", "chai-as-promised": "^7.1.1", - "mocha": "^8.4.0" - } - }, - "services/idp/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "services/idp/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "services/idp/node_modules/chalk/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "services/idp/node_modules/chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", - "dev": true, - "dependencies": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.1" - } - }, - "services/idp/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "services/idp/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/idp/node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "services/idp/node_modules/js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "services/idp/node_modules/log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "services/idp/node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "services/idp/node_modules/mocha": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", - "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", - "dev": true, - "dependencies": { - "@ungap/promise-all-settled": "1.1.2", - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.1", - "debug": "4.3.1", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.1.6", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "4.0.0", - "log-symbols": "4.0.0", - "minimatch": "3.0.4", - "ms": "2.1.3", - "nanoid": "3.1.20", - "serialize-javascript": "5.0.1", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "which": "2.0.2", - "wide-align": "1.1.3", - "workerpool": "6.1.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha" - }, - "engines": { - "node": ">= 10.12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" - } - }, - "services/idp/node_modules/nanoid": { - "version": "3.1.20", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", - "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "services/idp/node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, - "services/idp/node_modules/readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "services/idp/node_modules/serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", - "dev": true, - "dependencies": { - "randombytes": "^2.1.0" - } - }, - "services/idp/node_modules/workerpool": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", - "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", - "dev": true - }, - "services/idp/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" + "mocha": "^10.2.0" } }, "services/notifications": { @@ -42941,201 +42673,8 @@ "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "express": "^4.18.2", - "mocha": "^8.4.0", + "mocha": "^10.2.0", "samlp": "^7.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "dependencies": { - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", - "dev": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.3.1", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - } - }, - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "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 - } - } - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", - "dev": true, - "requires": { - "chalk": "^4.0.0" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "mocha": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", - "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", - "dev": true, - "requires": { - "@ungap/promise-all-settled": "1.1.2", - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.1", - "debug": "4.3.1", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.1.6", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "4.0.0", - "log-symbols": "4.0.0", - "minimatch": "3.0.4", - "ms": "2.1.3", - "nanoid": "3.1.20", - "serialize-javascript": "5.0.1", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "which": "2.0.2", - "wide-align": "1.1.3", - "workerpool": "6.1.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" - } - }, - "nanoid": { - "version": "3.1.20", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", - "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", - "dev": true - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, - "workerpool": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", - "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", - "dev": true - }, - "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "requires": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - } - } } }, "@overleaf/logger": { @@ -44193,7 +43732,7 @@ "passport-local": "^1.0.0", "passport-oauth2": "^1.5.0", "passport-orcid": "0.0.4", - "passport-saml": "^3.2.3", + "passport-saml": "3.2.3", "passport-twitter": "^1.0.4", "pdfjs-dist213": "npm:pdfjs-dist@2.13.216", "pdfjs-dist31": "npm:pdfjs-dist@3.1.81", @@ -47377,12 +46916,6 @@ } } }, - "@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, "@uppy/companion-client": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/@uppy/companion-client/-/companion-client-1.10.2.tgz", @@ -54487,12 +54020,6 @@ } } }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, "gtoken": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.1.tgz", diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile index b959d796e4..87c955871b 100644 --- a/services/chat/Dockerfile +++ b/services/chat/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base diff --git a/services/chat/Makefile b/services/chat/Makefile index 0d97802583..b6188d7c25 100644 --- a/services/chat/Makefile +++ b/services/chat/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -97,4 +100,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/clsi/Dockerfile b/services/clsi/Dockerfile index 935d471b36..1b773d9ad7 100644 --- a/services/clsi/Dockerfile +++ b/services/clsi/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base @@ -26,6 +26,6 @@ COPY services/clsi/ /overleaf/services/clsi/ FROM app RUN mkdir -p cache compiles output \ - && chown node:node cache compiles output +&& chown node:node cache compiles output CMD ["node", "--expose-gc", "app.js"] diff --git a/services/clsi/Makefile b/services/clsi/Makefile index fa7f7428b8..aaccd65cbf 100644 --- a/services/clsi/Makefile +++ b/services/clsi/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ || docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):main-deps \ @@ -110,4 +113,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/contacts/Dockerfile b/services/contacts/Dockerfile index c0cbd46667..2091a63333 100644 --- a/services/contacts/Dockerfile +++ b/services/contacts/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base diff --git a/services/contacts/Makefile b/services/contacts/Makefile index d12cc01c95..fea41a26df 100644 --- a/services/contacts/Makefile +++ b/services/contacts/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -97,4 +100,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/docstore/Dockerfile b/services/docstore/Dockerfile index adea7de885..6cdbb3c82f 100644 --- a/services/docstore/Dockerfile +++ b/services/docstore/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base diff --git a/services/docstore/Makefile b/services/docstore/Makefile index 6e845e96b5..fb20b1ea75 100644 --- a/services/docstore/Makefile +++ b/services/docstore/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -97,4 +100,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile index b90f6600d3..fd460d5153 100644 --- a/services/document-updater/Dockerfile +++ b/services/document-updater/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile index 43dbec4489..38d3f09d53 100644 --- a/services/document-updater/Makefile +++ b/services/document-updater/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -97,4 +100,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile index 9e5c173cf9..93d2766e9b 100644 --- a/services/filestore/Dockerfile +++ b/services/filestore/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base @@ -24,7 +24,7 @@ COPY services/filestore/ /overleaf/services/filestore/ FROM app RUN mkdir -p uploads user_files template_files \ - && chown node:node uploads user_files template_files +&& chown node:node uploads user_files template_files USER node CMD ["node", "--expose-gc", "app.js"] diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 1e9c5bc6a9..bfa367da84 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ || docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):main-deps \ @@ -110,4 +113,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index 6a029b8b76..e0ced2119c 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 4d328b9bb0..4a34f596d0 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -97,4 +100,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/project-history/Dockerfile b/services/project-history/Dockerfile index 238604caec..ebce9db91f 100644 --- a/services/project-history/Dockerfile +++ b/services/project-history/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base diff --git a/services/project-history/Makefile b/services/project-history/Makefile index dcf26456ca..32019674da 100644 --- a/services/project-history/Makefile +++ b/services/project-history/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -97,4 +100,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index bf087d0a49..f597b5fe5a 100644 --- a/services/real-time/Dockerfile +++ b/services/real-time/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 4115c41685..b1a2d03328 100644 --- a/services/real-time/Makefile +++ b/services/real-time/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -97,4 +100,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish diff --git a/services/track-changes/Dockerfile b/services/track-changes/Dockerfile index 0dce337e7c..06b522f338 100644 --- a/services/track-changes/Dockerfile +++ b/services/track-changes/Dockerfile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ FROM node:16.17.1 as base diff --git a/services/track-changes/Makefile b/services/track-changes/Makefile index 95f0301ef3..489e8f65f2 100644 --- a/services/track-changes/Makefile +++ b/services/track-changes/Makefile @@ -1,6 +1,6 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from -# https://github.com/sharelatex/sharelatex-dev-environment +# https://github.com/overleaf/internal/ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -83,6 +83,9 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run)) $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run endif +benchmarks: + $(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance npm run benchmarks + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -97,4 +100,4 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -.PHONY: clean test test_unit test_acceptance test_clean build publish +.PHONY: clean test test_unit test_acceptance test_clean benchmarks build publish