Remove unused prettier format script (#3646)

.github/workflows/test-and-deploy.yml

@@ -19,7 +19,7 @@ jobs:
         run: make prereqs
       - name: Run checks
         run: |
-          npm run lint
+          npm run lint-check
           npm run ci-test
           npm run format-check
           npm run ts-check

.github/workflows/test-win.yml

@@ -19,7 +19,7 @@ jobs:
         run: make prereqs
       - name: Build and test
         run: |
-          npm run lint
+          npm run lint-check
           npm run ci-test
           npm run format-check
           npm run ts-check

CONTRIBUTING.md

@@ -28,7 +28,7 @@ well when testing your changes locally.
 - Make your changes, trying to stick to the style and format where possible.
   - We use [ESLint](https://eslint.org/) to ensure a consistent code base and PRs won't pass unless it detects no
     errors.
-  - Running `make lint` will run the linter, which will auto-fix everything it can and report back any errors and
+  - Running `make lint-fix` will run the linter, which will auto-fix everything it can and report back any errors and
     warnings.
 - If you're adding a new server-side component, please do your best to add a test to cover it. For client-side changes
   that's trickier.

Makefile

@@ -40,11 +40,11 @@ $(NODE_MODULES): package.json | node-installed
 .PHONY: lint
 lint: $(NODE_MODULES)  ## Checks if the source currently matches code conventions
 	$(NPM) run ts-compile
-	$(NPM) run lint
+	$(NPM) run lint-check
 
 .PHONY: lint-fix
 lint-fix: $(NODE_MODULES)  ## Checks if everything matches code conventions & fixes those which are trivial to do so
-	$(NPM) run lint-fix
+	$(NPM) run lint
 
 .PHONY: ci-lint
 ci-lint: $(NODE_MODULES)

package.json

@@ -154,12 +154,12 @@
   },
   "scripts": {
     "ci-lint": "eslint --format github .",
-    "ci-lint-files": "eslint --format github",
     "ci-test": "nyc npm run test",
-    "lint": "eslint .",
-    "lint-fix": "eslint --fix .",
+    "lint": "eslint . --fix",
+    "lint-check": "eslint .",
+    "lint-files": "eslint",
     "test": "mocha --recursive",
-    "check": "npm run lint && npm run test",
+    "check": "npm run lint-check && npm run test",
     "dev": "cross-env NODE_ENV=DEV node -r esm -r ts-node/register app.js",
     "debugger": "cross-env NODE_ENV=DEV node --inspect -r esm -r ts-node/register app.js --debug",
     "debug": "cross-env NODE_ENV=DEV node -r esm -r ts-node/register app.js --debug",
@@ -168,21 +168,20 @@
     "sentry": "npx -p @sentry/cli sentry-cli",
     "update-browserslist": "npx browserslist@latest -- --update-db",
     "prepare": "husky install",
-    "format": "prettier --ignore-unknown .",
-    "format-fix": "prettier --write .",
-    "format-fix-files": "prettier --write --ignore-unknown",
+    "format": "prettier --write .",
     "format-check": "prettier --check .",
+    "format-files": "prettier --write --ignore-unknown",
     "ts-compile": "tsc",
     "ts-check": "tsc -p ./tsconfig.backend.json --noEmit --module esnext && tsc -p ./tsconfig.frontend.json --noEmit",
     "webpack": "webpack --node-env=production"
   },
   "lint-staged": {
     "*.[jt]s": [
-      "npm run format-fix-files --",
-      "npm run ci-lint-files --"
+      "npm run format-files --",
+      "npm run lint-files --"
     ],
     "*.{html,md}": [
-      "npm run format-fix-files --"
+      "npm run format-files --"
     ]
   },
   "license": "BSD-2-Clause"