fix(@ngtools/webpack): normalize lazy route names and paths

d2clouds · Apr 23, 2018 · c32c7d5 · c32c7d5
1 parent 35d6d68
commit c32c7d5
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/@ngtools/webpack/src/angular_compiler_plugin.ts b/packages/@ngtools/webpack/src/angular_compiler_plugin.ts
@@ -447,19 +447,20 @@ export class AngularCompilerPlugin implements Tapable {
       .forEach(lazyRouteKey => {
         const [lazyRouteModule, moduleName] = lazyRouteKey.split('#');
 
-        if (!lazyRouteModule || !moduleName) {
+        if (!lazyRouteModule) {
           return;
         }
 
-        const lazyRouteTSFile = discoveredLazyRoutes[lazyRouteKey];
+        const lazyRouteTSFile = discoveredLazyRoutes[lazyRouteKey].replace(/\\/g, '/');
         let modulePath: string, moduleKey: string;
 
         if (this._JitMode) {
           modulePath = lazyRouteTSFile;
-          moduleKey = lazyRouteKey;
+          moduleKey = `${lazyRouteModule}${moduleName ? '#' + moduleName : ''}`;
         } else {
           modulePath = lazyRouteTSFile.replace(/(\.d)?\.ts$/, `.ngfactory.js`);
-          moduleKey = `${lazyRouteModule}.ngfactory#${moduleName}NgFactory`;
+          const factoryModuleName = moduleName ? `#${moduleName}NgFactory` : '';
+          moduleKey = `${lazyRouteModule}.ngfactory${factoryModuleName}`;
         }
 
         if (moduleKey in this._lazyRoutes) {