Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-22 15:02:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(@ngtools/webpack): support webpack 4 resolveDependencies call

Browse Source
This commit is contained in:
Charles Lyding 2018-01-30 10:56:29 -05:00 committed by Filipe Silva
parent 935389997e
commit 23abd0d46b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/@ngtools/webpack/src/angular_compiler_plugin.ts
View File

@ -582,7 +582,7 @@ export class AngularCompilerPlugin implements Tapable {
// TODO: check if we can't just leave it as is (angularCoreModuleDir). // TODO: check if we can't just leave it as is (angularCoreModuleDir).
result.resource = path.join(this._basePath, '$$_lazy_route_resource'); result.resource = path.join(this._basePath, '$$_lazy_route_resource');
result.dependencies.forEach((d: any) => d.critical = false); result.dependencies.forEach((d: any) => d.critical = false);
result.resolveDependencies = (_fs: any, _resource: any, _recursive: any, result.resolveDependencies = (_fs: any, _resourceOrOptions: any, recursiveOrCallback: any,
_regExp: RegExp, cb: any) => { _regExp: RegExp, cb: any) => {
const dependencies = Object.keys(this._lazyRoutes) const dependencies = Object.keys(this._lazyRoutes)
.map((key) => { .map((key) => {
@ -595,6 +595,10 @@ export class AngularCompilerPlugin implements Tapable {
} }
}) })
.filter(x => !!x); .filter(x => !!x);
if (typeof cb !== 'function' && typeof recursiveOrCallback === 'function') {
// Webpack 4 only has 3 parameters
cb = recursiveOrCallback;
}
cb(null, dependencies); cb(null, dependencies);
}; };
return callback(null, result); return callback(null, result);