Skip to content

Commit

Permalink
Merge branch 'master' into optimize-storyshots-peers
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hypnosphi
Hypnosphi authored Dec 4, 2017
2 parents e10786e + a9e745c commit 6dfbd3f
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 52 deletions.
2 changes: 1 addition & 1 deletion dependencies.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ collectors:
versions: "L.Y.Y"
settings:
batch_mode: true
bootstrap_command: yarn
bootstrap_command: echo 'skip updating lockfile'
github_labels:
- dependencies:update
github_assignees:
Expand Down
8 changes: 4 additions & 4 deletions docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"storybook": "start-storybook -p 9009 -s src/pages"
},
"dependencies": {
"@storybook/addon-actions": "^3.2.16",
"@storybook/addon-links": "^3.2.16",
"@storybook/addons": "^3.2.16",
"@storybook/react": "^3.2.16",
"@storybook/addon-actions": "^3.2.17",
"@storybook/addon-links": "^3.2.17",
"@storybook/addons": "^3.2.17",
"@storybook/react": "^3.2.17",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
Expand Down
135 changes: 88 additions & 47 deletions docs/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,42 @@
version "3.0.9"
resolved "https://registry.yarnpkg.com/@hypnosphi/fuse.js/-/fuse.js-3.0.9.tgz#ea99f6121b4a8f065b4c71f85595db2714498807"

"@storybook/addon-actions@^3.2.16":
version "3.2.16"
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.2.16.tgz#dc53d48dc8035b426a02628687c6cb0601b933b9"
"@storybook/addon-actions@^3.2.17":
version "3.2.17"
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.2.17.tgz#e85d38f743125157fdaf6669708e089bc2008e50"
dependencies:
"@storybook/addons" "^3.2.16"
"@storybook/addons" "^3.2.17"
deep-equal "^1.0.1"
json-stringify-safe "^5.0.1"
prop-types "^15.6.0"
react-inspector "^2.2.1"
uuid "^3.1.0"

"@storybook/addon-links@^3.2.16":
version "3.2.16"
resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.2.16.tgz#58b807f7fbcdadb405c6379e69a22c48025c9558"
"@storybook/addon-links@^3.2.17":
version "3.2.17"
resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.2.17.tgz#fb1d5f5f16575e56d560955d70c2a756c9f5b612"
dependencies:
"@storybook/addons" "^3.2.16"
"@storybook/addons" "^3.2.17"

"@storybook/addons@^3.2.16":
version "3.2.16"
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.2.16.tgz#cbad5d9e8222aba3d5a5d06af98a095322f62cb5"
"@storybook/addons@^3.2.17":
version "3.2.17"
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.2.17.tgz#5c2ece24c5f7fbf7cedf4cfe503c5e356543e62d"

"@storybook/channel-postmessage@^3.2.16":
version "3.2.16"
resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.2.16.tgz#036b2c1c412e2806badc1c1f7bcbb19b069fedde"
"@storybook/channel-postmessage@^3.2.17":
version "3.2.17"
resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.2.17.tgz#530c1d6852b2c77df08490988fa943ba1373b1ec"
dependencies:
"@storybook/channels" "^3.2.16"
"@storybook/channels" "^3.2.17"
global "^4.3.2"
json-stringify-safe "^5.0.1"

"@storybook/channels@^3.2.16":
version "3.2.16"
resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.2.16.tgz#07d8686328c0bb885aa8b69254fcf0745d22a620"
"@storybook/channels@^3.2.17":
version "3.2.17"
resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.2.17.tgz#09219a512564d1aa2292419d8d6064dbf7f5a5b3"

"@storybook/components@^3.2.16":
version "3.2.16"
resolved "https://registry.yarnpkg.com/@storybook/components/-/components-3.2.16.tgz#381c4ce414f139fb03b059f1f0265c6246457e7b"
"@storybook/components@^3.2.17":
version "3.2.17"
resolved "https://registry.yarnpkg.com/@storybook/components/-/components-3.2.17.tgz#318c6e6a1d3ffb469523b5dcfee775639ccc500b"
dependencies:
glamor "^2.20.40"
glamorous "^4.11.0"
Expand Down Expand Up @@ -87,15 +87,15 @@
dependencies:
babel-runtime "^6.5.0"

"@storybook/react@^3.2.16":
version "3.2.16"
resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.2.16.tgz#9a0eaecbc7ba6c97e89ce1d17dee7a2af68260c9"
"@storybook/react@^3.2.17":
version "3.2.17"
resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.2.17.tgz#c7b0595efef049d4dae89202994c17f332ee4662"
dependencies:
"@storybook/addon-actions" "^3.2.16"
"@storybook/addon-links" "^3.2.16"
"@storybook/addons" "^3.2.16"
"@storybook/channel-postmessage" "^3.2.16"
"@storybook/ui" "^3.2.16"
"@storybook/addon-actions" "^3.2.17"
"@storybook/addon-links" "^3.2.17"
"@storybook/addons" "^3.2.17"
"@storybook/channel-postmessage" "^3.2.17"
"@storybook/ui" "^3.2.17"
airbnb-js-shims "^1.3.0"
autoprefixer "^7.1.6"
babel-core "^6.26.0"
Expand All @@ -111,11 +111,12 @@
babel-runtime "^6.26.0"
case-sensitive-paths-webpack-plugin "^2.1.1"
chalk "^2.3.0"
commander "^2.11.0"
common-tags "^1.4.0"
commander "^2.12.1"
common-tags "^1.5.1"
configstore "^3.1.1"
core-js "^2.5.1"
css-loader "^0.28.7"
dotenv-webpack "^1.5.4"
express "^4.16.2"
file-loader "^1.1.5"
find-cache-dir "^1.0.0"
Expand All @@ -128,7 +129,7 @@
lodash.flattendeep "^4.4.0"
lodash.pick "^4.4.0"
postcss-flexbugs-fixes "^3.2.0"
postcss-loader "^2.0.8"
postcss-loader "^2.0.9"
prop-types "^15.6.0"
qs "^6.5.1"
redux "^3.7.2"
Expand All @@ -140,15 +141,15 @@
util-deprecate "^1.0.2"
uuid "^3.1.0"
webpack "^3.8.1"
webpack-dev-middleware "^1.12.0"
webpack-hot-middleware "^2.20.0"
webpack-dev-middleware "^1.12.2"
webpack-hot-middleware "^2.21.0"

"@storybook/ui@^3.2.16":
version "3.2.16"
resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.2.16.tgz#b7df979c2f5770e54cf84300cc09b7072c2fef16"
"@storybook/ui@^3.2.17":
version "3.2.17"
resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.2.17.tgz#8838fc5bbe21cedfafc65ee90fe525499370118a"
dependencies:
"@hypnosphi/fuse.js" "^3.0.9"
"@storybook/components" "^3.2.16"
"@storybook/components" "^3.2.17"
"@storybook/mantra-core" "^1.7.0"
"@storybook/react-fuzzy" "^0.4.3"
"@storybook/react-komposer" "^2.0.0"
Expand All @@ -166,7 +167,7 @@
qs "^6.5.1"
react-icons "^2.2.7"
react-inspector "^2.2.1"
react-modal "^3.1.2"
react-modal "^3.1.4"
react-split-pane "^0.1.71"
react-treebeard "^2.0.3"
redux "^3.7.2"
Expand Down Expand Up @@ -2473,6 +2474,10 @@ [email protected], [email protected]:
dependencies:
graceful-readlink ">= 1.0.0"

commander@^2.12.1:
version "2.12.2"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"

commander@~2.8.1:
version "2.8.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
Expand All @@ -2491,6 +2496,12 @@ common-tags@^1.4.0:
dependencies:
babel-runtime "^6.18.0"

common-tags@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.5.1.tgz#e2e39931a013cd02253defeed89a1ad615a27f07"
dependencies:
babel-runtime "^6.26.0"

commondir@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
Expand Down Expand Up @@ -3193,6 +3204,12 @@ dot-prop@^4.1.0:
dependencies:
is-obj "^1.0.0"

dotenv-webpack@^1.5.4:
version "1.5.4"
resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.5.4.tgz#9c92e46e412a1cfbc60217ed33d69d2bbfddbf9f"
dependencies:
dotenv "^4.0.0"

dotenv@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
Expand Down Expand Up @@ -6633,6 +6650,10 @@ [email protected], mime@^1.3.4, mime@^1.3.6, mime@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"

mime@^1.5.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"

mimic-fn@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
Expand Down Expand Up @@ -7788,9 +7809,9 @@ postcss-loader@^0.13.0:
loader-utils "^0.2.15"
postcss "^5.2.0"

postcss-loader@^2.0.8:
version "2.0.8"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.8.tgz#8c67ddb029407dfafe684a406cfc16bad2ce0814"
postcss-loader@^2.0.9:
version "2.0.9"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.9.tgz#001fdf7bfeeb159405ee61d1bb8e59b528dbd309"
dependencies:
loader-utils "^1.1.0"
postcss "^6.0.0"
Expand Down Expand Up @@ -8383,12 +8404,13 @@ react-inspector@^2.2.1:
babel-runtime "^6.26.0"
is-dom "^1.0.9"

react-modal@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.2.tgz#6e1fd656315d6fc62a1edda2b5aecc9752ac6bca"
react-modal@^3.1.4:
version "3.1.7"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.7.tgz#21feb937c95cd722bf2d375cada751fdc8189c0e"
dependencies:
exenv "^1.2.0"
prop-types "^15.5.10"
warning "^3.0.0"

react-proxy@^3.0.0-alpha.0:
version "3.0.0-alpha.1"
Expand Down Expand Up @@ -10808,7 +10830,7 @@ webpack-core@~0.6.9:
source-list-map "~0.1.7"
source-map "~0.4.1"

webpack-dev-middleware@^1.10.2, webpack-dev-middleware@^1.12.0, webpack-dev-middleware@^1.8.4:
webpack-dev-middleware@^1.10.2, webpack-dev-middleware@^1.8.4:
version "1.12.0"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709"
dependencies:
Expand All @@ -10818,6 +10840,16 @@ webpack-dev-middleware@^1.10.2, webpack-dev-middleware@^1.12.0, webpack-dev-midd
range-parser "^1.0.3"
time-stamp "^2.0.0"

webpack-dev-middleware@^1.12.2:
version "1.12.2"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
dependencies:
memory-fs "~0.4.1"
mime "^1.5.0"
path-is-absolute "^1.0.0"
range-parser "^1.0.3"
time-stamp "^2.0.0"

webpack-dev-server@^1.16.1:
version "1.16.5"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-1.16.5.tgz#0cbd5f2d2ac8d4e593aacd5c9702e7bbd5e59892"
Expand All @@ -10836,7 +10868,7 @@ webpack-dev-server@^1.16.1:
supports-color "^3.1.1"
webpack-dev-middleware "^1.10.2"

webpack-hot-middleware@^2.13.2, webpack-hot-middleware@^2.20.0:
webpack-hot-middleware@^2.13.2:
version "2.20.0"
resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.20.0.tgz#cb896d837758b6408fe0afeeafdc0e5316b15319"
dependencies:
Expand All @@ -10845,6 +10877,15 @@ webpack-hot-middleware@^2.13.2, webpack-hot-middleware@^2.20.0:
querystring "^0.2.0"
strip-ansi "^3.0.0"

webpack-hot-middleware@^2.21.0:
version "2.21.0"
resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.0.tgz#7b3c113a7a4b301c91e0749573c7aab28b414b52"
dependencies:
ansi-html "0.0.7"
html-entities "^1.2.0"
querystring "^0.2.0"
strip-ansi "^3.0.0"

[email protected]:
version "0.0.5"
resolved "https://registry.yarnpkg.com/webpack-md5-hash/-/webpack-md5-hash-0.0.5.tgz#d9f1899ead664459dd8b6b0c926ac71cfbd7bc7a"
Expand Down

0 comments on commit 6dfbd3f

Please sign in to comment.