Upgrade to RC1: router -> router-deprecated

hdeshev · hdeshev · commit 93e8fefeed1e · 2016-05-05T16:24:47.000+03:00
diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts
@@ -27,11 +27,7 @@ import {ModalTest} from "./examples/modal/modal-test";
 import {PlatfromDirectivesTest} from "./examples/platform-directives/platform-directives-test";
 import {RouterOutletTest} from "./examples/navigation/router-outlet-test";
 
-nativeScriptBootstrap(RendererTest).then((compRef) => {
-    console.log("nativeScriptBootstrap resloved: " + compRef);
-}).catch((e) => {
-    console.log("nativeScriptBootstrap error: " + e);
-});
+nativeScriptBootstrap(RendererTest);
 //nativeScriptBootstrap(Benchmark);
 //nativeScriptBootstrap(ListTest);
 //nativeScriptBootstrap(ListTestAsync);
diff --git a/ng-sample/app/examples/action-bar/action-bar-test.ts b/ng-sample/app/examples/action-bar/action-bar-test.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {RouteConfig} from '@angular/router';
+import {RouteConfig} from '@angular/router-deprecated';
 import { Page} from "ui/page";
 import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
 import {NS_DIRECTIVES} from "../../nativescript-angular/directives";
diff --git a/ng-sample/app/examples/navigation/nav-component.ts b/ng-sample/app/examples/navigation/nav-component.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {ROUTER_DIRECTIVES, Router, OnActivate, OnDeactivate, CanReuse, OnReuse,
- RouteParams, ComponentInstruction, RouteConfig } from '@angular/router';
+ RouteParams, ComponentInstruction, RouteConfig } from '@angular/router-deprecated';
 import {Location, LocationStrategy} from '@angular/common';
 import {topmost} from "ui/frame";
 import {Page} from "ui/page";
diff --git a/ng-sample/app/examples/navigation/navigation-test.ts b/ng-sample/app/examples/navigation/navigation-test.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction} from '@angular/router';
+import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction} from '@angular/router-deprecated';
 
 import {NavComponent} from "./nav-component";
 import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
diff --git a/ng-sample/app/examples/navigation/router-outlet-test.ts b/ng-sample/app/examples/navigation/router-outlet-test.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction, RouteParams} from '@angular/router';
+import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction, RouteParams} from '@angular/router-deprecated';
 import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
 
 @Component({
diff --git a/ng-sample/package.json b/ng-sample/package.json
@@ -25,25 +25,25 @@
 	"dependencies": {
 		"tns-core-modules": "^2.0.0",
 		"nativescript-intl": "^0.0.2",
-		"@angular/common": "0.0.0-0",
-		"@angular/compiler": "0.0.0-0",
-		"@angular/core": "0.0.0-0",
-		"@angular/router": "0.0.0-0",
-		"@angular/platform-browser": "0.0.0-0",
-		"@angular/platform-browser-dynamic": "0.0.0-0",
-		"@angular/platform-server": "0.0.0-0",
+		"@angular/common": "2.0.0-rc.1",
+		"@angular/compiler": "2.0.0-rc.1",
+		"@angular/core": "2.0.0-rc.1",
+		"@angular/router-deprecated": "2.0.0-rc.1",
+		"@angular/platform-browser": "2.0.0-rc.1",
+		"@angular/platform-browser-dynamic": "2.0.0-rc.1",
+		"@angular/platform-server": "2.0.0-rc.1",
 		"reflect-metadata": "^0.1.3",
-		"rxjs": "5.0.0-beta.2",
+		"rxjs": "5.0.0-beta.6",
 		"zone.js": "^0.6.12",
 		"parse5": "1.4.2",
 		"punycode": "1.3.2",
 		"querystring": "0.2.0",
 		"url": "0.10.3"
 	},
 	"devDependencies": {
-		"babel-traverse": "6.7.6",
-		"babel-types": "6.7.7",
-		"babylon": "6.7.0",
+		"babel-traverse": "6.8.0",
+		"babel-types": "6.8.1",
+		"babylon": "6.8.0",
 		"filewalker": "0.1.2",
 		"grunt": "0.4.5",
 		"grunt-contrib-clean": "0.6.0",
diff --git a/package.json b/package.json
@@ -16,15 +16,15 @@
   "dependencies": {
     "tns-core-modules": "^2.0.0",
     "nativescript-intl": "^0.0.2",
-    "@angular/common": "0.0.0-0",
-    "@angular/compiler": "0.0.0-0",
-    "@angular/core": "0.0.0-0",
-    "@angular/router": "0.0.0-0",
-    "@angular/platform-browser": "0.0.0-0",
-    "@angular/platform-browser-dynamic": "0.0.0-0",
-    "@angular/platform-server": "0.0.0-0",
+    "@angular/common": "2.0.0-rc.1",
+    "@angular/compiler": "2.0.0-rc.1",
+    "@angular/core": "2.0.0-rc.1",
+    "@angular/router-deprecated": "2.0.0-rc.1",
+    "@angular/platform-browser": "2.0.0-rc.1",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.1",
+    "@angular/platform-server": "2.0.0-rc.1",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.12",
     "parse5": "1.4.2",
     "punycode": "1.3.2",
@@ -40,7 +40,7 @@
     "grunt-env": "0.4.4",
     "grunt-ts": "5.0.0-beta.5",
     "shelljs": "^0.5.3",
-    "typescript": "1.8.2"
+    "typescript": "^1.8.10"
   },
   "peerDependencies": {
     "tns-core-modules": ">=2.0.0 || >=2.0.0-2016 || >=2.0.0-angular-4"
diff --git a/src/nativescript-angular/common/detached-loader.ts b/src/nativescript-angular/common/detached-loader.ts
@@ -1,8 +1,9 @@
 import {DynamicComponentLoader, ComponentRef, ViewContainerRef, Component, Type, ViewChild} from '@angular/core';
 
+type AnyComponentRef = ComponentRef<any>;
 interface PendingLoadEntry {
     componentType: Type;
-    resolveCallback: (ComponentRef) => void;
+    resolveCallback: (AnyComponentRef) => void;
 }
 
 /**
@@ -34,11 +35,11 @@ export class DetachedLoader {
         });
     }
 
-    private loadInLocation(componentType: Type): Promise<ComponentRef> {
+    private loadInLocation(componentType: Type): Promise<ComponentRef<any>> {
         return this.loader.loadNextToLocation(componentType, this.containerRef);
     }
 
-    public loadComponent(componentType: Type): Promise<ComponentRef> {
+    public loadComponent(componentType: Type): Promise<ComponentRef<any>> {
         // Check if called before placeholder is initialized.
         // Delay load if so.
         if (this.viewLoaded) {
diff --git a/src/nativescript-angular/directives/dialogs.ts b/src/nativescript-angular/directives/dialogs.ts
@@ -35,7 +35,7 @@ export class ModalDialogService {
         return new Promise((resove, reject) => {
             const page = new Page();
 
-            var detachedLoaderRef: ComponentRef;
+            var detachedLoaderRef: ComponentRef<DetachedLoader>;
             const closeCallback = (...args) => {
                 resove.apply(undefined, args);
                 page.closeModal();
diff --git a/src/nativescript-angular/directives/tab-view.ts b/src/nativescript-angular/directives/tab-view.ts
@@ -39,7 +39,7 @@ export class TabViewItemDirective {
 
     constructor(
         private owner: TabViewDirective,
-        private templateRef: TemplateRef,
+        private templateRef: TemplateRef<any>,
         private viewContainer: ViewContainerRef
     ) {
     }
diff --git a/src/nativescript-angular/router/ns-router-link.ts b/src/nativescript-angular/router/ns-router-link.ts
@@ -1,6 +1,6 @@
 import {Directive, Input} from '@angular/core';
 import {isString} from '@angular/core/src/facade/lang';
-import {Router, Instruction} from '@angular/router';
+import {Router, Instruction} from '@angular/router-deprecated';
 import {Location} from '@angular/common';
 import { log } from "./common";
 
diff --git a/src/nativescript-angular/router/ns-router.ts b/src/nativescript-angular/router/ns-router.ts
@@ -2,7 +2,7 @@ import {Type} from '@angular/core/src/facade/lang';
 import {NSRouterLink} from './ns-router-link';
 import {PageRouterOutlet} from './page-router-outlet';
 import {NSLocationStrategy} from './ns-location-strategy';
-import {ROUTER_PROVIDERS} from '@angular/router';
+import {ROUTER_PROVIDERS} from '@angular/router-deprecated';
 import {LocationStrategy} from '@angular/common';
 import {provide} from '@angular/core';
 import { CATEGORY } from "./common";
diff --git a/src/nativescript-angular/router/page-router-outlet.ts b/src/nativescript-angular/router/page-router-outlet.ts
@@ -9,11 +9,11 @@ import {
     Component, Inject
 } from '@angular/core';
 
-import * as routerHooks from '@angular/router/src/lifecycle/lifecycle_annotations';
-import {hasLifecycleHook} from '@angular/router/src/lifecycle/route_lifecycle_reflector';
+import * as routerHooks from '@angular/router-deprecated/src/lifecycle/lifecycle_annotations';
+import {hasLifecycleHook} from '@angular/router-deprecated/src/lifecycle/route_lifecycle_reflector';
 
 import {Router, RouterOutlet, RouteData, RouteParams, ComponentInstruction, 
-    OnActivate, OnDeactivate, OnReuse, CanReuse} from '@angular/router';
+    OnActivate, OnDeactivate, OnReuse, CanReuse} from '@angular/router-deprecated';
 import {LocationStrategy} from '@angular/common';
 import {topmost} from "ui/frame";
 import {Page, NavigatedData} from "ui/page";
@@ -27,8 +27,8 @@ import {ViewUtil} from "../view-util";
 let _resolveToTrue = PromiseWrapper.resolve(true);
 
 interface CacheItem {
-    componentRef: ComponentRef;
-    loaderRef?: ComponentRef;
+    componentRef: ComponentRef<any>;
+    loaderRef?: ComponentRef<any>;
     router: Router;
 }
 
@@ -38,7 +38,7 @@ interface CacheItem {
 class RefCache {
     private cache: Array<CacheItem> = new Array<CacheItem>();
 
-    public push(comp: ComponentRef, router: Router, loaderRef?: ComponentRef) {
+    public push(comp: ComponentRef<any>, router: Router, loaderRef?: ComponentRef<any>) {
         this.cache.push({ componentRef: comp, router: router, loaderRef: loaderRef });
     }
 
@@ -71,7 +71,7 @@ export class PageRouterOutlet extends RouterOutlet {
     private isInitalPage: boolean = true;
     private refCache: RefCache = new RefCache();
 
-    private componentRef: ComponentRef = null;
+    private componentRef: ComponentRef<any> = null;
     private currentInstruction: ComponentInstruction = null;
     private viewUtil: ViewUtil;
     @ViewChild('loader', { read: ViewContainerRef }) childContainerRef: ViewContainerRef;
@@ -123,7 +123,7 @@ export class PageRouterOutlet extends RouterOutlet {
     private activateOnGoForward(nextInstruction: ComponentInstruction, previousInstruction: ComponentInstruction): Promise<any> {
         let componentType = nextInstruction.componentType;
         let resultPromise: Promise<any>;
-        let loaderRef: ComponentRef = undefined;
+        let loaderRef: ComponentRef<any> = undefined;
         const childRouter = this.parentRouter.childRouter(componentType);
 
         const providersArray = [
@@ -163,7 +163,7 @@ export class PageRouterOutlet extends RouterOutlet {
     }
 
 
-    private loadComponentInPage(page: Page, componentRef: ComponentRef): Promise<ComponentRef> {
+    private loadComponentInPage(page: Page, componentRef: ComponentRef<any>): Promise<ComponentRef<any>> {
         //Component loaded. Find its root native view.
         const componentView = componentRef.location.nativeElement;
         //Remove it from original native parent.
diff --git a/tests/app/snippets/icon-font.component.xml b/tests/app/snippets/icon-font.component.xml
@@ -1,12 +1,12 @@
 <!-- >> icon-font-sample -->
 <GridLayout>
     <ListView [items]="glyphs">
-        <template #item="item">
+        <template let-item="item">
             <StackLayout orientation="horizontal">
                 <Label [text]="item.icon" class="icon"></Label>
                 <Label [text]="item.code"></Label>
             </StackLayout>
         </template>
     </ListView>
 </GridLayout>
-<!-- << icon-font-sample -->
+<!-- << icon-font-sample -->
diff --git a/tests/app/tests/modal-dialog.ts b/tests/app/tests/modal-dialog.ts
diff --git a/tests/app/tests/router.ts b/tests/app/tests/router.ts
diff --git a/tests/app/tests/test-app.ts b/tests/app/tests/test-app.ts
diff --git a/tests/app/tests/third-party.ts b/tests/app/tests/third-party.ts
diff --git a/tests/package.json b/tests/package.json

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class TabViewItemDirective {`
`39`	`39`
`40`	`40`	`constructor(`
`41`	`41`	`private owner: TabViewDirective,`
`42`		`- private templateRef: TemplateRef,`
	`42`	`+ private templateRef: TemplateRef<any>,`
`43`	`43`	`private viewContainer: ViewContainerRef`
`44`	`44`	`) {`
`45`	`45`	`}`