Skip to content

Commit 79b62ac

Browse files
Merge pull request #5 from NativeScript/hdeshev/ng-rc5-router-config
Add routable components to main module `declarations`
2 parents c131f10 + 5423a65 commit 79b62ac

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

Diff for: app/main.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
// this import should be first in order to load some required settings (like globals and reflect-metadata)
22
import { platformNativeScriptDynamic, NativeScriptModule } from "nativescript-angular/platform";
33
import { NgModule } from "@angular/core";
4-
import { NavigationMainPageRouter, routes} from "./main/main-page-router-outlet";
4+
import { NavigationMainPageRouter, routes, routableComponents } from "./main/main-page-router-outlet";
55
import { NativeScriptRouterModule } from "nativescript-angular/router";
66

77
@NgModule({
8-
declarations: [NavigationMainPageRouter],
8+
declarations: [
9+
NavigationMainPageRouter,
10+
...routableComponents
11+
],
912
bootstrap: [NavigationMainPageRouter],
1013
imports: [
1114
NativeScriptModule,
@@ -15,4 +18,4 @@ import { NativeScriptRouterModule } from "nativescript-angular/router";
1518
})
1619
class AppComponentModule { }
1720

18-
platformNativeScriptDynamic().bootstrapModule(AppComponentModule);
21+
platformNativeScriptDynamic().bootstrapModule(AppComponentModule);

Diff for: app/main/main-page-router-outlet.ts

+13-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import { NavigationInfoComponent } from "../navigation-options/navigation-info.c
5959
</StackLayout>
6060
`,
6161
})
62-
class MainComponent { }
62+
export class MainComponent { }
6363

6464
@Component({
6565
selector: 'navigation-main',
@@ -92,4 +92,15 @@ export const routes: RouterConfig = [
9292
{ path: 'nav-info', component: NavigationInfoComponent }
9393
];
9494

95-
export var MainRouterProviders = nsProvideRouter(routes, { enableTracing: false });
95+
export const routableComponents = [
96+
AppComponent, MainComponent, NavigationTestRouter,
97+
FirstComponent, SecondComponent,
98+
FirstComponentActionBar, SecondComponentActionBar,
99+
BindingComponent,
100+
ListViewMainPageComponent, ListViewComponent,
101+
ListViewControlComponent, ListViewAsyncPipeComponent,
102+
ModalTest, ModalTestWithPushStrategy,
103+
NavigationOptionsComponent, NavigationInfoComponent,
104+
]
105+
106+
export var MainRouterProviders = nsProvideRouter(routes, { enableTracing: false });

Diff for: package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"version": "2.1.1"
1010
},
1111
"tns-android": {
12-
"version": "2.1.1"
12+
"version": "2.2.0"
1313
}
1414
},
1515
"dependencies": {
@@ -19,7 +19,7 @@
1919
"@angular/platform-browser": "2.0.0-rc.5",
2020
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
2121
"@angular/platform-server": "2.0.0-rc.5",
22-
"@angular/router": "3.0.0-rc.1",
22+
"@angular/router": "3.0.0-rc.1",
2323
"@angular/forms": "0.3.0",
2424
"nativescript-angular": "0.4.0",
2525
"tns-core-modules": "2.2.1"
@@ -33,4 +33,4 @@
3333
"nativescript-dev-typescript": "^0.3.2",
3434
"typescript": "^1.8.10"
3535
}
36-
}
36+
}

0 commit comments

Comments
 (0)