Merge remote-tracking branch 'upstream/development' into sol-doc

4 files changed, 40 insertions, 7 deletions

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 9ff4963c0..86cf7a916 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,5 +1,23 @@
 [
     {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Drastically reduce the bundle size by removing unused parts of included contract artifacts."
+            }
+        ],
+        "timestamp": 1537369748
+    },
+    {
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Add ZRX & WETH mainnet contract addresses into the included artifacts"
+            }
+        ],
+        "timestamp": 1537265493
+    },
+    {
         "timestamp": 1536142250,
         "version": "1.0.1",
         "changes": [
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 2fd357eb6..a6f23e620 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.3 - _September 19, 2018_
+
+    * Drastically reduce the bundle size by removing unused parts of included contract artifacts.
+
+## v1.0.2 - _September 18, 2018_
+
+    * Add ZRX & WETH mainnet contract addresses into the included artifacts
+
 ## v1.0.1 - _September 5, 2018_
 
     * Dependencies updated
diff --git a/packages/0x.js/README.md b/packages/0x.js/README.md
index fd6217151..329037324 100644
--- a/packages/0x.js/README.md
+++ b/packages/0x.js/README.md
@@ -1,6 +1,6 @@
 ## 0x.js
 
-A TypeScript/Javascript library for interacting with the 0x protocol.
+A TypeScript/Javascript library for interacting with the 0x protocol. It is a high level package which combines a number of underlying packages such as order-utils and order-watcher.
 
 ### Read the [Documentation](https://0xproject.com/docs/0x.js).
 
@@ -19,7 +19,14 @@ npm install 0x.js --save
 **Import**
 
 ```javascript
-import { ZeroEx } from '0x.js';
+import {
+    assetDataUtils,
+    BigNumber,
+    ContractWrappers,
+    generatePseudoRandomSalt,
+    orderHashUtils,
+    signatureUtils,
+} from '0x.js';
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index c2286ebf2..bf929a835 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "engines": {
         "node": ">=6.12"
     },
@@ -43,7 +43,7 @@
     "devDependencies": {
         "@0xproject/abi-gen": "^1.0.8",
         "@0xproject/dev-utils": "^1.0.7",
-        "@0xproject/migrations": "^1.0.7",
+        "@0xproject/migrations": "^1.0.9",
         "@0xproject/monorepo-scripts": "^1.0.8",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/lodash": "4.14.104",
@@ -75,9 +75,9 @@
     "dependencies": {
         "@0xproject/assert": "^1.0.8",
         "@0xproject/base-contract": "^2.0.2",
-        "@0xproject/contract-wrappers": "^1.0.1",
-        "@0xproject/order-utils": "^1.0.1",
-        "@0xproject/order-watcher": "^1.0.1",
+        "@0xproject/contract-wrappers": "^1.0.3",
+        "@0xproject/order-utils": "^1.0.2",
+        "@0xproject/order-watcher": "^1.0.3",
         "@0xproject/subproviders": "^2.0.2",
         "@0xproject/types": "^1.0.1",
         "@0xproject/typescript-typings": "^2.0.0",