chore: angular 9 cleanup

e2e/animation-examples/app/app.module.ts

@@ -5,9 +5,7 @@ import {
     APP_INITIALIZER
 } from "@angular/core";
 
-import { NativeScriptModule } from "@nativescript/angular";
-import { NativeScriptAnimationsModule } from "@nativescript/angular/animations";
-import { NSModuleFactoryLoader } from "@nativescript/angular/router";
+import { NativeScriptModule, NativeScriptAnimationsModule } from "@nativescript/angular";
 
 import { AppRoutingModule } from "./app.routing";
 import { AnimationsListComponent } from "./animations-list.component";

e2e/animation-examples/app/selector-all.component.ts

@@ -5,7 +5,7 @@ import {
     transition,
     trigger,
 } from "@angular/animations";
-import { Component } from "@angular/core";
+import { Component, NgZone } from "@angular/core";
 
 @Component({
     moduleId: module.id,
@@ -31,7 +31,7 @@ import { Component } from "@angular/core";
     template: `
         <FlexboxLayout flexDirection="column"
             automationText="itemsContainer">
-            <Button text="add" automationText="add" (tap)="items.push('random')"></Button>
+            <Button text="add" automationText="add" (tap)="addRandom()"></Button>
 
             <FlexboxLayout
                 flexDirection="column"
@@ -54,11 +54,19 @@ export class SelectorAllComponent {
         "second",
     ];
 
+    constructor(private zone: NgZone) {}
+
     add() {
         const newItem = `Item ${this.items.length}`;
         this.items.push(newItem);
     }
 
+    addRandom() {
+      // this.zone.run(() => {
+        this.items.push('random');
+      // });
+    }
+
     remove(item) {
         const index = this.items.indexOf(item);
         this.items.splice(index, 1)

e2e/animation-examples/package.json

@@ -47,7 +47,7 @@
     "typescript": "~3.8.3"
   },
   "scripts": {
-    "clean": "npx rimraf hooks node_modules package-lock.json",
+    "clean": "npx rimraf hooks node_modules platforms package-lock.json",
     "setup": "cd ../../nativescript-angular && npm run pack && cd ../e2e/animation-examples && npm run clean",
     "u": "update-ns-webpack",
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
@@ -56,6 +56,8 @@
     "ns-verify-bundle": "ns-verify-bundle",
     "update-ns-webpack": "update-ns-webpack",
     "ngcc": "ngcc --properties es2015 module main --first-only",
-    "postinstall": "npm run ngcc"
+    "postinstall": "npm run ngcc",
+    "ios": "tns debug ios --env.aot --emulator --no-hmr",
+    "android": "tns debug android --env.aot --emulator --no-hmr"
   }
 }

e2e/modal-navigation-ng/app/app.routing.ts

@@ -1,5 +1,5 @@
 import { NgModule } from "@angular/core";
-import { NativeScriptRouterModule } from "@nativescript/angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 import { Routes, Router } from "@angular/router";
 
 import { HomeComponent } from "./home/home.component";

e2e/modal-navigation-ng/app/home/home.component.ts

@@ -1,7 +1,6 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
-import { RouterExtensions } from "@nativescript/angular/router";
-import { EventData } from "@nativescript/core/data/observable";
+import { ModalDialogService, ModalDialogOptions, RouterExtensions } from "@nativescript/angular";
+import { EventData } from "@nativescript/core";
 
 import { ViewContainerRefService } from "../shared/ViewContainerRefService";
 import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";

e2e/modal-navigation-ng/app/layout.component.ts

@@ -1,7 +1,7 @@
 import { Component, ViewContainerRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
 import { NSLocationStrategy } from "@nativescript/angular";
-import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
+import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular";
 import { ModalViewComponent } from "./modal-shared/modal-view.component";
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 import { AppModule } from "./app.module";

e2e/modal-navigation-ng/app/modal-nested/modal-nested.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 import { View, ShownModallyData } from "@nativescript/core/ui/core/view"
-import { ModalDialogParams } from "@nativescript/angular/directives/dialogs";
+import { ModalDialogParams } from "@nativescript/angular";
 
 @Component({
     moduleId: module.id,

e2e/modal-navigation-ng/app/modal-second/modal-second.component.ts

@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { View } from "@nativescript/core/ui/core/view"
 import { ActivatedRoute } from "@angular/router";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "@nativescript/angular";
 
 @Component({
     moduleId: module.id,

e2e/modal-navigation-ng/app/modal-shared/modal-shared-second.component.ts

@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
-import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular/modal-dialog";
+import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular";
 
 import { ViewContainerRefService } from "../shared/ViewContainerRefService";
 import { ModalViewComponent } from "../modal-shared/modal-view.component";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "@nativescript/angular";
 
 @Component({
     selector: "ns-second",

e2e/modal-navigation-ng/app/modal-shared/modal-view-content.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { ModalDialogParams } from "@nativescript/angular/modal-dialog";
+import { ModalDialogParams } from "@nativescript/angular";
 
 @Component({
     selector: "ModalViewContent",

e2e/modal-navigation-ng/app/modal-shared/modal-view.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from "@angular/core";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "@nativescript/angular";
 
 @Component({
     selector: "ModalView",

e2e/modal-navigation-ng/app/modal/modal-router/modal-router.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { RouterExtensions } from "@nativescript/angular/router";
-import { ModalDialogParams } from "@nativescript/angular/directives/dialogs";
+import { RouterExtensions } from "@nativescript/angular";
+import { ModalDialogParams } from "@nativescript/angular";
 
 @Component({
     moduleId: module.id,

e2e/modal-navigation-ng/app/modal/modal.component.ts

@@ -1,6 +1,6 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import { ModalDialogParams, ModalDialogOptions, ModalDialogService } from "@nativescript/angular/directives/dialogs";
-import { RouterExtensions, PageRoute } from "@nativescript/angular/router";
+import { ModalDialogParams, ModalDialogOptions, ModalDialogService } from "@nativescript/angular";
+import { RouterExtensions, PageRoute } from "@nativescript/angular";
 import { ActivatedRoute } from "@angular/router";
 import { View, ShownModallyData, EventData } from "@nativescript/core/ui/core/view"
 import { confirm } from "@nativescript/core/ui/dialogs";

e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts

@@ -1,6 +1,6 @@
 import { Component, ViewContainerRef, Input, ViewChild, ElementRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
-import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
+import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular";
 import { ModalComponent } from "../modal/modal.component";
 import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
 import { confirm } from "@nativescript/core/ui/dialogs";

e2e/modal-navigation-ng/app/second/second.component.ts

@@ -1,11 +1,10 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
-import { EventData } from "@nativescript/core/data/observable";
-import { Frame } from "@nativescript/core/ui/frame";
-import { View } from "@nativescript/core/ui/core/view";
+import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular";
+import { EventData } from "@nativescript/core";
+import { Frame } from "@nativescript/core";
+import { View } from "@nativescript/core";
 import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
-import { PageRouterOutlet } from "@nativescript/angular/router/page-router-outlet";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "@nativescript/angular";
 import { ModalComponent } from "../modal/modal.component";
 import { AppModule } from "../app.module";
 @Component({

e2e/modal-navigation-ng/package.json

@@ -49,9 +49,11 @@
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
     "e2e-watch": "tsc -p e2e --watch",
-    "clean": "npx rimraf hooks node_modules package-lock.json",
-    "setup": "cd ../../nativescript-angular && npm run pack && cd ../e2e/animation-examples && npm run clean",
+    "clean": "npx rimraf hooks node_modules platforms package-lock.json",
+    "setup": "cd ../../nativescript-angular && npm run pack && cd ../e2e/modal-navigation-ng && npm run clean",
     "ngcc": "ngcc --properties es2015 module main --first-only",
-    "postinstall": "npm run ngcc"
+    "postinstall": "npm run ngcc",
+    "ios": "tns debug ios --env.aot --emulator --no-hmr",
+    "android": "tns debug android --env.aot --emulator --no-hmr"
   }
 }

e2e/nested-router-tab-view/app/modal/modal.component.ts

@@ -26,7 +26,8 @@ export class ModalComponent {
     }
 
     close(layoutRoot: View) {
-        layoutRoot.closeModal();
+      this.modal.closeModal();
+        // layoutRoot.closeModal();
     }
 
     ngOnInit() {

e2e/nested-router-tab-view/package.json

@@ -46,8 +46,8 @@
     "compile-tests": "tsc -p e2e --watch",
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
     "e2e-watch": "tsc -p e2e --watch",
-    "clean": "npx rimraf hooks node_modules package-lock.json",
-    "setup": "cd ../../nativescript-angular && npm run pack && cd ../e2e/animation-examples && npm run clean",
+    "clean": "npx rimraf hooks node_modules platforms package-lock.json",
+    "setup": "cd ../../nativescript-angular && npm run pack && cd ../e2e/nested-router-tab-view && npm run clean",
     "ngcc": "ngcc --properties es2015 module main --first-only",
     "postinstall": "npm run ngcc"
   }

e2e/router/app/app-routing.module.ts

@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule, NSEmptyOutletComponent } from "@nativescript/angular/router";
+import { NativeScriptRouterModule, NSEmptyOutletComponent } from "@nativescript/angular";
 
 import { FirstComponent } from "./first/first.component"
 import { SecondComponent } from "./second/second.component"
@@ -26,7 +26,7 @@ export const routes = [
                 path: "lazy-named",
                 outlet: "lazyNameOutlet",
                 component: NSEmptyOutletComponent,
-                loadChildren: "./lazy-named/lazy-named.module#LazyNamedModule",
+                loadChildren: () => import('./lazy-named/lazy-named.module').then(m => m.LazyNamedModule),
             }
         ]
     },
@@ -45,17 +45,11 @@ export const routes = [
     },
     {
         path: "lazy",
-        loadChildren: "./lazy/lazy.module#LazyModule",
+        component: NSEmptyOutletComponent,
+        loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule),
     }
 ];
 
-export const navigatableComponents = [
-    FirstComponent,
-    SecondComponent,
-    MasterComponent,
-    DetailComponent
-];
-
 @NgModule({
     imports: [NativeScriptRouterModule, NativeScriptRouterModule.forRoot(routes)],
     exports: [NativeScriptRouterModule],

e2e/router/app/app.module.ts

@@ -1,11 +1,13 @@
-import { NgModule, NgModuleFactoryLoader, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptModule } from "@nativescript/angular";
-import { NSModuleFactoryLoader } from "@nativescript/angular/router";
+import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
+import { NativeScriptModule, NativeScriptAnimationsModule } from "@nativescript/angular";
 
 import {
     AppRoutingModule,
-    navigatableComponents,
 } from "./app-routing.module";
+import { FirstComponent } from "./first/first.component"
+import { SecondComponent } from "./second/second.component"
+import { MasterComponent } from "./second/master.component"
+import { DetailComponent } from "./second/detail.component"
 
 import { AppComponent } from "./app.component";
 
@@ -17,14 +19,15 @@ enable();
 @NgModule({
     declarations: [
         AppComponent,
-        ...navigatableComponents,
+        FirstComponent,
+        SecondComponent,
+        MasterComponent,
+        DetailComponent,
     ],
     bootstrap: [AppComponent],
-    providers: [
-        { provide: NgModuleFactoryLoader, useClass: NSModuleFactoryLoader }
-    ],
     imports: [
         NativeScriptModule,
+        // NativeScriptAnimationsModule,
         AppRoutingModule,
     ],
     schemas: [NO_ERRORS_SCHEMA],

e2e/router/app/first/first.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, OnDestroy, OnChanges, DoCheck } from "@angular/core";
-import { RouterExtensions } from "@nativescript/angular/router";
-import { Page } from "@nativescript/core/ui/page";
+import { RouterExtensions } from "@nativescript/angular";
+import { Page } from "@nativescript/core";
 
 import { CounterService } from "../counter.service";
 import { ActivatedRoute } from "@angular/router";
@@ -39,6 +39,10 @@ export class FirstComponent implements OnInit, OnDestroy, DoCheck {
         console.log("FirstComponent - constructor() page: " + page);
     }
 
+    tapMe() {
+      console.log('here!!!')
+    }
+
     ngOnInit() {
         console.log("FirstComponent - ngOnInit()");
         this.sub = this.route.queryParams.subscribe((params) =>{

e2e/router/app/lazy-named/lazy-named.module.ts

@@ -1,8 +1,7 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { Route } from "@angular/router";
 
-import { NativeScriptCommonModule } from "@nativescript/angular/common";
-import { NativeScriptRouterModule } from "@nativescript/angular/router";
+import { NativeScriptCommonModule, NativeScriptRouterModule } from "@nativescript/angular";
 
 import { NestedMasterComponent } from "./nested-master.component"
 import { NestedDetailComponent } from "./nested-detail.component"
@@ -24,6 +23,7 @@ const routes: Route[] = [
         NestedDetailComponent
     ],
     exports:[
+        NativeScriptRouterModule,
         NestedMasterComponent,
         NestedDetailComponent
     ]

e2e/router/app/lazy-named/nested-detail.component.ts

@@ -3,11 +3,11 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
-import { Page } from "@nativescript/core/ui/page";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { Page } from "@nativescript/core";
+import { RouterExtensions } from "@nativescript/angular";
 
 @Component({
-    selector: "detail",
+    selector: "nested-detail",
     template: `
     <GridLayout rows="auto, auto">
         <Label [text]="'nested-named-param: ' + (id$ | async)"></Label>

e2e/router/app/lazy-named/nested-master.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
-import { Page } from "@nativescript/core/ui/page";
+import { Page } from "@nativescript/core";
 @Component({
-    selector: "master",
+    selector: "nested-master",
     template: `
     <GridLayout rows="auto">   
         <StackLayout row="1" orientation="horizontal">

e2e/router/app/lazy/lazy-componentless-route.component.ts

@@ -1,12 +1,12 @@
 import { Component, OnInit, OnDestroy, OnChanges } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "@nativescript/angular";
 
 import { Page } from "@nativescript/core/ui/page";
 
 @Component({
-    selector: "lazy",
+    selector: "lazy-cmp-less-route",
     template: `
     <StackLayout>
         <Label text="Lazy Componentless Route" class="header"></Label>

e2e/router/app/lazy/lazy.component.ts

@@ -1,9 +1,9 @@
 import { Component, OnInit, OnDestroy, OnChanges } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "@nativescript/angular";
 
-import { Page } from "@nativescript/core/ui/page";
+import { Page } from "@nativescript/core";
 
 @Component({
     selector: "lazy",