Skip to content

Commit c0c4d0b

Browse files
committed
build: update to latest Angular version and TypeScript 4.1
Updates to the latest versions of Angular and TypeScript.
1 parent 6ca1e43 commit c0c4d0b

File tree

4 files changed

+147
-131
lines changed

4 files changed

+147
-131
lines changed

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
},
5252
"version": "11.1.0-next.0",
5353
"dependencies": {
54-
"@angular/animations": "^11.0.0",
55-
"@angular/common": "^11.0.0",
56-
"@angular/compiler": "^11.0.0",
57-
"@angular/core": "^11.0.0",
58-
"@angular/elements": "^11.0.0",
59-
"@angular/forms": "^11.0.0",
60-
"@angular/platform-browser": "^11.0.0",
54+
"@angular/animations": "^11.1.0-next.1",
55+
"@angular/common": "^11.1.0-next.1",
56+
"@angular/compiler": "^11.1.0-next.1",
57+
"@angular/core": "^11.1.0-next.1",
58+
"@angular/elements": "^11.1.0-next.1",
59+
"@angular/forms": "^11.1.0-next.1",
60+
"@angular/platform-browser": "^11.1.0-next.1",
6161
"@types/googlemaps": "^3.39.3",
6262
"@types/youtube": "^0.0.40",
6363
"@webcomponents/custom-elements": "^1.1.0",
@@ -70,16 +70,16 @@
7070
"zone.js": "~0.10.3"
7171
},
7272
"devDependencies": {
73-
"@angular-devkit/build-optimizer": "^0.1100.0",
74-
"@angular-devkit/core": "^11.0.0",
75-
"@angular-devkit/schematics": "^11.0.0",
76-
"@angular/bazel": "^11.0.0",
73+
"@angular-devkit/build-optimizer": "^0.1101.0-next.1",
74+
"@angular-devkit/core": "^11.1.0-next.1",
75+
"@angular-devkit/schematics": "^11.1.0-next.1",
76+
"@angular/bazel": "^11.1.0-next.1",
7777
"@angular/benchpress": "0.2.1",
78-
"@angular/compiler-cli": "^11.0.0",
78+
"@angular/compiler-cli": "^11.1.0-next.1",
7979
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#f8bc880d554d45ca8bf881b8a776f00f61b918fb",
80-
"@angular/platform-browser-dynamic": "^11.0.0",
81-
"@angular/platform-server": "^11.0.0",
82-
"@angular/router": "^11.0.0",
80+
"@angular/platform-browser-dynamic": "^11.1.0-next.1",
81+
"@angular/platform-server": "^11.1.0-next.1",
82+
"@angular/router": "^11.1.0-next.1",
8383
"@bazel/bazelisk": "^1.4.0",
8484
"@bazel/buildifier": "^2.2.1",
8585
"@bazel/ibazel": "^0.13.0",
@@ -91,7 +91,7 @@
9191
"@bazel/typescript": "^2.2.0",
9292
"@firebase/app-types": "^0.6.1",
9393
"@octokit/rest": "16.28.7",
94-
"@schematics/angular": "^11.0.0",
94+
"@schematics/angular": "^11.1.0-next.1",
9595
"@types/autoprefixer": "^9.7.2",
9696
"@types/browser-sync": "^2.26.1",
9797
"@types/fs-extra": "^4.0.3",
@@ -171,12 +171,12 @@
171171
"tsickle": "0.39.1",
172172
"tslint": "^6.1.3",
173173
"tsutils": "^3.17.1",
174-
"typescript": "4.0.5",
174+
"typescript": "~4.1.2",
175175
"vrsource-tslint-rules": "5.1.1",
176176
"yaml": "^1.10.0"
177177
},
178178
"resolutions": {
179-
"dgeni-packages/typescript": "4.0.2",
179+
"dgeni-packages/typescript": "4.1.2",
180180
"**/graceful-fs": "4.2.2"
181181
},
182182
"husky": {

src/cdk/testing/change-detection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ async function batchChangeDetection<T>(fn: () => Promise<T>, triggerBeforeAndAft
7575
if (triggerBeforeAndAfter) {
7676
await new Promise(resolve => autoChangeDetectionSubject.next({
7777
isDisabled: true,
78-
onDetectChangesNow: resolve,
78+
onDetectChangesNow: resolve as () => void,
7979
}));
8080
// The function passed in may throw (e.g. if the user wants to make an expectation of an error
8181
// being thrown. If this happens, we need to make sure we still re-enable change detection, so
@@ -85,7 +85,7 @@ async function batchChangeDetection<T>(fn: () => Promise<T>, triggerBeforeAndAft
8585
} finally {
8686
await new Promise(resolve => autoChangeDetectionSubject.next({
8787
isDisabled: false,
88-
onDetectChangesNow: resolve,
88+
onDetectChangesNow: resolve as () => void,
8989
}));
9090
}
9191
} else {

tools/package-tools/ts-compile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import chalk from 'chalk';
99
* @returns Promise that resolves/rejects when the child process exits.
1010
*/
1111
export function tsCompile(binary: 'tsc' | 'ngc', flags: string[]) {
12-
return new Promise((resolve, reject) => {
12+
return new Promise<void>((resolve, reject) => {
1313
const binaryPath = resolvePath(`./node_modules/typescript/bin/${binary}`);
1414
const childProcess = spawn(binaryPath, flags, {shell: true});
1515

0 commit comments

Comments
 (0)