Fix PageRouterOutlet for rc5. Get first example running.

Author: hdeshev

nativescript-angular/router/page-router-outlet.ts

@@ -2,7 +2,8 @@ import {
     Attribute, ComponentFactory, ComponentRef, Directive,
     ReflectiveInjector, ResolvedReflectiveProvider, ViewContainerRef,
     Inject, ComponentResolver, provide, ComponentFactoryResolver,
-    NoComponentFactoryError} from '@angular/core';
+    NoComponentFactoryError, Injector
+} from '@angular/core';
 
 import {isPresent} from '@angular/core/src/facade/lang';
 
@@ -103,7 +104,7 @@ export class PageRouterOutlet {
 
         this.viewUtil = new ViewUtil(device);
         compiler.resolveComponent(DetachedLoader).then((detachedLoaderFactory) => {
-            log("DetachedLoaderFactory leaded");
+            log("DetachedLoaderFactory loaded");
             this.detachedLoaderFactory = detachedLoaderFactory;
         });
     }
@@ -145,11 +146,10 @@ export class PageRouterOutlet {
      * Called by the Router to instantiate a new component during the commit phase of a navigation.
      * This method in turn is responsible for calling the `routerOnActivate` hook of its child.
      */
-    activate(
-        activatedRoute: ActivatedRoute,
-        providers: ResolvedReflectiveProvider[],
-        outletMap: RouterOutletMap): void {
-
+     activate(
+         activatedRoute: ActivatedRoute, loadedResolver: ComponentFactoryResolver,
+         loadedInjector: Injector, providers: ResolvedReflectiveProvider[],
+         outletMap: RouterOutletMap): void {
         this.outletMap = outletMap;
         this.currentActivatedRoute = activatedRoute;
 
@@ -272,4 +272,4 @@ export class PageRouterOutlet {
 
 function log(msg: string) {
     routerLog(msg);
-}
+}

ng-sample/app/app.ts

@@ -36,7 +36,7 @@ import {LivesyncApp, LivesyncTestRouterProviders} from "./examples/livesync-test
 
 // new router
 import { RouterOutletAppComponent } from "./examples/router/router-outlet-test";
-import { PageRouterOutletAppComponent, PageRouterOutletRouterProviders } from "./examples/router/page-router-outlet-test";
+import { PageRouterOutletAppComponent } from "./examples/router/page-router-outlet-test";
 import { PageRouterOutletNestedAppComponent, PageRouterOutletNestedRouterProviders } from "./examples/router/page-router-outlet-nested-test";
 import { ClearHistoryAppComponent, ClearHistoryRouterProviders } from "./examples/router/clear-history-test";
 import { LoginAppComponent, LoginExampleProviders } from "./examples/router/login-test";
@@ -47,12 +47,6 @@ import { AnimationKeyframesTest } from "./examples/animation/animation-keyframes
 import { AnimationNgClassTest } from "./examples/animation/animation-ngclass-test";
 import { AnimationStatesTest } from "./examples/animation/animation-states-test";
 
-// nativeScriptBootstrap(RendererTest);
-//nativeScriptBootstrap(TabViewTest);
-//nativeScriptBootstrap(Benchmark);
-// nativeScriptBootstrap(ListTest);
-// nativeScriptBootstrap(ListTestAsync);
-//nativeScriptBootstrap(ImageTest);
 // nativeScriptBootstrap(HttpTest);
 //nativeScriptBootstrap(ActionBarTest, [NS_ROUTER_PROVIDERS_DEPRECATED], { startPageActionBarHidden: false });
 //nativeScriptBootstrap(ActionBarTest, [NS_ROUTER_PROVIDERS_DEPRECATED]);
@@ -83,24 +77,34 @@ import { AnimationStatesTest } from "./examples/animation/animation-states-test"
 })
 class ExampleModule {}
 
-@NgModule({bootstrap: [RendererTest], declarations: [RendererTest], imports: [ExampleModule]})
-class RendererTestModule {}
-
-@NgModule({bootstrap: [PageRouterOutletAppComponent], imports: [ExampleModule]})
-class PageRouterOutletAppModule {}
-
-@NgModule({
-    bootstrap: [RouterOutletAppComponent],
-    imports: [
-        ExampleModule,
-        NativeScriptRouterModule.forRoot(RouterOutletAppComponent.routes),
-    ],
-})
-class RouterOutletAppModule {}
-
-//platformNativeScriptDynamic().bootstrapModule(RendererTestModule);
-platformNativeScriptDynamic().bootstrapModule(RouterOutletAppModule);
-//platformNativeScriptDynamic().bootstrapModule(PageRouterOutletAppModule);
+function makeExampleModule(componentType, routes = null, entryComponents = null) {
+    let imports: any[] = [ExampleModule];
+    if (routes) {
+        imports.push(NativeScriptRouterModule.forRoot(routes))
+    }
+    let entries = [];
+    if (entryComponents) {
+        entries = entryComponents;
+    }
+    @NgModule({
+        bootstrap: [componentType],
+        imports: imports,
+        entryComponents: entries,
+        declarations: entries,
+    })
+    class ExampleModuleForComponent {}
+
+    return ExampleModuleForComponent;
+}
+
+//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(RendererTest));
+//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(TabViewTest));
+//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(Benchmark));
+//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ListTest));
+//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ListTestAsync));
+//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ImageTest));
+//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(RouterOutletAppComponent, RouterOutletAppComponent.routes));
+platformNativeScriptDynamic().bootstrapModule(makeExampleModule(PageRouterOutletAppComponent, PageRouterOutletAppComponent.routes, PageRouterOutletAppComponent.entries));
 
 // Livesync test
 // var cahcedUrl: string;

ng-sample/app/examples/router/page-router-outlet-test.ts

@@ -110,19 +110,21 @@ class ThirdComponent implements OnInit, OnDestroy {
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class PageRouterOutletAppComponent {
+    static routes: RouterConfig = [
+        { path: "", component: FirstComponent },
+        { path: "second/:id", component: SecondComponent },
+        { path: "third/:id", component: ThirdComponent },
+    ];
+
+    static entries = [
+        FirstComponent,
+        SecondComponent,
+        ThirdComponent
+    ]
+
     constructor(router: Router, private location: Location) {
         router.events.subscribe((e) => {
             console.log("--EVENT-->: " + e.toString());
         });
     }
 }
-
-const routes: RouterConfig = [
-    { path: "", component: FirstComponent },
-    { path: "second/:id", component: SecondComponent },
-    { path: "third/:id", component: ThirdComponent },
-];
-
-export const PageRouterOutletRouterProviders = [
-    nsProvideRouter(routes, { enableTracing: false })
-];