diff options
author | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
commit | 2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5 (patch) | |
tree | 60d846e22cf80416f0dd43ead8dd494c5735152f /yarn.lock | |
parent | 5468358f2142549c68ffae0085ce7d31ea271ea4 (diff) | |
parent | 7d9c357409c25996f9c448dffd69007f69b9d8d6 (diff) | |
download | dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.gz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.bz2 dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.lz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.xz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.zst dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.zip |
Merge branch 'development' into addExtraDocs
* development: (29 commits)
Set Lodash dep to an exact version since newer versions introduced breaking changes
Update Kovan Ethertoken Address
Update deployer version since manual re-publish
Add new entry into CHANGELOG
Fix bad merge
Update yarn.lock
Change title
Add Blake and Zach to About page
Re-size Jacob and Tom's images
Manually publish 0x.js back to a working state
Publish
Publish
Fix 0x.js assets
Remove assets from connect and _bundles from packages that don't generate the folder
Publish
Fix packages that aren't working as expected
Make new packages default to public on publish
Add new public packages to top-level README
Update top-level package.json
Fix incorrect new versions
...
# Conflicts:
# packages/0x.js/package.json
# packages/connect/package.json
# packages/json-schemas/package.json
# packages/sol-cov/package.json
Diffstat (limited to 'yarn.lock')
-rw-r--r-- | yarn.lock | 46 |
1 files changed, 42 insertions, 4 deletions
@@ -213,7 +213,7 @@ dependencies: "@types/node" "*" -"@types/mocha@^2.2.42": +"@types/mocha@^2.2.42", "@types/mocha@^2.2.48": version "2.2.48" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab" @@ -223,6 +223,12 @@ dependencies: moment "*" +"@types/nock@^9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@types/nock/-/nock-9.1.2.tgz#0515b27e3f6bbc11834d22508ad02e2921dd376a" + dependencies: + "@types/node" "*" + "@types/node@*": version "9.4.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.7.tgz#57d81cd98719df2c9de118f2d5f3b1120dcd7275" @@ -367,6 +373,10 @@ version "10.0.2" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-10.0.2.tgz#cc4ea921877874d1261e2c44b89807bc836e1b12" +"@types/yargs@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.0.0.tgz#124b9ed9c65b7091cc36da59ae12cbd47d8745ea" + JSONStream@^1.0.4: version "1.3.2" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea" @@ -1987,6 +1997,12 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" +chai-as-promised-typescript-typings@^0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/chai-as-promised-typescript-typings/-/chai-as-promised-typescript-typings-0.0.10.tgz#fad2fd48b1a1c1ad53ef7204fe9e3ffaa877d0e2" + dependencies: + chai-typescript-typings "^0.0.4" + chai-as-promised@^7.1.0: version "7.1.1" resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0" @@ -1997,6 +2013,10 @@ chai-bignumber@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/chai-bignumber/-/chai-bignumber-2.0.2.tgz#de6c219c690b2d66b646ad6930096f9ba2199643" +chai-typescript-typings@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/chai-typescript-typings/-/chai-typescript-typings-0.0.4.tgz#f4d4057b4b1b89d9bd0e35862fc4761ae76cc94b" + chai@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247" @@ -2005,7 +2025,7 @@ chai@^3.5.0: deep-eql "^0.1.3" type-detect "^1.0.0" -chai@^4.0.1: +chai@^4.0.1, chai@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c" dependencies: @@ -3092,7 +3112,7 @@ deep-eql@^3.0.0: dependencies: type-detect "^4.0.0" -deep-equal@^1.0.1, deep-equal@~1.0.1: +deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" @@ -7321,6 +7341,20 @@ nise@^1.2.0: path-to-regexp "^1.7.0" text-encoding "^0.6.4" +nock@^9.2.3: + version "9.2.3" + resolved "https://registry.yarnpkg.com/nock/-/nock-9.2.3.tgz#39738087d6a0497d3a165fb352612b38a2f9b92f" + dependencies: + chai "^4.1.2" + debug "^3.1.0" + deep-equal "^1.0.0" + json-stringify-safe "^5.0.1" + lodash "^4.17.5" + mkdirp "^0.5.0" + propagate "^1.0.0" + qs "^6.5.1" + semver "^5.5.0" + node-abi@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.3.0.tgz#f3d554d6ac72a9ee16f0f4dc9548db7c08de4986" @@ -8573,6 +8607,10 @@ prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, loose-envify "^1.3.1" object-assign "^4.1.1" +propagate@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/propagate/-/propagate-1.0.0.tgz#00c2daeedda20e87e3782b344adba1cddd6ad709" + property-is-enumerable-x@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/property-is-enumerable-x/-/property-is-enumerable-x-1.1.0.tgz#7ca48917476cd0914b37809bfd05776a0d942f6f" @@ -8710,7 +8748,7 @@ q@^1.1.2, q@^1.4.1, q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" -qs@6.5.1, qs@~6.5.1: +qs@6.5.1, qs@^6.5.1, qs@~6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" |