Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/init

4 files changed, 43 insertions, 17 deletions

diff --git a/packages/0x.js/.npmignore b/packages/0x.js/.npmignore
index 6a3eb57bd..d7ee80c97 100644
--- a/packages/0x.js/.npmignore
+++ b/packages/0x.js/.npmignore
@@ -4,7 +4,6 @@ webpack.config.js
 yarn-error.log
 test/
 /src/
-/_bundles/
 /contract_templates/
 /generated_docs/
 /scripts/
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 391335390..81a128c4c 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,5 +1,23 @@
 [
     {
+        "timestamp": 1538475601,
+        "version": "1.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1538157789,
+        "version": "1.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1537907159,
         "version": "1.0.6",
         "changes": [
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index b9b329085..eb5813c59 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.8 - _October 2, 2018_
+
+    * Dependencies updated
+
+## v1.0.7 - _September 28, 2018_
+
+    * Dependencies updated
+
 ## v1.0.6 - _September 25, 2018_
 
     * Dependencies updated
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 16650be3f..c89a3e613 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -16,6 +16,7 @@
     "types": "lib/index.d.ts",
     "scripts": {
         "build": "yarn build:all",
+        "build:ci": "yarn build:commonjs",
         "build:all": "run-p build:umd:prod build:commonjs",
         "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
         "test:circleci": "run-s test:coverage",
@@ -41,10 +42,10 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.11",
-        "@0xproject/dev-utils": "^1.0.10",
-        "@0xproject/migrations": "^1.0.12",
-        "@0xproject/monorepo-scripts": "^1.0.9",
+        "@0xproject/abi-gen": "^1.0.12",
+        "@0xproject/dev-utils": "^1.0.11",
+        "@0xproject/migrations": "^1.0.13",
+        "@0xproject/monorepo-scripts": "^1.0.10",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
@@ -73,17 +74,17 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.11",
-        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/contract-wrappers": "^2.0.0",
-        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/order-watcher": "^2.0.0",
-        "@0xproject/subproviders": "^2.0.5",
-        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.1",
-        "ethereum-types": "^1.0.8",
+        "@0xproject/assert": "^1.0.12",
+        "@0xproject/base-contract": "^3.0.0",
+        "@0xproject/contract-wrappers": "^2.0.1",
+        "@0xproject/order-utils": "^1.0.6",
+        "@0xproject/order-watcher": "^2.1.0",
+        "@0xproject/subproviders": "^2.0.6",
+        "@0xproject/types": "^1.1.2",
+        "@0xproject/typescript-typings": "^3.0.0",
+        "@0xproject/utils": "^2.0.0",
+        "@0xproject/web3-wrapper": "^3.0.2",
+        "ethereum-types": "^1.0.9",
         "ethers": "4.0.0-beta.14",
         "lodash": "^4.17.5",
         "web3-provider-engine": "14.0.6"