@@ -10,8 +10,13 @@ import { Architect } from '@angular-devkit/architect';
1010import { TestLogger } from '@angular-devkit/architect/testing' ;
1111import { take , tap , timeout } from 'rxjs/operators' ;
1212import {
13- browserBuild , createArchitect , host , lazyModuleFiles ,
14- lazyModuleFnImport , lazyModuleStringImport ,
13+ browserBuild ,
14+ createArchitect ,
15+ host ,
16+ ivyEnabled ,
17+ lazyModuleFiles ,
18+ lazyModuleFnImport ,
19+ lazyModuleStringImport ,
1520} from '../utils' ;
1621
1722// tslint:disable-next-line:no-big-function
@@ -25,10 +30,11 @@ describe('Browser Builder lazy modules', () => {
2530 } ) ;
2631 afterEach ( async ( ) => host . restore ( ) . toPromise ( ) ) ;
2732
28- for ( const [ name , imports ] of Object . entries ( {
29- 'string' : lazyModuleStringImport ,
30- 'function' : lazyModuleFnImport ,
31- } ) ) {
33+ const cases : [ string , Record < string , string > ] [ ] = [
34+ [ 'string' , lazyModuleStringImport ] ,
35+ [ 'function' , lazyModuleFnImport ] ,
36+ ] ;
37+ for ( const [ name , imports ] of cases ) {
3238 describe ( `Load children ${ name } , ( ) => {
3339 it ( 'supports lazy bundle for lazy routes with JIT' , async ( ) => {
3440 host . writeMultipleFiles ( lazyModuleFiles ) ;
@@ -39,34 +45,46 @@ describe('Browser Builder lazy modules', () => {
3945 } ) ;
4046
4147 it ( 'should show error when lazy route is invalid on watch mode AOT' , async ( ) => {
48+ if ( ivyEnabled && name === 'string' ) {
49+ pending ( 'Does not apply to Ivy.' ) ;
50+
51+ return ;
52+ }
53+
54+ // DISABLED_FOR_IVY - These should pass but are currently not supported
55+ if ( ivyEnabled ) {
56+ pending ( 'Broken in Ivy' ) ;
57+
58+ return ;
59+ }
60+
4261 host . writeMultipleFiles ( lazyModuleFiles ) ;
4362 host . writeMultipleFiles ( imports ) ;
44- host . replaceInFile (
45- 'src/app/app.module.ts' ,
46- 'lazy.module' ,
47- 'invalid.module' ,
48- ) ;
63+ host . replaceInFile ( 'src/app/app.module.ts' , 'lazy.module' , 'invalid.module' ) ;
4964
5065 const logger = new TestLogger ( 'rebuild-lazy-errors' ) ;
5166 const overrides = { watch : true , aot : true } ;
5267 const run = await architect . scheduleTarget ( target , overrides , { logger } ) ;
53- await run . output . pipe (
54- timeout ( 15000 ) ,
55- tap ( ( buildEvent ) => expect ( buildEvent . success ) . toBe ( false ) ) ,
56- tap ( ( ) => {
57- // Webpack error when using loadchildren string syntax.
58- const hasMissingModuleError = logger . includes ( 'Could not resolve module' )
59- // TS type error when using import().
60- || logger . includes ( 'Cannot find module' )
61- // Webpack error when using import() on a rebuild.
62- // There is no TS error because the type checker is forked on rebuilds.
63- || logger . includes ( 'Module not found' ) ;
64- expect ( hasMissingModuleError ) . toBe ( true , 'Should show missing module error' ) ;
65- logger . clear ( ) ;
66- host . appendToFile ( 'src/main.ts' , ' ' ) ;
67- } ) ,
68- take ( 2 ) ,
69- ) . toPromise ( ) ;
68+ await run . output
69+ . pipe (
70+ timeout ( 15000 ) ,
71+ tap ( buildEvent => expect ( buildEvent . success ) . toBe ( false ) ) ,
72+ tap ( ( ) => {
73+ // Webpack error when using loadchildren string syntax.
74+ const hasMissingModuleError =
75+ logger . includes ( 'Could not resolve module' ) ||
76+ // TS type error when using import().
77+ logger . includes ( 'Cannot find module' ) ||
78+ // Webpack error when using import() on a rebuild.
79+ // There is no TS error because the type checker is forked on rebuilds.
80+ logger . includes ( 'Module not found' ) ;
81+ expect ( hasMissingModuleError ) . toBe ( true , 'Should show missing module error' ) ;
82+ logger . clear ( ) ;
83+ host . appendToFile ( 'src/main.ts' , ' ' ) ;
84+ } ) ,
85+ take ( 2 ) ,
86+ )
87+ . toPromise ( ) ;
7088 await run . stop ( ) ;
7189 } ) ;
7290
@@ -75,7 +93,13 @@ describe('Browser Builder lazy modules', () => {
7593 host . writeMultipleFiles ( imports ) ;
7694
7795 const { files } = await browserBuild ( architect , host , target , { aot : true } ) ;
78- expect ( files [ 'lazy-lazy-module-ngfactory.js' ] ) . not . toBeUndefined ( ) ;
96+ if ( ivyEnabled ) {
97+ const data = await files [ 'lazy-lazy-module.js' ] ;
98+ expect ( data ) . not . toBeUndefined ( 'Lazy module output bundle does not exist' ) ;
99+ expect ( data ) . toContain ( 'LazyModule.ngModuleDef' ) ;
100+ } else {
101+ expect ( files [ 'lazy-lazy-module-ngfactory.js' ] ) . not . toBeUndefined ( ) ;
102+ }
79103 } ) ;
80104 } ) ;
81105 }
@@ -206,8 +230,14 @@ describe('Browser Builder lazy modules', () => {
206230 const { files } = await browserBuild ( architect , host , target , {
207231 lazyModules : [ 'src/app/lazy/lazy.module' ] ,
208232 aot : true ,
209- optimization : true ,
210233 } ) ;
211- expect ( files [ 'src-app-lazy-lazy-module-ngfactory.js' ] ) . not . toBeUndefined ( ) ;
234+
235+ if ( ivyEnabled ) {
236+ const data = await files [ 'src-app-lazy-lazy-module.js' ] ;
237+ expect ( data ) . not . toBeUndefined ( 'Lazy module output bundle does not exist' ) ;
238+ expect ( data ) . toContain ( 'LazyModule.ngModuleDef' ) ;
239+ } else {
240+ expect ( files [ 'src-app-lazy-lazy-module-ngfactory.js' ] ) . not . toBeUndefined ( ) ;
241+ }
212242 } ) ;
213243} ) ;
0 commit comments