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

Merge branch 'master' into addon-stories

Browse Source
This commit is contained in:
Igor 2018-02-07 13:38:35 +02:00 committed by GitHub
commit 5d454d8a55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 70 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/actions/package.json
View File

@ -22,7 +22,7 @@
"dependencies": {
"deep-equal": "^1.0.1",
"global": "^4.3.2",
"make-error": "^1.3.2",
"make-error": "^1.3.3",
"prop-types": "^15.6.0",
"react-inspector": "^2.2.2",
"uuid": "^3.2.1"

3
addons/knobs/README.md
View File

@ -265,6 +265,7 @@ const options = {
const defaultValue = 'Red';
const value = selectV2(label, options, defaultValue)
```
### date
@ -283,7 +284,7 @@ const value = date(label, defaultValue);
The `date` knob returns the selected date as stringified Unix timestamp (e.g. `"1510913096516"`).
If your component needs the date in a different form you can wrap the `date` function:
```
```js
function myDateKnob(name, defaultValue) {
const stringTimestamp = date(name, defaultValue)
return new Date(stringTimestamp)

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', () => (

4
app/angular/package.json
View File

@ -44,7 +44,7 @@
"babel-runtime": "^6.23.0",
"case-sensitive-paths-webpack-plugin": "^2.0.0",
"chalk": "^2.1.0",
"commander": "^2.13.0",
"commander": "^2.14.0",
"common-tags": "^1.7.2",
"configstore": "^3.1.0",
"core-js": "^2.4.1",
@ -71,7 +71,7 @@
"react": "^16.0.0",
"react-dev-utils": "^5.0.0",
"react-dom": "^16.0.0",
"react-modal": "^3.1.11",
"react-modal": "^3.1.12",
"redux": "^3.6.0",
"request": "^2.81.0",
"rxjs": "^5.4.2",

4
app/polymer/package.json
View File

@ -46,7 +46,7 @@
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.3.0",
"commander": "^2.11.0",
"commander": "^2.14.0",
"common-tags": "^1.4.0",
"configstore": "^3.1.1",
"copy-webpack-plugin": "^4.2.0",
@ -70,7 +70,7 @@
"react": "^16.0.0",
"react-dev-utils": "^5.0.0",
"react-dom": "^16.0.0",
"react-modal": "^3.1.11",
"react-modal": "^3.1.12",
"redux": "^3.7.2",
"request": "^2.83.0",
"serve-favicon": "^2.4.5",

2
app/react-native/package.json
View File

@ -48,7 +48,7 @@
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"commander": "^2.13.0",
"commander": "^2.14.0",
"css-loader": "^0.28.9",
"express": "^4.16.2",
"file-loader": "^1.1.6",

2
app/react/package.json
View File

@ -46,7 +46,7 @@
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.3.0",
"commander": "^2.13.0",
"commander": "^2.14.0",
"common-tags": "^1.7.2",
"configstore": "^3.1.1",
"core-js": "^2.5.3",

2
app/vue/package.json
View File

@ -44,7 +44,7 @@
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.3.0",
"commander": "^2.13.0",
"commander": "^2.14.0",
"common-tags": "^1.7.2",
"configstore": "^3.1.1",
"core-js": "^2.5.3",

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.182",
"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",

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.37:
version "1.1.37"
resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.37.tgz#2d86e766211a39e94ba38ecdfc426c8b9c4fcbf3"
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.182:
version "1.9.183"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.183.tgz#3e6afaf17be7383a767b3d9c60e64f69eaa96ba6"
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.37"
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
examples/angular-cli/package.json
View File

@ -38,9 +38,9 @@
"@storybook/addons": "^3.4.0-alpha.7",
"@storybook/angular": "^3.4.0-alpha.7",
"@types/jasmine": "~2.8.6",
"@types/node": "~6.0.96",
"@types/node": "~6.0.97",
"global": "^4.3.2",
"jasmine-core": "~2.9.1",
"jasmine-core": "~2.99.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.0",
"karma-chrome-launcher": "~2.2.0",

2
lib/cli/package.json
View File

@ -32,7 +32,7 @@
"babel-runtime": "^6.26.0",
"chalk": "^2.3.0",
"child-process-promise": "^2.2.1",
"commander": "^2.13.0",
"commander": "^2.14.0",
"cross-spawn": "^5.0.1",
"jscodeshift": "^0.4.0",
"json5": "^0.5.1",

2
lib/ui/package.json
View File

@ -34,7 +34,7 @@
"react-fuzzy": "^0.5.1",
"react-icons": "^2.2.7",
"react-inspector": "^2.2.2",
"react-modal": "^3.1.11",
"react-modal": "^3.1.12",
"react-split-pane": "^0.1.75",
"react-treebeard": "^2.1.0",
"redux": "^3.7.2"

4
package.json
View File

@ -55,7 +55,7 @@
"chalk": "^2.3.0",
"codecov": "^3.0.0",
"codelyzer": "^3.1.2",
"commander": "^2.13.0",
"commander": "^2.14.0",
"concurrently": "^3.5.1",
"cross-env": "^5.1.3",
"danger": "^2.1.10",
@ -80,7 +80,7 @@
"jest-config": "^22.1.4",
"jest-diff": "^22.1.0",
"jest-environment-jsdom": "^22.1.4",
"jest-enzyme": "^4.1.0",
"jest-enzyme": "^4.2.0",
"jest-image-snapshot": "^2.3.0",
"jest-jasmine2": "^22.1.4",
"jest-preset-angular": "^5.0.0",

44
yarn.lock
View File

@ -307,10 +307,14 @@
version "9.3.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5"
"@types/node@^6.0.0", "@types/node@^6.0.46", "@types/node@~6.0.96":
"@types/node@^6.0.0", "@types/node@^6.0.46":
version "6.0.96"
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.96.tgz#7bf0bf40d6ce51e93762cc47d010c8cc5ebb2179"
"@types/node@~6.0.97":
version "6.0.97"
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.97.tgz#72199848e8f3cfa975864031ac12e0ef6ccfe054"
"@types/parse5@^2.2.32":
version "2.2.34"
resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-2.2.34.tgz#e3870a10e82735a720f62d71dcd183ba78ef3a9d"
@ -3242,10 +3246,14 @@ commander@2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
commander@^2.11.0, commander@^2.12.1, commander@^2.12.2, commander@^2.13.0, commander@^2.9.0:
commander@^2.11.0, commander@^2.12.1, commander@^2.12.2, commander@^2.9.0:
version "2.13.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
commander@^2.14.0:
version "2.14.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.0.tgz#7b25325963e6aace20d3a9285b09379b0c2208b5"
common-tags@^1.3.1, common-tags@^1.4.0, common-tags@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.7.2.tgz#24d9768c63d253a56ecff93845b44b4df1d52771"
@ -4691,9 +4699,9 @@ enzyme-adapter-utils@^1.3.0:
object.assign "^4.0.4"
prop-types "^15.6.0"
enzyme-matchers@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-4.1.1.tgz#ce8c177f96f05e757a2c7b5ca4040450c3beb57c"
enzyme-matchers@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-4.2.0.tgz#38333883258da90e5414b5ac07d388aecb75227f"
dependencies:
circular-json-es6 "^2.0.1"
deep-equal-ident "^1.1.1"
@ -7695,9 +7703,9 @@ jasmine-core@~2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
jasmine-core@~2.9.1:
version "2.9.1"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.9.1.tgz#b6bbc1d8e65250d56f5888461705ebeeeb88f22f"
jasmine-core@~2.99.0:
version "2.99.0"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.0.tgz#c105ab5222da45f1b0a10580383f5adbbff56d2c"
jasmine-spec-reporter@~4.2.1:
version "4.2.1"
@ -8025,11 +8033,11 @@ jest-environment-node@^22.1.4:
jest-mock "^22.1.0"
jest-util "^22.1.4"
jest-enzyme@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-4.1.1.tgz#db080b3ff2f93ab7161715d69801d1d5f187ed13"
jest-enzyme@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-4.2.0.tgz#d284506b6d87e072bf6d2786584970bb42ea5969"
dependencies:
enzyme-matchers "^4.1.1"
enzyme-matchers "^4.2.0"
enzyme-to-json "^3.3.0"
jest-get-type@^21.2.0:
@ -9618,10 +9626,14 @@ make-dir@^1.0.0:
dependencies:
pify "^3.0.0"
make-error@^1.1.1, make-error@^1.3.2:
make-error@^1.1.1:
version "1.3.2"
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.2.tgz#8762ffad2444dd8ff1f7c819629fa28e24fea1c4"
make-error@^1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.3.tgz#a97ae14ffd98b05f543e83ddc395e1b2b6e4cc6a"
make-fetch-happen@^2.4.13:
version "2.6.0"
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz#8474aa52198f6b1ae4f3094c04e8370d35ea8a38"
@ -12192,9 +12204,9 @@ react-inspector@^2.2.2:
babel-runtime "^6.26.0"
is-dom "^1.0.9"
react-modal@^3.1.11:
version "3.1.11"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.11.tgz#95c8223fcee7013258ad2d149c38c9f870c89958"
react-modal@^3.1.12:
version "3.1.12"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.12.tgz#e80ab4e553ce946a6c96faf85eb31e0f9bd07470"
dependencies:
exenv "^1.2.0"
prop-types "^15.5.10"