Merge branch 'development' of https://github.com/0xProject/0x-monorepo into website/feature/react-16

4 files changed, 46 insertions, 16 deletions

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 346938958..0a43abe89 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,5 +1,23 @@
 [
     {
+        "version": "1.0.1-rc.6",
+        "changes": [
+            {
+                "note": "Fix missing `BlockParamLiteral` type import issue"
+            }
+        ],
+        "timestamp": 1535377027
+    },
+    {
+        "version": "1.0.1-rc.5",
+        "changes": [
+            {
+                "note":
+                    "Fix `main` and `types` package.json entries so that they point to the new location of index.d.ts and index.js"
+            }
+        ]
+    },
+    {
         "version": "1.0.1-rc.4",
         "changes": [
             {
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index e94907353..65cbbb8fe 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.1-rc.6 - _August 27, 2018_
+
+    * Fix missing `BlockParamLiteral` type import issue
+
+## v1.0.1-rc.5 - _Invalid date_
+
+    * Fix `main` and `types` package.json entries so that they point to the new location of index.d.ts and index.js
+
 ## v1.0.1-rc.4 - _August 24, 2018_
 
     * Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher` (#963)
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index b5cb6c7e4..c3adb496e 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.1-rc.4",
+    "version": "1.0.1-rc.6",
     "engines": {
         "node": ">=6.12"
     },
@@ -12,8 +12,8 @@
         "tokens",
         "exchange"
     ],
-    "main": "lib/src/index.js",
-    "types": "lib/src/index.d.ts",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
     "scripts": {
         "watch_without_deps": "tsc -w",
         "build": "yarn build:all",
@@ -42,10 +42,10 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.6",
-        "@0xproject/dev-utils": "^1.0.5",
-        "@0xproject/migrations": "^1.0.5",
-        "@0xproject/monorepo-scripts": "^1.0.6",
+        "@0xproject/abi-gen": "^1.0.7",
+        "@0xproject/dev-utils": "^1.0.6",
+        "@0xproject/migrations": "^1.0.6",
+        "@0xproject/monorepo-scripts": "^1.0.7",
         "@0xproject/tslint-config": "^1.0.6",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
@@ -73,16 +73,16 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.6",
-        "@0xproject/base-contract": "^2.0.0",
-        "@0xproject/contract-wrappers": "^1.0.1-rc.4",
-        "@0xproject/order-utils": "^1.0.1-rc.4",
-        "@0xproject/order-watcher": "^1.0.1-rc.4",
-        "@0xproject/subproviders": "^2.0.0",
-        "@0xproject/types": "^1.0.1-rc.5",
+        "@0xproject/assert": "^1.0.7",
+        "@0xproject/base-contract": "^2.0.1",
+        "@0xproject/contract-wrappers": "^1.0.1-rc.5",
+        "@0xproject/order-utils": "^1.0.1-rc.6",
+        "@0xproject/order-watcher": "^1.0.1-rc.5",
+        "@0xproject/subproviders": "^2.0.1",
+        "@0xproject/types": "^1.0.1-rc.6",
         "@0xproject/typescript-typings": "^1.0.5",
-        "@0xproject/utils": "^1.0.6",
-        "@0xproject/web3-wrapper": "^2.0.0",
+        "@0xproject/utils": "^1.0.7",
+        "@0xproject/web3-wrapper": "^2.0.1",
         "ethereum-types": "^1.0.5",
         "ethers": "3.0.22",
         "lodash": "^4.17.5",
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 7058a898f..17511f468 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -9,6 +9,7 @@ export {
     ERC20ProxyWrapper,
     ERC721ProxyWrapper,
     ForwarderWrapper,
+    OrderValidatorWrapper,
     IndexedFilterValues,
     BlockRange,
     ContractWrappersConfig,
@@ -42,6 +43,9 @@ export {
     DecodedLogEvent,
     ExchangeEventArgs,
     TransactionEncoder,
+    BalanceAndAllowance,
+    OrderAndTraderInfo,
+    TraderInfo,
 } from '@0xproject/contract-wrappers';
 
 export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher';