fix(@angular-devkit/build-angular): properly account for AOT in lazyModules option

Author: clydin

packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts

@@ -76,7 +76,7 @@ describe('Browser Builder lazy modules', () => {
   beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
   afterEach(done => host.restore().subscribe(undefined, done.fail, done));
 
-  it('supports lazy bundle for lazy routes', (done) => {
+  it('supports lazy bundle for lazy routes with JIT', (done) => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles(lazyModuleImport);
 
@@ -88,6 +88,19 @@ describe('Browser Builder lazy modules', () => {
     ).subscribe(undefined, done.fail, done);
   }, Timeout.Basic);
 
+  it('supports lazy bundle for lazy routes with AOT', (done) => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+
+    runTargetSpec(host, browserTargetSpec, { aot: true }).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync()
+          .exists(join(outputPath, 'lazy-lazy-module-ngfactory.js'))).toBe(true);
+      }),
+    ).subscribe(undefined, done.fail, done);
+  }, Timeout.Basic);
+
   it(`supports lazy bundle for import() calls`, (done) => {
     host.writeMultipleFiles({
       'src/lazy-module.ts': 'export const value = 42;',
@@ -180,7 +193,7 @@ describe('Browser Builder lazy modules', () => {
     ).subscribe(undefined, done.fail, done);
   }, Timeout.Basic);
 
-  it(`supports extra lazy modules array`, (done) => {
+  it(`supports extra lazy modules array in JIT`, (done) => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles({
       'src/app/app.component.ts': `
@@ -210,4 +223,40 @@ describe('Browser Builder lazy modules', () => {
         .toBe(true)),
     ).subscribe(undefined, done.fail, done);
   }, Timeout.Basic);
+
+  it(`supports extra lazy modules array in AOT`, (done) => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles({
+      'src/app/app.component.ts': `
+        import { Component, SystemJsNgModuleLoader } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css'],
+        })
+        export class AppComponent {
+          title = 'app';
+          constructor(loader: SystemJsNgModuleLoader) {
+            // Module will be split at build time and loaded when requested below
+            loader.load('src/app/lazy/lazy.module#LazyModule')
+              .then((factory) => { /* Use factory here */ });
+          }
+        }`,
+    });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+
+    const overrides: Partial<BrowserBuilderSchema> = {
+      lazyModules: ['src/app/lazy/lazy.module'],
+      aot: true,
+      optimization: true,
+    };
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => expect(host.scopedSync()
+        .exists(join(outputPath, 'src-app-lazy-lazy-module-ngfactory.js')))
+        .toBe(true)),
+    ).subscribe(undefined, done.fail, done);
+  }, Timeout.Basic);
 });

packages/ngtools/webpack/src/angular_compiler_plugin.ts

@@ -492,7 +492,8 @@ export class AngularCompilerPlugin {
           modulePath = lazyRouteTSFile;
           moduleKey = `${lazyRouteModule}${moduleName ? '#' + moduleName : ''}`;
         } else {
-          modulePath = lazyRouteTSFile.replace(/(\.d)?\.ts$/, `.ngfactory.js`);
+          modulePath = lazyRouteTSFile.replace(/(\.d)?\.ts$/, '');
+          modulePath += '.ngfactory.js';
           const factoryModuleName = moduleName ? `#${moduleName}NgFactory` : '';
           moduleKey = `${lazyRouteModule}.ngfactory${factoryModuleName}`;
         }