Merge pull request #28482 from overleaf/ar-move-notifications-changes-into-buildscripts

[monorepo] move notifications changes into buildscripts

GitOrigin-RevId: b5948702627d0bc87bffd3acc3d7c2ab9f4ac23d

libraries/access-token-encryptor/buildscript.txt

@@ -7,4 +7,3 @@ access-token-encryptor
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/access-token-encryptor/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/fetch-utils/buildscript.txt

@@ -7,4 +7,3 @@ fetch-utils
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/fetch-utils/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/logger/buildscript.txt

@@ -7,4 +7,3 @@ logger
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/logger/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/metrics/buildscript.txt

@@ -7,4 +7,3 @@ metrics
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/metrics/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/mongo-utils/buildscript.txt

@@ -7,4 +7,3 @@ mongo-utils
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/mongo-utils/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/o-error/buildscript.txt

@@ -7,4 +7,3 @@ o-error
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/o-error/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/object-persistor/buildscript.txt

@@ -7,4 +7,3 @@ object-persistor
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/object-persistor/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/overleaf-editor-core/buildscript.txt

@@ -7,4 +7,3 @@ overleaf-editor-core
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/overleaf-editor-core/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/promise-utils/buildscript.txt

@@ -7,4 +7,3 @@ promise-utils
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/promise-utils/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/ranges-tracker/buildscript.txt

@@ -7,4 +7,3 @@ ranges-tracker
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/ranges-tracker/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/redis-wrapper/buildscript.txt

@@ -7,4 +7,3 @@ redis-wrapper
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/redis-wrapper/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/settings/buildscript.txt

@@ -7,4 +7,3 @@ settings
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/settings/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/stream-utils/buildscript.txt

@@ -7,4 +7,3 @@ stream-utils
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

libraries/stream-utils/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "**/*.js",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

libraries/validation-tools/buildscript.txt

@@ -7,4 +7,5 @@ validation-tools
 --is-library=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0
+--test-acceptance-vitest=True
+--test-unit-vitest=True

libraries/validation-tools/package.json

@@ -16,7 +16,7 @@
     "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .",
     "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .",
     "test:ci": "npm run test:unit",
-    "test:unit": "vitest test/unit/src/*.test.ts --isolate=false",
+    "test:unit": "vitest test/unit --isolate=false",
     "types:check": "tsc --noEmit"
   },
   "dependencies": {

libraries/validation-tools/tsconfig.json

@@ -1,11 +1,8 @@
 {
   "extends": "../../tsconfig.backend.json",
-  "compilerOptions": {
-    "allowImportingTsExtensions": true
-  },
   "include": [
     "**/*.js",
-    "**/*.ts",
-    "**/*.cjs"
+    "**/*.cjs",
+    "**/*.ts"
   ]
 }

services/chat/buildscript.txt

@@ -6,4 +6,3 @@ chat
 --esmock-loader=False
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

services/contacts/buildscript.txt

@@ -6,4 +6,3 @@ contacts
 --esmock-loader=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

services/docstore/buildscript.txt

@@ -6,4 +6,3 @@ docstore
 --esmock-loader=False
 --node-version=22.18.0
 --public-repo=True
---script-version=4.7.0

services/document-updater/buildscript.txt

@@ -6,4 +6,3 @@ document-updater
 --esmock-loader=False
 --node-version=22.18.0
 --public-repo=True
---script-version=4.7.0

services/filestore/buildscript.txt

@@ -7,6 +7,5 @@ filestore
 --esmock-loader=False
 --node-version=22.18.0
 --public-repo=True
---script-version=4.7.0
 --test-acceptance-shards=SHARD_01_,SHARD_02_,SHARD_03_
 --use-large-ci-runner=True

services/history-v1/buildscript.txt

@@ -6,5 +6,4 @@ history-v1
 --esmock-loader=False
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0
 --tsconfig-extra-includes=backup-deletion-app.mjs,backup-verifier-app.mjs,backup-worker-app.mjs,api/**/*,migrations/**/*,storage/**/*

services/notifications/buildscript.txt

@@ -6,4 +6,5 @@ notifications
 --esmock-loader=False
 --node-version=22.18.0
 --public-repo=True
---script-version=4.7.0
+--test-unit-vitest=True
+--tsconfig-extra-includes=vitest.config.unit.cjs,vitest.config.acceptance.cjs

services/notifications/docker-compose.ci.yml

@@ -15,6 +15,7 @@ services:
       MONGO_CONNECTION_STRING: mongodb://mongo/test-overleaf
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
+      VITEST_NO_CACHE: true
     depends_on:
       mongo:
         condition: service_started

services/notifications/docker-compose.yml

@@ -9,8 +9,8 @@ services:
       - .:/overleaf/services/notifications
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
-      - ../../tsconfig.backend.json:/overleaf/tsconfig.backend.json
       - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
+      - ../../tsconfig.backend.json:/overleaf/tsconfig.backend.json
     working_dir: /overleaf/services/notifications
     environment:
       MOCHA_GREP: ${MOCHA_GREP}
@@ -62,3 +62,4 @@ services:
       # replica set. This override is not needed when running the setup after
       # starting up mongo.
       - mongo:127.0.0.1
+

services/notifications/package.json

@@ -8,13 +8,14 @@
     "start": "node app.js",
     "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
-    "test:unit:_run": "vitest ${NO_CACHE:+\"--no-cache\"} $@ test/unit/js",
-    "test:unit": "npm run test:unit:_run",
+    "test:unit:_run": "vitest --config ./vitest.config.unit.cjs",
+    "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "lint": "eslint --max-warnings 0 --format unix .",
     "format": "prettier --list-different $PWD/'**/{*.*js,Jenkinsfile}'",
     "format:fix": "prettier --write $PWD/'**/{*.*js,Jenkinsfile}'",
     "lint:fix": "eslint --fix .",
-    "types:check": "tsc --noEmit"
+    "types:check": "tsc --noEmit",
+    "nodemon": "node --watch app.js"
   },
   "author": "",
   "license": "ISC",
@@ -33,7 +34,9 @@
     "mongodb-legacy": "6.1.3"
   },
   "devDependencies": {
+    "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
+    "mocha": "^11.1.0",
     "typescript": "^5.0.4",
     "vitest": "^3.2.4"
   }

services/notifications/tsconfig.json

@@ -2,12 +2,13 @@
   "extends": "../../tsconfig.backend.json",
   "include": [
     "app.js",
-    "vitest.config.cjs",
     "app/js/**/*",
     "benchmarks/**/*",
     "config/**/*",
     "scripts/**/*",
     "test/**/*",
-    "types"
+    "types",
+    "vitest.config.acceptance.cjs",
+    "vitest.config.unit.cjs"
   ]
 }

services/project-history/buildscript.txt

@@ -6,4 +6,3 @@ project-history
 --esmock-loader=True
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

services/real-time/buildscript.txt

@@ -6,4 +6,3 @@ real-time
 --esmock-loader=False
 --node-version=22.18.0
 --public-repo=False
---script-version=4.7.0

tsconfig.backend.json

@@ -4,6 +4,7 @@
     "allowJs": true,
     "esModuleInterop": true,
     "moduleResolution": "node",
+    "allowImportingTsExtensions": true,
     "noEmit": true,
     "noImplicitAny": false,
     "paths": {