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 fix/current-refinements-dedupe
Browse files Browse the repository at this point in the history
  • Loading branch information
@Haroenv
Haroenv authored Jan 11, 2018
2 parents 63ba882 + ef6e454 commit 42e7f5b
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 57 deletions.
14 changes: 7 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"docs:storybook-build-production": "build-storybook -s ./storybook/public -o docs-production/react-instantsearch/storybook -c ./storybook"
},
"devDependencies": {
"@storybook/addon-actions": "3.3.7",
"@storybook/addon-knobs": "3.3.7",
"@storybook/addon-options": "3.3.7",
"@storybook/addons": "3.3.7",
"@storybook/react": "3.3.7",
"@storybook/ui": "3.3.7",
"@storybook/addon-actions": "3.3.8",
"@storybook/addon-knobs": "3.3.8",
"@storybook/addon-options": "3.3.8",
"@storybook/addons": "3.3.8",
"@storybook/react": "3.3.8",
"@storybook/ui": "3.3.8",
"argos-cli": "0.0.9",
"async": "2.6.0",
"autoprefixer": "7.2.4",
Expand Down Expand Up @@ -97,7 +97,7 @@
"postcss": "6.0.16",
"postcss-loader": "2.0.10",
"postcss-scss": "1.0.3",
"prettier": "1.10.1",
"prettier": "1.10.2",
"pretty-bytes-cli": "2.0.0",
"prop-types": "15.6.0",
"pug": "2.0.0-rc.4",
Expand Down
100 changes: 50 additions & 50 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
lodash "^4.17.4"
pify "^3.0.0"

"@storybook/addon-actions@3.3.7", "@storybook/addon-actions@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.3.7.tgz#edc2d4fe3472a3f542d7c3ed990400b5433e58fc"
"@storybook/addon-actions@3.3.8", "@storybook/addon-actions@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.3.8.tgz#7efa3d639b35f5b7540ed5befd2fbd80bc49e821"
dependencies:
deep-equal "^1.0.1"
global "^4.3.2"
Expand All @@ -137,9 +137,9 @@
react-inspector "^2.2.1"
uuid "^3.1.0"

"@storybook/addon-knobs@3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-3.3.7.tgz#d541de3d897987e21c10e25a5ae6a74c3606320e"
"@storybook/addon-knobs@3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-3.3.8.tgz#1c8b7a97ad64c7159c4dc4b3c9bfbc3e774aaca7"
dependencies:
babel-runtime "^6.26.0"
deep-equal "^1.0.1"
Expand All @@ -159,21 +159,21 @@
dependencies:
"@storybook/addons" "^3.2.14"

"@storybook/addon-links@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.3.7.tgz#df3114718bc7f0a39b6cdc61e301363768d7f2a0"
"@storybook/addon-links@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.3.8.tgz#d760952951c1f51eef280ceb091505d7af84bfb6"
dependencies:
"@storybook/components" "^3.3.7"
"@storybook/components" "^3.3.8"
global "^4.3.2"
prop-types "^15.5.10"

"@storybook/addon-options@3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/addon-options/-/addon-options-3.3.7.tgz#d57542b0c55d560c087b6b869602d3c694b32da4"
"@storybook/addon-options@3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/addon-options/-/addon-options-3.3.8.tgz#ce05e021dd54874b5521da09c4f89da82f4d3ca7"

"@storybook/addons@3.3.7", "@storybook/addons@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.3.7.tgz#cc27f4ba9da47810f7eae4013224fb5f72b22ffd"
"@storybook/addons@3.3.8", "@storybook/addons@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.3.8.tgz#2e36fdc0c03fb6eb9d2245fea1311ee7aaafbf0e"

"@storybook/addons@^3.2.14":
version "3.2.14"
Expand All @@ -187,25 +187,25 @@
global "^4.3.2"
json-stringify-safe "^5.0.1"

"@storybook/channel-postmessage@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.3.7.tgz#15bcc1525a27429348485fafb2fcbcb1091b72e1"
"@storybook/channel-postmessage@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.3.8.tgz#249a25e6f8c1c59e229ecec71a545c8127d59ab8"
dependencies:
"@storybook/channels" "^3.3.7"
"@storybook/channels" "^3.3.8"
global "^4.3.2"
json-stringify-safe "^5.0.1"

"@storybook/channels@^3.2.14":
version "3.2.14"
resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.2.14.tgz#0d7522bff3fdefe534828e80ef3b3b1360057c9e"

"@storybook/channels@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.3.7.tgz#227d1aac8d8d227354bdcfcef1e4ad5bee6afc44"
"@storybook/channels@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.3.8.tgz#3989a77c57ae6bf29bc2dcd9a82f364225f595ba"

"@storybook/client-logger@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-3.3.7.tgz#78d45bd1f13af2b621bbb5009a63daae381b3f94"
"@storybook/client-logger@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-3.3.8.tgz#58fc42e31ba10fc54380b324fbb8a16c76370398"

"@storybook/components@^3.2.14":
version "3.2.14"
Expand All @@ -215,9 +215,9 @@
glamorous "^4.11.0"
prop-types "^15.6.0"

"@storybook/components@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/components/-/components-3.3.7.tgz#6f64d56e9516907cd077e66564b8171a5745bc82"
"@storybook/components@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/components/-/components-3.3.8.tgz#850737561c1d97cfba003ed060db8f0cdf448c94"
dependencies:
glamor "^2.20.40"
glamorous "^4.11.2"
Expand All @@ -231,9 +231,9 @@
"@storybook/react-simple-di" "^1.2.1"
babel-runtime "6.x.x"

"@storybook/node-logger@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-3.3.7.tgz#5c2ae1b37bdd37c42a8c5d5f013cbb0e241f3c0b"
"@storybook/node-logger@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-3.3.8.tgz#b528bebb5d74156cf51e2c6424ba6da653adefe2"
dependencies:
chalk "^2.3.0"
npmlog "^4.1.2"
Expand Down Expand Up @@ -272,17 +272,17 @@
dependencies:
babel-runtime "^6.5.0"

"@storybook/react@3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.3.7.tgz#646f59773d9bb266b10c95124b638fffced28c2d"
dependencies:
"@storybook/addon-actions" "^3.3.7"
"@storybook/addon-links" "^3.3.7"
"@storybook/addons" "^3.3.7"
"@storybook/channel-postmessage" "^3.3.7"
"@storybook/client-logger" "^3.3.7"
"@storybook/node-logger" "^3.3.7"
"@storybook/ui" "^3.3.7"
"@storybook/react@3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.3.8.tgz#c7d3d4bb20d5ed281f73b118ccb2a22cd91eb0e8"
dependencies:
"@storybook/addon-actions" "^3.3.8"
"@storybook/addon-links" "^3.3.8"
"@storybook/addons" "^3.3.8"
"@storybook/channel-postmessage" "^3.3.8"
"@storybook/client-logger" "^3.3.8"
"@storybook/node-logger" "^3.3.8"
"@storybook/ui" "^3.3.8"
airbnb-js-shims "^1.4.0"
autoprefixer "^7.2.3"
babel-loader "^7.1.2"
Expand Down Expand Up @@ -391,11 +391,11 @@
webpack-dev-middleware "^1.12.0"
webpack-hot-middleware "^2.20.0"

"@storybook/ui@3.3.7", "@storybook/ui@^3.3.7":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.3.7.tgz#6d58b65955e47ac65588b7244c587fe28df3a1f3"
"@storybook/ui@3.3.8", "@storybook/ui@^3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.3.8.tgz#fc9e9f3da3d988da8b6e07f78e1f6db0a5c6e1dd"
dependencies:
"@storybook/components" "^3.3.7"
"@storybook/components" "^3.3.8"
"@storybook/mantra-core" "^1.7.2"
"@storybook/react-komposer" "^2.0.3"
babel-runtime "^6.26.0"
Expand Down Expand Up @@ -10010,9 +10010,9 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"

prettier@1.10.1:
version "1.10.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.1.tgz#01423fea6957ea23618d37d339ef0e7f7c967fc6"
prettier@1.10.2:
version "1.10.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"

pretty-bytes-cli@2.0.0:
version "2.0.0"
Expand Down

0 comments on commit 42e7f5b

Please sign in to comment.