Skip to content

Commit 548e0d8

Browse files
committed
build: update Angular, CLI, Material, CDK to v10
- silence build warnings with `allowedCommonJsDependencies`
1 parent b7013f1 commit 548e0d8

File tree

8 files changed

+2842
-2219
lines changed

8 files changed

+2842
-2219
lines changed

angular.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,16 @@
3131
"tsConfig": "src/tsconfig.app.json",
3232
"assets": ["src/favicon.ico", "src/assets"],
3333
"styles": ["src/styles.scss", "node_modules/angular-material/angular-material.scss"],
34-
"scripts": []
34+
"scripts": [],
35+
"allowedCommonJsDependencies": [
36+
"angular",
37+
"angular-animate",
38+
"angular-aria",
39+
"angular-material",
40+
"angular-messages",
41+
"zone.js/dist/zone-error",
42+
"zone.js/dist/zone"
43+
]
3544
},
3645
"configurations": {
3746
"production": {

package-lock.json

Lines changed: 2771 additions & 2174 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
@@ -1,6 +1,6 @@
11
{
22
"name": "angularjs-angular-material-hybrid-demo",
3-
"version": "0.3.3",
3+
"version": "0.4.0",
44
"private": true,
55
"scripts": {
66
"ng": "ng",
@@ -17,54 +17,54 @@
1717
"update": "npm-check -u"
1818
},
1919
"dependencies": {
20-
"@angular/animations": "9.1.9",
21-
"@angular/cdk": "9.2.4",
22-
"@angular/common": "9.1.9",
23-
"@angular/compiler": "9.1.9",
24-
"@angular/core": "9.1.9",
25-
"@angular/fire": "^6.0.0",
26-
"@angular/forms": "9.1.9",
27-
"@angular/material": "9.2.4",
28-
"@angular/platform-browser": "9.1.9",
29-
"@angular/platform-browser-dynamic": "9.1.9",
30-
"@angular/upgrade": "9.1.9",
20+
"@angular/animations": "10.0.1",
21+
"@angular/cdk": "10.0.0",
22+
"@angular/common": "10.0.1",
23+
"@angular/compiler": "10.0.1",
24+
"@angular/core": "10.0.1",
25+
"@angular/fire": "^6.0.2",
26+
"@angular/forms": "10.0.1",
27+
"@angular/material": "10.0.0",
28+
"@angular/platform-browser": "10.0.1",
29+
"@angular/platform-browser-dynamic": "10.0.1",
30+
"@angular/upgrade": "10.0.1",
3131
"@schuchard/prettier": "^3.1.0",
32-
"@types/angular": "^1.7.0",
32+
"@types/angular": "^1.7.2",
3333
"@types/angular-material": "^1.1.71",
3434
"angular": "^1.8.0",
3535
"angular-animate": "^1.8.0",
3636
"angular-aria": "^1.8.0",
37-
"angular-material": "^1.1.22",
37+
"angular-material": "^1.1.23",
3838
"angular-messages": "^1.8.0",
39-
"firebase": "^7.15.0",
39+
"firebase": "^7.15.5",
4040
"rxjs": "^6.5.5",
41-
"tslib": "^1.11.2",
41+
"tslib": "^2.0.0",
4242
"zone.js": "~0.10.3"
4343
},
4444
"devDependencies": {
45-
"@angular-devkit/architect": "^0.901.7",
46-
"@angular-devkit/build-angular": "~0.901.7",
47-
"@angular/cli": "~9.1.7",
48-
"@angular/compiler-cli": "~9.1.9",
49-
"@angular/language-service": "~9.1.9",
45+
"@angular-devkit/architect": "^0.1000.0",
46+
"@angular-devkit/build-angular": "~0.1000.0",
47+
"@angular/cli": "~10.0.0",
48+
"@angular/compiler-cli": "~10.0.1",
49+
"@angular/language-service": "~10.0.1",
5050
"@types/gulp": "^4.0.6",
51-
"@types/node": "^14.0.11",
52-
"codelyzer": "^5.2.2",
53-
"firebase-tools": "^8.4.2",
51+
"@types/node": "^14.0.14",
52+
"codelyzer": "^6.0.0-next.1",
53+
"firebase-tools": "^8.4.3",
5454
"gulp": "^4.0.2",
5555
"gulp-angular-templatecache": "^3.0.0",
5656
"gulp-htmlmin": "^5.0.1",
5757
"husky": "4.2.5",
58-
"lint-staged": "^10.2.9",
58+
"lint-staged": "^10.2.11",
5959
"npm-check": "^5.9.2",
6060
"prettier": "2.0.5",
61-
"rxjs-tslint-rules": "^4.33.1",
61+
"rxjs-tslint-rules": "^4.33.3",
6262
"source-map-explorer": "^2.4.2",
6363
"ts-node": "^8.10.2",
64-
"tslint": "^6.1.2",
64+
"tslint": "~6.1.0",
6565
"tslint-config-prettier": "1.18.0",
6666
"tsutils": "^3.17.1",
67-
"typescript": "~3.8.3"
67+
"typescript": "~3.9.5"
6868
},
6969
"husky": {
7070
"hooks": {
File renamed without changes.

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": []

tsconfig.base.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
"importHelpers": true,
13+
"target": "es2015",
14+
"typeRoots": ["node_modules/@types"],
15+
"lib": ["es2018", "dom"]
16+
}
17+
}

tsconfig.json

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
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-
"importHelpers": true,
13-
"target": "es2015",
14-
"typeRoots": ["node_modules/@types"],
15-
"lib": ["es2018", "dom"]
16-
}
8+
"files": [],
9+
"references": [
10+
{
11+
"path": "./src/tsconfig.app.json"
12+
}
13+
]
1714
}

tslint.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"class-name": true,
77
"comment-format": [true, "check-space"],
88
"curly": true,
9+
"deprecation": {
10+
"severity": "warning"
11+
},
912
"eofline": true,
1013
"forin": true,
1114
"import-blacklist": [true],

0 commit comments

Comments
 (0)