Merge branch 'master' into express-4.16.2-21.0.0-app--vue

This commit is contained in:
Filipp Riabchun 2017-10-12 00:18:38 +02:00 committed by GitHub
commit 5ce8ef07b5
5 changed files with 30 additions and 13 deletions

View File

@ -20,7 +20,7 @@
"global": "^4.3.2",
"insert-css": "^1.0.0",
"lodash.debounce": "^4.0.8",
"moment": "^2.18.1",
"moment": "^2.19.0",
"prop-types": "^15.6.0",
"react-color": "^2.11.4",
"react-datetime": "^2.10.3",

View File

@ -49,13 +49,13 @@
"commander": "^2.11.0",
"css-loader": "^0.28.7",
"events": "^1.1.1",
"express": "^4.15.5",
"express": "^4.16.2",
"file-loader": "^0.11.2",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
"json-loader": "^0.5.7",
"json5": "^0.5.1",
"postcss-loader": "^2.0.6",
"postcss-loader": "^2.0.7",
"prop-types": "^15.6.0",
"react-native-compat": "^1.0.0",
"shelljs": "^0.7.8",

View File

@ -47,7 +47,7 @@
"configstore": "^3.1.1",
"core-js": "^2.5.1",
"css-loader": "^0.28.7",
"express": "^4.15.5",
"express": "^4.16.2",
"file-loader": "^0.11.2",
"find-cache-dir": "^1.0.0",
"glamor": "^2.20.40",
@ -59,7 +59,7 @@
"lodash.flattendeep": "^4.4.0",
"lodash.pick": "^4.4.0",
"postcss-flexbugs-fixes": "^3.2.0",
"postcss-loader": "^2.0.6",
"postcss-loader": "^2.0.7",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react-modal": "^2.4.1",

View File

@ -117,3 +117,7 @@ Add ability to customize styles in the story preview area
### [Figma](https://github.com/hharnisc/storybook-addon-figma)
Embed [Figma](https://figma.com) designs in a storybook panel.
### [State](https://github.com/Sambego/storybook-state)
Manage state inside a story. Update components when this state changes.

View File

@ -7960,6 +7960,10 @@ moment@2.x.x, moment@^2.18.1, moment@^2.6.0:
version "2.18.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
moment@^2.19.0:
version "2.19.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.0.tgz#44f675ef6b944942762581b1c179fb679e599d67"
morgan@~1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.6.1.tgz#5fd818398c6819cba28a7cd6664f292fe1c0bbf2"
@ -8885,6 +8889,15 @@ postcss-loader@2.0.6, postcss-loader@^2.0.6:
postcss-load-config "^1.2.0"
schema-utils "^0.3.0"
postcss-loader@^2.0.7:
version "2.0.7"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.7.tgz#4d2da1489cee0a14f72c0d9440c9ee7eded34345"
dependencies:
loader-utils "^1.1.0"
postcss "^6.0.0"
postcss-load-config "^1.2.0"
schema-utils "^0.3.0"
postcss-merge-idents@^2.1.5:
version "2.1.7"
resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
@ -9062,6 +9075,14 @@ 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.0, postcss@^6.0.13:
version "6.0.13"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f"
dependencies:
chalk "^2.1.0"
source-map "^0.6.1"
supports-color "^4.4.0"
postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.6:
version "6.0.12"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.12.tgz#6b0155089d2d212f7bd6a0cecd4c58c007403535"
@ -9070,14 +9091,6 @@ postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.6:
source-map "^0.5.7"
supports-color "^4.4.0"
postcss@^6.0.13:
version "6.0.13"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f"
dependencies:
chalk "^2.1.0"
source-map "^0.6.1"
supports-color "^4.4.0"
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"