GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-03 05:04:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dependencies.io-update-build-203.0.0

Browse Source
This commit is contained in:
Filipp Riabchun 2018-02-06 22:19:24 +03:00 committed by GitHub
commit 092f4dff22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/links/README.md
View File

@ -105,7 +105,7 @@ A React implementation of such a component can be imported from `@storybook/addo
```js
import { storiesOf } from '@storybook/react';
import { LinkTo } from '@storybook/addon-links';
import LinkTo from '@storybook/addon-links/react';
storiesOf('Link', module)
.add('First', () => (

2
app/angular/src/server/config/webpack.config.js
View File

@ -79,7 +79,7 @@ export default function(configDir) {
{
test: /\.html$/,
loader: 'raw-loader',
exclude: /\.async\.css$/,
exclude: /\.async\.html$/,
},
{
test: /\.scss$/,

11
app/angular/src/server/config/webpack.config.prod.js
View File

@ -97,6 +97,17 @@ export default function(configDir) {
test: /\.scss$/,
loaders: [require.resolve('raw-loader'), require.resolve('sass-loader')],
},
{
test: /\.md$/,
use: [
{
loader: 'html-loader',
},
{
loader: 'markdown-loader',
},
],
},
],
},
resolve: {

1
dependencies.yml
View File

@ -30,6 +30,7 @@ collectors:
actors:
# pull requests for updates to our major version
- type: js-lerna
dependencies_not_matching: "^react-native$"
versions: "L.Y.Y"
settings:
batch_mode: true

6
docs/package.json
View File

@ -31,14 +31,14 @@
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"bootstrap": "^3.3.7",
"gatsby": "^1.9.178",
"gatsby": "^1.9.179",
"gatsby-link": "^1.6.36",
"gatsby-plugin-sharp": "^1.6.27",
"gatsby-remark-autolink-headers": "^1.4.11",
"gatsby-remark-copy-linked-files": "^1.5.25",
"gatsby-remark-copy-linked-files": "^1.5.26",
"gatsby-remark-images": "^1.5.41",
"gatsby-remark-smartypants": "^1.4.10",
"gatsby-source-filesystem": "^1.5.16",
"gatsby-source-filesystem": "^1.5.18",
"gatsby-transformer-remark": "^1.7.30",
"gh-pages": "^1.1.0",
"global": "^4.3.2",

8
docs/src/pages/addons/addon-gallery/index.md
View File

@ -42,6 +42,10 @@ Storyshots is a way to automatically jest-snapshot all your stories. [More info
Redirects console output (logs, errors, warnings) into Action Logger Panel. `withConsole` decorator notifies from what stories logs are coming.
### [Backgrounds](https://github.com/storybooks/storybook/tree/master/addons/background)
With this addon, you can switch between background colors and background images for your preview components. It is really helpful for styleguides.
## Community Addons
You need to install these addons directly from NPM in order to use them.
@ -75,10 +79,6 @@ Break your stories down into smaller categories (chapters) and subcategories (se
Given possible values for each prop, renders your component with all combinations of prop values.
Useful for finding edge cases or just seeing all component states at once.
### [Backgrounds](https://github.com/NewSpring/react-storybook-addon-backgrounds)
With this addon, you can switch between background colors and background images for your preview components. It is really helpful for styleguides.
### [Material-UI](https://github.com/sm-react/storybook-addon-material-ui)
Wraps your story into MuiThemeProvider.

42
docs/yarn.lock
View File

@ -4352,9 +4352,9 @@ gatsby-1-config-css-modules@^1.0.8:
dependencies:
babel-runtime "^6.26.0"
gatsby-cli@^1.1.34:
version "1.1.34"
resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.34.tgz#85c17bf67bc717be0274c8e4a56c7df819ede1f5"
gatsby-cli@^1.1.35:
version "1.1.35"
resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.35.tgz#59e9a8c75a64f71989ecb2b5af17549f020c0051"
dependencies:
babel-code-frame "^6.26.0"
babel-runtime "^6.26.0"
@ -4408,12 +4408,12 @@ gatsby-plugin-sharp@^1.6.27:
sharp "^0.19.0"
svgo "^0.7.2"
gatsby-react-router-scroll@^1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-1.0.9.tgz#0a321e7ae8c69ac6ba9528abf5b7be4e549a943f"
gatsby-react-router-scroll@^1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-1.0.10.tgz#a520ea98fd25d5c307790974b13955cb128e01df"
dependencies:
babel-runtime "^6.26.0"
scroll-behavior "^0.9.1"
scroll-behavior "^0.9.9"
warning "^3.0.0"
gatsby-remark-autolink-headers@^1.4.11:
@ -4425,9 +4425,9 @@ gatsby-remark-autolink-headers@^1.4.11:
mdast-util-to-string "^1.0.2"
unist-util-visit "^1.1.1"
gatsby-remark-copy-linked-files@^1.5.25:
version "1.5.25"
resolved "https://registry.yarnpkg.com/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-1.5.25.tgz#ca2098551de4df929f03b8ab0d3bfa54b9f68deb"
gatsby-remark-copy-linked-files@^1.5.26:
version "1.5.26"
resolved "https://registry.yarnpkg.com/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-1.5.26.tgz#d223fc9d7dba45b48b90a29d5e40af4c59807baa"
dependencies:
babel-runtime "^6.26.0"
cheerio "^1.0.0-rc.2"
@ -4459,9 +4459,9 @@ gatsby-remark-smartypants@^1.4.10:
retext-smartypants "^2.0.0"
unist-util-visit "^1.1.1"
gatsby-source-filesystem@^1.5.16:
version "1.5.16"
resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.16.tgz#1439093b6ad53322667870ca4ed636ad0e2121b0"
gatsby-source-filesystem@^1.5.18:
version "1.5.18"
resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.18.tgz#e2cb96a2c248c304e58ba3d0142316a695d3ef35"
dependencies:
babel-cli "^6.26.0"
babel-runtime "^6.26.0"
@ -4500,9 +4500,9 @@ gatsby-transformer-remark@^1.7.30:
unist-util-select "^1.5.0"
unist-util-visit "^1.1.1"
gatsby@^1.9.178:
version "1.9.178"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.178.tgz#56601badc81d527fef7a6d25d87e9d7ff44e52e9"
gatsby@^1.9.179:
version "1.9.181"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.181.tgz#d3507d191fde19c0907113109db44dcc22380447"
dependencies:
async "^2.1.2"
babel-code-frame "^6.22.0"
@ -4542,10 +4542,10 @@ gatsby@^1.9.178:
front-matter "^2.1.0"
fs-extra "^4.0.1"
gatsby-1-config-css-modules "^1.0.8"
gatsby-cli "^1.1.34"
gatsby-cli "^1.1.35"
gatsby-link "^1.6.36"
gatsby-module-loader "^1.0.9"
gatsby-react-router-scroll "^1.0.9"
gatsby-react-router-scroll "^1.0.10"
glob "^7.1.1"
graphql "^0.11.7"
graphql-relay "^0.5.1"
@ -9662,9 +9662,9 @@ schema-utils@^0.4.2:
ajv "^5.0.0"
ajv-keywords "^2.1.0"
scroll-behavior@^0.9.1:
version "0.9.4"
resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.4.tgz#73b4a0eae3e59c0b8f3b6fc1ff78f054a513e79c"
scroll-behavior@^0.9.9:
version "0.9.9"
resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.9.tgz#ebfe0658455b82ad885b66195215416674dacce2"
dependencies:
dom-helpers "^3.2.1"
invariant "^2.2.2"

4
package.json
View File

@ -16,8 +16,8 @@
"coverage": "codecov",
"danger": "danger",
"dev": "concurrently --kill-others \"yarn dev:ts\" \"yarn dev:js\"",
"dev:js": "lerna exec --parallel -- node %LERNA_ROOT_PATH%/scripts/watch-js.js",
"dev:ts": "lerna exec --parallel -- node %LERNA_ROOT_PATH%/scripts/watch-ts.js",
"dev:js": "lerna exec --parallel -- cross-env-shell node \\$LERNA_ROOT_PATH/scripts/watch-js.js",
"dev:ts": "lerna exec --parallel -- cross-env-shell node \\$LERNA_ROOT_PATH/scripts/watch-ts.js",
"docs:build": "npm --prefix docs run build",
"docs:deploy:ci": "npm --prefix docs run deploy:ci",
"docs:deploy:manual": "npm --prefix docs run deploy:manual",