Skip to content
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.

Sign up for GitHub

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

Jump to bottom

refactor: add support for TypeScript 4.0 #20368

Merged
merged 3 commits into from
Aug 26, 2020
Merged

refactor: add support for TypeScript 4.0 #20368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e476d65
refactor: changes to support TS 4.0 compilation
alan-agius4 Aug 20, 2020
63b4dbe
build: update typescript to 4.0, tslint to 6.1.3 and angular packages…
alan-agius4 Aug 25, 2020
9f68ff2
test: add ts-compat integration test for TypeScript 3.9
alan-agius4 Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions integration/ts-compat/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ write_file(
# List of TypeScript packages that we want to run the compatibility test against.
# The list contains NPM module names that resolve to the desired TypeScript version.
typescript_version_packages = [
"typescript-3.9",
"typescript",
]

Expand Down
31 changes: 16 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
},
"version": "10.2.0-next.0",
"dependencies": {
"@angular/animations": "^10.0.8",
"@angular/common": "^10.0.8",
"@angular/compiler": "^10.0.8",
"@angular/core": "^10.0.8",
"@angular/elements": "^10.0.8",
"@angular/forms": "^10.0.8",
"@angular/platform-browser": "^10.0.8",
"@angular/animations": "^10.1.0-next.8",
"@angular/common": "^10.1.0-next.8",
"@angular/compiler": "^10.1.0-next.8",
"@angular/core": "^10.1.0-next.8",
"@angular/elements": "^10.1.0-next.8",
"@angular/forms": "^10.1.0-next.8",
"@angular/platform-browser": "^10.1.0-next.8",
"@types/googlemaps": "^3.39.3",
"@types/youtube": "^0.0.38",
"@webcomponents/custom-elements": "^1.1.0",
Expand All @@ -71,13 +71,13 @@
"@angular-devkit/build-optimizer": "^0.1000.5",
"@angular-devkit/core": "^10.0.5",
"@angular-devkit/schematics": "^10.0.5",
"@angular/bazel": "^10.0.8",
"@angular/bazel": "^10.1.0-next.8",
"@angular/benchpress": "^0.2.1",
"@angular/compiler-cli": "^10.0.8",
"@angular/compiler-cli": "^10.1.0-next.8",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#d0855af987db4e426477da1780bcd02941c31271",
"@angular/platform-browser-dynamic": "^10.0.8",
"@angular/platform-server": "^10.0.8",
"@angular/router": "^10.0.8",
"@angular/platform-browser-dynamic": "^10.1.0-next.8",
"@angular/platform-server": "^10.1.0-next.8",
"@angular/router": "^10.1.0-next.8",
"@bazel/bazelisk": "^1.4.0",
"@bazel/buildifier": "^2.2.1",
"@bazel/ibazel": "^0.13.0",
Expand Down Expand Up @@ -165,14 +165,15 @@
"ts-api-guardian": "^0.5.0",
"ts-node": "^8.10.1",
"tsickle": "0.38.1",
"tslint": "^6.1.0",
"tslint": "^6.1.3",
"tsutils": "^3.17.1",
"typescript": "3.9.7",
"typescript": "4.0.2",
"typescript-3.9": "npm:typescript@~3.9.7",
"vrsource-tslint-rules": "5.1.1",
"yaml": "^1.10.0"
},
"resolutions": {
"dgeni-packages/typescript": "3.9.7",
"dgeni-packages/typescript": "4.0.2",
"**/graceful-fs": "4.2.2"
}
}
2 changes: 1 addition & 1 deletion src/cdk-experimental/selection/row-selection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class CdkRowSelection<T> {
@Input('cdkRowSelectionIndex')
get index(): number|undefined { return this._index; }
set index(index: number|undefined) { this._index = coerceNumberProperty(index); }
private _index?: number;
protected _index?: number;
alan-agius4 marked this conversation as resolved.
Show resolved Hide resolved

constructor(readonly _selection: CdkSelection<T>) {}

Expand Down
2 changes: 1 addition & 1 deletion src/cdk-experimental/selection/selection-toggle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class CdkSelectionToggle<T> implements OnDestroy, OnInit {
@Input('cdkSelectionToggleIndex')
get index(): number|undefined { return this._index; }
set index(index: number|undefined) { this._index = coerceNumberProperty(index); }
private _index?: number;
protected _index?: number;

/** The checked state of the selection toggle */
readonly checked: Observable<boolean> = this._selection.change.pipe(
Expand Down
2 changes: 1 addition & 1 deletion src/cdk-experimental/selection/selection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export class CdkSelection<T> implements OnInit, AfterContentChecked, CollectionV
set multiple(multiple: boolean) {
this._multiple = coerceBooleanProperty(multiple);
}
private _multiple: boolean;
protected _multiple: boolean;

/** Emits when selection changes. */
@Output('cdkSelectionChange') change = new EventEmitter<SelectionChange<T>>();
Expand Down