Skip to content

Commit 7d409c5

Browse files
committed
Upgrade project Angular deps to v14
1 parent df6eddb commit 7d409c5

19 files changed

+22946
-10369
lines changed
File renamed without changes.

.eslintrc.json

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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/dist
55
/tmp
66
/out-tsc
7+
.angular
78
# Only exists if Bazel was run
89
/bazel-out
910

.travis.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@ addons:
44
chrome: stable
55
language: node_js
66
node_js:
7-
- stable
8-
before_install:
9-
- echo "$TRAVIS_BRANCH"
10-
- echo "$TRAVIS_PULL_REQUEST"
11-
- export DISPLAY=:99.0
12-
- sh -e /etc/init.d/xvfb start
13-
- export CHROME_BIN=chromium-browser
7+
- 16
148
install:
159
- npm install
1610
script:

angular.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"main": "src/main.ts",
2323
"polyfills": "src/polyfills.ts",
2424
"tsConfig": "tsconfig.app.json",
25-
"aot": false,
25+
"aot": true,
2626
"assets": [
2727
"src/favicon.ico",
2828
"src/assets"
@@ -43,7 +43,6 @@
4343
"optimization": true,
4444
"outputHashing": "all",
4545
"sourceMap": false,
46-
"extractCss": true,
4746
"namedChunks": false,
4847
"aot": true,
4948
"extractLicenses": true,
@@ -94,15 +93,11 @@
9493
}
9594
},
9695
"lint": {
97-
"builder": "@angular-devkit/build-angular:tslint",
96+
"builder": "@angular-eslint/builder:lint",
9897
"options": {
99-
"tsConfig": [
100-
"tsconfig.app.json",
101-
"tsconfig.spec.json",
102-
"e2e/tsconfig.json"
103-
],
104-
"exclude": [
105-
"**/node_modules/**"
98+
"lintFilePatterns": [
99+
"src/**/*.ts",
100+
"src/**/*.html"
106101
]
107102
}
108103
},
@@ -119,6 +114,12 @@
119114
}
120115
}
121116
}
122-
}},
123-
"defaultProject": "angular-dynamic-forms"
117+
}
118+
},
119+
"cli": {
120+
"analytics": false,
121+
"schematicCollections": [
122+
"@angular-eslint/schematics"
123+
]
124+
}
124125
}

e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

karma.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports = function (config) {
77
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
plugins: [
99
require('karma-jasmine'),
10+
require('karma-spec-reporter'),
1011
require('karma-chrome-launcher'),
1112
require('karma-jasmine-html-reporter'),
1213
require('karma-coverage-istanbul-reporter'),
@@ -27,7 +28,7 @@ module.exports = function (config) {
2728
flags: ['--no-sandbox', '--disable-gpu']
2829
}
2930
},
30-
reporters: ['progress', 'kjhtml'],
31+
reporters: ['progress', 'kjhtml', 'spec'],
3132
port: 9876,
3233
colors: true,
3334
logLevel: config.LOG_INFO,

0 commit comments

Comments
 (0)