Skip to content

Commit

Permalink
Merge branch 'master' into feature/jsx-for-vue
Browse files Browse the repository at this point in the history
  • Loading branch information
@ndelangen
ndelangen authored Oct 9, 2017
2 parents e9e1ec7 + 3036b2c commit 6db2b3b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 29 deletions.
2 changes: 1 addition & 1 deletion app/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"postcss-loader": "^2.0.6",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react-modal": "^2.3.3",
"react-modal": "^2.4.1",
"redux": "^3.7.2",
"request": "^2.83.0",
"serve-favicon": "^2.4.5",
Expand Down
2 changes: 1 addition & 1 deletion app/vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"qs": "^6.5.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-modal": "^2.3.3",
"react-modal": "^2.4.1",
"redux": "^3.7.2",
"request": "^2.83.0",
"serve-favicon": "^2.4.5",
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/addons/addon-gallery/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Now it is easy to add them into your Storybook.

### [Story-router](https://github.com/gvaldambrini/storybook-router)

A [decorator](/addons/introduction) that allows you to integrate react-router components in your stories.
A [decorator](/addons/introduction) that allows you to use your routing-aware components in your stories.

### [Host](https://github.com/philcockfield/storybook-host)

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "2.3.1",
"lerna": "2.4.0",
"npmClient": "yarn",
"useWorkspaces": true,
"commands": {
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"podda": "^1.2.2",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react-icons": "^2.2.5",
"react-icons": "^2.2.7",
"react-inspector": "^2.2.0",
"react-komposer": "^2.0.0",
"react-modal": "^2.3.3",
"react-modal": "^2.4.1",
"react-split-pane": "^0.1.65",
"react-treebeard": "^2.0.3",
"redux": "^3.7.2"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"inquirer": "^3.2.3",
"jest": "^21.2.0",
"jest-enzyme": "^4.0.0",
"lerna": "^2.3.1",
"lerna": "^2.4.0",
"lint-staged": "^4.1.0",
"lodash": "^4.17.4",
"nodemon": "^1.12.1",
Expand Down
37 changes: 15 additions & 22 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5549,7 +5549,7 @@ homedir-polyfill@^1.0.1:
dependencies:
parse-passwd "^1.0.0"

hosted-git-info@^2.1.4:
hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"

Expand Down Expand Up @@ -7063,9 +7063,9 @@ left-pad@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a"

lerna@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.3.1.tgz#16397bc8ad8703381c8435e42ae0cd02086e8ee3"
lerna@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.4.0.tgz#7b76446b154bafb9cba8996f3dc233f1cb6ca7c3"
dependencies:
async "^1.5.0"
chalk "^2.1.0"
Expand All @@ -7083,6 +7083,7 @@ lerna@^2.3.1:
glob-parent "^3.1.0"
globby "^6.1.0"
graceful-fs "^4.1.11"
hosted-git-info "^2.5.0"
inquirer "^3.2.2"
is-ci "^1.0.10"
load-json-file "^3.0.0"
Expand Down Expand Up @@ -9059,12 +9060,6 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

prop-types@15.5.8:
version "15.5.8"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
dependencies:
fbjs "^0.8.9"

prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
Expand Down Expand Up @@ -9359,17 +9354,15 @@ react-html-attributes@^1.3.0:
dependencies:
html-element-attributes "^1.0.0"

react-icon-base@2.0.7:
version "2.0.7"
resolved "https://registry.yarnpkg.com/react-icon-base/-/react-icon-base-2.0.7.tgz#0bd18736bd6ce79ca6d69ce8387a07fb8d4ceffe"
dependencies:
prop-types "15.5.8"
react-icon-base@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/react-icon-base/-/react-icon-base-2.1.0.tgz#a196e33fdf1e7aaa1fda3aefbb68bdad9e82a79d"

react-icons@^2.2.5:
version "2.2.5"
resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-2.2.5.tgz#f942501c21a4cc0456ce2bbee5032c93f6051dcf"
react-icons@^2.2.7:
version "2.2.7"
resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-2.2.7.tgz#d7860826b258557510dac10680abea5ca23cf650"
dependencies:
react-icon-base "2.0.7"
react-icon-base "2.1.0"

react-inspector@^2.2.0:
version "2.2.0"
Expand Down Expand Up @@ -9398,9 +9391,9 @@ react-komposer@^2.0.0:
react-stubber "^1.0.0"
shallowequal "^0.2.2"

react-modal@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-2.3.3.tgz#bf4d100bbc426549b943e4294f7e9ea88e56e1a5"
react-modal@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-2.4.1.tgz#cb09b26711b148eb9f59cb180e1b7d82980ded05"
dependencies:
exenv "^1.2.0"
prop-types "^15.5.10"
Expand Down

0 comments on commit 6db2b3b

Please sign in to comment.