test(e2e): modal/basic: lazy load modals

src/components/modal/test/basic/app/app.module.ts

@@ -3,19 +3,11 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicModule, IonicApp } from '../../../../..';
 
 import { E2EApp } from './app.component';
-import { ModalWithInputs } from '../pages/modal-with-inputs/modal-with-inputs';
-import { ContactUs } from '../pages/contact-us/contact-us';
-import { ModalPassData } from '../pages/modal-pass-data/modal-pass-data';
-import { ToolbarModal } from '../pages/toolbar-modal/toolbar-modal';
-import { SomeAppProvider } from '../components/some-app-provider';
+import { SomeAppProvider } from '../services/some-app-provider';
 
 @NgModule({
   declarations: [
     E2EApp,
-    ModalWithInputs,
-    ContactUs,
-    ModalPassData,
-    ToolbarModal
   ],
   imports: [
     BrowserModule,
@@ -25,19 +17,19 @@ import { SomeAppProvider } from '../components/some-app-provider';
     }, {
       links: [
         { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' },
-        { loadChildren: '../pages/modal-first-page/modal-first-page.module#ModalFirstPageModule', name: 'ModalFirstPage' },
-        { loadChildren: '../pages/modal-second-page/modal-second-page.module#ModalSecondPageModule', name: 'ModalSecondPage' }
+        { loadChildren: '../pages/modal-first/modal-first.module#ModalFirstPageModule', name: 'ModalFirstPage' },
+        { loadChildren: '../pages/modal-second/modal-second.module#ModalSecondPageModule', name: 'ModalSecondPage' },
+        { loadChildren: '../components/contact-us/contact-us.module#ContactUsModalModule', name: 'ContactUsModal' },
+        { loadChildren: '../components/modal-pass-data/modal-pass-data.module#ModalPassDataModule', name: 'ModalPassData' },
+        { loadChildren: '../components/modal-with-inputs/modal-with-inputs.module#ModalWithInputsModule', name: 'ModalWithInputs' },
+        { loadChildren: '../components/toolbar/toolbar.module#ToolbarModalModule', name: 'ToolbarModal' },
       ]
     })
   ],
   bootstrap: [IonicApp],
   providers: [SomeAppProvider],
   entryComponents: [
     E2EApp,
-    ModalWithInputs,
-    ContactUs,
-    ModalPassData,
-    ToolbarModal
   ]
 })
 export class AppModule {}

src/components/modal/test/basic/components/contact-us/contact-us.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { ContactUsModal } from './contact-us';
+
+@NgModule({
+  declarations: [
+    ContactUsModal,
+  ],
+  imports: [
+    DeepLinkModule.forChild(ContactUsModal)
+  ],
+  entryComponents: [
+    ContactUsModal,
+  ]
+})
+export class ContactUsModalModule {}

src/components/modal/test/basic/pages/contact-us/contact-us.ts → src/components/modal/test/basic/components/contact-us/contact-us.ts

@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class ContactUs {
+export class ContactUsModal {
   root = 'ModalFirstPage';
 
   constructor() {

src/components/modal/test/basic/components/modal-pass-data/modal-pass-data.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { ModalPassData } from './modal-pass-data';
+
+@NgModule({
+  declarations: [
+    ModalPassData,
+  ],
+  imports: [
+    DeepLinkModule.forChild(ModalPassData)
+  ],
+  entryComponents: [
+    ModalPassData,
+  ]
+})
+export class ModalPassDataModule {}

src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.ts → src/components/modal/test/basic/components/modal-pass-data/modal-pass-data.ts

@@ -1,7 +1,7 @@
 import { Injectable, Component } from '@angular/core';
 import { ViewController, ToastController, AlertController, NavParams, Config } from '../../../../../..';
 
-import { SomeAppProvider } from '../../components/some-app-provider';
+import { SomeAppProvider } from '../../services/some-app-provider';
 
 @Injectable()
 export class SomeComponentProvider {

src/components/modal/test/basic/components/modal-with-inputs/modal-with-inputs.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { ModalWithInputs } from './modal-with-inputs';
+
+@NgModule({
+  declarations: [
+    ModalWithInputs,
+  ],
+  imports: [
+    DeepLinkModule.forChild(ModalWithInputs)
+  ],
+  entryComponents: [
+    ModalWithInputs,
+  ]
+})
+export class ModalWithInputsModule {}

src/components/modal/test/basic/components/toolbar/toolbar.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { DeepLinkModule } from '../../../../../..';
+
+import { ToolbarModal } from './toolbar';
+
+@NgModule({
+  declarations: [
+    ToolbarModal,
+  ],
+  imports: [
+    DeepLinkModule.forChild(ToolbarModal)
+  ],
+  entryComponents: [
+    ToolbarModal,
+  ]
+})
+export class ToolbarModalModule {}

src/components/modal/test/basic/pages/main/main.ts

@@ -1,11 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController, ModalController, ToastController, Config, Platform } from '../../../../../..';
 
-import { ModalPassData } from '../modal-pass-data/modal-pass-data';
-import { ContactUs } from '../contact-us/contact-us';
-import { ToolbarModal } from '../toolbar-modal/toolbar-modal';
-import { ModalWithInputs } from '../modal-with-inputs/modal-with-inputs';
-
 @Component({
   templateUrl: 'main.html'
 })
@@ -45,7 +40,7 @@ export class E2EPage {
   }
 
   presentModal() {
-    let modal = this.modalCtrl.create(ModalPassData, { userId: 8675309 }, {
+    let modal = this.modalCtrl.create('ModalPassData', { userId: 8675309 }, {
       enterAnimation: 'modal-slide-in',
       leaveAnimation: 'modal-slide-out'
     });
@@ -62,20 +57,20 @@ export class E2EPage {
   }
 
   presentModalChildNav() {
-    this.modalCtrl.create(ContactUs, null, {
+    this.modalCtrl.create('ContactUsModal', null, {
       enableBackdropDismiss: false
     }).present();
   }
 
   presentToolbarModal() {
-    this.modalCtrl.create(ToolbarModal, null, {
+    this.modalCtrl.create('ToolbarModal', null, {
       enterAnimation: 'modal-md-slide-in',
       leaveAnimation: 'modal-md-slide-out'
     }).present();
   }
 
   presentModalWithInputs() {
-    let modal = this.modalCtrl.create(ModalWithInputs);
+    let modal = this.modalCtrl.create('ModalWithInputs');
     modal.onDidDismiss((data: any) => {
       console.log('Modal with inputs data:', data);
     });
@@ -89,7 +84,7 @@ export class E2EPage {
     }).present();
 
     setTimeout(() => {
-      this.modalCtrl.create(ContactUs).present();
+      this.modalCtrl.create('ContactUsModal').present();
     }, 500);
   }
 
@@ -100,7 +95,7 @@ export class E2EPage {
     }).present();
 
     setTimeout(() => {
-      this.modalCtrl.create(ToolbarModal).present();
+      this.modalCtrl.create('ToolbarModal').present();
     }, 500);
   }
 

src/components/modal/test/basic/pages/modal-first-page/modal-first-page.module.ts → src/components/modal/test/basic/pages/modal-first/modal-first.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { ModalFirstPage } from './modal-first-page';
+import { ModalFirstPage } from './modal-first';
 
 @NgModule({
   declarations: [

src/components/modal/test/basic/pages/modal-first-page/modal-first-page.ts → src/components/modal/test/basic/pages/modal-first/modal-first.ts

@@ -1,8 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController, App, ActionSheetController, ToastController, AlertController, ModalController } from '../../../../../..';
 
-import { ContactUs } from '../contact-us/contact-us';
-
 @Component({
   template: `
     <ion-header>
@@ -143,7 +141,7 @@ export class ModalFirstPage {
   }
 
   openModal() {
-    this.modalCtrl.create(ContactUs).present();
+    this.modalCtrl.create('ContactUs').present();
   }
 
   openActionSheet() {

src/components/modal/test/basic/pages/modal-second-page/modal-second-page.module.ts → src/components/modal/test/basic/pages/modal-second/modal-second.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { DeepLinkModule } from '../../../../../..';
 
-import { ModalSecondPage } from './modal-second-page';
+import { ModalSecondPage } from './modal-second';
 
 @NgModule({
   declarations: [