Merge remote-tracking branch 'maraoz/feature/bundle-name'

Conflicts: browser/bitcore-0.1.24.js
bitpay · Jul 8, 2014 · 4e3b258 · 4e3b258
2 parents 5cdc160 + 9ac8682
commit 4e3b258
Show file tree

Hide file tree

Showing 5 changed files with 146 additions and 119 deletions.
diff --git a/browser/bundle.js → browser/bitcore-0.1.24.js b/browser/bundle.js → browser/bitcore-0.1.24.js
diff --git a/browser/bitcore-latest.js b/browser/bitcore-latest.js
@@ -0,0 +1 @@
+bitcore-0.1.24.js
diff --git a/browser/build.js b/browser/build.js
@@ -181,7 +181,10 @@ if (require.main === module) {
     testBundle.pipe(fs.createWriteStream('browser/testdata.js'));
   }
   var bitcoreBundle = createBitcore(program);
-  bitcoreBundle.pipe(program.stdout ? process.stdout : fs.createWriteStream('browser/bundle.js'));
+  var pjson = require('../package.json');
+  bitcoreBundle.pipe(
+      program.stdout ? process.stdout :
+      fs.createWriteStream('browser/bitcore-'+pjson.version+'.js'));
 }
 
 module.exports.createBitcore = createBitcore;

diff --git a/browser/testdata.js b/browser/testdata.js
diff --git a/test/index.html b/test/index.html
@@ -11,7 +11,7 @@
     <script src="../node_modules/mocha/mocha.js"></script>
     <script src="../node_modules/chai/chai.js"></script>
     <script>mocha.setup('bdd')</script>
-    <script src="../browser/bundle.js"></script>
+    <script src="../browser/bitcore-latest.js"></script>
     <script src="../browser/testdata.js"></script>
     <script src="adapter.js"></script>