Merge development

3 files changed, 51 insertions, 20 deletions

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 20778f8bb..8f13049e9 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,12 +1,31 @@
 [
     {
+        "timestamp": 1549504360,
+        "version": "4.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "4.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "4.0.0",
         "changes": [
             {
                 "note": "Upgrade the bignumber.js to v8.0.2",
                 "pr": 1517
             }
-        ]
+        ],
+        "timestamp": 1549373905
     },
     {
         "timestamp": 1547747677,
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index b0279f097..2ea296ea5 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.0.2 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v4.0.1 - _February 6, 2019_
+
+    * Dependencies updated
+
+## v4.0.0 - _February 5, 2019_
+
+    * Upgrade the bignumber.js to v8.0.2 (#1517)
+
 ## v3.0.3 - _January 17, 2019_
 
     * Dependencies updated
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 64054d288..0dce40010 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "3.0.3",
+    "version": "4.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,7 +24,7 @@
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "clean": "shx rm -rf _bundles lib test_temp src/generated_contract_wrappers generated_docs",
-        "build:umd:prod": "NODE_ENV=production webpack",
+        "build:umd:prod": "NODE_ENV=production node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production",
         "build:commonjs": "tsc -b",
         "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
     },
@@ -42,11 +42,11 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0x/abi-gen-wrappers": "^2.2.0",
-        "@0x/contract-addresses": "^2.2.0",
-        "@0x/dev-utils": "^1.0.24",
-        "@0x/migrations": "^2.4.0",
-        "@0x/tslint-config": "^2.0.2",
+        "@0x/abi-gen-wrappers": "^3.0.1",
+        "@0x/contract-addresses": "^2.2.1",
+        "@0x/dev-utils": "^2.0.1",
+        "@0x/migrations": "^3.0.2",
+        "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "*",
@@ -72,20 +72,20 @@
         "webpack": "^4.20.2"
     },
     "dependencies": {
-        "@0x/assert": "^1.0.23",
-        "@0x/base-contract": "^3.0.13",
-        "@0x/contract-wrappers": "^5.0.1",
-        "@0x/order-utils": "^3.1.2",
-        "@0x/order-watcher": "^2.4.3",
-        "@0x/subproviders": "^2.1.11",
-        "@0x/types": "^1.5.2",
-        "@0x/typescript-typings": "^3.0.8",
-        "@0x/utils": "^3.0.1",
-        "@0x/web3-wrapper": "^3.2.4",
+        "@0x/assert": "^2.0.1",
+        "@0x/base-contract": "^4.0.1",
+        "@0x/contract-wrappers": "^7.0.1",
+        "@0x/order-utils": "^6.0.0",
+        "@0x/order-watcher": "^3.0.2",
+        "@0x/subproviders": "^3.0.1",
+        "@0x/types": "^2.0.1",
+        "@0x/typescript-typings": "^4.0.0",
+        "@0x/utils": "^4.0.2",
+        "@0x/web3-wrapper": "^4.0.1",
         "@types/web3-provider-engine": "^14.0.0",
-        "ethereum-types": "^1.1.6",
+        "ethereum-types": "^2.0.0",
         "ethers": "~4.0.4",
-        "lodash": "^4.17.5",
+        "lodash": "^4.17.11",
         "web3-provider-engine": "14.0.6"
     },
     "publishConfig": {