Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-19 20:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(@ngtools/webpack): allow custom lazy module resource (#12593)

Browse Source
This commit is contained in:
Filipe Silva 2018-11-08 18:32:28 +00:00 committed by vikerman
parent 96606b3d1e
commit 5150f82762
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,7 @@ export interface AngularCompilerPluginOptions {
// added to the list of lazy routes // added to the list of lazy routes
additionalLazyModules?: { [module: string]: string }; additionalLazyModules?: { [module: string]: string };
additionalLazyModuleResources?: string[];
// The ContextElementDependency of correct Webpack compilation. // The ContextElementDependency of correct Webpack compilation.
// This is needed when there are multiple Webpack installs. // This is needed when there are multiple Webpack installs.
@ -663,15 +664,19 @@ export class AngularCompilerPlugin {
// APFv6 does not have single FESM anymore. Instead of verifying if we're pointing to // APFv6 does not have single FESM anymore. Instead of verifying if we're pointing to
// FESMs, we resolve the `@angular/core` path and verify that the path for the // FESMs, we resolve the `@angular/core` path and verify that the path for the
// module starts with it. // module starts with it.
// This may be slower but it will be compatible with both APF5, 6 and potential future // This may be slower but it will be compatible with both APF5, 6 and potential future
// versions (until the dynamic import appears outside of core I suppose). // versions (until the dynamic import appears outside of core I suppose).
// We resolve any symbolic links in order to get the real path that would be used in webpack. // We resolve any symbolic links in order to get the real path that would be used in webpack.
const angularCoreDirname = fs.realpathSync(path.dirname(angularCorePackagePath)); const angularCoreResourceRoot = fs.realpathSync(path.dirname(angularCorePackagePath));
cmf.hooks.afterResolve.tapPromise('angular-compiler', async result => { cmf.hooks.afterResolve.tapPromise('angular-compiler', async result => {
// Alter only request from Angular. // Alter only existing request from Angular or one of the additional lazy module resources.
if (!result || !this.done || !result.resource.startsWith(angularCoreDirname)) { const isLazyModuleResource = (resource: string) =>
resource.startsWith(angularCoreResourceRoot) ||
( this.options.additionalLazyModuleResources &&
this.options.additionalLazyModuleResources.includes(resource));
if (!result || !this.done || !isLazyModuleResource(result.resource)) {
return result; return result;
} }