Revert "feat: add lazy loaded modal and lazy routing tests"

This reverts commit 255208a.

Author: sis0k0

Diff for: app/app.css

@@ -1,6 +1,4 @@
-@import '~/nativescript-theme-core/css/core.light.css';
-
-button {
+button {
     font-size: 13;
 }
 
@@ -12,4 +10,3 @@ label {
     font-family: 'Courier'; /* Enabling this results in the error and shows a blank TabView */
 }
 
-

Diff for: app/app.module.ts

@@ -1,6 +1,5 @@
-import { NgModule, NgModuleFactoryLoader, NO_ERRORS_SCHEMA } from "@angular/core";
+import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
-import { NSModuleFactoryLoader } from "nativescript-angular/router";
 
 import { NavigationMainPageRouter } from "./main/main-page-router-outlet";
 import { routableComponents, routes } from "./app.routes";
@@ -23,12 +22,6 @@ import { CustomTemplate } from "./list-view/list-view-item-template";
         NativeScriptRouterModule,
         NativeScriptRouterModule.forRoot(routes),
     ],
-    providers: [
-        {
-            provide: NgModuleFactoryLoader,
-            useClass: NSModuleFactoryLoader
-        }
-    ],
     schemas: [NO_ERRORS_SCHEMA],
 })
 export class AppModule { }

Diff for: app/app.routes.ts

@@ -5,10 +5,9 @@ import { SecondComponentActionBar } from "./action-bar/action-bar-second.compone
 
 import { AppComponent } from "./template/app.component";
 
-import { FirstComponent } from "./router/router-outlet/first.component";
-import { SecondComponent } from "./router/router-outlet/second.component";
-import { NavigationComponent, NavigationSubRoutes } from "./router/router-outlet/navigation.component";
-import { LazyNavigationComponent } from "./router/lazy-module-navigation/lazy-navigation.component";
+import { FirstComponent } from "./components/first.component";
+import { SecondComponent } from "./components/second.component";
+import { NavigationTestRouter, NavigationSubRoutes } from "./router/router-outlet";
 
 import { BindingComponent } from "./binding/binding-page";
 
@@ -23,7 +22,6 @@ import { ListPickerComponent } from "./list-picker/list-picker";
 
 import { ModalTest, ModalTestWithPushStrategy, ModalContent } from "./modal/modal-dialogs/modal-dialog.component";
 import { ModalViewMainPageComponent } from "./modal/modal-view-main-page";
-import { LazyLoadModalComponent } from "./modal/lazy/lazy-load-modal.component";
 
 import { TabViewComponent } from "./tab-view/tab-view.component";
 
@@ -36,8 +34,7 @@ export const routableComponents = [
     ModalContent,
     AppComponent,
 
-    NavigationComponent,
-    LazyNavigationComponent,
+    NavigationTestRouter,
 
     FirstComponent,
     SecondComponent,
@@ -59,7 +56,6 @@ export const routableComponents = [
     ModalViewMainPageComponent,
     ModalTest,
     ModalTestWithPushStrategy,
-    LazyLoadModalComponent,
 
     TabViewComponent,
 
@@ -73,8 +69,7 @@ export const routes = [
     { path: '', component: ModalContent, data: { title: "" } },
     { path: 'template', component: AppComponent, data: { title: "Template", isNavigatable: true} },
 
-    { path: 'router', component: NavigationComponent, children: NavigationSubRoutes, data: { title: "Router", isNavigatable: true} },
-    { path: 'lazy-router', component: LazyNavigationComponent, data: { title: "Lazy Router", isNavigatable: true} },
+    { path: 'router', component: NavigationTestRouter, children: NavigationSubRoutes, data: { title: "Router", isNavigatable: true} },
 
     { path: 'first', component: FirstComponent, data: { title: "First", isNavigatable: true} },
     { path: 'second', component: SecondComponent, data: { title: "Second", isNavigatable: true} },
@@ -96,17 +91,10 @@ export const routes = [
     { path: 'modal', component: ModalViewMainPageComponent, data: { title: "Modals", isNavigatable: true} },
     { path: 'modal/modal-dialogs', component: ModalTest, data: { title: "modal" } },
     { path: 'modal/modal-dialogs-push', component: ModalTestWithPushStrategy, data: { title: "modal(onPush)" } },
-    { path: 'modal/lazy', component: LazyLoadModalComponent, data: { title: "modal(lazy)" } },
 
     { path: 'tab-view', component: TabViewComponent, data: { title: "tab-view", isNavigatable: true } },
 
     { path: 'nav-options', component: NavigationOptionsComponent, data: { title: "nav-options", isNavigatable: true} },
     { path: 'nav-info', component: NavigationInfoComponent, data: { title: "nav-info" } },
-
-    // Needed for AoT compilation
-    { 
-        path: "lazy",
-        loadChildren: "./lazy/lazy.module#LazyModule"
-    },
 ];
 

Diff for: app/router/router-outlet/first.component.ts renamed to app/components/first.component.ts

@@ -16,7 +16,7 @@ export class MainComponent {
 
     constructor() {
         let navigatableRoutes = this._routes.filter((item) => {
-            return item.data && item.data.isNavigatable && item.path;
+            return item.data.isNavigatable == true && item.path != '';
         });
 
         this._pages = navigatableRoutes;

Diff for: app/router/router-outlet/second.component.ts renamed to app/components/second.component.ts

@@ -6,7 +6,6 @@ import { Component } from "@angular/core";
     <StackLayout>
         <Button text="modal" [nsRouterLink]="['/modal','modal-dialogs']"></Button>        
         <Button text="modal(onPush)" [nsRouterLink]="['/modal','modal-dialogs-push']"></Button>
-        <Button text="modal(lazy)" [nsRouterLink]="['/modal','lazy']"></Button>
      </StackLayout>   
     `,
 })

Diff for: app/lazy/lazy.component.html

@@ -1,11 +1,11 @@
-import { Component } from "@angular/core";
-import { FirstComponent } from "./first.component";
-import { SecondComponent } from "./second.component";
+import {Component} from "@angular/core";
+import {FirstComponent} from "../components/first.component";
+import {SecondComponent} from "../components/second.component";
 
 @Component({
     moduleId: module.id,
-    selector: "navigation-test",
-    styleUrls: ["./navigation.component.css"],
+    selector: 'navigation-test',
+    styleUrls: ['./router-outlet.css'],
     template: `
         <StackLayout>
             <StackLayout class="nav">
@@ -19,10 +19,10 @@ import { SecondComponent } from "./second.component";
         </StackLayout>
     `
 })
-export class NavigationComponent { }
+export class NavigationTestRouter { }
 
 export var NavigationSubRoutes = [
-    { path: "", redirectTo: "first", pathMatch: "full" },
-    { path: "first", component: FirstComponent },
-    { path: "second", component: SecondComponent },
+    { path: '', redirectTo: 'first', pathMatch: "full" },
+    { path: 'first', component: FirstComponent },
+    { path: 'second', component: SecondComponent },
 ];

Diff for: app/lazy/lazy.component.ts

@@ -1,3 +1,25 @@
+// Resolve JavaScript classes that extend a Java class, and need to resolve
+// their JavaScript module from a bundled script. For example:
+// NativeScriptApplication, NativeScriptActivity, etc.
+//
+// This module gets bundled together with the rest of the app code and the
+// `require` calls get resolved to the correct bundling import call.
+//
+// At runtime the module gets loaded *before* the rest of the app code, so code
+// placed here needs to be careful about its dependencies.
+
 require("application");
 require("ui/frame");
 require("ui/frame/activity");
+
+if (global.TNS_WEBPACK) {
+    global.__requireOverride = function (name, dir) {
+        if (name === "./tns_modules/application/application.js") {
+            return require("application");
+        } else if (name === "./tns_modules/ui/frame/frame.js") {
+            return require("ui/frame");
+        } else if (name === "./tns_modules/ui/frame/activity.js") {
+            return require("ui/frame/activity");
+        }
+    };
+}

Diff for: app/lazy/lazy.module.ts

@@ -22,7 +22,6 @@
     "@angular/router": "~4.1.0",
     "nativescript-angular": "next",
     "nativescript-intl": "~3.0.0",
-    "nativescript-theme-core": "^1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^5.0.1",
     "tns-core-modules": "next",
@@ -54,4 +53,4 @@
     "build-android-bundle": "npm run ns-bundle --android --build-app",
     "build-ios-bundle": "npm run ns-bundle --ios --build-app"
   }
-}
+}

Diff for: app/main/main-page-router-outlet.ts

@@ -0,0 +1,2 @@
+var makeConfig = require("./webpack.common");
+module.exports = makeConfig("android");