fix routing problem and aot setup

filipesilva · filipesilva · commit 52cd466f6e84 · 2016-11-24T17:00:47.000Z
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/aot/index.html b/public/docs/_examples/upgrade-phonecat-3-router/ts/aot/index.html
@@ -32,9 +32,7 @@
   </head>
 
   <body>
-    <div class="view-container">
-      <div ng-view class="view-frame"></div>
-    </div>
+    <phonecat-app></phonecat-app>
   </body>
   <script src="/dist/build.js"></script>
 </html>
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/app/app-routing.module.ts b/public/docs/_examples/upgrade-phonecat-3-router/ts/app/app-routing.module.ts
@@ -6,7 +6,7 @@ import { APP_BASE_HREF, HashLocationStrategy, LocationStrategy } from '@angular/
 import { PhoneDetailComponent } from './phone-detail/phone-detail.component';
 import { PhoneListComponent }   from './phone-list/phone-list.component';
 
-class Ng1Ng2UrlHandlingStrategy implements UrlHandlingStrategy {
+export class Ng1Ng2UrlHandlingStrategy implements UrlHandlingStrategy {
   // shouldProcessUrl(url: UrlTree) { return false; }
   shouldProcessUrl(url: UrlTree) {
     return url.toString().startsWith('/phones')
@@ -23,7 +23,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [ RouterModule.forRoot(routes, { initialNavigation: false }) ],
+  imports: [ RouterModule.forRoot(routes) ],
   exports: [ RouterModule ],
   providers: [
     { provide: APP_BASE_HREF, useValue: '!' },
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/app/app.module.ts b/public/docs/_examples/upgrade-phonecat-3-router/ts/app/app.module.ts
@@ -40,11 +40,9 @@ import { PhoneDetailComponent } from './phone-detail/phone-detail.component';
   ],
   // #docregion bootstrap
   bootstrap: [ AppComponent ]
-  // #enddocregion bootstrap
 })
-export class AppModule {
-  ngDoBootstrap() {}
-}
+export class AppModule { }
+// #enddocregion bootstrap
 
 export function routeParamsFactory(i: any) {
   return i.get('$routeParams');
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/app/main.ts b/public/docs/_examples/upgrade-phonecat-3-router/ts/app/main.ts
@@ -1,14 +1,10 @@
 // #docregion
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { UpgradeModule } from '@angular/upgrade/static';
-import { Router } from '@angular/router';
 
 import { AppModule } from './app.module';
 
 platformBrowserDynamic().bootstrapModule(AppModule).then(platformRef => {
   const upgrade = platformRef.injector.get(UpgradeModule) as UpgradeModule;
   upgrade.bootstrap(document.documentElement, ['phonecatApp']);
-  setTimeout(() => {
-    platformRef.injector.get(Router).initialNavigation();
-  }, 0);
 });
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/app/phone-detail/phone-detail.component.ng1.ts b/public/docs/_examples/upgrade-phonecat-3-router/ts/app/phone-detail/phone-detail.component.ng1.ts
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/app/phone-list/phone-list.component.ng1.ts b/public/docs/_examples/upgrade-phonecat-3-router/ts/app/phone-list/phone-list.component.ng1.ts
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/rollup-config.js b/public/docs/_examples/upgrade-phonecat-3-router/ts/rollup-config.js
@@ -0,0 +1,21 @@
+// #docregion
+import rollup      from 'rollup'
+import nodeResolve from 'rollup-plugin-node-resolve'
+import commonjs    from 'rollup-plugin-commonjs';
+import uglify      from 'rollup-plugin-uglify'
+
+//paths are relative to the execution path
+export default {
+  entry: 'app/main-aot.js',
+  dest: 'aot/dist/build.js', // output a single application bundle
+  sourceMap: true,
+  sourceMapFile: 'aot/dist/build.js.map',
+  format: 'iife',
+  plugins: [
+    nodeResolve({jsnext: true, module: true}),
+    commonjs({
+      include: ['node_modules/rxjs/**']
+    }),
+    uglify()
+  ]
+}
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/tsconfig-aot.json b/public/docs/_examples/upgrade-phonecat-3-router/ts/tsconfig-aot.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "removeComments": false,
+    "noImplicitAny": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "typeRoots": [
+      "../../node_modules/@types/"
+    ]
+  },
+
+  "files": [
+    "app/app.module.ts",
+    "app/main-aot.ts"
+  ],
+
+  "angularCompilerOptions": {
+   "genDir": "aot",
+   "skipMetadataEmit" : true
+ }
+}
