Skip to content

Commit

Permalink
Merge branch 'master' into switchto-babel-preset-env
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen authored Aug 17, 2017
2 parents 39140d8 + 2392767 commit 1f8e843
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 19 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# 3.2.5

2017-August-16

#### Features

- Add codemod for deprecated addon-info API [#1582](https://github.com/storybooks/storybook/pull/1582)

#### Bug Fixes

- Fixed addon-knobs for RN [#1635](https://github.com/storybooks/storybook/pull/1635)
- Make links navigate in the parent window [#1650](https://github.com/storybooks/storybook/pull/1650)
- Don’t render leftpanel stories tree if stories are empty [#1664](https://github.com/storybooks/storybook/pull/1664)
- Remove double styling for inline stories [#1651](https://github.com/storybooks/storybook/pull/1651)

#### Dependency Upgrades

- Upgrade react-modal to v2.2.4 [#1666](https://github.com/storybooks/storybook/pull/1666)

# 3.2.4

2017-August-12
Expand Down
2 changes: 1 addition & 1 deletion addons/info/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-info",
"version": "3.2.4",
"version": "3.2.5",
"description": "A Storybook addon to show additional information for your stories.",
"license": "MIT",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-knobs",
"version": "3.2.0",
"version": "3.2.5",
"description": "Storybook Addon Prop Editor Component",
"license": "MIT",
"main": "dist/index.js",
Expand Down
6 changes: 3 additions & 3 deletions addons/storyshots/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-storyshots",
"version": "3.2.4",
"version": "3.2.5",
"description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -22,7 +22,7 @@
"devDependencies": {
"@storybook/addons": "^3.2.0",
"@storybook/channels": "^3.2.0",
"@storybook/react": "^3.2.4",
"@storybook/react": "^3.2.5",
"babel-cli": "^6.24.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
Expand All @@ -33,7 +33,7 @@
"peerDependencies": {
"@storybook/addons": "^3.2.0",
"@storybook/channels": "^3.2.0",
"@storybook/react": "^3.2.4",
"@storybook/react": "^3.2.5",
"babel-core": "^6.25.0",
"react": "*",
"react-test-renderer": "*"
Expand Down
4 changes: 2 additions & 2 deletions app/react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/react-native",
"version": "3.2.4",
"version": "3.2.5",
"description": "A better way to develop React Native Components for your app",
"keywords": [
"react",
Expand Down Expand Up @@ -28,7 +28,7 @@
"@storybook/addon-links": "^3.2.0",
"@storybook/addons": "^3.2.0",
"@storybook/channel-websocket": "^3.2.0",
"@storybook/ui": "^3.2.4",
"@storybook/ui": "^3.2.5",
"autoprefixer": "^7.1.1",
"babel-core": "^6.25.0",
"babel-loader": "^7.0.0",
Expand Down
6 changes: 3 additions & 3 deletions app/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/react",
"version": "3.2.4",
"version": "3.2.5",
"description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
"homepage": "https://github.com/storybooks/storybook/tree/master/apps/react",
"bugs": {
Expand All @@ -26,7 +26,7 @@
"@storybook/addon-links": "^3.2.0",
"@storybook/addons": "^3.2.0",
"@storybook/channel-postmessage": "^3.2.0",
"@storybook/ui": "^3.2.4",
"@storybook/ui": "^3.2.5",
"airbnb-js-shims": "^1.1.1",
"autoprefixer": "^7.1.1",
"babel-core": "^6.25.0",
Expand Down Expand Up @@ -59,7 +59,7 @@
"postcss-loader": "^2.0.5",
"prop-types": "^15.5.10",
"qs": "^6.4.0",
"react-modal": "^1.7.7",
"react-modal": "^2.2.4",
"redux": "^3.6.0",
"request": "^2.81.0",
"serve-favicon": "^2.4.3",
Expand Down
6 changes: 3 additions & 3 deletions app/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/vue",
"version": "3.2.4",
"version": "3.2.5",
"description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
"homepage": "https://github.com/storybooks/storybook/tree/master/apps/vue",
"bugs": {
Expand All @@ -26,7 +26,7 @@
"@storybook/addon-links": "^3.2.0",
"@storybook/addons": "^3.2.0",
"@storybook/channel-postmessage": "^3.2.0",
"@storybook/ui": "^3.2.4",
"@storybook/ui": "^3.2.5",
"airbnb-js-shims": "^1.1.1",
"autoprefixer": "^7.1.1",
"babel-core": "^6.25.0",
Expand Down Expand Up @@ -58,7 +58,7 @@
"qs": "^6.4.0",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-modal": "^1.7.7",
"react-modal": "^2.2.4",
"redux": "^3.6.0",
"request": "^2.81.0",
"serve-favicon": "^2.4.3",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
"examples/*"
],
"concurrency": 1,
"version": "3.2.4"
"version": "3.2.5"
}
4 changes: 2 additions & 2 deletions lib/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/cli",
"version": "3.2.4",
"version": "3.2.5",
"description": "Storybook's CLI - easiest method of adding storybook to your projects",
"keywords": [
"cli",
Expand All @@ -24,7 +24,7 @@
"postinstall": "opencollective postinstall --collective=storybook"
},
"dependencies": {
"@storybook/codemod": "^3.2.0",
"@storybook/codemod": "^3.2.5",
"chalk": "^2.0.1",
"child-process-promise": "^2.2.1",
"commander": "^2.9.0",
Expand Down
2 changes: 1 addition & 1 deletion lib/codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/codemod",
"version": "3.2.0",
"version": "3.2.5",
"description": "A collection of codemod scripts written with JSCodeshift",
"license": "MIT",
"main": "dist/index.js",
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/ui",
"version": "3.2.4",
"version": "3.2.5",
"description": "Core Storybook UI",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -32,7 +32,7 @@
"react-icons": "^2.2.5",
"react-inspector": "^2.1.1",
"react-komposer": "^2.0.0",
"react-modal": "^1.7.7",
"react-modal": "^2.2.4",
"react-split-pane": "^0.1.65",
"react-treebeard": "^2.0.3",
"redux": "^3.6.0"
Expand Down

0 comments on commit 1f8e843

Please sign in to comment.