Skip to content

Commit c4ba0df

Browse files
authored
Merge pull request #1644 from CSCfi/CSCTTV-2291
CSCTTV-2291
2 parents 4f96577 + efd00e8 commit c4ba0df

File tree

5 files changed

+18811
-401
lines changed

5 files changed

+18811
-401
lines changed

.eslintrc.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

.eslintrc.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": [
4+
"projects/**/*"
5+
],
6+
"overrides": [
7+
{
8+
"files": [
9+
"*.ts"
10+
],
11+
"extends": [
12+
"eslint:recommended",
13+
"plugin:@typescript-eslint/recommended",
14+
"plugin:@angular-eslint/recommended",
15+
"plugin:@angular-eslint/template/process-inline-templates"
16+
],
17+
"rules": {
18+
"@angular-eslint/directive-selector": [
19+
"error",
20+
{
21+
"type": "attribute",
22+
"prefix": "app",
23+
"style": "camelCase"
24+
}
25+
],
26+
"@angular-eslint/component-selector": [
27+
"error",
28+
{
29+
"type": "element",
30+
"prefix": "app",
31+
"style": "kebab-case"
32+
}
33+
]
34+
}
35+
},
36+
{
37+
"files": [
38+
"*.html"
39+
],
40+
"extends": [
41+
"plugin:@angular-eslint/template/recommended"
42+
],
43+
"rules": {}
44+
}
45+
]
46+
}

angular.json

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
"main": "src/main.ts",
3030
"polyfills": "src/polyfills.ts",
3131
"tsConfig": "src/tsconfig.app.json",
32-
"assets": ["src/assets/favicon.ico", "src/assets"],
32+
"assets": [
33+
"src/assets/favicon.ico",
34+
"src/assets"
35+
],
3336
"styles": [
3437
"./node_modules/@fortawesome/fontawesome-svg-core/styles.css",
3538
"./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css",
@@ -83,13 +86,19 @@
8386
]
8487
},
8588
"fi": {
86-
"localize": ["fi"]
89+
"localize": [
90+
"fi"
91+
]
8792
},
8893
"en": {
89-
"localize": ["en"]
94+
"localize": [
95+
"en"
96+
]
9097
},
9198
"sv": {
92-
"localize": ["sv"]
99+
"localize": [
100+
"sv"
101+
]
93102
},
94103
"es5": {
95104
"budgets": [
@@ -147,6 +156,15 @@
147156
"scripts": []
148157
}
149158
},
159+
"lint": {
160+
"builder": "@angular-eslint/builder:lint",
161+
"options": {
162+
"lintFilePatterns": [
163+
"src/**/*.ts",
164+
"src/**/*.html"
165+
]
166+
}
167+
},
150168
"e2e": {
151169
"builder": "@angular-devkit/build-angular:protractor",
152170
"options": {
@@ -164,7 +182,11 @@
164182
"options": {
165183
"main": "src/main.server.ts",
166184
"tsConfig": "src/tsconfig.server.json",
167-
"localize": ["fi", "en", "sv"],
185+
"localize": [
186+
"fi",
187+
"en",
188+
"sv"
189+
],
168190
"sourceMap": true,
169191
"optimization": true
170192
},
@@ -190,7 +212,11 @@
190212
"srcDir": "src/i18n",
191213
"genDir": "src/i18n",
192214
"defaultLanguage": "fi",
193-
"languages": ["fi", "sv", "en"]
215+
"languages": [
216+
"fi",
217+
"sv",
218+
"en"
219+
]
194220
}
195221
}
196222
}

0 commit comments

Comments
 (0)