Merge remote-tracking branch 'upstream/master' into webpack

Author: hansl

lib/broccoli/angular2-app.js

@@ -147,13 +147,6 @@ class Angular2App extends BroccoliPlugin {
       }));
     }
 
-    // Add the public folder in.
-    buildTrees.push(new BroccoliFunnel(this._inputNode, {
-      allowEmpty: true,
-      srcDir: 'public',
-      name: 'PublicFolderFunnel'
-    }));
-
     var merged = new BroccoliMergeTrees(buildTrees, { overwrite: true });
 
     if (this.ngConfig.apps[0].mobile) {
@@ -167,6 +160,15 @@ class Angular2App extends BroccoliPlugin {
       merged = this._getBundleTree(merged);
     }
 
+    // Public folder funnel 
+    var publicFolder =  new BroccoliFunnel(this._inputNode, {
+      allowEmpty: true,
+      srcDir: 'public',
+      name: 'PublicFolderFunnel'
+    });
+
+    merged = new BroccoliMergeTrees([merged, publicFolder]);
+
     return new BroccoliFunnel(merged, {
       destDir: this._destDir,
       overwrite: true

package.json

@@ -114,7 +114,7 @@
     "exists-sync": "0.0.3",
     "minimatch": "^3.0.0",
     "mocha": "^2.4.5",
-    "mock-fs": "^3.8.0",
+    "mock-fs": "3.10.0",
     "object-assign": "^4.0.1",
     "rewire": "^2.5.1",
     "sinon": "^1.17.3",

scripts/publish/shrinkwrap.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+'use strict';
+
+
+function removeResolvedKeys(json) {
+  if (json['resolved']) {
+    delete json['resolved'];
+  }
+  if (json['_resolved']) {
+    delete json['_resolved'];
+  }
+
+  const deps = json['dependencies'] || {};
+  for (const key of Object.keys(deps)) {
+    deps[key] = removeResolvedKeys(deps[key]);
+  }
+
+  return json;
+}
+
+
+const fs = require('fs');
+const path = require('path');
+
+const shrinkwrapPath = path.join(__dirname, '../../npm-shrinkwrap.json');
+const shrinkwrap = JSON.parse(fs.readFileSync(shrinkwrapPath, 'utf-8'));
+
+const newJson = removeResolvedKeys(shrinkwrap);
+fs.writeFileSync(shrinkwrapPath, JSON.stringify(newJson, null, 2), 'utf-8');

tests/acceptance/github-pages-deploy.spec.js

@@ -45,15 +45,15 @@ describe('Acceptance: ng github-pages:deploy', function() {
       .then(() => process.chdir('./tmp'))
       .then(() => ng(['new', project, '--skip-npm', '--skip-bower']))
       .then(() => setupDist())
-      .then(() => execStub = new ExecStub());
+      .finally(() => execStub = new ExecStub());
   });
 
   afterEach(function() {
     this.timeout(10000);
     return tmp.teardown('./tmp')
       .then(() => expect(execStub.hasFailed()).to.be.false)
       .then(() => expect(execStub.hasEmptyStack()).to.be.true)
-      .then(() => execStub.restore());
+      .finally(() => execStub.restore());
   });
 
   it('should fail with uncommited changes', function() {