From 42122cb08a4b8e47a87419369adf892dd09974f5 Mon Sep 17 00:00:00 2001
From: John Dean <john.holmes.dean@gmail.com>
Date: Sat, 25 Mar 2017 12:58:28 -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 10b1f4ed..4fc43493 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,6 @@
"url": "https://github.com/bitpay/bitcore-p2p.git"
},
"dependencies": {
- "bitcore-lib": "^0.13.7",
"bloom-filter": "^0.2.0",
"buffers": "bitpay/node-buffers#v0.1.2-bitpay",
"socks5-client": "^0.3.6"
@@ -64,5 +63,8 @@
"gulp": "^3.8.10",
"sinon": "^1.12.2"
},
+ "peerDependencies": {
+ "bitcore-lib": "^0.14.0"
+ },
"license": "MIT"
}
From 982c9c43e4c6769917e1f1d443c794f3511e2792 Mon Sep 17 00:00:00 2001
From: John Dean <john.holmes.dean@gmail.com>
Date: Sat, 25 Mar 2017 13:38:57 -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 f2d7cd06..2f24aecc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,5 +7,6 @@ before_install:
- sh -e /etc/init.d/xvfb start
install:
- npm install
+ - npm install bitcore-lib
after_script:
- gulp coveralls
From be7c3d1f197b7ecc5b304b869e005c5a660bd758 Mon Sep 17 00:00:00 2001
From: John Dean <john.holmes.dean@gmail.com>
Date: Sat, 25 Mar 2017 17:04:13 -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 2f24aecc..108b57f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,8 @@ before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
+ # When all dependencies declare bitcore-lib as a peerDependency this can be bumped up, but this matches the current ecosystem version expected by dependencies
+ - npm install bitcore-lib@0.13.7
- npm install
- - npm install bitcore-lib
after_script:
- gulp coveralls
diff --git a/package.json b/package.json
index 4fc43493..56bfe110 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
"sinon": "^1.12.2"
},
"peerDependencies": {
- "bitcore-lib": "^0.14.0"
+ "bitcore-lib": "~0.13.7"
},
"license": "MIT"
}
From 1bb691981dd5c3c0746c75353683f5b2f03a9496 Mon Sep 17 00:00:00 2001
From: John Dean <john.holmes.dean@gmail.com>
Date: Sat, 25 Mar 2017 17:45:56 -0500
Subject: [PATCH 4/4] Install peerDependencies conditionally
---
.travis.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 108b57f6..9d381a8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,9 @@ before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
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
- - npm install bitcore-lib@0.13.7
+ - if [ $(npm --version | sed 's/\..*//g') -ge 3 ]; then npm install bitcore-lib@0.13.7; fi
- npm install
after_script:
- gulp coveralls