diff --git a/app/app.module.ts b/app/app.module.ts index c0e579de..db0d77fa 100644 --- a/app/app.module.ts +++ b/app/app.module.ts @@ -1,17 +1,19 @@ // this import should be first in order to load some required settings (like globals and reflect-metadata) // >> ngmodule-config // >> (hide) -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; +import { + NativeScriptModule, + NativeScriptRouterModule, + NativeScriptFormsModule, + NSModuleFactoryLoader, + ModalDialogService, + registerElement +} from "nativescript-angular"; import { NgModule, NO_ERRORS_SCHEMA, NgModuleFactoryLoader } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; import { routes } from "./app.routes"; import { AppComponent } from "./app.component"; // << (hide) -import { NsModuleFactoryLoader } from "./ns-module-factory-loader"; -import { ModalDialogService } from "nativescript-angular/modal-dialog"; -import { registerElement } from "nativescript-angular/element-registry"; import { TnsGoogleMaps } from "nativescript-googlemaps"; import { isIOS } from "platform"; @@ -31,7 +33,7 @@ declare var GMSServices: any; ], providers: [ ModalDialogService, - { provide: NgModuleFactoryLoader, useClass: NsModuleFactoryLoader } + { provide: NgModuleFactoryLoader, useClass: NSModuleFactoryLoader } ] }) // << ngmodule-config diff --git a/app/application-settings/application-settings-examples.module.ts b/app/application-settings/application-settings-examples.module.ts index 10c69df7..6f3912f6 100644 --- a/app/application-settings/application-settings-examples.module.ts +++ b/app/application-settings/application-settings-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ApplicationSettingsExamplesComponent } from "./application-settings-examples.component"; import { ValuesExampleComponent } from "./values/values.component"; import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module"; diff --git a/app/application/application-examples.module.ts b/app/application/application-examples.module.ts index a3fa0470..97e6c371 100644 --- a/app/application/application-examples.module.ts +++ b/app/application/application-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ApplicationExamplesComponent } from "./application-examples.component"; import { AppCheckingTargetExampleComponent } from "./app-checking-target/app-checking-target.component"; import { AppUsingAndroidExampleComponent } from "./app-using-android-specifics/app-using-android-specifics.component"; diff --git a/app/camera/camera-examples.module.ts b/app/camera/camera-examples.module.ts index e4530d49..19378be1 100644 --- a/app/camera/camera-examples.module.ts +++ b/app/camera/camera-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { CameraExamplesComponent } from "./camera-examples.component"; import { UsingCameraExampleComponent } from "./using-camera/using-camera.component"; import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module"; diff --git a/app/color/color-examples.module.ts b/app/color/color-examples.module.ts index 93797fb8..e0f60a11 100644 --- a/app/color/color-examples.module.ts +++ b/app/color/color-examples.module.ts @@ -1,7 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { ColorExamplesComponent } from "./color-examples.component"; import { CreatingColorsExampleComponent } from "./creating-colors/creating-colors.component"; import { HexPipe } from "./creating-colors/creating-colors.component"; diff --git a/app/common-screens-category/content-screens/content-screens-examples.module.ts b/app/common-screens-category/content-screens/content-screens-examples.module.ts index 069e3b75..ee00e673 100644 --- a/app/common-screens-category/content-screens/content-screens-examples.module.ts +++ b/app/common-screens-category/content-screens/content-screens-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ContentScreensExamplesComponent } from "./content-screens-examples.component"; import { ContentScrollablePageExampleComponent } from "./content-scrollable/content-scrollable-example.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/common-screens-category/dataentry/extended-dataentry-examples.module.ts b/app/common-screens-category/dataentry/extended-dataentry-examples.module.ts index 444f3069..78a163b4 100644 --- a/app/common-screens-category/dataentry/extended-dataentry-examples.module.ts +++ b/app/common-screens-category/dataentry/extended-dataentry-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ExtendedDataEntryExamplesComponent } from "./extended-dataentry-examples.component"; import { SignupDataEntryExampleComponent } from "./dataentry-signup/dataentry-signup.component"; import { SocialLoginDataEntryExampleComponent } from "./dataentry-sociallogin/dataentry-sociallogin.component"; diff --git a/app/common-screens-category/lists-category/extended-listview-examples.module.ts b/app/common-screens-category/lists-category/extended-listview-examples.module.ts index ce9d79fc..06d8caba 100644 --- a/app/common-screens-category/lists-category/extended-listview-examples.module.ts +++ b/app/common-screens-category/lists-category/extended-listview-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ExtendedListViewExamplesComponent } from "./extended-listview-examples.component"; import { CardsListViewExampleComponent } from "./cards/cards-listview.component"; import { HeaderWithMapExampleComponent } from "./header-with-map/header-with-map.component"; diff --git a/app/common-screens-category/lists-category/multi-line-big/multi-line-big.component.ts b/app/common-screens-category/lists-category/multi-line-big/multi-line-big.component.ts index 6cc9255d..64a938eb 100644 --- a/app/common-screens-category/lists-category/multi-line-big/multi-line-big.component.ts +++ b/app/common-screens-category/lists-category/multi-line-big/multi-line-big.component.ts @@ -1,7 +1,7 @@ // >> multi-line-big-code import { Component, ChangeDetectionStrategy, OnInit, Input } from "@angular/core"; import { ItemEventData } from "ui/list-view"; -import { SetupItemViewArgs } from "nativescript-angular/directives"; +import { SetupItemViewArgs } from "nativescript-angular"; import { mockedDataArray, mockedGroupDataArray, Country } from "../mock-dataItems"; @Component({ diff --git a/app/common-screens-category/lists-category/multi-line/multi-line.component.ts b/app/common-screens-category/lists-category/multi-line/multi-line.component.ts index 4a48ed40..a132a1bc 100644 --- a/app/common-screens-category/lists-category/multi-line/multi-line.component.ts +++ b/app/common-screens-category/lists-category/multi-line/multi-line.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, OnInit, Input } from "@angular/core"; import { ItemEventData } from "ui/list-view"; -import { SetupItemViewArgs } from "nativescript-angular/directives"; +import { SetupItemViewArgs } from "nativescript-angular"; import { mockedDataArray, Country } from "../mock-dataItems"; // >> multiline-listview-code diff --git a/app/common-screens-category/userprofile/extended-userprofile-examples.module.ts b/app/common-screens-category/userprofile/extended-userprofile-examples.module.ts index 668c687d..913a5ddc 100644 --- a/app/common-screens-category/userprofile/extended-userprofile-examples.module.ts +++ b/app/common-screens-category/userprofile/extended-userprofile-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ExtendedUserProfileExamplesComponent } from "./extended-userprofile-examples.component"; import { UserFeedExampleComponent } from "./user-feed/user-feed.component"; import { UserFeedImagesExampleComponent } from "./user-feed-images/user-feed-images.component"; diff --git a/app/connectivity/connectivity-examples.module.ts b/app/connectivity/connectivity-examples.module.ts index f61988b2..08152475 100644 --- a/app/connectivity/connectivity-examples.module.ts +++ b/app/connectivity/connectivity-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ConnectivityExamplesComponent } from "./connectivity-examples.component"; import { UsingConnectivityExampleComponent } from "./using-connectivity/using-connectivity.component"; import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module"; diff --git a/app/directives/toggle-nav-button.directive.ts b/app/directives/toggle-nav-button.directive.ts index b58e05ef..021dc517 100644 --- a/app/directives/toggle-nav-button.directive.ts +++ b/app/directives/toggle-nav-button.directive.ts @@ -3,7 +3,7 @@ import { Directive, OnInit } from "@angular/core"; import { EventData } from "data/observable"; import { NavigationButton } from "ui/action-bar"; import { Page } from "ui/page"; -import { RouterExtensions } from "nativescript-angular/router"; +import { RouterExtensions } from "nativescript-angular"; import * as app from "application"; @Directive({ diff --git a/app/examples-list.module.ts b/app/examples-list.module.ts index 95468506..cf1acbcf 100644 --- a/app/examples-list.module.ts +++ b/app/examples-list.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ExamplesListComponent } from "./examples-list.component"; import { TitleAndNavButtonModule } from "./directives/title-and-nav-button.module"; diff --git a/app/fetch/fetch-examples.module.ts b/app/fetch/fetch-examples.module.ts index 03e4c58e..b3e6771c 100644 --- a/app/fetch/fetch-examples.module.ts +++ b/app/fetch/fetch-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { FetchExamplesComponent } from "./fetch-examples.component"; import { FetchGetExampleComponent } from "./fetch-get/fetch-get.component"; import { FetchPostExampleComponent } from "./fetch-post/fetch-post.component"; diff --git a/app/file-system/file-system-examples.module.ts b/app/file-system/file-system-examples.module.ts index f2d2828a..491f3288 100644 --- a/app/file-system/file-system-examples.module.ts +++ b/app/file-system/file-system-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { FileSystemExamplesComponent } from "./file-system-examples.component"; import { CreateExampleComponent } from "./create/create.component"; import { DeleteExampleComponent } from "./delete/delete.component"; diff --git a/app/fps-meter/fps-meter-examples.module.ts b/app/fps-meter/fps-meter-examples.module.ts index 5f1becfd..fc0d55da 100644 --- a/app/fps-meter/fps-meter-examples.module.ts +++ b/app/fps-meter/fps-meter-examples.module.ts @@ -1,7 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { FpsExamplesComponent } from "./fps-meter-examples.component"; diff --git a/app/http/http-examples.module.ts b/app/http/http-examples.module.ts index f96bea7e..253bf0bc 100644 --- a/app/http/http-examples.module.ts +++ b/app/http/http-examples.module.ts @@ -1,7 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { HttpExamplesComponent } from "./http-examples.component"; diff --git a/app/location/location-examples.module.ts b/app/location/location-examples.module.ts index 6c05c602..7a360f53 100644 --- a/app/location/location-examples.module.ts +++ b/app/location/location-examples.module.ts @@ -1,11 +1,9 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { LocationExamplesComponent } from "./location-examples.component"; import { BasicLocationExampleComponent } from "./basic-location-example/basic-location-example"; import { LocationMonitoringExampleComponent } from "./location-monitoring-example/location-monitoring-example"; import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; export const routerConfig = [ { diff --git a/app/main.aot.ts b/app/main.aot.ts index 98bf134f..0426ca89 100644 --- a/app/main.aot.ts +++ b/app/main.aot.ts @@ -1,4 +1,4 @@ -import { platformNativeScript } from "nativescript-angular/platform-static"; +import { platformNativeScript } from "nativescript-angular"; import { AppModuleNgFactory } from "./app.module.ngfactory"; platformNativeScript().bootstrapModuleFactory(AppModuleNgFactory); diff --git a/app/main.ts b/app/main.ts index 639bfd51..c7f43bc8 100644 --- a/app/main.ts +++ b/app/main.ts @@ -1,4 +1,4 @@ -import { platformNativeScriptDynamic } from "nativescript-angular/platform"; +import { platformNativeScriptDynamic } from "nativescript-angular"; import { AppModule } from "./app.module"; platformNativeScriptDynamic().bootstrapModule(AppModule); diff --git a/app/modal-page/modal-page-examples.module.ts b/app/modal-page/modal-page-examples.module.ts index 464d6322..d5be702e 100644 --- a/app/modal-page/modal-page-examples.module.ts +++ b/app/modal-page/modal-page-examples.module.ts @@ -1,7 +1,6 @@ // tslint:disable:max-line-length import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ModalPageExamplesComponent } from "./modal-page-examples.component"; import { SampleModalPageModuleExampleComponent } from "./sample-modal-page-module-example/sample-modal-page-module-example"; import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module"; diff --git a/app/modal-page/sample-modal-page-module-example/modal-view.ts b/app/modal-page/sample-modal-page-module-example/modal-view.ts index bbf6dc75..2c0145e3 100644 --- a/app/modal-page/sample-modal-page-module-example/modal-view.ts +++ b/app/modal-page/sample-modal-page-module-example/modal-view.ts @@ -1,5 +1,5 @@ import { Component, OnInit, NgModule } from "@angular/core"; -import { ModalDialogParams } from "nativescript-angular/modal-dialog"; +import { ModalDialogParams } from "nativescript-angular"; import { DatePicker } from "ui/date-picker"; import { Page } from "ui/page"; diff --git a/app/modal-page/sample-modal-page-module-example/sample-modal-page-module-example.ts b/app/modal-page/sample-modal-page-module-example/sample-modal-page-module-example.ts index 4c25a380..164d8b9b 100644 --- a/app/modal-page/sample-modal-page-module-example/sample-modal-page-module-example.ts +++ b/app/modal-page/sample-modal-page-module-example/sample-modal-page-module-example.ts @@ -1,5 +1,5 @@ // >> time-picker-configure-code -import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/modal-dialog"; +import { ModalDialogService, ModalDialogOptions } from "nativescript-angular"; import { Component, ViewContainerRef } from "@angular/core"; import { DatePicker } from "ui/date-picker"; import { ModalViewComponent } from "./modal-view"; diff --git a/app/ns-module-factory-loader.ts b/app/ns-module-factory-loader.ts deleted file mode 100644 index 17fa0d97..00000000 --- a/app/ns-module-factory-loader.ts +++ /dev/null @@ -1,82 +0,0 @@ -import { - Injectable, - Compiler, - NgModuleFactory, - NgModuleFactoryLoader -} from "@angular/core"; - -import { path, knownFolders } from "file-system"; - -declare var System: any; -const SEPARATOR = "#"; -const FACTORY_CLASS_SUFFIX = "NgFactory"; -const FACTORY_PATH_SUFFIX = ".ngfactory"; - -@Injectable() -export class NsModuleFactoryLoader implements NgModuleFactoryLoader { - private offlineMode: boolean; - - constructor(private compiler: Compiler) { - this.offlineMode = compiler instanceof Compiler; - } - - load(path: string): Promise> { - let {modulePath, exportName} = this.splitPath(path); - - if (this.offlineMode) { - return this.loadFactory(modulePath, exportName); - } else { - return this.loadAndCompile(modulePath, exportName); - } - } - - private loadFactory(modulePath: string, exportName: string): Promise> { - modulePath = factoryModulePath(modulePath); - exportName = factoryExportName(exportName); - - return System.import(modulePath) - .then((module: any) => module[exportName]) - .then((factory: any) => checkNotEmpty(factory, modulePath, exportName)); - } - - private loadAndCompile(modulePath: string, exportName: string): Promise> { - modulePath = getAbsolutePath(modulePath); - - let loadedModule = require(modulePath)[exportName]; - checkNotEmpty(loadedModule, modulePath, exportName); - - return Promise.resolve(this.compiler.compileModuleAsync(loadedModule)); - } - - private splitPath(path: string): {modulePath: string, exportName: string} { - let [modulePath, exportName] = path.split(SEPARATOR); - - if (typeof exportName === "undefined") { - exportName = "default"; - } - - return {modulePath, exportName}; - } -} - -function getAbsolutePath(relativePath: string) { - return path.normalize(path.join(knownFolders.currentApp().path, relativePath)); -} - -function factoryModulePath(modulePath) { - return `${modulePath}${FACTORY_PATH_SUFFIX}`; -} - -function factoryExportName(exportName) { - return exportName === "default" ? - exportName : - `${exportName}${FACTORY_CLASS_SUFFIX}`; -} - -function checkNotEmpty(value: any, modulePath: string, exportName: string): any { - if (!value) { - throw new Error(`Cannot find '${exportName}' in '${modulePath}'`); - } - - return value; -} diff --git a/app/platform/platform-examples.module.ts b/app/platform/platform-examples.module.ts index a5151657..fb36083e 100644 --- a/app/platform/platform-examples.module.ts +++ b/app/platform/platform-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { PlatformExamplesComponent } from "./platform-examples.component"; import { PlatformModuleExampleComponent } from "./platform-module-example/platform-module-example"; import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module"; diff --git a/app/timer/timer-examples.module.ts b/app/timer/timer-examples.module.ts index fd46b128..a3d2becb 100644 --- a/app/timer/timer-examples.module.ts +++ b/app/timer/timer-examples.module.ts @@ -1,7 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { TimerExamplesComponent } from "./timer-examples.component"; import { SetIntervalComponent } from "./set-interval/setinterval-example"; diff --git a/app/trace/trace-examples.module.ts b/app/trace/trace-examples.module.ts index 4c2c22f6..64b7b14d 100644 --- a/app/trace/trace-examples.module.ts +++ b/app/trace/trace-examples.module.ts @@ -1,12 +1,9 @@ -// tslint:disable:max-line-length import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { TraceExamplesComponent } from "./trace-examples.component"; import { CustomTraceWriterExampleComponent } from "./custom-trace-writer/custom-tracewriter-example.component"; -import { TraceSpecificCategoriesExampleComponent } from "./trace-specific-categories/trace-specific-categories-example.component"; +import { TraceSpecificCategoriesExampleComponent } from "./trace-specific-categories/trace-specific-categories-example.component"; // tslint:disable-line:max-line-length import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module"; export const routerConfig = [ diff --git a/app/ui-category/action-bar/action-bar-examples.module.ts b/app/ui-category/action-bar/action-bar-examples.module.ts index 200550bf..b2a340a0 100644 --- a/app/ui-category/action-bar/action-bar-examples.module.ts +++ b/app/ui-category/action-bar/action-bar-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ActionBarExamplesComponent } from "./action-bar-examples.component"; import { ActionItemsComponent } from "./action-items/action-items.component"; import { NavigationButtonComponent } from "./navigation-button/navigation-button.component"; diff --git a/app/ui-category/action-bar/action-items/action-items.component.ts b/app/ui-category/action-bar/action-items/action-items.component.ts index f2de7c94..69365809 100644 --- a/app/ui-category/action-bar/action-items/action-items.component.ts +++ b/app/ui-category/action-bar/action-items/action-items.component.ts @@ -1,5 +1,5 @@ import { Component } from "@angular/core"; -import { RouterExtensions } from "nativescript-angular/router"; +import { RouterExtensions } from "nativescript-angular"; @Component({ moduleId: module.id, diff --git a/app/ui-category/action-bar/navigation-button/navigation-button.component.ts b/app/ui-category/action-bar/navigation-button/navigation-button.component.ts index 8c2967bf..2b2a54ca 100644 --- a/app/ui-category/action-bar/navigation-button/navigation-button.component.ts +++ b/app/ui-category/action-bar/navigation-button/navigation-button.component.ts @@ -1,5 +1,5 @@ import { Component } from "@angular/core"; -import { RouterExtensions } from "nativescript-angular/router"; +import { RouterExtensions } from "nativescript-angular"; @Component({ moduleId: module.id, diff --git a/app/ui-category/action-bar/title/title.component.ts b/app/ui-category/action-bar/title/title.component.ts index 217f5665..8d332120 100644 --- a/app/ui-category/action-bar/title/title.component.ts +++ b/app/ui-category/action-bar/title/title.component.ts @@ -1,5 +1,5 @@ import { Component } from "@angular/core"; -import { RouterExtensions } from "nativescript-angular/router"; +import { RouterExtensions } from "nativescript-angular"; @Component({ moduleId: module.id, diff --git a/app/ui-category/activity-indicator/activity-indicator-examples.module.ts b/app/ui-category/activity-indicator/activity-indicator-examples.module.ts index 00ece992..a7279552 100644 --- a/app/ui-category/activity-indicator/activity-indicator-examples.module.ts +++ b/app/ui-category/activity-indicator/activity-indicator-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ActivityIndicatorExamplesComponent } from "./activity-indicator-examples.component"; import { SettingBusyComponent } from "./setting-busy/setting-busy.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/ui-category/animations/animations-examples.module.ts b/app/ui-category/animations/animations-examples.module.ts index 96882626..a5bb269d 100644 --- a/app/ui-category/animations/animations-examples.module.ts +++ b/app/ui-category/animations/animations-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { AnimationsExamplesComponent } from "./animations-examples.component"; import { AnimatingPropertiesComponent } from "./animating-properties/animating-properties.component"; import { ChainingAnimationsComponent } from "./chaining-animations/chaining-animations.component"; diff --git a/app/ui-category/button/button-examples.module.ts b/app/ui-category/button/button-examples.module.ts index 9cab9dc5..58314a75 100644 --- a/app/ui-category/button/button-examples.module.ts +++ b/app/ui-category/button/button-examples.module.ts @@ -1,11 +1,9 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { ButtonExamplesComponent } from "./button-examples.component"; import { ButtonBindingTextComponent } from "./binding-text/binding-text.component"; import { ButtonTapEventComponent } from "./tap-event/tap-event.component"; import { ButtonTextComponent } from "./text/text.component"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; export const routerConfig = [ diff --git a/app/ui-category/date-picker/date-picker-examples.module.ts b/app/ui-category/date-picker/date-picker-examples.module.ts index c9a1b05f..b4ff63ff 100644 --- a/app/ui-category/date-picker/date-picker-examples.module.ts +++ b/app/ui-category/date-picker/date-picker-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { DatePickerExamplesComponent } from "./date-picker-examples.component"; import { ConfigureDatePickerComponent } from "./configure-date-picker/configure-date-picker.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/ui-category/dialogs/dialogs-examples.module.ts b/app/ui-category/dialogs/dialogs-examples.module.ts index 2981b172..50168d6c 100644 --- a/app/ui-category/dialogs/dialogs-examples.module.ts +++ b/app/ui-category/dialogs/dialogs-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { DialogsExamplesComponent } from "./dialogs-examples.component"; import { ActionDialogComponent } from "./action-dialog/action-dialog.component"; import { AlertDialogComponent } from "./alert-dialog/alert-dialog.component"; diff --git a/app/ui-category/formatted-string/formated-string-examples.module.ts b/app/ui-category/formatted-string/formated-string-examples.module.ts index 00e75cfe..9368639f 100644 --- a/app/ui-category/formatted-string/formated-string-examples.module.ts +++ b/app/ui-category/formatted-string/formated-string-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { FormattedStringExamplesComponent } from "./formated-string-examples.component"; import { CreateFormattedStringComponent } from "./create-formatted-string/create-formatted-string.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/ui-category/gestures/gestures-examples.module.ts b/app/ui-category/gestures/gestures-examples.module.ts index 2c36db3e..4f454304 100644 --- a/app/ui-category/gestures/gestures-examples.module.ts +++ b/app/ui-category/gestures/gestures-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { GesturesExamplesComponent } from "./gestures-examples.component"; import { DoubleTapExampleComponent } from "./double-tap/double-tap.component"; import { LongPressExampleComponent } from "./long-press/long-press.component"; diff --git a/app/ui-category/htmlview/htmlview-examples.module.ts b/app/ui-category/htmlview/htmlview-examples.module.ts index 15611a0a..4a3c507a 100644 --- a/app/ui-category/htmlview/htmlview-examples.module.ts +++ b/app/ui-category/htmlview/htmlview-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { HtmlViewExamplesComponent } from "./htmlview-examples.component"; import { CreatingHtmlViewExampleComponent } from "./creating-htmlview/creating-htmlview.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/ui-category/image/image-examples.module.ts b/app/ui-category/image/image-examples.module.ts index d1b7f2e3..782d6133 100644 --- a/app/ui-category/image/image-examples.module.ts +++ b/app/ui-category/image/image-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ImageExamplesComponent } from "./image-examples.component"; import { CreatingImageExampleComponent } from "./creating-image/creating-image.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/ui-category/label/label-examples.module.ts b/app/ui-category/label/label-examples.module.ts index c1574519..04903d32 100644 --- a/app/ui-category/label/label-examples.module.ts +++ b/app/ui-category/label/label-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { LabelExamplesComponent } from "./label-examples.component"; import { CreatingLabelComponent } from "./creating-label/creating-label.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/ui-category/layouts/layouts-examples.module.ts b/app/ui-category/layouts/layouts-examples.module.ts index 81ebda5a..f7ecb8a1 100644 --- a/app/ui-category/layouts/layouts-examples.module.ts +++ b/app/ui-category/layouts/layouts-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { LayoutsExamplesComponent } from "./layouts-examples.component"; import { AbsoluteLayoutComponent } from "./absolute-layout/absolute-layout.component"; import { DockLayoutComponent } from "./dock-layout/dock-layout.component"; diff --git a/app/ui-category/listpicker/listpicker-examples.module.ts b/app/ui-category/listpicker/listpicker-examples.module.ts index 611b74a3..ed8a926d 100644 --- a/app/ui-category/listpicker/listpicker-examples.module.ts +++ b/app/ui-category/listpicker/listpicker-examples.module.ts @@ -1,7 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { ListPickerExamplesComponent } from "./listpicker-examples.component"; import { CreatingListPickerComponent } from "./creating-listpicker/creating-listpicker.component"; import { UsingSelectedIndexExampleComponent } from "./using-selected-index/using-selected-index.component"; diff --git a/app/ui-category/listview/customizing-listview/customizing-listview.component.ts b/app/ui-category/listview/customizing-listview/customizing-listview.component.ts index aded52bb..1db461e9 100644 --- a/app/ui-category/listview/customizing-listview/customizing-listview.component.ts +++ b/app/ui-category/listview/customizing-listview/customizing-listview.component.ts @@ -1,6 +1,6 @@ // >> listview-customize-code import { Component, ChangeDetectionStrategy, ElementRef } from "@angular/core"; -import { SetupItemViewArgs } from "nativescript-angular/directives"; +import { SetupItemViewArgs } from "nativescript-angular"; class Item { constructor(public name: string) { } diff --git a/app/ui-category/listview/listview-examples.module.ts b/app/ui-category/listview/listview-examples.module.ts index 531de18c..acf61b78 100644 --- a/app/ui-category/listview/listview-examples.module.ts +++ b/app/ui-category/listview/listview-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ListViewExamplesComponent } from "./listview-examples.component"; import { CreatingListViewComponent } from "./creating-listview/creating-listview.component"; import { CustomizingListViewComponent } from "./customizing-listview/customizing-listview.component"; diff --git a/app/ui-category/ng-directives/create-custom-directive/create-custom-directive.component.ts b/app/ui-category/ng-directives/create-custom-directive/create-custom-directive.component.ts index bc7f4e3f..03014826 100644 --- a/app/ui-category/ng-directives/create-custom-directive/create-custom-directive.component.ts +++ b/app/ui-category/ng-directives/create-custom-directive/create-custom-directive.component.ts @@ -1,7 +1,7 @@ // >> custom-directive-code import { Component, Directive, ViewContainerRef, TemplateRef, Inject } from "@angular/core"; import { Device, platformNames } from "platform"; -import { DEVICE } from "nativescript-angular/platform-providers"; +import { DEVICE } from "nativescript-angular"; @Directive({ selector: "[sdkIfAndroid]" }) export class IfAndroidDirective { diff --git a/app/ui-category/ng-directives/ng-directives-examples.module.ts b/app/ui-category/ng-directives/ng-directives-examples.module.ts index 3153fcc6..1e1b8e66 100644 --- a/app/ui-category/ng-directives/ng-directives-examples.module.ts +++ b/app/ui-category/ng-directives/ng-directives-examples.module.ts @@ -1,7 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { NgDirectivesExamplesComponent } from "./ng-directives-examples.component"; import { CreateCustomDirectiveExampleComponent, diff --git a/app/ui-category/progress/progress-examples.module.ts b/app/ui-category/progress/progress-examples.module.ts index 0898d00b..4fccc818 100644 --- a/app/ui-category/progress/progress-examples.module.ts +++ b/app/ui-category/progress/progress-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ProgressExamplesComponent } from "./progress-examples.component"; import { CreatingProgressComponent } from "./creating-progress/creating-progress.component"; import { SettingProgressComponent } from "./setting-progress/setting-progress.component"; diff --git a/app/ui-category/scroll-view/scroll-view-examples.module.ts b/app/ui-category/scroll-view/scroll-view-examples.module.ts index fbe42d34..cd5a6ca1 100644 --- a/app/ui-category/scroll-view/scroll-view-examples.module.ts +++ b/app/ui-category/scroll-view/scroll-view-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { ScrollViewExamplesComponent } from "./scroll-view-examples.component"; import { ScrollViewHorizontalComponent } from "./horizontal/scroll-view-horizontal.component"; import { ScrollViewVerticalComponent } from "./vertical/scroll-view-vertical.component"; diff --git a/app/ui-category/search-bar/search-bar-examples.module.ts b/app/ui-category/search-bar/search-bar-examples.module.ts index f0eab930..faf4163b 100644 --- a/app/ui-category/search-bar/search-bar-examples.module.ts +++ b/app/ui-category/search-bar/search-bar-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { SearchBarExamplesComponent } from "./search-bar-examples.component"; import { BasicSearchBarComponent } from "./basic-search-bar/basic-search-bar.component"; import { ClearSearchBarComponent } from "./clear-search-bar/clear-search-bar.component"; diff --git a/app/ui-category/segmented-bar/segmented-bar-examples.module.ts b/app/ui-category/segmented-bar/segmented-bar-examples.module.ts index b5e643c1..ea114b0b 100644 --- a/app/ui-category/segmented-bar/segmented-bar-examples.module.ts +++ b/app/ui-category/segmented-bar/segmented-bar-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { SegmentedBarExamplesComponent } from "./segmented-bar-examples.component"; import { BasicSegmentedBarComponent } from "./basic-segmented-bar/basic-segmented-bar.component"; import { SegmentedBarViewsComponent } from "./segmented-bar-views/segmented-bar-views.component"; diff --git a/app/ui-category/slider/slider-examples.module.ts b/app/ui-category/slider/slider-examples.module.ts index 23223f06..26c084ae 100644 --- a/app/ui-category/slider/slider-examples.module.ts +++ b/app/ui-category/slider/slider-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { SliderExamplesComponent } from "./slider-examples.component"; import { BasicSliderComponent } from "./basic-slider/basic-slider.component"; import { SliderAccessValueComponent } from "./slider-access-value-code/slider-access-value.component"; diff --git a/app/ui-category/style/style-examples.module.ts b/app/ui-category/style/style-examples.module.ts index a07bf60b..02ea9c74 100644 --- a/app/ui-category/style/style-examples.module.ts +++ b/app/ui-category/style/style-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { StyleExamplesComponent } from "./style-examples.component"; import { ApplyStyleCodeComponent } from "./apply-style-via-code/apply-style-code.component"; import { StyleCSSFileComponent } from "./style-css-file/style-css-file.component"; diff --git a/app/ui-category/switch/switch-examples.module.ts b/app/ui-category/switch/switch-examples.module.ts index 7502cfef..b0998f5c 100644 --- a/app/ui-category/switch/switch-examples.module.ts +++ b/app/ui-category/switch/switch-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { SwitchExamplesComponent } from "./switch-examples.component"; import { BasicSwitchComponent } from "./basic-switch/basic-switch.component"; import { DisableSwitchComponent } from "./disable-switch/disable-switch.component"; diff --git a/app/ui-category/tab-view/tab-view-examples.module.ts b/app/ui-category/tab-view/tab-view-examples.module.ts index e58558e0..3c6cca4f 100644 --- a/app/ui-category/tab-view/tab-view-examples.module.ts +++ b/app/ui-category/tab-view/tab-view-examples.module.ts @@ -1,11 +1,10 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular"; import { TabViewExamplesComponent } from "./tab-view-examples.component"; import { BasicTabViewComponent } from "./basic-tab-view/basic-tab-view.component"; import { TabViewItemsComponent } from "./tab-view-items/tab-view-items.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; + export const routerConfig = [ { path: "", diff --git a/app/ui-category/text-field/text-field-examples.module.ts b/app/ui-category/text-field/text-field-examples.module.ts index e270329b..0a6f98a1 100644 --- a/app/ui-category/text-field/text-field-examples.module.ts +++ b/app/ui-category/text-field/text-field-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { TextFieldExamplesComponent } from "./text-field-examples.component"; import { BasicTextFieldComponent } from "./basic-text-field/basic-text-field.component"; import { TextFieldBindingComponent } from "./text-field-binding/text-field-binding.component"; diff --git a/app/ui-category/text-view/text-view-examples.module.ts b/app/ui-category/text-view/text-view-examples.module.ts index d7ba684d..3db70d95 100644 --- a/app/ui-category/text-view/text-view-examples.module.ts +++ b/app/ui-category/text-view/text-view-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { TextViewExamplesComponent } from "./text-view-examples.component"; import { BasicTextViewComponent } from "./basic-text-view/basic-text-view.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/ui-category/time-picker/time-picker-examples.module.ts b/app/ui-category/time-picker/time-picker-examples.module.ts index 856e9d0e..785a48b2 100644 --- a/app/ui-category/time-picker/time-picker-examples.module.ts +++ b/app/ui-category/time-picker/time-picker-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { TimePickerExamplesComponent } from "./time-picker-examples.component"; import { ConfigureTimePickerComponent } from "./configure-time-picker/configure-time-picker.component"; import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module"; diff --git a/app/ui-category/web-view/web-view-examples.module.ts b/app/ui-category/web-view/web-view-examples.module.ts index 4e73aeaf..9ff95bd6 100644 --- a/app/ui-category/web-view/web-view-examples.module.ts +++ b/app/ui-category/web-view/web-view-examples.module.ts @@ -1,6 +1,5 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { NativeScriptModule } from "nativescript-angular/platform"; +import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular"; import { WebViewExamplesComponent } from "./web-view-examples.component"; import { BasicWebViewComponent } from "./basic-web-view/basic-web-view.component"; import { WebViewHtmlComponent } from "./web-view-html/web-view-html.component"; diff --git a/app/vendor.ts b/app/vendor.ts index 0d969654..f7c9a765 100644 --- a/app/vendor.ts +++ b/app/vendor.ts @@ -8,6 +8,4 @@ require("@angular/forms"); require("@angular/http"); require("@angular/router"); -require("nativescript-angular/platform-static"); -require("nativescript-angular/forms"); -require("nativescript-angular/router"); +require("nativescript-angular"); diff --git a/package.json b/package.json index 666e6c7e..d5916178 100644 --- a/package.json +++ b/package.json @@ -37,14 +37,14 @@ "@angular/platform-browser": "2.2.1", "@angular/platform-browser-dynamic": "2.2.1", "@angular/router": "3.2.1", - "nativescript-intl": "~0.0.6", - "nativescript-angular": "1.2.0", + "nativescript-angular": "next", "nativescript-camera": "0.0.7", "nativescript-geolocation": "0.0.14", "nativescript-googlemaps": "0.0.6", + "nativescript-intl": "~0.0.6", "nativescript-theme-core": "^1.0.0", - "rxjs": "5.0.0-beta.12", "reflect-metadata": "~0.1.8", + "rxjs": "5.0.0-beta.12", "tns-core-modules": "next" }, "devDependencies": { @@ -103,4 +103,4 @@ "build-android-bundle": "tns build android --bundle --disable-npm-install", "build-ios-bundle": "tns build ios --bundle --disable-npm-install" } -} +} \ No newline at end of file