diff --git a/.gitignore b/.gitignore index ce36265815..ce9b08ec5f 100644 --- a/.gitignore +++ b/.gitignore @@ -83,4 +83,5 @@ pods/front/dist metrics.txt dev/tool/report*.csv tests/db_dump -.build \ No newline at end of file +.build +.format \ No newline at end of file diff --git a/dev/account/package.json b/dev/account/package.json index 52fa39fb0a..a4422bfb8f 100644 --- a/dev/account/package.json +++ b/dev/account/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/dev/client-resources/package.json b/dev/client-resources/package.json index e3cca7c8d2..11950b15e5 100644 --- a/dev/client-resources/package.json +++ b/dev/client-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/dev/generator/package.json b/dev/generator/package.json index 1c739c1f59..7863e4304b 100644 --- a/dev/generator/package.json +++ b/dev/generator/package.json @@ -12,7 +12,7 @@ "bundle": "esbuild src/index.ts --bundle --minify --platform=node > bundle.js", "run-local": "TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ts-node ./src/index.ts", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/dev/server/package.json b/dev/server/package.json index fbedf86705..c27f1c4c9c 100644 --- a/dev/server/package.json +++ b/dev/server/package.json @@ -10,7 +10,7 @@ "lint:fix": "eslint --fix src", "start": "ts-node src/__start.ts", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/dev/storage/package.json b/dev/storage/package.json index 93c6f0c4b1..b6877925b5 100644 --- a/dev/storage/package.json +++ b/dev/storage/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/dev/tool/package.json b/dev/tool/package.json index 1afd9d4ccd..1717ac6977 100644 --- a/dev/tool/package.json +++ b/dev/tool/package.json @@ -17,7 +17,7 @@ "run": "cross-env node -r ts-node/register --max-old-space-size=8000 ./src/__start.ts", "upgrade": "rushx run-local upgrade", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/models/activity/package.json b/models/activity/package.json index c10547ba4e..f88028b63d 100644 --- a/models/activity/package.json +++ b/models/activity/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/all/package.json b/models/all/package.json index 23bbea3fb1..f22c5d2aed 100644 --- a/models/all/package.json +++ b/models/all/package.json @@ -12,7 +12,7 @@ "version": "ts-node src/__showversion.ts", "bumpversion": "ts-node src/__bumpversion.ts", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/attachment/package.json b/models/attachment/package.json index 82282fa829..8947850433 100644 --- a/models/attachment/package.json +++ b/models/attachment/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/bitrix/package.json b/models/bitrix/package.json index 8d6bf2c4cf..cdd9a721a0 100644 --- a/models/bitrix/package.json +++ b/models/bitrix/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/board/package.json b/models/board/package.json index ff23fd8a69..a328d43453 100644 --- a/models/board/package.json +++ b/models/board/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/calendar/package.json b/models/calendar/package.json index 7dcfcd3727..d0fed2f989 100644 --- a/models/calendar/package.json +++ b/models/calendar/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/chunter/package.json b/models/chunter/package.json index a96a26f7e3..74061ad7da 100644 --- a/models/chunter/package.json +++ b/models/chunter/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/contact/package.json b/models/contact/package.json index b6e8180b8d..f71b96aa00 100644 --- a/models/contact/package.json +++ b/models/contact/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/core/package.json b/models/core/package.json index f1b6a223b3..cd1c21cdde 100644 --- a/models/core/package.json +++ b/models/core/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/gmail/package.json b/models/gmail/package.json index fbba1d25e2..2b5d03db4e 100644 --- a/models/gmail/package.json +++ b/models/gmail/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/hr/package.json b/models/hr/package.json index a239c9ed35..50f8aeb607 100644 --- a/models/hr/package.json +++ b/models/hr/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/inventory/package.json b/models/inventory/package.json index 1e6a2ab100..5a6d666b8c 100644 --- a/models/inventory/package.json +++ b/models/inventory/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/lead/package.json b/models/lead/package.json index adb313dbd5..e1ade6117e 100644 --- a/models/lead/package.json +++ b/models/lead/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/notification/package.json b/models/notification/package.json index 44bfae31b8..4003a49c68 100644 --- a/models/notification/package.json +++ b/models/notification/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/preference/package.json b/models/preference/package.json index 32753a598e..a08d28e50e 100644 --- a/models/preference/package.json +++ b/models/preference/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/presentation/package.json b/models/presentation/package.json index 6591867f58..d265a47b45 100644 --- a/models/presentation/package.json +++ b/models/presentation/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/recruit/package.json b/models/recruit/package.json index 02fe21efb2..a1e6742397 100644 --- a/models/recruit/package.json +++ b/models/recruit/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/request/package.json b/models/request/package.json index 8df5135603..5b7b1f67a9 100644 --- a/models/request/package.json +++ b/models/request/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-attachment/package.json b/models/server-attachment/package.json index 7c81e9ffc7..96fdce785d 100644 --- a/models/server-attachment/package.json +++ b/models/server-attachment/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-calendar/package.json b/models/server-calendar/package.json index 8ce0d29796..53b4a2004d 100644 --- a/models/server-calendar/package.json +++ b/models/server-calendar/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-chunter/package.json b/models/server-chunter/package.json index 2f2de34494..5b32bb2b64 100644 --- a/models/server-chunter/package.json +++ b/models/server-chunter/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-contact/package.json b/models/server-contact/package.json index c0a70eaea8..3e0566bd5a 100644 --- a/models/server-contact/package.json +++ b/models/server-contact/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-core/package.json b/models/server-core/package.json index 1f90621250..5ae0dfe1ec 100644 --- a/models/server-core/package.json +++ b/models/server-core/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-gmail/package.json b/models/server-gmail/package.json index ab285d6f87..b8922250c3 100644 --- a/models/server-gmail/package.json +++ b/models/server-gmail/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-hr/package.json b/models/server-hr/package.json index c02a504759..37fb741c7d 100644 --- a/models/server-hr/package.json +++ b/models/server-hr/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-inventory/package.json b/models/server-inventory/package.json index 8db5ea5ad9..1aecae56a6 100644 --- a/models/server-inventory/package.json +++ b/models/server-inventory/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-lead/package.json b/models/server-lead/package.json index 3f8d43a712..2775dcf05d 100644 --- a/models/server-lead/package.json +++ b/models/server-lead/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-notification/package.json b/models/server-notification/package.json index f8dd92d068..e14a871667 100644 --- a/models/server-notification/package.json +++ b/models/server-notification/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-openai/package.json b/models/server-openai/package.json index 939f5737d8..4fec879310 100644 --- a/models/server-openai/package.json +++ b/models/server-openai/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-recruit/package.json b/models/server-recruit/package.json index 2263e85671..07f95483db 100644 --- a/models/server-recruit/package.json +++ b/models/server-recruit/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-request/package.json b/models/server-request/package.json index 0b90afc2b1..1cd75f52cf 100644 --- a/models/server-request/package.json +++ b/models/server-request/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-setting/package.json b/models/server-setting/package.json index c5b0c9ad2a..371ba06aab 100644 --- a/models/server-setting/package.json +++ b/models/server-setting/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-tags/package.json b/models/server-tags/package.json index 7ccdc415ff..456bd4fccb 100644 --- a/models/server-tags/package.json +++ b/models/server-tags/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-task/package.json b/models/server-task/package.json index b39f493845..d77e39f7d9 100644 --- a/models/server-task/package.json +++ b/models/server-task/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-telegram/package.json b/models/server-telegram/package.json index c909a8cdcf..d8ac768a31 100644 --- a/models/server-telegram/package.json +++ b/models/server-telegram/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-tracker/package.json b/models/server-tracker/package.json index 4450c78c19..732fe45f13 100644 --- a/models/server-tracker/package.json +++ b/models/server-tracker/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-translate/package.json b/models/server-translate/package.json index 641c61d9e9..60600ea4c6 100644 --- a/models/server-translate/package.json +++ b/models/server-translate/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/server-view/package.json b/models/server-view/package.json index 532279dcb3..4ebb348faa 100644 --- a/models/server-view/package.json +++ b/models/server-view/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/setting/package.json b/models/setting/package.json index 49cb5103bc..73238c5bbc 100644 --- a/models/setting/package.json +++ b/models/setting/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/support/package.json b/models/support/package.json index c2fde1113c..595407927e 100644 --- a/models/support/package.json +++ b/models/support/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/tags/package.json b/models/tags/package.json index 9c8d070425..5aaff24030 100644 --- a/models/tags/package.json +++ b/models/tags/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/task/package.json b/models/task/package.json index 1ea8d2d512..ef005f4e6d 100644 --- a/models/task/package.json +++ b/models/task/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/telegram/package.json b/models/telegram/package.json index 11e24b083f..6f47f668ff 100644 --- a/models/telegram/package.json +++ b/models/telegram/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/templates/package.json b/models/templates/package.json index 3fa4cb7a67..01c46c81ce 100644 --- a/models/templates/package.json +++ b/models/templates/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/text-editor/package.json b/models/text-editor/package.json index de29410486..7b8e464201 100644 --- a/models/text-editor/package.json +++ b/models/text-editor/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/tracker/package.json b/models/tracker/package.json index 3990149a8b..e46b7fae34 100644 --- a/models/tracker/package.json +++ b/models/tracker/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/view/package.json b/models/view/package.json index 9b06b2b330..01c13b4f85 100644 --- a/models/view/package.json +++ b/models/view/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/models/workbench/package.json b/models/workbench/package.json index 7595abf073..dfd87e05c8 100644 --- a/models/workbench/package.json +++ b/models/workbench/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "template": "@hcengineering/model-package", "devDependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index 578ec96be6..4890070b35 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/packages/kanban/package.json b/packages/kanban/package.json index 6cf6e54329..948850dbbb 100644 --- a/packages/kanban/package.json +++ b/packages/kanban/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/packages/model/package.json b/packages/model/package.json index c7a9e75102..69f2dd1dcf 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/packages/panel/package.json b/packages/panel/package.json index 18b0e4311a..175dbffbe8 100644 --- a/packages/panel/package.json +++ b/packages/panel/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/packages/platform-rig/bin/format.js b/packages/platform-rig/bin/format.js new file mode 100755 index 0000000000..175be71475 --- /dev/null +++ b/packages/platform-rig/bin/format.js @@ -0,0 +1,97 @@ +const { join, dirname, relative, extname, basename } = require("path") +const { readFileSync, writeFileSync, existsSync, readdirSync, lstatSync, copyFileSync, mkdirSync, rmSync, current } = require('fs') +const { spawnSync, execSync } = require('child_process') +const crypto = require('crypto') + +if(!existsSync('.format')) { + mkdirSync('.format', { recursive: true }) +} + +let hash = {} + +if( existsSync('.format/format.json') ) { + hash = JSON.parse(readFileSync('.format/format.json').toString()) +} + +let filesToCheck = [] +let allFiles = [] + +let newHash = {} + +function calcHash(source, msg) { + const files = readdirSync(source) + for (const f of files) { + const sourceFile = join(source, f) + + if (lstatSync(sourceFile).isDirectory()) { + calcHash(sourceFile, msg) + } else { + let ext = basename(sourceFile) + if( !ext.endsWith('.ts') && !ext.endsWith('.js') && !ext.endsWith('.svelte')) { + continue + } + const hasher = crypto.createHash('md5') + hasher.update(readFileSync(sourceFile)) + let digest = hasher.digest('hex') + if( hash[sourceFile] !== digest ) { + filesToCheck.push(sourceFile) + console.log(msg, relative(process.cwd(), sourceFile)) + } + newHash[sourceFile] = digest + allFiles.push(sourceFile) + } + } +} + +for( const v of process.argv.slice(2)) { + if( existsSync(v) ) { + console.log('checking:', join( process.cwd(), v) ) + calcHash(join(process.cwd(), v), 'changed') + } +} + +if( process.argv.includes('-f')) { + filesToCheck = allFiles +} + +if( filesToCheck.length > 0 ) { + console.log(`running prettier ${filesToCheck.length}`) + // Changes detected. + const prettier = spawnSync(join(process.cwd(), 'node_modules/.bin/prettier'), ["--color", "--plugin-search-dir=.", "--write", ...filesToCheck],) + if( prettier.stdout != null) { + writeFileSync('.format/prettier.log', prettier.stdout) + console.log(prettier.stdout.toString()) + } + if( prettier.stderr != null) { + writeFileSync('.format/prettier.err', prettier.stderr) + console.error(prettier.stderr.toString()) + } + + console.log(`running eslint ${filesToCheck.length}`) + const eslint = spawnSync(join(process.cwd(), 'node_modules/.bin/eslint'), ["--color", "--fix", ...filesToCheck]) + if(eslint.stdout != null) { + writeFileSync('.format/eslint.log', eslint.stdout) + console.log(eslint.stdout.toString()) + } + if( eslint.stderr != null) { + writeFileSync('.format/eslint.err', eslint.stderr) + console.error(eslint.stderr.toString()) + } + if( prettier.status || eslint.status) { + console.log('prettier and eslint failed', prettier.status, eslint.status) + process.exit(1) + } + + hash = newHash + for( const v of process.argv.slice(2)) { + if( existsSync(v) ) { + calcHash(join(process.cwd(), v), 'updated') + } + } + writeFileSync('.format/format.json', JSON.stringify(newHash, undefined, 2)) +} else { + console.log('No changes detected.') +} + +process.exit(0) + diff --git a/packages/platform-rig/package.json b/packages/platform-rig/package.json index 199c079311..12a49dcc21 100644 --- a/packages/platform-rig/package.json +++ b/packages/platform-rig/package.json @@ -5,6 +5,9 @@ "build": "", "format": "" }, + "bin": { + "format": "./bin/format.js" + }, "devDependencies": { "eslint-config-standard-with-typescript": "^23.0.0" }, diff --git a/packages/platform-rig/profiles/ui/config/rush-project.json b/packages/platform-rig/profiles/ui/config/rush-project.json index 049fee47ae..e8f8372fbe 100644 --- a/packages/platform-rig/profiles/ui/config/rush-project.json +++ b/packages/platform-rig/profiles/ui/config/rush-project.json @@ -20,14 +20,6 @@ { "operationName": "build:watch", "outputFolderNames": ["lib", "dist_cache"] - }, - { - "operationName": "format", - "outputFolderNames": [".rush/temp/.format"] - }, - { - "operationName": "svelte-check", - "outputFolderNames": [".rush/temp/.svelte-check"] } ] } \ No newline at end of file diff --git a/packages/platform/package.json b/packages/platform/package.json index 56c48e80ca..bfa5f5502c 100644 --- a/packages/platform/package.json +++ b/packages/platform/package.json @@ -16,7 +16,7 @@ "test": "jest --passWithNoTests --silent", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/packages/presentation/package.json b/packages/presentation/package.json index c88547831d..5523f66d66 100644 --- a/packages/presentation/package.json +++ b/packages/presentation/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/packages/query/package.json b/packages/query/package.json index 98c269d4fa..0a01fb2696 100644 --- a/packages/query/package.json +++ b/packages/query/package.json @@ -10,7 +10,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/packages/rekoni/package.json b/packages/rekoni/package.json index 3f310e1541..17b3ea6c37 100644 --- a/packages/rekoni/package.json +++ b/packages/rekoni/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "test": "jest --passWithNoTests --silent" }, diff --git a/packages/text-editor/package.json b/packages/text-editor/package.json index cc6b6956d4..3632356349 100644 --- a/packages/text-editor/package.json +++ b/packages/text-editor/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/packages/text/package.json b/packages/text/package.json index 6004a20c16..a3a529c6c4 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -10,7 +10,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/packages/theme/package.json b/packages/theme/package.json index 6bd7143f8f..9af05dfe0a 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -9,7 +9,7 @@ "build": "tsc --noEmit --outDir ./dist_cache && echo build", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/packages/ui/package.json b/packages/ui/package.json index f7ccb869a2..227bc5e5d7 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -10,7 +10,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check" }, "devDependencies": { diff --git a/plugins/activity-assets/package.json b/plugins/activity-assets/package.json index 288d383945..9793f00693 100644 --- a/plugins/activity-assets/package.json +++ b/plugins/activity-assets/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "build:docs": "" }, diff --git a/plugins/activity-resources/package.json b/plugins/activity-resources/package.json index 1b1f39a0b3..3647edfd0d 100644 --- a/plugins/activity-resources/package.json +++ b/plugins/activity-resources/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit --outDir ./dist_cache && echo build", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/activity/package.json b/plugins/activity/package.json index 3ff0d91040..b2a1c71d1e 100644 --- a/plugins/activity/package.json +++ b/plugins/activity/package.json @@ -8,7 +8,7 @@ "build": "tsc", "build:watch": "tsc", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "lint": "eslint src", "test": "jest --passWithNoTests --silent" }, diff --git a/plugins/attachment-assets/package.json b/plugins/attachment-assets/package.json index 1bd9f85b34..286a179f1b 100644 --- a/plugins/attachment-assets/package.json +++ b/plugins/attachment-assets/package.json @@ -11,7 +11,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/attachment-resources/package.json b/plugins/attachment-resources/package.json index a5e2753d55..1bdb325d82 100644 --- a/plugins/attachment-resources/package.json +++ b/plugins/attachment-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/attachment/package.json b/plugins/attachment/package.json index 1262f11ce0..e7cc41139f 100644 --- a/plugins/attachment/package.json +++ b/plugins/attachment/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/bitrix-assets/package.json b/plugins/bitrix-assets/package.json index 2094b3a6f3..6c621b84eb 100644 --- a/plugins/bitrix-assets/package.json +++ b/plugins/bitrix-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/bitrix-resources/package.json b/plugins/bitrix-resources/package.json index 8ab612485d..85b07411e5 100644 --- a/plugins/bitrix-resources/package.json +++ b/plugins/bitrix-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/bitrix/package.json b/plugins/bitrix/package.json index ca1e8013b1..678188d11a 100644 --- a/plugins/bitrix/package.json +++ b/plugins/bitrix/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/board-assets/package.json b/plugins/board-assets/package.json index 176c3c4656..ca524d5f08 100644 --- a/plugins/board-assets/package.json +++ b/plugins/board-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/board-resources/package.json b/plugins/board-resources/package.json index a8876de693..5130d65f97 100644 --- a/plugins/board-resources/package.json +++ b/plugins/board-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/board/package.json b/plugins/board/package.json index a1f0030a42..dfb9a024e5 100644 --- a/plugins/board/package.json +++ b/plugins/board/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/calendar-assets/package.json b/plugins/calendar-assets/package.json index 565e93f7ea..f39b249349 100644 --- a/plugins/calendar-assets/package.json +++ b/plugins/calendar-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/calendar-resources/package.json b/plugins/calendar-resources/package.json index 8765699d4a..c732312063 100644 --- a/plugins/calendar-resources/package.json +++ b/plugins/calendar-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/calendar/package.json b/plugins/calendar/package.json index dd2e58167e..31ab989f82 100644 --- a/plugins/calendar/package.json +++ b/plugins/calendar/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/chunter-assets/package.json b/plugins/chunter-assets/package.json index e6c1d20be1..d45e161173 100644 --- a/plugins/chunter-assets/package.json +++ b/plugins/chunter-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/chunter-resources/package.json b/plugins/chunter-resources/package.json index 0f8ade873b..4c6e4f2741 100644 --- a/plugins/chunter-resources/package.json +++ b/plugins/chunter-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/chunter/package.json b/plugins/chunter/package.json index f1c9f014c0..778aeb1d2d 100644 --- a/plugins/chunter/package.json +++ b/plugins/chunter/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/client-resources/package.json b/plugins/client-resources/package.json index 033fbfbb81..6c93bcc9a9 100644 --- a/plugins/client-resources/package.json +++ b/plugins/client-resources/package.json @@ -15,7 +15,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/client/package.json b/plugins/client/package.json index 63c8598509..d97caa2d88 100644 --- a/plugins/client/package.json +++ b/plugins/client/package.json @@ -15,7 +15,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/contact-assets/package.json b/plugins/contact-assets/package.json index 80ed32007c..98d9f6f1e2 100644 --- a/plugins/contact-assets/package.json +++ b/plugins/contact-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/contact-resources/package.json b/plugins/contact-resources/package.json index f65115551b..ef3c1f3a14 100644 --- a/plugins/contact-resources/package.json +++ b/plugins/contact-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/contact/package.json b/plugins/contact/package.json index 269fec11a7..ef2985e47c 100644 --- a/plugins/contact/package.json +++ b/plugins/contact/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/devmodel-resources/package.json b/plugins/devmodel-resources/package.json index e9c9385ecd..fb63e4ba85 100644 --- a/plugins/devmodel-resources/package.json +++ b/plugins/devmodel-resources/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit --outDir ./dist_cache && echo build", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/devmodel/package.json b/plugins/devmodel/package.json index 1e917782ea..d2dc869cd8 100644 --- a/plugins/devmodel/package.json +++ b/plugins/devmodel/package.json @@ -8,7 +8,7 @@ "build": "tsc", "build:watch": "tsc", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "lint": "eslint src", "test": "jest --passWithNoTests --silent" }, diff --git a/plugins/gmail-assets/package.json b/plugins/gmail-assets/package.json index b9b35c7393..8219718697 100644 --- a/plugins/gmail-assets/package.json +++ b/plugins/gmail-assets/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "build:docs": "" }, diff --git a/plugins/gmail-resources/package.json b/plugins/gmail-resources/package.json index 5c7feb621f..cc0a1bbd6e 100644 --- a/plugins/gmail-resources/package.json +++ b/plugins/gmail-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/gmail/package.json b/plugins/gmail/package.json index 5ae12e6fcd..3f5369b802 100644 --- a/plugins/gmail/package.json +++ b/plugins/gmail/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/hr-assets/package.json b/plugins/hr-assets/package.json index 82a59267da..96582c9e51 100644 --- a/plugins/hr-assets/package.json +++ b/plugins/hr-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/hr-resources/package.json b/plugins/hr-resources/package.json index e693fb01c3..e00e8375e7 100644 --- a/plugins/hr-resources/package.json +++ b/plugins/hr-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/hr/package.json b/plugins/hr/package.json index c447a897d7..4c3520b225 100644 --- a/plugins/hr/package.json +++ b/plugins/hr/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/image-cropper-resources/package.json b/plugins/image-cropper-resources/package.json index 6f5071a4b0..a8535507a7 100644 --- a/plugins/image-cropper-resources/package.json +++ b/plugins/image-cropper-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/image-cropper/package.json b/plugins/image-cropper/package.json index 00abcb461a..1e6873165e 100644 --- a/plugins/image-cropper/package.json +++ b/plugins/image-cropper/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/inventory-assets/package.json b/plugins/inventory-assets/package.json index 636f4e4cb4..347d6258d6 100644 --- a/plugins/inventory-assets/package.json +++ b/plugins/inventory-assets/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "build:docs": "" }, diff --git a/plugins/inventory-resources/package.json b/plugins/inventory-resources/package.json index 12c13c5fed..c9a06fe299 100644 --- a/plugins/inventory-resources/package.json +++ b/plugins/inventory-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/inventory/package.json b/plugins/inventory/package.json index 6f5216e144..5ceb3d0a57 100644 --- a/plugins/inventory/package.json +++ b/plugins/inventory/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/lead-assets/package.json b/plugins/lead-assets/package.json index c38078d999..ffff0f7a62 100644 --- a/plugins/lead-assets/package.json +++ b/plugins/lead-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/lead-resources/package.json b/plugins/lead-resources/package.json index 7bd88a8e11..23b6883f28 100644 --- a/plugins/lead-resources/package.json +++ b/plugins/lead-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/lead/package.json b/plugins/lead/package.json index 8c5eebbccc..98c427c816 100644 --- a/plugins/lead/package.json +++ b/plugins/lead/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/login-assets/package.json b/plugins/login-assets/package.json index 778f8e9f8e..ca0d57f636 100644 --- a/plugins/login-assets/package.json +++ b/plugins/login-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/login-resources/package.json b/plugins/login-resources/package.json index 6a7a679ba3..4a2425d31d 100644 --- a/plugins/login-resources/package.json +++ b/plugins/login-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/login/package.json b/plugins/login/package.json index 389944472d..1bf7219c57 100644 --- a/plugins/login/package.json +++ b/plugins/login/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/notification-assets/package.json b/plugins/notification-assets/package.json index c7a2489b9c..efd4200935 100644 --- a/plugins/notification-assets/package.json +++ b/plugins/notification-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/notification-resources/package.json b/plugins/notification-resources/package.json index 300d09a0ee..e4b97d241e 100644 --- a/plugins/notification-resources/package.json +++ b/plugins/notification-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/notification/package.json b/plugins/notification/package.json index 8c0b54f725..ff75283c30 100644 --- a/plugins/notification/package.json +++ b/plugins/notification/package.json @@ -9,7 +9,7 @@ "build": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "test": "jest --passWithNoTests --silent" }, diff --git a/plugins/preference-assets/package.json b/plugins/preference-assets/package.json index f4c32d41c2..7d610687ca 100644 --- a/plugins/preference-assets/package.json +++ b/plugins/preference-assets/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "build:docs": "" }, diff --git a/plugins/preference/package.json b/plugins/preference/package.json index 6a5bc30cfe..32ec415f12 100644 --- a/plugins/preference/package.json +++ b/plugins/preference/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/recruit-assets/package.json b/plugins/recruit-assets/package.json index b087d4d5a0..2c094a3f41 100644 --- a/plugins/recruit-assets/package.json +++ b/plugins/recruit-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/recruit-resources/package.json b/plugins/recruit-resources/package.json index 060eb43d94..a615f36b3e 100644 --- a/plugins/recruit-resources/package.json +++ b/plugins/recruit-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/recruit/package.json b/plugins/recruit/package.json index 60a20a49a1..91266f00ef 100644 --- a/plugins/recruit/package.json +++ b/plugins/recruit/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/request-assets/package.json b/plugins/request-assets/package.json index 4697a7eb60..3693bae764 100644 --- a/plugins/request-assets/package.json +++ b/plugins/request-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/request-resources/package.json b/plugins/request-resources/package.json index ab02927914..0ceb44242d 100644 --- a/plugins/request-resources/package.json +++ b/plugins/request-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/request/package.json b/plugins/request/package.json index 91023d5923..b9598cd1fb 100644 --- a/plugins/request/package.json +++ b/plugins/request/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/setting-assets/package.json b/plugins/setting-assets/package.json index 82a666f2a6..678dd6afd0 100644 --- a/plugins/setting-assets/package.json +++ b/plugins/setting-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/setting-resources/package.json b/plugins/setting-resources/package.json index ec96e78fac..e3f10fdbdd 100644 --- a/plugins/setting-resources/package.json +++ b/plugins/setting-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/setting/package.json b/plugins/setting/package.json index c3a5828e0d..9a69cbbf75 100644 --- a/plugins/setting/package.json +++ b/plugins/setting/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/support-assets/package.json b/plugins/support-assets/package.json index b10af9170a..f224395029 100644 --- a/plugins/support-assets/package.json +++ b/plugins/support-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/support-resources/package.json b/plugins/support-resources/package.json index 4b921f9b64..c91538de4c 100644 --- a/plugins/support-resources/package.json +++ b/plugins/support-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/support/package.json b/plugins/support/package.json index bbdd6f7b72..3abe613b93 100644 --- a/plugins/support/package.json +++ b/plugins/support/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/tags-assets/package.json b/plugins/tags-assets/package.json index f4ce125680..413a3ccce2 100644 --- a/plugins/tags-assets/package.json +++ b/plugins/tags-assets/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "build:docs": "" }, diff --git a/plugins/tags-resources/package.json b/plugins/tags-resources/package.json index 78fb149ee8..c274065d6d 100644 --- a/plugins/tags-resources/package.json +++ b/plugins/tags-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/tags/package.json b/plugins/tags/package.json index 5d1f219f9b..0ac5436a5a 100644 --- a/plugins/tags/package.json +++ b/plugins/tags/package.json @@ -10,7 +10,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/task-assets/package.json b/plugins/task-assets/package.json index 635fc902d1..e54c8cb73c 100644 --- a/plugins/task-assets/package.json +++ b/plugins/task-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/task-resources/package.json b/plugins/task-resources/package.json index 2e0e1a62ff..0a1da5d76b 100644 --- a/plugins/task-resources/package.json +++ b/plugins/task-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/task/package.json b/plugins/task/package.json index 30dd11ce14..8468383de9 100644 --- a/plugins/task/package.json +++ b/plugins/task/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/telegram-assets/package.json b/plugins/telegram-assets/package.json index 9a1e141c19..45f4f2d048 100644 --- a/plugins/telegram-assets/package.json +++ b/plugins/telegram-assets/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "build:docs": "" }, diff --git a/plugins/telegram-resources/package.json b/plugins/telegram-resources/package.json index f71ada9fc8..618234ee37 100644 --- a/plugins/telegram-resources/package.json +++ b/plugins/telegram-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/telegram/package.json b/plugins/telegram/package.json index 73f27e1a38..15a45fc8df 100644 --- a/plugins/telegram/package.json +++ b/plugins/telegram/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/templates-assets/package.json b/plugins/templates-assets/package.json index 754dfa1cdd..7655d046af 100644 --- a/plugins/templates-assets/package.json +++ b/plugins/templates-assets/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "build:docs": "" }, diff --git a/plugins/templates-resources/package.json b/plugins/templates-resources/package.json index 08a8654a04..98d842b8b5 100644 --- a/plugins/templates-resources/package.json +++ b/plugins/templates-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/templates/package.json b/plugins/templates/package.json index fe1aaa31d6..f1ba6d2101 100644 --- a/plugins/templates/package.json +++ b/plugins/templates/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/tracker-assets/package.json b/plugins/tracker-assets/package.json index d310b90b52..cdfdb2ea72 100644 --- a/plugins/tracker-assets/package.json +++ b/plugins/tracker-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/tracker-resources/package.json b/plugins/tracker-resources/package.json index e1a8812c42..861b888c4f 100644 --- a/plugins/tracker-resources/package.json +++ b/plugins/tracker-resources/package.json @@ -10,7 +10,7 @@ "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/tracker/package.json b/plugins/tracker/package.json index 54af840b3d..5ccbc68bc6 100644 --- a/plugins/tracker/package.json +++ b/plugins/tracker/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/view-assets/package.json b/plugins/view-assets/package.json index 62e80323e1..f6bc2a3dca 100644 --- a/plugins/view-assets/package.json +++ b/plugins/view-assets/package.json @@ -11,7 +11,7 @@ "build:docs": "", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc" }, "devDependencies": { diff --git a/plugins/view-resources/package.json b/plugins/view-resources/package.json index 5dda854750..7dc6c8a245 100644 --- a/plugins/view-resources/package.json +++ b/plugins/view-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "svelte-check": "svelte-check --output human && mkdir -p .rush/temp/.svelte-check", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, diff --git a/plugins/view/package.json b/plugins/view/package.json index 0ebd2b32fa..97a48ed43e 100644 --- a/plugins/view/package.json +++ b/plugins/view/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/plugins/workbench-assets/package.json b/plugins/workbench-assets/package.json index c1d548be05..838a6819ae 100644 --- a/plugins/workbench-assets/package.json +++ b/plugins/workbench-assets/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc", "build:docs": "" }, diff --git a/plugins/workbench-resources/package.json b/plugins/workbench-resources/package.json index 64d0fa9271..e26694327a 100644 --- a/plugins/workbench-resources/package.json +++ b/plugins/workbench-resources/package.json @@ -9,7 +9,7 @@ "build:docs": "api-extractor run --local", "lint": "svelte-check && eslint", "lint:fix": "eslint --fix src", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "build:watch": "tsc --noEmit --outDir ./dist_cache" }, "devDependencies": { diff --git a/plugins/workbench/package.json b/plugins/workbench/package.json index 52e8ed0673..86d17b1cc5 100644 --- a/plugins/workbench/package.json +++ b/plugins/workbench/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/pods/account/package.json b/pods/account/package.json index 72ab8107b2..38cf348961 100644 --- a/pods/account/package.json +++ b/pods/account/package.json @@ -15,7 +15,7 @@ "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/account", "run-local": "cross-env MONGO_URL=mongodb://localhost:27017 MINIO_ACCESS_KEY=minioadmi MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' TRANSACTOR_URL=ws://localhost:3333 ts-node src/__start.ts", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/pods/backup/package.json b/pods/backup/package.json index 697301a09b..bc9b3c66c7 100644 --- a/pods/backup/package.json +++ b/pods/backup/package.json @@ -15,7 +15,7 @@ "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/backup", "run-local": "cross-env ACCOUNTS_URL=http://localhost:3000/ SECRET=secret MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost TRANSACTOR_URL=ws://localhost:3333 BUCKET_NAME=backups INTERVAL=30 ts-node src/index.ts", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/pods/front/package.json b/pods/front/package.json index 46fb525543..4f3e9cd632 100644 --- a/pods/front/package.json +++ b/pods/front/package.json @@ -14,7 +14,7 @@ "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/front", "docker:tbuild": "docker build -t hardcoreeng/front . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/front", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "run-local": "cross-env MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost TRANSACTOR_URL=ws://localhost:3333 SERVER_SECRET='secret' ACCOUNTS_URL=http://localhost:3000 UPLOAD_URL=/files ELASTIC_URL=http://localhost:9200 MODEL_VERSION=$(node ../../models/all/lib/__showversion.js) PUBLIC_DIR='.' ts-node ./src/__start.ts", "test": "jest --passWithNoTests --silent" }, diff --git a/pods/server/package.json b/pods/server/package.json index 98b0ec4995..488d9f5049 100644 --- a/pods/server/package.json +++ b/pods/server/package.json @@ -15,7 +15,7 @@ "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/transactor", "build:watch": "tsc", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "docker:tbuild": "docker build -t hardcoreeng/transactor . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor", "test": "jest --passWithNoTests --silent" }, diff --git a/server-plugins/attachment-resources/package.json b/server-plugins/attachment-resources/package.json index 97526edd4c..38f6c9741c 100644 --- a/server-plugins/attachment-resources/package.json +++ b/server-plugins/attachment-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/attachment/package.json b/server-plugins/attachment/package.json index 976913434f..e979e1ee5c 100644 --- a/server-plugins/attachment/package.json +++ b/server-plugins/attachment/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/calendar-resources/package.json b/server-plugins/calendar-resources/package.json index a8c034f114..df01feaf59 100644 --- a/server-plugins/calendar-resources/package.json +++ b/server-plugins/calendar-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/calendar/package.json b/server-plugins/calendar/package.json index 120ca1525f..ff98102f35 100644 --- a/server-plugins/calendar/package.json +++ b/server-plugins/calendar/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/chunter-resources/package.json b/server-plugins/chunter-resources/package.json index 16a00b4b32..4c6f8f7a16 100644 --- a/server-plugins/chunter-resources/package.json +++ b/server-plugins/chunter-resources/package.json @@ -10,7 +10,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/server-plugins/chunter/package.json b/server-plugins/chunter/package.json index 72ccab1457..4372184761 100644 --- a/server-plugins/chunter/package.json +++ b/server-plugins/chunter/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/contact-resources/package.json b/server-plugins/contact-resources/package.json index c29662ab32..b4e11a92ea 100644 --- a/server-plugins/contact-resources/package.json +++ b/server-plugins/contact-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/contact/package.json b/server-plugins/contact/package.json index cf90170bbd..4054368213 100644 --- a/server-plugins/contact/package.json +++ b/server-plugins/contact/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/gmail-resources/package.json b/server-plugins/gmail-resources/package.json index de50e1332b..7f3df7c112 100644 --- a/server-plugins/gmail-resources/package.json +++ b/server-plugins/gmail-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/gmail/package.json b/server-plugins/gmail/package.json index 6ee9eaad3f..9d6e8a8a02 100644 --- a/server-plugins/gmail/package.json +++ b/server-plugins/gmail/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/hr-resources/package.json b/server-plugins/hr-resources/package.json index 222cfea889..5350d338c8 100644 --- a/server-plugins/hr-resources/package.json +++ b/server-plugins/hr-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/hr/package.json b/server-plugins/hr/package.json index e576a3672d..ff0bdef160 100644 --- a/server-plugins/hr/package.json +++ b/server-plugins/hr/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/inventory-resources/package.json b/server-plugins/inventory-resources/package.json index 32baa1764e..166cab1c84 100644 --- a/server-plugins/inventory-resources/package.json +++ b/server-plugins/inventory-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/inventory/package.json b/server-plugins/inventory/package.json index 4feb6c4a6a..2616e60f88 100644 --- a/server-plugins/inventory/package.json +++ b/server-plugins/inventory/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/lead-resources/package.json b/server-plugins/lead-resources/package.json index e3b231d5bc..03d7760409 100644 --- a/server-plugins/lead-resources/package.json +++ b/server-plugins/lead-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/lead/package.json b/server-plugins/lead/package.json index dc7a92836c..634b2ddfd0 100644 --- a/server-plugins/lead/package.json +++ b/server-plugins/lead/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/notification-resources/package.json b/server-plugins/notification-resources/package.json index 4e8fa7cf3d..96220db659 100644 --- a/server-plugins/notification-resources/package.json +++ b/server-plugins/notification-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/notification/package.json b/server-plugins/notification/package.json index 5602dd5d80..4d57c6dcb9 100644 --- a/server-plugins/notification/package.json +++ b/server-plugins/notification/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/openai/package.json b/server-plugins/openai/package.json index 12ffaa0132..35dfb17754 100644 --- a/server-plugins/openai/package.json +++ b/server-plugins/openai/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/preference/package.json b/server-plugins/preference/package.json index 54bcbe740e..9eb61777dd 100644 --- a/server-plugins/preference/package.json +++ b/server-plugins/preference/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/recruit-resources/package.json b/server-plugins/recruit-resources/package.json index 65237c0e31..0b17436916 100644 --- a/server-plugins/recruit-resources/package.json +++ b/server-plugins/recruit-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/recruit/package.json b/server-plugins/recruit/package.json index 350b3c0129..4fb5c2b72b 100644 --- a/server-plugins/recruit/package.json +++ b/server-plugins/recruit/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/request-resources/package.json b/server-plugins/request-resources/package.json index 81fd101ef2..ce3421ffb2 100644 --- a/server-plugins/request-resources/package.json +++ b/server-plugins/request-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/request/package.json b/server-plugins/request/package.json index 150a4d9a73..c3ea680231 100644 --- a/server-plugins/request/package.json +++ b/server-plugins/request/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/setting-resources/package.json b/server-plugins/setting-resources/package.json index d9e656ff3a..b98d2349e2 100644 --- a/server-plugins/setting-resources/package.json +++ b/server-plugins/setting-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/setting/package.json b/server-plugins/setting/package.json index 5d46ef7cf5..12ac1bd57b 100644 --- a/server-plugins/setting/package.json +++ b/server-plugins/setting/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/tags-resources/package.json b/server-plugins/tags-resources/package.json index 258a835e5d..cdf605fe5f 100644 --- a/server-plugins/tags-resources/package.json +++ b/server-plugins/tags-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/tags/package.json b/server-plugins/tags/package.json index f2b1abc94b..5666e522b4 100644 --- a/server-plugins/tags/package.json +++ b/server-plugins/tags/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/task-resources/package.json b/server-plugins/task-resources/package.json index 9fcdc76db5..42b6e39c87 100644 --- a/server-plugins/task-resources/package.json +++ b/server-plugins/task-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/task/package.json b/server-plugins/task/package.json index e54c868d88..1bcc28a127 100644 --- a/server-plugins/task/package.json +++ b/server-plugins/task/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/telegram-resources/package.json b/server-plugins/telegram-resources/package.json index b7bab5773f..f488cfefb7 100644 --- a/server-plugins/telegram-resources/package.json +++ b/server-plugins/telegram-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/telegram/package.json b/server-plugins/telegram/package.json index c49bdcedc9..6ffe686f8a 100644 --- a/server-plugins/telegram/package.json +++ b/server-plugins/telegram/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/tracker-resources/package.json b/server-plugins/tracker-resources/package.json index f5d93ce4f6..e21fc2b245 100644 --- a/server-plugins/tracker-resources/package.json +++ b/server-plugins/tracker-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/tracker/package.json b/server-plugins/tracker/package.json index e6a5df78dc..cb4b45d227 100644 --- a/server-plugins/tracker/package.json +++ b/server-plugins/tracker/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/view-resources/package.json b/server-plugins/view-resources/package.json index 75db68a1ff..cc9cb5ebb6 100644 --- a/server-plugins/view-resources/package.json +++ b/server-plugins/view-resources/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server-plugins/view/package.json b/server-plugins/view/package.json index 3792d0238b..1af3491e52 100644 --- a/server-plugins/view/package.json +++ b/server-plugins/view/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/account/package.json b/server/account/package.json index bc40ea696a..542e4d5520 100644 --- a/server/account/package.json +++ b/server/account/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/backup/package.json b/server/backup/package.json index 7178f47e16..7070b8cc63 100644 --- a/server/backup/package.json +++ b/server/backup/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "run": "ts-node", "test": "jest --passWithNoTests --silent" }, diff --git a/server/core/package.json b/server/core/package.json index 918b17e2e5..c25958404c 100644 --- a/server/core/package.json +++ b/server/core/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/elastic/package.json b/server/elastic/package.json index 8459437173..bb9b924f5c 100644 --- a/server/elastic/package.json +++ b/server/elastic/package.json @@ -13,7 +13,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "" }, "devDependencies": { diff --git a/server/front/package.json b/server/front/package.json index bc24db186a..5e476e1060 100644 --- a/server/front/package.json +++ b/server/front/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/middleware/package.json b/server/middleware/package.json index 1dee0c4003..9c84bb900f 100644 --- a/server/middleware/package.json +++ b/server/middleware/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/minio/package.json b/server/minio/package.json index 19198d864c..14a9eea56c 100644 --- a/server/minio/package.json +++ b/server/minio/package.json @@ -10,7 +10,7 @@ "test": "jest --passWithNoTests --silent", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/server/mongo/package.json b/server/mongo/package.json index a969a35f82..bf07022f2c 100644 --- a/server/mongo/package.json +++ b/server/mongo/package.json @@ -11,7 +11,7 @@ "test": "jest --passWithNoTests --silent --forceExit", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/server/rpc/package.json b/server/rpc/package.json index 9c09f8a3f4..c7c232b761 100644 --- a/server/rpc/package.json +++ b/server/rpc/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/server/package.json b/server/server/package.json index 62d3db47d0..702975ffd2 100644 --- a/server/server/package.json +++ b/server/server/package.json @@ -9,7 +9,7 @@ "lint:fix": "eslint --fix src", "build:watch": "tsc", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/token/package.json b/server/token/package.json index 2a7715ed94..e8c6913028 100644 --- a/server/token/package.json +++ b/server/token/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/tool/package.json b/server/tool/package.json index 80fa5be0e0..f4b0fb2c5e 100644 --- a/server/tool/package.json +++ b/server/tool/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/translate/package.json b/server/translate/package.json index 43ad3660f9..4f2c46517a 100644 --- a/server/translate/package.json +++ b/server/translate/package.json @@ -9,7 +9,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent" }, "devDependencies": { diff --git a/server/ws/package.json b/server/ws/package.json index de03031598..fba31a9aa9 100644 --- a/server/ws/package.json +++ b/server/ws/package.json @@ -11,7 +11,7 @@ "test": "jest --passWithNoTests --silent --forceExit", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/templates/assets/package.json b/templates/assets/package.json index 51a396c3d9..ff8139e00c 100644 --- a/templates/assets/package.json +++ b/templates/assets/package.json @@ -8,7 +8,7 @@ "test": "jest --passWithNoTests --silent", "lint": "eslint src", "lint:fix": "eslint --fix src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/templates/model/package.json b/templates/model/package.json index 4f26b80194..e84ff217d6 100644 --- a/templates/model/package.json +++ b/templates/model/package.json @@ -6,7 +6,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "peerDependencies": { }, diff --git a/templates/node/package.json b/templates/node/package.json index a43f3dc16a..4d094df743 100644 --- a/templates/node/package.json +++ b/templates/node/package.json @@ -7,7 +7,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "peerDependencies": { "@hcengineering/platform-rig": "*" diff --git a/templates/platform/package.json b/templates/platform/package.json index f01c4ae9e5..67b0a4ef33 100644 --- a/templates/platform/package.json +++ b/templates/platform/package.json @@ -7,7 +7,7 @@ "build:watch": "tsc", "lint:fix": "eslint --fix src", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "peerDependencies": { "@hcengineering/platform-rig": "*" diff --git a/templates/ui/package.json b/templates/ui/package.json index ca2b867982..ba3e0a99c8 100644 --- a/templates/ui/package.json +++ b/templates/ui/package.json @@ -6,7 +6,7 @@ "build:watch": "tsc --noEmit --outDir ./dist_cache", "lint:fix": "eslint --fix src", "lint": "svelte-check && eslint", - "format": "prettier --write --plugin-search-dir=. src && eslint --fix src && mkdir -p .rush/temp/.format" + "format": "format src" }, "devDependencies": { "@hcengineering/platform-rig": "^0.6.0", diff --git a/tests/sanity/package.json b/tests/sanity/package.json index dcafdbade5..1bb76874a8 100644 --- a/tests/sanity/package.json +++ b/tests/sanity/package.json @@ -9,7 +9,7 @@ "build:watch": "", "lint:fix": "eslint --fix tests", "lint": "eslint tests", - "format": "prettier --write tests && eslint --fix tests", + "format": "format tests", "ci": "playwright install --with-deps chromium", "test": "", "uitest": "playwright test --browser chromium --reporter list,html -c ./tests/playwright.config.ts", diff --git a/tools/apm/package.json b/tools/apm/package.json index 0c47d89d15..a3f570dc49 100644 --- a/tools/apm/package.json +++ b/tools/apm/package.json @@ -12,7 +12,7 @@ "lint:fix": "eslint --fix src", "bundle": "esbuild src/index.ts --bundle --minify --platform=node > apm.js", "lint": "eslint src", - "format": "prettier --write src && eslint --fix src && mkdir -p .rush/temp/.format", + "format": "format src", "test": "jest --passWithNoTests --silent --forceExit" }, "devDependencies": {