merge development

packages/react-docs/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "1.0.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1541740904
+    },
     {
         "timestamp": 1539871071,
         "version": "1.0.14",

packages/react-docs/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.15 - _November 9, 2018_
+
+    * Dependencies updated
+
 ## v1.0.14 - _October 18, 2018_
 
     * Dependencies updated

packages/react-docs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/react-docs",
-    "version": "1.0.14",
+    "version": "1.0.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -8,7 +8,7 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "lint": "tslint --project .",
+        "lint": "tslint --format stylish --project .",
         "build": "tsc -b",
         "build:ci": "yarn build",
         "clean": "shx rm -rf lib"
@@ -24,8 +24,8 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0x/dev-utils": "^1.0.13",
-        "@0x/tslint-config": "^1.0.9",
+        "@0x/dev-utils": "^1.0.14",
+        "@0x/tslint-config": "^1.0.10",
         "@types/compare-versions": "^3.0.0",
         "@types/styled-components": "^4.0.0",
         "make-promises-safe": "^1.1.0",
@@ -34,9 +34,9 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/react-shared": "^1.0.17",
-        "@0x/types": "^1.2.0",
-        "@0x/utils": "^2.0.3",
+        "@0x/react-shared": "^1.0.18",
+        "@0x/types": "^1.2.1",
+        "@0x/utils": "^2.0.4",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",