Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-18 03:23:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@ngtools/webpack): remove usage of private compiler API

Browse Source
This commit is contained in:
Charles Lyding 2018-10-12 10:37:02 -04:00 committed by Alex Eagle
parent df172bdc8a
commit 3ae3fa3a1d
1 changed files with 32 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
packages/ngtools/webpack/src/angular_compiler_plugin.ts
View File

@ -21,11 +21,11 @@ import {
DEFAULT_ERROR_CODE, DEFAULT_ERROR_CODE,
Diagnostic, Diagnostic,
EmitFlags, EmitFlags,
LazyRoute,
Program, Program,
SOURCE, SOURCE,
UNKNOWN_ERROR_CODE, UNKNOWN_ERROR_CODE,
VERSION, VERSION,
__NGTOOLS_PRIVATE_API_2,
createCompilerHost, createCompilerHost,
createProgram, createProgram,
formatDiagnostics, formatDiagnostics,
@ -162,14 +162,6 @@ export class AngularCompilerPlugin {
// Logging. // Logging.
private _logger: logging.Logger; private _logger: logging.Logger;
private get _ngCompilerSupportsNewApi() {
if (this._JitMode) {
return false;
} else {
return !!(this._program as Program).listLazyRoutes;
}
}
constructor(options: AngularCompilerPluginOptions) { constructor(options: AngularCompilerPluginOptions) {
this._options = Object.assign({}, options); this._options = Object.assign({}, options);
this._setupOptions(this._options); this._setupOptions(this._options);
@ -426,34 +418,6 @@ export class AngularCompilerPlugin {
} }
} }
private _getLazyRoutesFromNgtools() {
try {
time('AngularCompilerPlugin._getLazyRoutesFromNgtools');
const result = __NGTOOLS_PRIVATE_API_2.listLazyRoutes({
program: this._getTsProgram(),
host: this._compilerHost,
angularCompilerOptions: Object.assign({}, this._compilerOptions, {
// genDir seems to still be needed in @angular\compiler-cli\src\compiler_host.js:226.
genDir: '',
}),
// TODO: fix compiler-cli typings; entryModule should not be string, but also optional.
// tslint:disable-next-line:no-non-null-assertion
entryModule: this._entryModule!,
});
timeEnd('AngularCompilerPlugin._getLazyRoutesFromNgtools');
return result;
} catch (err) {
// We silence the error that the @angular/router could not be found. In that case, there is
// basically no route supported by the app itself.
if (err.message.startsWith('Could not resolve module @angular/router')) {
return {};
} else {
throw err;
}
}
}
private _findLazyRoutesInAst(changedFilePaths: string[]): LazyRouteMap { private _findLazyRoutesInAst(changedFilePaths: string[]): LazyRouteMap {
time('AngularCompilerPlugin._findLazyRoutesInAst'); time('AngularCompilerPlugin._findLazyRoutesInAst');
const result: LazyRouteMap = Object.create(null); const result: LazyRouteMap = Object.create(null);
@ -471,12 +435,24 @@ export class AngularCompilerPlugin {
} }
private _listLazyRoutesFromProgram(): LazyRouteMap { private _listLazyRoutesFromProgram(): LazyRouteMap {
const ngProgram = this._program as Program; let lazyRoutes: LazyRoute[];
if (!ngProgram.listLazyRoutes) { if (this._JitMode) {
throw new Error('_listLazyRoutesFromProgram was called with an old program.'); if (!this.entryModule) {
} return {};
}
const lazyRoutes = ngProgram.listLazyRoutes(); const ngProgram = createProgram({
rootNames: this._rootNames,
options: { ...this._compilerOptions, genDir: '', collectAllErrors: true },
host: this._compilerHost,
});
lazyRoutes = ngProgram.listLazyRoutes(
this.entryModule.path + '#' + this.entryModule.className,
);
} else {
lazyRoutes = (this._program as Program).listLazyRoutes();
}
return lazyRoutes.reduce( return lazyRoutes.reduce(
(acc, curr) => { (acc, curr) => {
@ -890,31 +866,27 @@ export class AngularCompilerPlugin {
// If nothing we care about changed and it isn't the first run, don't do anything. // If nothing we care about changed and it isn't the first run, don't do anything.
if (changedFiles.length === 0 && !this._firstRun) { if (changedFiles.length === 0 && !this._firstRun) {
return Promise.resolve(); return;
} }
// Make a new program and load the Angular structure. // Make a new program and load the Angular structure.
await this._createOrUpdateProgram(); await this._createOrUpdateProgram();
if (this.entryModule) { // Try to find lazy routes if we have an entry module.
// Try to find lazy routes if we have an entry module. // We need to run the `listLazyRoutes` the first time because it also navigates libraries
// We need to run the `listLazyRoutes` the first time because it also navigates libraries // and other things that we might miss using the (faster) findLazyRoutesInAst.
// and other things that we might miss using the (faster) findLazyRoutesInAst. // Lazy routes modules will be read with compilerHost and added to the changed files.
// Lazy routes modules will be read with compilerHost and added to the changed files. if (this._firstRun || !this._JitMode) {
if (this._ngCompilerSupportsNewApi) { this._processLazyRoutes(this._listLazyRoutesFromProgram());
this._processLazyRoutes(this._listLazyRoutesFromProgram()); } else {
} else if (this._firstRun) { const changedTsFiles = this._getChangedTsFiles();
this._processLazyRoutes(this._getLazyRoutesFromNgtools()); if (changedTsFiles.length > 0) {
} else { this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
const changedTsFiles = this._getChangedTsFiles();
if (changedTsFiles.length > 0) {
this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
}
}
if (this._options.additionalLazyModules) {
this._processLazyRoutes(this._options.additionalLazyModules);
} }
} }
if (this._options.additionalLazyModules) {
this._processLazyRoutes(this._options.additionalLazyModules);
}
// Emit and report errors. // Emit and report errors.