Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/modal-navigation-ng/app/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ViewContainerRefService } from "../shared/ViewContainerRefService";
import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
import { ModalComponent } from "../modal/modal.component";
import { ModalViewComponent } from "../modal-shared/modal-view.component";
import { confirm } from "ui/dialogs";
import { confirm } from "tns-core-modules/ui/dialogs";

import { AppModule } from "../app.module";

Expand Down
2 changes: 1 addition & 1 deletion e2e/modal-navigation-ng/app/layout.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/dir
import { ModalComponent } from "./modal/modal.component";
import { ModalViewComponent } from "./modal-shared/modal-view.component";
import { ModalRouterComponent } from "./modal/modal-router/modal-router.component";
import { confirm } from "ui/dialogs";
import { confirm } from "tns-core-modules/ui/dialogs";

import { AppModule } from "./app.module";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from "@angular/core";
import { View, ShownModallyData } from "ui/core/view"
import { View, ShownModallyData } from "tns-core-modules/ui/core/view"
import { ModalDialogParams } from "nativescript-angular/directives/dialogs";

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from "@angular/core";
import { View, EventData } from "ui/core/view"
import { View, EventData } from "tns-core-modules/ui/core/view"
import { RouterExtensions } from "nativescript-angular/router";

@Component({
Expand Down
4 changes: 2 additions & 2 deletions e2e/modal-navigation-ng/app/modal/modal.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Component, ViewContainerRef } from "@angular/core";
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 "ui/core/view"
import { confirm } from "ui/dialogs";
import { View, ShownModallyData, EventData } from "tns-core-modules/ui/core/view"
import { confirm } from "tns-core-modules/ui/dialogs";
import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
import { NestedModalComponent } from "../modal-nested/modal-nested.component";

Expand Down
2 changes: 1 addition & 1 deletion e2e/renderer/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { AppComponent } from "./app.component";
import { ItemsService } from "./items.service";

import { rendererTraceCategory, viewUtilCategory, bootstrapCategory } from "nativescript-angular/trace";
import { addCategories, enable, categories } from "trace";
import { addCategories, enable, categories } from "tns-core-modules/trace";
addCategories(bootstrapCategory);
addCategories(rendererTraceCategory);
addCategories(viewUtilCategory);
Expand Down
2 changes: 1 addition & 1 deletion e2e/renderer/app/tab-view/tab-item-binding.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from "@angular/core";
import { isAndroid } from "platform";
import { isAndroid } from "tns-core-modules/platform";

function getIconSource(icon: string): string {
const iconPrefix = isAndroid ? "res://" : "res://tabIcons/";
Expand Down
2 changes: 1 addition & 1 deletion e2e/router/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { AppComponent } from "./app.component";

import { rendererTraceCategory, viewUtilCategory, routeReuseStrategyTraceCategory, routerTraceCategory } from "nativescript-angular/trace";
import { setCategories, enable } from "trace";
import { setCategories, enable } from "tns-core-modules/trace";
setCategories(routerTraceCategory + "," + routeReuseStrategyTraceCategory);
enable();

Expand Down
2 changes: 1 addition & 1 deletion e2e/router/app/first/first.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
import { Location } from "@angular/common";
import { RouterExtensions } from "nativescript-angular/router";

import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";

@Component({
selector: "first",
Expand Down
2 changes: 1 addition & 1 deletion e2e/router/app/lazy/lazy-componentless-route.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
import { Location } from "@angular/common";
import { RouterExtensions } from "nativescript-angular/router";

import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";

@Component({
selector: "lazy",
Expand Down
2 changes: 1 addition & 1 deletion e2e/router/app/lazy/lazy.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
import { Location } from "@angular/common";
import { RouterExtensions } from "nativescript-angular/router";

import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";

@Component({
selector: "lazy",
Expand Down
2 changes: 1 addition & 1 deletion e2e/router/app/second/detail.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit, OnDestroy } from "@angular/core";
import { ActivatedRoute, Router, Route } from "@angular/router";
import { Location } from "@angular/common";
import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";
import { Observable } from "rxjs";
import { map } from "rxjs/operators";

Expand Down
2 changes: 1 addition & 1 deletion e2e/router/app/second/second.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from "@angular/core";
import { ActivatedRoute, Router, Route } from "@angular/router";

import { RouterExtensions } from "nativescript-angular/router";
import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";
import { Observable } from "rxjs";
import { map } from "rxjs/operators";

Expand Down
2 changes: 1 addition & 1 deletion e2e/single-page/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { AppComponent } from "./app.component";

import { rendererTraceCategory, viewUtilCategory, routeReuseStrategyTraceCategory, routerTraceCategory } from "nativescript-angular/trace";
import { setCategories, enable } from "trace";
import { setCategories, enable } from "tns-core-modules/trace";
setCategories(routerTraceCategory + "," + routeReuseStrategyTraceCategory);
enable();

Expand Down
2 changes: 1 addition & 1 deletion e2e/single-page/app/first/first.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy, OnChanges } from "@angular/core";
import { ActivatedRoute, Router, Route } from "@angular/router";
import { Location } from "@angular/common";

import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";
import { Observable } from "rxjs";
import { FrameService } from "nativescript-angular/platform-providers";

Expand Down
2 changes: 1 addition & 1 deletion e2e/single-page/app/second/second.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit, OnDestroy } from "@angular/core";
import { ActivatedRoute, Router, Route } from "@angular/router";

import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";
import { Observable } from "rxjs";
import { map } from "rxjs/operators";
import { RouterExtensions } from "nativescript-angular/router";
Expand Down
6 changes: 3 additions & 3 deletions ng-sample/app/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import {
bootstrapCategory,
} from "nativescript-angular/trace";
import { PAGE_FACTORY, PageFactory, PageFactoryOptions } from "nativescript-angular/platform-providers";
import { Page } from "ui/page";
import { Color } from "color";
import { Page } from "tns-core-modules/ui/page";
import { Color } from "tns-core-modules/color";
import { log } from "tns-core-modules/profiling";

import { setCategories, addCategories, enable, categories } from "trace";
import { setCategories, addCategories, enable, categories } from "tns-core-modules/trace";
addCategories(bootstrapCategory);
// addCategories(rendererTraceCategory);
// addCategories(routerTraceCategory);
Expand Down
2 changes: 1 addition & 1 deletion ng-sample/app/examples/action-bar/action-bar-test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from "@angular/core";
import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";

@Component({
selector: "first",
Expand Down
4 changes: 2 additions & 2 deletions ng-sample/app/examples/list/list-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, Input, WrappedValue, ChangeDetectionStrategy, AfterViewChecked, DoCheck} from "@angular/core";
import {Label} from "ui/label";
import {ObservableArray} from "data/observable-array";
import {Label} from "tns-core-modules/ui/label";
import {ObservableArray} from "tns-core-modules/data/observable-array";

class DataItem {
constructor(public id: number, public name: string) { }
Expand Down
2 changes: 1 addition & 1 deletion ng-sample/app/examples/modal/modal-nested-test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ViewContainerRef } from "@angular/core";
import * as dialogs from "ui/dialogs";
import * as dialogs from "tns-core-modules/ui/dialogs";
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
import { ModalContent } from "./modal-content";
import { ModalTest } from "./modal-test";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ViewContainerRef } from "@angular/core";
import * as dialogs from "ui/dialogs";
import * as dialogs from "tns-core-modules/ui/dialogs";
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
import { FirstComponent, SecondComponent, ThirdComponent, PageRouterOutletAppComponent } from "../router/page-router-outlet-test";

Expand Down
2 changes: 1 addition & 1 deletion ng-sample/app/examples/modal/modal-router-outlet-test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ViewContainerRef } from "@angular/core";
import * as dialogs from "ui/dialogs";
import * as dialogs from "tns-core-modules/ui/dialogs";
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
import { FirstComponent, SecondComponent, RouterOutletAppComponent } from "../router/router-outlet-test";

Expand Down
4 changes: 2 additions & 2 deletions ng-sample/app/examples/renderer-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Directive, Host, ElementRef, Input } from "@angular/core";
import { Observable } from "data/observable";
import { SegmentedBarItem } from "ui/segmented-bar";
import { Observable } from "tns-core-modules/data/observable";
import { SegmentedBarItem } from "tns-core-modules/ui/segmented-bar";

function createTabItem(title: string) {
let item = new SegmentedBarItem();
Expand Down
2 changes: 1 addition & 1 deletion ng-sample/app/examples/router/login-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Injectable } from "@angular/core";
import { CanActivate, Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router";
import { RouterExtensions, PageRoute } from "nativescript-angular/router";
import * as appSettings from "application-settings";
import * as appSettings from "tns-core-modules/application-settings";
import { Observable } from "rxjs";
import { map, switchMap } from "rxjs/operators";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit, OnDestroy } from "@angular/core";
import { ActivatedRoute, Router, Route } from "@angular/router";
import { Location } from "@angular/common";
import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";
import { Observable } from "rxjs";
import { map } from "rxjs/operators";

Expand Down
2 changes: 1 addition & 1 deletion ng-sample/app/examples/router/page-router-outlet-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit, OnDestroy } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { Location } from "@angular/common";
import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";
import { Observable } from "rxjs";
import { map } from "rxjs/operators";

Expand Down
6 changes: 3 additions & 3 deletions ng-sample/app/performance/benchmark.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {StackLayout} from "ui/layouts/stack-layout";
import {Button} from "ui/button";
import {Label} from "ui/label";
import {StackLayout} from "tns-core-modules/ui/layouts/stack-layout";
import {Button} from "tns-core-modules/ui/button";
import {Label} from "tns-core-modules/ui/label";
import {Inject, Component, ApplicationRef} from "@angular/core";
import * as profiling from "./profiling";

Expand Down
2 changes: 1 addition & 1 deletion tests/app/lazy-loaded.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, NgModule } from "@angular/core";
import { NativeScriptCommonModule } from "nativescript-angular/common";
import { NativeScriptRouterModule } from "nativescript-angular/router";
import { ModalDialogParams } from "nativescript-angular/directives/dialogs";
import { Page } from "ui/page";
import { Page } from "tns-core-modules/ui/page";

import { lazyLoadHooksLogProvider } from "./main";
import { SecondComponent } from "./second.component";
Expand Down
12 changes: 6 additions & 6 deletions tests/app/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import { GestureComponent } from "./snippets/gestures.component";
import { LayoutsComponent } from "./snippets/layouts.component";
import { IconFontComponent } from "./snippets/icon-font.component";
import { APP_ROOT_VIEW } from "nativescript-angular/platform-providers";
import { Page } from "ui/page";
import { StackLayout } from "ui/layouts/stack-layout";
import { Page } from "tns-core-modules/ui/page";
import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";

import * as application from "application";
import "ui/styling/style";
import "ui/frame";
import * as application from "tns-core-modules/application";
import "tns-core-modules/ui/styling/style";
import "tns-core-modules/ui/frame";
import { HOOKS_LOG } from "./base.component";
import { MultiPageMain, routes as multiPageRoutes } from "./multi-page-main.component";
import { SinglePageMain, routes as singlePageRoutes } from "./single-page-main.component";
Expand All @@ -35,7 +35,7 @@ import { BehaviorSubject } from "rxjs";

import { GridLayout, ItemSpec } from "tns-core-modules/ui/layouts/grid-layout/grid-layout";

import { enable, addCategories, categories } from "trace";
import { enable, addCategories, categories } from "tns-core-modules/trace";
import { Color } from "tns-core-modules/color/color";

addCategories(rendererTraceCategory);
Expand Down
6 changes: 3 additions & 3 deletions tests/app/tests/modal-dialog.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// make sure you import mocha-config before @angular/core
import { assert } from "./test-config";
import { Component, ViewContainerRef } from "@angular/core";
import { Page } from "ui/page";
import { topmost } from "ui/frame";
import { Page } from "tns-core-modules/ui/page";
import { topmost } from "tns-core-modules/ui/frame";
import { ModalDialogParams, ModalDialogService } from "nativescript-angular/directives/dialogs";

import { device, isIOS } from "platform";
import { device, isIOS } from "tns-core-modules/platform";

import { ComponentFixture, async } from "@angular/core/testing";
import { nsTestBedRender, nsTestBedAfterEach, nsTestBedBeforeEach } from "nativescript-angular/testing";
Expand Down
6 changes: 3 additions & 3 deletions tests/app/tests/ns-location-strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import { assert } from "./test-config";
import { DefaultUrlSerializer, UrlSegmentGroup, UrlTree } from "@angular/router";
import { NSLocationStrategy, LocationState } from "nativescript-angular/router/ns-location-strategy";
import { Frame, BackstackEntry, NavigationEntry } from "ui/frame";
import { Page } from "ui/page";
import { View } from "ui/core/view";
import { Frame, BackstackEntry, NavigationEntry } from "tns-core-modules/ui/frame";
import { Page } from "tns-core-modules/ui/page";
import { View } from "tns-core-modules/ui/core/view";
import { FrameService } from "nativescript-angular/platform-providers";

export class FakeFrameService extends FrameService {
Expand Down
2 changes: 1 addition & 1 deletion tests/app/tests/platform-filter-components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { assert } from "./test-config";
import { Component, ElementRef } from "@angular/core";
import { dumpView, createDevice } from "./test-utils";
import { DEVICE } from "nativescript-angular/platform-providers";
import { platformNames } from "platform";
import { platformNames } from "tns-core-modules/platform";
import { nsTestBedAfterEach, nsTestBedBeforeEach, nsTestBedRender } from "nativescript-angular/testing";

@Component({
Expand Down
6 changes: 3 additions & 3 deletions tests/app/tests/property-sets.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// make sure you import mocha-config before @angular/core
import {assert} from "./test-config";
import {View} from "ui/core/view";
import {View} from "tns-core-modules/ui/core/view";
import {ViewUtil} from "nativescript-angular/view-util";
import {
NgView,
ViewExtensions,
ViewClassMeta,
} from "nativescript-angular/element-registry";
import {Red} from "color/known-colors";
import {device, platformNames} from "platform";
import {Red} from "tns-core-modules/color/known-colors";
import {device, platformNames} from "tns-core-modules/platform";
import {createDevice} from "./test-utils";

class TestView extends View implements NgView {
Expand Down
4 changes: 2 additions & 2 deletions tests/app/tests/renderer-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import { assert } from "./test-config";
import { Component, ComponentRef, ElementRef, NgZone, Renderer2, ViewChild } from "@angular/core";
import { ProxyViewContainer } from "ui/proxy-view-container";
import { Red } from "color/known-colors";
import { ProxyViewContainer } from "tns-core-modules/ui/proxy-view-container";
import { Red } from "tns-core-modules/color/known-colors";
import { dumpView } from "./test-utils";
import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";
import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
Expand Down
6 changes: 3 additions & 3 deletions tests/app/tests/style-properties.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// make sure you import mocha-config before @angular/core
import { assert } from "./test-config";
import { TextField } from "ui/text-field";
import { Red, Lime } from "color/known-colors";
import { TextField } from "tns-core-modules/ui/text-field";
import { Red, Lime } from "tns-core-modules/color/known-colors";
import { NativeScriptRendererFactory, NativeScriptRenderer } from "nativescript-angular/renderer";
import { device } from "platform";
import { device } from "tns-core-modules/platform";
import { ViewEncapsulation, RendererType2, Renderer2 } from "@angular/core";
import { NgView } from "nativescript-angular/view-util";
import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
Expand Down
6 changes: 3 additions & 3 deletions tests/app/tests/test-utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { View } from "ui/core/view";
import { TextBase } from "ui/text-base";
import { Device } from "platform";
import { View } from "tns-core-modules/ui/core/view";
import { TextBase } from "tns-core-modules/ui/text-base";
import { Device } from "tns-core-modules/platform";

function getChildren(view: View): Array<View> {
let children: Array<View> = [];
Expand Down
2 changes: 1 addition & 1 deletion tests/app/tests/third-party-view.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ContentView} from "ui/content-view";
import {ContentView} from "tns-core-modules/ui/content-view";

// >> third-party-simple-view
export class SimpleTag extends ContentView {
Expand Down
4 changes: 2 additions & 2 deletions tests/app/tests/third-party.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// make sure you import mocha-config before @angular/core
import {assert} from "./test-config";
import {Component, ComponentRef, Directive, TemplateRef, ViewContainerRef} from "@angular/core";
import {View} from "ui/core/view";
import {Label} from "ui/label";
import {View} from "tns-core-modules/ui/core/view";
import {Label} from "tns-core-modules/ui/label";
import {nsTestBedAfterEach, nsTestBedBeforeEach, nsTestBedRender} from "nativescript-angular/testing";
// >> third-party-simple-view-registration
import {registerElement} from "nativescript-angular/element-registry";
Expand Down
14 changes: 7 additions & 7 deletions tests/app/tests/value-accessor-tests.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// make sure you import mocha-config before @angular/core
import { assert } from "./test-config";
import { View } from "ui/core/view";
import { Slider } from "ui/slider";
import { Switch } from "ui/switch";
import { DatePicker } from "ui/date-picker";
import { TimePicker } from "ui/time-picker";
import { ListPicker } from "ui/list-picker";
import { TextField } from "ui/text-field";
import { View } from "tns-core-modules/ui/core/view";
import { Slider } from "tns-core-modules/ui/slider";
import { Switch } from "tns-core-modules/ui/switch";
import { DatePicker } from "tns-core-modules/ui/date-picker";
import { TimePicker } from "tns-core-modules/ui/time-picker";
import { ListPicker } from "tns-core-modules/ui/list-picker";
import { TextField } from "tns-core-modules/ui/text-field";
import {
NumberValueAccessor,
CheckedValueAccessor,
Expand Down