Skip to content

Commit f7f3f5f

Browse files
committed
build: bump a few Angular and external dependencies
* 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 119684e commit f7f3f5f

File tree

10 files changed

+163
-235
lines changed

10 files changed

+163
-235
lines changed

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": "11.0.0-canary.15604bd0d.0",
141141
"@material/typography": "11.0.0-canary.15604bd0d.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"]

0 commit comments

Comments
 (0)