Skip to content

Commit ef998f5

Browse files
committed
upgrade to Angular 10
1 parent e4779f0 commit ef998f5

10 files changed

+4178
-2943
lines changed
File renamed without changes.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
This repository contains the code of the [Angular Material Course](https://angular-university.io/course/angular-material-course).
55

6-
This course repository is updated to Angular v9, and there is a package-lock.json file available, for avoiding semantic versioning installation issues.
6+
This course repository is updated to Angular v10, and there is a package-lock.json file available, for avoiding semantic versioning installation issues.
77

88
![Angular Material Course](https://s3-us-west-1.amazonaws.com/angular-university/course-images/material_design.png)
99

e2e/tsconfig.e2e.json

+1-1
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/e2e",
55
"baseUrl": "./",

package-lock.json

+4,106-2,890
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,46 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "9.0.1",
17-
"@angular/cdk": "^9.0.0",
18-
"@angular/common": "9.0.1",
19-
"@angular/compiler": "9.0.1",
20-
"@angular/core": "9.0.1",
21-
"@angular/forms": "9.0.1",
22-
"@angular/material": "^9.0.0",
23-
"@angular/material-moment-adapter": "9.0.0",
24-
"@angular/platform-browser": "9.0.1",
25-
"@angular/platform-browser-dynamic": "9.0.1",
26-
"@angular/router": "9.0.1",
16+
"@angular/animations": "10.0.2",
17+
"@angular/cdk": "^10.0.1",
18+
"@angular/common": "10.0.2",
19+
"@angular/compiler": "10.0.2",
20+
"@angular/core": "10.0.2",
21+
"@angular/forms": "10.0.2",
22+
"@angular/material": "^10.0.1",
23+
"@angular/material-moment-adapter": "10.0.1",
24+
"@angular/platform-browser": "10.0.2",
25+
"@angular/platform-browser-dynamic": "10.0.2",
26+
"@angular/router": "10.0.2",
2727
"core-js": "^2.4.1",
2828
"express": "^4.16.2",
2929
"moment": "^2.22.2",
3030
"rxjs": "6.5.4",
31-
"tslib": "^1.10.0",
32-
"zone.js": "~0.10.2"
31+
"tslib": "^2.0.0",
32+
"zone.js": "~0.10.3"
3333
},
3434
"devDependencies": {
35-
"@angular-devkit/build-angular": "~0.900.2",
36-
"@angular-devkit/schematics": "^9.0.2",
37-
"@angular/cli": "^9.0.2",
38-
"@angular/compiler-cli": "9.0.1",
39-
"@angular/language-service": "9.0.1",
35+
"@angular-devkit/build-angular": "~0.1000.1",
36+
"@angular-devkit/schematics": "^10.0.1",
37+
"@angular/cli": "^10.0.1",
38+
"@angular/compiler-cli": "10.0.2",
39+
"@angular/language-service": "10.0.2",
4040
"@types/express": "^4.0.39",
4141
"@types/jasmine": "~2.5.53",
4242
"@types/jasminewd2": "~2.0.2",
4343
"@types/node": "^12.11.1",
4444
"codelyzer": "^5.1.2",
45-
"jasmine-core": "~2.6.2",
46-
"jasmine-spec-reporter": "~4.1.0",
47-
"karma": "^4.1.0",
48-
"karma-chrome-launcher": "~2.1.1",
45+
"jasmine-core": "~3.5.0",
46+
"jasmine-spec-reporter": "~5.0.0",
47+
"karma": "~5.0.0",
48+
"karma-chrome-launcher": "~3.1.0",
4949
"karma-cli": "~1.0.1",
50-
"karma-coverage-istanbul-reporter": "^1.2.1",
51-
"karma-jasmine": "~1.1.0",
52-
"karma-jasmine-html-reporter": "^0.2.2",
53-
"protractor": "^6.0.0",
50+
"karma-coverage-istanbul-reporter": "~3.0.2",
51+
"karma-jasmine": "~3.3.0",
52+
"karma-jasmine-html-reporter": "^1.5.0",
53+
"protractor": "~7.0.0",
5454
"ts-node": "~3.2.0",
55-
"tslint": "~5.7.0",
56-
"typescript": "3.7.5"
55+
"tslint": "~6.1.0",
56+
"typescript": "3.9.6"
5757
}
5858
}

src/tsconfig.app.json

+1-1
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
"baseUrl": "./",

src/tsconfig.spec.json

+1-1
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
"baseUrl": "./",

tsconfig.base.json

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

tsconfig.json

+16-20
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
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-
"module": "esnext",
5-
"outDir": "./dist/out-tsc",
6-
"sourceMap": true,
7-
"declaration": false,
8-
"moduleResolution": "node",
9-
"emitDecoratorMetadata": true,
10-
"experimentalDecorators": true,
11-
"target": "es2015",
12-
"typeRoots": [
13-
"node_modules/@types"
14-
],
15-
"lib": [
16-
"es2017",
17-
"dom",
18-
"ES2017.object"
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+
}

tslint.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
"check-space"
1212
],
1313
"curly": true,
14+
"deprecation": {
15+
"severity": "warning"
16+
},
1417
"eofline": true,
1518
"forin": true,
1619
"import-blacklist": [
@@ -69,7 +72,6 @@
6972
"no-trailing-whitespace": true,
7073
"no-unnecessary-initializer": true,
7174
"no-unused-expression": true,
72-
"no-use-before-declare": true,
7375
"no-var-keyword": true,
7476
"object-literal-sort-keys": false,
7577
"one-line": [

0 commit comments

Comments
 (0)