Skip to content

Commit cbbd77a

Browse files
committed
upgrade to Angular 10
1 parent c20cd8a commit cbbd77a

9 files changed

+4376
-3815
lines changed
File renamed without changes.

e2e/tsconfig.e2e.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"module": "commonjs",

package-lock.json

Lines changed: 4305 additions & 3763 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,45 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "^9.0.1",
16-
"@angular/cdk": "^9.0.0",
17-
"@angular/common": "^9.0.1",
18-
"@angular/compiler": "^9.0.1",
19-
"@angular/core": "^9.0.1",
20-
"@angular/elements": "^9.0.1",
21-
"@angular/forms": "^9.0.1",
22-
"@angular/localize": "^9.0.2",
23-
"@angular/material": "^9.0.0",
24-
"@angular/platform-browser": "^9.0.1",
25-
"@angular/platform-browser-dynamic": "^9.0.1",
26-
"@angular/router": "^9.0.1",
15+
"@angular/animations": "^10.0.1",
16+
"@angular/cdk": "^10.0.0",
17+
"@angular/common": "^10.0.1",
18+
"@angular/compiler": "^10.0.1",
19+
"@angular/core": "^10.0.1",
20+
"@angular/elements": "^10.0.1",
21+
"@angular/forms": "^10.0.1",
22+
"@angular/localize": "^10.0.1",
23+
"@angular/material": "^10.0.0",
24+
"@angular/platform-browser": "^10.0.1",
25+
"@angular/platform-browser-dynamic": "^10.0.1",
26+
"@angular/router": "^10.0.1",
2727
"body-parser": "^1.18.3",
2828
"core-js": "^2.5.4",
2929
"document-register-element": "1.8.1",
3030
"express": "^4.16.3",
3131
"rxjs": "^6.5.4",
32-
"tslib": "^1.10.0",
33-
"zone.js": "~0.10.2"
32+
"tslib": "^2.0.0",
33+
"zone.js": "~0.10.3"
3434
},
3535
"devDependencies": {
36-
"@angular-devkit/build-angular": "~0.900.2",
37-
"@angular/cli": "^9.0.2",
38-
"@angular/compiler-cli": "^9.0.1",
39-
"@angular/language-service": "^9.0.1",
36+
"@angular-devkit/build-angular": "~0.1000.0",
37+
"@angular/cli": "^10.0.0",
38+
"@angular/compiler-cli": "^10.0.1",
39+
"@angular/language-service": "^10.0.1",
4040
"@types/jasmine": "~2.8.6",
4141
"@types/jasminewd2": "~2.0.3",
4242
"@types/node": "^12.11.1",
4343
"codelyzer": "^5.1.2",
44-
"jasmine-core": "~2.99.1",
45-
"jasmine-spec-reporter": "~4.2.1",
46-
"karma": "^4.1.0",
47-
"karma-chrome-launcher": "~2.2.0",
48-
"karma-coverage-istanbul-reporter": "~2.0.0",
49-
"karma-jasmine": "~1.1.1",
50-
"karma-jasmine-html-reporter": "^0.2.2",
51-
"protractor": "~5.4.0",
44+
"jasmine-core": "~3.5.0",
45+
"jasmine-spec-reporter": "~5.0.0",
46+
"karma": "~5.0.0",
47+
"karma-chrome-launcher": "~3.1.0",
48+
"karma-coverage-istanbul-reporter": "~3.0.2",
49+
"karma-jasmine": "~3.3.0",
50+
"karma-jasmine-html-reporter": "^1.5.0",
51+
"protractor": "~7.0.0",
5252
"ts-node": "~5.0.1",
53-
"tslint": "~5.9.1",
54-
"typescript": "~3.7.5"
53+
"tslint": "~6.1.0",
54+
"typescript": "~3.9.5"
5555
}
5656
}

src/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"types": []

src/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/spec",
55
"types": [

tsconfig.base.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"baseUrl": "./",
5+
"outDir": "./dist/out-tsc",
6+
"sourceMap": true,
7+
"declaration": false,
8+
"module": "esnext",
9+
"moduleResolution": "node",
10+
"emitDecoratorMetadata": true,
11+
"experimentalDecorators": true,
12+
"target": "es2015",
13+
"typeRoots": [
14+
"node_modules/@types"
15+
],
16+
"lib": [
17+
"es2017",
18+
"dom"
19+
]
20+
}
21+
}

tsconfig.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1+
/*
2+
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3+
It is not intended to be used to perform a compilation.
4+
5+
To learn more about this file see: https://angular.io/config/solution-tsconfig.
6+
*/
17
{
2-
"compileOnSave": false,
3-
"compilerOptions": {
4-
"baseUrl": "./",
5-
"outDir": "./dist/out-tsc",
6-
"sourceMap": true,
7-
"declaration": false,
8-
"module": "esnext",
9-
"moduleResolution": "node",
10-
"emitDecoratorMetadata": true,
11-
"experimentalDecorators": true,
12-
"target": "es2015",
13-
"typeRoots": [
14-
"node_modules/@types"
15-
],
16-
"lib": [
17-
"es2017",
18-
"dom"
19-
]
20-
}
21-
}
8+
"files": [],
9+
"references": [
10+
{
11+
"path": "./src/tsconfig.app.json"
12+
},
13+
{
14+
"path": "./src/tsconfig.spec.json"
15+
},
16+
{
17+
"path": "./e2e/tsconfig.e2e.json"
18+
}
19+
]
20+
}

tslint.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
"no-trailing-whitespace": true,
7373
"no-unnecessary-initializer": true,
7474
"no-unused-expression": true,
75-
"no-use-before-declare": true,
7675
"no-var-keyword": true,
7776
"object-literal-sort-keys": false,
7877
"one-line": [

0 commit comments

Comments
 (0)