more cleanup`

Author: jelbourn

angular-cli-build.js

@@ -26,6 +26,8 @@ module.exports = function(defaults) {
   const ngTree = angularAppTree.toTree();
   const ngNewPackagesRelease = new Funnel('node_modules/@angular', {destDir: '@angular'});
   const rxjs = new Funnel('node_modules/rxjs', {destDir: 'rxjs'});
+  const zonejs = new Funnel('node_modules/zone.js', {destDir: 'zonejs'});
+  const reflectMetadata = new Funnel('node_modules/reflect-metadata', {destDir: 'reflect-metadata'});
   const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
     include: [ '**/*.css' ]
   }));
@@ -36,5 +38,7 @@ module.exports = function(defaults) {
     cssAutoprefixed,
     ngNewPackagesRelease,
     rxjs,
+    zonejs,
+    reflectMetadata,
   ], { overwrite: true });
 };

src/index.html

@@ -7,7 +7,8 @@
   <base href="/">
   <script src="vendor/es6-shim/es6-shim.js"></script>
   <script src="vendor/systemjs/dist/system-polyfills.js"></script>
-  <script src="vendor/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="zonejs/dist/zone.js"></script>
+  <script src="reflect-metadata/Reflect.js"></script>
   {{content-for 'head'}}
   <link rel="icon" type="image/x-icon" href="favicon.ico">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -19,10 +20,7 @@
   <demo-app>Loading...</demo-app>
 
   <script src="vendor/systemjs/dist/system.src.js"></script>
-  <script src="vendor/rxjs/bundles/Rx.js"></script>
-  <script src="vendor/angular2/bundles/angular2.dev.js"></script>
-  <script src="vendor/angular2/bundles/http.dev.js"></script>
-  <script src="vendor/angular2/bundles/router.dev.js"></script>
+  <script src="rxjs/bundles/Rx.js"></script>
 
   <script src="https://ajax.googleapis.com/ajax/libs/hammerjs/2.0.8/hammer.min.js"></script>
   <script>

test/karma.config.ts

@@ -23,25 +23,18 @@ export function config(config) {
       'node_modules/reflect-metadata/Reflect.js',
       {pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: true, watched: false},
       {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false},
-      // 'node_modules/angular2/es6/dev/src/testing/shims_for_IE.js',
 
       // Zone polyfills *must* be loaded after es6-shim and system-polyfills in order to
       // setup the monkey-patches for zones.
-      // {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false},
       'node_modules/zone.js/dist/zone.js',
       {pattern: 'node_modules/zone.js/dist/jasmine-patch.js', included: true, watched: false},
       {pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: false},
       {pattern: 'node_modules/zone.js/dist/fake-async-test.js', included: true, watched: false},
-      // {pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: false},
 
       // RxJs.
       {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false},
       {pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false},
 
-      // {pattern: 'node_modules/angular2/bundles/angular2.dev.js', included: true, watched: false},
-      // {pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: false},
-      // {pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: false},
-
       {pattern: 'test/karma-test-shim.js', included: true, watched: true},
 
       // paths loaded via module imports