Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 400d8af

Browse files
CaerusKaruCaerusKaru
authored
build: upgrade to Angular v10, CDK v10, and TypeScript 3.9 (#1261)
1 parent af92cb0 commit 400d8af

File tree

14 files changed

+136
-106
lines changed

14 files changed

+136
-106
lines changed

‎package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,29 @@
2828
"postinstall": "ngcc --properties es2015 browser module main --no-async --create-ivy-entry-points"
2929
},
3030
"version": "9.0.0-beta.31",
31-
"requiredAngularVersion": ">=9.1.5",
31+
"requiredAngularVersion": ">=10.0.0-rc.0",
3232
"dependencies": {
33-
"@angular/cdk": "^9.2.2",
34-
"@angular/common": "^9.1.5",
35-
"@angular/compiler": "^9.1.5",
36-
"@angular/core": "^9.1.5",
37-
"@angular/platform-browser": "^9.1.5",
33+
"@angular/cdk": "^10.0.0-next.1",
34+
"@angular/common": "^10.0.0-rc.0",
35+
"@angular/compiler": "^10.0.0-rc.0",
36+
"@angular/core": "^10.0.0-rc.0",
37+
"@angular/platform-browser": "^10.0.0-rc.0",
3838
"core-js": "^2.5.7",
3939
"karma-parallel": "^0.3.1",
4040
"rxjs": "^6.5.1",
4141
"systemjs": "0.19.43",
42-
"tsickle": "^0.37.1",
43-
"tslib": "^1.9.3",
44-
"zone.js": "~0.10.2"
42+
"tsickle": "^0.38.1",
43+
"tslib": "^2.0.0",
44+
"zone.js": "~0.10.3"
4545
},
4646
"devDependencies": {
47-
"@angular/animations": "^9.1.5",
48-
"@angular/compiler-cli": "^9.1.5",
49-
"@angular/forms": "^9.1.5",
50-
"@angular/material": "^9.2.2",
51-
"@angular/platform-browser-dynamic": "^9.1.5",
52-
"@angular/platform-server": "^9.1.5",
53-
"@angular/router": "^9.1.5",
47+
"@angular/animations": "^10.0.0-rc.0",
48+
"@angular/compiler-cli": "^10.0.0-rc.0",
49+
"@angular/forms": "^10.0.0-rc.0",
50+
"@angular/material": "^10.0.0-next.1",
51+
"@angular/platform-browser-dynamic": "^10.0.0-rc.0",
52+
"@angular/platform-server": "^10.0.0-rc.0",
53+
"@angular/router": "^10.0.0-rc.0",
5454
"@firebase/app-types": "^0.3.2",
5555
"@types/chalk": "^0.4.31",
5656
"@types/fs-extra": "^4.0.5",
@@ -120,7 +120,7 @@
120120
"ts-node": "^3.0.4",
121121
"tsconfig-paths": "^2.3.0",
122122
"tslint": "^5.11.0",
123-
"typescript": "~3.8.3",
123+
"typescript": "~3.9.2",
124124
"uglify-js": "^2.8.14"
125125
},
126126
"// Gulp": "Overwrite graceful-fs to a version that does not rely on the 'natives' package. This fixes gulp for >= 10.13, more information: angular/angular#28213",

‎src/apps/demo-app/angular.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
1414
"aot": true,
15+
"preserveSymlinks": true,
1516
"outputPath": "dist/browser",
1617
"index": "src/index.html",
1718
"main": "src/main.ts",
@@ -103,7 +104,8 @@
103104
"options": {
104105
"outputPath": "dist/server",
105106
"main": "src/main.server.ts",
106-
"tsConfig": "tsconfig.server.json"
107+
"tsConfig": "tsconfig.server.json",
108+
"preserveSymlinks": true
107109
}
108110
}
109111
}

‎src/apps/demo-app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"zone.js": "file:../../../node_modules/zone.js"
3131
},
3232
"devDependencies": {
33-
"@angular-devkit/build-angular": "~0.900.0-rc.2",
34-
"@angular/cli": "^9.0.0-rc.2",
33+
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
34+
"@angular/cli": "^10.0.0-rc.0",
3535
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
36-
"@angular/language-service": "^9.0.0-rc.2",
36+
"@angular/language-service": "^10.0.0-rc.0",
3737
"@types/jasmine": "~2.8.3",
3838
"@types/jasminewd2": "~2.0.2",
3939
"@types/node": "^12.12.11",

‎src/apps/demo-app/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"emitDecoratorMetadata": true,
99
"experimentalDecorators": true,
1010
"strictNullChecks": true,
11-
"target": "es5",
11+
"target": "es2015",
1212
"typeRoots": [
1313
"node_modules/@types"
1414
],

‎src/apps/hello-world/angular.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
1414
"aot": true,
15+
"preserveSymlinks": true,
1516
"outputPath": "dist",
1617
"index": "src/index.html",
1718
"main": "src/main.ts",

‎src/apps/hello-world/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"zone.js": "file:../../../node_modules/zone.js"
2626
},
2727
"devDependencies": {
28-
"@angular-devkit/build-angular": "~0.900.0-rc.2",
29-
"@angular/cli": "^9.0.0-rc.2",
28+
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
29+
"@angular/cli": "^10.0.0-rc.0",
3030
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
31-
"@angular/language-service": "^9.0.0-rc.2",
31+
"@angular/language-service": "^10.0.0-rc.0",
3232
"typescript": "file:../../../node_modules/typescript"
3333
}
3434
}

‎src/apps/hello-world/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"moduleResolution": "node",
88
"emitDecoratorMetadata": true,
99
"experimentalDecorators": true,
10-
"target": "es5",
10+
"target": "es2015",
1111
"typeRoots": [
1212
"node_modules/@types"
1313
],

‎src/apps/universal-app/angular.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
2020
"aot": true,
21+
"preserveSymlinks": true,
2122
"outputPath": "dist/browser",
2223
"index": "src/index.html",
2324
"main": "src/main.ts",
@@ -114,7 +115,8 @@
114115
"options": {
115116
"outputPath": "dist/server",
116117
"main": "server.ts",
117-
"tsConfig": "src/tsconfig.server.json"
118+
"tsConfig": "src/tsconfig.server.json",
119+
"preserveSymlinks": true
118120
},
119121
"configurations": {
120122
"production": {

‎src/apps/universal-app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
"@angular/platform-browser-dynamic": "file:../../../node_modules/@angular/platform-browser-dynamic",
2525
"@angular/platform-server": "file:../../../node_modules/@angular/platform-server",
2626
"@angular/router": "file:../../../node_modules/@angular/router",
27-
"@nguniversal/express-engine": "^9.0.0-next.6",
27+
"@nguniversal/express-engine": "^10.0.0-next.0",
2828
"express": "^4.16.2",
2929
"rxjs": "file:../../../node_modules/rxjs",
3030
"tslib": "file:../../../node_modules/tslib",
3131
"zone.js": "file:../../../node_modules/zone.js"
3232
},
3333
"devDependencies": {
34-
"@angular-devkit/build-angular": "~0.900.0-rc.2",
35-
"@angular/cli": "~9.0.0-rc.2",
34+
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
35+
"@angular/cli": "~10.0.0-rc.0",
3636
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
37-
"@angular/language-service": "~9.0.0-rc.2",
37+
"@angular/language-service": "~10.0.0-rc.0",
3838
"@types/express": "^4.17.0",
3939
"@types/node": "file:../../../node_modules/@types/node",
4040
"@types/jasmine": "~2.8.8",

‎src/apps/universal-app/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"emitDecoratorMetadata": true,
1111
"experimentalDecorators": true,
1212
"importHelpers": true,
13-
"target": "es5",
13+
"target": "es2015",
1414
"typeRoots": [
1515
"node_modules/@types"
1616
],

‎src/lib/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@
2222
"url": "https://github.com/angular/flex-layout/issues"
2323
},
2424
"homepage": "https://github.com/angular/flex-layout#readme",
25+
"dependencies": {
26+
"tslib": "^2.0.0"
27+
},
2528
"peerDependencies": {
26-
"@angular/cdk": "^9.0.0-rc.8",
29+
"@angular/cdk": "^10.0.0-next.0",
2730
"@angular/core": "0.0.0-NG",
2831
"@angular/common": "0.0.0-NG",
2932
"@angular/platform-browser": "0.0.0-NG",
30-
"rxjs": "^6.0.0",
31-
"tslib": "^1.9.0"
33+
"rxjs": "^6.0.0"
3234
},
3335
"sideEffects": false
3436
}

‎src/lib/tsconfig-tests.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
{
55
"extends": "./tsconfig-build",
66
"compilerOptions": {
7-
"importHelpers": false,
8-
"module": "commonjs",
7+
"importHelpers": true,
8+
"module": "umd",
99
"target": "es5",
1010
"types": ["jasmine"],
1111
"paths": {

‎tools/gulp/util/task-helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function execTask(binPath: string, args: string[], options: ExecTaskOptio
6868

6969
if (!options.silent || options.failOnStderr) {
7070
childProcess.stderr.on('data', (data: string) => {
71-
options.failOnStderr && !data.includes('Compiling') ?
71+
options.failOnStderr && !/\s/.test(data) && !data.includes('Compiling') ?
7272
stderrData.push(data) : process.stderr.write(data);
7373
});
7474
}

0 commit comments

Comments
 (0)