fix(React): compatibility with React 15.4.0

+ upgrade all deps + force [email protected], see yarnpkg/yarn#1832 fixes #1577
algolia · Nov 17, 2016 · 379c30e · 379c30e
1 parent 05b3141
commit 379c30e
Show file tree

Hide file tree

Showing 14 changed files with 925 additions and 901 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 node_js: stable
 install:
-  - npm install --global yarn
+  - npm install --global yarn@0.16
   - yarn
 branches:
   only:

diff --git a/package.json b/package.json
@@ -19,16 +19,16 @@
   "repository": "algolia/instantsearch.js",
   "dependencies": {
     "@kadira/react-storybook-addon-info": "^3.3.0",
-    "@kadira/storybook": "^2.27.0",
+    "@kadira/storybook": "^2.30.1",
     "@kadira/storybook-addon-knobs": "^1.5.0",
     "@kadira/storybook-addon-notes": "^1.0.1",
     "@kadira/storybook-addon-options": "^1.0.1",
-    "@kadira/storybook-addons": "^1.5.0",
+    "@kadira/storybook-addons": "^1.6.1",
     "async": "^2.1.2",
-    "autoprefixer": "^6.5.1",
+    "autoprefixer": "^6.5.3",
     "babel-cli": "^6.18.0",
     "babel-eslint": "^7.0.0",
-    "babel-jest": "^16.0.0",
+    "babel-jest": "^17.0.2",
     "babel-loader": "^6.2.5",
     "babel-plugin-transform-define": "^1.2.0",
     "babel-plugin-transform-inline-localize-css-import": "^1.0.0",
@@ -37,67 +37,67 @@
     "babel-preset-latest": "^6.16.0",
     "babel-preset-react": "^6.16.0",
     "babel-preset-stage-2": "^6.18.0",
-    "browser-sync": "^2.17.5",
+    "browser-sync": "^2.18.1",
     "chokidar": "^1.6.1",
     "codemirror": "^5.20.2",
     "compression": "^1.6.2",
-    "css-loader": "^0.25.0",
+    "css-loader": "^0.26.0",
     "doctoc": "^1.2.0",
     "doctrine": "^1.4.0",
     "ejs": "^2.5.2",
-    "enzyme": "^2.5.1",
+    "enzyme": "^2.6.0",
     "escape-html": "^1.0.3",
-    "eslint": "^3.8.1",
+    "eslint": "^3.10.2",
     "eslint-config-algolia": "^6.0.1",
-    "eslint-import-resolver-webpack": "^0.6.0",
-    "eslint-plugin-import": "^2.0.1",
-    "eslint-plugin-jasmine": "^1.8.1",
-    "eslint-plugin-react": "^6.4.1",
-    "gh-pages": "^0.11.0",
-    "google-map-react": "^0.20.1",
-    "insert-css": "^1.0.0",
-    "jest-cli": "^16.0.2",
+    "eslint-import-resolver-webpack": "^0.7.0",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-jasmine": "^2.1.0",
+    "eslint-plugin-react": "^6.7.1",
+    "gh-pages": "^0.12.0",
+    "google-map-react": "^0.21.3",
+    "insert-css": "^2.0.0",
+    "jest-cli": "^17.0.3",
     "jsdoc-parse": "^1.2.7",
     "json-loader": "^0.5.4",
     "jstransformer-markdown-it": "^2.0.0",
-    "lodash": "^4.16.2",
-    "markdown-it": "^8.0.1",
+    "lodash": "^4.17.2",
+    "markdown-it": "^8.1.0",
     "markdown-it-anchor": "^2.5.0",
-    "material-ui": "^0.16.1",
+    "material-ui": "^0.16.4",
     "memoizee": "^0.4.1",
     "memory-fs": "^0.3.0",
-    "metalsmith": "^2.2.0",
+    "metalsmith": "^2.3.0",
     "metalsmith-headings": "^0.1.0",
-    "metalsmith-layouts": "^1.6.5",
+    "metalsmith-layouts": "^1.7.0",
     "metalsmith-markdown": "^0.2.1",
     "metalsmith-navigation": "^0.2.9",
     "metalsmith-sass": "^1.3.0",
     "mockdate": "^1.0.4",
     "ms-webpack": "^2.0.0-alpha.1",
     "null-loader": "^0.1.1",
     "postcss": "^5.2.5",
-    "postcss-scss": "^0.3.1",
+    "postcss-scss": "^0.4.0",
     "pug": "^2.0.0-beta6",
     "qs": "^6.3.0",
-    "react": "^15.3.2",
-    "react-addons-test-utils": "^15.3.2",
+    "react": "^15.4.0",
+    "react-addons-test-utils": "^15.4.0",
     "react-dev-utils": "^0.3.0",
-    "react-dom": "^15.3.2",
+    "react-dom": "^15.4.0",
     "react-hot-loader": "^3.0.0-beta.4",
     "react-instantsearch": "file:./packages/react-instantsearch/",
-    "react-tap-event-plugin": "^1.0.0",
-    "react-test-renderer": "^15.3.2",
-    "recast": "^0.11.14",
+    "react-tap-event-plugin": "^2.0.1",
+    "react-test-renderer": "^15.4.0",
+    "recast": "^0.11.17",
     "recursive-readdir": "^2.1.0",
     "require-from-string": "^1.2.1",
-    "rheostat": "^2.0.1",
+    "rheostat": "^2.1.0",
     "stat-mode": "^0.2.2",
     "style-loader": "^0.13.1",
     "unescape-html": "^1.0.0",
     "webpack": "^1.13.2",
     "webpack-dev-middleware": "^1.8.3",
     "webpack-externals-plugin": "^1.0.0",
-    "webpack-hot-middleware": "^2.12.2"
+    "webpack-hot-middleware": "^2.13.2"
   },
   "engines": {
     "node": "^6.6.0"

diff --git a/packages/react-instantsearch/package.json b/packages/react-instantsearch/package.json
@@ -6,11 +6,12 @@
   },
   "repository": "algolia/instantsearch.js/packages/react-instantsearch",
   "dependencies": {
-    "algoliasearch": "^3.18.1",
+    "algoliasearch": "^3.19.1",
     "algoliasearch-helper": "^2.14.0",
-    "insert-css": "^1.0.0",
-    "lodash": "^4.16.2",
-    "react-addons-shallow-compare": "^15.3.2",
+    "insert-css": "^2.0.0",
+    "lodash": "^4.17.2",
+    "react": "^15.4.0",
+    "react-addons-shallow-compare": "^15.4.0",
     "react-themeable": "^1.1.0"
   },
   "peerDependencies": {

diff --git a/packages/react-instantsearch/src/components/HierarchicalMenu.test.js b/packages/react-instantsearch/src/components/HierarchicalMenu.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest, jasmine */
 
 import React from 'react';
-import renderer from 'react/lib/ReactTestRenderer';
+import renderer from 'react-test-renderer';
 
 import HierarchicalMenu from './HierarchicalMenu';
 

diff --git a/packages/react-instantsearch/src/components/Menu.test.js b/packages/react-instantsearch/src/components/Menu.test.js
@@ -1,12 +1,12 @@
 /* eslint-env jest, jasmine */
 
 import React from 'react';
-import renderer from 'react/lib/ReactTestRenderer';
+import renderer from 'react-test-renderer';
 
 import Menu from './Menu';
 
-describe('HierarchicalMenu', () => {
-  it('default hierarchical menu', () => {
+describe('Menu', () => {
+  it('default menu', () => {
     const tree = renderer.create(
       <Menu
         refine={() => null}

diff --git a/packages/react-instantsearch/src/components/MultiRange.test.js b/packages/react-instantsearch/src/components/MultiRange.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest, jasmine */
 
 import React from 'react';
-import renderer from 'react/lib/ReactTestRenderer';
+import renderer from 'react-test-renderer';
 
 import MultiRange from './MultiRange';
 

diff --git a/packages/react-instantsearch/src/components/PoweredBy.test.js b/packages/react-instantsearch/src/components/PoweredBy.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest, jasmine */
 
 import React from 'react';
-import renderer from 'react/lib/ReactTestRenderer';
+import renderer from 'react-test-renderer';
 
 import PoweredBy from './PoweredBy';
 

diff --git a/packages/react-instantsearch/src/components/RangeInput.test.js b/packages/react-instantsearch/src/components/RangeInput.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest, jasmine */
 
 import React from 'react';
-import renderer from 'react/lib/ReactTestRenderer';
+import renderer from 'react-test-renderer';
 
 import RangeInput from './RangeInput';
 

diff --git a/packages/react-instantsearch/src/components/RangeRatings.test.js b/packages/react-instantsearch/src/components/RangeRatings.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest, jasmine */
 
 import React from 'react';
-import renderer from 'react/lib/ReactTestRenderer';
+import renderer from 'react-test-renderer';
 
 import RangeRatings from './RangeRatings';
 

diff --git a/packages/react-instantsearch/src/components/RefinementList.test.js b/packages/react-instantsearch/src/components/RefinementList.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest, jasmine */
 
 import React from 'react';
-import renderer from 'react/lib/ReactTestRenderer';
+import renderer from 'react-test-renderer';
 
 import RefinementList from './RefinementList';
 

diff --git a/packages/react-instantsearch/src/components/__snapshots__/Menu.test.js.snap b/packages/react-instantsearch/src/components/__snapshots__/Menu.test.js.snap
@@ -95,3 +95,101 @@ exports[`HierarchicalMenu default hierarchical menu 1`] = `
   </button>
 </div>
 `;
+
+exports[`Menu applies translations 1`] = `
+<div
+  className="root">
+  <div
+    className="items">
+    <div
+      className="item">
+      <a
+        className="itemLink"
+        href="#"
+        onClick={[Function]}>
+        <span
+          className="itemLabel">
+          white
+        </span>
+         
+        <span
+          className="itemCount">
+          10
+        </span>
+      </a>
+    </div>
+    <div
+      className="item">
+      <a
+        className="itemLink"
+        href="#"
+        onClick={[Function]}>
+        <span
+          className="itemLabel">
+          black
+        </span>
+         
+        <span
+          className="itemCount">
+          20
+        </span>
+      </a>
+    </div>
+  </div>
+  <button
+    className="showMore"
+    disabled={false}
+    onClick={[Function]}>
+     display more
+  </button>
+</div>
+`;
+
+exports[`Menu default menu 1`] = `
+<div
+  className="root">
+  <div
+    className="items">
+    <div
+      className="item">
+      <a
+        className="itemLink"
+        href="#"
+        onClick={[Function]}>
+        <span
+          className="itemLabel">
+          white
+        </span>
+         
+        <span
+          className="itemCount">
+          10
+        </span>
+      </a>
+    </div>
+    <div
+      className="item">
+      <a
+        className="itemLink"
+        href="#"
+        onClick={[Function]}>
+        <span
+          className="itemLabel">
+          black
+        </span>
+         
+        <span
+          className="itemCount">
+          20
+        </span>
+      </a>
+    </div>
+  </div>
+  <button
+    className="showMore"
+    disabled={false}
+    onClick={[Function]}>
+    Show more
+  </button>
+</div>
+`;
diff --git a/packages/react-instantsearch/src/core/styling.js b/packages/react-instantsearch/src/core/styling.js