Skip to content

build: update to latest Angular version and TypeScript 4.1 #21238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 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
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
},
"version": "11.1.0-next.0",
"dependencies": {
"@angular/animations": "^11.0.0",
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/elements": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"@angular/animations": "^11.1.0-next.2",
"@angular/common": "^11.1.0-next.2",
"@angular/compiler": "^11.1.0-next.2",
"@angular/core": "^11.1.0-next.2",
"@angular/elements": "^11.1.0-next.2",
"@angular/forms": "^11.1.0-next.2",
"@angular/platform-browser": "^11.1.0-next.2",
"@types/googlemaps": "^3.39.3",
"@types/youtube": "^0.0.40",
"@webcomponents/custom-elements": "^1.1.0",
Expand All @@ -70,16 +70,16 @@
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-optimizer": "^0.1100.0",
"@angular-devkit/core": "^11.0.0",
"@angular-devkit/schematics": "^11.0.0",
"@angular/bazel": "^11.0.0",
"@angular-devkit/build-optimizer": "^0.1101.0-next.2",
"@angular-devkit/core": "^11.1.0-next.2",
"@angular-devkit/schematics": "^11.1.0-next.2",
"@angular/bazel": "^11.1.0-next.2",
"@angular/benchpress": "0.2.1",
"@angular/compiler-cli": "^11.0.0",
"@angular/compiler-cli": "^11.1.0-next.2",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#f8bc880d554d45ca8bf881b8a776f00f61b918fb",
"@angular/platform-browser-dynamic": "^11.0.0",
"@angular/platform-server": "^11.0.0",
"@angular/router": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.1.0-next.2",
"@angular/platform-server": "^11.1.0-next.2",
"@angular/router": "^11.1.0-next.2",
"@bazel/bazelisk": "^1.4.0",
"@bazel/buildifier": "^3.5.0",
"@bazel/ibazel": "^0.13.0",
Expand All @@ -91,7 +91,7 @@
"@bazel/typescript": "^2.2.0",
"@firebase/app-types": "^0.6.1",
"@octokit/rest": "16.28.7",
"@schematics/angular": "^11.0.0",
"@schematics/angular": "^11.1.0-next.2",
"@types/autoprefixer": "^9.7.2",
"@types/browser-sync": "^2.26.1",
"@types/fs-extra": "^4.0.3",
Expand All @@ -115,7 +115,7 @@
"axe-webdriverjs": "^1.1.1",
"browser-sync": "^2.26.7",
"chalk": "^2.4.2",
"codelyzer": "^6.0.0-next.1",
"codelyzer": "^6.0.0-next.2",
"conventional-changelog": "^3.0.5",
"dgeni": "^0.4.11",
"dgeni-packages": "^0.28.4",
Expand Down Expand Up @@ -171,12 +171,12 @@
"tsickle": "0.39.1",
"tslint": "^6.1.3",
"tsutils": "^3.17.1",
"typescript": "4.0.5",
"typescript": "~4.1.2",
"vrsource-tslint-rules": "5.1.1",
"yaml": "^1.10.0"
},
"resolutions": {
"dgeni-packages/typescript": "4.0.2",
"dgeni-packages/typescript": "4.1.2",
"**/graceful-fs": "4.2.2"
},
"husky": {
Expand Down
4 changes: 2 additions & 2 deletions src/cdk/testing/change-detection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ async function batchChangeDetection<T>(fn: () => Promise<T>, triggerBeforeAndAft
if (triggerBeforeAndAfter) {
await new Promise(resolve => autoChangeDetectionSubject.next({
isDisabled: true,
onDetectChangesNow: resolve,
onDetectChangesNow: resolve as () => void,
}));
// The function passed in may throw (e.g. if the user wants to make an expectation of an error
// being thrown. If this happens, we need to make sure we still re-enable change detection, so
Expand All @@ -85,7 +85,7 @@ async function batchChangeDetection<T>(fn: () => Promise<T>, triggerBeforeAndAft
} finally {
await new Promise(resolve => autoChangeDetectionSubject.next({
isDisabled: false,
onDetectChangesNow: resolve,
onDetectChangesNow: resolve as () => void,
}));
}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ describe('v9 HammerJS removal', () => {
await runMigration();

expect(tree.readContent('/projects/cdk-testing/src/app/app.module.ts')).toContain(dedent`\
import { BrowserModule, HammerModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { BrowserModule, HammerModule } from '@angular/platform-browser';

import { AppComponent } from './app.component';

Expand All @@ -457,7 +457,7 @@ describe('v9 HammerJS removal', () => {
import {NgModule} from '@angular/core';
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
import {GestureConfig} from '@angular/material/core';

@NgModule({
providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
})
Expand Down Expand Up @@ -657,8 +657,8 @@ describe('v9 HammerJS removal', () => {
expect(tree.readContent('/projects/cdk-testing/src/main.ts')).toContain(`import 'hammerjs';`);
expect(tree.exists('/projects/cdk-testing/src/gesture-config.ts')).toBe(true);
expect(tree.readContent('/projects/cdk-testing/src/app/app.module.ts')).toContain(dedent`\
import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';

import { AppComponent } from './app.component';
import { GestureConfig } from "../gesture-config";
Expand Down Expand Up @@ -687,14 +687,14 @@ describe('v9 HammerJS removal', () => {
import 'hammerjs';
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

import { AppModule } from './app/';
import { environment } from './environments/environment';

if (environment.production) {
enableProdMode();
}

platformBrowserDynamic().bootstrapModule(AppModule)
.catch(err => console.error(err));
`);
Expand All @@ -706,8 +706,8 @@ describe('v9 HammerJS removal', () => {
expect(tree.readContent('/projects/cdk-testing/src/main.ts')).toContain(`import 'hammerjs';`);
expect(tree.exists('/projects/cdk-testing/src/gesture-config.ts')).toBe(true);
expect(tree.readContent('/projects/cdk-testing/src/app/app.module.ts')).toContain(dedent`\
import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';

import { AppComponent } from './app.component';
import { GestureConfig } from "../gesture-config";
Expand Down
2 changes: 1 addition & 1 deletion test/browser-providers.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* - `saucelabs`: Launches the browser within Saucelabs
*/
const browserConfig = {
'Edge83': {unitTest: {target: 'browserstack'}},
'Edge87': {unitTest: {target: 'browserstack'}},
'iOS13': {unitTest: {target: 'saucelabs'}},
'Safari13': {unitTest: {target: 'browserstack'}},
};
Expand Down
4 changes: 2 additions & 2 deletions test/karma-browsers.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"platformName": "iOS",
"deviceName": "iPhone XS Simulator"
},
"BROWSERSTACK_EDGE83": {
"BROWSERSTACK_EDGE87": {
"base": "BrowserStack",
"browser": "Edge",
"browser_version": "83.0",
"browser_version": "87.0",
"os": "Windows",
"os_version": "10"
},
Expand Down
2 changes: 1 addition & 1 deletion tools/package-tools/ts-compile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import chalk from 'chalk';
* @returns Promise that resolves/rejects when the child process exits.
*/
export function tsCompile(binary: 'tsc' | 'ngc', flags: string[]) {
return new Promise((resolve, reject) => {
return new Promise<void>((resolve, reject) => {
const binaryPath = resolvePath(`./node_modules/typescript/bin/${binary}`);
const childProcess = spawn(binaryPath, flags, {shell: true});

Expand Down
Loading