Skip to content

build: update to 8.2.0 and TypeScript 3.5.3 #16678

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

Merged
merged 1 commit into from
Aug 13, 2019
Merged

build: update to 8.2.0 and TypeScript 3.5.3 #16678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ jobs:
# we use ngcc to apply the ivy switches because ngcc currently does not handle the
# UMD format which is used by Bazel when running tests. UMD processing is in
# progress and tracked with FW-85.
- run: node ./scripts/circleci/setup-angular-snapshots.js --tag 8.2.0-next.0-ivy-aot+c69e552a8
- run: node ./scripts/circleci/setup-angular-snapshots.js --tag 9.0.0-next.0-ivy-aot+3122f3415
# Disable type checking when building with Ivy. This is necessary because
# type checking is not complete yet and can incorrectly break compilation.
# Issue is tracked with FW-1004.
Expand Down
42 changes: 21 additions & 21 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
"requiredAngularVersion": "^8.0.0 || ^9.0.0-0",
"requiredMDCVersion": "^4.0.0-alpha.0",
"dependencies": {
"@angular/animations": "^8.1.0",
"@angular/common": "^8.1.0",
"@angular/compiler": "^8.1.0",
"@angular/core": "^8.1.0",
"@angular/elements": "^8.1.0",
"@angular/forms": "^8.1.0",
"@angular/platform-browser": "^8.1.0",
"@angular/animations": "^8.2.0",
"@angular/common": "^8.2.0",
"@angular/compiler": "^8.2.0",
"@angular/core": "^8.2.0",
"@angular/elements": "^8.2.0",
"@angular/forms": "^8.2.0",
"@angular/platform-browser": "^8.2.0",
"@types/googlemaps": "^3.37.0",
"@types/youtube": "^0.0.38",
"@webcomponents/custom-elements": "^1.1.0",
Expand All @@ -58,24 +58,24 @@
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/core": "^8.0.3",
"@angular-devkit/schematics": "^8.0.3",
"@angular-devkit/core": "^8.2.0",
"@angular-devkit/schematics": "^8.2.0",
"@angular/bazel": "^8.1.0",
Copy link
Member Author

@crisbeto crisbeto Aug 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I wanted to bump the Bazel dependencies as well, but updating @angular/bazel causes only the CI to throw an error along the lines of Cannot find command bazel. It only happens on the CI and the error wasn't super helpful so I wasn't able to track it down. My best guess is that it might be something with the setup_bazel_binary.sh.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The @angular/bazel package should not be related to the bazel binary at all. Should we just get this PR through and I'll have a look at the Bazel related thing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

"@angular/compiler-cli": "^8.1.0",
"@angular/platform-browser-dynamic": "^8.1.0",
"@angular/platform-server": "^8.1.0",
"@angular/router": "^8.1.0",
"@angular/upgrade": "^8.1.0",
"@angular/compiler-cli": "^8.2.0",
"@angular/platform-browser-dynamic": "^8.2.0",
"@angular/platform-server": "^8.2.0",
"@angular/router": "^8.2.0",
"@angular/upgrade": "^8.2.0",
"@bazel/bazel": "^0.27.0",
"@bazel/buildifier": "^0.25.1",
"@bazel/hide-bazel-files": "0.32.2",
"@bazel/hide-bazel-files": "0.34.0",
"@bazel/ibazel": "^0.10.3",
"@bazel/jasmine": "0.32.2",
"@bazel/karma": "0.32.2",
"@bazel/typescript": "0.32.2",
"@bazel/jasmine": "0.34.0",
"@bazel/karma": "0.34.0",
"@bazel/typescript": "0.34.0",
"@firebase/app-types": "^0.3.2",
"@octokit/rest": "^16.28.7",
"@schematics/angular": "^8.0.3",
"@schematics/angular": "^8.2.0",
"@types/browser-sync": "^0.0.42",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^4.0.3",
Expand Down Expand Up @@ -152,10 +152,10 @@
"tsconfig-paths": "^2.3.0",
"tslint": "^5.18.0",
"tsutils": "^3.0.0",
"typescript": "~3.4",
"typescript": "3.5.3",
"uglify-js": "^2.8.14"
},
"resolutions": {
"dgeni-packages/typescript": "~3.4"
"dgeni-packages/typescript": "3.5.3"
}
}
4 changes: 3 additions & 1 deletion src/cdk/schematics/ng-update/upgrade-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,7 @@ export interface RuleUpgradeData {
export function
getVersionUpgradeData<T extends keyof RuleUpgradeData, U = ValueOfChanges<RuleUpgradeData[T]>>(
r: MigrationRule<RuleUpgradeData>, dataName: T): U[] {
return getChangesForTarget<U>(r.targetVersion, r.upgradeData[dataName] as VersionChanges<U>);
// Note that below we need to cast to `unknown` first TS doesn't infer the type of T correctly.
return getChangesForTarget<U>(r.targetVersion,
r.upgradeData[dataName] as unknown as VersionChanges<U>);
}
4 changes: 1 addition & 3 deletions src/cdk/schematics/utils/ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ export function addModuleImportToModule(host: Tree, modulePath: string, moduleNa
throw new SchematicsException(`Module not found: ${modulePath}`);
}

// TODO: TypeScript version mismatch due to @schematics/angular using a different version
// than Material. Cast to any to avoid the type assignment failure.
const changes = addImportToModule(moduleSource as any, modulePath, moduleName, src);
const changes = addImportToModule(moduleSource, modulePath, moduleName, src);
const recorder = host.beginUpdate(modulePath);

changes.forEach((change) => {
Expand Down
12 changes: 3 additions & 9 deletions src/cdk/schematics/utils/build-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {
const classifiedName = strings.classify(`${options.name}Component`);

const declarationChanges = addDeclarationToModule(
// TODO: TypeScript version mismatch due to @schematics/angular using a different version
// than Material. Cast to any to avoid the type assignment failure.
source as any,
source,
modulePath,
classifiedName,
relativePath);
Expand All @@ -93,9 +91,7 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {

const exportRecorder = host.beginUpdate(modulePath);
const exportChanges = addExportToModule(
// TODO: TypeScript version mismatch due to @schematics/angular using a different version
// than Material. Cast to any to avoid the type assignment failure.
source as any,
source,
modulePath,
strings.classify(`${options.name}Component`),
relativePath);
Expand All @@ -114,9 +110,7 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {

const entryComponentRecorder = host.beginUpdate(modulePath);
const entryComponentChanges = addEntryComponentToModule(
// TODO: TypeScript version mismatch due to @schematics/angular using a different version
// than Material. Cast to any to avoid the type assignment failure.
source as any,
source,
modulePath,
strings.classify(`${options.name}Component`),
relativePath);
Expand Down
2 changes: 1 addition & 1 deletion src/material/sidenav/drawer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export class MatDrawer implements AfterContentInit, AfterContentChecked, OnDestr
* An observable that emits when the drawer mode changes. This is used by the drawer container to
* to know when to when the mode changes so it can adapt the margins on the content.
*/
readonly _modeChanged = new Subject();
readonly _modeChanged = new Subject<void>();

get _isFocusTrapEnabled(): boolean {
// The focus trap is only enabled when the drawer is open in any mode other than side.
Expand Down
2 changes: 1 addition & 1 deletion src/material/tabs/tab-group.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export interface MatTabsConfig {
}

/** Injection token that can be used to provide the default options the tabs module. */
export const MAT_TABS_CONFIG = new InjectionToken('MAT_TABS_CONFIG');
export const MAT_TABS_CONFIG = new InjectionToken<MatTabsConfig>('MAT_TABS_CONFIG');

// Boilerplate for applying mixins to MatTabGroup.
/** @docs-private */
Expand Down
2 changes: 1 addition & 1 deletion tools/public_api_guard/material/sidenav.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export declare class MatDrawer implements AfterContentInit, AfterContentChecked,
_animationState: 'open-instant' | 'open' | 'void';
readonly _closedStream: Observable<void>;
readonly _isFocusTrapEnabled: boolean;
readonly _modeChanged: Subject<{}>;
readonly _modeChanged: Subject<void>;
readonly _openedStream: Observable<void>;
readonly _width: number;
autoFocus: boolean;
Expand Down
2 changes: 1 addition & 1 deletion tools/public_api_guard/material/tabs.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface _MatInkBarPositioner {
};
}

export declare const MAT_TABS_CONFIG: InjectionToken<{}>;
export declare const MAT_TABS_CONFIG: InjectionToken<MatTabsConfig>;

export declare class MatInkBar {
_animationMode?: string | undefined;
Expand Down
Loading