From 38bb8f26fc64858271d8129fe9f91098be9b3e8b Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 12:53:51 -0500 Subject: [PATCH 1/4] 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 f827087a8..0ab9557c5 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ }, "dependencies": { "async": "^0.9.2", - "bitcore-lib": "^0.14.0", "body-parser": "^1.11.0", "compression": "^1.6.2", "coveralls": "^2.11.2", @@ -62,6 +61,9 @@ "supertest": "*", "tingodb": "^0.3.4" }, + "peerDependencies": { + "bitcore-lib": "^0.14.0" + }, "scripts": { "start": "./start.sh", "stop": "./stop.sh", From f54c906946d18285546c797789c346803109f1c7 Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 17:02:40 -0500 Subject: [PATCH 2/4] Updates for running on current ecosystem for travis --- .travis.yml | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ef77dc2e..7c4dad7df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ node_js: before_install: - export CXX="g++-4.8" CC="gcc-4.8" install: + # 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 after_success: - npm run coveralls diff --git a/package.json b/package.json index 0ab9557c5..0360a1e26 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "tingodb": "^0.3.4" }, "peerDependencies": { - "bitcore-lib": "^0.14.0" + "bitcore-lib": "~0.13.7" }, "scripts": { "start": "./start.sh", From 68e5782f7004df42b3ceaa64dc96df6ce85357fb Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 17:47:26 -0500 Subject: [PATCH 3/4] Install peerDependencies conditionally --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c4dad7df..ba63c695f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,9 @@ node_js: before_install: - export CXX="g++-4.8" CC="gcc-4.8" install: - # 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 + # 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 install after_success: - npm run coveralls From 337409637d4ff0791ed59ba535ef32e3f49f5b87 Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 18:03:28 -0500 Subject: [PATCH 4/4] Expects newer bitcore-lib then rest of ecosystem --- .travis.yml | 3 +-- package.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba63c695f..6b2eede2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,7 @@ before_install: - export CXX="g++-4.8" CC="gcc-4.8" 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 + - if [ $(npm --version | sed 's/\..*//g') -ge 3 ]; then npm install bitcore-lib; fi - npm install after_success: - npm run coveralls diff --git a/package.json b/package.json index 0360a1e26..294e989d7 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "tingodb": "^0.3.4" }, "peerDependencies": { - "bitcore-lib": "~0.13.7" + "bitcore-lib": "~0.14.0" }, "scripts": { "start": "./start.sh",