aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-12-05 23:25:45 +0800
committerFabio Berger <me@fabioberger.com>2017-12-05 23:25:45 +0800
commitdf58593ff41b4476b0e5b2c851e902391f4da843 (patch)
tree3a9bfb096917adda3a29b329eece2f29b9499544
parent3d73167f535f00047a03620aa584307d083b4840 (diff)
downloaddexon-0x-contracts-df58593ff41b4476b0e5b2c851e902391f4da843.tar.gz
dexon-0x-contracts-df58593ff41b4476b0e5b2c851e902391f4da843.tar.zst
dexon-0x-contracts-df58593ff41b4476b0e5b2c851e902391f4da843.zip
Move testrpc to top-level package.json and standardize some versions
-rw-r--r--package.json3
-rw-r--r--packages/0x.js/package.json3
-rw-r--r--packages/connect/package.json2
-rw-r--r--yarn.lock30
4 files changed, 25 insertions, 13 deletions
diff --git a/package.json b/package.json
index 091ae1069..461591004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"async-child-process": "^1.1.1",
"semver-sort": "^0.0.4",
"publish-release": "0xproject/publish-release",
- "es6-promisify": "^5.0.0"
+ "es6-promisify": "^5.0.0",
+ "ethereumjs-testrpc": "6.0.3"
}
}
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 97aff0581..593521258 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -61,7 +61,6 @@
"copyfiles": "^1.2.0",
"coveralls": "^3.0.0",
"dirty-chai": "^2.0.1",
- "ethereumjs-testrpc": "6.0.3",
"json-loader": "^0.5.4",
"mocha": "^4.0.0",
"npm-run-all": "^4.0.2",
@@ -79,7 +78,7 @@
"types-ethereumjs-util": "0xProject/types-ethereumjs-util",
"typescript": "~2.6.1",
"web3-provider-engine": "^13.0.1",
- "web3-typescript-typings": "^0.7.1",
+ "web3-typescript-typings": "^0.7.2",
"webpack": "^3.1.0"
},
"dependencies": {
diff --git a/packages/connect/package.json b/packages/connect/package.json
index c46d00e7b..3a49cc547 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -64,6 +64,6 @@
"tslint": "5.8.0",
"typedoc": "~0.8.0",
"typescript": "~2.6.1",
- "web3-typescript-typings": "^0.7.1"
+ "web3-typescript-typings": "^0.7.2"
}
}
diff --git a/yarn.lock b/yarn.lock
index 53bf63887..6cdf16f33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -108,7 +108,7 @@
version "2.0.29"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
-"@types/mocha@^2.2.41", "@types/mocha@^2.2.42":
+"@types/mocha@^2.2.41", "@types/mocha@^2.2.42", "@types/mocha@^2.2.44":
version "2.2.44"
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.44.tgz#1d4a798e53f35212fd5ad4d04050620171cd5b5e"
@@ -1574,7 +1574,7 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"
-chai-as-promised-typescript-typings@0.0.3:
+chai-as-promised-typescript-typings@0.0.3, chai-as-promised-typescript-typings@^0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/chai-as-promised-typescript-typings/-/chai-as-promised-typescript-typings-0.0.3.tgz#8694287ebe2dd6c18a96667c38151d714d6ecbb6"
dependencies:
@@ -2097,10 +2097,14 @@ conventional-recommended-bump@^1.0.1:
meow "^3.3.0"
object-assign "^4.0.1"
-convert-source-map@^1.1.0, convert-source-map@^1.3.0, convert-source-map@^1.5.0:
+convert-source-map@^1.1.0, convert-source-map@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+convert-source-map@^1.3.0:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
cookie-signature@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -5212,11 +5216,11 @@ mute-stream@0.0.7, mute-stream@~0.0.4:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-nan@^2.0.5, nan@^2.0.8, nan@^2.2.1, nan@^2.3.0, nan@^2.3.3:
+nan@^2.0.5, nan@^2.2.1, nan@^2.3.0, nan@^2.3.3:
version "2.7.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-nan@^2.4.0:
+nan@^2.0.8, nan@^2.4.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
@@ -5390,7 +5394,7 @@ normalize-url@^1.4.0:
query-string "^4.1.0"
sort-keys "^1.0.0"
-npm-run-all@^4.0.2, npm-run-all@^4.1.1:
+npm-run-all@^4.0.2, npm-run-all@^4.1.1, npm-run-all@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056"
dependencies:
@@ -7041,6 +7045,10 @@ selfsigned@^1.9.1:
dependencies:
node-forge "0.6.33"
+semaphore-async-await@^1.5.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz#857bef5e3644601ca4b9570b87e9df5ca12974fa"
+
semaphore@>=1.0.1, semaphore@^1.0.3:
version "1.1.0"
resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
@@ -8073,6 +8081,10 @@ typescript@2.6.1, typescript@^2.4.1, typescript@^2.4.2, typescript@~2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"
+typescript@^2.6.1:
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+
ua-parser-js@^0.7.9:
version "0.7.17"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
@@ -8361,9 +8373,9 @@ web3-provider-engine@^8.4.0:
xhr "^2.2.0"
xtend "^4.0.1"
-web3-typescript-typings@^0.7.1:
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/web3-typescript-typings/-/web3-typescript-typings-0.7.1.tgz#4b1145b9fd7e80292c2ab6b75e2359cf95f0efe1"
+web3-typescript-typings@^0.7.2:
+ version "0.7.2"
+ resolved "https://registry.yarnpkg.com/web3-typescript-typings/-/web3-typescript-typings-0.7.2.tgz#5312bb786936a9c91381eee7af3d02ac21cf13b3"
dependencies:
bignumber.js "^4.0.2"