Merge branch 'master' into release/3.3

This commit is contained in:
Filipp Riabchun 2017-09-30 15:35:05 -07:00 committed by GitHub
commit a306d2bd1b
8 changed files with 132 additions and 84 deletions

View File

@ -1,6 +1,5 @@
# Storybook
[![Greenkeeper badge](https://badges.greenkeeper.io/storybooks/storybook.svg)](https://greenkeeper.io/)
[![Build Status on CircleCI](https://circleci.com/gh/storybooks/storybook.svg?style=shield)](https://circleci.com/gh/storybooks/storybook)
[![CodeFactor](https://www.codefactor.io/repository/github/storybooks/storybook/badge)](https://www.codefactor.io/repository/github/storybooks/storybook)
[![Known Vulnerabilities](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847/badge.svg)](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847)
@ -64,6 +63,7 @@ For full documentation on using Storybook visit: [storybook.js.org](https://stor
### Main Projects
- [Storybook for react](app/react) - Storybook for React components
- [Storybook for vue](app/vue) - Storybook for Vue components
- [Storybook for react-native](app/react-native) - Storybook for React components
### Sub Projects

View File

@ -32,7 +32,7 @@
"marked": "^0.3.6",
"moment": "^2.18.1",
"prop-types": "^15.6.0",
"react-render-html": "^0.1.6",
"react-render-html": "^0.5.2",
"react-textarea-autosize": "^4.3.0"
},
"devDependencies": {

View File

@ -22,8 +22,8 @@
},
"dependencies": {
"global": "^4.3.2",
"graphiql": "^0.7.8",
"graphql": "^0.7.0",
"graphiql": "^0.11.5",
"graphql": "^0.11.6",
"prop-types": "^15.6.0"
},
"devDependencies": {

View File

@ -23,7 +23,7 @@
"moment": "^2.18.1",
"prop-types": "^15.6.0",
"react-color": "^2.11.4",
"react-datetime": "^2.8.10",
"react-datetime": "^2.10.3",
"react-textarea-autosize": "^4.3.0",
"util-deprecate": "^1.0.2"
},

View File

@ -29,7 +29,7 @@
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"bootstrap": "^3.3.7",
"chroma-js": "^0.7.2",
"chroma-js": "^0.7.8",
"color-pairs-picker": "^1.3.5",
"docsearch.js": "^2.3.3",
"front-matter": "^2.1.2",
@ -48,13 +48,13 @@
"react-document-title": "^2.0.3",
"react-dom": "^15.6.1",
"react-helmet": "^5.0.3",
"react-motion": "^0.1.0",
"react-motion": "^0.5.1",
"react-responsive-grid": "^0.3.3",
"react-router": "^2.6.1",
"react-stack-grid": "^0.2.1",
"react-typography": "^0.15.0",
"react-stack-grid": "^0.5.0",
"react-typography": "^0.16.5",
"sitemap": "^1.12.0",
"typography": "^0.15.8",
"typography": "^0.16.6",
"typography-plugin-code": "^0.15.9",
"underscore.string": "^3.2.2",
"webpack": "^1.15.0"

View File

@ -1981,10 +1981,14 @@ chownr@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
chroma-js@0.7.2, chroma-js@^0.7.2:
chroma-js@0.7.2:
version "0.7.2"
resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-0.7.2.tgz#d8373f97cda7310e447e1dd21974efb239e3117d"
chroma-js@^0.7.8:
version "0.7.8"
resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-0.7.8.tgz#4765881b3cc368a571677917e81b5cd3ff041d40"
cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@ -4214,7 +4218,7 @@ ini@^1.3.4, ini@~1.3.0:
version "1.3.4"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
inline-style-prefixer@^2.0.4, inline-style-prefixer@^2.0.5:
inline-style-prefixer@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz#c153c7e88fd84fef5c602e95a8168b2770671fe7"
dependencies:
@ -6678,6 +6682,12 @@ raf@^2.0.4:
dependencies:
performance-now "~0.1.3"
raf@^3.1.0:
version "3.3.2"
resolved "https://registry.yarnpkg.com/raf/-/raf-3.3.2.tgz#0c13be0b5b49b46f76d6669248d527cf2b02fe27"
dependencies:
performance-now "^2.1.0"
randomatic@^1.1.3:
version "1.1.7"
resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@ -6832,9 +6842,13 @@ react-modal@^2.2.4:
prop-types "^15.5.10"
react-dom-factories "^1.0.0"
react-motion@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.1.0.tgz#c6742fe6d15c22699ed4fc61bdede9a1cfab7acc"
react-motion@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.1.tgz#b90631408175ab1668e173caccd66d41a44f4592"
dependencies:
performance-now "^0.2.0"
prop-types "^15.5.8"
raf "^3.1.0"
react-page-width@^1.0.1:
version "1.0.1"
@ -6905,18 +6919,18 @@ react-split-pane@^0.1.65:
prop-types "^15.5.10"
react-style-proptype "^3.0.0"
react-stack-grid@^0.2.1:
version "0.2.2"
resolved "https://registry.yarnpkg.com/react-stack-grid/-/react-stack-grid-0.2.2.tgz#a9f0ba846bb7ffa5dc6464a36b75006e900ca785"
react-stack-grid@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/react-stack-grid/-/react-stack-grid-0.5.0.tgz#7b30341163ef937edce4a5a1c7962a429f7e2818"
dependencies:
easy-css-transform-builder "^0.0.2"
exenv "^1.2.1"
imagesloaded "^4.1.1"
inline-style-prefixer "^2.0.4"
inline-style-prefixer "^3.0.6"
invariant "^2.2.2"
prop-types "^15.5.10"
react-sizeme "^2.2.0"
react-transition-group "^1.1.3"
react-transition-group "^1.2.0"
shallowequal "^1.0.1"
react-stubber@^1.0.0:
@ -6942,7 +6956,7 @@ react-transform-hmr@^1.0.3:
global "^4.3.0"
react-proxy "^1.1.7"
react-transition-group@^1.1.2, react-transition-group@^1.1.3:
react-transition-group@^1.1.2, react-transition-group@^1.2.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
dependencies:
@ -6963,9 +6977,9 @@ react-treebeard@^2.0.3:
shallowequal "^0.2.2"
velocity-react "^1.3.1"
react-typography@^0.15.0:
version "0.15.10"
resolved "https://registry.yarnpkg.com/react-typography/-/react-typography-0.15.10.tgz#1ece7bbd856735bd2ada4f6c40be508e994655a8"
react-typography@^0.16.5:
version "0.16.5"
resolved "https://registry.yarnpkg.com/react-typography/-/react-typography-0.16.5.tgz#86e539430e0efb3a326c9de20d9e3a32662a2a6b"
react@^15.6.1:
version "15.6.2"
@ -8160,9 +8174,9 @@ typography-plugin-code@^0.15.9:
gray-percentage "^2.0.0"
lodash "^4.13.1"
typography@^0.15.8:
version "0.15.12"
resolved "https://registry.yarnpkg.com/typography/-/typography-0.15.12.tgz#333189035f85e585c0a5ac72669dd508e394a73e"
typography@^0.16.6:
version "0.16.6"
resolved "https://registry.yarnpkg.com/typography/-/typography-0.16.6.tgz#8eeb6a3f10a97fd08025132bb50272104ae72aa3"
dependencies:
compass-vertical-rhythm "^1.3.0"
decamelize "^1.2.0"

View File

@ -54,7 +54,7 @@
"danger": "^1.2.0",
"enzyme": "^3.0.0",
"enzyme-adapter-react-16": "^1.0.0",
"eslint": "^4.6.1",
"eslint": "^4.8.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-config-prettier": "^2.4.0",
"eslint-plugin-import": "^2.7.0",
@ -76,7 +76,7 @@
"lodash": "^4.17.4",
"nodemon": "^1.12.1",
"npmlog": "^4.1.2",
"prettier": "^1.6.1",
"prettier": "^1.7.3",
"raf": "^3.3.2",
"react": "^16.0.0",
"react-dom": "^16.0.0",

144
yarn.lock
View File

@ -2685,11 +2685,14 @@ codecov@^2.3.0:
request "2.81.0"
urlgrey "0.4.4"
codemirror-graphql@^0.5.7:
version "0.5.9"
resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.5.9.tgz#b5ca2a84bd0deae7660c726f7feba15149bac8fd"
codemirror-graphql@^0.6.11:
version "0.6.11"
resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.6.11.tgz#795efa3933523815a5245eefe8d6831d3c4ad026"
dependencies:
graphql-language-service-interface "0.0.19"
graphql-language-service-parser "0.0.15"
codemirror@^5.15.2:
codemirror@^5.26.0:
version "5.30.0"
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.30.0.tgz#86e57dd5ea5535acbcf9c720797b4cefe05b5a70"
@ -3206,7 +3209,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
create-react-class@^15.5.2, create-react-class@^15.5.x:
create-react-class@^15.5.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
dependencies:
@ -4369,9 +4372,9 @@ eslint@^3.16.1:
text-table "~0.2.0"
user-home "^2.0.0"
eslint@^4.6.1:
version "4.7.2"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.7.2.tgz#ff6f5f5193848a27ee9b627be3e73fb9cb5e662e"
eslint@^4.8.0:
version "4.8.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.8.0.tgz#229ef0e354e0e61d837c7a80fdfba825e199815e"
dependencies:
ajv "^5.2.0"
babel-code-frame "^6.22.0"
@ -5458,19 +5461,60 @@ graceful-fs@4.1.11, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3,
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
graphiql@^0.7.8:
version "0.7.8"
resolved "https://registry.yarnpkg.com/graphiql/-/graphiql-0.7.8.tgz#b8765d542ff6c3d51e67325a262c32dfc0f4becb"
graphiql@^0.11.5:
version "0.11.5"
resolved "https://registry.yarnpkg.com/graphiql/-/graphiql-0.11.5.tgz#0924c934d035c69eddfbbae30d3e59e46e29afc9"
dependencies:
codemirror "^5.15.2"
codemirror-graphql "^0.5.7"
marked "^0.3.5"
codemirror "^5.26.0"
codemirror-graphql "^0.6.11"
marked "0.3.6"
graphql@^0.7.0:
version "0.7.2"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.7.2.tgz#cc894a32823399b8a0cb012b9e9ecad35cd00f72"
graphql-language-service-config@0.0.17:
version "0.0.17"
resolved "https://registry.yarnpkg.com/graphql-language-service-config/-/graphql-language-service-config-0.0.17.tgz#36b5a9906c0bf0d356d31b7583058f9b85d1793e"
dependencies:
iterall "1.0.2"
graphql-language-service-types "0.0.21"
graphql-language-service-interface@0.0.19:
version "0.0.19"
resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-0.0.19.tgz#c58fa7bd95d2f30e33e04937a1a2c00a9740926e"
dependencies:
graphql "^0.10.1"
graphql-language-service-config "0.0.17"
graphql-language-service-parser "0.0.15"
graphql-language-service-types "0.0.21"
graphql-language-service-utils "0.0.17"
graphql-language-service-parser@0.0.15:
version "0.0.15"
resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-0.0.15.tgz#fd64afd8873624fa3c4a5831a08de9ccd6cc5182"
dependencies:
graphql-language-service-types "0.0.21"
graphql-language-service-types@0.0.21:
version "0.0.21"
resolved "https://registry.yarnpkg.com/graphql-language-service-types/-/graphql-language-service-types-0.0.21.tgz#b9453366fc8985765034bf34056fe93603a24b82"
dependencies:
graphql "^0.10.1"
graphql-language-service-utils@0.0.17:
version "0.0.17"
resolved "https://registry.yarnpkg.com/graphql-language-service-utils/-/graphql-language-service-utils-0.0.17.tgz#a8b91eca80c6aa5a0d461a0bbb63317986f9b989"
dependencies:
graphql "^0.10.1"
graphql-language-service-types "0.0.21"
graphql@^0.10.1:
version "0.10.5"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.10.5.tgz#c9be17ca2bdfdbd134077ffd9bbaa48b8becd298"
dependencies:
iterall "^1.1.0"
graphql@^0.11.6:
version "0.11.6"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.11.6.tgz#f0146b5dc1480fda579c21bb6238970fd5cf5aa3"
dependencies:
iterall "1.1.3"
graphqlify@^1.0.0:
version "1.1.0"
@ -6548,9 +6592,13 @@ istanbul-reports@^1.1.2:
dependencies:
handlebars "^4.0.3"
iterall@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.0.2.tgz#41a2e96ce9eda5e61c767ee5dc312373bb046e91"
iterall@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9"
iterall@^1.1.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9"
jest-changed-files@^20.0.3:
version "20.0.3"
@ -7889,7 +7937,7 @@ markdown-table@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c"
marked@^0.3.5, marked@^0.3.6:
marked@0.3.6, marked@^0.3.6:
version "0.3.6"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
@ -9045,11 +9093,7 @@ parse5@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
parse5@^2.0.2:
version "2.2.3"
resolved "https://registry.yarnpkg.com/parse5/-/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6"
parse5@^3.0.1:
parse5@^3.0.1, parse5@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
dependencies:
@ -9528,9 +9572,9 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@^1.6.1:
version "1.7.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.2.tgz#81371e64018aafc69cf1031956c70e029339f54e"
prettier@^1.7.3:
version "1.7.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.3.tgz#8e6974725273914b1c47439959dd3d3ba53664b6"
pretty-bytes@^4.0.2:
version "4.0.2"
@ -9836,9 +9880,9 @@ react-addons-test-utils@^15.5.1:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156"
react-attr-converter@0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/react-attr-converter/-/react-attr-converter-0.1.1.tgz#0591f5a1146e3ab9c8e4d303d6cf966f5e6d7608"
react-attr-converter@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/react-attr-converter/-/react-attr-converter-0.3.1.tgz#4a2abf6d907b7ddae4d862dfec80e489ce41ad6e"
react-clone-referenced-element@^1.0.1:
version "1.0.1"
@ -9854,14 +9898,14 @@ react-color@^2.11.4:
reactcss "^1.2.0"
tinycolor2 "^1.4.1"
react-datetime@^2.8.10:
version "2.10.2"
resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.10.2.tgz#0a91819c8068f6f3f24bbc687c0039820145a43e"
react-datetime@^2.10.3:
version "2.10.3"
resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.10.3.tgz#9807a7d9be1dd4ee01b3466b0416614e3543378e"
dependencies:
create-react-class "^15.5.2"
object-assign "^3.0.0"
prop-types "^15.5.7"
react-onclickoutside "^5.9.0"
react-onclickoutside "^6.5.0"
react-deep-force-update@^1.0.0:
version "1.1.1"
@ -10088,11 +10132,9 @@ react-native@^0.43.3:
xpipe "^1.0.5"
yargs "^6.4.0"
react-onclickoutside@^5.9.0:
version "5.11.1"
resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-5.11.1.tgz#00314e52567cf55faba94cabbacd119619070623"
dependencies:
create-react-class "^15.5.x"
react-onclickoutside@^6.5.0:
version "6.6.0"
resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.6.0.tgz#8526d0675fad26558e9f0a400c983b813c99ef3c"
react-proxy@^1.1.7:
version "1.1.8"
@ -10101,14 +10143,12 @@ react-proxy@^1.1.7:
lodash "^4.6.1"
react-deep-force-update "^1.0.0"
react-render-html@^0.1.6:
version "0.1.6"
resolved "https://registry.yarnpkg.com/react-render-html/-/react-render-html-0.1.6.tgz#57d63acc8e4a4cd0716bc5105af5c64c392f83b1"
react-render-html@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/react-render-html/-/react-render-html-0.5.2.tgz#de5889ccb447221f8e64ff570bb5f77a8dc4f138"
dependencies:
camelcase "^3.0.0"
parse5 "^2.0.2"
react-attr-converter "0.1.1"
uppercamelcase "^1.1.0"
parse5 "^3.0.2"
react-attr-converter "^0.3.1"
react-scripts@1.0.14:
version "1.0.14"
@ -12518,12 +12558,6 @@ upper-case@^1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
uppercamelcase@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/uppercamelcase/-/uppercamelcase-1.1.0.tgz#324d98a6b3afc7e8a8953e10641509b0e4e23f97"
dependencies:
camelcase "^1.2.1"
urijs@^1.16.1:
version "1.18.12"
resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.18.12.tgz#f04d91e1fabb29c16fc842f9a14ee8ddc3fda64e"