Merge branch 'develop' into fix/2523

algolia · Oct 30, 2017 · 568dc56 · 568dc56
2 parents d810284 + 8ca9b84
commit 568dc56
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "conventional-changelog-cli": "1.3.4",
     "css-loader": "0.28.7",
     "csso-cli": "1.1.0",
-    "dev-novel": "0.0.4",
+    "dev-novel": "0.0.6",
     "doctoc": "1.3.0",
     "enzyme": "2.9.1",
     "eslint": "4.9.0",

diff --git a/yarn.lock b/yarn.lock
@@ -47,6 +47,14 @@
     lodash "^4.17.4"
     pify "^3.0.0"
 
+"@types/inline-style-prefixer@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/inline-style-prefixer/-/inline-style-prefixer-3.0.1.tgz#8541e636b029124b747952e9a28848286d2b5bf6"
+
+"@types/react@^16.0.18":
+  version "16.0.18"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.18.tgz#c08eea79ada55bf10b5353e18c21797dd17afa23"
+
 JSONStream@^1.0.4:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
@@ -2829,9 +2837,9 @@ detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
 
-dev-novel@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/dev-novel/-/dev-novel-0.0.4.tgz#0f8a8853ac0f5b2e895e8e121d87186902422ffe"
+dev-novel@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/dev-novel/-/dev-novel-0.0.6.tgz#38e1ec752599d07b6604d9de1b7ef091f11ff842"
   dependencies:
     babel-plugin-transform-decorators-legacy "^1.3.4"
     babel-plugin-transform-flow-strip-types "^6.22.0"
@@ -2845,7 +2853,7 @@ dev-novel@0.0.4:
     react "^15.5.4"
     react-dom "^15.5.4"
     react-inspector "^2.0.0"
-    react-split-pane "^0.1.63"
+    react-split-pane "^0.1.68"
     styled-components "^2.0.1"
     styled-normalize "^2.0.0"
 
@@ -7712,10 +7720,12 @@ react-inspector@^2.0.0:
     babel-runtime "^6.26.0"
     is-dom "^1.0.9"
 
-react-split-pane@^0.1.63:
-  version "0.1.66"
-  resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.66.tgz#369085dd07ec1237bda123e73813dcc7dc6502c1"
+react-split-pane@^0.1.68:
+  version "0.1.68"
+  resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.68.tgz#a4ed40b0e77f0578cb6c9f9e65edd32726e4b16a"
   dependencies:
+    "@types/inline-style-prefixer" "^3.0.0"
+    "@types/react" "^16.0.18"
     inline-style-prefixer "^3.0.6"
     prop-types "^15.5.10"
     react-style-proptype "^3.0.0"