fix: single-page test app

tbozhikov · tbozhikov · commit 1d640af5432e · 2019-10-17T16:17:33.000+03:00
diff --git a/e2e/modal-navigation-ng/app/app.component.ts b/e2e/modal-navigation-ng/app/app.component.ts
@@ -1,11 +1,11 @@
 import { Component, ViewContainerRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
-// import { NSLocationStrategy } from "@nativescript/angular/router/ns-location-strategy";
+// import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 
 import { AppModule } from "./app.module";
-import { ModalDialogOptions, ModalDialogService, NSLocationStrategy } from "@nativescript/angular";
+import { ModalDialogOptions, ModalDialogService, NSLocationStrategy } from "nativescript-angular";
 import { ModalViewComponent } from "./modal-shared/modal-view.component";
 
 @Component({
diff --git a/e2e/modal-navigation-ng/app/app.module.ts b/e2e/modal-navigation-ng/app/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptModule } from "@nativescript/angular/nativescript.module";
+import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { AppRoutingModule } from "./app.routing";
 import { AppComponent } from "./app.component";
 import { NamedRouterComponent } from "./named-router.component";
@@ -20,7 +20,7 @@ import { ModalSharedSecondComponent } from "./modal-shared/modal-shared-second.c
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 
 import { enable as traceEnable, addCategories } from "tns-core-modules/trace";
-import { NativeScriptPlatformRef, routerTraceCategory } from "@nativescript/angular";
+import { NativeScriptPlatformRef, routerTraceCategory } from "nativescript-angular";
 
 addCategories(routerTraceCategory);
 traceEnable();
diff --git a/e2e/modal-navigation-ng/app/app.routing.ts b/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/router";
 import { Routes, Router } from "@angular/router";
 
 import { HomeComponent } from "./home/home.component";
diff --git a/e2e/modal-navigation-ng/app/home/home.component.ts b/e2e/modal-navigation-ng/app/home/home.component.ts
@@ -1,5 +1,5 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import { ModalDialogService, RouterExtensions } from "@nativescript/angular";
+import { ModalDialogService, RouterExtensions } from "nativescript-angular";
 import { ViewContainerRefService } from "../shared/ViewContainerRefService";
 
 @Component({
diff --git a/e2e/modal-navigation-ng/app/layout.component.ts b/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/router";
-import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
+import { NSLocationStrategy } from "nativescript-angular/router";
+import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
 import { ModalViewComponent } from "./modal-shared/modal-view.component";
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 import { AppModule } from "./app.module";
diff --git a/e2e/modal-navigation-ng/app/main.aot.ts b/e2e/modal-navigation-ng/app/main.aot.ts
@@ -1,9 +1,9 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScript } from "@nativescript/angular";
+import { platformNativeScript } from "nativescript-angular";
 console.log(">>>>>>>>main.aot.ts");
 
 import { AppModule } from "./app.module";
-import { NativeScriptPlatformRef } from "@nativescript/angular";
+import { NativeScriptPlatformRef } from "nativescript-angular";
 // "./app.module.ngfactory" is a dynamically generated module when compiled with AoT.
 import { AppModuleNgFactory } from "./app.module.ngfactory";
 
diff --git a/e2e/modal-navigation-ng/app/main.ts b/e2e/modal-navigation-ng/app/main.ts
@@ -1,9 +1,9 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from "@nativescript/angular";
+import { platformNativeScriptDynamic } from "nativescript-angular";
 console.log(">>>>>>>>main.ts");
 
 import { AppModule } from "./app.module";
-import { NativeScriptPlatformRef } from "@nativescript/angular";
+import { NativeScriptPlatformRef } from "nativescript-angular";
 
 AppModule.platformRef = <NativeScriptPlatformRef>platformNativeScriptDynamic();
 AppModule.platformRef.bootstrapModule(AppModule);
diff --git a/e2e/modal-navigation-ng/app/modal-nested/modal-nested.component.ts b/e2e/modal-navigation-ng/app/modal-nested/modal-nested.component.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 import { View, ShownModallyData } from "tns-core-modules/ui/core/view"
-import { ModalDialogParams } from "@nativescript/angular/directives/dialogs";
+import { ModalDialogParams } from "nativescript-angular/directives/dialogs";
 
 @Component({
     moduleId: module.id,
diff --git a/e2e/modal-navigation-ng/app/modal-second/modal-second.component.ts b/e2e/modal-navigation-ng/app/modal-second/modal-second.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { View } from "tns-core-modules/ui/core/view"
 import { ActivatedRoute } from "@angular/router";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "nativescript-angular/router";
 
 @Component({
     moduleId: module.id,
diff --git a/e2e/modal-navigation-ng/app/modal-shared/modal-shared-second.component.ts b/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/modal-dialog";
 
 import { ViewContainerRefService } from "../shared/ViewContainerRefService";
 import { ModalViewComponent } from "../modal-shared/modal-view.component";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "nativescript-angular/router";
 
 @Component({
     selector: "ns-second",
diff --git a/e2e/modal-navigation-ng/app/modal-shared/modal-view-content.component.ts b/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/modal-dialog";
 
 @Component({
     selector: "ModalViewContent",
diff --git a/e2e/modal-navigation-ng/app/modal-shared/modal-view.component.ts b/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/router";
 
 @Component({
     selector: "ModalView",
diff --git a/e2e/modal-navigation-ng/app/modal/modal-router/modal-router.component.ts b/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/router";
+import { ModalDialogParams } from "nativescript-angular/directives/dialogs";
 
 @Component({
     moduleId: module.id,
diff --git a/e2e/modal-navigation-ng/app/modal/modal.component.ts b/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/directives/dialogs";
+import { RouterExtensions, PageRoute } from "nativescript-angular/router";
 import { ActivatedRoute } from "@angular/router";
 import { View, ShownModallyData, EventData } from "tns-core-modules/ui/core/view"
 import { confirm } from "tns-core-modules/ui/dialogs";
diff --git a/e2e/modal-navigation-ng/app/named-router.component.ts b/e2e/modal-navigation-ng/app/named-router.component.ts
@@ -1,10 +1,10 @@
 import { Component, ViewContainerRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
-import { NSLocationStrategy } from "@nativescript/angular";
+import { NSLocationStrategy } from "nativescript-angular";
 
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 import { AppModule } from "./app.module";
-import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular";
+import { ModalDialogOptions, ModalDialogService } from "nativescript-angular";
 import { ModalViewComponent } from "./modal-shared/modal-view.component";
 
 @Component({
diff --git a/e2e/modal-navigation-ng/app/navigation/basic.navigation.component.ts b/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/directives/dialogs";
 import { ModalComponent } from "../modal/modal.component";
 import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
 import { confirm } from "tns-core-modules/ui/dialogs";
diff --git a/e2e/modal-navigation-ng/app/second/second.component.ts b/e2e/modal-navigation-ng/app/second/second.component.ts
@@ -1,11 +1,11 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
+import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
 import { EventData } from "tns-core-modules/data/observable";
 import { Frame } from "tns-core-modules/ui/frame";
 import { View } from "tns-core-modules/ui/core/view";
 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 { PageRouterOutlet } from "nativescript-angular/router/page-router-outlet";
+import { RouterExtensions } from "nativescript-angular/router";
 import { ModalComponent } from "../modal/modal.component";
 import { AppModule } from "../app.module";
 @Component({
diff --git a/e2e/modal-navigation-ng/app/tab.component.ts b/e2e/modal-navigation-ng/app/tab.component.ts
@@ -1,10 +1,10 @@
 import { Component, ViewContainerRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
-// import { NSLocationStrategy } from "@nativescript/angular";
+// import { NSLocationStrategy } from "nativescript-angular";
 
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 import { AppModule } from "./app.module";
-import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular";
+import { ModalDialogOptions, ModalDialogService } from "nativescript-angular";
 import { ModalViewComponent } from "./modal-shared/modal-view.component";
 
 @Component({
diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json
@@ -21,7 +21,7 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "@nativescript/angular": "file:../../nativescript-angular",
+    "nativescript-angular": "file:../../nativescript-angular-package",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.4.0",
diff --git a/e2e/single-page/app/app-routing.module.ts b/e2e/single-page/app/app-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "@nativescript/angular/router";
+import { NativeScriptRouterModule } from "nativescript-angular/router";
 
 import { FirstComponent } from "./first/first.component"
 import { SecondComponent } from "./second/second.component"
diff --git a/e2e/single-page/app/app.module.ts b/e2e/single-page/app/app.module.ts
@@ -1,6 +1,7 @@
 import { NgModule, NgModuleFactoryLoader, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptModule } from "@nativescript/angular/nativescript.module";
-import { NSModuleFactoryLoader } from "@nativescript/angular/router";
+import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NSModuleFactoryLoader } from "nativescript-angular/router";
+ import { isNavigationButton } from "nativescript-angular/directives/action-bar";
 
 import {
     AppRoutingModule,
@@ -9,7 +10,7 @@ import {
 
 import { AppComponent } from "./app.component";
 
-import { routeReuseStrategyTraceCategory, routerTraceCategory } from "@nativescript/angular/trace";
+import { routeReuseStrategyTraceCategory, routerTraceCategory } from "nativescript-angular/trace";
 import { setCategories, enable } from "tns-core-modules/trace";
 import { ModalComponent } from "./second/modal/modal.component";
 setCategories(routerTraceCategory + "," + routeReuseStrategyTraceCategory);
diff --git a/e2e/single-page/app/main.aot.ts b/e2e/single-page/app/main.aot.ts
@@ -1,4 +1,4 @@
-import { platformNativeScript } from "@nativescript/angular/platform-static";
+import { platformNativeScript } from "nativescript-angular/platform-static";
 import { AppModuleNgFactory } from "./app.module.ngfactory";
 
 platformNativeScript({ createFrameOnBootstrap: true }).bootstrapModuleFactory(AppModuleNgFactory);
diff --git a/e2e/single-page/app/main.ts b/e2e/single-page/app/main.ts
@@ -1,4 +1,4 @@
-import { platformNativeScriptDynamic } from "@nativescript/angular/platform";
+import { platformNativeScriptDynamic } from "nativescript-angular/platform";
 import { AppModule } from "./app.module";
 
 platformNativeScriptDynamic({ createFrameOnBootstrap: true }).bootstrapModule(AppModule);
diff --git a/e2e/single-page/app/second/modal/modal.component.ts b/e2e/single-page/app/second/modal/modal.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ModalDialogParams } from "@nativescript/angular/modal-dialog";
+import { ModalDialogParams } from "nativescript-angular/modal-dialog";
 
 @Component({
     moduleId: module.id,
diff --git a/e2e/single-page/app/second/second.component.ts b/e2e/single-page/app/second/second.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnInit, OnDestroy, ViewContainerRef } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 
-import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular";
+import { ModalDialogService, ModalDialogOptions } from "nativescript-angular";
 import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
-import { RouterExtensions } from "@nativescript/angular/router";
+import { RouterExtensions } from "nativescript-angular/router";
 import { ModalComponent } from "./modal/modal.component";
 
 @Component({
diff --git a/e2e/single-page/tsconfig.json b/e2e/single-page/tsconfig.json
@@ -23,10 +23,13 @@
         }
     },
     "include": [
+        "../../nativescript-angular-package",
         "../../nativescript-angular",
         "**/*"
     ],
     "exclude": [
+        "../../nativescript-angular-package/node_modules",
+        "../../nativescript-angular-package/**/*.d.ts",
         "../../nativescript-angular/node_modules",
         "../../nativescript-angular/**/*.d.ts",
         "node_modules",
diff --git a/nativescript-angular-package/directives/action-bar.ts b/nativescript-angular-package/directives/action-bar.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/directives/action-bar";
diff --git a/nativescript-angular-package/modal-dialog.ts b/nativescript-angular-package/modal-dialog.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/modal-dialog"
diff --git a/nativescript-angular-package/router/page-router-outlet.ts b/nativescript-angular-package/router/page-router-outlet.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/router/page-router-outlet";
