From 7b269568befea8c9bb5e606ca5590e35af2f4bdc Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 12:55:33 -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 b95909a26..8386e9c34 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "bitcoreNode": "lib", "dependencies": { "async": "*", - "bitcore-lib": "^0.13.7", "bitcore-message": "^1.0.1", "body-parser": "^1.13.3", "compression": "^1.6.1", @@ -76,5 +75,8 @@ "proxyquire": "^1.7.2", "should": "^8.3.1", "sinon": "^1.10.3" + }, + "peerDependencies": { + "bitcore-lib": "^0.14.0" } } From d0532d3ff36c914d3709268ab010697770628be2 Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 13:40:09 -0500 Subject: [PATCH 2/4] Explicitly install bitcore-lib --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index aa9deeb7b..6144446dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,3 +4,4 @@ node_js: - 'v4' install: - npm install + - npm install bitcore-lib From 9f00e579cb5fb79c7ab8aa2e69e6fb87ee712f96 Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 17:02:34 -0500 Subject: [PATCH 3/4] 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 6144446dd..7b94de51b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,6 @@ node_js: - 'v0.12.7' - 'v4' 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 - - npm install bitcore-lib diff --git a/package.json b/package.json index 8386e9c34..d144cded2 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,6 @@ "sinon": "^1.10.3" }, "peerDependencies": { - "bitcore-lib": "^0.14.0" + "bitcore-lib": "~0.13.7" } } From 15ff30be087b102d726e7df7c3e90f445a3ff202 Mon Sep 17 00:00:00 2001 From: John Dean Date: Sat, 25 Mar 2017 17:46:07 -0500 Subject: [PATCH 4/4] Install peerDependencies conditionally --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b94de51b..5e10fffd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ node_js: - 'v0.12.7' - 'v4' 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