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 docs/refine-from-hits
Browse files Browse the repository at this point in the history
  • Loading branch information
@Haroenv
Haroenv authored Mar 2, 2018
2 parents 76f5c56 + 35ea253 commit b566919
Show file tree
Hide file tree
Showing 73 changed files with 1,544 additions and 1,186 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.6.0
8.9.4
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Version][version-svg]][package-url] [![Build Status][travis-svg]][travis-url] [![License][license-image]][license-url] [![Downloads][downloads-image]][downloads-url]

InstantSearch projects: **React InstantSearch** | [InstantSearch.js][instantsearch.js-github] | [InstantSearch Android][instantsearch-android-github] | [InstantSearch iOS][instantsearch-ios-github].
InstantSearch projects: **React InstantSearch** | [InstantSearch.js][instantsearch.js-github] | [Angular InstantSearch][instantsearch-angular-github] | [Vue InstantSearch][instantsearch-vue-github] | [InstantSearch Android][instantsearch-android-github] | [InstantSearch iOS][instantsearch-ios-github].

## React InstantSearch

Expand Down Expand Up @@ -35,6 +35,8 @@ one command away to start the developer environment, [read our CONTRIBUTING guid
[instantsearch.js-github]: https://github.com/algolia/instantsearch.js
[instantsearch-android-github]: https://github.com/algolia/instantsearch-android
[instantsearch-ios-github]: https://github.com/algolia/instantsearch-ios
[instantsearch-vue-github]: https://github.com/algolia/vue-instantsearch
[instantsearch-angular-github]: https://github.com/algolia/angular-instantsearch
[travis-svg]: https://img.shields.io/travis/algolia/react-instantsearch/master.svg?style=flat-square
[travis-url]: https://travis-ci.org/algolia/react-instantsearch
[license-image]: http://img.shields.io/badge/license-MIT-green.svg?style=flat-square
Expand Down
24 changes: 24 additions & 0 deletions docgen/assets/img/InstantSearch-Angular.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions docgen/assets/js/activateClipboard.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Clipboard from 'clipboard';
import ClipboardJS from 'clipboard';

export default function activateClipboard(codeSamples) {
codeSamples.forEach(codeSample => {
Expand All @@ -20,7 +20,7 @@ export default function activateClipboard(codeSamples) {
copyToClipboard.textContent = 'Copied!';
};

const clipboard = new Clipboard(copyToClipboard, {
const clipboard = new ClipboardJS(copyToClipboard, {
text: () => codeSample.querySelector('code').textContent,
});

Expand Down
20 changes: 13 additions & 7 deletions docgen/layouts/index.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,25 +228,31 @@ block content
div.heading.w100p.text-left.m-l-large
small.color-logan InstantSearch for web
.col-md-12
.col-md-4
.col-md-3.col-sm-6
.card.fill-white.elevation1.radius6.p-large.h100.text-left
a(href="https://community.algolia.com/instantsearch.js/v2")
figure
img(src="assets/img/InstantSearch-JavaScript.svg", alt="Logo InstantSearch Javascript")
img.logo-is.w100p(src="assets/img/InstantSearch-JavaScript.svg", alt="Logo InstantSearch Javascript")
figcaption InstantSearch for Javascript
.col-md-4
.col-md-3.col-sm-6
.card.fill-white.elevation1.radius6.p-large.h100.text-left
a(href="https://community.algolia.com/react-instantsearch/")
figure
img(src="assets/img/InstantSearch-React.svg", alt="Logo InstantSearch React")
img.logo-is.w100p(src="assets/img/InstantSearch-React.svg", alt="Logo InstantSearch React")
figcaption InstantSearch for React
.col-md-4
.col-md-3.col-sm-6
.card.fill-white.elevation1.radius6.p-large.h100.text-left
a(href="https://community.algolia.com/vue-instantsearch")
figure
img(src="assets/img/InstantSearch-Vue.svg", alt="Logo InstantSearch Vue")
img.logo-is.w100p(src="assets/img/InstantSearch-Vue.svg", alt="Logo InstantSearch Vue")
figcaption InstantSearch for Vue.js

.col-md-3.col-sm-6
.card.fill-white.elevation1.radius6.p-large.h100.text-left
a(href="https://community.algolia.com/angular-instantsearch")
figure
img.logo-is.w100p(src="assets/img/InstantSearch-Angular.svg", alt="Logo InstantSearch Angular")
figcaption InstantSearch for Angular

.inline.spacer80
.inline.spacer120
.inline.spacer120
6 changes: 3 additions & 3 deletions docgen/src/guide/Server-side_rendering.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ When called, `createInstantSearch` returns:
* A dedicated [`<InstantSearch>`](widgets/<InstantSearch>.html) component accepting a `resultsState` prop containing the Algolia results.
* A `findResultsState` function to retrieve a `resultsState`.

The server-side reference is available in the [API docs](server-side-rendering/).
More details are available in the [server-side API docs](server-side-rendering/).

We split this guide in three parts:
- App.js is the server and browser shared main React component from your application
Expand All @@ -52,7 +52,7 @@ class App extends Component {
apiKey="apiKey"
indexName="indexName"
searchState={this.props.searchState}
resultsState={this.props.resultsState || {}}
resultsState={this.props.resultsState}
>
<SearchBox />
<Hits />
Expand Down Expand Up @@ -82,7 +82,7 @@ import { App, findResultsState } from './app.js';
import { renderToString } from 'react-dom/server';

const server = createServer((req, res) => {
const searchState = {searchState: {query: 'chair'}};
const searchState = {query: 'chair'};
const resultsState = await findResultsState(App, {searchState});
const appInitialState = {searchState, resultsState}
const appAsString = renderToString(<App {...appInitialState} />);
Expand Down
77 changes: 38 additions & 39 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
"docs:storybook-build-production": "build-storybook -s ./storybook/public -o docs-production/react-instantsearch/storybook -c ./storybook"
},
"devDependencies": {
"@storybook/addon-actions": "3.3.13",
"@storybook/addon-knobs": "3.3.13",
"@storybook/addon-links": "3.3.13",
"@storybook/addon-options": "3.3.13",
"@storybook/addons": "3.3.13",
"@storybook/react": "3.3.13",
"@storybook/ui": "3.3.13",
"@storybook/addon-actions": "3.3.14",
"@storybook/addon-knobs": "3.3.14",
"@storybook/addon-links": "3.3.14",
"@storybook/addon-options": "3.3.14",
"@storybook/addons": "3.3.14",
"@storybook/react": "3.3.14",
"@storybook/ui": "3.3.14",
"argos-cli": "0.0.9",
"async": "2.6.0",
"autoprefixer": "8.0.0",
"babel-cli": "6.26.0",
"babel-core": "6.26.0",
"babel-eslint": "8.2.1",
"babel-loader": "7.1.2",
"babel-eslint": "8.2.2",
"babel-loader": "7.1.3",
"babel-plugin-external-helpers": "6.22.0",
"babel-plugin-inline-json-import": "0.2.1",
"babel-plugin-lodash": "3.3.2",
Expand All @@ -48,43 +48,42 @@
"babel-preset-stage-2": "6.24.1",
"browser-sync": "2.23.6",
"bundlesize": "0.16.0",
"chokidar": "2.0.1",
"clipboard": "1.7.1",
"codemirror": "5.34.0",
"chokidar": "2.0.2",
"clipboard": "2.0.0",
"codemirror": "5.35.0",
"collect-json": "1.0.8",
"compression": "1.7.1",
"conventional-changelog-cli": "1.3.10",
"css-loader": "0.28.9",
"doctoc": "1.3.0",
"compression": "1.7.2",
"conventional-changelog-cli": "1.3.15",
"css-loader": "0.28.10",
"doctoc": "1.3.1",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "1.1.1",
"enzyme-to-json": "3.3.1",
"escape-html": "1.0.3",
"eslint": "4.17.0",
"eslint": "4.18.1",
"eslint-config-algolia": "13.1.0",
"eslint-config-prettier": "2.9.0",
"eslint-import-resolver-webpack": "0.8.4",
"eslint-plugin-import": "2.8.0",
"eslint-plugin-jasmine": "2.9.2",
"eslint-plugin-jest": "21.12.1",
"eslint-plugin-import": "2.9.0",
"eslint-plugin-jest": "21.12.2",
"eslint-plugin-prettier": "2.6.0",
"eslint-plugin-react": "7.6.1",
"eslint-plugin-react": "7.7.0",
"fs-extra": "5.0.0",
"gh-pages": "1.1.0",
"glob": "7.1.2",
"google-map-react": "0.31.0",
"google-map-react": "0.32.0",
"happo": "5.0.0",
"happo-core": "5.0.0",
"happo-target-firefox": "5.0.0",
"happypack": "4.0.1",
"hasha": "3.0.0",
"jest": "22.2.2",
"jest": "22.4.2",
"jsdoc-parse": "1.2.7",
"json": "9.0.6",
"jstransformer-markdown-it": "2.0.0",
"jstransformer-pug": "0.3.0",
"lodash": "4.17.5",
"markdown-it": "8.4.0",
"markdown-it": "8.4.1",
"markdown-it-anchor": "4.0.0",
"material-ui": "0.20.0",
"metalsmith": "2.3.0",
Expand All @@ -96,44 +95,44 @@
"mversion": "1.10.1",
"netlify-cli": "1.2.2",
"node-sass": "4.7.2",
"postcss": "6.0.17",
"postcss-loader": "2.1.0",
"postcss-scss": "1.0.3",
"prettier": "1.10.2",
"postcss": "6.0.19",
"postcss-loader": "2.1.1",
"postcss-scss": "1.0.4",
"prettier": "1.11.1",
"pretty-bytes-cli": "2.0.0",
"prop-types": "15.6.0",
"prop-types": "15.6.1",
"pug": "2.0.0-rc.4",
"qs": "6.5.1",
"react": "16.2.0",
"react-addons-test-utils": "15.6.2",
"react-autosuggest": "9.3.3",
"react-autosuggest": "9.3.4",
"react-dom": "16.2.0",
"react-hot-loader": "3.1.3",
"react-hot-loader": "4.0.0",
"react-tap-event-plugin": "3.0.2",
"recursive-readdir": "2.2.1",
"recursive-readdir": "2.2.2",
"replace-in-file": "3.1.1",
"rheostat": "2.1.3",
"rollup": "0.55.5",
"rollup": "0.56.3",
"rollup-plugin-babel": "3.0.3",
"rollup-plugin-commonjs": "8.3.0",
"rollup-plugin-filesize": "1.5.0",
"rollup-plugin-node-globals": "1.1.0",
"rollup-plugin-node-resolve": "3.0.0",
"rollup-plugin-node-resolve": "3.0.3",
"rollup-plugin-replace": "2.0.0",
"rollup-plugin-uglify": "3.0.0",
"sass-loader": "6.0.6",
"stat-mode": "0.2.2",
"storybook-addon-a11y": "3.1.9",
"storybook-addon-jsx": "5.3.0",
"string": "3.3.3",
"style-loader": "0.20.1",
"style-loader": "0.20.2",
"webpack": "3.11.0",
"webpack-bundle-analyzer": "2.10.0",
"webpack-dev-middleware": "2.0.5",
"webpack-hot-middleware": "2.21.0"
"webpack-bundle-analyzer": "2.11.1",
"webpack-dev-middleware": "2.0.6",
"webpack-hot-middleware": "2.21.1"
},
"engines": {
"node": "8.6.0",
"node": "8.9.4",
"yarn": "1.3.2"
},
"jest": {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-instantsearch-theme-algolia/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"autoprefixer": "8.0.0",
"cssnano": "3.10.0",
"node-sass": "4.7.2",
"postcss": "6.0.17",
"postcss-scss": "1.0.3"
"postcss": "6.0.19",
"postcss-scss": "1.0.4"
},
"author": {
"name": "Algolia, Inc.",
Expand Down
44 changes: 31 additions & 13 deletions packages/react-instantsearch-theme-algolia/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ansi-styles@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"

ansi-styles@^3.1.0:
ansi-styles@^3.1.0, ansi-styles@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
dependencies:
Expand Down Expand Up @@ -233,6 +233,14 @@ chalk@^2.3.0:
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"

chalk@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
dependencies:
ansi-styles "^3.2.0"
escape-string-regexp "^1.0.5"
supports-color "^5.2.0"

clap@^1.0.9:
version "1.2.3"
resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
Expand Down Expand Up @@ -616,6 +624,10 @@ has-flag@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"

has-flag@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"

has-unicode@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
Expand Down Expand Up @@ -1268,11 +1280,11 @@ postcss-reduce-transforms@^1.0.3:
postcss "^5.0.8"
postcss-value-parser "^3.0.1"

postcss-scss@1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.3.tgz#4c00ab440fc1c994134e3d4e600c23341af6cd27"
postcss-scss@1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.4.tgz#6310fe1a15be418707a2cfd77f21dd4a06d1e09d"
dependencies:
postcss "^6.0.15"
postcss "^6.0.19"

postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
version "2.2.3"
Expand Down Expand Up @@ -1311,13 +1323,13 @@ postcss-zindex@^2.0.1:
postcss "^5.0.4"
uniqs "^2.0.0"

postcss@6.0.17, postcss@^6.0.17:
version "6.0.17"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.17.tgz#e259a051ca513f81e9afd0c21f7f82eda50c65c5"
postcss@6.0.19, postcss@^6.0.19:
version "6.0.19"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
dependencies:
chalk "^2.3.0"
chalk "^2.3.1"
source-map "^0.6.1"
supports-color "^5.1.0"
supports-color "^5.2.0"

postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.8, postcss@^5.2.16:
version "5.2.18"
Expand All @@ -1328,9 +1340,9 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
source-map "^0.5.6"
supports-color "^3.2.3"

postcss@^6.0.15:
version "6.0.15"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.15.tgz#f460cd6269fede0d1bf6defff0b934a9845d974d"
postcss@^6.0.17:
version "6.0.17"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.17.tgz#e259a051ca513f81e9afd0c21f7f82eda50c65c5"
dependencies:
chalk "^2.3.0"
source-map "^0.6.1"
Expand Down Expand Up @@ -1663,6 +1675,12 @@ supports-color@^5.1.0:
dependencies:
has-flag "^2.0.0"

supports-color@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
dependencies:
has-flag "^3.0.0"

svgo@^0.7.0:
version "0.7.2"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
Expand Down
Loading

0 comments on commit b566919

Please sign in to comment.