fix(@ngtools/webpack): Change to modify module map to for universal

Remove the manipulation of path and name to string out ngfactory references

Author: Brocco

packages/@ngtools/webpack/src/transformers/export_lazy_module_map.spec.ts

@@ -34,11 +34,11 @@ describe('export_lazy_module_map', () => {
       export { AppModule } from './app/app.module';
     `;
     // tslint:disable:max-line-length
-    const output = stripIndent`
-      import * as __lazy_0__ from "app/lazy/lazy.module.ts";
-      import * as __lazy_1__ from "app/lazy2/lazy2.module.ts";
+    const expected = stripIndent`
+      import * as __lazy_0__ from "app/lazy/lazy.module.ngfactory.ts";
+      import * as __lazy_1__ from "app/lazy2/lazy2.module.ngfactory.ts";
       export { AppModule } from './app/app.module';
-      export var LAZY_MODULE_MAP = { "./lazy/lazy.module#LazyModule": __lazy_0__.LazyModule, "./lazy2/lazy2.module#LazyModule2": __lazy_1__.LazyModule2 };
+      export var LAZY_MODULE_MAP = { "./lazy/lazy.module#LazyModule": __lazy_0__.LazyModuleNgFactory, "./lazy2/lazy2.module#LazyModule2": __lazy_1__.LazyModule2NgFactory };
     `;
     // tslint:enable:max-line-length
 
@@ -50,6 +50,6 @@ describe('export_lazy_module_map', () => {
     });
     const result = transformTypescript(input, transformOpsCb);
 
-    expect(oneLine`${result}`).toEqual(oneLine`${output}`);
+    expect(oneLine`${result}`).toEqual(oneLine`${expected}`);
   });
 });

packages/@ngtools/webpack/src/transformers/export_lazy_module_map.ts

@@ -18,16 +18,8 @@ export function exportLazyModuleMap(
 
   const modules = Object.keys(lazyRoutes)
     .map((loadChildrenString) => {
-      let [, moduleName] = loadChildrenString.split('#');
-      let modulePath = lazyRoutes[loadChildrenString];
-
-      if (modulePath.match(/\.ngfactory\.[jt]s$/)) {
-        modulePath = modulePath.replace('.ngfactory', '');
-        moduleName = moduleName.replace('NgFactory', '');
-        loadChildrenString = loadChildrenString
-          .replace('.ngfactory', '')
-          .replace('NgFactory', '');
-      }
+      const [, moduleName] = loadChildrenString.split('#');
+      const modulePath = lazyRoutes[loadChildrenString];
 
       return {
         modulePath,
@@ -52,10 +44,17 @@ export function exportLazyModuleMap(
   });
 
   const lazyModuleObjectLiteral = ts.createObjectLiteral(
-    modules.map((mod, idx) => ts.createPropertyAssignment(
-      ts.createLiteral(mod.loadChildrenString),
-      ts.createPropertyAccess(ts.createIdentifier(`__lazy_${idx}__`), mod.moduleName))
-    )
+    modules.map((mod, idx) => {
+      let [modulePath, moduleName] = mod.loadChildrenString.split('#');
+      if (modulePath.match(/\.ngfactory/)) {
+        modulePath = modulePath.replace('.ngfactory', '');
+        moduleName = moduleName.replace('NgFactory', '');
+      }
+
+      return ts.createPropertyAssignment(
+        ts.createLiteral(`${modulePath}#${moduleName}`),
+        ts.createPropertyAccess(ts.createIdentifier(`__lazy_${idx}__`), mod.moduleName));
+    })
   );
 
   const lazyModuleVariableStmt = ts.createVariableStatement(