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 dd/fix-info-story-description

Browse Source
This commit is contained in:
Filipp Riabchun 2017-10-28 02:45:17 +03:00 committed by GitHub
commit 04a98e679c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/react/package.json
View File

@ -51,7 +51,7 @@
"file-loader": "^0.11.2", "file-loader": "^0.11.2",
"find-cache-dir": "^1.0.0", "find-cache-dir": "^1.0.0",
"glamor": "^2.20.40", "glamor": "^2.20.40",
"glamorous": "^4.10.0", "glamorous": "^4.11.0",
"global": "^4.3.2", "global": "^4.3.2",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"json-stringify-safe": "^5.0.1", "json-stringify-safe": "^5.0.1",

2
examples/cra-kitchen-sink/package.json
View File

@ -13,7 +13,7 @@
"eventemitter3": "^2.0.3", "eventemitter3": "^2.0.3",
"format-json": "^1.0.3", "format-json": "^1.0.3",
"glamor": "^2.20.40", "glamor": "^2.20.40",
"glamorous": "^4.10.0", "glamorous": "^4.11.0",
"global": "^4.3.2", "global": "^4.3.2",
"prop-types": "^15.6.0", "prop-types": "^15.6.0",
"react": "^16.0.0", "react": "^16.0.0",

2
lib/components/package.json
View File

@ -15,7 +15,7 @@
}, },
"dependencies": { "dependencies": {
"glamor": "^2.20.40", "glamor": "^2.20.40",
"glamorous": "^4.10.0", "glamorous": "^4.11.0",
"prop-types": "^15.6.0" "prop-types": "^15.6.0"
}, },
"devDependencies": { "devDependencies": {

6
yarn.lock
View File

@ -5236,9 +5236,9 @@ glamor@^2.20.40:
prop-types "^15.5.10" prop-types "^15.5.10"
through "^2.3.8" through "^2.3.8"
glamorous@^4.10.0: glamorous@^4.11.0:
version "4.10.0" version "4.11.0"
resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-4.10.0.tgz#2f2e06c27b93aade93432c98ca21db0b8c3d9a5e" resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-4.11.0.tgz#cb846dda1450c895c59a34060fb19e3251ed619f"
dependencies: dependencies:
brcast "^3.0.0" brcast "^3.0.0"
fast-memoize "^2.2.7" fast-memoize "^2.2.7"