Merge pull request #6120 from overleaf/jpa-same-linting-packages

[misc] move the linting setup to the root of the monorepo

GitOrigin-RevId: 1633e2a58598add0b727738cd3bfba0ab7bae781

services/filestore/.eslintrc

@@ -1,73 +0,0 @@
-// this file was auto-generated, do not edit it directly.
-// instead run bin/update_build_scripts from
-// https://github.com/sharelatex/sharelatex-dev-environment
-{
-  "extends": [
-    "eslint:recommended",
-    "standard",
-    "prettier"
-  ],
-  "parserOptions": {
-    "ecmaVersion": 2018
-  },
-  "plugins": [
-    "mocha",
-    "chai-expect",
-    "chai-friendly"
-  ],
-  "env": {
-    "node": true,
-    "mocha": true
-  },
-  "rules": {
-    // Swap the no-unused-expressions rule with a more chai-friendly one
-    "no-unused-expressions": 0,
-    "chai-friendly/no-unused-expressions": "error",
-
-    // Do not allow importing of implicit dependencies.
-    "import/no-extraneous-dependencies": "error"
-  },
-  "overrides": [
-    {
-      // Test specific rules
-      "files": ["test/**/*.js"],
-      "globals": {
-        "expect": true
-      },
-      "rules": {
-        // mocha-specific rules
-        "mocha/handle-done-callback": "error",
-        "mocha/no-exclusive-tests": "error",
-        "mocha/no-global-tests": "error",
-        "mocha/no-identical-title": "error",
-        "mocha/no-nested-tests": "error",
-        "mocha/no-pending-tests": "error",
-        "mocha/no-skipped-tests": "error",
-        "mocha/no-mocha-arrows": "error",
-
-        // chai-specific rules
-        "chai-expect/missing-assertion": "error",
-        "chai-expect/terminating-properties": "error",
-
-        // prefer-arrow-callback applies to all callbacks, not just ones in mocha tests.
-        // we don't enforce this at the top-level - just in tests to manage `this` scope
-        // based on mocha's context mechanism
-        "mocha/prefer-arrow-callback": "error"
-      }
-    },
-    {
-      // Backend specific rules
-      "files": ["app/**/*.js", "app.js", "index.js"],
-      "rules": {
-        // don't allow console.log in backend code
-        "no-console": "error",
-
-        // Do not allow importing of implicit dependencies.
-        "import/no-extraneous-dependencies": ["error", {
-          // Do not allow importing of devDependencies.
-          "devDependencies": false
-        }]
-      }
-    }
-  ]
-}

services/filestore/.prettierrc

@@ -1,11 +0,0 @@
-# This file was auto-generated, do not edit it directly.
-# Instead run bin/update_build_scripts from
-# https://github.com/sharelatex/sharelatex-dev-environment
-{
-  "arrowParens": "avoid",
-  "semi": false,
-  "singleQuote": true,
-  "trailingComma": "es5",
-  "tabWidth": 2,
-  "useTabs": false
-}

services/filestore/Makefile

@@ -26,14 +26,23 @@ clean:
 	-$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local
 	-$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local
 
+HERE=$(shell pwd)
+MONOREPO=$(shell cd ../../ && pwd)
+# Run the linting commands in the scope of the monorepo.
+# Eslint and prettier (plus some configs) are on the root.
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:14.18.1 npm run --silent
+
 format:
-	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent format
+	$(RUN_LINTING) format
 
 format_fix:
-	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent format:fix
+	$(RUN_LINTING) format:fix
 
 lint:
-	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent lint
+	$(RUN_LINTING) lint
+
+lint_fix:
+	$(RUN_LINTING) lint:fix
 
 test: format lint test_unit test_acceptance
 

services/filestore/package.json

@@ -13,12 +13,12 @@
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "start": "node $NODE_APP_OPTIONS app.js",
     "nodemon": "nodemon --config nodemon.json",
-    "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "lint": "../../node_modules/.bin/eslint --max-warnings 0 --format unix .",
+    "format": "../../node_modules/.bin/prettier --list-different $PWD/'**/*.js'",
+    "format:fix": "../../node_modules/.bin/prettier --write $PWD/'**/*.js'",
     "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
-    "lint:fix": "eslint --fix ."
+    "lint:fix": "../../node_modules/.bin/eslint --fix ."
   },
   "dependencies": {
     "@overleaf/logger": "^3.1.0",
@@ -45,20 +45,8 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "disrequire": "^1.1.0",
-    "eslint": "^7.21.0",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-config-standard": "^16.0.2",
-    "eslint-plugin-chai-expect": "^2.2.0",
-    "eslint-plugin-chai-friendly": "^0.6.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-mocha": "^8.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-promise": "^4.2.1",
     "mocha": "^8.3.2",
     "mongodb": "^3.5.9",
-    "prettier": "^2.2.1",
-    "prettier-eslint": "^9.0.2",
     "sandboxed-module": "2.0.4",
     "sinon": "9.0.2",
     "sinon-chai": "^3.5.0",