Skip to content
This repository has been archived by the owner on Dec 30, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@samouss
samouss authored Aug 7, 2018
2 parents 6020f01 + 182ca8d commit ebca14c
Show file tree
Hide file tree
Showing 9 changed files with 199 additions and 136 deletions.
8 changes: 4 additions & 4 deletions docgen/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
"metalsmith-navigation": "0.2.9",
"metalsmith-sass": "1.5.1",
"ms-webpack": "2.0.0",
"postcss": "7.0.0",
"postcss": "7.0.2",
"postcss-loader": "2.1.6",
"postcss-scss": "2.0.0",
"prop-types": "15.6.1",
"pug": "2.0.3",
"qs": "6.5.2",
"react": "16.4.1",
"react-dom": "16.4.1",
"react-hot-loader": "4.3.3",
"react": "16.4.2",
"react-dom": "16.4.2",
"react-hot-loader": "4.3.4",
"react-tap-event-plugin": "3.0.3",
"recursive-readdir": "2.2.2",
"replace-in-file": "3.4.0",
Expand Down
2 changes: 1 addition & 1 deletion docgen/src/guide/Server-side_rendering.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ export { App, findResultsState };
```jsx
import React from 'react';
import { createServer } from 'http';
import { App, findResultsState } from './app.js';
import { renderToString } from 'react-dom/server';
import { App, findResultsState } from './App';

const server = createServer((req, res) => {
const searchState = {query: 'chair'};
Expand Down
20 changes: 10 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
"docs:doctoc": "doctoc --maxlevel 1 README.md"
},
"devDependencies": {
"@storybook/addon-actions": "3.4.8",
"@storybook/addon-knobs": "3.4.8",
"@storybook/addon-links": "3.4.8",
"@storybook/addon-options": "3.4.8",
"@storybook/addons": "3.4.8",
"@storybook/react": "3.4.8",
"@storybook/ui": "3.4.8",
"@storybook/addon-actions": "3.4.10",
"@storybook/addon-knobs": "3.4.10",
"@storybook/addon-links": "3.4.10",
"@storybook/addon-options": "3.4.10",
"@storybook/addons": "3.4.10",
"@storybook/react": "3.4.10",
"@storybook/ui": "3.4.10",
"algoliasearch": "3.29.0",
"argos-cli": "0.0.9",
"babel-cli": "6.26.0",
Expand Down Expand Up @@ -78,15 +78,15 @@
"places.js": "1.7.3",
"prettier": "1.13.7",
"prop-types": "15.6.1",
"react": "16.4.1",
"react": "16.4.2",
"react-autosuggest": "9.3.4",
"react-dom": "16.4.1",
"react-dom": "16.4.2",
"react-instantsearch-dom": "5.2.2",
"react-instantsearch-dom-maps": "5.2.2",
"react-native": "0.54.2",
"rheostat": "2.2.0",
"storybook-addon-a11y": "3.1.9",
"storybook-addon-jsx": "5.3.0",
"storybook-addon-jsx": "5.4.0",
"style-loader": "0.21.0",
"webpack": "3.12.0"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/react-instantsearch-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
"enzyme-adapter-react-16": "1.1.1",
"enzyme-to-json": "3.3.4",
"jest": "23.4.2",
"react": "16.4.1",
"react-dom": "16.4.1",
"react-test-renderer": "16.4.1",
"rollup": "0.62.0",
"react": "16.4.2",
"react-dom": "16.4.2",
"react-test-renderer": "16.4.2",
"rollup": "0.63.5",
"rollup-plugin-babel": "3.0.7",
"rollup-plugin-commonjs": "9.1.3",
"rollup-plugin-filesize": "2.0.0",
"rollup-plugin-commonjs": "9.1.4",
"rollup-plugin-filesize": "4.0.1",
"rollup-plugin-node-globals": "1.2.1",
"rollup-plugin-node-resolve": "3.3.0",
"rollup-plugin-replace": "2.0.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/react-instantsearch-dom-maps/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
"enzyme-adapter-react-16": "1.1.1",
"enzyme-to-json": "3.3.4",
"jest": "23.4.2",
"react": "16.4.1",
"react-dom": "16.4.1",
"react-test-renderer": "16.4.1",
"rollup": "0.62.0",
"react": "16.4.2",
"react-dom": "16.4.2",
"react-test-renderer": "16.4.2",
"rollup": "0.63.5",
"rollup-plugin-babel": "3.0.7",
"rollup-plugin-commonjs": "9.1.3",
"rollup-plugin-filesize": "2.0.0",
"rollup-plugin-commonjs": "9.1.4",
"rollup-plugin-filesize": "4.0.1",
"rollup-plugin-node-globals": "1.2.1",
"rollup-plugin-node-resolve": "3.3.0",
"rollup-plugin-replace": "2.0.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/react-instantsearch-dom/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
"enzyme-adapter-react-16": "1.1.1",
"enzyme-to-json": "3.3.4",
"jest": "23.4.2",
"react": "16.4.1",
"react-dom": "16.4.1",
"react-test-renderer": "16.4.1",
"rollup": "0.62.0",
"react": "16.4.2",
"react-dom": "16.4.2",
"react-test-renderer": "16.4.2",
"rollup": "0.63.5",
"rollup-plugin-babel": "3.0.7",
"rollup-plugin-commonjs": "9.1.3",
"rollup-plugin-filesize": "2.0.0",
"rollup-plugin-commonjs": "9.1.4",
"rollup-plugin-filesize": "4.0.1",
"rollup-plugin-node-globals": "1.2.1",
"rollup-plugin-node-resolve": "3.3.0",
"rollup-plugin-replace": "2.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-instantsearch-native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"enzyme-adapter-react-16": "1.1.1",
"enzyme-to-json": "3.3.4",
"jest": "23.4.2",
"react": "16.4.1",
"react-dom": "16.4.1",
"react-test-renderer": "16.4.1"
"react": "16.4.2",
"react-dom": "16.4.2",
"react-test-renderer": "16.4.2"
},
"peerDependencies": {
"react": ">= 15.3.0 < 17",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-instantsearch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
"babel-preset-env": "1.7.0",
"babel-preset-react": "6.24.1",
"babel-preset-stage-2": "6.24.1",
"rollup": "0.62.0",
"rollup": "0.63.5",
"rollup-plugin-babel": "3.0.7",
"rollup-plugin-commonjs": "9.1.3",
"rollup-plugin-filesize": "2.0.0",
"rollup-plugin-commonjs": "9.1.4",
"rollup-plugin-filesize": "4.0.1",
"rollup-plugin-node-globals": "1.2.1",
"rollup-plugin-node-resolve": "3.3.0",
"rollup-plugin-replace": "2.0.0",
Expand Down
Loading

0 comments on commit ebca14c

Please sign in to comment.