Skip to content

fix(@ngtools/webpack): fix lazy loading new Error emit after webpack … #6804

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

Closed
rayros wants to merge 1 commit into from
Closed

fix(@ngtools/webpack): fix lazy loading new Error emit after webpack … #6804

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
16 changes: 10 additions & 6 deletions packages/@ngtools/webpack/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export class AotPlugin implements Tapable {
private _compilerHost: WebpackCompilerHost;
private _resourceLoader: WebpackResourceLoader;
private _lazyRoutes: LazyRouteMap = Object.create(null);
private _discoveredLazyRoutes: LazyRouteMap;
private _tsConfigPath: string;
private _entryModule: string;

Expand Down Expand Up @@ -485,25 +486,28 @@ export class AotPlugin implements Tapable {
}
})
.then(() => {
if (!this.firstRun) {
this._discoveredLazyRoutes = this._findLazyRoutesInAst();
}
// Populate the file system cache with the virtual module.
this._compilerHost.populateWebpackResolver(this._compiler.resolvers.normal);
})
.then(() => {
// We need to run the `listLazyRoutes` the first time because it also navigates libraries
// and other things that we might miss using the findLazyRoutesInAst.
let discoveredLazyRoutes: LazyRouteMap = this.firstRun ?
__NGTOOLS_PRIVATE_API_2.listLazyRoutes({
if (this.firstRun) {
this._discoveredLazyRoutes = __NGTOOLS_PRIVATE_API_2.listLazyRoutes({
program: this._program,
host: this._compilerHost,
angularCompilerOptions: this._angularCompilerOptions,
entryModule: this._entryModule
})
: this._findLazyRoutesInAst();
});
}

// Process the lazy routes discovered.
Object.keys(discoveredLazyRoutes)
Object.keys(this._discoveredLazyRoutes)
.forEach(k => {
const lazyRoute = discoveredLazyRoutes[k];
const lazyRoute = this._discoveredLazyRoutes[k];
k = k.split('#')[0];
if (lazyRoute === null) {
return;
Expand Down