Skip to content

Commit 1d640af

Browse files
tbozhikovtbozhikov
committed
fix: single-page test app
1 parent 55da9f3 commit 1d640af

29 files changed

+47
-40
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, ViewContainerRef } from "@angular/core";
22
import { Router, NavigationEnd } from "@angular/router";
3-
// import { NSLocationStrategy } from "@nativescript/angular/router/ns-location-strategy";
3+
// import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
44

55
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
66

77
import { AppModule } from "./app.module";
8-
import { ModalDialogOptions, ModalDialogService, NSLocationStrategy } from "@nativescript/angular";
8+
import { ModalDialogOptions, ModalDialogService, NSLocationStrategy } from "nativescript-angular";
99
import { ModalViewComponent } from "./modal-shared/modal-view.component";
1010

1111
@Component({

‎e2e/modal-navigation-ng/app/app.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
2-
import { NativeScriptModule } from "@nativescript/angular/nativescript.module";
2+
import { NativeScriptModule } from "nativescript-angular/nativescript.module";
33
import { AppRoutingModule } from "./app.routing";
44
import { AppComponent } from "./app.component";
55
import { NamedRouterComponent } from "./named-router.component";
@@ -20,7 +20,7 @@ import { ModalSharedSecondComponent } from "./modal-shared/modal-shared-second.c
2020
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
2121

2222
import { enable as traceEnable, addCategories } from "tns-core-modules/trace";
23-
import { NativeScriptPlatformRef, routerTraceCategory } from "@nativescript/angular";
23+
import { NativeScriptPlatformRef, routerTraceCategory } from "nativescript-angular";
2424

2525
addCategories(routerTraceCategory);
2626
traceEnable();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule } from "@angular/core";
2-
import { NativeScriptRouterModule } from "@nativescript/angular/router";
2+
import { NativeScriptRouterModule } from "nativescript-angular/router";
33
import { Routes, Router } from "@angular/router";
44

55
import { HomeComponent } from "./home/home.component";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, ViewContainerRef } from "@angular/core";
2-
import { ModalDialogService, RouterExtensions } from "@nativescript/angular";
2+
import { ModalDialogService, RouterExtensions } from "nativescript-angular";
33
import { ViewContainerRefService } from "../shared/ViewContainerRefService";
44

55
@Component({

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, ViewContainerRef } from "@angular/core";
22
import { Router, NavigationEnd } from "@angular/router";
3-
import { NSLocationStrategy } from "@nativescript/angular/router";
4-
import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
3+
import { NSLocationStrategy } from "nativescript-angular/router";
4+
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
55
import { ModalViewComponent } from "./modal-shared/modal-view.component";
66
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
77
import { AppModule } from "./app.module";

‎e2e/modal-navigation-ng/app/main.aot.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// this import should be first in order to load some required settings (like globals and reflect-metadata)
2-
import { platformNativeScript } from "@nativescript/angular";
2+
import { platformNativeScript } from "nativescript-angular";
33
console.log(">>>>>>>>main.aot.ts");
44

55
import { AppModule } from "./app.module";
6-
import { NativeScriptPlatformRef } from "@nativescript/angular";
6+
import { NativeScriptPlatformRef } from "nativescript-angular";
77
// "./app.module.ngfactory" is a dynamically generated module when compiled with AoT.
88
import { AppModuleNgFactory } from "./app.module.ngfactory";
99

‎e2e/modal-navigation-ng/app/main.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// this import should be first in order to load some required settings (like globals and reflect-metadata)
2-
import { platformNativeScriptDynamic } from "@nativescript/angular";
2+
import { platformNativeScriptDynamic } from "nativescript-angular";
33
console.log(">>>>>>>>main.ts");
44

55
import { AppModule } from "./app.module";
6-
import { NativeScriptPlatformRef } from "@nativescript/angular";
6+
import { NativeScriptPlatformRef } from "nativescript-angular";
77

88
AppModule.platformRef = <NativeScriptPlatformRef>platformNativeScriptDynamic();
99
AppModule.platformRef.bootstrapModule(AppModule);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from "@angular/core";
22
import { View, ShownModallyData } from "tns-core-modules/ui/core/view"
3-
import { ModalDialogParams } from "@nativescript/angular/directives/dialogs";
3+
import { ModalDialogParams } from "nativescript-angular/directives/dialogs";
44

55
@Component({
66
moduleId: module.id,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component } from "@angular/core";
22
import { View } from "tns-core-modules/ui/core/view"
33
import { ActivatedRoute } from "@angular/router";
4-
import { RouterExtensions } from "@nativescript/angular/router";
4+
import { RouterExtensions } from "nativescript-angular/router";
55

66
@Component({
77
moduleId: module.id,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component } from "@angular/core";
2-
import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular/modal-dialog";
2+
import { ModalDialogOptions, ModalDialogService } from "nativescript-angular/modal-dialog";
33

44
import { ViewContainerRefService } from "../shared/ViewContainerRefService";
55
import { ModalViewComponent } from "../modal-shared/modal-view.component";
6-
import { RouterExtensions } from "@nativescript/angular/router";
6+
import { RouterExtensions } from "nativescript-angular/router";
77

88
@Component({
99
selector: "ns-second",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from "@angular/core";
2-
import { ModalDialogParams } from "@nativescript/angular/modal-dialog";
2+
import { ModalDialogParams } from "nativescript-angular/modal-dialog";
33

44
@Component({
55
selector: "ModalViewContent",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnInit } from "@angular/core";
2-
import { RouterExtensions } from "@nativescript/angular/router";
2+
import { RouterExtensions } from "nativescript-angular/router";
33

44
@Component({
55
selector: "ModalView",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, OnInit } from "@angular/core";
22
import { ActivatedRoute } from "@angular/router";
3-
import { RouterExtensions } from "@nativescript/angular/router";
4-
import { ModalDialogParams } from "@nativescript/angular/directives/dialogs";
3+
import { RouterExtensions } from "nativescript-angular/router";
4+
import { ModalDialogParams } from "nativescript-angular/directives/dialogs";
55

66
@Component({
77
moduleId: module.id,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, ViewContainerRef } from "@angular/core";
2-
import { ModalDialogParams, ModalDialogOptions, ModalDialogService } from "@nativescript/angular/directives/dialogs";
3-
import { RouterExtensions, PageRoute } from "@nativescript/angular/router";
2+
import { ModalDialogParams, ModalDialogOptions, ModalDialogService } from "nativescript-angular/directives/dialogs";
3+
import { RouterExtensions, PageRoute } from "nativescript-angular/router";
44
import { ActivatedRoute } from "@angular/router";
55
import { View, ShownModallyData, EventData } from "tns-core-modules/ui/core/view"
66
import { confirm } from "tns-core-modules/ui/dialogs";

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Component, ViewContainerRef } from "@angular/core";
22
import { Router, NavigationEnd } from "@angular/router";
3-
import { NSLocationStrategy } from "@nativescript/angular";
3+
import { NSLocationStrategy } from "nativescript-angular";
44

55
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
66
import { AppModule } from "./app.module";
7-
import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular";
7+
import { ModalDialogOptions, ModalDialogService } from "nativescript-angular";
88
import { ModalViewComponent } from "./modal-shared/modal-view.component";
99

1010
@Component({

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, ViewContainerRef, Input, ViewChild, ElementRef } from "@angular/core";
22
import { Router, NavigationEnd } from "@angular/router";
3-
import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
3+
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
44
import { ModalComponent } from "../modal/modal.component";
55
import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
66
import { confirm } from "tns-core-modules/ui/dialogs";

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, ViewContainerRef } from "@angular/core";
2-
import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
2+
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
33
import { EventData } from "tns-core-modules/data/observable";
44
import { Frame } from "tns-core-modules/ui/frame";
55
import { View } from "tns-core-modules/ui/core/view";
66
import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
7-
import { PageRouterOutlet } from "@nativescript/angular/router/page-router-outlet";
8-
import { RouterExtensions } from "@nativescript/angular/router";
7+
import { PageRouterOutlet } from "nativescript-angular/router/page-router-outlet";
8+
import { RouterExtensions } from "nativescript-angular/router";
99
import { ModalComponent } from "../modal/modal.component";
1010
import { AppModule } from "../app.module";
1111
@Component({

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Component, ViewContainerRef } from "@angular/core";
22
import { Router, NavigationEnd } from "@angular/router";
3-
// import { NSLocationStrategy } from "@nativescript/angular";
3+
// import { NSLocationStrategy } from "nativescript-angular";
44

55
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
66
import { AppModule } from "./app.module";
7-
import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular";
7+
import { ModalDialogOptions, ModalDialogService } from "nativescript-angular";
88
import { ModalViewComponent } from "./modal-shared/modal-view.component";
99

1010
@Component({

‎e2e/modal-navigation-ng/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@angular/platform-browser": "~8.2.0",
2222
"@angular/platform-browser-dynamic": "~8.2.0",
2323
"@angular/router": "~8.2.0",
24-
"@nativescript/angular": "file:../../nativescript-angular",
24+
"nativescript-angular": "file:../../nativescript-angular-package",
2525
"nativescript-theme-core": "~1.0.4",
2626
"reflect-metadata": "~0.1.8",
2727
"rxjs": "^6.4.0",

‎e2e/single-page/app/app-routing.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
2-
import { NativeScriptRouterModule } from "@nativescript/angular/router";
2+
import { NativeScriptRouterModule } from "nativescript-angular/router";
33

44
import { FirstComponent } from "./first/first.component"
55
import { SecondComponent } from "./second/second.component"

‎e2e/single-page/app/app.module.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { NgModule, NgModuleFactoryLoader, NO_ERRORS_SCHEMA } from "@angular/core";
2-
import { NativeScriptModule } from "@nativescript/angular/nativescript.module";
3-
import { NSModuleFactoryLoader } from "@nativescript/angular/router";
2+
import { NativeScriptModule } from "nativescript-angular/nativescript.module";
3+
import { NSModuleFactoryLoader } from "nativescript-angular/router";
4+
import { isNavigationButton } from "nativescript-angular/directives/action-bar";
45

56
import {
67
AppRoutingModule,
@@ -9,7 +10,7 @@ import {
910

1011
import { AppComponent } from "./app.component";
1112

12-
import { routeReuseStrategyTraceCategory, routerTraceCategory } from "@nativescript/angular/trace";
13+
import { routeReuseStrategyTraceCategory, routerTraceCategory } from "nativescript-angular/trace";
1314
import { setCategories, enable } from "tns-core-modules/trace";
1415
import { ModalComponent } from "./second/modal/modal.component";
1516
setCategories(routerTraceCategory + "," + routeReuseStrategyTraceCategory);

‎e2e/single-page/app/main.aot.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { platformNativeScript } from "@nativescript/angular/platform-static";
1+
import { platformNativeScript } from "nativescript-angular/platform-static";
22
import { AppModuleNgFactory } from "./app.module.ngfactory";
33

44
platformNativeScript({ createFrameOnBootstrap: true }).bootstrapModuleFactory(AppModuleNgFactory);

‎e2e/single-page/app/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { platformNativeScriptDynamic } from "@nativescript/angular/platform";
1+
import { platformNativeScriptDynamic } from "nativescript-angular/platform";
22
import { AppModule } from "./app.module";
33

44
platformNativeScriptDynamic({ createFrameOnBootstrap: true }).bootstrapModule(AppModule);

‎e2e/single-page/app/second/modal/modal.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from '@angular/core';
2-
import { ModalDialogParams } from "@nativescript/angular/modal-dialog";
2+
import { ModalDialogParams } from "nativescript-angular/modal-dialog";
33

44
@Component({
55
moduleId: module.id,

‎e2e/single-page/app/second/second.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, OnInit, OnDestroy, ViewContainerRef } from "@angular/core";
22
import { ActivatedRoute, Router, Route } from "@angular/router";
33

4-
import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular";
4+
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular";
55
import { Page } from "tns-core-modules/ui/page";
66
import { Observable } from "rxjs";
77
import { map } from "rxjs/operators";
8-
import { RouterExtensions } from "@nativescript/angular/router";
8+
import { RouterExtensions } from "nativescript-angular/router";
99
import { ModalComponent } from "./modal/modal.component";
1010

1111
@Component({

‎e2e/single-page/tsconfig.json

+3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
}
2424
},
2525
"include": [
26+
"../../nativescript-angular-package",
2627
"../../nativescript-angular",
2728
"**/*"
2829
],
2930
"exclude": [
31+
"../../nativescript-angular-package/node_modules",
32+
"../../nativescript-angular-package/**/*.d.ts",
3033
"../../nativescript-angular/node_modules",
3134
"../../nativescript-angular/**/*.d.ts",
3235
"node_modules",

‎nativescript-angular-package/directives/action-bar.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "@nativescript/angular/directives/action-bar";

‎nativescript-angular-package/modal-dialog.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "@nativescript/angular/modal-dialog"

‎nativescript-angular-package/router/page-router-outlet.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "@nativescript/angular/router/page-router-outlet";

0 commit comments

Comments
 (0)