add manual @angular/upgrade install

Author: filipesilva

public/docs/_examples/_boilerplate/systemjs.config.js

@@ -23,8 +23,6 @@
       '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
       '@angular/router/upgrade': 'npm:@angular/router/bundles/router-upgrade.umd.js',
       '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
-      '@angular/upgrade': 'npm:@angular/upgrade/bundles/upgrade.umd.js',
-      '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
 
       // other libraries
       'rxjs':                      'npm:rxjs',

public/docs/_examples/upgrade-module/ts/.gitignore

@@ -0,0 +1,7 @@
+**/*.js
+aot/**/*
+!aot/bs-config.json
+!aot/index.html
+!copy-dist-files.js
+!rollup-config.js
+!systemjs.config.1.js

public/docs/_examples/upgrade-module/ts/index-1-2-hybrid-bootstrap.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
     System.import('app/1-2-hybrid-bootstrap/app.module')
           .then(null, console.error.bind(console));

public/docs/_examples/upgrade-module/ts/index-1-to-2-projection.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
       System.import('app/1-to-2-projection/app.module')
             .then(null, console.error.bind(console));

public/docs/_examples/upgrade-module/ts/index-1-to-2-providers.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
       System.import('app/1-to-2-providers/app.module')
             .then(null, console.error.bind(console));

public/docs/_examples/upgrade-module/ts/index-2-to-1-providers.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
       System.import('app/2-to-1-providers/app.module')
             .then(null, console.error.bind(console));

public/docs/_examples/upgrade-module/ts/index-2-to-1-transclusion.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
       System.import('app/2-to-1-transclusion/app.module')
             .then(null, console.error.bind(console));

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

@@ -16,7 +16,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
     System.import('app/divide-routes/main')
           .then(null, console.error.bind(console));

public/docs/_examples/upgrade-module/ts/index-downgrade-io.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
       System.import('app/downgrade-io/app.module')
             .then(null, console.error.bind(console));

public/docs/_examples/upgrade-module/ts/index-downgrade-static.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
       System.import('app/downgrade-static/app.module')
             .then(null, console.error.bind(console));

public/docs/_examples/upgrade-module/ts/index-upgrade-io.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
       System.import('app/upgrade-io/app.module')
             .then(null, console.error.bind(console));

public/docs/_examples/upgrade-module/ts/index-upgrade-static.html

@@ -15,7 +15,7 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="systemjs.config.js"></script>
+    <script src="systemjs.config.1.js"></script>
     <script>
       System.import('app/upgrade-static/app.module')
             .then(null, console.error.bind(console));

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

@@ -0,0 +1,43 @@
+/**
+ * System configuration for Angular samples
+ * Adjust as necessary for your application needs.
+ */
+(function (global) {
+  System.config({
+    paths: {
+      // paths serve as alias
+      'npm:': 'node_modules/'
+    },
+    // map tells the System loader where to look for things
+    map: {
+      // our app is within the app folder
+      app: 'app',
+      // angular bundles
+      '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
+      '@angular/common': 'npm:@angular/common/bundles/common.umd.js',
+      '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
+      '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
+      '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
+      '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
+      '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
+      '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
+      // #docregion upgrade-static-umd
+      '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
+      // #enddocregion upgrade-static-umd
+
+      // other libraries
+      'rxjs':                      'npm:rxjs',
+      'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js'
+    },
+    // packages tells the System loader how to load when no filename and/or no extension
+    packages: {
+      app: {
+        main: './main.js',
+        defaultExtension: 'js'
+      },
+      rxjs: {
+        defaultExtension: 'js'
+      }
+    }
+  });
+})(this);

public/docs/_examples/upgrade-phonecat-2-hybrid/ts/systemjs.config.1.js

@@ -22,8 +22,9 @@
       '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
       '@angular/router/upgrade': 'npm:@angular/router/bundles/router-upgrade.umd.js',
       '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
-      '@angular/upgrade': 'npm:@angular/upgrade/bundles/upgrade.umd.js',
+      // #docregion paths
       '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
+      // #enddocregion paths
 
       // other libraries
       'rxjs':                      'npm:rxjs',

public/docs/ts/latest/guide/upgrade.jade

@@ -456,6 +456,12 @@ figure.image-display
 
 +makeExample('upgrade-module/ts/app/1-2-hybrid-bootstrap/app.module.ts', 'bootstrap')
 
+:marked
+  We also need to install the `@angular/upgrade` package via `npm install @angular/upgrade --save`
+  and add a mapping for the `@angular/upgrade/static` package: 
+
++makeExample('upgrade-module/ts/systemjs.config.1.js', 'upgrade-static-umd', 'systemjs.config.js (map)')
+
 :marked
   Congratulations! You're running a hybrid Angular 1+2 application! The
   existing Angular 1 code works as before _and_ you're ready to run Angular 2 code.
@@ -1124,8 +1130,12 @@ code-example(format="").
 :marked
   We also need to make a couple of adjustments 
   to the `systemjs.config.js` file installed during [setup](setup.html). 
-  We want to point the browser to the project
-  root when loading things through SystemJS, instead of using the  `<base>` URL:
+   
+  We want to point the browser to the project root when loading things through SystemJS,
+  instead of using the  `<base>` URL.
+
+  We also need to install the `upgrade` package via `npm install @angular/upgrade --save`
+  and add a mapping for the `@angular/upgrade/static` package. 
 
 +makeExample('upgrade-phonecat-2-hybrid/ts/systemjs.config.1.js', 'paths', 'systemjs.config.js')
 
@@ -1603,11 +1613,15 @@ code-example(format="").
   * `app/core/phone/phone.module.ts`
   * `app/phone-detail/phone-detail.module.ts`
   * `app/phone-list/phone-list.module.ts`
-
+  
   The external typings for Angular 1 may be uninstalled as well. The only ones
   we still need are for Jasmine and Angular 2 polyfills.
 
+  The `@angular/upgrade` package and it's mapping in `systemjs.config.js` can also go, 
+  we don't need them anymore. 
+
 code-example(format="").
+  npm uninstall @angular/upgrade --save
   npm uninstall @types/angular @types/angular-animate @types/angular-cookies @types/angular-mocks @types/angular-resource @types/angular-route @types/angular-sanitize --save-dev
 
 :marked