Skip to content

Commit d8125e5

Browse files
authored
Merge pull request #518 from webcat12345/eslint
fix(eslint): Fix eslint configuration
2 parents 8104b41 + 5d083d8 commit d8125e5

File tree

4 files changed

+832
-547
lines changed

4 files changed

+832
-547
lines changed

Diff for: .eslintrc.json

+10-14
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,27 @@
88
"files": [
99
"*.ts"
1010
],
11-
"parserOptions": {
12-
"project": [
13-
"tsconfig.json",
14-
"e2e/tsconfig.json"
15-
],
16-
"createDefaultProgram": true
17-
},
1811
"extends": [
12+
"eslint:recommended",
13+
"plugin:@typescript-eslint/recommended",
1914
"plugin:@angular-eslint/recommended",
2015
"plugin:@angular-eslint/template/process-inline-templates"
2116
],
2217
"rules": {
23-
"@angular-eslint/component-selector": [
18+
"@angular-eslint/directive-selector": [
2419
"error",
2520
{
21+
"type": "attribute",
2622
"prefix": "app",
27-
"style": "kebab-case",
28-
"type": "element"
23+
"style": "camelCase"
2924
}
3025
],
31-
"@angular-eslint/directive-selector": [
26+
"@angular-eslint/component-selector": [
3227
"error",
3328
{
29+
"type": "element",
3430
"prefix": "app",
35-
"style": "camelCase",
36-
"type": "attribute"
31+
"style": "kebab-case"
3732
}
3833
]
3934
}
@@ -43,7 +38,8 @@
4338
"*.html"
4439
],
4540
"extends": [
46-
"plugin:@angular-eslint/template/recommended"
41+
"plugin:@angular-eslint/template/recommended",
42+
"plugin:@angular-eslint/template/accessibility"
4743
],
4844
"rules": {}
4945
}

Diff for: angular.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -149,20 +149,14 @@
149149
},
150150
"@schematics/angular:directive": {
151151
"prefix": "app"
152-
},
153-
"@angular-eslint/schematics:application": {
154-
"setParserOptionsProject": true
155-
},
156-
"@angular-eslint/schematics:library": {
157-
"setParserOptionsProject": true
158152
}
159153
},
160154
"cli": {
161-
"defaultCollection": "@angular-eslint/schematics",
162155
"analytics": false,
163156
"schematicCollections": [
157+
"@angular-eslint/schematics",
164158
"@cypress/schematic",
165159
"@schematics/angular"
166160
]
167161
}
168-
}
162+
}

Diff for: package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -39,38 +39,39 @@
3939
"cypress:run": "cypress run"
4040
},
4141
"dependencies": {
42-
"@angular/animations": "^16.1.8",
43-
"@angular/common": "^16.1.8",
44-
"@angular/compiler": "^16.1.8",
45-
"@angular/core": "^16.1.8",
46-
"@angular/forms": "^16.1.8",
47-
"@angular/platform-browser": "^16.1.8",
48-
"@angular/platform-browser-dynamic": "^16.1.8",
49-
"@angular/router": "^16.1.8",
42+
"@angular/animations": "^16.0.0",
43+
"@angular/common": "^16.0.0",
44+
"@angular/compiler": "^16.0.0",
45+
"@angular/core": "^16.0.0",
46+
"@angular/forms": "^16.0.0",
47+
"@angular/platform-browser": "^16.0.0",
48+
"@angular/platform-browser-dynamic": "^16.0.0",
49+
"@angular/router": "^16.0.0",
5050
"bootstrap": "^4.3.1",
5151
"font-awesome": "^4.7.0",
5252
"rxjs": "^7.5.5",
5353
"tslib": "^2.3.0",
5454
"zone.js": "~0.13.1"
5555
},
5656
"devDependencies": {
57-
"@angular-devkit/build-angular": "^16.1.7",
58-
"@angular-eslint/builder": "^16.1.0",
59-
"@angular-eslint/eslint-plugin": "^16.1.0",
60-
"@angular-eslint/eslint-plugin-template": "^16.1.0",
61-
"@angular-eslint/schematics": "^16.1.0",
62-
"@angular-eslint/template-parser": "^16.1.0",
63-
"@angular/cli": "^16.1.7",
64-
"@angular/compiler-cli": "^16.1.8",
65-
"@angular/language-service": "^16.1.8",
57+
"@angular-devkit/build-angular": "^16.0.0",
58+
"@angular-eslint/builder": "^16.0.0",
59+
"@angular-eslint/eslint-plugin": "^16.0.0",
60+
"@angular-eslint/eslint-plugin-template": "^16.0.0",
61+
"@angular-eslint/schematics": "^16.0.0",
62+
"@angular-eslint/template-parser": "^16.0.0",
63+
"@angular/cli": "^16.0.0",
64+
"@angular/compiler-cli": "^16.0.0",
65+
"@angular/language-service": "^16.0.0",
6666
"@cypress/schematic": "2.5.2",
6767
"@types/jasmine": "^4.3.0",
6868
"@types/jasminewd2": "^2.0.10",
6969
"@types/node": "^22.0.0",
70-
"@typescript-eslint/eslint-plugin": "^5.59.2",
71-
"@typescript-eslint/parser": "^5.59.2",
70+
"@typescript-eslint/eslint-plugin": "7.11.0",
71+
"@typescript-eslint/parser": "7.11.0",
7272
"all-contributors-cli": "^5.10.0",
73-
"eslint": "^9.0.0",
73+
"cypress": "^14.0.0",
74+
"eslint": "^8.0.0",
7475
"fs-extra": "^11.0.0",
7576
"jasmine-core": "~3.8.0",
7677
"jasmine-spec-reporter": "~5.0.0",
@@ -84,7 +85,6 @@
8485
"ts-node": "^10.9.1",
8586
"tsickle": "^0.46.3",
8687
"typedoc": "^0.14.2",
87-
"typescript": "^4.9.5",
88-
"cypress": "latest"
88+
"typescript": "^4.9.5"
8989
}
9090
}

0 commit comments

Comments
 (0)