diff --git a/addons/actions/package.json b/addons/actions/package.json index 2cc191f453ce..2558f907937f 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "Action Logger addon for storybook", "main": "dist/index.js", "scripts": { @@ -22,7 +22,7 @@ "homepage": "https://github.com/storybooks/storybook/tree/master/packages/addon-actions", "devDependencies": { "@storybook/addons": "^3.0.0-alpha.0", - "@storybook/react": "^3.0.0-alpha.1", + "@storybook/react": "^3.0.0-alpha.4", "@storybook/ui": "^3.0.0-alpha.0", "react": "^15.5.4", "react-dom": "^15.5.4", diff --git a/addons/comments/package.json b/addons/comments/package.json index 33200117e280..591038888ccb 100644 --- a/addons/comments/package.json +++ b/addons/comments/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-comments", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "Comments addon for Storybook", "keywords": [ "storybook" @@ -37,7 +37,7 @@ "@kadira/storybook-database-cloud": "*", "@kadira/storybook-deployer": "*", "@storybook/addons": "^3.0.0-alpha.0", - "@storybook/react": "^3.0.0-alpha.1", + "@storybook/react": "^3.0.0-alpha.4", "@storybook/ui": "^3.0.0-alpha.0", "git-url-parse": "^6.2.2", "react": "^15.5.4", diff --git a/addons/graphql/package.json b/addons/graphql/package.json index d7cf2e3a0049..f3a4a166f04e 100644 --- a/addons/graphql/package.json +++ b/addons/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-graphql", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "Storybook addon to display the GraphiQL IDE", "main": "dist/index.js", "scripts": { @@ -21,7 +21,7 @@ }, "homepage": "https://github.com/storybooks/storybook/tree/master/packages/addon-graphql", "devDependencies": { - "@storybook/react": "^3.0.0-alpha.1", + "@storybook/react": "^3.0.0-alpha.4", "react": "^15.5.4", "react-dom": "^15.5.4", "shelljs": "^0.7.7" diff --git a/addons/info/package.json b/addons/info/package.json index 7326d6ed7a39..0099869e8101 100644 --- a/addons/info/package.json +++ b/addons/info/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-info", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "A Storybook addon to show additional information for your stories.", "repository": { "type": "git", @@ -13,7 +13,7 @@ "publish-storybook": "bash .scripts/publish_storybook.sh" }, "devDependencies": { - "@storybook/react": "^3.0.0-alpha.1", + "@storybook/react": "^3.0.0-alpha.4", "git-url-parse": "^6.2.2", "react": "^15.5.4", "react-dom": "^15.5.4", diff --git a/addons/knobs/README.md b/addons/knobs/README.md index 7cce69650dee..699eb8c28b49 100644 --- a/addons/knobs/README.md +++ b/addons/knobs/README.md @@ -73,7 +73,7 @@ You can see your Knobs in a Storybook panel as shown below. * Introduction blog post. * Watch this video on how to use knobs * [Live Storybook with Knobs](https://goo.gl/uX9WLf) -* Have a look at this [sample Storybook repo](https://github.com/storybook-samples/storybook-knobs-example). +* Have a look at this [sample Storybook repo](https://github.com/kadira-samples/storybook-knobs-example). ## Available Knobs diff --git a/addons/knobs/package.json b/addons/knobs/package.json index 6c75d9c3b296..6b6283973b56 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-knobs", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "Storybook Addon Prop Editor Component", "repository": { "type": "git", @@ -14,7 +14,7 @@ "publish-storybook": "bash .scripts/publish_storybook.sh" }, "devDependencies": { - "@storybook/react": "^3.0.0-alpha.1", + "@storybook/react": "^3.0.0-alpha.4", "@types/node": "^7.0.12", "@types/react": "^15.0.21", "git-url-parse": "^6.2.2", diff --git a/addons/links/package.json b/addons/links/package.json index 905443cb151c..b268e301eed0 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "Story Links addon for storybook", "main": "dist/index.js", "scripts": { @@ -22,7 +22,7 @@ "homepage": "https://github.com/kadirahq/storybook-addon-links#readme", "devDependencies": { "@storybook/addons": "^3.0.0-alpha.0", - "@storybook/react": "^3.0.0-alpha.1", + "@storybook/react": "^3.0.0-alpha.4", "@storybook/ui": "^3.0.0-alpha.0", "react": "^15.5.4", "react-dom": "^15.5.4", diff --git a/addons/notes/package.json b/addons/notes/package.json index c84c012d2ccb..2343e24884b7 100644 --- a/addons/notes/package.json +++ b/addons/notes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-notes", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "Write notes for your Storybook stories.", "repository": { "type": "git", @@ -13,7 +13,7 @@ "publish-storybook": "bash .scripts/publish_storybook.sh" }, "devDependencies": { - "@storybook/react": "^3.0.0-alpha.1", + "@storybook/react": "^3.0.0-alpha.4", "git-url-parse": "^6.2.2", "react": "^15.5.4", "react-addons-test-utils": "^15.5.1", diff --git a/addons/options/package.json b/addons/options/package.json index 2d9739f2597f..4b03124e88f9 100644 --- a/addons/options/package.json +++ b/addons/options/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-options", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "Options addon for storybook", "main": "preview.js", "scripts": { @@ -21,7 +21,7 @@ "homepage": "https://github.com/storybooks/storybook/tree/master/packages/addon-options", "devDependencies": { "@storybook/addons": "^3.0.0-alpha.0", - "@storybook/react": "^3.0.0-alpha.1", + "@storybook/react": "^3.0.0-alpha.4", "@storybook/ui": "^3.0.0-alpha.0", "react": "^15.5.4", "react-dom": "^15.5.4", diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json index e32de8ec6aa5..06d84269230e 100644 --- a/addons/storyshots/package.json +++ b/addons/storyshots/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.4", "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.", "repository": { "type": "git", diff --git a/app/react-native/package.json b/app/react-native/package.json index 8a7f3d780a47..0adfd09636dd 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-native", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "A better way to develop React Native Components for your app", "main": "dist/index.js", "bin": { @@ -34,8 +34,8 @@ "react-native": "^0.43.3" }, "dependencies": { - "@storybook/addon-actions": "^3.0.0-alpha.1", - "@storybook/addon-links": "^3.0.0-alpha.1", + "@storybook/addon-actions": "^3.0.0-alpha.4", + "@storybook/addon-links": "^3.0.0-alpha.4", "@storybook/addons": "^3.0.0-alpha.0", "@storybook/channel-websocket": "^3.0.0-alpha.0", "@storybook/ui": "^3.0.0-alpha.0", diff --git a/app/react-native/src/server/config/defaults/webpack.config.js b/app/react-native/src/server/config/defaults/webpack.config.js index 0c052d8250ab..97df0e98f9a7 100644 --- a/app/react-native/src/server/config/defaults/webpack.config.js +++ b/app/react-native/src/server/config/defaults/webpack.config.js @@ -3,16 +3,26 @@ import { includePaths } from '../utils'; // Add a default custom config which is similar to what React Create App does. module.exports = storybookBaseConfig => { - const newConfig = storybookBaseConfig; + const newConfig = { ...storybookBaseConfig }; + newConfig.module.loaders = [ ...newConfig.module.loaders, { test: /\.css?$/, include: includePaths, - loaders: [ + use: [ require.resolve('style-loader'), require.resolve('css-loader'), - require.resolve('postcss-loader'), + { + loader: require.resolve('postcss-loader'), + options: { + plugins: () => [ + autoprefixer({ + browsers: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie < 9'], + }), + ], + }, + }, ], }, { @@ -39,16 +49,10 @@ module.exports = storybookBaseConfig => { }, ]; - newConfig.postcss = () => [ - autoprefixer({ - browsers: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie < 9'], - }), - ]; - newConfig.resolve = { - // These are the reasonable defaults supported by the Node ecosystem. - extensions: ['.js', '.json', ''], + ...newConfig.resolve, alias: { + ...((newConfig.resolve && newConfig.resolve.alias) || {}), // This is to support NPM2 'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator'), }, diff --git a/app/react/package.json b/app/react/package.json index da338ddb0b80..4a818cdb2b25 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.4", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "license": "MIT", "main": "dist/client/index.js", @@ -19,8 +19,8 @@ "prepublish": "node ../../scripts/prepublish.js" }, "dependencies": { - "@storybook/addon-actions": "^3.0.0-alpha.1", - "@storybook/addon-links": "^3.0.0-alpha.1", + "@storybook/addon-actions": "^3.0.0-alpha.4", + "@storybook/addon-links": "^3.0.0-alpha.4", "@storybook/addons": "^3.0.0-alpha.0", "@storybook/channel-postmessage": "^3.0.0-alpha.0", "@storybook/ui": "^3.0.0-alpha.0", diff --git a/lerna.json b/lerna.json index baa39295352c..3f6e9c687696 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.0.0-rc.3", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.4", "commands": { "bootstrap": { "ignore": [ diff --git a/lib/cli/generators/WEBPACK_REACT/template/.storybook/webpack.config.js b/lib/cli/generators/WEBPACK_REACT/template/.storybook/webpack.config.js index fae1ef93df48..a26d89ae8c17 100644 --- a/lib/cli/generators/WEBPACK_REACT/template/.storybook/webpack.config.js +++ b/lib/cli/generators/WEBPACK_REACT/template/.storybook/webpack.config.js @@ -1,5 +1,5 @@ // you can use this file to add your custom webpack plugins, loaders and anything you like. -// This is just the basic way to add addional webpack configurations. +// This is just the basic way to add additional webpack configurations. // For more information refer the docs: https://storybooks.js.org/docs/react-storybook/configurations/custom-webpack-config // IMPORTANT diff --git a/lib/cli/package.json b/lib/cli/package.json index 54709e7469cf..1ecf9c4dd179 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.4", "description": "Easiest way to add Storybook support to your project.", "bin": { "getstorybook": "./bin/generate.js"