Merge pull request #2318 from sap-labs-france/master-qa

Merge master-qa
sap-labs-france · Mar 25, 2021 · 79a68af · 79a68af
2 parents 7c37655 + 99653db
commit 79a68af
Show file tree

Hide file tree

Showing 218 changed files with 3,365 additions and 1,440 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,106 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/ng-cli-compat",
+        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "app",
+            "style": "kebab-case"
+          }
+        ],
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "app",
+            "style": "camelCase"
+          }
+        ],
+        "@typescript-eslint/naming-convention": [
+          "error",
+          {
+            "selector": "enumMember",
+            "format": [
+              "UPPER_CASE"
+            ]
+          }
+        ],
+        "@angular-eslint/use-component-view-encapsulation": "error",
+        "@typescript-eslint/array-type": [
+          "error",
+          {
+            "default": "array"
+          }
+        ],
+        "@typescript-eslint/await-thenable": "error",
+        "@typescript-eslint/consistent-type-definitions": "error",
+        "@typescript-eslint/dot-notation": "off",
+        "@typescript-eslint/explicit-member-accessibility": [
+          "error",
+          {
+            "accessibility": "explicit"
+          }
+        ],
+        "@typescript-eslint/no-floating-promises": "warn",
+        "@typescript-eslint/no-var-requires": "error",
+        "@typescript-eslint/promise-function-async": "error",
+        "@typescript-eslint/require-await": "error",
+        "brace-style": [
+          "error",
+          "1tbs"
+        ],
+        "complexity": "error",
+        "import/order": "error",
+        "linebreak-style": [
+          "error",
+          "unix"
+        ],
+        "max-len": [
+          "error",
+          {
+            "ignoreRegExpLiterals": true,
+            "ignoreStrings": true,
+            "ignorePattern": "(^(import|export)|(public|private))\\s.+;",
+            "code": 140
+          }
+        ],
+        "no-duplicate-case": "error",
+        "no-duplicate-imports": "error",
+        "no-irregular-whitespace": "error",
+        "no-new-func": "error",
+        "no-redeclare": "error",
+        "no-return-await": "error",
+        "no-useless-constructor": "error"
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,5 +21,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - name: npm install
       run: npm ci
-    - name: npm run tslint
-      run: npm run tslint
+    - name: npm run eslint
+      run: npm run eslint
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -4,10 +4,10 @@
   "recommendations": [
     "amatiasq.sort-imports",
     "codezombiech.gitignore",
+    "dbaeumer.vscode-eslint",
     "eamodio.gitlens",
     "EditorConfig.EditorConfig",
     "ms-azuretools.vscode-docker",
-    "ms-vscode.vscode-typescript-tslint-plugin",
     "msjsdiag.debugger-for-chrome",
     "streetsidesoftware.code-spell-checker"
   ]

diff --git a/angular.json b/angular.json
@@ -34,11 +34,31 @@
               "canvg"
             ],
             "assets": [
-              { "glob": "@(LICENSE|NOTICE)", "input": "src/../", "output": "/" },
-              { "glob": "**/*", "input": "src/assets/", "output": "/assets/" },
-              { "glob": "favicon.ico", "input": "src/", "output": "/" },
-              { "glob": "Staticfile", "input": "src/nginx/", "output": "/" },
-              { "glob": "**/*", "input": "src/nginx/", "output": "/nginx/" }
+              {
+                "glob": "@(LICENSE|NOTICE)",
+                "input": "src/../",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets/",
+                "output": "/assets/"
+              },
+              {
+                "glob": "favicon.ico",
+                "input": "src/",
+                "output": "/"
+              },
+              {
+                "glob": "Staticfile",
+                "input": "src/nginx/",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/nginx/",
+                "output": "/nginx/"
+              }
             ],
             "styles": [
               "node_modules/bootstrap/dist/css/bootstrap.css",
@@ -144,14 +164,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
             ]
           }
         }