From efb36b719335e3e6fad19addd3dd49095f5f5231 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 2 Oct 2023 16:30:34 +0200 Subject: [PATCH] Merge pull request #14698 from overleaf/bg-sg-use-node-watch [misc] replace nodemon with "node --watch" GitOrigin-RevId: 8b34861887b39ffe1c64d9e4679f8ebef09302bd --- .../access-token-encryptor/buildscript.txt | 3 +- libraries/fetch-utils/buildscript.txt | 3 +- libraries/logger/buildscript.txt | 3 +- libraries/metrics/buildscript.txt | 3 +- libraries/o-error/buildscript.txt | 3 +- libraries/object-persistor/buildscript.txt | 3 +- .../overleaf-editor-core/buildscript.txt | 3 +- libraries/ranges-tracker/buildscript.txt | 3 +- libraries/redis-wrapper/buildscript.txt | 3 +- libraries/settings/buildscript.txt | 3 +- libraries/stream-utils/buildscript.txt | 3 +- package-lock.json | 247 +----------------- package.json | 1 - services/chat/buildscript.txt | 3 +- services/chat/nodemon.json | 18 -- services/chat/package.json | 2 +- services/clsi/buildscript.txt | 3 +- services/clsi/nodemon.json | 18 -- services/clsi/package.json | 2 +- services/contacts/buildscript.txt | 3 +- services/contacts/nodemon.json | 18 -- services/contacts/package.json | 2 +- services/docstore/buildscript.txt | 3 +- services/docstore/nodemon.json | 18 -- services/docstore/package.json | 2 +- services/document-updater/buildscript.txt | 3 +- services/document-updater/nodemon.json | 18 -- services/document-updater/package.json | 2 +- services/filestore/buildscript.txt | 3 +- services/filestore/nodemon.json | 18 -- services/filestore/package.json | 2 +- services/history-v1/buildscript.txt | 3 +- services/history-v1/nodemon.json | 20 -- services/history-v1/package.json | 2 +- services/notifications/buildscript.txt | 3 +- services/notifications/nodemon.json | 18 -- services/notifications/package.json | 2 +- services/project-history/buildscript.txt | 3 +- services/project-history/nodemon.json | 18 -- services/project-history/package.json | 2 +- services/real-time/buildscript.txt | 3 +- services/real-time/nodemon.json | 18 -- services/real-time/package.json | 2 +- services/spelling/buildscript.txt | 3 +- services/spelling/nodemon.json | 18 -- services/spelling/package.json | 2 +- services/track-changes/buildscript.txt | 3 +- services/track-changes/nodemon.json | 18 -- services/track-changes/package.json | 2 +- .../app/src/infrastructure/Translations.js | 8 + services/web/nodemon.json | 10 - services/web/package.json | 2 +- 52 files changed, 45 insertions(+), 534 deletions(-) delete mode 100644 services/chat/nodemon.json delete mode 100644 services/clsi/nodemon.json delete mode 100644 services/contacts/nodemon.json delete mode 100644 services/docstore/nodemon.json delete mode 100644 services/document-updater/nodemon.json delete mode 100644 services/filestore/nodemon.json delete mode 100644 services/history-v1/nodemon.json delete mode 100644 services/notifications/nodemon.json delete mode 100644 services/project-history/nodemon.json delete mode 100644 services/real-time/nodemon.json delete mode 100644 services/spelling/nodemon.json delete mode 100644 services/track-changes/nodemon.json delete mode 100644 services/web/nodemon.json diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt index e4dc9b4dc7..8aeb110f0f 100644 --- a/libraries/access-token-encryptor/buildscript.txt +++ b/libraries/access-token-encryptor/buildscript.txt @@ -4,8 +4,7 @@ access-token-encryptor --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/fetch-utils/buildscript.txt b/libraries/fetch-utils/buildscript.txt index 2db01f30ca..945b8d5604 100644 --- a/libraries/fetch-utils/buildscript.txt +++ b/libraries/fetch-utils/buildscript.txt @@ -4,8 +4,7 @@ fetch-utils --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=True --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt index 230ab6c9c3..6d18c45194 100644 --- a/libraries/logger/buildscript.txt +++ b/libraries/logger/buildscript.txt @@ -4,8 +4,7 @@ logger --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt index 8b399cba2e..1e9aa77be1 100644 --- a/libraries/metrics/buildscript.txt +++ b/libraries/metrics/buildscript.txt @@ -4,8 +4,7 @@ metrics --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt index dfb3410cd4..3c553c8e53 100644 --- a/libraries/o-error/buildscript.txt +++ b/libraries/o-error/buildscript.txt @@ -4,8 +4,7 @@ o-error --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt index b22c3498be..5702b078a4 100644 --- a/libraries/object-persistor/buildscript.txt +++ b/libraries/object-persistor/buildscript.txt @@ -4,8 +4,7 @@ object-persistor --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/overleaf-editor-core/buildscript.txt b/libraries/overleaf-editor-core/buildscript.txt index 5d91717efd..c557964544 100644 --- a/libraries/overleaf-editor-core/buildscript.txt +++ b/libraries/overleaf-editor-core/buildscript.txt @@ -4,8 +4,7 @@ overleaf-editor-core --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/ranges-tracker/buildscript.txt b/libraries/ranges-tracker/buildscript.txt index bda2936c40..ba0df9fb19 100644 --- a/libraries/ranges-tracker/buildscript.txt +++ b/libraries/ranges-tracker/buildscript.txt @@ -4,8 +4,7 @@ ranges-tracker --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt index c0e455dce2..84980bf9bb 100644 --- a/libraries/redis-wrapper/buildscript.txt +++ b/libraries/redis-wrapper/buildscript.txt @@ -4,8 +4,7 @@ redis-wrapper --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt index a820537935..345c267230 100644 --- a/libraries/settings/buildscript.txt +++ b/libraries/settings/buildscript.txt @@ -4,8 +4,7 @@ settings --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/libraries/stream-utils/buildscript.txt b/libraries/stream-utils/buildscript.txt index 982551b2bb..22f722101f 100644 --- a/libraries/stream-utils/buildscript.txt +++ b/libraries/stream-utils/buildscript.txt @@ -4,8 +4,7 @@ stream-utils --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --is-library=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/package-lock.json b/package-lock.json index 74defebe01..a37a118947 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,6 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-promise": "^6.0.0", - "nodemon": "^3.0.1", "prettier": "2.5.1" } }, @@ -30169,12 +30168,6 @@ "node": ">= 4" } }, - "node_modules/ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", - "dev": true - }, "node_modules/image-size": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", @@ -35306,97 +35299,6 @@ "aws-sdk": "^2.2.36" } }, - "node_modules/nodemon": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.1.tgz", - "integrity": "sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==", - "dev": true, - "dependencies": { - "chokidar": "^3.5.2", - "debug": "^3.2.7", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^7.5.3", - "simple-update-notifier": "^2.0.0", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "bin": { - "nodemon": "bin/nodemon.js" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nodemon" - } - }, - "node_modules/nodemon/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/nodemon/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/nodemon/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/nodemon/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/nodemon/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/nodemon/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -37851,12 +37753,6 @@ "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, - "node_modules/pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true - }, "node_modules/pug": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz", @@ -42937,33 +42833,6 @@ "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz", "integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=" }, - "node_modules/touch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", - "dev": true, - "dependencies": { - "nopt": "~1.0.10" - }, - "bin": { - "nodetouch": "bin/nodetouch.js" - } - }, - "node_modules/touch/node_modules/nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "dev": true, - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "*" - } - }, "node_modules/tough-cookie": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", @@ -43278,12 +43147,6 @@ "react": ">=15.0.0" } }, - "node_modules/undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true - }, "node_modules/underscore": { "version": "1.13.2", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz", @@ -45833,8 +45696,7 @@ "devDependencies": { "chai": "^4.3.6", "chai-as-promised": "^7.1.1", - "mocha": "^10.2.0", - "nodemon": "^3.0.1" + "mocha": "^10.2.0" } }, "services/github-sync": { @@ -70871,7 +70733,6 @@ "express": "^4.18.2", "is-valid-hostname": "^1.0.2", "mocha": "^10.2.0", - "nodemon": "^3.0.1", "tar-stream": "^2.2.0", "zlib": "^1.0.5" } @@ -72627,12 +72488,6 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==" }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", - "dev": true - }, "image-size": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", @@ -76652,74 +76507,6 @@ "aws-sdk": "^2.2.36" } }, - "nodemon": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.1.tgz", - "integrity": "sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==", - "dev": true, - "requires": { - "chokidar": "^3.5.2", - "debug": "^3.2.7", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^7.5.3", - "simple-update-notifier": "^2.0.0", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, "nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -78723,12 +78510,6 @@ "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, - "pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true - }, "pug": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz", @@ -82711,26 +82492,6 @@ "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz", "integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=" }, - "touch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", - "dev": true, - "requires": { - "nopt": "~1.0.10" - }, - "dependencies": { - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "dev": true, - "requires": { - "abbrev": "1" - } - } - } - }, "tough-cookie": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", @@ -82968,12 +82729,6 @@ "react-lifecycles-compat": "^3.0.4" } }, - "undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true - }, "underscore": { "version": "1.13.2", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz", diff --git a/package.json b/package.json index 013dc9db4e..ebb9b32a03 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-promise": "^6.0.0", - "nodemon": "^3.0.1", "prettier": "2.5.1" }, "scripts": { diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index 7323bb4d41..7fc630dfa6 100644 --- a/services/chat/buildscript.txt +++ b/services/chat/buildscript.txt @@ -4,7 +4,6 @@ chat --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/chat/nodemon.json b/services/chat/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/chat/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/chat/package.json b/services/chat/package.json index fbabc1e161..bff2c865d9 100644 --- a/services/chat/package.json +++ b/services/chat/package.json @@ -8,7 +8,7 @@ "start": "node $NODE_APP_OPTIONS app.js", "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "lint": "eslint --max-warnings 0 --format unix .", diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt index 41b6da553a..d0d12e7424 100644 --- a/services/clsi/buildscript.txt +++ b/services/clsi/buildscript.txt @@ -6,7 +6,6 @@ clsi --env-pass-through=TEXLIVE_IMAGE --esmock-loader=False --has-custom-cloudbuild=True ---has-custom-nodemon=False --node-version=18.18.0 --public-repo=True ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/clsi/nodemon.json b/services/clsi/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/clsi/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/clsi/package.json b/services/clsi/package.json index 5b0239b337..b78357be1c 100644 --- a/services/clsi/package.json +++ b/services/clsi/package.json @@ -9,7 +9,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", "format:fix": "prettier --write $PWD/'**/*.js'", diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index a210eb3924..321956a756 100644 --- a/services/contacts/buildscript.txt +++ b/services/contacts/buildscript.txt @@ -4,7 +4,6 @@ contacts --env-add= --env-pass-through= --esmock-loader=True ---has-custom-nodemon=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/contacts/nodemon.json b/services/contacts/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/contacts/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/contacts/package.json b/services/contacts/package.json index 2dc6784092..accdb90f15 100644 --- a/services/contacts/package.json +++ b/services/contacts/package.json @@ -10,7 +10,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", "format:fix": "prettier --write $PWD/'**/*.js'", diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index c7c7b0c3b0..fb4b2450c5 100644 --- a/services/docstore/buildscript.txt +++ b/services/docstore/buildscript.txt @@ -4,7 +4,6 @@ docstore --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=True --node-version=18.18.0 --public-repo=True ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/docstore/nodemon.json b/services/docstore/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/docstore/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/docstore/package.json b/services/docstore/package.json index aa39d55804..5df199c972 100644 --- a/services/docstore/package.json +++ b/services/docstore/package.json @@ -9,7 +9,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", "format:fix": "prettier --write $PWD/'**/*.js'", diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index df00a6d713..07009f58cf 100644 --- a/services/document-updater/buildscript.txt +++ b/services/document-updater/buildscript.txt @@ -4,7 +4,6 @@ document-updater --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=True --node-version=18.18.0 --public-repo=True ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/document-updater/nodemon.json b/services/document-updater/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/document-updater/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/document-updater/package.json b/services/document-updater/package.json index 22175fecdc..b31f82197c 100644 --- a/services/document-updater/package.json +++ b/services/document-updater/package.json @@ -9,7 +9,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", "format:fix": "prettier --write $PWD/'**/*.js'", diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index ea15c3423a..34be793aac 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -5,7 +5,6 @@ filestore --env-add=ENABLE_CONVERSIONS="true",USE_PROM_METRICS="true",AWS_S3_USER_FILES_BUCKET_NAME=fake_user_files,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake_template_files,AWS_S3_PUBLIC_FILES_BUCKET_NAME=fake_public_files,GCS_USER_FILES_BUCKET_NAME=fake_userfiles,GCS_TEMPLATE_FILES_BUCKET_NAME=fake_templatefiles,GCS_PUBLIC_FILES_BUCKET_NAME=fake_publicfiles --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --node-version=18.18.0 --public-repo=True ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/filestore/nodemon.json b/services/filestore/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/filestore/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/filestore/package.json b/services/filestore/package.json index 9386d8d263..9807f7a486 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -9,7 +9,7 @@ "test:unit:run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", "start": "node $NODE_APP_OPTIONS app.js", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", "format:fix": "prettier --write $PWD/'**/*.js'", diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt index 3062ff8f18..d5783517b6 100644 --- a/services/history-v1/buildscript.txt +++ b/services/history-v1/buildscript.txt @@ -4,7 +4,6 @@ history-v1 --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/history-v1/nodemon.json b/services/history-v1/nodemon.json deleted file mode 100644 index 4d98b88d89..0000000000 --- a/services/history-v1/nodemon.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "api/", - "app/js/", - "app.js", - "config/", - "storage/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/history-v1/package.json b/services/history-v1/package.json index 623a95e5c6..570a99f151 100644 --- a/services/history-v1/package.json +++ b/services/history-v1/package.json @@ -59,7 +59,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "migrate": "knex migrate:latest", "delete_old_chunks": "node storage/tasks/delete_old_chunks.js", "fix_duplicate_versions": "node storage/tasks/fix_duplicate_versions.js", diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index c39beac861..7e39bfb79f 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -4,7 +4,6 @@ notifications --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=True --node-version=18.18.0 --public-repo=True ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/notifications/nodemon.json b/services/notifications/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/notifications/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/notifications/package.json b/services/notifications/package.json index 55084a1edb..43eacb5d85 100644 --- a/services/notifications/package.json +++ b/services/notifications/package.json @@ -9,7 +9,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", "format:fix": "prettier --write $PWD/'**/*.js'", diff --git a/services/project-history/buildscript.txt b/services/project-history/buildscript.txt index 8761d9e27b..2dd65a96ba 100644 --- a/services/project-history/buildscript.txt +++ b/services/project-history/buildscript.txt @@ -4,7 +4,6 @@ project-history --env-add= --env-pass-through= --esmock-loader=True ---has-custom-nodemon=True --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/project-history/nodemon.json b/services/project-history/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/project-history/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/project-history/package.json b/services/project-history/package.json index 6c2fc182a1..a33ffea3fa 100644 --- a/services/project-history/package.json +++ b/services/project-history/package.json @@ -8,7 +8,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", "start": "node $NODE_APP_OPTIONS app.js", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "test:acceptance:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", "test:unit:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec $@ test/unit/js", "lint": "eslint --max-warnings 0 --format unix .", diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 6489eee1bf..701fa17001 100644 --- a/services/real-time/buildscript.txt +++ b/services/real-time/buildscript.txt @@ -4,7 +4,6 @@ real-time --env-add= --env-pass-through= --esmock-loader=False ---has-custom-nodemon=False --node-version=18.18.0 --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/real-time/nodemon.json b/services/real-time/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/real-time/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/real-time/package.json b/services/real-time/package.json index bc005b0cd3..067749ad87 100644 --- a/services/real-time/package.json +++ b/services/real-time/package.json @@ -9,7 +9,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", "format:fix": "prettier --write $PWD/'**/*.js'", diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index c7fd9f4263..737efe15a6 100644 --- a/services/spelling/buildscript.txt +++ b/services/spelling/buildscript.txt @@ -5,7 +5,6 @@ spelling --env-add= --env-pass-through= --esmock-loader=True ---has-custom-nodemon=False --node-version=18.18.0-buster --public-repo=False ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/spelling/nodemon.json b/services/spelling/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/spelling/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/spelling/package.json b/services/spelling/package.json index d216e4c9f2..a99d9733af 100644 --- a/services/spelling/package.json +++ b/services/spelling/package.json @@ -14,7 +14,7 @@ "compile:unit_tests": "[ ! -e test/unit/coffee ] && echo 'No unit tests to compile' || coffee -o test/unit/js -c test/unit/coffee", "compile:acceptance_tests": "[ ! -e test/acceptance/coffee ] && echo 'No acceptance tests to compile' || coffee -o test/acceptance/js -c test/acceptance/coffee", "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests && npm run compile:smoke_tests", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "compile:smoke_tests": "[ ! -e test/smoke/coffee ] && echo 'No smoke tests to compile' || coffee -o test/smoke/js -c test/smoke/coffee", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 7198f81142..914500f7f4 100644 --- a/services/track-changes/buildscript.txt +++ b/services/track-changes/buildscript.txt @@ -4,7 +4,6 @@ track-changes --env-add=AWS_BUCKET=bucket --env-pass-through= --esmock-loader=False ---has-custom-nodemon=True --node-version=18.18.0 --public-repo=True ---script-version=4.3.0 +--script-version=4.4.0 diff --git a/services/track-changes/nodemon.json b/services/track-changes/nodemon.json deleted file mode 100644 index 58f7956f20..0000000000 --- a/services/track-changes/nodemon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ignore": [ - ".git", - "node_modules/" - ], - "verbose": true, - "legacyWatch": true, - "execMap": { - "js": "npm run start" - }, - "watch": [ - "app/js/", - "app.js", - "config/", - "../../libraries/" - ], - "ext": "js" -} diff --git a/services/track-changes/package.json b/services/track-changes/package.json index 802c331dee..64d221d971 100644 --- a/services/track-changes/package.json +++ b/services/track-changes/package.json @@ -9,7 +9,7 @@ "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "nodemon": "nodemon --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", "format:fix": "prettier --write $PWD/'**/*.js'", diff --git a/services/web/app/src/infrastructure/Translations.js b/services/web/app/src/infrastructure/Translations.js index 4adffc04e8..68d82ec058 100644 --- a/services/web/app/src/infrastructure/Translations.js +++ b/services/web/app/src/infrastructure/Translations.js @@ -31,6 +31,14 @@ if (!availableLanguageCodes.includes(fallbackLanguageCode)) { availableLanguageCodes.push(fallbackLanguageCode) } +// The "node --watch" flag is not easy to detect. +if (process.argv.includes('--watch-locales')) { + // Dummy imports for setting up watching of locales files. + for (const lngCode of availableLanguageCodes) { + require(`../../../locales/${lngCode}.json`) + } +} + i18n .use(fsBackend) .use(middleware.LanguageDetector) diff --git a/services/web/nodemon.json b/services/web/nodemon.json deleted file mode 100644 index d079a89b35..0000000000 --- a/services/web/nodemon.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "watch": [ - "app/src/", - "app.js", - "locales/*.json", - "modules/*/app/src/", - "config/", - "../../libraries/" - ] -} diff --git a/services/web/package.json b/services/web/package.json index 1b56bab0bf..0c7a7ea0ef 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -18,7 +18,7 @@ "test:karma": "karma start", "test:karma:single": "karma start --no-auto-watch --single-run", "start": "node $NODE_APP_OPTIONS app.js", - "nodemon": "nodemon $NODE_APP_OPTIONS --config nodemon.json", + "nodemon": "node --watch $NODE_APP_OPTIONS app.js --watch-locales", "webpack": "webpack serve --config webpack.config.dev.js", "webpack:production": "webpack --config webpack.config.prod.js", "webpack:profile": "webpack --config webpack.config.prod.js --profile --json > stats.json",