aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-04-12 07:53:12 +0800
committerFabio Berger <me@fabioberger.com>2018-04-12 07:53:12 +0800
commit27b915789efcacbeb0bfbe943f917c590cfaff4a (patch)
tree3e5e1b9f8e4588f811b203806ffde6864f0e09de /packages/0x.js
parentddc6dca98c23b8a844506cf74d17b0287faf627e (diff)
parente8d4f6d5322930cf8618abcb9fea7c773a87ecd7 (diff)
downloaddexon-sol-tools-27b915789efcacbeb0bfbe943f917c590cfaff4a.tar
dexon-sol-tools-27b915789efcacbeb0bfbe943f917c590cfaff4a.tar.gz
dexon-sol-tools-27b915789efcacbeb0bfbe943f917c590cfaff4a.tar.bz2
dexon-sol-tools-27b915789efcacbeb0bfbe943f917c590cfaff4a.tar.lz
dexon-sol-tools-27b915789efcacbeb0bfbe943f917c590cfaff4a.tar.xz
dexon-sol-tools-27b915789efcacbeb0bfbe943f917c590cfaff4a.tar.zst
dexon-sol-tools-27b915789efcacbeb0bfbe943f917c590cfaff4a.zip
Merge branch 'development' into removeMigrateStep
* development: Publish Updated CHANGELOGS # Conflicts: # packages/0x.js/package.json # packages/deployer/package.json # packages/utils/CHANGELOG.json
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/CHANGELOG.json3
-rw-r--r--packages/0x.js/CHANGELOG.md4
-rw-r--r--packages/0x.js/package.json24
3 files changed, 18 insertions, 13 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 6d5dc0dd2..6bcfcb73e 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -6,7 +6,8 @@
"note": "Moved Web3.Provider to `@0xproject/types:Provider`",
"pr": 501
}
- ]
+ ],
+ "timestamp": 1523462196
},
{
"version": "0.35.0",
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index c18915417..693b4f4b2 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v0.36.0 - _April 11, 2018_
+
+ * Moved Web3.Provider to `@0xproject/types:Provider` (#501)
+
## v0.35.0 - _April 2, 2018_
* Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3_wrapper' `Web3WrapperErrors.TransactionMiningTimeout` (#485)
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index d59e170b0..cd339e770 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
{
"name": "0x.js",
- "version": "0.35.0",
+ "version": "0.36.0",
"description": "A javascript library for interacting with the 0x protocol",
"keywords": [
"0x.js",
@@ -61,11 +61,11 @@
"node": ">=6.0.0"
},
"devDependencies": {
- "@0xproject/deployer": "^0.3.5",
- "@0xproject/dev-utils": "^0.3.4",
- "@0xproject/monorepo-scripts": "^0.1.16",
+ "@0xproject/deployer": "^0.4.0",
+ "@0xproject/dev-utils": "^0.3.5",
+ "@0xproject/monorepo-scripts": "^0.1.17",
"@0xproject/subproviders": "^0.8.4",
- "@0xproject/tslint-config": "^0.4.14",
+ "@0xproject/tslint-config": "^0.4.15",
"@types/bintrees": "^1.0.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@@ -97,13 +97,13 @@
"webpack": "^3.1.0"
},
"dependencies": {
- "@0xproject/assert": "^0.2.5",
- "@0xproject/base-contract": "^0.1.0",
- "@0xproject/json-schemas": "^0.7.19",
- "@0xproject/types": "^0.5.0",
- "@0xproject/typescript-typings": "^0.0.3",
- "@0xproject/utils": "^0.5.0",
- "@0xproject/web3-wrapper": "^0.5.0",
+ "@0xproject/assert": "^0.2.6",
+ "@0xproject/base-contract": "^0.2.0",
+ "@0xproject/json-schemas": "^0.7.20",
+ "@0xproject/types": "^0.6.0",
+ "@0xproject/typescript-typings": "^0.1.0",
+ "@0xproject/utils": "^0.5.1",
+ "@0xproject/web3-wrapper": "^0.6.0",
"bintrees": "^1.0.2",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",