Upgrade to ng2 rc6

hdeshev · hdeshev · commit 4999886f2ac4 · 2016-09-09T16:40:46.000+03:00
diff --git a/app/action-bar/action-bar-first.component.ts b/app/action-bar/action-bar-first.component.ts
@@ -1,9 +1,7 @@
 import {Component} from '@angular/core';
-import {NS_ROUTER_DIRECTIVES} from "nativescript-angular/router";
 
 @Component({
     selector: "first-action-bar",
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <ActionBar title="Title 1" automationText="title"> 
         <ActionItem *ngIf="show" text="action" (tap)="onTap()" [nsRouterLink]="['/second']" 
diff --git a/app/action-bar/action-bar-second.component.ts b/app/action-bar/action-bar-second.component.ts
@@ -1,9 +1,7 @@
 import {Component} from '@angular/core';
-import {NestedComponent} from "./action-bar-nested.component";
 
 @Component({
     selector: "second-action-bar",
-    directives: [NestedComponent],
     template: `
     <ActionBar title="Title 2" automationText="title">
         <NavigationButton text="First" android.systemIcon="ic_menu_back" automationText="back"></NavigationButton>
diff --git a/app/components/first.component.ts b/app/components/first.component.ts
@@ -1,13 +1,11 @@
 import {Component} from "@angular/core";
-import {NS_ROUTER_DIRECTIVES} from "nativescript-angular/router";
 
 @Component({
     selector: "first",
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout>
         <Label text="First component" class="title"></Label>
         <Button text="GO TO SECOND" [nsRouterLink]="['../second']" class="link"></Button>
     </StackLayout>`
 })
-export class FirstComponent {}
+export class FirstComponent {}
diff --git a/app/components/second.component.ts b/app/components/second.component.ts
@@ -1,13 +1,11 @@
 import {Component} from "@angular/core";
-import {NS_ROUTER_DIRECTIVES} from "nativescript-angular/router";
 
 @Component({
     selector: "second",
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout>
         <Label text="Second component" class="title"></Label>
         <Button text="GO TO FIRST" [nsRouterLink]="['../first']" class="link"></Button>
     </StackLayout>`
 })
-export class SecondComponent {}
+export class SecondComponent {}
diff --git a/app/listView/customTemplate/list-view-item-template.ts b/app/listView/customTemplate/list-view-item-template.ts
@@ -15,7 +15,6 @@ export class CustomTemplate {
 
 @Component({
     selector: 'list-test',
-    directives: [CustomTemplate],
     template: `
         <GridLayout rows="*" automationText="mainView"> 
             <ListView [items]="myItems">
diff --git a/app/listView/listViewMainPage/list-view-main-page.ts b/app/listView/listViewMainPage/list-view-main-page.ts
@@ -1,9 +1,7 @@
 import { Component } from "@angular/core";
-import { NS_ROUTER_DIRECTIVES } from "nativescript-angular/router";
 
 @Component({
     selector: "main",
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout>
         <Button text="ListView" [nsRouterLink]="['/listView','commonTemplate']"></Button>        
diff --git a/app/main.ts b/app/main.ts
@@ -2,14 +2,23 @@
 import { platformNativeScriptDynamic, NativeScriptModule } from "nativescript-angular/platform";
 import { NgModule } from "@angular/core";
 import { NavigationMainPageRouter, routes, routableComponents } from "./main/main-page-router-outlet";
+import { NestedComponent } from "./action-bar/action-bar-nested.component";
+import { CustomTemplate } from "./listView/customTemplate/list-view-item-template";
+import { ModalContent } from "./modal/modal-dialog.component";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
 
 @NgModule({
     declarations: [
         NavigationMainPageRouter,
+        NestedComponent,
+        CustomTemplate,
+        ModalContent,
         ...routableComponents
     ],
+    entryComponents: [
+        ModalContent,
+    ],
     bootstrap: [NavigationMainPageRouter],
     imports: [
         NativeScriptModule,
diff --git a/app/main/main-page-router-outlet.ts b/app/main/main-page-router-outlet.ts
@@ -1,6 +1,4 @@
 import { Component } from "@angular/core";
-import { RouterConfig } from '@angular/router';
-import { NS_ROUTER_DIRECTIVES, nsProvideRouter } from "nativescript-angular/router";
 
 import { FirstComponentActionBar } from "../action-bar/action-bar-first.component";
 import { SecondComponentActionBar } from "../action-bar/action-bar-second.component";
@@ -26,7 +24,6 @@ import { NavigationInfoComponent } from "../navigation-options/navigation-info.c
 
 @Component({
     selector: "main",
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout>
         <Label text="Main Component" class="title"></Label>
@@ -63,13 +60,12 @@ export class MainComponent { }
 
 @Component({
     selector: 'navigation-main',
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class NavigationMainPageRouter { }
 
 
-export const routes: RouterConfig = [
+export const routes = [
     { path: '', component: MainComponent },
     { path: 'template', component: AppComponent },
     { path: 'router', component: NavigationTestRouter, children: NavigationSubRoutes },
@@ -102,5 +98,3 @@ export const routableComponents = [
     ModalTest, ModalTestWithPushStrategy,
     NavigationOptionsComponent, NavigationInfoComponent,
 ]
-
-export var MainRouterProviders = nsProvideRouter(routes, { enableTracing: false });
diff --git a/app/modal/modal-dialog.component.ts b/app/modal/modal-dialog.component.ts
@@ -1,6 +1,6 @@
 import { Component, ChangeDetectionStrategy } from '@angular/core';
 import * as dialogs from "ui/dialogs";
-import { ModalDialogService, ModalDialogOptions, ModalDialogHost, ModalDialogParams } from "nativescript-angular/directives/dialogs";
+import { ModalDialogService, ModalDialogOptions, ModalDialogParams } from "nativescript-angular/directives/dialogs";
 
 
 @Component({
@@ -15,7 +15,7 @@ import { ModalDialogService, ModalDialogOptions, ModalDialogHost, ModalDialogPar
     </StackLayout>
     `
 })
-class ModalContent {
+export class ModalContent {
     public prompt: string;
     constructor(private params: ModalDialogParams) {
         this.prompt = params.context.message;
@@ -37,7 +37,6 @@ const TEMPLATE = `
 
 @Component({
     selector: 'modal-test',
-    directives: [ModalDialogHost],
     providers: [ModalDialogService],
     template: TEMPLATE
 })
@@ -66,8 +65,6 @@ export class ModalTest {
 
 @Component({
     selector: 'modal-test-on-push',
-    directives: [ModalDialogHost],
-    providers: [ModalDialogService],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: TEMPLATE
 })
diff --git a/app/navigation-options/navigation-info.component.ts b/app/navigation-options/navigation-info.component.ts
@@ -1,12 +1,10 @@
 import {Component} from '@angular/core';
-import {NS_ROUTER_DIRECTIVES, RouterExtensions} from "nativescript-angular/router";
 import {NSLocationStrategy} from "nativescript-angular/router/ns-location-strategy";
 import {Frame} from "ui/frame";
 
 
 @Component({
     selector: 'nav-info',
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout>
         <Label automationText="lbFrameStack" [text]="'frameStack: ' + frameStack" ></Label>
@@ -28,4 +26,4 @@ export class NavigationInfoComponent {
         this.frameStack = this.frame.backStack.length;
         this.locationStack = this.strategy._getSatates().length;
     }
-}
+}
diff --git a/app/navigation-options/navigation-options.component.ts b/app/navigation-options/navigation-options.component.ts
@@ -1,9 +1,8 @@
 import {Component} from '@angular/core';
-import {NS_ROUTER_DIRECTIVES, RouterExtensions} from "nativescript-angular/router";
+import {RouterExtensions} from "nativescript-angular/router";
 
 @Component({
     selector: 'nav-options',
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout>
         <Button text="clear-history" [nsRouterLink]="['/nav-info']" [clearHistory]="true"></Button>
@@ -24,4 +23,4 @@ export class NavigationOptionsComponent {
             }
         });
     }
-}
+}
diff --git a/app/router/router-outlet.ts b/app/router/router-outlet.ts
@@ -1,13 +1,10 @@
 import {Component} from "@angular/core";
-import {RouterConfig, ROUTER_DIRECTIVES} from '@angular/router';
-import {NS_ROUTER_DIRECTIVES} from "nativescript-angular/router";
 import {FirstComponent} from "../components/first.component";
 import {SecondComponent} from "../components/second.component";
 
 @Component({
     selector: 'navigation-test',
     styleUrls: ['./router/router-outlet.css'],
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES],
     template: `
         <StackLayout>
             <StackLayout class="nav">
@@ -23,8 +20,8 @@ import {SecondComponent} from "../components/second.component";
 })
 export class NavigationTestRouter { }
 
-export var NavigationSubRoutes: RouterConfig = [
+export var NavigationSubRoutes = [
     { path: '', redirectTo: 'first' },
     { path: 'first', component: FirstComponent },
     { path: 'second', component: SecondComponent },
-];
+];
diff --git a/package.json b/package.json
@@ -13,16 +13,18 @@
     }
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "@angular/platform-server": "2.0.0-rc.5",
-    "@angular/router": "3.0.0-rc.1",
-    "@angular/forms": "0.3.0",
-    "nativescript-angular": "0.4.0",
-    "tns-core-modules": "2.2.1"
+    "nativescript-angular": "0.5.0",
+    "tns-core-modules": "2.2.1",
+    "nativescript-intl": "^0.0.4",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/http": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "@angular/platform-server": "2.0.0-rc.6",
+    "@angular/forms": "2.0.0-rc.6",
+    "@angular/router": "3.0.0-rc.2"
   },
   "devDependencies": {
     "babel-traverse": "6.8.0",
