diff --git a/.eslintrc.json b/.eslintrc.json index 5e30c10..9a467bd 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,61 +1,65 @@ { - "env": { - "browser": true, - "node": true, - "es6": true, - "es2017": true - }, - "overrides": [ - { - "files": ["*.ts"], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@typescript-eslint/recommended-requiring-type-checking" + "env": { + "browser": true, + "node": true, + "es6": true, + "es2017": true + }, + "overrides": [ + { + "files": ["*.ts"], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended", + "plugin:@typescript-eslint/recommended-requiring-type-checking" + ], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaVersion": 10, + "project": [ + "./src/tsconfig.app.json", + "./src/tsconfig.spec.json", + "./e2e/tsconfig.e2e.json" ], - "parser": "@typescript-eslint/parser", - "parserOptions": { - "ecmaVersion": 10, - "project": "src/tsconfig.app.json", - "sourceType": "module", - "ecmaFeatures": { - "modules": true - } - }, - "plugins": [ - "@typescript-eslint", - "@angular-eslint/eslint-plugin" - ], - "rules": { - "@typescript-eslint/indent": [ - "error", 2, { - "SwitchCase": 1, - "CallExpression": {"arguments": "first"}, - "FunctionExpression": {"parameters": "first"}, - "FunctionDeclaration": {"parameters": "first"} - } - ], - "@typescript-eslint/no-empty-function": 0, - "@typescript-eslint/no-var-requires": 0, - "@typescript-eslint/no-explicit-any": 0, - "@typescript-eslint/no-unsafe-call": 0, - "@typescript-eslint/no-unsafe-member-access": 0, - "@typescript-eslint/no-unsafe-assignment": 0, - "@typescript-eslint/no-unsafe-return": 0, - "@typescript-eslint/no-floating-promises": 0, - "@angular-eslint/use-injectable-provided-in": "error", - "@angular-eslint/no-attribute-decorator": "error" + "sourceType": "module", + "ecmaFeatures": { + "modules": true } }, - { - "files": ["*.component.html"], - "parser": "@angular-eslint/template-parser", - "plugins": ["@angular-eslint/template"], - "rules": { - "@angular-eslint/template/banana-in-a-box": "error", - "@angular-eslint/template/no-negated-async": "error" - } + "plugins": [ + "@typescript-eslint", + "@angular-eslint/eslint-plugin" + ], + "rules": { + "@typescript-eslint/indent": [ + "error", 2, { + "SwitchCase": 1, + "CallExpression": {"arguments": "first"}, + "FunctionExpression": {"parameters": "first"}, + "FunctionDeclaration": {"parameters": "first"} + } + ], + "@typescript-eslint/no-empty-function": 0, + "@typescript-eslint/no-var-requires": 0, + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-unsafe-call": 0, + "@typescript-eslint/no-unsafe-member-access": 0, + "@typescript-eslint/no-unsafe-assignment": 0, + "@typescript-eslint/no-unsafe-return": 0, + "@typescript-eslint/no-floating-promises": 0, + "@angular-eslint/use-injectable-provided-in": "error", + "@angular-eslint/no-attribute-decorator": "error" } - ] + }, + { + "files": ["*.component.html"], + "parser": "@angular-eslint/template-parser", + "plugins": ["@angular-eslint/template"], + "rules": { + "@angular-eslint/template/banana-in-a-box": "error", + "@angular-eslint/template/no-negated-async": "error" + } + } + ] } diff --git a/angular.json b/angular.json index ff9bc40..c52b3ad 100644 --- a/angular.json +++ b/angular.json @@ -127,7 +127,7 @@ "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "eslintConfig": "src/eslintrc.app.json", + "eslintConfig": ".eslintrc.json", "tsConfig": [ "src/tsconfig.app.json", "src/tsconfig.spec.json" @@ -146,7 +146,7 @@ "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "eslintConfig": "e2e/eslintrc.e2e.json", + "eslintConfig": ".eslintrc.json", "tsConfig": [ "e2e/tsconfig.e2e.json" ], diff --git a/e2e/eslintrc.e2e.json b/e2e/eslintrc.e2e.json deleted file mode 100644 index 515a7b3..0000000 --- a/e2e/eslintrc.e2e.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../.eslintrc.json", - "parserOptions": { - "project": [ - "e2e/tsconfig.e2e.json" - ] - } -} diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json index d490130..46e1c21 100644 --- a/e2e/tsconfig.e2e.json +++ b/e2e/tsconfig.e2e.json @@ -8,6 +8,6 @@ ] }, "include": [ - "**/*.ts" + "e2e/**/*.ts" ] } diff --git a/src/eslintrc.app.json b/src/eslintrc.app.json deleted file mode 100644 index 45559a3..0000000 --- a/src/eslintrc.app.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../.eslintrc.json", - "parserOptions": { - "project": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ] - } -}