diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d05cc216bd..bbdfe5d6ad5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 3.3.0-alpha.4 + +2017-November-22 + +#### Bug Fixes + +- Fix HMR by saving the preview frame URL as the story changes [#2349](https://github.com/storybooks/storybook/pull/2349) +- Fix CLI babel transpilation [#2350](https://github.com/storybooks/storybook/pull/2350) + # 3.3.0-alpha.3 2017-November-07 diff --git a/addons/a11y/package.json b/addons/a11y/package.json index 1df2cf98797..f8e157a899e 100644 --- a/addons/a11y/package.json +++ b/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "a11y addon for storybook", "keywords": [ "a11y", @@ -24,8 +24,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/components": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/components": "^3.3.0-alpha.4", "axe-core": "^2.0.7", "prop-types": "^15.6.0" }, diff --git a/addons/actions/package.json b/addons/actions/package.json index be5c4d9d6f4..83d34871b30 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Action Logger addon for storybook", "keywords": [ "storybook" @@ -21,7 +21,7 @@ "storybook": "start-storybook -p 9001" }, "dependencies": { - "@storybook/addons": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", "deep-equal": "^1.0.1", "prop-types": "^15.6.0", "react-inspector": "^2.2.1", diff --git a/addons/background/package.json b/addons/background/package.json index 4b857529c1c..e66e5b989a6 100644 --- a/addons/background/package.json +++ b/addons/background/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "A storybook addon to show different backgrounds for your preview", "keywords": [ "addon", diff --git a/addons/centered/package.json b/addons/centered/package.json index b3891460c03..94ccb32c042 100644 --- a/addons/centered/package.json +++ b/addons/centered/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-centered", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook decorator to center components", "license": "MIT", "author": "Muhammed Thanish ", diff --git a/addons/events/package.json b/addons/events/package.json index aae777b384a..66e819fab55 100644 --- a/addons/events/package.json +++ b/addons/events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-events", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Add events to your Storybook stories.", "keywords": [ "addon", @@ -20,7 +20,7 @@ "storybook": "start-storybook -p 6006" }, "dependencies": { - "@storybook/addons": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", "babel-runtime": "^6.26.0", "format-json": "^1.0.3", "prop-types": "^15.6.0", diff --git a/addons/graphql/package.json b/addons/graphql/package.json index f4d347b4d58..74ad10facd8 100644 --- a/addons/graphql/package.json +++ b/addons/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-graphql", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook addon to display the GraphiQL IDE", "keywords": [ "storybook" diff --git a/addons/info/package.json b/addons/info/package.json index 783aaba6576..33b1960e126 100644 --- a/addons/info/package.json +++ b/addons/info/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-info", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "A Storybook addon to show additional information for your stories.", "license": "MIT", "main": "dist/index.js", @@ -14,8 +14,8 @@ "storybook": "start-storybook -p 9010" }, "dependencies": { - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/components": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/components": "^3.3.0-alpha.4", "babel-runtime": "^6.26.0", "global": "^4.3.2", "marksy": "^2.0.0", diff --git a/addons/knobs/package.json b/addons/knobs/package.json index 2290055f9f1..3cbeaab3cc8 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-knobs", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook Addon Prop Editor Component", "license": "MIT", "main": "dist/index.js", @@ -15,7 +15,7 @@ }, "dependencies": { "@angular/core": "^5.0.0-beta.7", - "@storybook/addons": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", "babel-runtime": "^6.26.0", "deep-equal": "^1.0.1", "global": "^4.3.2", diff --git a/addons/links/package.json b/addons/links/package.json index 0de1779e37d..55744aadcfb 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Story Links addon for storybook", "keywords": [ "storybook" @@ -21,8 +21,8 @@ "storybook": "start-storybook -p 9001" }, "dependencies": { - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/components": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/components": "^3.3.0-alpha.4", "global": "^4.3.2", "prop-types": "^15.5.10" }, diff --git a/addons/notes/package.json b/addons/notes/package.json index 94c79970251..e04ae589938 100644 --- a/addons/notes/package.json +++ b/addons/notes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-notes", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Write notes for your Storybook stories.", "keywords": [ "addon", @@ -19,7 +19,7 @@ "storybook": "start-storybook -p 9010" }, "dependencies": { - "@storybook/addons": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", "babel-runtime": "^6.26.0", "prop-types": "^15.6.0", "util-deprecate": "^1.0.2" diff --git a/addons/options/package.json b/addons/options/package.json index 3622dab7bc8..5cbceface61 100644 --- a/addons/options/package.json +++ b/addons/options/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-options", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Options addon for storybook", "keywords": [ "storybook" @@ -20,7 +20,7 @@ "storybook": "start-storybook -p 9001" }, "dependencies": { - "@storybook/addons": "^3.3.0-alpha.3" + "@storybook/addons": "^3.3.0-alpha.4" }, "peerDependencies": { "react": "*", diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json index 3100ab4174f..6008ec394e3 100644 --- a/addons/storyshots/package.json +++ b/addons/storyshots/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.", "license": "MIT", "main": "dist/index.js", @@ -23,9 +23,9 @@ "read-pkg-up": "^3.0.0" }, "devDependencies": { - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/channels": "^3.3.0-alpha.3", - "@storybook/react": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/channels": "^3.3.0-alpha.4", + "@storybook/react": "^3.3.0-alpha.4", "babel-cli": "^6.26.0", "babel-jest": "^20.0.3", "babel-plugin-transform-runtime": "^6.23.0", @@ -37,9 +37,9 @@ "react-dom": "^16.1.0" }, "peerDependencies": { - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/channels": "^3.3.0-alpha.3", - "@storybook/react": "^3.3.0-alpha.3", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/channels": "^3.3.0-alpha.4", + "@storybook/react": "^3.3.0-alpha.4", "babel-core": "^6.26.0", "react": "*", "react-test-renderer": "*" diff --git a/addons/viewport/package.json b/addons/viewport/package.json index 31b40959f4f..792fce76957 100644 --- a/addons/viewport/package.json +++ b/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook addon to change the viewport size to mobile", "main": "dist/index.js", "keywords": [ @@ -11,7 +11,7 @@ }, "license": "MIT", "dependencies": { - "@storybook/components": "^3.3.0-alpha.3", + "@storybook/components": "^3.3.0-alpha.4", "global": "^4.3.2", "prop-types": "^15.5.10" }, diff --git a/app/angular/package.json b/app/angular/package.json index c678fa0a3ad..41fa1d56eff 100644 --- a/app/angular/package.json +++ b/app/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook for Anglar: Develop Angular Components in isolation with Hot Reloading.", "homepage": "https://github.com/storybooks/storybook/tree/master/apps/angular", "bugs": { @@ -27,11 +27,11 @@ "@angular/core": "^5.0.0-beta.7", "@angular/platform-browser": "^5.0.0-beta.7", "@angular/platform-browser-dynamic": "^5.0.0-beta.7", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/channel-postmessage": "^3.3.0-alpha.3", - "@storybook/ui": "^3.3.0-alpha.3", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/channel-postmessage": "^3.3.0-alpha.4", + "@storybook/ui": "^3.3.0-alpha.4", "airbnb-js-shims": "^1.1.1", "angular2-template-loader": "^0.6.2", "autoprefixer": "^7.1.1", diff --git a/app/angular/src/client/preview/init.js b/app/angular/src/client/preview/init.js index a8de2d28f16..11e470afd4c 100644 --- a/app/angular/src/client/preview/init.js +++ b/app/angular/src/client/preview/init.js @@ -1,4 +1,6 @@ import keyEvents from '@storybook/ui/dist/libs/key_events'; +import qs from 'qs'; + import { selectStory } from './actions'; export default function(context) { @@ -8,6 +10,19 @@ export default function(context) { reduxStore.dispatch(selectStory(queryParams.selectedKind, queryParams.selectedStory)); } + // Keep whichever of these are set that we don't override when stories change + const originalQueryParams = queryParams; + reduxStore.subscribe(() => { + const { selectedKind, selectedStory } = reduxStore.getState(); + + const queryString = qs.stringify({ + ...originalQueryParams, + selectedKind, + selectedStory, + }); + window.history.pushState({}, '', `?${queryString}`); + }); + // Handle keyEvents and pass them to the parent. window.onkeydown = e => { const parsedEvent = keyEvents(e); diff --git a/app/react-native/package.json b/app/react-native/package.json index f2f4689f212..5e8b02fe7e1 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-native", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "A better way to develop React Native Components for your app", "keywords": [ "react", @@ -24,11 +24,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/channel-websocket": "^3.3.0-alpha.3", - "@storybook/ui": "^3.3.0-alpha.3", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/channel-websocket": "^3.3.0-alpha.4", + "@storybook/ui": "^3.3.0-alpha.4", "autoprefixer": "^7.1.6", "babel-core": "^6.26.0", "babel-loader": "^7.1.2", diff --git a/app/react/package.json b/app/react/package.json index 8fa79448a09..773d73fd721 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybooks/storybook/tree/master/app/react", "bugs": { @@ -22,11 +22,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/channel-postmessage": "^3.3.0-alpha.3", - "@storybook/ui": "^3.3.0-alpha.3", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/channel-postmessage": "^3.3.0-alpha.4", + "@storybook/ui": "^3.3.0-alpha.4", "airbnb-js-shims": "^1.3.0", "autoprefixer": "^7.1.6", "babel-core": "^6.26.0", @@ -47,6 +47,7 @@ "configstore": "^3.1.1", "core-js": "^2.5.1", "css-loader": "^0.28.7", + "dotenv-webpack": "^1.5.4", "express": "^4.16.2", "file-loader": "^1.1.5", "find-cache-dir": "^1.0.0", diff --git a/app/react/src/client/preview/init.js b/app/react/src/client/preview/init.js index a8de2d28f16..11e470afd4c 100644 --- a/app/react/src/client/preview/init.js +++ b/app/react/src/client/preview/init.js @@ -1,4 +1,6 @@ import keyEvents from '@storybook/ui/dist/libs/key_events'; +import qs from 'qs'; + import { selectStory } from './actions'; export default function(context) { @@ -8,6 +10,19 @@ export default function(context) { reduxStore.dispatch(selectStory(queryParams.selectedKind, queryParams.selectedStory)); } + // Keep whichever of these are set that we don't override when stories change + const originalQueryParams = queryParams; + reduxStore.subscribe(() => { + const { selectedKind, selectedStory } = reduxStore.getState(); + + const queryString = qs.stringify({ + ...originalQueryParams, + selectedKind, + selectedStory, + }); + window.history.pushState({}, '', `?${queryString}`); + }); + // Handle keyEvents and pass them to the parent. window.onkeydown = e => { const parsedEvent = keyEvents(e); diff --git a/app/react/src/server/config/webpack.config.js b/app/react/src/server/config/webpack.config.js index 090ea973bc1..c9b354cc120 100644 --- a/app/react/src/server/config/webpack.config.js +++ b/app/react/src/server/config/webpack.config.js @@ -1,5 +1,6 @@ import path from 'path'; import webpack from 'webpack'; +import Dotenv from 'dotenv-webpack'; import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; import WatchMissingNodeModulesPlugin from './WatchMissingNodeModulesPlugin'; @@ -55,6 +56,7 @@ export default function() { new CaseSensitivePathsPlugin(), new WatchMissingNodeModulesPlugin(nodeModulesPaths), new webpack.ProgressPlugin(), + new Dotenv(), ], module: { rules: [ diff --git a/app/vue/package.json b/app/vue/package.json index 9f6636d8358..3fdd93e2e44 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybooks/storybook/tree/master/apps/vue", "bugs": { @@ -22,11 +22,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/channel-postmessage": "^3.3.0-alpha.3", - "@storybook/ui": "^3.3.0-alpha.3", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/channel-postmessage": "^3.3.0-alpha.4", + "@storybook/ui": "^3.3.0-alpha.4", "airbnb-js-shims": "^1.3.0", "autoprefixer": "^7.1.6", "babel-core": "^6.26.0", @@ -47,6 +47,7 @@ "configstore": "^3.1.1", "core-js": "^2.5.1", "css-loader": "^0.28.7", + "dotenv-webpack": "^1.5.4", "express": "^4.16.2", "file-loader": "^1.1.5", "find-cache-dir": "^1.0.0", diff --git a/app/vue/src/client/preview/init.js b/app/vue/src/client/preview/init.js index a8de2d28f16..11e470afd4c 100644 --- a/app/vue/src/client/preview/init.js +++ b/app/vue/src/client/preview/init.js @@ -1,4 +1,6 @@ import keyEvents from '@storybook/ui/dist/libs/key_events'; +import qs from 'qs'; + import { selectStory } from './actions'; export default function(context) { @@ -8,6 +10,19 @@ export default function(context) { reduxStore.dispatch(selectStory(queryParams.selectedKind, queryParams.selectedStory)); } + // Keep whichever of these are set that we don't override when stories change + const originalQueryParams = queryParams; + reduxStore.subscribe(() => { + const { selectedKind, selectedStory } = reduxStore.getState(); + + const queryString = qs.stringify({ + ...originalQueryParams, + selectedKind, + selectedStory, + }); + window.history.pushState({}, '', `?${queryString}`); + }); + // Handle keyEvents and pass them to the parent. window.onkeydown = e => { const parsedEvent = keyEvents(e); diff --git a/app/vue/src/server/config/webpack.config.js b/app/vue/src/server/config/webpack.config.js index b9baa314466..faee281da18 100644 --- a/app/vue/src/server/config/webpack.config.js +++ b/app/vue/src/server/config/webpack.config.js @@ -1,5 +1,6 @@ import path from 'path'; import webpack from 'webpack'; +import Dotenv from 'dotenv-webpack'; import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; import WatchMissingNodeModulesPlugin from './WatchMissingNodeModulesPlugin'; @@ -54,6 +55,7 @@ export default function() { new CaseSensitivePathsPlugin(), new WatchMissingNodeModulesPlugin(nodeModulesPaths), new webpack.ProgressPlugin(), + new Dotenv(), ], module: { rules: [ diff --git a/docs/package.json b/docs/package.json index a28070b0b79..d17f1953130 100644 --- a/docs/package.json +++ b/docs/package.json @@ -30,7 +30,7 @@ "babel-preset-react": "^6.24.1", "babel-preset-stage-0": "^6.24.1", "bootstrap": "^3.3.7", - "gatsby": "^1.9.118", + "gatsby": "^1.9.119", "gatsby-link": "^1.6.28", "gatsby-plugin-sharp": "^1.6.21", "gatsby-remark-autolink-headers": "^1.4.8", diff --git a/docs/yarn.lock b/docs/yarn.lock index f74751527da..bbb608ea5c8 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -4175,9 +4175,9 @@ gatsby-1-config-css-modules@^1.0.6: dependencies: babel-runtime "^6.26.0" -gatsby-cli@^1.1.22: - version "1.1.22" - resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.22.tgz#5ffef1dda85cde7536d389f333416794ec6a3b01" +gatsby-cli@^1.1.23: + version "1.1.23" + resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.23.tgz#8681aefa6efefe0abfbd3b267c2358c2c1f3d9bd" dependencies: babel-code-frame "^6.26.0" babel-runtime "^6.26.0" @@ -4317,9 +4317,9 @@ gatsby-transformer-remark@^1.7.21: unist-util-select "^1.5.0" unist-util-visit "^1.1.1" -gatsby@^1.9.118: - version "1.9.118" - resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.118.tgz#76d94faaa91f0ebe39fd2346f91a26146bff4009" +gatsby@^1.9.119: + version "1.9.119" + resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.119.tgz#753b212330d3391761a0cc5257fe3220fc0a1195" dependencies: async "^2.1.2" babel-code-frame "^6.22.0" @@ -4358,7 +4358,7 @@ gatsby@^1.9.118: front-matter "^2.1.0" fs-extra "^4.0.1" gatsby-1-config-css-modules "^1.0.6" - gatsby-cli "^1.1.22" + gatsby-cli "^1.1.23" gatsby-module-loader "^1.0.8" gatsby-react-router-scroll "^1.0.5" glob "^7.1.1" diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json index 6a4a4282a3f..55f4fe8addf 100644 --- a/examples/angular-cli/package.json +++ b/examples/angular-cli/package.json @@ -31,11 +31,11 @@ "@angular/cli": "1.3.0", "@angular/compiler-cli": "^5.0.0-beta.7", "@angular/language-service": "^5.0.0-beta.7", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", - "@storybook/addon-notes": "^3.3.0-alpha.3", - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/angular": "3.3.0-alpha.3", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", + "@storybook/addon-notes": "^3.3.0-alpha.4", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/angular": "^3.3.0-alpha.4", "@types/jasmine": "~2.5.53", "@types/node": "~6.0.60", "codelyzer": "^3.1.2", diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json index eba59c65e87..d22894ebb53 100644 --- a/examples/cra-kitchen-sink/package.json +++ b/examples/cra-kitchen-sink/package.json @@ -21,21 +21,21 @@ "uuid": "^3.1.0" }, "devDependencies": { - "@storybook/addon-a11y": "^3.3.0-alpha.3", - "@storybook/addon-actions": "3.3.0-alpha.3", - "@storybook/addon-backgrounds": "^3.3.0-alpha.3", - "@storybook/addon-centered": "3.3.0-alpha.3", - "@storybook/addon-events": "3.3.0-alpha.3", - "@storybook/addon-info": "3.3.0-alpha.3", - "@storybook/addon-knobs": "3.3.0-alpha.3", - "@storybook/addon-links": "3.3.0-alpha.3", - "@storybook/addon-notes": "3.3.0-alpha.3", - "@storybook/addon-options": "3.3.0-alpha.3", - "@storybook/addon-storyshots": "3.3.0-alpha.3", - "@storybook/addon-viewport": "3.3.0-alpha.3", - "@storybook/addons": "3.3.0-alpha.3", - "@storybook/components": "3.3.0-alpha.3", - "@storybook/react": "3.3.0-alpha.3", + "@storybook/addon-a11y": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-backgrounds": "^3.3.0-alpha.4", + "@storybook/addon-centered": "^3.3.0-alpha.4", + "@storybook/addon-events": "^3.3.0-alpha.4", + "@storybook/addon-info": "^3.3.0-alpha.4", + "@storybook/addon-knobs": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", + "@storybook/addon-notes": "^3.3.0-alpha.4", + "@storybook/addon-options": "^3.3.0-alpha.4", + "@storybook/addon-storyshots": "^3.3.0-alpha.4", + "@storybook/addon-viewport": "^3.3.0-alpha.4", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/components": "^3.3.0-alpha.4", + "@storybook/react": "^3.3.0-alpha.4", "react-scripts": "1.0.17" }, "private": true diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index 9d70c642e9c..62d9177369f 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -3,14 +3,14 @@ "version": "0.1.0", "private": true, "devDependencies": { - "@storybook/addon-actions": "3.3.0-alpha.3", - "@storybook/addon-centered": "3.3.0-alpha.3", - "@storybook/addon-knobs": "3.3.0-alpha.3", - "@storybook/addon-links": "3.3.0-alpha.3", - "@storybook/addon-notes": "3.3.0-alpha.3", - "@storybook/addon-viewport": "3.3.0-alpha.3", - "@storybook/addons": "3.3.0-alpha.3", - "@storybook/vue": "3.3.0-alpha.3", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-centered": "^3.3.0-alpha.4", + "@storybook/addon-knobs": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", + "@storybook/addon-notes": "^3.3.0-alpha.4", + "@storybook/addon-viewport": "^3.3.0-alpha.4", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/vue": "^3.3.0-alpha.4", "babel-core": "^6.26.0", "babel-loader": "^7.1.2", "babel-preset-env": "^1.6.0", diff --git a/lerna.json b/lerna.json index 831d61212bc..d3dd07037cf 100644 --- a/lerna.json +++ b/lerna.json @@ -4,15 +4,9 @@ "useWorkspaces": true, "commands": { "publish": { - "ignore": [ - "cra-kitchen-sink", - "angular-cli", - "vue-example", - "lib/cli/test/run/*" - ], "allowBranch": "release/3.3" } }, "concurrency": 1, - "version": "3.3.0-alpha.3" + "version": "3.3.0-alpha.4" } diff --git a/lib/addons/package.json b/lib/addons/package.json index 068a559ef96..e82784b4c06 100644 --- a/lib/addons/package.json +++ b/lib/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook addons store", "keywords": [ "storybook" diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json index fb887bc3695..3117dd2b95a 100644 --- a/lib/channel-postmessage/package.json +++ b/lib/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "", "license": "MIT", "main": "dist/index.js", @@ -8,7 +8,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "^3.3.0-alpha.3", + "@storybook/channels": "^3.3.0-alpha.4", "global": "^4.3.2", "json-stringify-safe": "^5.0.1" } diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json index 96a7398c096..df31823c37a 100644 --- a/lib/channel-websocket/package.json +++ b/lib/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "", "license": "MIT", "main": "dist/index.js", @@ -8,7 +8,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "^3.3.0-alpha.3", + "@storybook/channels": "^3.3.0-alpha.4", "global": "^4.3.2" } } diff --git a/lib/channels/package.json b/lib/channels/package.json index be888c07d7a..d7f5b8cc6a9 100644 --- a/lib/channels/package.json +++ b/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "", "license": "MIT", "main": "dist/index.js", diff --git a/lib/cli/bin/index.js b/lib/cli/bin/index.js index c0266361b16..a43919d2a28 100755 --- a/lib/cli/bin/index.js +++ b/lib/cli/bin/index.js @@ -1,4 +1,6 @@ #!/usr/bin/env node -require('babel-register'); +require('babel-register')({ + ignore: /node_modules\/(?!@storybook\/cli)/, +}); require('./generate'); diff --git a/lib/cli/package.json b/lib/cli/package.json index 4a98a91f1e3..511e9b3c868 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Storybook's CLI - easiest method of adding storybook to your projects", "keywords": [ "cli", @@ -25,7 +25,7 @@ "test": "cd test && ./run_tests.sh" }, "dependencies": { - "@storybook/codemod": "^3.3.0-alpha.3", + "@storybook/codemod": "^3.3.0-alpha.4", "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-env": "^1.6.0", "babel-register": "^6.26.0", @@ -43,25 +43,25 @@ "update-notifier": "^2.3.0" }, "devDependencies": { - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-centered": "^3.3.0-alpha.3", - "@storybook/addon-graphql": "^3.3.0-alpha.3", - "@storybook/addon-info": "^3.3.0-alpha.3", - "@storybook/addon-knobs": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", - "@storybook/addon-notes": "^3.3.0-alpha.3", - "@storybook/addon-options": "^3.3.0-alpha.3", - "@storybook/addon-storyshots": "^3.3.0-alpha.3", - "@storybook/addons": "^3.3.0-alpha.3", - "@storybook/angular": "^3.3.0-alpha.3", - "@storybook/channel-postmessage": "^3.3.0-alpha.3", - "@storybook/channel-websocket": "^3.3.0-alpha.3", - "@storybook/channels": "^3.3.0-alpha.3", - "@storybook/polymer": "^3.3.0-alpha.3", - "@storybook/react": "^3.3.0-alpha.3", - "@storybook/react-native": "^3.3.0-alpha.3", - "@storybook/ui": "^3.3.0-alpha.3", - "@storybook/vue": "^3.3.0-alpha.3", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-centered": "^3.3.0-alpha.4", + "@storybook/addon-graphql": "^3.3.0-alpha.4", + "@storybook/addon-info": "^3.3.0-alpha.4", + "@storybook/addon-knobs": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", + "@storybook/addon-notes": "^3.3.0-alpha.4", + "@storybook/addon-options": "^3.3.0-alpha.4", + "@storybook/addon-storyshots": "^3.3.0-alpha.4", + "@storybook/addons": "^3.3.0-alpha.4", + "@storybook/angular": "^3.3.0-alpha.4", + "@storybook/channel-postmessage": "^3.3.0-alpha.4", + "@storybook/channel-websocket": "^3.3.0-alpha.4", + "@storybook/channels": "^3.3.0-alpha.4", + "@storybook/polymer": "^3.3.0-alpha.4", + "@storybook/react": "^3.3.0-alpha.4", + "@storybook/react-native": "^3.3.0-alpha.4", + "@storybook/ui": "^3.3.0-alpha.4", + "@storybook/vue": "^3.3.0-alpha.4", "check-node-version": "2.1.0", "npx": "9.6.0" } diff --git a/lib/cli/test/snapshots/angular-cli/package.json b/lib/cli/test/snapshots/angular-cli/package.json index 12f60d568f7..c3280e3ade9 100644 --- a/lib/cli/test/snapshots/angular-cli/package.json +++ b/lib/cli/test/snapshots/angular-cli/package.json @@ -44,6 +44,6 @@ "ts-node": "1.2.1", "tslint": "^4.3.0", "typescript": "~2.4.0", - "@storybook/angular": "^3.3.0-alpha.3" + "@storybook/angular": "^3.3.0-alpha.4" } } diff --git a/lib/cli/test/snapshots/meteor/package.json b/lib/cli/test/snapshots/meteor/package.json index 1b6b5b321ce..1b943f4b2d0 100644 --- a/lib/cli/test/snapshots/meteor/package.json +++ b/lib/cli/test/snapshots/meteor/package.json @@ -18,8 +18,8 @@ "babel-preset-react": "^6.24.1", "babel-preset-stage-1": "^6.24.1", "babel-root-slash-import": "^1.1.0", - "@storybook/react": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3" + "@storybook/react": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4" } } diff --git a/lib/cli/test/snapshots/react/package.json b/lib/cli/test/snapshots/react/package.json index ddd739fa8fb..618f19837c9 100644 --- a/lib/cli/test/snapshots/react/package.json +++ b/lib/cli/test/snapshots/react/package.json @@ -20,8 +20,8 @@ "rollup-plugin-commonjs": "^8.2.0", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^1.1.1", - "@storybook/react": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3" + "@storybook/react": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4" } } diff --git a/lib/cli/test/snapshots/react_native/package.json b/lib/cli/test/snapshots/react_native/package.json index 0ab1ae797f2..aba681cf3a0 100644 --- a/lib/cli/test/snapshots/react_native/package.json +++ b/lib/cli/test/snapshots/react_native/package.json @@ -16,9 +16,9 @@ "babel-preset-react-native": "3.0.1", "jest": "20.0.4", "react-test-renderer": "16.0.0-alpha.12", - "@storybook/react-native": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", + "@storybook/react-native": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", "react-dom": "16.0.0-alpha.12", "prop-types": "^15.6.0" }, diff --git a/lib/cli/test/snapshots/react_native_scripts/package.json b/lib/cli/test/snapshots/react_native_scripts/package.json index 175ebb794bf..c9ba9c8cb02 100644 --- a/lib/cli/test/snapshots/react_native_scripts/package.json +++ b/lib/cli/test/snapshots/react_native_scripts/package.json @@ -6,9 +6,9 @@ "react-native-scripts": "1.3.1", "jest-expo": "~20.0.0", "react-test-renderer": "16.0.0-alpha.12", - "@storybook/react-native": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", + "@storybook/react-native": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", "react-dom": "16.0.0-alpha.12", "prop-types": "^15.6.0" }, diff --git a/lib/cli/test/snapshots/react_project/package.json b/lib/cli/test/snapshots/react_project/package.json index 94d7a65a78b..ff20f60b583 100644 --- a/lib/cli/test/snapshots/react_project/package.json +++ b/lib/cli/test/snapshots/react_project/package.json @@ -13,9 +13,9 @@ "babel-preset-react": "^6.24.1", "react": "^15.6.1", "react-dom": "^15.6.1", - "@storybook/react": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3" + "@storybook/react": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4" }, "peerDependencies": { "react": "*", diff --git a/lib/cli/test/snapshots/react_scripts/package.json b/lib/cli/test/snapshots/react_scripts/package.json index ac17e29ff45..20f15e85581 100644 --- a/lib/cli/test/snapshots/react_scripts/package.json +++ b/lib/cli/test/snapshots/react_scripts/package.json @@ -16,8 +16,8 @@ "build-storybook": "build-storybook -s public" }, "devDependencies": { - "@storybook/react": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3" + "@storybook/react": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4" } } diff --git a/lib/cli/test/snapshots/sfc_vue/package.json b/lib/cli/test/snapshots/sfc_vue/package.json index f437e2a3d84..9e80dc00e40 100644 --- a/lib/cli/test/snapshots/sfc_vue/package.json +++ b/lib/cli/test/snapshots/sfc_vue/package.json @@ -49,9 +49,9 @@ "webpack-dev-middleware": "^1.10.0", "webpack-hot-middleware": "^2.18.0", "webpack-merge": "^4.1.0", - "@storybook/vue": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", + "@storybook/vue": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", "babel-preset-vue": "^1.2.1" }, "engines": { diff --git a/lib/cli/test/snapshots/update_package_organisations/package.json b/lib/cli/test/snapshots/update_package_organisations/package.json index 41c003ac7ef..5eaf912a329 100644 --- a/lib/cli/test/snapshots/update_package_organisations/package.json +++ b/lib/cli/test/snapshots/update_package_organisations/package.json @@ -8,7 +8,7 @@ "react-scripts": "0.9.x" }, "devDependencies": { - "@storybook/react": "^3.3.0-alpha.3" + "@storybook/react": "^3.3.0-alpha.4" }, "scripts": { "start": "react-scripts start", diff --git a/lib/cli/test/snapshots/vue/package.json b/lib/cli/test/snapshots/vue/package.json index 54070ce0020..386dd6312d7 100644 --- a/lib/cli/test/snapshots/vue/package.json +++ b/lib/cli/test/snapshots/vue/package.json @@ -34,9 +34,9 @@ "rollup-plugin-serve": "^0.4.0", "rollup-plugin-vue": "^2.4.0", "rollup-watch": "^4.0.0", - "@storybook/vue": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3", + "@storybook/vue": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4", "babel-preset-vue": "^1.2.1" } } diff --git a/lib/cli/test/snapshots/webpack_react/package.json b/lib/cli/test/snapshots/webpack_react/package.json index 02e769b93f2..8b5ed5ea5a5 100644 --- a/lib/cli/test/snapshots/webpack_react/package.json +++ b/lib/cli/test/snapshots/webpack_react/package.json @@ -17,8 +17,8 @@ "babel-loader": "^7.1.2", "babel-preset-react": "^6.24.1", "webpack": "^3.5.5", - "@storybook/react": "^3.3.0-alpha.3", - "@storybook/addon-actions": "^3.3.0-alpha.3", - "@storybook/addon-links": "^3.3.0-alpha.3" + "@storybook/react": "^3.3.0-alpha.4", + "@storybook/addon-actions": "^3.3.0-alpha.4", + "@storybook/addon-links": "^3.3.0-alpha.4" } } diff --git a/lib/codemod/package.json b/lib/codemod/package.json index 80b8352400f..cd8bb7f5930 100644 --- a/lib/codemod/package.json +++ b/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "A collection of codemod scripts written with JSCodeshift", "license": "MIT", "main": "dist/index.js", diff --git a/lib/components/package.json b/lib/components/package.json index 0359d763e75..889bb09bac2 100644 --- a/lib/components/package.json +++ b/lib/components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/components", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Core Storybook Components", "license": "MIT", "main": "dist/index.js", diff --git a/lib/ui/package.json b/lib/ui/package.json index 6de6fa4b301..4bbc0c3fec8 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ui", - "version": "3.3.0-alpha.3", + "version": "3.3.0-alpha.4", "description": "Core Storybook UI", "license": "MIT", "main": "dist/index.js", @@ -15,7 +15,7 @@ }, "dependencies": { "@hypnosphi/fuse.js": "^3.0.9", - "@storybook/components": "^3.3.0-alpha.3", + "@storybook/components": "^3.3.0-alpha.4", "@storybook/mantra-core": "^1.7.0", "@storybook/react-komposer": "^2.0.0", "babel-runtime": "^6.26.0", diff --git a/yarn.lock b/yarn.lock index 62f702e9c0e..545ccfbe3c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5037,6 +5037,12 @@ dot-prop@^4.1.0: dependencies: is-obj "^1.0.0" +dotenv-webpack@^1.5.4: + version "1.5.4" + resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.5.4.tgz#9c92e46e412a1cfbc60217ed33d69d2bbfddbf9f" + dependencies: + dotenv "^4.0.0" + dotenv@4.0.0, dotenv@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"