ESLint fixes and unified lint targets (#3424)

* optimise lint targets * fix eslint config files * fix app coverage settings * tune eslint to warn about optional chains
Alfresco · Sep 8, 2023 · 9106608 · 9106608
1 parent 46ea854
commit 9106608
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 149 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -113,6 +113,7 @@
         "@angular-eslint/no-outputs-metadata-property": "error",
         "@angular-eslint/use-lifecycle-interface": "error",
         "@angular-eslint/use-pipe-transform-interface": "error",
+        "@typescript-eslint/prefer-optional-chain": "warn",
         "@typescript-eslint/no-misused-new": "error",
         "@typescript-eslint/no-non-null-assertion": "error",
         "@typescript-eslint/prefer-function-type": "error",
@@ -328,7 +329,7 @@
         "@angular-eslint/template/no-negated-async": "off",
         "@angular-eslint/template/no-positive-tabindex": "error",
         "@angular-eslint/template/eqeqeq": "error",
-        "@angular-eslint/template/no-call-expression": "warn"
+        "@angular-eslint/template/no-call-expression": "off"
       }
     },
     {

diff --git a/app/karma.conf.js b/app/karma.conf.js
@@ -1,11 +1,15 @@
 // Karma configuration file, see link for more information
 // https://karma-runner.github.io/1.0/config/configuration-file.html
+const { join } = require('path');
 const getBaseKarmaConfig = require('../karma.conf');
 
 module.exports = function (config) {
   const baseConfig = getBaseKarmaConfig();
   config.set({
     ...baseConfig,
-    coverageReporter: {},
+    coverageReporter: {
+      ...baseConfig.coverageReporter,
+      dir: join(__dirname, '../coverage/content-ce')
+    }
   });
 };
diff --git a/app/project.json b/app/project.json
@@ -237,19 +237,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "app/**/*.ts",
-          "app/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": [
-        "{options.outputFile}"
-      ]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }
diff --git a/e2e/playwright/actions/project.json b/e2e/playwright/actions/project.json
@@ -18,17 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "e2e/**/*.ts",
-          "e2e/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": ["{options.outputFile}"]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }
diff --git a/e2e/playwright/authentication/project.json b/e2e/playwright/authentication/project.json
@@ -18,17 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "e2e/**/*.ts",
-          "e2e/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": ["{options.outputFile}"]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }
diff --git a/e2e/playwright/folder-rules/project.json b/e2e/playwright/folder-rules/project.json
@@ -18,17 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "e2e/**/*.ts",
-          "e2e/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": ["{options.outputFile}"]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }
diff --git a/e2e/playwright/navigation/project.json b/e2e/playwright/navigation/project.json
@@ -18,17 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "e2e/**/*.ts",
-          "e2e/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": ["{options.outputFile}"]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }
diff --git a/e2e/playwright/viewer/project.json b/e2e/playwright/viewer/project.json
@@ -18,17 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "e2e/**/*.ts",
-          "e2e/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": ["{options.outputFile}"]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }
diff --git a/e2e/protractor/project.json b/e2e/protractor/project.json
@@ -17,19 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "e2e/**/*.ts",
-          "e2e/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": [
-        "{options.outputFile}"
-      ]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }
diff --git a/nx.json b/nx.json
@@ -48,10 +48,17 @@
       ]
     },
     "lint": {
-      "inputs": [
-        "default",
-        "{workspaceRoot}/.eslintrc.json"
-      ]
+      "executor": "@angular-eslint/builder:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": [
+          "{projectRoot}/**/*.ts",
+          "{projectRoot}/**/*.html"
+        ],
+        "cache": true,
+        "cacheLocation": ".eslintcache",
+        "ignorePath": ".eslintignore"
+      }
     },
     "e2e": {
       "inputs": [

diff --git a/projects/aca-content/.eslintrc.js b/projects/aca-content/.eslintrc.js
@@ -1,23 +1,15 @@
-path = require("path");
+const path = require('path');
 module.exports = {
-  "extends": "../../.eslintrc.json",
-  "ignorePatterns": [
-    "!**/*"
-  ],
-  "overrides": [
+  extends: '../../.eslintrc.json',
+  ignorePatterns: ['!**/*'],
+  overrides: [
     {
-      "files": [
-        "*.ts"
-      ],
-      "parserOptions": {
-        "project": [
-          path.join(__dirname, "tsconfig.lib.json"),
-          path.join(__dirname, "tsconfig.spec.json")
-        ],
-        "createDefaultProgram": true
+      files: ['*.ts'],
+      parserOptions: {
+        project: [path.join(__dirname, 'tsconfig.lib.json'), path.join(__dirname, 'tsconfig.spec.json')],
+        createDefaultProgram: true
       },
-      "rules": {
-      }
+      rules: {}
     }
   ]
-}
+};
diff --git a/projects/aca-content/project.json b/projects/aca-content/project.json
@@ -41,19 +41,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "projects/aca-content/**/*.ts",
-          "projects/aca-content/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": [
-        "{options.outputFile}"
-      ]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }
diff --git a/projects/aca-shared/.eslintrc.js b/projects/aca-shared/.eslintrc.js
@@ -1,23 +1,15 @@
-path = require("path");
+const path = require('path');
 module.exports = {
-  "extends": "../../.eslintrc.json",
-  "ignorePatterns": [
-    "!**/*"
-  ],
-  "overrides": [
+  extends: '../../.eslintrc.json',
+  ignorePatterns: ['!**/*'],
+  overrides: [
     {
-      "files": [
-        "*.ts"
-      ],
-      "parserOptions": {
-        "project": [
-          path.join(__dirname, "tsconfig.lib.json"),
-          path.join(__dirname, "tsconfig.spec.json")
-        ],
-        "createDefaultProgram": true
+      files: ['*.ts'],
+      parserOptions: {
+        project: [path.join(__dirname, 'tsconfig.lib.json'), path.join(__dirname, 'tsconfig.spec.json')],
+        createDefaultProgram: true
       },
-      "rules": {
-      }
+      rules: {}
     }
   ]
-}
+};
diff --git a/projects/aca-shared/project.json b/projects/aca-shared/project.json
@@ -36,19 +36,7 @@
       }
     },
     "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "projects/aca-shared/**/*.ts",
-          "projects/aca-shared/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": [
-        "{options.outputFile}"
-      ]
+      "executor": "@angular-eslint/builder:lint"
     }
   }
 }