From 2d19e30f72b2fd8863499ecf26bef600eec50ae7 Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 12:49:23 -0500 Subject: [PATCH 1/5] Use bitcore-lib as a peerDependency --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e02b7cf0..85d6464de 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "dependencies": { "async": "^1.3.0", "bitcoind-rpc": "^0.6.0", - "bitcore-lib": "^0.13.13", "body-parser": "^1.13.3", "colors": "^1.1.2", "commander": "^2.8.1", @@ -78,5 +77,8 @@ "rimraf": "^2.4.2", "sinon": "^1.15.4" }, + "peerDependencies": { + "bitcore-lib": "^0.14" + }, "license": "MIT" } From 40582fdfe4f589296fed07637d4b12b67781a95c Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 13:39:25 -0500 Subject: [PATCH 2/5] Explicitly install bitcore-lib --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fbc8be0eb..981123032 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,10 @@ node_js: - "v0.12.7" - "v4" script: + - npm install + - npm install bitcore-lib - npm run regtest - npm run test - npm run jshint after_success: - - npm run coveralls \ No newline at end of file + - npm run coveralls From 523e16201ec9f1f08996b8335ef1bd88589a462e Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 17:03:35 -0500 Subject: [PATCH 3/5] Updates for running on current ecosystem for travis --- .travis.yml | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 981123032..39b4512f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,9 @@ node_js: - "v0.12.7" - "v4" script: +# When all dependencies declare bitcore-lib as a peerDependency this can be bumped up, but this matches the current version expected by dependencies + - npm install bitcore-lib@0.13.7 - npm install - - npm install bitcore-lib - npm run regtest - npm run test - npm run jshint diff --git a/package.json b/package.json index 85d6464de..87f40a1d9 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "sinon": "^1.15.4" }, "peerDependencies": { - "bitcore-lib": "^0.14" + "bitcore-lib": "~0.13.7" }, "license": "MIT" } From 5520e32180ae6102e1cedf66def2d68b3a043e84 Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 17:45:14 -0500 Subject: [PATCH 4/5] Install peerDependencies conditionally --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39b4512f1..314c9dbe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,9 @@ node_js: - "v0.12.7" - "v4" script: -# When all dependencies declare bitcore-lib as a peerDependency this can be bumped up, but this matches the current version expected by dependencies - - npm install bitcore-lib@0.13.7 - - npm install + # Install peerDependencies on > npm3 + # When all dependencies declare bitcore-lib as a peerDependency this can be bumped up, but this matches the current ecosystem version expected by dependencies + - if [ $(npm --version | sed 's/\..*//g') -ge 3 ]; then npm install bitcore-lib@0.13.7; fi - npm run regtest - npm run test - npm run jshint From ffef84a5099adefed1d644d025754fb276878c2d Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 18:05:34 -0500 Subject: [PATCH 5/5] Small version bump to match master --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 314c9dbe5..99db04413 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ node_js: script: # Install peerDependencies on > npm3 # When all dependencies declare bitcore-lib as a peerDependency this can be bumped up, but this matches the current ecosystem version expected by dependencies - - if [ $(npm --version | sed 's/\..*//g') -ge 3 ]; then npm install bitcore-lib@0.13.7; fi + - if [ $(npm --version | sed 's/\..*//g') -ge 3 ]; then npm install bitcore-lib@^0.13.13; fi - npm run regtest - npm run test - npm run jshint diff --git a/package.json b/package.json index 87f40a1d9..786668c56 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "sinon": "^1.15.4" }, "peerDependencies": { - "bitcore-lib": "~0.13.7" + "bitcore-lib": "~0.13.13" }, "license": "MIT" }