Skip to content

Commit 4bcd76c

Browse files
authored
build: bump a few Angular and external dependencies (#22507)
* Bumps all of the Angular dependencies to 12.0.0-next.9. * Removes the logic related to `entryComponents` from the schematics code, because the CLI is in the process of removing ViewEngine and some of the options aren't there anymore. * Updates the versions of `ts-node` and `kagekiri` since we were a few minor versions behind.
1 parent 52ac1e4 commit 4bcd76c

File tree

34 files changed

+212
-284
lines changed

34 files changed

+212
-284
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ jobs:
418418
name: Prepare CDK artifacts for publish.
419419
command: |
420420
mkdir -p /tmp/cdk-umd-minified-bundles
421-
cp dist/releases/cdk/bundles/*.umd.min.js /tmp/cdk-umd-minified-bundles
421+
cp dist/releases/cdk/bundles/*.umd.js /tmp/cdk-umd-minified-bundles
422422
# Publish bundle artifacts which will be used to calculate the size change.
423423
# Note: Make sure that the size plugin from the Angular robot fetches the artifacts
424424
# from this CircleCI job (see .github/angular-robot.yml). Additionally any artifacts need to
@@ -427,8 +427,8 @@ jobs:
427427
# artifacts from CircleCI. See:
428428
# https://github.com/angular/github-robot/blob/master/functions/src/plugins/size.ts#L392-L394
429429
- store_artifacts:
430-
path: dist/releases/material/bundles/material.umd.min.js
431-
destination: /angular_material/material_release_output/material.umd.min.js
430+
path: dist/releases/material/bundles/material.umd.js
431+
destination: /angular_material/material_release_output/material.umd.js
432432
- store_artifacts:
433433
path: /tmp/cdk-umd-minified-bundles
434434
destination: /angular_material/cdk_release_output/

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252
},
5353
"version": "12.1.0-next.0",
5454
"dependencies": {
55-
"@angular/animations": "^12.0.0-next.7",
56-
"@angular/common": "^12.0.0-next.7",
57-
"@angular/compiler": "^12.0.0-next.7",
58-
"@angular/core": "^12.0.0-next.7",
59-
"@angular/elements": "^12.0.0-next.7",
60-
"@angular/forms": "^12.0.0-next.7",
61-
"@angular/platform-browser": "^12.0.0-next.7",
55+
"@angular/animations": "^12.0.0-next.9",
56+
"@angular/common": "^12.0.0-next.9",
57+
"@angular/compiler": "^12.0.0-next.9",
58+
"@angular/core": "^12.0.0-next.9",
59+
"@angular/elements": "^12.0.0-next.9",
60+
"@angular/forms": "^12.0.0-next.9",
61+
"@angular/platform-browser": "^12.0.0-next.9",
6262
"@types/googlemaps": "^3.43.1",
6363
"@types/youtube": "^0.0.42",
6464
"@webcomponents/custom-elements": "^1.1.0",
@@ -71,15 +71,15 @@
7171
"zone.js": "~0.11.3"
7272
},
7373
"devDependencies": {
74-
"@angular-devkit/build-optimizer": "^0.1200.0-next.6",
75-
"@angular-devkit/core": "^12.0.0-next.6",
76-
"@angular-devkit/schematics": "^12.0.0-next.6",
77-
"@angular/bazel": "^12.0.0-next.7",
78-
"@angular/compiler-cli": "^12.0.0-next.7",
74+
"@angular-devkit/build-optimizer": "^0.1200.0-next.9",
75+
"@angular-devkit/core": "^12.0.0-next.9",
76+
"@angular-devkit/schematics": "^12.0.0-next.9",
77+
"@angular/bazel": "^12.0.0-next.9",
78+
"@angular/compiler-cli": "^12.0.0-next.9",
7979
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#3953ba9eea35a2660b6068523bafb92634042be9",
80-
"@angular/platform-browser-dynamic": "^12.0.0-next.7",
81-
"@angular/platform-server": "^12.0.0-next.7",
82-
"@angular/router": "^12.0.0-next.7",
80+
"@angular/platform-browser-dynamic": "^12.0.0-next.9",
81+
"@angular/platform-server": "^12.0.0-next.9",
82+
"@angular/router": "^12.0.0-next.9",
8383
"@axe-core/webdriverjs": "^4.1.0",
8484
"@bazel/bazelisk": "1.7.5",
8585
"@bazel/buildifier": "4.0.1",
@@ -140,7 +140,7 @@
140140
"@material/touch-target": "12.0.0-canary.b52196498.0",
141141
"@material/typography": "12.0.0-canary.b52196498.0",
142142
"@octokit/rest": "18.3.5",
143-
"@schematics/angular": "^12.0.0-next.6",
143+
"@schematics/angular": "^12.0.0-next.9",
144144
"@types/autoprefixer": "^9.7.2",
145145
"@types/browser-sync": "^2.26.1",
146146
"@types/fs-extra": "^9.0.5",
@@ -179,7 +179,7 @@
179179
"inquirer": "^8.0.0",
180180
"jasmine": "^3.6.0",
181181
"jasmine-core": "^3.6.0",
182-
"kagekiri": "^1.0.18",
182+
"kagekiri": "^1.4.1",
183183
"karma": "^4.4.1",
184184
"karma-browserstack-launcher": "^1.6.0",
185185
"karma-chrome-launcher": "^3.1.0",
@@ -214,7 +214,7 @@
214214
"stylelint": "^13.8.0",
215215
"terser": "^4.8.0",
216216
"ts-api-guardian": "^0.6.0",
217-
"ts-node": "^9.0.0",
217+
"ts-node": "^9.1.1",
218218
"tsickle": "0.39.1",
219219
"tslint": "^6.1.3",
220220
"tsutils": "^3.17.1",

src/cdk/schematics/ng-generate/drag-drop/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@
8787
"type": "boolean",
8888
"default": false,
8989
"description": "Specifies if declaring module exports the component."
90-
},
91-
"entryComponent": {
92-
"type": "boolean",
93-
"default": false,
94-
"description": "Specifies if the component is an entry component of declaring module."
9590
}
9691
},
9792
"required": ["name"]

src/cdk/schematics/utils/build-component.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import {dirname, join, resolve} from 'path';
3434
import * as ts from 'typescript';
3535
import {
3636
addDeclarationToModule,
37-
addEntryComponentToModule,
3837
addExportToModule,
3938
} from '../utils/vendored-ast-utils';
4039
import {getProjectFromWorkspace} from './get-project';
@@ -119,26 +118,6 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {
119118
host.commitUpdate(exportRecorder);
120119
}
121120

122-
if (options.entryComponent) {
123-
// Need to refresh the AST because we overwrote the file in the host.
124-
source = readIntoSourceFile(host, modulePath);
125-
126-
const entryComponentRecorder = host.beginUpdate(modulePath);
127-
const entryComponentChanges = addEntryComponentToModule(
128-
source,
129-
modulePath,
130-
strings.classify(`${options.name}Component`),
131-
relativePath);
132-
133-
for (const change of entryComponentChanges) {
134-
if (change instanceof InsertChange) {
135-
entryComponentRecorder.insertLeft(change.pos, change.toAdd);
136-
}
137-
}
138-
host.commitUpdate(entryComponentRecorder);
139-
}
140-
141-
142121
return host;
143122
};
144123
}

src/cdk/schematics/utils/vendored-ast-utils/index.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -489,19 +489,6 @@ export function addExportToModule(source: ts.SourceFile,
489489
return addSymbolToNgModuleMetadata(source, modulePath, 'exports', classifiedName, importPath);
490490
}
491491

492-
/**
493-
* Custom function to insert an entryComponent into NgModule. It also imports it.
494-
* @deprecated - Since version 9.0.0 with Ivy, entryComponents is no longer necessary.
495-
*/
496-
export function addEntryComponentToModule(source: ts.SourceFile,
497-
modulePath: string, classifiedName: string,
498-
importPath: string): Change[] {
499-
return addSymbolToNgModuleMetadata(
500-
source, modulePath,
501-
'entryComponents', classifiedName, importPath,
502-
);
503-
}
504-
505492
export function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallExpression | null {
506493
const mainBuffer = host.read(mainPath);
507494
if (!mainBuffer) {

src/material/schematics/ng-generate/address-form/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@
8787
"type": "boolean",
8888
"default": false,
8989
"description": "Specifies if declaring module exports the component."
90-
},
91-
"entryComponent": {
92-
"type": "boolean",
93-
"default": false,
94-
"description": "Specifies if the component is an entry component of declaring module."
9590
}
9691
},
9792
"required": ["name"]

src/material/schematics/ng-generate/dashboard/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@
8787
"type": "boolean",
8888
"default": false,
8989
"description": "Specifies if declaring module exports the component."
90-
},
91-
"entryComponent": {
92-
"type": "boolean",
93-
"default": false,
94-
"description": "Specifies if the component is an entry component of declaring module."
9590
}
9691
},
9792
"required": ["name"]

src/material/schematics/ng-generate/navigation/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,6 @@
8888
"default": false,
8989
"description": "Specifies if declaring module exports the component."
9090
},
91-
"entryComponent": {
92-
"type": "boolean",
93-
"default": false,
94-
"description": "Specifies if the component is an entry component of declaring module."
95-
},
9691
"routing": {
9792
"type": "boolean",
9893
"default": false,

src/material/schematics/ng-generate/table/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@
8787
"type": "boolean",
8888
"default": false,
8989
"description": "Specifies if declaring module exports the component."
90-
},
91-
"entryComponent": {
92-
"type": "boolean",
93-
"default": false,
94-
"description": "Specifies if the component is an entry component of declaring module."
9590
}
9691
},
9792
"required": ["name"]

src/material/schematics/ng-generate/tree/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@
8787
"type": "boolean",
8888
"default": false,
8989
"description": "Specifies if declaring module exports the component."
90-
},
91-
"entryComponent": {
92-
"type": "boolean",
93-
"default": false,
94-
"description": "Specifies if the component is an entry component of declaring module."
9590
}
9691
},
9792
"required": ["name"]

tools/public_api_guard/cdk/a11y.d.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export declare class AriaDescriber implements OnDestroy {
1818
removeDescription(hostElement: Element, message: string, role?: string): void;
1919
removeDescription(hostElement: Element, message: HTMLElement): void;
2020
static ɵfac: i0.ɵɵFactoryDeclaration<AriaDescriber, never>;
21-
static ɵprov: i0.ɵɵInjectableDef<AriaDescriber>;
21+
static ɵprov: i0.ɵɵInjectableDeclaration<AriaDescriber>;
2222
}
2323

2424
export declare type AriaLivePoliteness = 'off' | 'polite' | 'assertive';
@@ -80,7 +80,7 @@ export declare class ConfigurableFocusTrapFactory {
8080
create(element: HTMLElement, config?: ConfigurableFocusTrapConfig): ConfigurableFocusTrap;
8181
create(element: HTMLElement, deferCaptureElements: boolean): ConfigurableFocusTrap;
8282
static ɵfac: i0.ɵɵFactoryDeclaration<ConfigurableFocusTrapFactory, [null, null, null, null, { optional: true; }]>;
83-
static ɵprov: i0.ɵɵInjectableDef<ConfigurableFocusTrapFactory>;
83+
static ɵprov: i0.ɵɵInjectableDeclaration<ConfigurableFocusTrapFactory>;
8484
}
8585

8686
export declare class EventListenerFocusTrapInertStrategy implements FocusTrapInertStrategy {
@@ -115,7 +115,7 @@ export declare class FocusMonitor implements OnDestroy {
115115
stopMonitoring(element: HTMLElement): void;
116116
stopMonitoring(element: ElementRef<HTMLElement>): void;
117117
static ɵfac: i0.ɵɵFactoryDeclaration<FocusMonitor, [null, null, { optional: true; }, { optional: true; }]>;
118-
static ɵprov: i0.ɵɵInjectableDef<FocusMonitor>;
118+
static ɵprov: i0.ɵɵInjectableDeclaration<FocusMonitor>;
119119
}
120120

121121
export declare const enum FocusMonitorDetectionMode {
@@ -159,7 +159,7 @@ export declare class FocusTrapFactory {
159159
constructor(_checker: InteractivityChecker, _ngZone: NgZone, _document: any);
160160
create(element: HTMLElement, deferCaptureElements?: boolean): FocusTrap;
161161
static ɵfac: i0.ɵɵFactoryDeclaration<FocusTrapFactory, never>;
162-
static ɵprov: i0.ɵɵInjectableDef<FocusTrapFactory>;
162+
static ɵprov: i0.ɵɵInjectableDeclaration<FocusTrapFactory>;
163163
}
164164

165165
export interface FocusTrapInertStrategy {
@@ -178,7 +178,7 @@ export declare class HighContrastModeDetector {
178178
_applyBodyHighContrastModeCssClasses(): void;
179179
getHighContrastMode(): HighContrastMode;
180180
static ɵfac: i0.ɵɵFactoryDeclaration<HighContrastModeDetector, never>;
181-
static ɵprov: i0.ɵɵInjectableDef<HighContrastModeDetector>;
181+
static ɵprov: i0.ɵɵInjectableDeclaration<HighContrastModeDetector>;
182182
}
183183

184184
export interface Highlightable extends ListKeyManagerOption {
@@ -193,7 +193,7 @@ export declare class InteractivityChecker {
193193
isTabbable(element: HTMLElement): boolean;
194194
isVisible(element: HTMLElement): boolean;
195195
static ɵfac: i0.ɵɵFactoryDeclaration<InteractivityChecker, never>;
196-
static ɵprov: i0.ɵɵInjectableDef<InteractivityChecker>;
196+
static ɵprov: i0.ɵɵInjectableDeclaration<InteractivityChecker>;
197197
}
198198

199199
export declare function isFakeMousedownFromScreenReader(event: MouseEvent): boolean;
@@ -251,7 +251,7 @@ export declare class LiveAnnouncer implements OnDestroy {
251251
clear(): void;
252252
ngOnDestroy(): void;
253253
static ɵfac: i0.ɵɵFactoryDeclaration<LiveAnnouncer, [{ optional: true; }, null, null, { optional: true; }]>;
254-
static ɵprov: i0.ɵɵInjectableDef<LiveAnnouncer>;
254+
static ɵprov: i0.ɵɵInjectableDeclaration<LiveAnnouncer>;
255255
}
256256

257257
export interface LiveAnnouncerDefaultOptions {

tools/public_api_guard/cdk/bidi.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ export declare class Directionality implements OnDestroy {
2626
constructor(_document?: any);
2727
ngOnDestroy(): void;
2828
static ɵfac: i0.ɵɵFactoryDeclaration<Directionality, [{ optional: true; }]>;
29-
static ɵprov: i0.ɵɵInjectableDef<Directionality>;
29+
static ɵprov: i0.ɵɵInjectableDeclaration<Directionality>;
3030
}

tools/public_api_guard/cdk/clipboard.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export declare class Clipboard {
2222
beginCopy(text: string): PendingCopy;
2323
copy(text: string): boolean;
2424
static ɵfac: i0.ɵɵFactoryDeclaration<Clipboard, never>;
25-
static ɵprov: i0.ɵɵInjectableDef<Clipboard>;
25+
static ɵprov: i0.ɵɵInjectableDeclaration<Clipboard>;
2626
}
2727

2828
export declare class ClipboardModule {

tools/public_api_guard/cdk/collections.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export declare class UniqueSelectionDispatcher implements OnDestroy {
101101
ngOnDestroy(): void;
102102
notify(id: string, name: string): void;
103103
static ɵfac: i0.ɵɵFactoryDeclaration<UniqueSelectionDispatcher, never>;
104-
static ɵprov: i0.ɵɵInjectableDef<UniqueSelectionDispatcher>;
104+
static ɵprov: i0.ɵɵInjectableDeclaration<UniqueSelectionDispatcher>;
105105
}
106106

107107
export declare type UniqueSelectionDispatcherListener = (id: string, name: string) => void;

tools/public_api_guard/cdk/drag-drop.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export declare class DragDrop {
217217
createDrag<T = any>(element: ElementRef<HTMLElement> | HTMLElement, config?: DragRefConfig): DragRef<T>;
218218
createDropList<T = any>(element: ElementRef<HTMLElement> | HTMLElement): DropListRef<T>;
219219
static ɵfac: i0.ɵɵFactoryDeclaration<DragDrop, never>;
220-
static ɵprov: i0.ɵɵInjectableDef<DragDrop>;
220+
static ɵprov: i0.ɵɵInjectableDeclaration<DragDrop>;
221221
}
222222

223223
export interface DragDropConfig extends Partial<DragRefConfig> {
@@ -257,7 +257,7 @@ export declare class DragDropRegistry<I extends {
257257
startDragging(drag: I, event: TouchEvent | MouseEvent): void;
258258
stopDragging(drag: I): void;
259259
static ɵfac: i0.ɵɵFactoryDeclaration<DragDropRegistry<any, any>, never>;
260-
static ɵprov: i0.ɵɵInjectableDef<DragDropRegistry<any, any>>;
260+
static ɵprov: i0.ɵɵInjectableDeclaration<DragDropRegistry<any, any>>;
261261
}
262262

263263
export declare class DragRef<T = any> {

tools/public_api_guard/cdk/layout.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export declare class BreakpointObserver implements OnDestroy {
44
ngOnDestroy(): void;
55
observe(value: string | readonly string[]): Observable<BreakpointState>;
66
static ɵfac: i0.ɵɵFactoryDeclaration<BreakpointObserver, never>;
7-
static ɵprov: i0.ɵɵInjectableDef<BreakpointObserver>;
7+
static ɵprov: i0.ɵɵInjectableDeclaration<BreakpointObserver>;
88
}
99

1010
export declare const Breakpoints: {
@@ -41,5 +41,5 @@ export declare class MediaMatcher {
4141
constructor(_platform: Platform);
4242
matchMedia(query: string): MediaQueryList;
4343
static ɵfac: i0.ɵɵFactoryDeclaration<MediaMatcher, never>;
44-
static ɵprov: i0.ɵɵInjectableDef<MediaMatcher>;
44+
static ɵprov: i0.ɵɵInjectableDeclaration<MediaMatcher>;
4545
}

tools/public_api_guard/cdk/observers.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ export declare class ContentObserver implements OnDestroy {
1919
observe(element: Element): Observable<MutationRecord[]>;
2020
observe(element: ElementRef<Element>): Observable<MutationRecord[]>;
2121
static ɵfac: i0.ɵɵFactoryDeclaration<ContentObserver, never>;
22-
static ɵprov: i0.ɵɵInjectableDef<ContentObserver>;
22+
static ɵprov: i0.ɵɵInjectableDeclaration<ContentObserver>;
2323
}
2424

2525
export declare class MutationObserverFactory {
2626
create(callback: MutationCallback): MutationObserver | null;
2727
static ɵfac: i0.ɵɵFactoryDeclaration<MutationObserverFactory, never>;
28-
static ɵprov: i0.ɵɵInjectableDef<MutationObserverFactory>;
28+
static ɵprov: i0.ɵɵInjectableDeclaration<MutationObserverFactory>;
2929
}
3030

3131
export declare class ObserversModule {

0 commit comments

Comments
 (0)