Skip to content

Commit

Permalink
Merge pull request #1644 from CSCfi/CSCTTV-2291
Browse files Browse the repository at this point in the history
CSCTTV-2291
  • Loading branch information
ommann authored Feb 10, 2023
2 parents 4f96577 + efd00e8 commit c4ba0df
Show file tree
Hide file tree
Showing 5 changed files with 18,811 additions and 401 deletions.
12 changes: 0 additions & 12 deletions .eslintrc.js

This file was deleted.

46 changes: 46 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "app",
"style": "kebab-case"
}
]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {}
}
]
}
38 changes: 32 additions & 6 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": ["src/assets/favicon.ico", "src/assets"],
"assets": [
"src/assets/favicon.ico",
"src/assets"
],
"styles": [
"./node_modules/@fortawesome/fontawesome-svg-core/styles.css",
"./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css",
Expand Down Expand Up @@ -83,13 +86,19 @@
]
},
"fi": {
"localize": ["fi"]
"localize": [
"fi"
]
},
"en": {
"localize": ["en"]
"localize": [
"en"
]
},
"sv": {
"localize": ["sv"]
"localize": [
"sv"
]
},
"es5": {
"budgets": [
Expand Down Expand Up @@ -147,6 +156,15 @@
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand All @@ -164,7 +182,11 @@
"options": {
"main": "src/main.server.ts",
"tsConfig": "src/tsconfig.server.json",
"localize": ["fi", "en", "sv"],
"localize": [
"fi",
"en",
"sv"
],
"sourceMap": true,
"optimization": true
},
Expand All @@ -190,7 +212,11 @@
"srcDir": "src/i18n",
"genDir": "src/i18n",
"defaultLanguage": "fi",
"languages": ["fi", "sv", "en"]
"languages": [
"fi",
"sv",
"en"
]
}
}
}
Expand Down
Loading

0 comments on commit c4ba0df

Please sign in to comment.