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

Merge remote-tracking branch 'origin/master' into release/3.3

Browse Source 
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
This commit is contained in:
hypnos 2017-12-13 22:21:49 +03:00
commit 147a51d8dc
9 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/knobs/package.json
View File

@ -30,7 +30,7 @@
"devDependencies": {
"raw-loader": "^0.5.1",
"style-loader": "^0.19.0",
"vue": "^2.5.9"
"vue": "^2.5.10"
},
"peerDependencies": {
"@storybook/addons": "^3.3.0-alpha.4",

2
app/react/package.json
View File

@ -81,7 +81,7 @@
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"nodemon": "^1.12.5"
"nodemon": "^1.12.6"
},
"peerDependencies": {
"react": ">=15.0.0 || ^16.0.0",

10
app/vue/package.json
View File

@ -77,14 +77,14 @@
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"nodemon": "^1.12.5",
"vue": "^2.5.9",
"nodemon": "^1.12.6",
"vue": "^2.5.10",
"vue-loader": "^13.5.0",
"vue-template-compiler": "^2.5.9"
"vue-template-compiler": "^2.5.10"
},
"peerDependencies": {
"vue": "*",
"vue": "2.5.10",
"vue-loader": "*",
"vue-template-compiler": "*"
"vue-template-compiler": "2.5.10"
}
}

6
docs/package.json
View File

@ -30,14 +30,14 @@
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"bootstrap": "^3.3.7",
"gatsby": "^1.9.130",
"gatsby": "^1.9.131",
"gatsby-link": "^1.6.31",
"gatsby-plugin-sharp": "^1.6.23",
"gatsby-remark-autolink-headers": "^1.4.10",
"gatsby-remark-copy-linked-files": "^1.5.23",
"gatsby-remark-images": "^1.5.34",
"gatsby-remark-images": "^1.5.35",
"gatsby-remark-smartypants": "^1.4.10",
"gatsby-source-filesystem": "^1.5.10",
"gatsby-source-filesystem": "^1.5.11",
"gatsby-transformer-remark": "^1.7.24",
"gh-pages": "^1.1.0",
"global": "^4.3.2",

18
docs/yarn.lock
View File

@ -4276,9 +4276,9 @@ gatsby-remark-copy-linked-files@^1.5.23:
path-is-inside "^1.0.2"
unist-util-visit "^1.1.1"
gatsby-remark-images@^1.5.34:
version "1.5.34"
resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.34.tgz#0e55b88d8f26e363d76b5705b7e92cc492ad15a0"
gatsby-remark-images@^1.5.35:
version "1.5.35"
resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.35.tgz#141786c33129538f4a560389f94d1f902c66872e"
dependencies:
babel-runtime "^6.26.0"
cheerio "^1.0.0-rc.2"
@ -4297,9 +4297,9 @@ gatsby-remark-smartypants@^1.4.10:
retext-smartypants "^2.0.0"
unist-util-visit "^1.1.1"
gatsby-source-filesystem@^1.5.10:
version "1.5.10"
resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.10.tgz#b2a2ed5a7656a30335961624af1da39373a9d5c5"
gatsby-source-filesystem@^1.5.11:
version "1.5.11"
resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.11.tgz#bc2f9bdcc71212df42d45ae0b8adc7e37540b599"
dependencies:
babel-cli "^6.26.0"
babel-runtime "^6.26.0"
@ -4335,9 +4335,9 @@ gatsby-transformer-remark@^1.7.24:
unist-util-select "^1.5.0"
unist-util-visit "^1.1.1"
gatsby@^1.9.130:
version "1.9.130"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.130.tgz#74c22b85a3fcf75a9c2f0ba190b2f9a1b435a651"
gatsby@^1.9.131:
version "1.9.131"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.131.tgz#15ad010885bdb1dd6bfe8c8d069108b6f06f4311"
dependencies:
async "^2.1.2"
babel-code-frame "^6.22.0"

4
examples/vue-kitchen-sink/package.json
View File

@ -21,12 +21,12 @@
"vue-hot-reload-api": "^2.2.4",
"vue-loader": "^13.5.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.9",
"vue-template-compiler": "^2.5.10",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.9.7"
},
"dependencies": {
"vue": "^2.5.9",
"vue": "^2.5.10",
"vuex": "^3.0.0"
},
"scripts": {

2
lib/ui/package.json
View File

@ -33,7 +33,7 @@
"react-fuzzy": "^0.5.1",
"react-icons": "^2.2.7",
"react-inspector": "^2.2.2",
"react-modal": "^3.1.7",
"react-modal": "^3.1.8",
"react-split-pane": "^0.1.71",
"react-treebeard": "^2.0.3",
"redux": "^3.7.2"

4
package.json
View File

@ -63,7 +63,7 @@
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-jest": "^21.4.2",
"eslint-plugin-json": "^1.2.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-prettier": "^2.2.0",
"eslint-plugin-react": "^7.5.1",
"fs-extra": "^4.0.3",
@ -79,7 +79,7 @@
"lerna": "^2.5.1",
"lint-staged": "^6.0.0",
"lodash": "^4.17.4",
"nodemon": "^1.12.5",
"nodemon": "^1.12.6",
"npmlog": "^4.1.2",
"prettier": "^1.9.2",
"process-nextick-args": "^1.0.7",

32
yarn.lock
View File

@ -4501,9 +4501,9 @@ eslint-plugin-jsx-a11y@5.1.1:
emoji-regex "^6.1.0"
jsx-ast-utils "^1.4.0"
eslint-plugin-jsx-a11y@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.2.tgz#659277a758b036c305a7e4a13057c301cd3be73f"
eslint-plugin-jsx-a11y@^6.0.3:
version "6.0.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.3.tgz#54583d1ae442483162e040e13cc31865465100e5"
dependencies:
aria-query "^0.7.0"
array-includes "^3.0.3"
@ -4511,7 +4511,7 @@ eslint-plugin-jsx-a11y@^6.0.2:
axobject-query "^0.1.0"
damerau-levenshtein "^1.0.0"
emoji-regex "^6.1.0"
jsx-ast-utils "^1.4.0"
jsx-ast-utils "^2.0.0"
eslint-plugin-prettier@^2.2.0:
version "2.3.1"
@ -9084,9 +9084,9 @@ nodemon@^1.12.0:
undefsafe "0.0.3"
update-notifier "^2.2.0"
nodemon@^1.12.5:
version "1.12.5"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.12.5.tgz#bd34afa1aa855f1996b561147848519f136de620"
nodemon@^1.12.6:
version "1.12.6"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.12.6.tgz#aa0ca0f3b9ea0f09e970e8135b2c9c9aa84eb711"
dependencies:
chokidar "^1.7.0"
debug "^2.6.8"
@ -10799,9 +10799,9 @@ react-modal@^2.2.4:
exenv "^1.2.0"
prop-types "^15.5.10"
react-modal@^3.1.7:
version "3.1.7"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.7.tgz#21feb937c95cd722bf2d375cada751fdc8189c0e"
react-modal@^3.1.8:
version "3.1.8"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.8.tgz#7d6b1958f44828babd2a1ce826c28fa40d026b0f"
dependencies:
exenv "^1.2.0"
prop-types "^15.5.10"
@ -13791,9 +13791,9 @@ vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
vue-template-compiler@^2.5.9:
version "2.5.9"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.9.tgz#7fabc73c8d3d12d32340cd86c5fc33e00e86d686"
vue-template-compiler@^2.5.10:
version "2.5.10"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.10.tgz#8d2754677430bf520650a7e2aee9070635158fc5"
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
@ -13802,9 +13802,9 @@ vue-template-es2015-compiler@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
vue@^2.5.9:
version "2.5.9"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.9.tgz#b2380cd040915dca69881dafd121d760952e65f7"
vue@^2.5.10:
version "2.5.10"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.10.tgz#dcd772e2594ba994145f2f09522149d9a1e7841a"
vuex@^3.0.0:
version "3.0.1"