fix rebase errors

Author: filipesilva

public/docs/_examples/upgrade-module/ts/index-divide-routes.html renamed to public/docs/_examples/upgrade-module/ts/src/index-divide-routes.html

@@ -1,8 +1,5 @@
-aot/**/*.ts
-**/*.ngfactory.ts
-**/*.ngsummary.json
-**/*.metadata.json
-**/*.js
+aot/**/*
+!aot/index.html
 dist
 !app/tsconfig.json
 !rollup-config.js

public/docs/_examples/upgrade-module/ts/systemjs.config.1.js renamed to public/docs/_examples/upgrade-module/ts/src/systemjs.config.1.js

@@ -8,7 +8,7 @@ import { Component } from '@angular/core';
 
 import { Phone, PhoneData } from '../core/phone/phone.service';
 // #enddocregion initialclass
-import { RouteParams } from '../ng1-upgraded-providers';
+import { RouteParams } from '../ajs-upgraded-providers';
 
 // #docregion initialclass
 @Component({

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/.gitignore

@@ -0,0 +1,14 @@
+{
+  "open": false,
+  "logLevel": "silent",
+  "port": 8080,
+  "server": {
+    "baseDir": "aot",
+    "routes": {
+      "/node_modules": "node_modules"
+    },
+    "middleware": {
+      "0": null
+    }
+  }
+}

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/aot/bs-config.json

@@ -11,7 +11,7 @@ var resources = [
   'app/img/',
   'app/phones/',
   // app files
-  'app/app.module.ng1.js',
+  'app/app.module.ajs.js',
   'app/app.config.js',
   'app/app.animations.js',
   'app/core/core.module.js',

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-detail/phone-detail.component.ts

@@ -5,7 +5,7 @@ import { downgradeComponent } from '@angular/upgrade/static';
 import { Component } from '@angular/core';
 
 import { Phone, PhoneData } from '../core/phone/phone.service';
-import { RouteParams } from '../ng1-upgraded-providers';
+import { RouteParams } from '../ajs-upgraded-providers';
 
 @Component({
   moduleId: module.id,

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/bs-config.aot.json

@@ -0,0 +1,14 @@
+{
+  "open": false,
+  "logLevel": "silent",
+  "port": 8080,
+  "server": {
+    "baseDir": "aot",
+    "routes": {
+      "/node_modules": "node_modules"
+    },
+    "middleware": {
+      "0": null
+    }
+  }
+}

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/copy-dist-files.js

@@ -11,7 +11,7 @@ var resources = [
   'app/img/',
   'app/phones/',
   // app files
-  'app/app.module.ng1.js',
+  'app/app.module.ajs.js',
   'app/app.config.js',
   'app/app.animations.js',
   'app/core/core.module.js',

public/docs/_examples/upgrade-phonecat-3-router/ts/app/app.module.ng1.ts renamed to public/docs/_examples/upgrade-phonecat-3-router/ts/app/app.module.ajs.ts

@@ -17,7 +17,7 @@
     <script src="https://code.angularjs.org/1.5.5/angular-resource.js"></script>
     <script src="https://code.angularjs.org/1.5.5/angular-route.js"></script>
 
-    <script src="app.module.ng1.js"></script>
+    <script src="app.module.ajs.js"></script>
     <script src="app.config.js"></script>
     <script src="app.animations.js"></script>
     <script src="core/core.module.js"></script>

public/docs/_examples/upgrade-phonecat-3-router/ts/app/phone-detail/phone-detail.component.ts

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [ "es2015", "dom" ],
+    "noImplicitAny": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "typeRoots": [
+      "../../node_modules/@types/"
+    ]
+  },
+  "compileOnSave": true,
+  "exclude": [
+    "node_modules/*",
+    "**/*-aot.ts"
+  ]
+}

public/docs/_examples/upgrade-phonecat-3-router/ts/bs-config.aot.json

@@ -1,3 +1,5 @@
 {
+  "build": "build:upgrade",
+  "run": "serve:upgrade",
   "unittesting": true
 }

public/docs/_examples/upgrade-phonecat-3-router/ts/copy-dist-files.js

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [ "es2015", "dom" ],
+    "noImplicitAny": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "typeRoots": [
+      "../../node_modules/@types/"
+    ]
+  },
+  "compileOnSave": true,
+  "exclude": [
+    "node_modules/*",
+    "**/*-aot.ts"
+  ]
+}