Skip to content

Commit 07bb027

Browse files
crisbetocrisbeto
authored
build: update to latest Angular version and TypeScript 4.1 (#21238)
Updates to the latest versions of Angular and TypeScript.
1 parent 4e6916a commit 07bb027

File tree

7 files changed

+164
-148
lines changed

7 files changed

+164
-148
lines changed

‎package.json

Lines changed: 19 additions & 19 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.2",
55+
"@angular/common": "^11.1.0-next.2",
56+
"@angular/compiler": "^11.1.0-next.2",
57+
"@angular/core": "^11.1.0-next.2",
58+
"@angular/elements": "^11.1.0-next.2",
59+
"@angular/forms": "^11.1.0-next.2",
60+
"@angular/platform-browser": "^11.1.0-next.2",
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.2",
74+
"@angular-devkit/core": "^11.1.0-next.2",
75+
"@angular-devkit/schematics": "^11.1.0-next.2",
76+
"@angular/bazel": "^11.1.0-next.2",
7777
"@angular/benchpress": "0.2.1",
78-
"@angular/compiler-cli": "^11.0.0",
78+
"@angular/compiler-cli": "^11.1.0-next.2",
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.2",
81+
"@angular/platform-server": "^11.1.0-next.2",
82+
"@angular/router": "^11.1.0-next.2",
8383
"@bazel/bazelisk": "^1.4.0",
8484
"@bazel/buildifier": "^3.5.0",
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.2",
9595
"@types/autoprefixer": "^9.7.2",
9696
"@types/browser-sync": "^2.26.1",
9797
"@types/fs-extra": "^9.0.5",
@@ -115,7 +115,7 @@
115115
"axe-webdriverjs": "^1.1.1",
116116
"browser-sync": "^2.26.7",
117117
"chalk": "^2.4.2",
118-
"codelyzer": "^6.0.0-next.1",
118+
"codelyzer": "^6.0.0-next.2",
119119
"conventional-changelog": "^3.0.5",
120120
"dgeni": "^0.4.11",
121121
"dgeni-packages": "^0.28.4",
@@ -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 {

‎src/material/schematics/ng-update/test-cases/v9/misc/hammer-migration-v9.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,8 @@ describe('v9 HammerJS removal', () => {
429429
await runMigration();
430430

431431
expect(tree.readContent('/projects/cdk-testing/src/app/app.module.ts')).toContain(dedent`\
432-
import { BrowserModule, HammerModule } from '@angular/platform-browser';
433432
import { NgModule } from '@angular/core';
433+
import { BrowserModule, HammerModule } from '@angular/platform-browser';
434434
435435
import { AppComponent } from './app.component';
436436
@@ -457,7 +457,7 @@ describe('v9 HammerJS removal', () => {
457457
import {NgModule} from '@angular/core';
458458
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
459459
import {GestureConfig} from '@angular/material/core';
460-
460+
461461
@NgModule({
462462
providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
463463
})
@@ -657,8 +657,8 @@ describe('v9 HammerJS removal', () => {
657657
expect(tree.readContent('/projects/cdk-testing/src/main.ts')).toContain(`import 'hammerjs';`);
658658
expect(tree.exists('/projects/cdk-testing/src/gesture-config.ts')).toBe(true);
659659
expect(tree.readContent('/projects/cdk-testing/src/app/app.module.ts')).toContain(dedent`\
660-
import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
661660
import { NgModule } from '@angular/core';
661+
import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
662662
663663
import { AppComponent } from './app.component';
664664
import { GestureConfig } from "../gesture-config";
@@ -687,14 +687,14 @@ describe('v9 HammerJS removal', () => {
687687
import 'hammerjs';
688688
import { enableProdMode } from '@angular/core';
689689
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
690-
690+
691691
import { AppModule } from './app/';
692692
import { environment } from './environments/environment';
693-
693+
694694
if (environment.production) {
695695
enableProdMode();
696696
}
697-
697+
698698
platformBrowserDynamic().bootstrapModule(AppModule)
699699
.catch(err => console.error(err));
700700
`);
@@ -706,8 +706,8 @@ describe('v9 HammerJS removal', () => {
706706
expect(tree.readContent('/projects/cdk-testing/src/main.ts')).toContain(`import 'hammerjs';`);
707707
expect(tree.exists('/projects/cdk-testing/src/gesture-config.ts')).toBe(true);
708708
expect(tree.readContent('/projects/cdk-testing/src/app/app.module.ts')).toContain(dedent`\
709-
import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
710709
import { NgModule } from '@angular/core';
710+
import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
711711
712712
import { AppComponent } from './app.component';
713713
import { GestureConfig } from "../gesture-config";

‎test/browser-providers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* - `saucelabs`: Launches the browser within Saucelabs
88
*/
99
const browserConfig = {
10-
'Edge83': {unitTest: {target: 'browserstack'}},
10+
'Edge87': {unitTest: {target: 'browserstack'}},
1111
'iOS13': {unitTest: {target: 'saucelabs'}},
1212
'Safari13': {unitTest: {target: 'browserstack'}},
1313
};

‎test/karma-browsers.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"platformName": "iOS",
2020
"deviceName": "iPhone XS Simulator"
2121
},
22-
"BROWSERSTACK_EDGE83": {
22+
"BROWSERSTACK_EDGE87": {
2323
"base": "BrowserStack",
2424
"browser": "Edge",
25-
"browser_version": "83.0",
25+
"browser_version": "87.0",
2626
"os": "Windows",
2727
"os_version": "10"
2828
},

‎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)