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

build: upgrade to Angular v10, CDK v10, and TypeScript 3.9 #1261

Merged
merged 3 commits into from
May 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,29 @@
"postinstall": "ngcc --properties es2015 browser module main --no-async --create-ivy-entry-points"
},
"version": "9.0.0-beta.31",
"requiredAngularVersion": ">=9.1.5",
"requiredAngularVersion": ">=10.0.0-rc.0",
"dependencies": {
"@angular/cdk": "^9.2.2",
"@angular/common": "^9.1.5",
"@angular/compiler": "^9.1.5",
"@angular/core": "^9.1.5",
"@angular/platform-browser": "^9.1.5",
"@angular/cdk": "^10.0.0-next.1",
"@angular/common": "^10.0.0-rc.0",
"@angular/compiler": "^10.0.0-rc.0",
"@angular/core": "^10.0.0-rc.0",
"@angular/platform-browser": "^10.0.0-rc.0",
"core-js": "^2.5.7",
"karma-parallel": "^0.3.1",
"rxjs": "^6.5.1",
"systemjs": "0.19.43",
"tsickle": "^0.37.1",
"tslib": "^1.9.3",
"zone.js": "~0.10.2"
"tsickle": "^0.38.1",
"tslib": "^2.0.0",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular/animations": "^9.1.5",
"@angular/compiler-cli": "^9.1.5",
"@angular/forms": "^9.1.5",
"@angular/material": "^9.2.2",
"@angular/platform-browser-dynamic": "^9.1.5",
"@angular/platform-server": "^9.1.5",
"@angular/router": "^9.1.5",
"@angular/animations": "^10.0.0-rc.0",
"@angular/compiler-cli": "^10.0.0-rc.0",
"@angular/forms": "^10.0.0-rc.0",
"@angular/material": "^10.0.0-next.1",
"@angular/platform-browser-dynamic": "^10.0.0-rc.0",
"@angular/platform-server": "^10.0.0-rc.0",
"@angular/router": "^10.0.0-rc.0",
"@firebase/app-types": "^0.3.2",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^4.0.5",
Expand Down Expand Up @@ -120,7 +120,7 @@
"ts-node": "^3.0.4",
"tsconfig-paths": "^2.3.0",
"tslint": "^5.11.0",
"typescript": "~3.8.3",
"typescript": "~3.9.2",
"uglify-js": "^2.8.14"
},
"// 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",
Expand Down
4 changes: 3 additions & 1 deletion src/apps/demo-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"preserveSymlinks": true,
"outputPath": "dist/browser",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down Expand Up @@ -103,7 +104,8 @@
"options": {
"outputPath": "dist/server",
"main": "src/main.server.ts",
"tsConfig": "tsconfig.server.json"
"tsConfig": "tsconfig.server.json",
"preserveSymlinks": true
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/apps/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"zone.js": "file:../../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.900.0-rc.2",
"@angular/cli": "^9.0.0-rc.2",
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
"@angular/cli": "^10.0.0-rc.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "^9.0.0-rc.2",
"@angular/language-service": "^10.0.0-rc.0",
"@types/jasmine": "~2.8.3",
"@types/jasminewd2": "~2.0.2",
"@types/node": "^12.12.11",
Expand Down
2 changes: 1 addition & 1 deletion src/apps/demo-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"strictNullChecks": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
Expand Down
1 change: 1 addition & 0 deletions src/apps/hello-world/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"preserveSymlinks": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down
6 changes: 3 additions & 3 deletions src/apps/hello-world/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"zone.js": "file:../../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.900.0-rc.2",
"@angular/cli": "^9.0.0-rc.2",
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
"@angular/cli": "^10.0.0-rc.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "^9.0.0-rc.2",
"@angular/language-service": "^10.0.0-rc.0",
"typescript": "file:../../../node_modules/typescript"
}
}
2 changes: 1 addition & 1 deletion src/apps/hello-world/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
Expand Down
4 changes: 3 additions & 1 deletion src/apps/universal-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"preserveSymlinks": true,
"outputPath": "dist/browser",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down Expand Up @@ -114,7 +115,8 @@
"options": {
"outputPath": "dist/server",
"main": "server.ts",
"tsConfig": "src/tsconfig.server.json"
"tsConfig": "src/tsconfig.server.json",
"preserveSymlinks": true
},
"configurations": {
"production": {
Expand Down
8 changes: 4 additions & 4 deletions src/apps/universal-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"@angular/platform-browser-dynamic": "file:../../../node_modules/@angular/platform-browser-dynamic",
"@angular/platform-server": "file:../../../node_modules/@angular/platform-server",
"@angular/router": "file:../../../node_modules/@angular/router",
"@nguniversal/express-engine": "^9.0.0-next.6",
"@nguniversal/express-engine": "^10.0.0-next.0",
"express": "^4.16.2",
"rxjs": "file:../../../node_modules/rxjs",
"tslib": "file:../../../node_modules/tslib",
"zone.js": "file:../../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.900.0-rc.2",
"@angular/cli": "~9.0.0-rc.2",
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
"@angular/cli": "~10.0.0-rc.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "~9.0.0-rc.2",
"@angular/language-service": "~10.0.0-rc.0",
"@types/express": "^4.17.0",
"@types/node": "file:../../../node_modules/@types/node",
"@types/jasmine": "~2.8.8",
Expand Down
2 changes: 1 addition & 1 deletion src/apps/universal-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
Expand Down
8 changes: 5 additions & 3 deletions src/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@
"url": "https://github.com/angular/flex-layout/issues"
},
"homepage": "https://github.com/angular/flex-layout#readme",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/cdk": "^9.0.0-rc.8",
"@angular/cdk": "^10.0.0-next.0",
"@angular/core": "0.0.0-NG",
"@angular/common": "0.0.0-NG",
"@angular/platform-browser": "0.0.0-NG",
"rxjs": "^6.0.0",
"tslib": "^1.9.0"
"rxjs": "^6.0.0"
},
"sideEffects": false
}
4 changes: 2 additions & 2 deletions src/lib/tsconfig-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
{
"extends": "./tsconfig-build",
"compilerOptions": {
"importHelpers": false,
"module": "commonjs",
"importHelpers": true,
"module": "umd",
"target": "es5",
"types": ["jasmine"],
"paths": {
Expand Down
2 changes: 1 addition & 1 deletion tools/gulp/util/task-helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function execTask(binPath: string, args: string[], options: ExecTaskOptio

if (!options.silent || options.failOnStderr) {
childProcess.stderr.on('data', (data: string) => {
options.failOnStderr && !data.includes('Compiling') ?
options.failOnStderr && !/\s/.test(data) && !data.includes('Compiling') ?
stderrData.push(data) : process.stderr.write(data);
});
}
Expand Down
Loading