Merge branch 'master' into webpack-4

This commit is contained in:
Filipp Riabchun 2018-03-09 23:31:41 +02:00 committed by GitHub
commit 19919e56fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 13 deletions

View File

@ -26,13 +26,11 @@
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@storybook/react": "^3.4.0-rc.0"
"@storybook/react": "^3.4.0-rc.0",
"@types/react": "^16.0.20"
},
"peerDependencies": {
"@storybook/addons": "^3.3.0",
"react": "*"
},
"optionalDependencies": {
"@types/react": "^16.0.20"
}
}

View File

@ -31,7 +31,7 @@
"@storybook/addon-links": "^3.4.0-rc.0",
"@storybook/addons": "^3.4.0-rc.0",
"@storybook/react": "^3.4.0-rc.0",
"enzyme-to-json": "^3.3.2",
"enzyme-to-json": "^3.3.1",
"react": "^16.1.0",
"react-dom": "^16.1.0"
},

View File

@ -1,6 +1,6 @@
# Storybook Viewport Addon
Storybook Viewport Addon allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybookjs.org). This helps build responsive components inside of Storybook.
Storybook Viewport Addon allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybook.js.org). This helps build responsive components inside of Storybook.
[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)

View File

@ -48,7 +48,7 @@ With this addon, you can switch between background colors and background images
### [Viewport](https://github.com/storybooks/storybook/tree/master/addons/viewport)
Viewport allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybookjs.org). This helps build responsive components inside of Storybook.
Viewport allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybook.js.org). This helps build responsive components inside of Storybook.
## Community Addons

View File

@ -11,7 +11,7 @@ You may have tried to use our quick start guide to setup your project for Storyb
Storybook has its own Webpack setup and a dev server. Webpack setup is very similar to [Create React App](https://github.com/facebookincubator/create-react-app), but allows you to configure as you want.
In this guide, we are trying to set up Storybook for your React project.
In this guide, we will set up Storybook for your React project.
## Table of contents

View File

@ -35,7 +35,7 @@
"babel-runtime": "^6.26.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.0",
"enzyme-to-json": "^3.3.2",
"enzyme-to-json": "^3.3.1",
"jest": "^20.0.4",
"react-scripts": "^1.1.1",
"webpack": "^4.1.1"

View File

@ -27,7 +27,7 @@
"@storybook/node-logger": "^3.4.0-rc.0",
"@storybook/react": "^3.4.0-rc.0",
"babel-runtime": "^6.26.0",
"enzyme-to-json": "^3.3.2",
"enzyme-to-json": "^3.3.1",
"eventemitter3": "^3.0.1",
"format-json": "^1.0.3",
"global": "^4.3.2",

View File

@ -5099,9 +5099,9 @@ enzyme-to-json@^3.3.0:
dependencies:
lodash "^4.17.4"
enzyme-to-json@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.3.2.tgz#5caf0b3729ffea3aa14702f12c37e93b501a9d96"
enzyme-to-json@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.3.1.tgz#64239dcd417e2fb552f4baa6632de4744b9b5b93"
dependencies:
lodash "^4.17.4"