From 32b0c0b93df5932bce5f996f100a95c1f4e459c3 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Tue, 13 Mar 2018 19:04:30 +0200 Subject: [PATCH] refactor: replace NativeScriptModule with NativeScriptCommonModule NativeScriptModule should be imported only in the root NgModule. For all other feature modules, NativeScriptCommonModule should be used instead. Check out https://github.com/NativeScript/nativescript-angular/pull/1196. --- .../app/autocomplete/autocomplete-examples.module.ts | 6 +++--- sdkAngular/app/calendar/calendar-examples.module.ts | 6 +++--- sdkAngular/app/chart/chart-examples.module.ts | 8 ++++---- sdkAngular/app/dataform/dataform-examples.module.ts | 8 ++++---- sdkAngular/app/gauges/gauges-examples.module.ts | 8 ++++---- sdkAngular/app/listview/listview-examples.module.ts | 8 ++++---- sdkAngular/app/sidedrawer/sidedrawer-examples.module.ts | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sdkAngular/app/autocomplete/autocomplete-examples.module.ts b/sdkAngular/app/autocomplete/autocomplete-examples.module.ts index d91ff5fc..ec73b5e1 100644 --- a/sdkAngular/app/autocomplete/autocomplete-examples.module.ts +++ b/sdkAngular/app/autocomplete/autocomplete-examples.module.ts @@ -1,5 +1,5 @@ +import { NativeScriptCommonModule } from "nativescript-angular/common"; import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; import { NativeScriptRouterModule } from "nativescript-angular/router"; import { NativeScriptUIAutoCompleteTextViewModule } from "nativescript-ui-autocomplete/angular"; @@ -28,11 +28,11 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv @NgModule({ schemas: [NO_ERRORS_SCHEMA], imports: [ - NativeScriptModule, CommonDirectivesModule, NativeScriptUIAutoCompleteTextViewModule, NativeScriptRouterModule, - NativeScriptRouterModule.forChild(routes) + NativeScriptRouterModule.forChild(routes), + NativeScriptCommonModule, ], declarations: [ AutoCompleteContainsModeComponent, diff --git a/sdkAngular/app/calendar/calendar-examples.module.ts b/sdkAngular/app/calendar/calendar-examples.module.ts index 83c85b95..5a501ccf 100644 --- a/sdkAngular/app/calendar/calendar-examples.module.ts +++ b/sdkAngular/app/calendar/calendar-examples.module.ts @@ -1,5 +1,5 @@ +import { NativeScriptCommonModule } from "nativescript-angular/common"; import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; import { NativeScriptRouterModule } from "nativescript-angular/router"; import { NativeScriptUICalendarModule } from "nativescript-ui-calendar/angular"; @@ -21,12 +21,12 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv @NgModule({ schemas: [NO_ERRORS_SCHEMA], imports: [ - NativeScriptModule, CommonDirectivesModule, NativeScriptUICalendarModule, NativeScriptUIListViewModule, NativeScriptRouterModule, - NativeScriptRouterModule.forChild(routes) + NativeScriptRouterModule.forChild(routes), + NativeScriptCommonModule, ], declarations: [ CalendarLocalizationComponent, diff --git a/sdkAngular/app/chart/chart-examples.module.ts b/sdkAngular/app/chart/chart-examples.module.ts index f10a0581..ffb20157 100644 --- a/sdkAngular/app/chart/chart-examples.module.ts +++ b/sdkAngular/app/chart/chart-examples.module.ts @@ -1,5 +1,5 @@ +import { NativeScriptCommonModule } from "nativescript-angular/common"; import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; import { NativeScriptRouterModule } from "nativescript-angular/router"; import { NativeScriptUIChartModule } from "nativescript-ui-chart/angular"; @@ -44,11 +44,11 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv @NgModule({ schemas: [NO_ERRORS_SCHEMA], imports: [ - NativeScriptModule, CommonDirectivesModule, NativeScriptUIChartModule, NativeScriptRouterModule, - NativeScriptRouterModule.forChild(routes) + NativeScriptRouterModule.forChild(routes), + NativeScriptCommonModule, ], declarations: [ ChartAnnotationsGridLineComponent, @@ -86,4 +86,4 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv ChartLabelVisibilityComponent ] }) -export class ChartExamplesModule { } \ No newline at end of file +export class ChartExamplesModule { } diff --git a/sdkAngular/app/dataform/dataform-examples.module.ts b/sdkAngular/app/dataform/dataform-examples.module.ts index fac6cb52..6172998b 100644 --- a/sdkAngular/app/dataform/dataform-examples.module.ts +++ b/sdkAngular/app/dataform/dataform-examples.module.ts @@ -1,5 +1,5 @@ +import { NativeScriptCommonModule } from "nativescript-angular/common"; import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; import { NativeScriptRouterModule } from "nativescript-angular/router"; import { NativeScriptUIDataFormModule } from "nativescript-ui-dataform/angular"; @@ -42,11 +42,11 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv @NgModule({ schemas: [NO_ERRORS_SCHEMA], imports: [ - NativeScriptModule, CommonDirectivesModule, NativeScriptUIDataFormModule, NativeScriptRouterModule, - NativeScriptRouterModule.forChild(routes) + NativeScriptRouterModule.forChild(routes), + NativeScriptCommonModule, ], declarations: [ DataFormAdjustmentComponent, @@ -82,4 +82,4 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv DataFormValueProvidersComponent, ] }) -export class DataFormExamplesModule { } \ No newline at end of file +export class DataFormExamplesModule { } diff --git a/sdkAngular/app/gauges/gauges-examples.module.ts b/sdkAngular/app/gauges/gauges-examples.module.ts index 0f5f7db3..6d19dd3a 100644 --- a/sdkAngular/app/gauges/gauges-examples.module.ts +++ b/sdkAngular/app/gauges/gauges-examples.module.ts @@ -1,5 +1,5 @@ +import { NativeScriptCommonModule } from "nativescript-angular/common"; import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; import { NativeScriptRouterModule } from "nativescript-angular/router"; import { NativeScriptUIGaugeModule } from "nativescript-ui-gauge/angular"; @@ -15,11 +15,11 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv @NgModule({ schemas: [NO_ERRORS_SCHEMA], imports: [ - NativeScriptModule, CommonDirectivesModule, NativeScriptUIGaugeModule, NativeScriptRouterModule, - NativeScriptRouterModule.forChild(routes) + NativeScriptRouterModule.forChild(routes), + NativeScriptCommonModule, ], declarations: [ GaugesAnimationsComponent, @@ -28,4 +28,4 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv GaugesScalesComponent ] }) -export class GaugesExamplesModule { } \ No newline at end of file +export class GaugesExamplesModule { } diff --git a/sdkAngular/app/listview/listview-examples.module.ts b/sdkAngular/app/listview/listview-examples.module.ts index e3024eec..11ffa861 100644 --- a/sdkAngular/app/listview/listview-examples.module.ts +++ b/sdkAngular/app/listview/listview-examples.module.ts @@ -1,5 +1,5 @@ +import { NativeScriptCommonModule } from "nativescript-angular/common"; import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; import { NativeScriptRouterModule } from "nativescript-angular/router"; import { NativeScriptFormsModule } from "nativescript-angular/forms"; @@ -46,12 +46,12 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv @NgModule({ schemas: [NO_ERRORS_SCHEMA], imports: [ - NativeScriptModule, CommonDirectivesModule, NativeScriptUIListViewModule, NativeScriptFormsModule, NativeScriptRouterModule, - NativeScriptRouterModule.forChild(routes) + NativeScriptRouterModule.forChild(routes), + NativeScriptCommonModule, ], declarations: [ ListViewGettingStartedComponent, @@ -90,4 +90,4 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv ListViewDataOperationsSortingComponent ] }) -export class ListViewExamplesModule { } \ No newline at end of file +export class ListViewExamplesModule { } diff --git a/sdkAngular/app/sidedrawer/sidedrawer-examples.module.ts b/sdkAngular/app/sidedrawer/sidedrawer-examples.module.ts index ee2fe329..6766b1df 100644 --- a/sdkAngular/app/sidedrawer/sidedrawer-examples.module.ts +++ b/sdkAngular/app/sidedrawer/sidedrawer-examples.module.ts @@ -1,5 +1,5 @@ +import { NativeScriptCommonModule } from "nativescript-angular/common"; import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; import { NativeScriptRouterModule } from "nativescript-angular/router"; import { NativeScriptUISideDrawerModule } from "nativescript-ui-sidedrawer/angular"; @@ -17,11 +17,11 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv @NgModule({ schemas: [NO_ERRORS_SCHEMA], imports: [ - NativeScriptModule, CommonDirectivesModule, NativeScriptUISideDrawerModule, NativeScriptRouterModule, - NativeScriptRouterModule.forChild(routes) + NativeScriptRouterModule.forChild(routes), + NativeScriptCommonModule, ], declarations: [ SideDrawerEventsComponent, @@ -32,4 +32,4 @@ import { CommonDirectivesModule } from '../navigation/directives/common-directiv SideDrawerTransitionsComponent ] }) -export class SideDrawerExamplesModule { } \ No newline at end of file +export class SideDrawerExamplesModule { }