diff --git a/libraries/access-token-encryptor/package.json b/libraries/access-token-encryptor/package.json index a05c280a7c..73734fb8fa 100644 --- a/libraries/access-token-encryptor/package.json +++ b/libraries/access-token-encryptor/package.json @@ -5,10 +5,10 @@ "main": "index.js", "scripts": { "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test:ci": "npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", "types:check": "tsc --noEmit" diff --git a/libraries/fetch-utils/package.json b/libraries/fetch-utils/package.json index fff80001df..9df69e7730 100644 --- a/libraries/fetch-utils/package.json +++ b/libraries/fetch-utils/package.json @@ -5,10 +5,10 @@ "main": "index.js", "scripts": { "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test:ci": "npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", "types:check": "tsc --noEmit" diff --git a/libraries/logger/package.json b/libraries/logger/package.json index f259613a97..6c939dda70 100644 --- a/libraries/logger/package.json +++ b/libraries/logger/package.json @@ -11,10 +11,10 @@ "version": "3.1.1", "scripts": { "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", + "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": "mocha --exit test/**/*.{js,cjs}", "types:check": "tsc --noEmit" diff --git a/libraries/metrics/package.json b/libraries/metrics/package.json index a0616bb8dc..3aa50c9c71 100644 --- a/libraries/metrics/package.json +++ b/libraries/metrics/package.json @@ -29,13 +29,13 @@ "typescript": "^5.0.4" }, "scripts": { - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", "test:unit": "mocha --exit test/**/*.{js,cjs}", "test:acceptance": "mocha --reporter spec --recursive --exit --grep=$MOCHA_GREP test/acceptance", "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test:ci": "npm run test:unit", "types:check": "tsc --noEmit" }, diff --git a/libraries/o-error/package.json b/libraries/o-error/package.json index 0c5f42bb35..4a34b1bcdc 100644 --- a/libraries/o-error/package.json +++ b/libraries/o-error/package.json @@ -18,11 +18,11 @@ ], "scripts": { "build": "npm run --silent test", - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test:ci": "npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", "types:check": "tsc --noEmit" diff --git a/libraries/object-persistor/package.json b/libraries/object-persistor/package.json index 84f0fcce26..8fe38f54d1 100644 --- a/libraries/object-persistor/package.json +++ b/libraries/object-persistor/package.json @@ -6,10 +6,10 @@ "scripts": { "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test:ci": "npm run test:unit", "types:check": "tsc --noEmit" }, diff --git a/libraries/promise-utils/package.json b/libraries/promise-utils/package.json index c34cf645e3..b9464a45bf 100644 --- a/libraries/promise-utils/package.json +++ b/libraries/promise-utils/package.json @@ -6,10 +6,10 @@ "scripts": { "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test:ci": "npm run test:unit", "types:check": "tsc --noEmit" }, diff --git a/libraries/ranges-tracker/package.json b/libraries/ranges-tracker/package.json index b72a16687a..2df71e76b4 100644 --- a/libraries/ranges-tracker/package.json +++ b/libraries/ranges-tracker/package.json @@ -9,10 +9,10 @@ "author": "Overleaf (https://www.overleaf.com)", "private": true, "scripts": { - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", "test:ci": "npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", diff --git a/libraries/redis-wrapper/package.json b/libraries/redis-wrapper/package.json index 634a657584..56372e1dba 100644 --- a/libraries/redis-wrapper/package.json +++ b/libraries/redis-wrapper/package.json @@ -13,10 +13,10 @@ "repository": "github:overleaf/redis-wrapper", "license": "ISC", "scripts": { - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", "test:ci": "npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", diff --git a/libraries/settings/package.json b/libraries/settings/package.json index 10e207352b..c7d049098f 100644 --- a/libraries/settings/package.json +++ b/libraries/settings/package.json @@ -5,10 +5,10 @@ "repository": "overleaf/settings-module", "main": "index.js", "scripts": { - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", "test:ci": "npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", diff --git a/libraries/stream-utils/package.json b/libraries/stream-utils/package.json index d5d8374918..83f03146d7 100644 --- a/libraries/stream-utils/package.json +++ b/libraries/stream-utils/package.json @@ -6,10 +6,10 @@ "scripts": { "test": "npm run lint && npm run format && npm run types:check && npm run test:unit", "test:unit": "mocha --exit test/**/*.{js,cjs}", - "lint": "eslint --ext .js --ext .cjs --max-warnings 0 --format unix .", - "lint:fix": "eslint --fix --ext .js --ext .cjs .", - "format": "prettier --list-different $PWD/'**/*.{js,cjs}'", - "format:fix": "prettier --write $PWD/'**/*.{js,cjs}'", + "lint": "eslint --ext .js --ext .cjs --ext .ts --max-warnings 0 --format unix .", + "lint:fix": "eslint --fix --ext .js --ext .cjs --ext .ts .", + "format": "prettier --list-different $PWD/'**/*.{js,cjs,ts}'", + "format:fix": "prettier --write $PWD/'**/*.{js,cjs,ts}'", "test:ci": "npm run test:unit", "types:check": "tsc --noEmit" }, diff --git a/services/chat/tsconfig.json b/services/chat/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/chat/tsconfig.json +++ b/services/chat/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/clsi/tsconfig.json b/services/clsi/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/clsi/tsconfig.json +++ b/services/clsi/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/contacts/tsconfig.json b/services/contacts/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/contacts/tsconfig.json +++ b/services/contacts/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/docstore/tsconfig.json b/services/docstore/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/docstore/tsconfig.json +++ b/services/docstore/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/document-updater/expire_docops.js b/services/document-updater/scripts/expire_docops.js similarity index 97% rename from services/document-updater/expire_docops.js rename to services/document-updater/scripts/expire_docops.js index 42a7f40024..463509e26b 100644 --- a/services/document-updater/expire_docops.js +++ b/services/document-updater/scripts/expire_docops.js @@ -4,7 +4,7 @@ const rclient = require('@overleaf/redis-wrapper').createClient( ) let keys = Settings.redis.documentupdater.key_schema const async = require('async') -const RedisManager = require('./app/js/RedisManager') +const RedisManager = require('../app/js/RedisManager') const getKeysFromNode = function (node, pattern, callback) { let cursor = 0 // redis iterator diff --git a/services/document-updater/tsconfig.json b/services/document-updater/tsconfig.json index b537da424c..d3fdd3022a 100644 --- a/services/document-updater/tsconfig.json +++ b/services/document-updater/tsconfig.json @@ -2,11 +2,11 @@ "extends": "../../tsconfig.backend.json", "include": [ "app.js", - "expire_docops.js", "app/js/**/*", "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 8fa89b5692..a19cf67af4 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -50,12 +50,6 @@ lint: lint_fix: $(RUN_LINTING) lint:fix -lint_styles: - $(RUN_LINTING) lint:styles - -lint_styles_fix: - $(RUN_LINTING) lint:styles:fix - typecheck: $(RUN_LINTING) types:check diff --git a/services/filestore/tsconfig.json b/services/filestore/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/filestore/tsconfig.json +++ b/services/filestore/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt index 6da3f2009d..4303b9f845 100644 --- a/services/history-v1/buildscript.txt +++ b/services/history-v1/buildscript.txt @@ -7,3 +7,4 @@ history-v1 --node-version=18.20.2 --public-repo=False --script-version=4.5.0 +--tsconfig-extra-includes=api/**/*,migrations/**/*,storage/**/* diff --git a/services/history-v1/tsconfig.json b/services/history-v1/tsconfig.json index 8a71ea2143..f8812e8818 100644 --- a/services/history-v1/tsconfig.json +++ b/services/history-v1/tsconfig.json @@ -1,14 +1,15 @@ { "extends": "../../tsconfig.backend.json", "include": [ - "app.js", "api/**/*", + "app.js", "app/js/**/*", "benchmarks/**/*", "config/**/*", "migrations/**/*", - "storage/**/*", "scripts/**/*", - "test/**/*" + "storage/**/*", + "test/**/*", + "types" ] } diff --git a/services/notifications/tsconfig.json b/services/notifications/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/notifications/tsconfig.json +++ b/services/notifications/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/project-history/tsconfig.json b/services/project-history/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/project-history/tsconfig.json +++ b/services/project-history/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/real-time/tsconfig.json b/services/real-time/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/real-time/tsconfig.json +++ b/services/real-time/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] } diff --git a/services/spelling/tsconfig.json b/services/spelling/tsconfig.json index 066c19b762..d3fdd3022a 100644 --- a/services/spelling/tsconfig.json +++ b/services/spelling/tsconfig.json @@ -3,8 +3,10 @@ "include": [ "app.js", "app/js/**/*", + "benchmarks/**/*", "config/**/*", "scripts/**/*", - "test/**/*" + "test/**/*", + "types" ] }