diff --git a/.gitignore b/.gitignore index 3985fdcc2c1..0830b92f408 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ scripts/storage htpasswd /false storybook-out +/addons/docs/common/config-* \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 0550811683b..778ccc4ff5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +## 5.2.0-beta.17 (July 29, 2019) + +### Bug Fixes + +* CLI: Fix storiesof-to-csf migration w/punctuation ([#7590](https://github.com/storybookjs/storybook/pull/7590)) + +## 5.2.0-beta.16 (July 29, 2019) + +### Features + +* Addon-docs: Configure jsx automagically ([#7581](https://github.com/storybookjs/storybook/pull/7581)) +* Addon-docs: Add DocsPage automagically ([#7579](https://github.com/storybookjs/storybook/pull/7579)) + +## 5.2.0-beta.15 (July 29, 2019) + +### Features + +* CRA: Add support for TSX in config folder ([#7566](https://github.com/storybookjs/storybook/pull/7566)) + +### Bug Fixes + +* Addon-info: only render Components in propTables ([#7477](https://github.com/storybookjs/storybook/pull/7477)) + +### Dependency Upgrades + +* Update telejson dependency to 2.2.2 ([#7586](https://github.com/storybookjs/storybook/pull/7586)) +* Angular: Fix @angular-devkit/build-angular version ([#7585](https://github.com/storybookjs/storybook/pull/7585)) + +## 5.2.0-beta.14 (July 29, 2019) + +Failed publish + ## 5.2.0-beta.13 (July 27, 2019) This is a breaking change for anybody who used `load` on an earlier 5.2 pre-release. Simply rename `load` to `configure` in your storybook config and that should fix things. diff --git a/addons/a11y/package.json b/addons/a11y/package.json index 296875bcf62..23ce8642b1b 100644 --- a/addons/a11y/package.json +++ b/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "a11y addon for storybook", "keywords": [ "a11y", @@ -26,12 +26,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "axe-core": "^3.2.2", "common-tags": "^1.8.0", "core-js": "^3.0.1", diff --git a/addons/actions/package.json b/addons/actions/package.json index 98ed4992486..8d895304daa 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Action Logger addon for storybook", "keywords": [ "storybook" @@ -21,12 +21,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-api": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-api": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "fast-deep-equal": "^2.0.1", "global": "^4.3.2", diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json index c7b01305789..9e9072e2ba2 100644 --- a/addons/backgrounds/package.json +++ b/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "A storybook addon to show different backgrounds for your preview", "keywords": [ "addon", @@ -25,12 +25,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "memoizerific": "^1.11.3", "react": "^16.8.3", diff --git a/addons/centered/package.json b/addons/centered/package.json index ac2afb4fcb5..66e83747dcf 100644 --- a/addons/centered/package.json +++ b/addons/centered/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-centered", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook decorator to center components", "keywords": [ "addon", @@ -23,7 +23,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "util-deprecate": "^1.0.2" diff --git a/addons/contexts/README.md b/addons/contexts/README.md index c8c09b66b06..8f51fd449d8 100644 --- a/addons/contexts/README.md +++ b/addons/contexts/README.md @@ -8,14 +8,14 @@ Real world users expects your application being customizable, that is why often your components are **polymorphic**: they simply need to adapt themselves under different contextual environments. Imagine your components can speak Chinese, English, or even French, and they change their skin tone under dark or light theme. Yeah, you want to make -sure a component look great in all scenario. +sure a component looks great in all scenarios. A good practice to write maintainable components is separate the presentation and its business logic. Storybook is a great place for exercising the visualization and interaction of your components, which may depend on some contexts. Often enough, you will find it become very tedious to wrap each component deeply with its contextual environments before you can really write the main story. You even start to write extra components or factory functions just to -make your life easier. How about changing the context of your story dynamically?! There were simply having no good -way so you ended up writing stories like an accountant. +make your life easier. How about changing the context of your story dynamically?! There was simply no good way so +you ended up writing stories like an accountant. That is why you need this. An elegant way to wrap your component stories and change their contextual environment directly and dynamically in Storybook UI! Kind of like a dependency injection, eh! The best bit is **you define it @@ -26,17 +26,17 @@ once then apply it everywhere**. 1. Define a single global file for managing contextual environments (a.k.a. containers) for all of your stories declaratively. No more repetitive setups or noisy wrapping, making your stories more focused and readable. 2. Support dynamic contextual props switching from Storybook toolbar at runtime. You can easily slice into - different environments (e.g. languages or themes ) to understand how your component is going to response. + different environments (e.g. languages or themes ) to understand how your component is going to respond. 3. Library agnostic: no presumption on what kind of components you want to wrap around your stories. You can even use it to bridge with your favorite routing, state-management solutions, or even your own [React Context](https://reactjs.org/docs/context.html) provider. 4. Offer chainable and granular configurations. It is even possible to fine-tune at per story level. -5. Visual regression friendly. You can use this addon to driving the same story under different contexts to smoke - testing important visual states. +5. Visual regression friendly. You can use this addon to drive the same story under different contexts to smoke + test important visual states. ## 🧰 Requirements -Make sure the version of your Storybook is above v5. For the full list the current supported framework, see +Make sure the version of your Storybook is above v5. For the full list of the current supported frameworks, see [Addon / Framework Support Table](../../ADDONS_SUPPORT.md). ## 🎬 Getting started @@ -54,7 +54,7 @@ under the storybook config directory of your project): import '@storybook/addon-contexts/register'; ``` -To load your contextual setups for your stories globally, adding the following lines into `config.js` file (you should +To load your contextual setups for your stories globally, add the following lines into `config.js` file (you should see it near your `addon.js` file): ```js @@ -132,8 +132,8 @@ export const contexts = [ #### `withContexts(contexts) : function` A decorating function for wrapping your stories under your predefined `contexts`. This means multiple contextual -environments are supported. They are going to be loaded layer by layer and wraped in a descending oder (top -> down --> story). The `contexts` is an array of object that should has the following properties: +environments are supported. They are going to be loaded layer by layer and wrapped in a descending oder (top -> down +-> story). The `contexts` is an array of objects that should have the following properties: --- @@ -141,10 +141,10 @@ environments are supported. They are going to be loaded layer by layer and wrape (default `undefined`) -A icon displayed in the Storybook toolbar to control contextual props. This addon allows you to define an icon for -each contextual environment individually. Take a look from what are currently supported +An icon displayed in the Storybook toolbar to control contextual props. This addon allows you to define an icon for +each contextual environment individually. Take a look at the currently supported [icon lists](https://storybooks-official.netlify.com/?path=/story/basics-icon--labels) from the official Storybook -story. You must define an icon first if you want to take advantage on switching props dynamically in your Storybook +story. You must define an icon first if you want to take advantage of switching props dynamically in your Storybook toolbar. --- @@ -153,7 +153,7 @@ toolbar. (required) -An unique name of a contextual environment; if duplicated names provided, the later is going to be ignored. +A unique name of a contextual environment; if duplicate names are provided, the latter is going to be ignored. --- @@ -161,10 +161,10 @@ An unique name of a contextual environment; if duplicated names provided, the la (required) -An array of components that is going to be injected to wrap stories. This means this addon allow multiple wrapping -components coexisted. The wrapping sequence is from the left to right (parent -> children -> story). This nested +An array of components that is going to be injected to wrap stories. This means this addon allows multiple wrapping +components to coexist. The wrapping sequence is from the left to right (parent -> children -> story). This nested wrapping behaviour can be useful in some cases; for instance, in the above example, we are wrapping stories under -`styled-componnets` and `material-ui` theme providers. Also, you can use this addon to wrap any valid HTML tags. +`styled-components` and `material-ui` theme providers. Also, you can use this addon to wrap any valid HTML tags. --- @@ -178,13 +178,13 @@ An array of params contains a set of predefined `props` for `components`. This o (required) -An unique name for representing the props. +A unique name for representing the props. #### `params.props : object | null:` (required) -The `props` that is accepted by the wrapping component(s). +The `props` that are accepted by the wrapping component(s). #### `params.default : true?` @@ -220,16 +220,16 @@ be shown at first in the toolbar menu in your Storybook. ## 📔 Notes -1. You can use this addon to inject any valid components, that is why `icon`, and `params` can be just optional. +1. You can use this addon to inject any valid components, that is why `icon` and `params` can be just optional. 2. As mentioned, extra contextual environment setups can be added at the story level. Please make sure they are passed via the second argument as `{ contexts: [{ /* extra contexts */ }}`. -3. Additional `params` can be "appended" into an existed setups at the story level too (make sure it goes with the +3. Additional `params` can be "appended" into an existing setup at the story level too (make sure it goes with the correct `title`); however, they are never be able to overridden the default setups. So it is important to have - non-collided names. + non-colliding names. 4. The addon will persist the selected params (the addon state) between stories at run-time (similar to other - addons). If the active param were gone after story switching, it fallback to the default then the first. As a - rule of thumbs, whenever collisions made possible, always the first wins. -5. Query parameters are supported for pre-selecting contexts param, which comes handy for visual regression testing. + addons). If the active params were gone after story switching, it falls back to the default then the first. As a + rule of thumb, whenever collisions are possible, the first always wins. +5. Query parameters are supported for pre-selecting contexts param, which comes in handy for visual regression testing. You can do this by appending `&contexts=[name of contexts]=[name of param]` in the URL under iframe mode. Use `,` to separate multiple contexts (e.g. `&contexts=Theme=Forests,Language=Fr`). diff --git a/addons/contexts/package.json b/addons/contexts/package.json index 5e6cbec2783..23d9c00cece 100644 --- a/addons/contexts/package.json +++ b/addons/contexts/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-contexts", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook Addon Contexts", "keywords": [ "storybook", @@ -28,10 +28,10 @@ "dev:check-types": "tsc --noEmit" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", "core-js": "^3.0.1" }, "peerDependencies": { diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json index baea283d33d..17e4cce2fc3 100644 --- a/addons/cssresources/package.json +++ b/addons/cssresources/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-cssresources", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "A storybook addon to switch between css resources at runtime for your story", "keywords": [ "addon", @@ -25,10 +25,10 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "react": "^16.8.3" diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json index b070f0a2df0..bb08336fae4 100644 --- a/addons/design-assets/package.json +++ b/addons/design-assets/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-design-assets", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Design asset preview for storybook", "keywords": [ "addon", @@ -27,12 +27,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/addons/docs/__snapshots__/mdx-compiler-plugin.test.js.snap b/addons/docs/__snapshots__/mdx-compiler-plugin.test.js.snap index 1f7f247a54a..9e918e0b420 100644 --- a/addons/docs/__snapshots__/mdx-compiler-plugin.test.js.snap +++ b/addons/docs/__snapshots__/mdx-compiler-plugin.test.js.snap @@ -504,6 +504,9 @@ function MDXContent({ components, ...props }) { + + + ); } @@ -519,7 +522,12 @@ helloStory.story = {}; helloStory.story.name = 'hello story'; helloStory.story.parameters = { mdxSource: '' }; -const componentMeta = { title: 'Button', includeStories: ['one', 'helloStory'] }; +export const wPunctuation = () => ; +wPunctuation.story = {}; +wPunctuation.story.name = 'w/punctuation'; +wPunctuation.story.parameters = { mdxSource: '' }; + +const componentMeta = { title: 'Button', includeStories: ['one', 'helloStory', 'wPunctuation'] }; const mdxKind = componentMeta.title || componentMeta.displayName; const WrappedMDXContent = ({ context }) => ( diff --git a/addons/docs/angular/config.js b/addons/docs/angular/config.js new file mode 100644 index 00000000000..e24435f6314 --- /dev/null +++ b/addons/docs/angular/config.js @@ -0,0 +1,7 @@ +/* eslint-disable import/no-extraneous-dependencies */ +const { addParameters } = require('@storybook/angular'); +const { DocsPage } = require('@storybook/addon-docs/blocks'); + +addParameters({ + docs: DocsPage, +}); diff --git a/addons/docs/angular/preset.js b/addons/docs/angular/preset.js index a9b8af2cce0..420d9cc15c5 100644 --- a/addons/docs/angular/preset.js +++ b/addons/docs/angular/preset.js @@ -1 +1 @@ -module.exports = require('../common/preset'); +module.exports = require('../common/makePreset')('angular'); diff --git a/addons/docs/common/makePreset.js b/addons/docs/common/makePreset.js new file mode 100644 index 00000000000..77b21d2c633 --- /dev/null +++ b/addons/docs/common/makePreset.js @@ -0,0 +1,20 @@ +const fs = require('fs'); +const common = require('./preset'); + +module.exports = framework => { + const frameworkConfig = `${__dirname}/../${framework}/config.js`; + const preConfig = fs.existsSync(frameworkConfig) ? [frameworkConfig] : []; + function config(entry = []) { + return [...preConfig, ...entry]; + } + + const configureJSX = framework !== 'react'; + const webpack = (webpackConfig, options) => + common.webpack(webpackConfig, { configureJSX, ...options }); + + return { + ...common, + webpack, + config, + }; +}; diff --git a/addons/docs/fixtures/story-definitions.mdx b/addons/docs/fixtures/story-definitions.mdx index ee5c355b989..74dc5db7a0d 100644 --- a/addons/docs/fixtures/story-definitions.mdx +++ b/addons/docs/fixtures/story-definitions.mdx @@ -12,3 +12,7 @@ import { Story, Meta } from '@storybook/addon-docs/blocks'; + + + + diff --git a/addons/docs/html/config.js b/addons/docs/html/config.js new file mode 100644 index 00000000000..c9d8a1dfe7b --- /dev/null +++ b/addons/docs/html/config.js @@ -0,0 +1,7 @@ +/* eslint-disable import/no-extraneous-dependencies */ +const { addParameters } = require('@storybook/html'); +const { DocsPage } = require('@storybook/addon-docs/blocks'); + +addParameters({ + docs: DocsPage, +}); diff --git a/addons/docs/html/preset.js b/addons/docs/html/preset.js index a9b8af2cce0..7cfa7a8428c 100644 --- a/addons/docs/html/preset.js +++ b/addons/docs/html/preset.js @@ -1 +1 @@ -module.exports = require('../common/preset'); +module.exports = require('../common/makePreset')('html'); diff --git a/addons/docs/package.json b/addons/docs/package.json index d8bd6c77691..f3933d07fc3 100644 --- a/addons/docs/package.json +++ b/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Superior documentation for your components", "keywords": [ "addon", @@ -28,12 +28,12 @@ "@mdx-js/loader": "^1.1.0", "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/router": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/router": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "js-string-escape": "^1.0.1", diff --git a/addons/docs/react/config.js b/addons/docs/react/config.js new file mode 100644 index 00000000000..91b8259620b --- /dev/null +++ b/addons/docs/react/config.js @@ -0,0 +1,7 @@ +/* eslint-disable import/no-extraneous-dependencies */ +const { addParameters } = require('@storybook/react'); +const { DocsPage } = require('@storybook/addon-docs/blocks'); + +addParameters({ + docs: DocsPage, +}); diff --git a/addons/docs/react/preset.js b/addons/docs/react/preset.js index a9b8af2cce0..52b9ccc3206 100644 --- a/addons/docs/react/preset.js +++ b/addons/docs/react/preset.js @@ -1 +1 @@ -module.exports = require('../common/preset'); +module.exports = require('../common/makePreset')('react'); diff --git a/addons/docs/vue/config.js b/addons/docs/vue/config.js new file mode 100644 index 00000000000..8661b36c062 --- /dev/null +++ b/addons/docs/vue/config.js @@ -0,0 +1,7 @@ +/* eslint-disable import/no-extraneous-dependencies */ +const { addParameters } = require('@storybook/vue'); +const { DocsPage } = require('@storybook/addon-docs/blocks'); + +addParameters({ + docs: DocsPage, +}); diff --git a/addons/docs/vue/preset.js b/addons/docs/vue/preset.js index a9b8af2cce0..f24ac440560 100644 --- a/addons/docs/vue/preset.js +++ b/addons/docs/vue/preset.js @@ -1 +1 @@ -module.exports = require('../common/preset'); +module.exports = require('../common/makePreset')('vue'); diff --git a/addons/events/package.json b/addons/events/package.json index 076e428432e..1b4600dd425 100644 --- a/addons/events/package.json +++ b/addons/events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-events", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Add events to your Storybook stories.", "keywords": [ "addon", @@ -24,11 +24,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-api": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-api": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "format-json": "^1.0.3", "lodash": "^4.17.11", diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json index 90a5ae52816..f9174e8e6af 100644 --- a/addons/google-analytics/package.json +++ b/addons/google-analytics/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-google-analytics", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook addon for google analytics", "keywords": [ "addon", @@ -20,8 +20,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "react-ga": "^2.5.7" diff --git a/addons/graphql/package.json b/addons/graphql/package.json index 0c9bf30aee2..b4594111d36 100644 --- a/addons/graphql/package.json +++ b/addons/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-graphql", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook addon to display the GraphiQL IDE", "keywords": [ "addon", @@ -22,8 +22,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "graphiql": "^0.13.0", diff --git a/addons/info/package.json b/addons/info/package.json index 982559a4d3e..5d9db3cfb32 100644 --- a/addons/info/package.json +++ b/addons/info/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-info", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "A Storybook addon to show additional information for your stories.", "keywords": [ "addon", @@ -22,10 +22,10 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "jsx-to-string": "^1.4.0", diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js index 1be74625b32..237e4a8a053 100644 --- a/addons/info/src/components/Story.js +++ b/addons/info/src/components/Story.js @@ -311,7 +311,7 @@ class Story extends Component { const { stylesheet } = this.state; const types = new Map(); - if (propTables === null) { + if (!propTables) { return null; } @@ -319,11 +319,9 @@ class Story extends Component { return null; } - if (propTables) { - propTables.forEach(type => { - types.set(type, true); - }); - } + propTables.forEach(type => { + types.set(type, true); + }); // depth-first traverse and collect types const extract = innerChildren => { @@ -348,6 +346,8 @@ class Story extends Component { if ( typeof innerChildren === 'string' || typeof innerChildren.type === 'string' || + (propTables.length > 0 && // if propTables is set and has items in it + !propTables.includes(innerChildren.type)) || // ignore types that are missing from propTables (Array.isArray(propTablesExclude) && // also ignore excluded types ~propTablesExclude.indexOf(innerChildren.type)) // eslint-disable-line no-bitwise ) { diff --git a/addons/jest/package.json b/addons/jest/package.json index a2dd4b5fb0a..28cb12aa33c 100644 --- a/addons/jest/package.json +++ b/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "React storybook addon that show component jest report", "keywords": [ "addon", @@ -28,11 +28,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "react": "^16.8.3", diff --git a/addons/knobs/package.json b/addons/knobs/package.json index e8c3f36d0fb..35824d43024 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-knobs", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook Addon Prop Editor Component", "keywords": [ "addon", @@ -22,12 +22,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-api": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-api": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "copy-to-clipboard": "^3.0.8", "core-js": "^3.0.1", "escape-html": "^1.0.3", diff --git a/addons/links/package.json b/addons/links/package.json index 205a4d3ba74..6e76fbf39d8 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Story Links addon for storybook", "keywords": [ "addon", @@ -22,9 +22,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/router": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/router": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/addons/notes/package.json b/addons/notes/package.json index 1d4a64ddc5e..67afc058228 100644 --- a/addons/notes/package.json +++ b/addons/notes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-notes", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Write notes for your Storybook stories.", "keywords": [ "addon", @@ -23,13 +23,13 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/router": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/router": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "markdown-to-jsx": "^6.9.3", diff --git a/addons/ondevice-actions/package.json b/addons/ondevice-actions/package.json index 90d25a7fbe8..054edf725f0 100644 --- a/addons/ondevice-actions/package.json +++ b/addons/ondevice-actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-ondevice-actions", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Action Logger addon for react-native storybook", "keywords": [ "storybook" @@ -19,13 +19,13 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", "core-js": "^3.0.1", "fast-deep-equal": "^2.0.1" }, "devDependencies": { - "@storybook/addon-actions": "5.2.0-beta.13" + "@storybook/addon-actions": "5.2.0-beta.17" }, "peerDependencies": { "@storybook/addon-actions": "*", diff --git a/addons/ondevice-backgrounds/package.json b/addons/ondevice-backgrounds/package.json index 272287f5ef4..0d94d36f360 100644 --- a/addons/ondevice-backgrounds/package.json +++ b/addons/ondevice-backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-ondevice-backgrounds", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "A react-native storybook addon to show different backgrounds for your preview", "keywords": [ "addon", @@ -24,7 +24,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", "core-js": "^3.0.1", "prop-types": "^15.7.2" }, diff --git a/addons/ondevice-knobs/package.json b/addons/ondevice-knobs/package.json index 79c248aaf6c..a77d7ecf263 100644 --- a/addons/ondevice-knobs/package.json +++ b/addons/ondevice-knobs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-ondevice-knobs", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Display storybook story knobs on your deviced.", "keywords": [ "addon", @@ -21,8 +21,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", "core-js": "^3.0.1", "deep-equal": "^1.0.1", "prop-types": "^15.7.2", @@ -32,7 +32,7 @@ "react-native-switch": "^1.5.0" }, "peerDependencies": { - "@storybook/addon-knobs": "5.2.0-alpha.23", + "@storybook/addon-knobs": "5.2.0-beta.13", "react": "*", "react-native": "*" }, diff --git a/addons/ondevice-notes/package.json b/addons/ondevice-notes/package.json index 14e67df9781..93b761c5963 100644 --- a/addons/ondevice-notes/package.json +++ b/addons/ondevice-notes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-ondevice-notes", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Write notes for your react-native Storybook stories.", "keywords": [ "addon", @@ -20,8 +20,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", "core-js": "^3.0.1", "prop-types": "^15.7.2", "react-native-simple-markdown": "^1.1.0" diff --git a/addons/options/package.json b/addons/options/package.json index afec5456d64..bd9a4172aa6 100644 --- a/addons/options/package.json +++ b/addons/options/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-options", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Options addon for storybook", "keywords": [ "addon", @@ -22,7 +22,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", "core-js": "^3.0.1", "util-deprecate": "^1.0.2" }, diff --git a/addons/queryparams/package.json b/addons/queryparams/package.json index 20d263cac06..c5f220ccc33 100644 --- a/addons/queryparams/package.json +++ b/addons/queryparams/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-queryparams", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "parameter addon for storybook", "keywords": [ "addon", @@ -23,12 +23,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json index 2764b9bcf14..76a214ca2ab 100644 --- a/addons/storyshots/storyshots-core/package.json +++ b/addons/storyshots/storyshots-core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.", "keywords": [ "addon", @@ -25,7 +25,7 @@ "storybook": "start-storybook -p 6006" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", "core-js": "^3.0.1", "glob": "^7.1.3", "global": "^4.3.2", diff --git a/addons/storyshots/storyshots-puppeteer/package.json b/addons/storyshots/storyshots-puppeteer/package.json index 4053e220e9c..cb2584990f6 100644 --- a/addons/storyshots/storyshots-puppeteer/package.json +++ b/addons/storyshots/storyshots-puppeteer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots-puppeteer", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Image snappshots addition to StoryShots base on puppeteer", "keywords": [ "addon", @@ -22,8 +22,8 @@ "prepare": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/node-logger": "5.2.0-beta.13", - "@storybook/router": "5.2.0-beta.13", + "@storybook/node-logger": "5.2.0-beta.17", + "@storybook/router": "5.2.0-beta.17", "core-js": "^3.0.1", "jest-image-snapshot": "^2.8.2", "regenerator-runtime": "^0.12.1" @@ -32,7 +32,7 @@ "puppeteer": "^1.12.2" }, "peerDependencies": { - "@storybook/addon-storyshots": "5.2.0-alpha.40", + "@storybook/addon-storyshots": "5.2.0-beta.13", "puppeteer": "^1.12.2" }, "publishConfig": { diff --git a/addons/storysource/package.json b/addons/storysource/package.json index 7f3f399acfe..5d15893a753 100644 --- a/addons/storysource/package.json +++ b/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Stories addon for storybook", "keywords": [ "addon", @@ -22,11 +22,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/router": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/router": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "estraverse": "^4.2.0", "loader-utils": "^1.2.3", diff --git a/addons/viewport/package.json b/addons/viewport/package.json index 51cc2d60780..a54d61ad510 100644 --- a/addons/viewport/package.json +++ b/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook addon to change the viewport size to mobile", "keywords": [ "addon", @@ -21,12 +21,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "memoizerific": "^1.11.3", diff --git a/app/angular/package.json b/app/angular/package.json index 67389d2e30c..d26db55918a 100644 --- a/app/angular/package.json +++ b/app/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -26,9 +26,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/core": "5.2.0-beta.13", - "@storybook/node-logger": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/core": "5.2.0-beta.17", + "@storybook/node-logger": "5.2.0-beta.17", "angular2-template-loader": "^0.6.2", "core-js": "^3.0.1", "fork-ts-checker-webpack-plugin": "^1.3.4", @@ -44,7 +44,7 @@ "webpack": "^4.33.0" }, "peerDependencies": { - "@angular-devkit/build-angular": ">=6.0.0", + "@angular-devkit/build-angular": ">=0.8.9", "@angular-devkit/core": "^0.6.1 || >=7.0.0", "@angular/common": ">=6.0.0", "@angular/compiler": ">=6.0.0", diff --git a/app/ember/package.json b/app/ember/package.json index db8a9b45846..718f05bf7f1 100644 --- a/app/ember/package.json +++ b/app/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybookjs/storybook/tree/master/app/ember", "bugs": { @@ -24,7 +24,7 @@ }, "dependencies": { "@ember/test-helpers": "^1.5.0", - "@storybook/core": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/app/html/package.json b/app/html/package.json index b0fb1f14f6b..a1c2389ef29 100644 --- a/app/html/package.json +++ b/app/html/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -26,8 +26,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/core": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/core": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/app/marko/package.json b/app/marko/package.json index 3dcd7df1afd..21ee8e2faab 100644 --- a/app/marko/package.json +++ b/app/marko/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/marko", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Marko: Develop Marko Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -27,7 +27,7 @@ }, "dependencies": { "@marko/webpack": "^1.2.0", - "@storybook/core": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/app/mithril/package.json b/app/mithril/package.json index 8549bbc2a82..544374a9cba 100644 --- a/app/mithril/package.json +++ b/app/mithril/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/mithril", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Mithril: Develop Mithril Component in isolation.", "keywords": [ "storybook" @@ -27,7 +27,7 @@ }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.3.0", - "@storybook/core": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/app/polymer/package.json b/app/polymer/package.json index 1d58433aa46..35e676c27c9 100644 --- a/app/polymer/package.json +++ b/app/polymer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/polymer", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Polymer: Develop Polymer components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -25,7 +25,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", "@webcomponents/webcomponentsjs": "^1.2.0", "common-tags": "^1.8.0", "core-js": "^3.0.1", diff --git a/app/preact/package.json b/app/preact/package.json index 0b07933084d..6a4a216aa7c 100644 --- a/app/preact/package.json +++ b/app/preact/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" @@ -27,8 +27,8 @@ }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.3.0", - "@storybook/core": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/app/rax/package.json b/app/rax/package.json index 2ec088d02e0..5c7d5125856 100644 --- a/app/rax/package.json +++ b/app/rax/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/rax", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Rax: Develop Rax Component in isolation.", "keywords": [ "storybook", @@ -27,7 +27,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", "babel-preset-rax": "^1.0.0-beta.0", "common-tags": "^1.8.0", "core-js": "^2.6.2", diff --git a/app/react-native-server/package.json b/app/react-native-server/package.json index 13c110988be..200261973a5 100644 --- a/app/react-native-server/package.json +++ b/app/react-native-server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-native-server", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "A better way to develop React Native Components for your app", "keywords": [ "react", @@ -24,12 +24,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/channel-websocket": "5.2.0-beta.13", - "@storybook/core": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/ui": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/channel-websocket": "5.2.0-beta.17", + "@storybook/core": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/ui": "5.2.0-beta.17", "commander": "^2.19.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/app/react-native/package.json b/app/react-native/package.json index 96e5408efa7..a8b4f4fdc11 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-native", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "A better way to develop React Native Components for your app", "keywords": [ "react", @@ -24,11 +24,11 @@ "dependencies": { "@emotion/core": "^10.0.14", "@emotion/native": "^10.0.14", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/channel-websocket": "5.2.0-beta.13", - "@storybook/channels": "5.2.0-beta.13", - "@storybook/client-api": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/channel-websocket": "5.2.0-beta.17", + "@storybook/channels": "5.2.0-beta.17", + "@storybook/client-api": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", "core-js": "^3.0.1", "emotion-theming": "^10.0.14", "react-native-swipe-gestures": "^1.0.3", diff --git a/app/react/package.json b/app/react/package.json index 7293bc050e6..e41eabc6efb 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -29,9 +29,9 @@ "@babel/plugin-transform-react-constant-elements": "^7.2.0", "@babel/preset-flow": "^7.0.0", "@babel/preset-react": "^7.0.0", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/core": "5.2.0-beta.13", - "@storybook/node-logger": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/core": "5.2.0-beta.17", + "@storybook/node-logger": "5.2.0-beta.17", "@svgr/webpack": "^4.0.3", "babel-plugin-add-react-displayname": "^0.0.5", "babel-plugin-named-asset-import": "^0.3.1", diff --git a/app/react/src/server/__mocks__/mockRules.ts b/app/react/src/server/__mocks__/mockRules.ts index 11319ec0536..3c43a333672 100644 --- a/app/react/src/server/__mocks__/mockRules.ts +++ b/app/react/src/server/__mocks__/mockRules.ts @@ -1,7 +1,7 @@ export default [ { parser: { requireEnsure: false } }, { - test: /\.(js|mjs|jsx)$/, + test: /\.(js|mjs|jsx|ts|tsx)$/, enforce: 'pre', use: [ { @@ -10,7 +10,6 @@ export default [ eslintPath: '/mock_folder/node_modules/eslint/lib/api.js', baseConfig: { extends: ['/mock_folder/node_modules/eslint-config-react-app/index.js'], - settings: { react: { version: '999.999.999' } }, }, ignore: false, useEslintrc: false, @@ -44,7 +43,7 @@ export default [ { loaderMap: { svg: { - ReactComponent: '@svgr/webpack?-prettier,-svgo![path]', + ReactComponent: '@svgr/webpack?-svgo,+titleProp,+ref![path]', }, }, }, diff --git a/app/react/src/server/cra-config.test.ts b/app/react/src/server/cra-config.test.ts index 35eb39a0db0..20feeab6603 100644 --- a/app/react/src/server/cra-config.test.ts +++ b/app/react/src/server/cra-config.test.ts @@ -83,18 +83,16 @@ exit $ret` describe('when used with TypeScript', () => { it('should return the correct config', () => { - // Normalise the return, as we know our new rules object will be an array, whereas a string is expected. const rules = getTypeScriptRules(mockRules, './.storybook'); - const rulesObject = { ...rules[0], include: rules[0].include[0] }; - expect(rulesObject).toMatchObject(mockRules[2].oneOf[1]); + expect(rules.length).toBe(2); }); // Allows using TypeScript in the `.storybook` (or config) folder. - it('should add the Storybook config directory to `include`', () => { + it('should add the Storybook config directory to `include` for all TS related rules', () => { const rules = getTypeScriptRules(mockRules, './.storybook'); - expect(rules[0].include.findIndex((string: string) => string.includes('.storybook'))).toEqual( - 1 - ); + expect( + rules.every(rule => rule.include.find(filePath => filePath.includes('.storybook'))) + ).toBe(true); }); it('should get the baseUrl from a tsconfig.json', () => { diff --git a/app/react/src/server/cra-config.ts b/app/react/src/server/cra-config.ts index 5c3ac986197..b38418da6bc 100644 --- a/app/react/src/server/cra-config.ts +++ b/app/react/src/server/cra-config.ts @@ -71,43 +71,53 @@ export function isReactScriptsInstalled(requiredVersion = '2.0.0') { } export const getRules = (extensions: string[]) => (rules: RuleSetRule[]) => - rules.reduce((craRules: any, rule: any) => { - // If at least one extension satisfies the rule test, the rule is one - // we want to extract - if (rule.test && extensions.some(normalizeCondition(rule.test))) { - // If the base test is for extensions, return early - return craRules.concat(rule); - } + rules.reduce( + (craRules, rule) => { + // If at least one extension satisfies the rule test, the rule is one + // we want to extract + if (rule.test && extensions.some(normalizeCondition(rule.test))) { + // If the base test is for extensions, return early + return craRules.concat(rule); + } - // Get any rules contained in rule.oneOf - if (!rule.test && rule.oneOf) { - craRules.push(...getRules(extensions)(rule.oneOf)); - } + // Get any rules contained in rule.oneOf + if (!rule.test && rule.oneOf) { + craRules.push(...getRules(extensions)(rule.oneOf)); + } - // Get any rules contained in rule.rules - if (!rule.test && rule.rules) { - craRules.push(...getRules(extensions)(rule.rules)); - } + // Get any rules contained in rule.rules + if (!rule.test && rule.rules) { + craRules.push(...getRules(extensions)(rule.rules)); + } - return craRules; - }, []); + return craRules; + }, + [] as RuleSetRule[] + ); const getStyleRules = getRules(cssExtensions.concat(cssModuleExtensions)); export const getTypeScriptRules = (webpackConfigRules: RuleSetRule[], configDir: string) => { const rules = getRules(typeScriptExtensions)(webpackConfigRules); - // We know CRA only has one rule targeting TS for now, which is the first rule. - const babelRule = rules[0]; - // Resolves an issue where this config is parsed twice (#4903). - if (typeof babelRule.include !== 'string') return rules; + // Adds support for using TypeScript in the `.storybook` (or config) folder. - return [ - { - ...babelRule, - include: [babelRule.include, path.resolve(configDir)], + return rules.reduce( + (accRules, rule) => { + // Resolves an issue where this config is parsed twice (#4903). + if (typeof rule.include !== 'string') { + return [...accRules, rule]; + } + + return [ + ...accRules, + { + ...rule, + include: [rule.include, path.resolve(configDir)], + }, + ]; }, - ...rules.slice(1), - ]; + [] as RuleSetRule[] + ); }; export const getModulePath = () => { diff --git a/app/riot/package.json b/app/riot/package.json index 6e3e83f02cb..8cacda810f3 100644 --- a/app/riot/package.json +++ b/app/riot/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/riot", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for riot.js: View riot snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -25,7 +25,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/app/svelte/package.json b/app/svelte/package.json index 8343606aafd..990e09142f2 100644 --- a/app/svelte/package.json +++ b/app/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -26,7 +26,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/app/vue/package.json b/app/vue/package.json index 1652dfa8483..0c5fb293d14 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -26,7 +26,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "5.2.0-beta.13", + "@storybook/core": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/dev-kits/addon-decorator/package.json b/dev-kits/addon-decorator/package.json index 276982175e0..0d8e9caecc7 100644 --- a/dev-kits/addon-decorator/package.json +++ b/dev-kits/addon-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-decorator", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "decorator addon for storybook", "keywords": [ "devkit", @@ -24,8 +24,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/client-api": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/client-api": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^3.0.1" }, diff --git a/dev-kits/addon-parameter/package.json b/dev-kits/addon-parameter/package.json index dec1c199381..d1c71c49f40 100644 --- a/dev-kits/addon-parameter/package.json +++ b/dev-kits/addon-parameter/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-parameter", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "parameter addon for storybook", "keywords": [ "devkit", @@ -24,12 +24,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/dev-kits/addon-roundtrip/package.json b/dev-kits/addon-roundtrip/package.json index a5d667dbea7..89827e58b29 100644 --- a/dev-kits/addon-roundtrip/package.json +++ b/dev-kits/addon-roundtrip/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-roundtrip", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "roundtrip addon for storybook", "keywords": [ "devkit", @@ -24,13 +24,13 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/api": "5.2.0-beta.13", - "@storybook/client-api": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/api": "5.2.0-beta.17", + "@storybook/client-api": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/docs/src/pages/basics/live-examples/index.md b/docs/src/pages/basics/live-examples/index.md index 7ebe158d1ef..d3d39bdc24f 100644 --- a/docs/src/pages/basics/live-examples/index.md +++ b/docs/src/pages/basics/live-examples/index.md @@ -3,8 +3,33 @@ id: 'live-examples' title: 'Live Examples' --- -### 5.1 +### Next release +- [React Official](https://monorepo.storybook.now.sh/examples/official-storybook/) +- [Vue](https://monorepo.storybook.now.sh/examples/vue-kitchen-sink/) +- [Angular](https://monorepo.storybook.now.sh/examples/angular-cli/) +- [Polymer](https://monorepo.storybook.now.sh/examples/polymer-cli/) +- [Mithril](https://monorepo.storybook.now.sh/examples/mithril-kitchen-sink/) +- [Marko](https://monorepo.storybook.now.sh/examples/marko-cli/) +- [HTML](https://monorepo.storybook.now.sh/examples/html-kitchen-sink/) +- [Svelte](https://monorepo.storybook.now.sh/examples/svelte-kitchen-sink/) +- [Riot](https://monorepo.storybook.now.sh/examples/riot-kitchen-sink/) +- [Ember](https://monorepo.storybook.now.sh/examples/ember-cli/) +- [Preact](https://monorepo.storybook.now.sh/examples/preact-kitchen-sink/) +### Current release +- [React Official](https://monorepo-git-master.storybook.now.sh/examples/official-storybook/) +- [Vue](https://monorepo-git-master.storybook.now.sh/examples/vue-kitchen-sink/) +- [Angular](https://monorepo-git-master.storybook.now.sh/examples/angular-cli/) +- [Polymer](https://monorepo-git-master.storybook.now.sh/examples/polymer-cli/) +- [Mithril](https://monorepo-git-master.storybook.now.sh/examples/mithril-kitchen-sink/) +- [Marko](https://monorepo-git-master.storybook.now.sh/examples/marko-cli/) +- [HTML](https://monorepo-git-master.storybook.now.sh/examples/html-kitchen-sink/) +- [Svelte](https://monorepo-git-master.storybook.now.sh/examples/svelte-kitchen-sink/) +- [Riot](https://monorepo-git-master.storybook.now.sh/examples/riot-kitchen-sink/) +- [Ember](https://monorepo-git-master.storybook.now.sh/examples/ember-cli/) +- [Preact](https://monorepo-git-master.storybook.now.sh/examples/preact-kitchen-sink/) + +### 5.1 - [React Official](https://storybooks-official.netlify.com) - [Vue](https://storybooks-vue.netlify.com/) - [Angular](https://storybooks-angular.netlify.com/) @@ -18,14 +43,12 @@ title: 'Live Examples' - [Preact](https://storybooks-preact.netlify.com/) ### 3.4 - - [React Official](https://release-3-4--storybooks-official.netlify.com) - [Vue](https://release-3-4--storybooks-vue.netlify.com/) - [Angular](https://release-3-4--storybooks-angular.netlify.com/) - [Polymer](https://release-3-4--storybooks-polymer.netlify.com/) ### 3.3 - - [React Official](https://release-3-3--storybooks-official.netlify.com) - [Vue](https://release-3-3--storybooks-vue.netlify.com/) - [Angular](https://release-3-3--storybooks-angular.netlify.com/) diff --git a/docs/src/versions/next.json b/docs/src/versions/next.json index a4455836d6a..6b8b3c60433 100644 --- a/docs/src/versions/next.json +++ b/docs/src/versions/next.json @@ -1 +1 @@ -{"version":"5.2.0-beta.13","info":{"plain":"This is a breaking change for anybody who used `load` on an earlier 5.2 pre-release. Simply rename `load` to `configure` in your storybook config and that should fix things.\n\nIf you're not using SB Docs, you probably don't have to worry about this.\n\n### Breaking Changes\n\n* Core: Rename `load` to `configure` ([#7576](https://github.com/storybookjs/storybook/pull/7576))"}} \ No newline at end of file +{"version":"5.2.0-beta.17","info":{"plain":"### Bug Fixes\n\n* CLI: Fix storiesof-to-csf migration w/punctuation ([#7590](https://github.com/storybookjs/storybook/pull/7590))"}} diff --git a/examples-native/crna-kitchen-sink/package.json b/examples-native/crna-kitchen-sink/package.json index b07ee01347b..7f5e048a0a4 100644 --- a/examples-native/crna-kitchen-sink/package.json +++ b/examples-native/crna-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "crna-kitchen-sink", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "main": "node_modules/expo/AppEntry.js", "scripts": { @@ -24,14 +24,14 @@ "devDependencies": { "@babel/core": "^7.2.2", "@babel/plugin-transform-react-jsx-source": "^7.2.0", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-ondevice-actions": "5.2.0-beta.13", - "@storybook/addon-ondevice-backgrounds": "5.2.0-beta.13", - "@storybook/addon-ondevice-knobs": "5.2.0-beta.13", - "@storybook/addon-ondevice-notes": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/react-native": "5.2.0-beta.13", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-ondevice-actions": "5.2.0-beta.17", + "@storybook/addon-ondevice-backgrounds": "5.2.0-beta.17", + "@storybook/addon-ondevice-knobs": "5.2.0-beta.17", + "@storybook/addon-ondevice-notes": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/react-native": "5.2.0-beta.17", "babel-loader": "^8.0.4", "babel-plugin-module-resolver": "^3.2.0", "babel-preset-expo": "^5.1.1", diff --git a/examples/angular-cli/.storybook/config.ts b/examples/angular-cli/.storybook/config.ts index 80424b69d97..e9ce645b742 100644 --- a/examples/angular-cli/.storybook/config.ts +++ b/examples/angular-cli/.storybook/config.ts @@ -1,6 +1,5 @@ import { configure, addParameters, addDecorator } from '@storybook/angular'; import { withA11y } from '@storybook/addon-a11y'; -import { DocsPage } from '@storybook/addon-docs/blocks'; import addCssWarning from '../src/cssWarning'; addDecorator(withA11y); @@ -13,7 +12,6 @@ addParameters({ iframeHeight: '60px', }, }, - docs: DocsPage, }); configure(require.context('../src/stories', true, /\.stories\.(ts|mdx)$/), module); diff --git a/examples/angular-cli/.storybook/presets.js b/examples/angular-cli/.storybook/presets.js index 3486cb78356..da117ff9853 100644 --- a/examples/angular-cli/.storybook/presets.js +++ b/examples/angular-cli/.storybook/presets.js @@ -1,8 +1 @@ -module.exports = [ - { - name: '@storybook/addon-docs/common/preset', - options: { - configureJSX: true, - }, - }, -]; +module.exports = ['@storybook/addon-docs/angular/preset']; diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json index 84bd25f0861..6c8467225f5 100644 --- a/examples/angular-cli/package.json +++ b/examples/angular-cli/package.json @@ -1,6 +1,6 @@ { "name": "angular-cli", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "license": "MIT", "scripts": { @@ -34,21 +34,21 @@ "@angular-devkit/build-angular": "^0.13.4", "@angular/cli": "^7.3.6", "@angular/compiler-cli": "^7.2.6", - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-docs": "5.2.0-beta.13", - "@storybook/addon-jest": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/angular": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-docs": "5.2.0-beta.17", + "@storybook/addon-jest": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/angular": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "@types/core-js": "^2.5.0", "@types/jest": "^24.0.11", "@types/node": "~12.0.2", diff --git a/examples/cra-kitchen-sink/.storybook/config.js b/examples/cra-kitchen-sink/.storybook/config.js index e836114ad0c..a8a6004f452 100644 --- a/examples/cra-kitchen-sink/.storybook/config.js +++ b/examples/cra-kitchen-sink/.storybook/config.js @@ -1,7 +1,6 @@ import { configure, addParameters, addDecorator } from '@storybook/react'; import { create } from '@storybook/theming'; import { withA11y } from '@storybook/addon-a11y'; -import { DocsPage } from '@storybook/addon-docs/blocks'; addDecorator(withA11y); addParameters({ @@ -21,7 +20,6 @@ addParameters({ }), storySort: (a, b) => a[1].id.localeCompare(b[1].id), }, - docs: DocsPage, }); configure(require.context('../src/stories', true, /\.stories\.(js|mdx)$/), module); diff --git a/examples/cra-kitchen-sink/.storybook/presets.js b/examples/cra-kitchen-sink/.storybook/presets.js index 3486cb78356..bd5d86e6e96 100644 --- a/examples/cra-kitchen-sink/.storybook/presets.js +++ b/examples/cra-kitchen-sink/.storybook/presets.js @@ -1,6 +1,6 @@ module.exports = [ { - name: '@storybook/addon-docs/common/preset', + name: '@storybook/addon-docs/react/preset', options: { configureJSX: true, }, diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json index 745acc9f026..e1a505de95a 100644 --- a/examples/cra-kitchen-sink/package.json +++ b/examples/cra-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "cra-kitchen-sink", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build": "react-scripts build", @@ -19,23 +19,23 @@ "react-lifecycles-compat": "^3.0.4" }, "devDependencies": { - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-docs": "5.2.0-beta.13", - "@storybook/addon-events": "5.2.0-beta.13", - "@storybook/addon-info": "5.2.0-beta.13", - "@storybook/addon-jest": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/react": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-docs": "5.2.0-beta.17", + "@storybook/addon-events": "5.2.0-beta.17", + "@storybook/addon-info": "5.2.0-beta.17", + "@storybook/addon-jest": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/react": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "react-scripts": "^3.0.1" } } diff --git a/examples/cra-react15/package.json b/examples/cra-react15/package.json index 5831501b4b0..2946c9087df 100644 --- a/examples/cra-react15/package.json +++ b/examples/cra-react15/package.json @@ -1,6 +1,6 @@ { "name": "cra-react15", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "dependencies": { "babel-loader": "8.0.6", @@ -19,10 +19,10 @@ "build-storybook": "build-storybook -s public" }, "devDependencies": { - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/react": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/react": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "babel-core": "6", "babel-runtime": "6" } diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json index aa5f5feb516..ab7c0dd4f40 100644 --- a/examples/cra-ts-kitchen-sink/package.json +++ b/examples/cra-ts-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "cra-ts-kitchen-sink", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build-storybook": "build-storybook -s public", @@ -14,12 +14,12 @@ "react-dom": "^16.8.3" }, "devDependencies": { - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-info": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/react": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-info": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/react": "5.2.0-beta.17", "@types/enzyme": "^3.9.0", "@types/react": "^16.8.3", "@types/react-dom": "^16.8.2", diff --git a/examples/dev-kits/package.json b/examples/dev-kits/package.json index 2bcd103e274..bfa18f6cbe5 100644 --- a/examples/dev-kits/package.json +++ b/examples/dev-kits/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/example-devkits", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build-storybook": "build-storybook -c ./ -s built-storybooks", @@ -8,15 +8,15 @@ "storybook": "start-storybook -p 9011 -c ./" }, "devDependencies": { - "@storybook/addon-decorator": "5.2.0-beta.13", - "@storybook/addon-parameter": "5.2.0-beta.13", - "@storybook/addon-roundtrip": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/node-logger": "5.2.0-beta.13", - "@storybook/react": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addon-decorator": "5.2.0-beta.17", + "@storybook/addon-parameter": "5.2.0-beta.17", + "@storybook/addon-roundtrip": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/node-logger": "5.2.0-beta.17", + "@storybook/react": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "cors": "^2.8.5", "cross-env": "^5.2.0", "enzyme-to-json": "^3.3.5", diff --git a/examples/ember-cli/package.json b/examples/ember-cli/package.json index e0c362c00f2..8d7695bf7c0 100644 --- a/examples/ember-cli/package.json +++ b/examples/ember-cli/package.json @@ -1,6 +1,6 @@ { "name": "ember-example", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build": "ember build", @@ -15,19 +15,19 @@ }, "devDependencies": { "@babel/core": "^7.3.4", - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/ember": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/ember": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "babel-loader": "^8", "broccoli-asset-rev": "^3.0.0", "cross-env": "^5.2.0", diff --git a/examples/html-kitchen-sink/.storybook/config.js b/examples/html-kitchen-sink/.storybook/config.js index 7ce67397280..4f9203a56c7 100644 --- a/examples/html-kitchen-sink/.storybook/config.js +++ b/examples/html-kitchen-sink/.storybook/config.js @@ -1,6 +1,5 @@ import { configure, addParameters, addDecorator } from '@storybook/html'; import { withA11y } from '@storybook/addon-a11y'; -import { DocsPage } from '@storybook/addon-docs/blocks'; addDecorator(withA11y); @@ -18,7 +17,6 @@ addParameters({ iframeHeight: '200px', }, }, - docs: DocsPage, }); configure(require.context('../stories', true, /\.stories\.(js|mdx)$/), module); diff --git a/examples/html-kitchen-sink/.storybook/presets.js b/examples/html-kitchen-sink/.storybook/presets.js index 3486cb78356..7c4d1835bcf 100644 --- a/examples/html-kitchen-sink/.storybook/presets.js +++ b/examples/html-kitchen-sink/.storybook/presets.js @@ -1,8 +1 @@ -module.exports = [ - { - name: '@storybook/addon-docs/common/preset', - options: { - configureJSX: true, - }, - }, -]; +module.exports = ['@storybook/addon-docs/html/preset']; diff --git a/examples/html-kitchen-sink/package.json b/examples/html-kitchen-sink/package.json index 30a50542fb8..ae9b7257033 100644 --- a/examples/html-kitchen-sink/package.json +++ b/examples/html-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "html-kitchen-sink", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "description": "", "keywords": [], @@ -14,26 +14,26 @@ "storybook": "start-storybook -p 9006 --no-dll" }, "devDependencies": { - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-docs": "5.2.0-beta.13", - "@storybook/addon-events": "5.2.0-beta.13", - "@storybook/addon-jest": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/client-api": "5.2.0-beta.13", - "@storybook/core": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/html": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-docs": "5.2.0-beta.17", + "@storybook/addon-events": "5.2.0-beta.17", + "@storybook/addon-jest": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/client-api": "5.2.0-beta.17", + "@storybook/core": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/html": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "eventemitter3": "^4.0.0", "format-json": "^1.0.3", "global": "^4.3.2" diff --git a/examples/marko-cli/package.json b/examples/marko-cli/package.json index e33e4cb3dd9..a9e279c0f97 100644 --- a/examples/marko-cli/package.json +++ b/examples/marko-cli/package.json @@ -1,6 +1,6 @@ { "name": "marko-cli", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "description": "Demo of how to build an app using marko-starter", "repository": { @@ -24,14 +24,14 @@ "marko-starter": "^2.0.4" }, "devDependencies": { - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/marko": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/marko": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "prettier": "^1.16.4", "webpack": "^4.33.0" } diff --git a/examples/mithril-kitchen-sink/package.json b/examples/mithril-kitchen-sink/package.json index 4914550ae08..ef7e8aa1864 100644 --- a/examples/mithril-kitchen-sink/package.json +++ b/examples/mithril-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "mithril-example", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build-storybook": "build-storybook", @@ -11,20 +11,20 @@ "mithril": "^1.1.6" }, "devDependencies": { - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/mithril": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/mithril": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "webpack": "^4.33.0" } } diff --git a/examples/official-storybook/config.js b/examples/official-storybook/config.js index 2d1d0c0ea2a..be7ac8804b2 100644 --- a/examples/official-storybook/config.js +++ b/examples/official-storybook/config.js @@ -1,8 +1,6 @@ import React from 'react'; import { configure, addDecorator, addParameters } from '@storybook/react'; import { Global, ThemeProvider, themes, createReset, convert } from '@storybook/theming'; -import { DocsPage } from '@storybook/addon-docs/blocks'; - import { withCssResources } from '@storybook/addon-cssresources'; import { withA11y } from '@storybook/addon-a11y'; import { withNotes } from '@storybook/addon-notes'; @@ -57,7 +55,6 @@ addParameters({ { name: 'light', value: '#eeeeee' }, { name: 'dark', value: '#222222' }, ], - docs: DocsPage, }); configure( diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json index 480d7aab274..71231b00508 100644 --- a/examples/official-storybook/package.json +++ b/examples/official-storybook/package.json @@ -1,6 +1,6 @@ { "name": "official-storybook", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build-storybook": "build-storybook -c ./ -s built-storybooks", @@ -15,34 +15,34 @@ }, "devDependencies": { "@packtracker/webpack-plugin": "^2.0.1", - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-contexts": "5.2.0-beta.13", - "@storybook/addon-cssresources": "5.2.0-beta.13", - "@storybook/addon-design-assets": "5.2.0-beta.13", - "@storybook/addon-docs": "5.2.0-beta.13", - "@storybook/addon-events": "5.2.0-beta.13", - "@storybook/addon-graphql": "5.2.0-beta.13", - "@storybook/addon-info": "5.2.0-beta.13", - "@storybook/addon-jest": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-queryparams": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storyshots-puppeteer": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/components": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/node-logger": "5.2.0-beta.13", - "@storybook/react": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-contexts": "5.2.0-beta.17", + "@storybook/addon-cssresources": "5.2.0-beta.17", + "@storybook/addon-design-assets": "5.2.0-beta.17", + "@storybook/addon-docs": "5.2.0-beta.17", + "@storybook/addon-events": "5.2.0-beta.17", + "@storybook/addon-graphql": "5.2.0-beta.17", + "@storybook/addon-info": "5.2.0-beta.17", + "@storybook/addon-jest": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-queryparams": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storyshots-puppeteer": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/components": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/node-logger": "5.2.0-beta.17", + "@storybook/react": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "cors": "^2.8.5", "cross-env": "^5.2.0", "enzyme-to-json": "^3.3.5", diff --git a/examples/official-storybook/presets.js b/examples/official-storybook/presets.js index 8aacf08c06d..b1d463490f6 100644 --- a/examples/official-storybook/presets.js +++ b/examples/official-storybook/presets.js @@ -1 +1 @@ -module.exports = ['@storybook/addon-docs/common/preset']; +module.exports = ['@storybook/addon-docs/react/preset']; diff --git a/examples/polymer-cli/package.json b/examples/polymer-cli/package.json index 8e357fe70be..07683ff63b0 100644 --- a/examples/polymer-cli/package.json +++ b/examples/polymer-cli/package.json @@ -1,6 +1,6 @@ { "name": "polymer-cli", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build-storybook": "build-storybook", @@ -10,17 +10,17 @@ }, "dependencies": { "@polymer/polymer": "^2.6.0", - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/polymer": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/polymer": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "@webcomponents/webcomponentsjs": "^1.2.0", "global": "^4.3.2", "lit-html": "^1.0.0", diff --git a/examples/preact-kitchen-sink/package.json b/examples/preact-kitchen-sink/package.json index 1f96c344be3..b8b17b4fd82 100644 --- a/examples/preact-kitchen-sink/package.json +++ b/examples/preact-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "preact-example", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", @@ -16,21 +16,21 @@ "devDependencies": { "@babel/core": "^7.3.4", "@babel/plugin-transform-runtime": "^7.2.0", - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-contexts": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/preact": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-contexts": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/preact": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "babel-loader": "^8.0.4", "cross-env": "^5.2.0", "file-loader": "^3.0.1", diff --git a/examples/rax-kitchen-sink/package.json b/examples/rax-kitchen-sink/package.json index 945bffd0af5..183b65499a2 100644 --- a/examples/rax-kitchen-sink/package.json +++ b/examples/rax-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "rax-kitchen-sink", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "test:generate-output": "jest --json --outputFile=jest-test-results.json --config=./jest-addon.config.js", @@ -24,23 +24,23 @@ "rax-view": "^0.6.5" }, "devDependencies": { - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-events": "5.2.0-beta.13", - "@storybook/addon-info": "5.2.0-beta.13", - "@storybook/addon-jest": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/rax": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-events": "5.2.0-beta.17", + "@storybook/addon-info": "5.2.0-beta.17", + "@storybook/addon-jest": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/rax": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "babel-eslint": "^8.2.2", "babel-preset-rax": "^1.0.0-beta.0", "rax-scripts": "^1.0.0-beta.10", diff --git a/examples/riot-kitchen-sink/package.json b/examples/riot-kitchen-sink/package.json index cb067030ca6..154ef44ea9b 100644 --- a/examples/riot-kitchen-sink/package.json +++ b/examples/riot-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "riot-example", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", @@ -16,20 +16,20 @@ }, "devDependencies": { "@babel/core": "^7.3.4", - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/riot": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/riot": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", "babel-loader": "^8.0.4", "cross-env": "^5.2.0", "file-loader": "^3.0.1", diff --git a/examples/standalone-preview/package.json b/examples/standalone-preview/package.json index 0a3912384f4..e8b95faaa1a 100644 --- a/examples/standalone-preview/package.json +++ b/examples/standalone-preview/package.json @@ -1,6 +1,6 @@ { "name": "standalone-preview", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "storybook": "parcel ./storybook.html --port 1337" diff --git a/examples/svelte-kitchen-sink/package.json b/examples/svelte-kitchen-sink/package.json index beb864c7e98..3452449a276 100644 --- a/examples/svelte-kitchen-sink/package.json +++ b/examples/svelte-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "svelte-example", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build-storybook": "build-storybook -s public", @@ -11,19 +11,19 @@ "global": "^4.3.2" }, "devDependencies": { - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", - "@storybook/svelte": "5.2.0-beta.13" + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", + "@storybook/svelte": "5.2.0-beta.17" } } diff --git a/examples/vue-kitchen-sink/.storybook/config.js b/examples/vue-kitchen-sink/.storybook/config.js index 8eeb27cbaec..73989383ab1 100644 --- a/examples/vue-kitchen-sink/.storybook/config.js +++ b/examples/vue-kitchen-sink/.storybook/config.js @@ -2,7 +2,6 @@ import { configure, addParameters, addDecorator } from '@storybook/vue'; import Vue from 'vue'; import Vuex from 'vuex'; import { withA11y } from '@storybook/addon-a11y'; -import { DocsPage } from '@storybook/addon-docs/blocks'; import MyButton from '../src/stories/Button.vue'; @@ -17,7 +16,6 @@ addParameters({ iframeHeight: '60px', }, }, - docs: DocsPage, }); configure(require.context('../src/stories', true, /\.stories\.(js|mdx)$/), module); diff --git a/examples/vue-kitchen-sink/.storybook/presets.js b/examples/vue-kitchen-sink/.storybook/presets.js index 3486cb78356..a4707c74c5c 100644 --- a/examples/vue-kitchen-sink/.storybook/presets.js +++ b/examples/vue-kitchen-sink/.storybook/presets.js @@ -1,8 +1 @@ -module.exports = [ - { - name: '@storybook/addon-docs/common/preset', - options: { - configureJSX: true, - }, - }, -]; +module.exports = ['@storybook/addon-docs/vue/preset']; diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index 0822a689890..2fafb67e1e8 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "vue-example", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "private": true, "scripts": { "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", @@ -15,22 +15,22 @@ }, "devDependencies": { "@babel/core": "^7.3.4", - "@storybook/addon-a11y": "5.2.0-beta.13", - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-backgrounds": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-contexts": "5.2.0-beta.13", - "@storybook/addon-docs": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addon-storysource": "5.2.0-beta.13", - "@storybook/addon-viewport": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/source-loader": "5.2.0-beta.13", - "@storybook/vue": "5.2.0-beta.13", + "@storybook/addon-a11y": "5.2.0-beta.17", + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-backgrounds": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-contexts": "5.2.0-beta.17", + "@storybook/addon-docs": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addon-storysource": "5.2.0-beta.17", + "@storybook/addon-viewport": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/source-loader": "5.2.0-beta.17", + "@storybook/vue": "5.2.0-beta.17", "babel-core": "^7.0.0-bridge.0", "babel-loader": "^8.0.5", "cross-env": "^5.2.0", diff --git a/lerna.json b/lerna.json index 8acb3382995..5978e76f48e 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "npmClient": "yarn", "useWorkspaces": true, "registry": "https://registry.npmjs.org", - "version": "5.2.0-beta.13" + "version": "5.2.0-beta.17" } diff --git a/lib/addons/package.json b/lib/addons/package.json index f502703ee69..9c1f750273f 100644 --- a/lib/addons/package.json +++ b/lib/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook addons store", "keywords": [ "storybook" @@ -21,9 +21,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/api": "5.2.0-beta.13", - "@storybook/channels": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", + "@storybook/api": "5.2.0-beta.17", + "@storybook/channels": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "util-deprecate": "^1.0.2" diff --git a/lib/api/package.json b/lib/api/package.json index 082b032c321..158f9a743b1 100644 --- a/lib/api/package.json +++ b/lib/api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/api", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Core Storybook API & Context", "keywords": [ "storybook" @@ -20,11 +20,11 @@ "prepare": "node ./scripts/generateVersion.js && node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/router": "5.2.0-beta.13", - "@storybook/theming": "5.2.0-beta.13", + "@storybook/channels": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/router": "5.2.0-beta.17", + "@storybook/theming": "5.2.0-beta.17", "core-js": "^3.0.1", "fast-deep-equal": "^2.0.1", "global": "^4.3.2", @@ -35,7 +35,7 @@ "semver": "^6.0.0", "shallow-equal": "^1.1.0", "store2": "^2.7.1", - "telejson": "^2.2.1", + "telejson": "^2.2.2", "util-deprecate": "^1.0.2" }, "devDependencies": { diff --git a/lib/api/src/version.ts b/lib/api/src/version.ts index 7eedc14a928..04f83b01eef 100644 --- a/lib/api/src/version.ts +++ b/lib/api/src/version.ts @@ -1 +1 @@ -export const version = '5.2.0-beta.13'; +export const version = '5.2.0-beta.17'; diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json index d900e7298cc..8276310a1de 100644 --- a/lib/channel-postmessage/package.json +++ b/lib/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "", "keywords": [ "storybook" @@ -21,11 +21,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", + "@storybook/channels": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", - "telejson": "^2.2.1" + "telejson": "^2.2.2" }, "publishConfig": { "access": "public" diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json index fb0e174d6b5..1b1b2bae127 100644 --- a/lib/channel-websocket/package.json +++ b/lib/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "", "keywords": [ "storybook" @@ -21,7 +21,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "5.2.0-beta.13", + "@storybook/channels": "5.2.0-beta.17", "core-js": "^3.0.1", "global": "^4.3.2", "json-fn": "^1.1.1" diff --git a/lib/channels/package.json b/lib/channels/package.json index 49e2848332f..1dec4a621fb 100644 --- a/lib/channels/package.json +++ b/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "", "keywords": [ "storybook" diff --git a/lib/cli/package.json b/lib/cli/package.json index e7f96bd5541..9666859e41b 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook's CLI - easiest method of adding storybook to your projects", "keywords": [ "cli", @@ -30,7 +30,7 @@ "@babel/core": "^7.4.5", "@babel/preset-env": "^7.4.5", "@babel/register": "^7.0.0", - "@storybook/codemod": "5.2.0-beta.13", + "@storybook/codemod": "5.2.0-beta.17", "chalk": "^2.4.1", "commander": "^2.19.0", "core-js": "^3.0.1", @@ -46,33 +46,33 @@ "update-notifier": "^3.0.0" }, "devDependencies": { - "@storybook/addon-actions": "5.2.0-beta.13", - "@storybook/addon-centered": "5.2.0-beta.13", - "@storybook/addon-graphql": "5.2.0-beta.13", - "@storybook/addon-info": "5.2.0-beta.13", - "@storybook/addon-knobs": "5.2.0-beta.13", - "@storybook/addon-links": "5.2.0-beta.13", - "@storybook/addon-notes": "5.2.0-beta.13", - "@storybook/addon-options": "5.2.0-beta.13", - "@storybook/addon-storyshots": "5.2.0-beta.13", - "@storybook/addons": "5.2.0-beta.13", - "@storybook/angular": "5.2.0-beta.13", - "@storybook/channel-postmessage": "5.2.0-beta.13", - "@storybook/channel-websocket": "5.2.0-beta.13", - "@storybook/channels": "5.2.0-beta.13", - "@storybook/ember": "5.2.0-beta.13", - "@storybook/html": "5.2.0-beta.13", - "@storybook/marko": "5.2.0-beta.13", - "@storybook/mithril": "5.2.0-beta.13", - "@storybook/polymer": "5.2.0-beta.13", - "@storybook/preact": "5.2.0-beta.13", - "@storybook/rax": "5.2.0-beta.13", - "@storybook/react": "5.2.0-beta.13", - "@storybook/react-native": "5.2.0-beta.13", - "@storybook/riot": "5.2.0-beta.13", - "@storybook/svelte": "5.2.0-beta.13", - "@storybook/ui": "5.2.0-beta.13", - "@storybook/vue": "5.2.0-beta.13" + "@storybook/addon-actions": "5.2.0-beta.17", + "@storybook/addon-centered": "5.2.0-beta.17", + "@storybook/addon-graphql": "5.2.0-beta.17", + "@storybook/addon-info": "5.2.0-beta.17", + "@storybook/addon-knobs": "5.2.0-beta.17", + "@storybook/addon-links": "5.2.0-beta.17", + "@storybook/addon-notes": "5.2.0-beta.17", + "@storybook/addon-options": "5.2.0-beta.17", + "@storybook/addon-storyshots": "5.2.0-beta.17", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/angular": "5.2.0-beta.17", + "@storybook/channel-postmessage": "5.2.0-beta.17", + "@storybook/channel-websocket": "5.2.0-beta.17", + "@storybook/channels": "5.2.0-beta.17", + "@storybook/ember": "5.2.0-beta.17", + "@storybook/html": "5.2.0-beta.17", + "@storybook/marko": "5.2.0-beta.17", + "@storybook/mithril": "5.2.0-beta.17", + "@storybook/polymer": "5.2.0-beta.17", + "@storybook/preact": "5.2.0-beta.17", + "@storybook/rax": "5.2.0-beta.17", + "@storybook/react": "5.2.0-beta.17", + "@storybook/react-native": "5.2.0-beta.17", + "@storybook/riot": "5.2.0-beta.17", + "@storybook/svelte": "5.2.0-beta.17", + "@storybook/ui": "5.2.0-beta.17", + "@storybook/vue": "5.2.0-beta.17" }, "publishConfig": { "access": "public" diff --git a/lib/client-api/package.json b/lib/client-api/package.json index 52d50148225..14c4ce10145 100644 --- a/lib/client-api/package.json +++ b/lib/client-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-api", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "Storybook Client API", "keywords": [ "storybook" @@ -21,12 +21,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-beta.13", - "@storybook/channel-postmessage": "5.2.0-beta.13", - "@storybook/channels": "5.2.0-beta.13", - "@storybook/client-logger": "5.2.0-beta.13", - "@storybook/core-events": "5.2.0-beta.13", - "@storybook/router": "5.2.0-beta.13", + "@storybook/addons": "5.2.0-beta.17", + "@storybook/channel-postmessage": "5.2.0-beta.17", + "@storybook/channels": "5.2.0-beta.17", + "@storybook/client-logger": "5.2.0-beta.17", + "@storybook/core-events": "5.2.0-beta.17", + "@storybook/router": "5.2.0-beta.17", "common-tags": "^1.8.0", "core-js": "^3.0.1", "eventemitter3": "^4.0.0", diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json index 01d229f1848..17214962e02 100644 --- a/lib/client-logger/package.json +++ b/lib/client-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-logger", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "", "keywords": [ "storybook" diff --git a/lib/codemod/package.json b/lib/codemod/package.json index a99c8b28554..6104a8a48c4 100644 --- a/lib/codemod/package.json +++ b/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "5.2.0-beta.13", + "version": "5.2.0-beta.17", "description": "A collection of codemod scripts written with JSCodeshift", "keywords": [ "storybook" @@ -22,7 +22,7 @@ }, "dependencies": { "@mdx-js/mdx": "^1.0.0", - "@storybook/node-logger": "5.2.0-beta.13", + "@storybook/node-logger": "5.2.0-beta.17", "core-js": "^3.0.1", "cross-spawn": "^6.0.5", "globby": "^10.0.1", diff --git a/lib/codemod/src/lib/isReserved.js b/lib/codemod/src/lib/utils.js similarity index 68% rename from lib/codemod/src/lib/isReserved.js rename to lib/codemod/src/lib/utils.js index 99d1b7e9e8e..822774440a2 100644 --- a/lib/codemod/src/lib/isReserved.js +++ b/lib/codemod/src/lib/utils.js @@ -1,3 +1,13 @@ +import camelCase from 'lodash/camelCase'; + const RESERVED = /^(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|await|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$/; export const isReserved = name => RESERVED.exec(name); + +export const sanitizeName = name => { + let key = camelCase(name); + if (isReserved(key)) { + key = `${key}Story`; + } + return key; +}; diff --git a/lib/codemod/src/lib/utils.test.js b/lib/codemod/src/lib/utils.test.js new file mode 100644 index 00000000000..efeffdfb880 --- /dev/null +++ b/lib/codemod/src/lib/utils.test.js @@ -0,0 +1,14 @@ +import { sanitizeName } from './utils'; + +it('should sanitize names', () => { + const testCases = [ + ['basic', 'basic'], + ['with space', 'withSpace'], + ['default', 'defaultStory'], + ['w/punctuation', 'wPunctuation'], + ]; + testCases.forEach(testCase => { + const [input, out] = testCase; + expect(sanitizeName(input)).toBe(out); + }); +}); diff --git a/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/basic.input.js b/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/basic.input.js index 816062e09b9..fc45a6e5850 100644 --- a/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/basic.input.js +++ b/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/basic.input.js @@ -11,4 +11,8 @@ import { Meta, Story } from '@storybook/addon-docs/blocks';
\ No newline at end of file + + + +