Merge development

5 files changed, 87 insertions, 19 deletions

diff --git a/packages/0x.js/.npmignore b/packages/0x.js/.npmignore
index d7ee80c97..312a23faa 100644
--- a/packages/0x.js/.npmignore
+++ b/packages/0x.js/.npmignore
@@ -4,7 +4,7 @@ webpack.config.js
 yarn-error.log
 test/
 /src/
-/contract_templates/
+/abi-gen-templates/
 /generated_docs/
 /scripts/
 /lib/src/monorepo_scripts/
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 0321ee200..f73de96aa 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,5 +1,51 @@
 [
     {
+        "version": "3.0.0",
+        "changes": [
+            {
+                "note":
+                    "Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`.",
+                "pr": 1363
+            }
+        ]
+    },
+    {
+        "version": "2.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1544739608
+    },
+    {
+        "version": "2.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1544570656
+    },
+    {
+        "timestamp": 1543401373,
+        "version": "2.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1542821676,
+        "version": "2.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1542208198,
         "version": "2.0.4",
         "changes": [
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 2467311bf..2923fdf03 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.8 - _December 13, 2018_
+
+    * Dependencies updated
+
+## v2.0.7 - _December 11, 2018_
+
+    * Dependencies updated
+
+## v2.0.6 - _November 28, 2018_
+
+    * Dependencies updated
+
+## v2.0.5 - _November 21, 2018_
+
+    * Dependencies updated
+
 ## v2.0.4 - _November 14, 2018_
 
     * Dependencies updated
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 755ff7512..2960c9e4b 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "2.0.4",
+    "version": "2.0.8",
     "engines": {
         "node": ">=6.12"
     },
@@ -42,12 +42,11 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.16",
-        "@0x/abi-gen-wrappers": "^1.0.5",
-        "@0x/contract-addresses": "^1.1.0",
-        "@0x/dev-utils": "^1.0.17",
-        "@0x/migrations": "^2.0.4",
-        "@0x/tslint-config": "^1.0.10",
+        "@0x/abi-gen-wrappers": "^2.0.2",
+        "@0x/contract-addresses": "^2.0.0",
+        "@0x/dev-utils": "^1.0.21",
+        "@0x/migrations": "^2.2.2",
+        "@0x/tslint-config": "^2.0.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "*",
@@ -73,18 +72,18 @@
         "webpack": "^4.20.2"
     },
     "dependencies": {
-        "@0x/assert": "^1.0.17",
-        "@0x/base-contract": "^3.0.6",
-        "@0x/contract-wrappers": "^4.0.2",
-        "@0x/order-utils": "^3.0.2",
-        "@0x/order-watcher": "^2.2.4",
-        "@0x/subproviders": "^2.1.4",
-        "@0x/types": "^1.2.1",
-        "@0x/typescript-typings": "^3.0.4",
-        "@0x/utils": "^2.0.5",
-        "@0x/web3-wrapper": "^3.1.4",
+        "@0x/assert": "^1.0.20",
+        "@0x/base-contract": "^3.0.10",
+        "@0x/contract-wrappers": "^4.1.3",
+        "@0x/order-utils": "^3.0.7",
+        "@0x/order-watcher": "^2.2.8",
+        "@0x/subproviders": "^2.1.8",
+        "@0x/types": "^1.4.1",
+        "@0x/typescript-typings": "^3.0.6",
+        "@0x/utils": "^2.0.8",
+        "@0x/web3-wrapper": "^3.2.1",
         "@types/web3-provider-engine": "^14.0.0",
-        "ethereum-types": "^1.1.2",
+        "ethereum-types": "^1.1.4",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5",
         "web3-provider-engine": "14.0.6"
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 2df360b96..006e4cf29 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -4,6 +4,7 @@ export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtil
 
 export {
     ContractWrappers,
+    DutchAuctionWrapper,
     ERC20TokenWrapper,
     ERC721TokenWrapper,
     EtherTokenWrapper,
@@ -27,6 +28,7 @@ export {
     OrderAndTraderInfo,
     TraderInfo,
     ValidateOrderFillableOpts,
+    DutchAuctionData,
 } from '@0x/contract-wrappers';
 
 export {
@@ -80,11 +82,16 @@ export {
     OrderState,
     AssetProxyId,
     AssetData,
+    SingleAssetData,
     ERC20AssetData,
     ERC721AssetData,
+    MultiAssetData,
+    MultiAssetDataWithRecursiveDecoding,
     SignatureType,
+    ObjectMap,
     OrderRelevantState,
     Stats,
+    DutchAuctionDetails,
 } from '@0x/types';
 
 export {