Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/web3-wrapper/unexport-marshaller

3 files changed, 29 insertions, 22 deletions

diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json
index 5e0e40a70..b9e66ec50 100644
--- a/packages/react-shared/CHANGELOG.json
+++ b/packages/react-shared/CHANGELOG.json
@@ -1,6 +1,7 @@
 [
     {
-        "version": "1.0.0",
+        "timestamp": 1532357734,
+        "version": "1.0.1",
         "changes": [
             {
                 "note": "Dependencies updated"
@@ -8,8 +9,8 @@
         ]
     },
     {
-        "timestamp": 1531919263,
-        "version": "0.2.3",
+        "timestamp": 1532043000,
+        "version": "1.0.0",
         "changes": [
             {
                 "note": "Dependencies updated"
@@ -17,8 +18,8 @@
         ]
     },
     {
-        "timestamp": 1531149657,
-        "version": "0.2.2",
+        "timestamp": 1531919263,
+        "version": "0.2.3",
         "changes": [
             {
                 "note": "Dependencies updated"
@@ -26,8 +27,8 @@
         ]
     },
     {
-        "timestamp": 1529397769,
-        "version": "0.2.1",
+        "timestamp": 1531149657,
+        "version": "0.2.2",
         "changes": [
             {
                 "note": "Dependencies updated"
@@ -35,7 +36,8 @@
         ]
     },
     {
-        "version": "0.2.0",
+        "timestamp": 1529397769,
+        "version": "0.2.1",
         "changes": [
             {
                 "note": "Dependencies updated"
@@ -43,6 +45,7 @@
         ]
     },
     {
+        "timestamp": 1525477860,
         "version": "0.2.0",
         "changes": [
             {
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md
index ceeb7a2e6..f804fe4bb 100644
--- a/packages/react-shared/CHANGELOG.md
+++ b/packages/react-shared/CHANGELOG.md
@@ -1,30 +1,34 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
-## v0.2.3 - _July 18, 2018_
+## v1.0.1 - _July 23, 2018_
 
     * Dependencies updated
 
-## v0.2.2 - _July 9, 2018_
+## v1.0.0 - _July 20, 2018_
 
     * Dependencies updated
 
-## v0.2.1 - _June 19, 2018_
+## v0.2.3 - _July 18, 2018_
 
     * Dependencies updated
 
-## v0.2.0 - _June 1, 2018_
+## v0.2.2 - _July 9, 2018_
 
-    * Incorrect publish that was unpublished
+    * Dependencies updated
 
-## v0.1.7 - _May 22, 2018_
+## v0.2.1 - _June 19, 2018_
 
     * Dependencies updated
 
+## v0.2.0 - _May 5, 2018_
+
+    * Removed portal specific colors
+
 ## v0.1.6 - _May 5, 2018_
 
     * Dependencies updated
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 008972da9..3af73eb53 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-shared",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -25,9 +25,9 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.0",
-        "@0xproject/monorepo-scripts": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/dev-utils": "^1.0.1",
+        "@0xproject/monorepo-scripts": "^1.0.1",
+        "@0xproject/tslint-config": "^1.0.1",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
@@ -35,13 +35,13 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
+        "@types/is-mobile": "0.3.0",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/node": "^8.0.53",
-        "@types/react": "16.3.13",
-        "@types/react-dom": "^16.0.3",
+        "@types/react": "*",
+        "@types/react-dom": "*",
         "@types/react-scroll": "0.0.31",
-        "@types/is-mobile": "0.3.0",
         "basscss": "^8.0.3",
         "is-mobile": "^0.2.2",
         "lodash": "^4.17.4",