Merge branch 'master' into alphabetize-barrel

Author: phillipgreenii

lib/broccoli/angular2-app.js

@@ -160,7 +160,7 @@ class Angular2App extends BroccoliPlugin {
     }
 
     if (this.ngConfig.apps[0].mobile) {
-      var ServiceWorkerPlugin = require('angular2-service-worker').ServiceWorkerPlugin;
+      var ServiceWorkerPlugin = require('@angular/service-worker').ServiceWorkerPlugin;
       var swTree = new ServiceWorkerPlugin(merged);
       merged = BroccoliMergeTrees([merged, swTree], {
         overwrite: true
@@ -357,7 +357,7 @@ class Angular2App extends BroccoliPlugin {
     ];
 
     if (this.ngConfig.apps[0].mobile) {
-      vendorNpmFiles.push('angular2-service-worker/dist/worker.js')
+      vendorNpmFiles.push('@angular/service-worker/dist/worker.js')
     }
 
     if (this._options.vendorNpmFiles) {
@@ -415,6 +415,7 @@ class Angular2App extends BroccoliPlugin {
     var indexFile = path.join(this._sourceDir, 'index.html');
     var indexContent = fs.readFileSync(indexFile, 'utf8');
     var scriptTagVendorFiles = indexContent.match(/vendor\/[^"']*\.js/gi);
+    var vendorTree = this._getVendorNpmTree();
 
     var scriptTree = new BroccoliFunnel(preBundleTree, {
       include: scriptTagVendorFiles
@@ -430,7 +431,7 @@ class Angular2App extends BroccoliPlugin {
     var bundleTree = new BundlePlugin([jsTree]);
 
     if (this.ngConfig.apps[0].mobile) {
-      bundleTree = concat(BroccoliMergeTrees([jsTree, scriptTree, bundleTree], {
+      bundleTree = concat(BroccoliMergeTrees([vendorTree, jsTree, scriptTree, bundleTree], {
         overwrite: true
       }), {
         headerFiles: this._options.polyfills.concat([