From 306ecbf1a338932e2747aefc911f5d5f84813108 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:00:14 -0300 Subject: [PATCH 01/14] fix postinstall script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 382f3d6..e043a8a 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "scripts": { "test": "mocha test -R spec", - "postinstall": "node ./browser/browserify.js -a" + "prepublish": "node browser/browserify.js -a" }, "dependencies": { "soop": "git://github.com/bitpay/soop.git", From b4afdedd409a7d9763df7c9635f9422210746075 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:09:34 -0300 Subject: [PATCH 02/14] fix postinstall --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e043a8a..2aee09e 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "scripts": { "test": "mocha test -R spec", - "prepublish": "node browser/browserify.js -a" + "postinstall": "node browser/browserify.js -a" }, "dependencies": { "soop": "git://github.com/bitpay/soop.git", From a3fa5834a40e0c18d1fb97ae29fabce5a4713181 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:12:23 -0300 Subject: [PATCH 03/14] use grunt in postinstall --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2aee09e..6f7079f 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "scripts": { "test": "mocha test -R spec", - "postinstall": "node browser/browserify.js -a" + "postinstall": "grunt shell" }, "dependencies": { "soop": "git://github.com/bitpay/soop.git", From 485ef5940252496c97b1483495b96e2339b8b931 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:14:03 -0300 Subject: [PATCH 04/14] add grunt dev dependency --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f7079f..db7be18 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,8 @@ "chai": "~1.9.0", "brfs": "~1.0.0", "async": "~0.2.10", - "commander": "~2.1.0" + "commander": "~2.1.0", + "grunt": "~0.4.3" }, "license": "MIT" } From 7d7777b2e371dc7ec0991663993245f859e1f6a6 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:18:06 -0300 Subject: [PATCH 05/14] fixing grunt reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index db7be18..12afc24 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "scripts": { "test": "mocha test -R spec", - "postinstall": "grunt shell" + "postinstall": "node_modules/.bin/grunt shell" }, "dependencies": { "soop": "git://github.com/bitpay/soop.git", From fa7e205de841858e4c16015836dcad03413014aa Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:20:59 -0300 Subject: [PATCH 06/14] still trying to fix postinstall --- browser/browserify.js | 1 + package.json | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/browserify.js b/browser/browserify.js index df52135..8e78a85 100644 --- a/browser/browserify.js +++ b/browser/browserify.js @@ -109,5 +109,6 @@ tb.transform('brfs'); tb.bundle().pipe(fs.createWriteStream('browser/testdata.js')); +console.log('cwd '+__dirname); diff --git a/package.json b/package.json index 12afc24..2aee09e 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "scripts": { "test": "mocha test -R spec", - "postinstall": "node_modules/.bin/grunt shell" + "postinstall": "node browser/browserify.js -a" }, "dependencies": { "soop": "git://github.com/bitpay/soop.git", @@ -69,8 +69,7 @@ "chai": "~1.9.0", "brfs": "~1.0.0", "async": "~0.2.10", - "commander": "~2.1.0", - "grunt": "~0.4.3" + "commander": "~2.1.0" }, "license": "MIT" } From dbc968e22670b27ce304bf2c91321b4916828a99 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:24:18 -0300 Subject: [PATCH 07/14] fixing postinstall --- browser/{browserify.js => build.js} | 0 package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename browser/{browserify.js => build.js} (100%) diff --git a/browser/browserify.js b/browser/build.js similarity index 100% rename from browser/browserify.js rename to browser/build.js diff --git a/package.json b/package.json index 2aee09e..ea10581 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "scripts": { "test": "mocha test -R spec", - "postinstall": "node browser/browserify.js -a" + "postinstall": "node browser/build.js -a" }, "dependencies": { "soop": "git://github.com/bitpay/soop.git", From 99a74a6ec31e7c75b98d00ae338ade55b2051854 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:25:22 -0300 Subject: [PATCH 08/14] fixing dependencies --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ea10581..e4cb417 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,8 @@ "chai": "~1.9.0", "brfs": "~1.0.0", "async": "~0.2.10", - "commander": "~2.1.0" + "commander": "~2.1.0", + "browserify": "~3.32.1" }, "license": "MIT" } From 49e9dd4930363b06b0a73f69a33e34b7b6799410 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:26:20 -0300 Subject: [PATCH 09/14] fix dependencies --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e4cb417..dc984fa 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,8 @@ "binary": "=0.3.0", "step": "=0.0.4", "buffers": "=0.1.1", - "buffertools": "~2.0.1" + "buffertools": "~2.0.1", + "browserify": "~3.32.1" }, "devDependencies": { "grunt-contrib-watch": "~0.5.3", @@ -69,8 +70,7 @@ "chai": "~1.9.0", "brfs": "~1.0.0", "async": "~0.2.10", - "commander": "~2.1.0", - "browserify": "~3.32.1" + "commander": "~2.1.0" }, "license": "MIT" } From 3c3c276867370ba487d68058a31bcab9d1cf354a Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:27:43 -0300 Subject: [PATCH 10/14] fix deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dc984fa..f9d8405 100644 --- a/package.json +++ b/package.json @@ -55,14 +55,14 @@ "step": "=0.0.4", "buffers": "=0.1.1", "buffertools": "~2.0.1", - "browserify": "~3.32.1" + "browserify": "~3.32.1", + "browser-pack": "~2.0.1" }, "devDependencies": { "grunt-contrib-watch": "~0.5.3", "grunt-mocha-test": "~0.8.2", "grunt-shell": "~0.6.4", "grunt-browserify": "~2.0.0", - "browser-pack": "*", "grunt-markdown": "~0.5.0", "mocha": ">=1.15.1", "browserify-bignum": "git://github.com/maraoz/browserify-bignum.git", From 25b75b1154b34701fb76cabacfdd5f0f9e0a690d Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:32:02 -0300 Subject: [PATCH 11/14] fixing deps --- package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f9d8405..1d01d4d 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,9 @@ "buffers": "=0.1.1", "buffertools": "~2.0.1", "browserify": "~3.32.1", - "browser-pack": "~2.0.1" + "browser-pack": "~2.0.1", + "commander": "~2.1.0", + "brfs": "~1.0.0" }, "devDependencies": { "grunt-contrib-watch": "~0.5.3", @@ -70,7 +72,8 @@ "chai": "~1.9.0", "brfs": "~1.0.0", "async": "~0.2.10", - "commander": "~2.1.0" + "commander": "~2.1.0", + "browser-pack": "~2.0.1" }, "license": "MIT" } From f30aba9b393bbde8538c3356878e5c32dd4335d8 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:34:42 -0300 Subject: [PATCH 12/14] fixing deps for child projects --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1d01d4d..22a7f3b 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,8 @@ "browserify": "~3.32.1", "browser-pack": "~2.0.1", "commander": "~2.1.0", + "browserify-bignum": "git://github.com/maraoz/browserify-bignum.git", + "browserify-buffertools": "~1.0.2", "brfs": "~1.0.0" }, "devDependencies": { @@ -67,8 +69,6 @@ "grunt-browserify": "~2.0.0", "grunt-markdown": "~0.5.0", "mocha": ">=1.15.1", - "browserify-bignum": "git://github.com/maraoz/browserify-bignum.git", - "browserify-buffertools": "~1.0.2", "chai": "~1.9.0", "brfs": "~1.0.0", "async": "~0.2.10", From c339fb1f2f997240eac406d20f6081d7faeb6ef6 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:37:24 -0300 Subject: [PATCH 13/14] change README names --- README.md | 4 ++-- browser/build.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ca5c591..33f9750 100644 --- a/README.md +++ b/README.md @@ -262,7 +262,7 @@ To build bitcore full bundle for the browser: (this is automatically executed after you run `npm install`) ``` -node browser/browserify.js -a +node browser/build.js -a ``` This will generate a `browser/bundle.js` file which you can include in your HTML to use bitcore in the browser. @@ -294,7 +294,7 @@ To generate a customized bitcore bundle, you can specify which submodules you want to include in it with the -s option: ``` -node browser/browserify.js -s Transaction,Address +node browser/build.js -s Transaction,Address ``` This will generate a `browser/bundle.js` containing only the Transaction and Address class, with all their dependencies. diff --git a/browser/build.js b/browser/build.js index 8e78a85..df52135 100644 --- a/browser/build.js +++ b/browser/build.js @@ -109,6 +109,5 @@ tb.transform('brfs'); tb.bundle().pipe(fs.createWriteStream('browser/testdata.js')); -console.log('cwd '+__dirname); From 2b3d8e1d2530084dc9f4dfceb9d3dfcfea34a3c5 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Mar 2014 09:38:21 -0300 Subject: [PATCH 14/14] fix Gruntfile --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8bf4826..76f758c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -16,7 +16,7 @@ module.exports = function(grunt) { stdout: true, stderr: true }, - command: 'node ./browser/browserify.js -a', + command: 'node ./browser/build.js -a', } }, watch: {