aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Browne <stephenalexbrowne@gmail.com>2018-08-17 08:10:28 +0800
committerGitHub <noreply@github.com>2018-08-17 08:10:28 +0800
commit8131a87046e129f6f5a8978e6133fb21abd8db42 (patch)
tree17fb00c6b889c060ac52566d0b3f9bd78b7ebcaa
parent2604d40751f860b3612d97c460a033d1ed010fb5 (diff)
parentb7079e9616d44bb7bda0d3f3385d3a44406f08a2 (diff)
downloaddexon-sol-tools-8131a87046e129f6f5a8978e6133fb21abd8db42.tar
dexon-sol-tools-8131a87046e129f6f5a8978e6133fb21abd8db42.tar.gz
dexon-sol-tools-8131a87046e129f6f5a8978e6133fb21abd8db42.tar.bz2
dexon-sol-tools-8131a87046e129f6f5a8978e6133fb21abd8db42.tar.lz
dexon-sol-tools-8131a87046e129f6f5a8978e6133fb21abd8db42.tar.xz
dexon-sol-tools-8131a87046e129f6f5a8978e6133fb21abd8db42.tar.zst
dexon-sol-tools-8131a87046e129f6f5a8978e6133fb21abd8db42.zip
Merge pull request #978 from 0xProject/feature/lenra-3.0.0-beta.25
feat: Update lerna to version 3.0.0-beta.25 of our fork
-rw-r--r--package.json2
-rw-r--r--yarn.lock41
2 files changed, 21 insertions, 22 deletions
diff --git a/package.json b/package.json
index 9b8146be8..c6b0ac2dd 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
},
"devDependencies": {
- "@0x-lerna-fork/lerna": "3.0.0-beta.23",
+ "@0x-lerna-fork/lerna": "3.0.0-beta.25",
"async-child-process": "^1.1.1",
"coveralls": "^3.0.0",
"ganache-cli": "6.1.3",
diff --git a/yarn.lock b/yarn.lock
index 0e9e2470d..4bbc2783d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -72,14 +72,14 @@
read-package-tree "^5.1.6"
semver "^5.5.0"
-"@0x-lerna-fork/changed@^3.0.0-beta.22":
- version "3.0.0-beta.22"
- resolved "https://registry.yarnpkg.com/@0x-lerna-fork/changed/-/changed-3.0.0-beta.22.tgz#febe7309820d88e95695fab538849302ae7e58a4"
+"@0x-lerna-fork/changed@^3.0.0-beta.25":
+ version "3.0.0-beta.25"
+ resolved "https://registry.yarnpkg.com/@0x-lerna-fork/changed/-/changed-3.0.0-beta.25.tgz#68fec3a4bf2b0808561db2d13d0b117659fb3242"
dependencies:
"@0x-lerna-fork/collect-updates" "^3.0.0-beta.22"
"@0x-lerna-fork/command" "^3.0.0-beta.22"
"@0x-lerna-fork/output" "^3.0.0-beta.22"
- "@0x-lerna-fork/publish" "^3.0.0-beta.22"
+ "@0x-lerna-fork/publish" "^3.0.0-beta.25"
chalk "^2.3.1"
"@0x-lerna-fork/child-process@^3.0.0-beta.22":
@@ -102,13 +102,13 @@
p-map-series "^1.0.0"
p-waterfall "^1.0.0"
-"@0x-lerna-fork/cli@^3.0.0-beta.22":
- version "3.0.0-beta.22"
- resolved "https://registry.yarnpkg.com/@0x-lerna-fork/cli/-/cli-3.0.0-beta.22.tgz#131f5de34ede1a1c04e007d122cc8c0583355b95"
+"@0x-lerna-fork/cli@^3.0.0-beta.25":
+ version "3.0.0-beta.25"
+ resolved "https://registry.yarnpkg.com/@0x-lerna-fork/cli/-/cli-3.0.0-beta.25.tgz#1becdaf2cf2cbbbda7e2fcc96c3058398d7ed802"
dependencies:
"@0x-lerna-fork/add" "^3.0.0-beta.22"
"@0x-lerna-fork/bootstrap" "^3.0.0-beta.22"
- "@0x-lerna-fork/changed" "^3.0.0-beta.22"
+ "@0x-lerna-fork/changed" "^3.0.0-beta.25"
"@0x-lerna-fork/clean" "^3.0.0-beta.22"
"@0x-lerna-fork/create" "^3.0.0-beta.22"
"@0x-lerna-fork/diff" "^3.0.0-beta.22"
@@ -118,7 +118,7 @@
"@0x-lerna-fork/init" "^3.0.0-beta.22"
"@0x-lerna-fork/link" "^3.0.0-beta.22"
"@0x-lerna-fork/list" "^3.0.0-beta.22"
- "@0x-lerna-fork/publish" "^3.0.0-beta.22"
+ "@0x-lerna-fork/publish" "^3.0.0-beta.25"
"@0x-lerna-fork/run" "^3.0.0-beta.22"
dedent "^0.7.0"
is-ci "^1.0.10"
@@ -271,11 +271,11 @@
p-map "^1.2.0"
write-json-file "^2.3.0"
-"@0x-lerna-fork/lerna@3.0.0-beta.23":
- version "3.0.0-beta.23"
- resolved "https://registry.yarnpkg.com/@0x-lerna-fork/lerna/-/lerna-3.0.0-beta.23.tgz#102390423e6ed6c1d0b72f43da166d85bc6bd0ac"
+"@0x-lerna-fork/lerna@3.0.0-beta.25":
+ version "3.0.0-beta.25"
+ resolved "https://registry.yarnpkg.com/@0x-lerna-fork/lerna/-/lerna-3.0.0-beta.25.tgz#0b5b85b4af3741863937f85ef130500e23325593"
dependencies:
- "@0x-lerna-fork/cli" "^3.0.0-beta.22"
+ "@0x-lerna-fork/cli" "^3.0.0-beta.25"
import-local "^1.0.0"
npmlog "^4.1.2"
@@ -326,9 +326,9 @@
signal-exit "^3.0.2"
write-pkg "^3.1.0"
-"@0x-lerna-fork/npm-publish@^3.0.0-beta.22":
- version "3.0.0-beta.22"
- resolved "https://registry.yarnpkg.com/@0x-lerna-fork/npm-publish/-/npm-publish-3.0.0-beta.22.tgz#4199433a49f8b92293c220dc11f9db5dcb5ced56"
+"@0x-lerna-fork/npm-publish@^3.0.0-beta.25":
+ version "3.0.0-beta.25"
+ resolved "https://registry.yarnpkg.com/@0x-lerna-fork/npm-publish/-/npm-publish-3.0.0-beta.25.tgz#a448ff29808bdce8afd34c3c6a9c5e3e44d5e6e6"
dependencies:
"@0x-lerna-fork/child-process" "^3.0.0-beta.22"
"@0x-lerna-fork/get-npm-exec-opts" "^3.0.0-beta.22"
@@ -384,9 +384,9 @@
inquirer "^5.1.0"
npmlog "^4.1.2"
-"@0x-lerna-fork/publish@^3.0.0-beta.22":
- version "3.0.0-beta.22"
- resolved "https://registry.yarnpkg.com/@0x-lerna-fork/publish/-/publish-3.0.0-beta.22.tgz#3fc44b93e30b872efd8161e45d1484416f01a5db"
+"@0x-lerna-fork/publish@^3.0.0-beta.25":
+ version "3.0.0-beta.25"
+ resolved "https://registry.yarnpkg.com/@0x-lerna-fork/publish/-/publish-3.0.0-beta.25.tgz#edcb6d68b441b8456ceafb3073509da20fa2af0c"
dependencies:
"@0x-lerna-fork/batch-packages" "^3.0.0-beta.22"
"@0x-lerna-fork/child-process" "^3.0.0-beta.22"
@@ -395,7 +395,7 @@
"@0x-lerna-fork/conventional-commits" "^3.0.0-beta.22"
"@0x-lerna-fork/npm-conf" "^3.0.0-beta.22"
"@0x-lerna-fork/npm-dist-tag" "^3.0.0-beta.22"
- "@0x-lerna-fork/npm-publish" "^3.0.0-beta.22"
+ "@0x-lerna-fork/npm-publish" "^3.0.0-beta.25"
"@0x-lerna-fork/output" "^3.0.0-beta.22"
"@0x-lerna-fork/prompt" "^3.0.0-beta.22"
"@0x-lerna-fork/run-lifecycle" "^3.0.0-beta.22"
@@ -5258,7 +5258,6 @@ ethereumjs-wallet@~0.6.0:
ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22:
version "3.0.18"
- uid b91342bd200d142af0165d6befddf783c8ae8447
resolved "https://codeload.github.com/0xproject/ethers.js/tar.gz/b91342bd200d142af0165d6befddf783c8ae8447"
dependencies:
aes-js "3.0.0"