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
This commit is contained in:
Fabio Berger
2018-03-20 11:52:22 +00:00
62 changed files with 8333 additions and 271 deletions

View File

@@ -1,6 +1,10 @@
# CHANGELOG
## v0.33.2 - _TBD, 2018_
## v0.34.0 - _TBD_
* Update Kovan EtherToken artifact address to match TokenRegistry.
## v0.33.2 - _March 18, 2018_
* Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)
* Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package (#456)

View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "0.33.1",
"version": "0.33.6",
"description": "A javascript library for interacting with the 0x protocol",
"keywords": [
"0x.js",
@@ -34,7 +34,10 @@
"config": {
"artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken",
"postpublish": {
"assets": ["_bundles/index.js", "_bundles/index.min.js"],
"assets": [
"packages/0x.js/_bundles/index.js",
"packages/0x.js/_bundles/index.min.js"
],
"docPublishConfigs": {
"extraFileIncludes": ["../types/src/index.ts"],
"s3BucketPath": "s3://doc-jsons/0xjs/",
@@ -51,13 +54,13 @@
"node": ">=6.0.0"
},
"devDependencies": {
"@0xproject/abi-gen": "^0.2.5",
"@0xproject/dev-utils": "^0.2.1",
"@0xproject/monorepo-scripts": "^0.1.12",
"@0xproject/tslint-config": "^0.4.10",
"@0xproject/abi-gen": "^0.2.7",
"@0xproject/dev-utils": "^0.3.2",
"@0xproject/monorepo-scripts": "^0.1.14",
"@0xproject/tslint-config": "^0.4.12",
"@types/bintrees": "^1.0.2",
"@types/jsonschema": "^1.1.1",
"@types/lodash": "^4.14.86",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
@@ -65,9 +68,9 @@
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-as-promised-typescript-typings": "^0.0.10",
"chai-as-promised-typescript-typings": "^0.0.12",
"chai-bignumber": "^2.0.1",
"chai-typescript-typings": "^0.0.4",
"chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"json-loader": "^0.5.4",
@@ -90,26 +93,26 @@
"webpack": "^3.1.0"
},
"dependencies": {
"@0xproject/assert": "^0.2.0",
"@0xproject/base-contract": "^0.0.3",
"@0xproject/json-schemas": "^0.7.14",
"@0xproject/types": "^0.3.1",
"@0xproject/utils": "^0.4.1",
"@0xproject/web3-wrapper": "^0.2.1",
"@0xproject/assert": "^0.2.3",
"@0xproject/base-contract": "^0.0.5",
"@0xproject/json-schemas": "^0.7.17",
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"@0xproject/web3-wrapper": "^0.3.1",
"bintrees": "^1.0.2",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-blockstream": "^2.0.6",
"ethereumjs-util": "^5.1.1",
"ethers-contracts": "^2.2.1",
"ethers-typescript-typings": "^0.0.2",
"ethers-typescript-typings": "^0.0.4",
"js-sha3": "^0.7.0",
"lodash": "^4.17.4",
"uuid": "^3.1.0",
"web3": "^0.20.0",
"web3-typescript-typings": "^0.10.0"
"web3-typescript-typings": "^0.10.2"
},
"publishConfig": {
"access": "public"
"access": "public"
}
}

View File

@@ -538,7 +538,7 @@
"address": "0x4e9aad8184de8833365fea970cd9149372fdf1e6"
},
"42": {
"address": "0xf18e504561f4347bea557f3d4558f559dddbae7f"
"address": "0xd0a1e359811322d97991e03f863a0c30c2cf029c"
},
"50": {
"address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082"