Merge remote-tracking branch 'origin/next' into feature/useChannelToHighlight

2025-04-05 08:01:20 +08:00 · 2020-04-19 18:45:46 +02:00 · 2020-04-19 18:45:46 +02:00 · 5226171d56
commit 5226171d56
parent 30220c2c85 d45c7d8915
122 changed files with 872 additions and 647 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,49 @@
+## 6.0.0-alpha.39 (April 18, 2020)
+
+### Breaking Changes
+
+- Addon-docs: Inline stories in Vue by default ([#10463](https://github.com/storybookjs/storybook/pull/10463))
+
+### Features
+
+- Addon-docs: Provide better props include/exclude features ([#10464](https://github.com/storybookjs/storybook/pull/10464))
+- UI: Improve loading state ([#10444](https://github.com/storybookjs/storybook/pull/10444))
+
+### Bug Fixes
+
+- UI: Fix bad shortcutpage layout ([#10445](https://github.com/storybookjs/storybook/pull/10445))
+
+## 6.0.0-alpha.38 (April 18, 2020)
+
+Failed publish
+
+## 6.0.0-alpha.37 (April 17, 2020)
+
+### Features
+
+- Addon-actions: Make arg auto-generation more aggressive ([#10451](https://github.com/storybookjs/storybook/pull/10451))
+
+### Maintenance
+
+- Examples: Format stringified parameters ([#10435](https://github.com/storybookjs/storybook/pull/10435))
+
+### Dependency Upgrades
+
+- Bump recast from 0.16.2 to 0.19.0 ([#10415](https://github.com/storybookjs/storybook/pull/10415))
+
+## 6.0.0-alpha.36 (April 16, 2020)
+
+### Bug Fixes
+
+- Server: Fix serialization of knobs params back to server ([#10391](https://github.com/storybookjs/storybook/pull/10391))
+- Core: Serve correctly hashed static files with the Cache-Control header ([#10390](https://github.com/storybookjs/storybook/pull/10390))
+- Addon-a11y: Fix default a11y parameters ([#10439](https://github.com/storybookjs/storybook/pull/10439))
+- Core: Fix event source handling ([#10416](https://github.com/storybookjs/storybook/pull/10416))
+
+### Maintenance
+
+- Addon-docs: Add blocks typings ([#10441](https://github.com/storybookjs/storybook/pull/10441))
+
 ## 6.0.0-alpha.35 (April 16, 2020)

 ### Bug Fixes
--- a/addons/a11y/package.json
+++ b/addons/a11y/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-a11y",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "a11y addon for storybook",
  "keywords": [
    "a11y",
@ -33,14 +33,14 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/channels": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/channels": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "axe-core": "^3.5.2",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-actions",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Action Logger addon for storybook",
  "keywords": [
    "storybook"
@ -28,15 +28,16 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "fast-deep-equal": "^3.1.1",
    "global": "^4.3.2",
+    "lodash": "^4.17.15",
    "polished": "^3.4.4",
    "prop-types": "^15.7.2",
    "react": "^16.8.3",
--- a/addons/actions/src/preset/addArgs.test.ts
+++ b/addons/actions/src/preset/addArgs.test.ts
@ -17,14 +17,18 @@ describe('actions parameter enhancers', () => {
      expect(withDefaultValue(argTypes)).toEqual(['onClick', 'onFocus']);
    });

-    it('should prioritize pre-existing argTypes', () => {
+    it('should prioritize pre-existing argTypes unless they are null', () => {
      const parameters = {
        ...baseParameters,
-        argTypes: { onClick: { defaultValue: 'pre-existing value' }, onFocus: {} },
+        argTypes: {
+          onClick: { defaultValue: 'pre-existing value' },
+          onFocus: { defaultValue: null },
+        },
      };
      const argTypes = inferActionsFromArgTypesRegex({ parameters } as StoryContext);
      expect(withDefaultValue(argTypes)).toEqual(['onClick', 'onFocus']);
      expect(argTypes.onClick.defaultValue).toEqual('pre-existing value');
+      expect(argTypes.onFocus.defaultValue).not.toBeNull();
    });

    it('should do nothing if actions are disabled', () => {
--- a/addons/actions/src/preset/addArgs.ts
+++ b/addons/actions/src/preset/addArgs.ts
@ -1,5 +1,5 @@
-import { ArgTypesEnhancer, combineParameters } from '@storybook/client-api';
-import { ArgTypes, ArgType } from '@storybook/addons';
+import mapValues from 'lodash/mapValues';
+import { ArgTypesEnhancer } from '@storybook/client-api';

 import { action } from '../index';

@ -19,14 +19,12 @@ export const inferActionsFromArgTypesRegex: ArgTypesEnhancer = (context) => {
  }

  const argTypesRegex = new RegExp(actions.argTypesRegex);
-  const actionArgTypes = Object.keys(argTypes).reduce((acc, name) => {
-    if (argTypesRegex.test(name)) {
-      acc[name] = { defaultValue: action(name) };
+  return mapValues(argTypes, (argType, name) => {
+    if (!argTypesRegex.test(name)) {
+      return argType;
    }
-    return acc;
-  }, {} as ArgTypes);
-
-  return combineParameters(actionArgTypes, argTypes) as ArgTypes;
+    return { ...argType, defaultValue: argType.defaultValue || action(name) };
+  });
 };

 /**
@ -38,16 +36,13 @@ export const addActionsFromArgTypes: ArgTypesEnhancer = (context) => {
    return argTypes;
  }

-  const actionArgTypes = Object.keys(argTypes).reduce((acc, argName) => {
-    const argType: ArgType = argTypes[argName];
-    if (argType.action) {
-      const message = typeof argType.action === 'string' ? argType.action : argName;
-      acc[argName] = { defaultValue: action(message) };
+  return mapValues(argTypes, (argType, name) => {
+    if (!argType.action) {
+      return argType;
    }
-    return acc;
-  }, {} as ArgTypes);
-
-  return combineParameters(actionArgTypes, argTypes) as ArgTypes;
+    const message = typeof argType.action === 'string' ? argType.action : name;
+    return { ...argType, defaultValue: argType.defaultValue || action(message) };
+  });
 };

 export const argTypesEnhancers = [addActionsFromArgTypes, inferActionsFromArgTypesRegex];
--- a/addons/backgrounds/package.json
+++ b/addons/backgrounds/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-backgrounds",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "A storybook addon to show different backgrounds for your preview",
  "keywords": [
    "addon",
@ -32,12 +32,12 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "memoizerific": "^1.11.3",
    "react": "^16.8.3",
--- a/addons/contexts/package.json
+++ b/addons/contexts/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-contexts",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook Addon Contexts",
  "keywords": [
    "preact",
@ -28,10 +28,10 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "qs": "^6.6.0",
--- a/addons/cssresources/package.json
+++ b/addons/cssresources/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-cssresources",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "A storybook addon to switch between css resources at runtime for your story",
  "keywords": [
    "addon",
@ -32,11 +32,11 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "react": "^16.8.3",
--- a/addons/design-assets/package.json
+++ b/addons/design-assets/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-design-assets",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Design asset preview for storybook",
  "keywords": [
    "addon",
@ -34,12 +34,12 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "react": "^16.8.3",
--- a/addons/docs/README.md
+++ b/addons/docs/README.md
@ -174,7 +174,7 @@ module.exports = {
  //    will configure everything with a preset)
  addons: ['@storybook/addon-docs/register'],
  // 2. manually configure webpack, since you're not using the preset
-  webpackFinal: async config => {
+  webpackFinal: async (config) => {
    config.module.rules.push({
      // 2a. Load `.stories.mdx` / `.story.mdx` files as CSF and generate
      //     the docs page from the markdown
@ -235,7 +235,6 @@ Install the preset with care. If you've already configured Typescript manually,

 Want to learn more? Here are some more articles on Storybook Docs:

- References: [DocsPage](./docs/docspage.md) / [MDX](./docs/mdx.md) / [FAQ](./docs/faq.md) / [Recipes](./docs/recipes.md) / [Theming](./docs/theming.md)
- Vision: [Storybook Docs sneak peak](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a)
- Announcement: [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf)
+- References: [DocsPage](./docs/docspage.md) / [MDX](./docs/mdx.md) / [FAQ](./docs/faq.md) / [Recipes](./docs/recipes.md) / [Theming](./docs/theming.md) / [Props](./docs/props-tables.md)
+- Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/angular/README.md
+++ b/addons/docs/angular/README.md
@ -10,11 +10,12 @@ Storybook Docs transforms your Storybook stories into world-class component docu

 To learn more about Storybook Docs, read the [general documentation](../README.md). To learn the Angular specifics, read on!

- [Installation](#installation)
- [DocsPage](#docspage)
- [MDX](#mdx)
- [IFrame height](#iframe-height)
- [More resources](#more-resources)
+- [Storybook Docs for Angular](#storybook-docs-for-angular)
+  - [Installation](#installation)
+  - [DocsPage](#docspage)
+  - [MDX](#mdx)
+  - [IFrame height](#iframe-height)
+  - [More resources](#more-resources)

 ## Installation

@ -164,7 +165,6 @@ And for `MDX` you can modify it as an attribute on the `Story` element:

 Want to learn more? Here are some more articles on Storybook Docs:

- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md)
- Vision: [Storybook Docs sneak peak](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a)
- Announcement: [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf)
+- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md) / [Props](../docs/props-tables.md)
+- Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/blocks.d.ts
+++ b/addons/docs/blocks.d.ts
@ -0,0 +1 @@
+export * from './dist/blocks.d';
--- a/addons/docs/docs/docspage.md
+++ b/addons/docs/docs/docspage.md
@ -173,7 +173,7 @@ import { addParameters } from '@storybook/vue';

 addParameters({
  docs: {
-    prepareForInline: storyFn => {
+    prepareForInline: (storyFn) => {
      const Story = toReact(storyFn());
      return <Story />;
    },
@ -185,7 +185,7 @@ With that function, anyone using the docs addon for `@storybook/vue` can make th

 ## More resources

- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md)
+- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md) / [Props](props-tables.md)
 - Framework-specific docs: [React](../react/README.md) / [Vue](../vue/README.md) / [Angular](../angular/README.md) / [Web components](../web-components/README.md) / [Ember](../ember/README.md)
 - Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/docs/faq.md
+++ b/addons/docs/docs/faq.md
@ -43,7 +43,7 @@ This is [Component Story Format (CSF)](https://medium.com/storybookjs/component-

 ## More resources

- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md)
+- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md) / [Props](props-tables.md)
 - Framework-specific docs: [React](../react/README.md) / [Vue](../vue/README.md) / [Angular](../angular/README.md) / [Web components](../web-components/README.md) / [Ember](../ember/README.md)
 - Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/docs/mdx.md
+++ b/addons/docs/docs/mdx.md
@ -194,7 +194,7 @@ Be sure to update your Storybook config file to load `.stories.mdx` stories, as

 ## More resources

- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md)
+- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md) / [Props](props-tables.md)
 - Framework-specific docs: [React](../react/README.md) / [Vue](../vue/README.md) / [Angular](../angular/README.md) / [Web components](../web-components/README.md) / [Ember](../ember/README.md)
 - Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/docs/media/args-controls.gif
+++ b/addons/docs/docs/media/args-controls.gif
--- a/addons/docs/docs/multiframework.md
+++ b/addons/docs/docs/multiframework.md
@ -88,7 +88,7 @@ import toReact from '@egoist/vue-to-react';
 addParameters({
  docs: {
    // `container`, `page`, etc. here
-    prepareForInline: storyFn => {
+    prepareForInline: (storyFn) => {
      const Story = toReact(storyFn());
      return <Story />;
    },
@ -100,7 +100,7 @@ The input is the story function, and the output is a React element, because we r

 ## More resources

- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md)
+- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md) / [Props](props-tables.md)
 - Framework-specific docs: [React](../react/README.md) / [Vue](../vue/README.md) / [Angular](../angular/README.md) / [Web components](../web-components/README.md) / [Ember](../ember/README.md)
 - Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/docs/props-tables.md
+++ b/addons/docs/docs/props-tables.md
@ -57,7 +57,7 @@ import { MyComponent } from './MyComponent';
 Starting in SB 6.0, the `Props` block has built-in controls (formerly known as "knobs") for editing stories dynamically.

 <center>
-  <img src="./media/props-tables-controls.png" width="100%" />
+  <img src="./media/args-controls.gif" width="100%" />
 </center>

 These controls are implemented appear automatically in the props table when your story accepts [Storybook Args](#https://github.com/storybookjs/storybook/blob/next/docs/src/pages/formats/component-story-format/index.md#args-story-inputs) as its input.
@ -251,7 +251,7 @@ SB Docs for Ember uses `yui-doc` for prop table information.

 ## More resources

- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md)
+- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md) / [Props](props-tables.md)
 - Framework-specific docs: [React](../react/README.md) / [Vue](../vue/README.md) / [Angular](../angular/README.md) / [Web components](../web-components/README.md) / [Ember](../ember/README.md)
 - Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/docs/recipes.md
+++ b/addons/docs/docs/recipes.md
@ -59,7 +59,7 @@ basic.story = {

 ```md
 import { Meta, Story } from '@storybook/addon-docs/blocks';
-import * as stories from './Button.stories.js';
+import \* as stories from './Button.stories.js';
 import { SomeComponent } from 'path/to/SomeComponent';

 <Meta title="Demo/Button" component={Button} />
@ -138,8 +138,8 @@ const loadFn = () => {
  const req = require.context('../src', true, /\.stories\.js$/);
  return req
    .keys()
-    .map(fname => req(fname))
-    .filter(exp => !!exp.default);
+    .map((fname) => req(fname))
+    .filter((exp) => !!exp.default);
 };

 configure(loadFn, module);
@ -269,7 +269,7 @@ These two methods are complementary. The former is useful for story-specific, an

 ## More resources

- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md)
+- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md) / [Props](props-tables.md)
 - Framework-specific docs: [React](../react/README.md) / [Vue](../vue/README.md) / [Angular](../angular/README.md) / [Web components](../web-components/README.md) / [Ember](../ember/README.md)
 - Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/docs/theming.md
+++ b/addons/docs/docs/theming.md
@ -91,7 +91,7 @@ addParameters({

 ## More resources

- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md)
+- References: [README](../README.md) / [DocsPage](docspage.md) / [MDX](mdx.md) / [FAQ](faq.md) / [Recipes](recipes.md) / [Theming](theming.md) / [Props](props-tables.md)
 - Framework-specific docs: [React](../react/README.md) / [Vue](../vue/README.md) / [Angular](../angular/README.md) / [Web components](../web-components/README.md) / [Ember](../ember/README.md)
 - Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/ember/README.md
+++ b/addons/docs/ember/README.md
@ -6,11 +6,12 @@ Storybook Docs transforms your Storybook stories into world-class component docu

 To learn more about Storybook Docs, read the [general documentation](../README.md). To learn the Ember specifics, read on!

- [Installation](#installation)
- [DocsPage](#docspage)
- [MDX](#mdx)
- [IFrame height](#iframe-height)
- [More resources](#more-resources)
+- [Storybook Docs for Ember](#storybook-docs-for-ember)
+  - [Installation](#installation)
+  - [DocsPage](#docspage)
+  - [MDX](#mdx)
+  - [IFrame height](#iframe-height)
+  - [More resources](#more-resources)

 ## Installation

@ -146,7 +147,6 @@ And for `MDX` you can modify it as an attribute on the `Story` element:

 Want to learn more? Here are some more articles on Storybook Docs:

- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md)
- Vision: [Storybook Docs sneak peak](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a)
- Announcement: [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf)
+- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md) / [Props](../docs/props-tables.md)
+- Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/package.json
+++ b/addons/docs/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-docs",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Superior documentation for your components",
  "keywords": [
    "addon",
@ -48,16 +48,16 @@
    "@mdx-js/loader": "^1.5.1",
    "@mdx-js/mdx": "^1.5.1",
    "@mdx-js/react": "^1.5.1",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
    "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-alpha.35",
-    "@storybook/postinstall": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/node-logger": "6.0.0-alpha.39",
+    "@storybook/postinstall": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "acorn": "^7.1.0",
    "acorn-jsx": "^5.1.0",
    "acorn-walk": "^7.0.0",
@ -83,8 +83,8 @@
    "@babel/core": "^7.8.4",
    "@emotion/core": "^10.0.20",
    "@emotion/styled": "^10.0.17",
-    "@storybook/react": "6.0.0-alpha.35",
-    "@storybook/web-components": "6.0.0-alpha.35",
+    "@storybook/react": "6.0.0-alpha.39",
+    "@storybook/web-components": "6.0.0-alpha.39",
    "@types/doctrine": "^0.0.3",
    "@types/enzyme": "^3.10.3",
    "@types/jest": "^25.1.1",
--- a/addons/docs/react/README.md
+++ b/addons/docs/react/README.md
@ -10,11 +10,12 @@ Storybook Docs transforms your Storybook stories into world-class component docu

 To learn more about Storybook Docs, read the [general documentation](../README.md). To learn the React specifics, read on!

- [Installation](#installation)
- [DocsPage](#docspage)
- [MDX](#mdx)
- [Inline stories](#inline-stories)
- [More resources](#more-resources)
+- [Storybook Docs for React](#storybook-docs-for-react)
+  - [Installation](#installation)
+  - [DocsPage](#docspage)
+  - [MDX](#mdx)
+  - [Inline Stories](#inline-stories)
+  - [More resources](#more-resources)

 ## Installation

@ -116,7 +117,6 @@ addParameters({

 Want to learn more? Here are some more articles on Storybook Docs:

- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md)
- Vision: [Storybook Docs sneak peak](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a)
- Announcement: [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf)
+- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md) / [Props](../docs/props-tables.md)
+- Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/src/blocks/Props.tsx
+++ b/addons/docs/src/blocks/Props.tsx
@ -1,6 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 import React, { FC, useContext, useEffect, useState, useCallback } from 'react';
 import mapValues from 'lodash/mapValues';
+import pickBy from 'lodash/pickBy';
 import {
  ArgsTable,
  ArgsTableProps,
@ -18,8 +19,11 @@ import { getComponentName } from './utils';
 import { ArgTypesExtractor } from '../lib/docgen/types';
 import { lookupStoryId } from './Story';

+type PropDescriptor = string[] | RegExp;
+
 interface BaseProps {
-  exclude?: string[];
+  include?: PropDescriptor;
+  exclude?: PropDescriptor;
 }

 type OfProps = BaseProps & {
@ -62,15 +66,18 @@ const useArgs = (storyId: string, storyStore: StoryStore): [Args, (args: Args) =
  return [args, updateArgs];
 };

-const filterArgTypes = (argTypes: ArgTypes, exclude?: string[]) => {
-  if (!exclude) {
+const matches = (name: string, descriptor: PropDescriptor) =>
+  Array.isArray(descriptor) ? descriptor.includes(name) : name.match(descriptor);
+
+const filterArgTypes = (argTypes: ArgTypes, include?: PropDescriptor, exclude?: PropDescriptor) => {
+  if (!include && !exclude) {
    return argTypes;
  }
  return (
    argTypes &&
-    mapValues(argTypes, (argType, key) => {
+    pickBy(argTypes, (argType, key) => {
      const name = argType.name || key;
-      return exclude.includes(name) ? undefined : argType;
+      return (!include || matches(name, include)) && (!exclude || !matches(name, exclude));
    })
  );
 };
@ -78,7 +85,8 @@ const filterArgTypes = (argTypes: ArgTypes, exclude?: string[]) => {
 export const extractComponentArgTypes = (
  component: Component,
  { parameters }: DocsContextProps,
-  exclude?: string[]
+  include?: PropDescriptor,
+  exclude?: PropDescriptor
 ): ArgTypes => {
  const params = parameters || {};
  const { extractArgTypes }: { extractArgTypes: ArgTypesExtractor } = params.docs || {};
@ -86,7 +94,7 @@ export const extractComponentArgTypes = (
    throw new Error(ArgsTableError.ARGS_UNSUPPORTED);
  }
  let argTypes = extractArgTypes(component);
-  argTypes = filterArgTypes(argTypes, exclude);
+  argTypes = filterArgTypes(argTypes, include, exclude);

  return argTypes;
 };
@ -110,11 +118,12 @@ const addComponentTabs = (
  tabs: Record<string, ArgsTableProps>,
  components: Record<string, Component>,
  context: DocsContextProps,
-  exclude?: string[]
+  include?: PropDescriptor,
+  exclude?: PropDescriptor
 ) => ({
  ...tabs,
  ...mapValues(components, (comp) => ({
-    rows: extractComponentArgTypes(comp, context, exclude),
+    rows: extractComponentArgTypes(comp, context, include, exclude),
  })),
 });

@ -125,7 +134,7 @@ export const StoryTable: FC<StoryProps & { components: Record<string, Component>
    parameters: { argTypes },
    storyStore,
  } = context;
-  const { story, showComponents, components, exclude } = props;
+  const { story, showComponents, components, include, exclude } = props;
  let storyArgTypes;
  try {
    let storyId;
@ -137,14 +146,14 @@ export const StoryTable: FC<StoryProps & { components: Record<string, Component>
      const data = storyStore.fromId(storyId);
      storyArgTypes = data.parameters.argTypes;
    }
-    storyArgTypes = filterArgTypes(storyArgTypes, exclude);
+    storyArgTypes = filterArgTypes(storyArgTypes, include, exclude);
    const [args, updateArgs] = useArgs(storyId, storyStore);
    let tabs = { Story: { rows: storyArgTypes, args, updateArgs } } as Record<
      string,
      ArgsTableProps
    >;
    if (showComponents) {
-      tabs = addComponentTabs(tabs, components, context, exclude);
+      tabs = addComponentTabs(tabs, components, context, include, exclude);
    }

    return <TabbedArgsTable tabs={tabs} />;
@ -155,9 +164,9 @@ export const StoryTable: FC<StoryProps & { components: Record<string, Component>

 export const ComponentsTable: FC<ComponentsProps> = (props) => {
  const context = useContext(DocsContext);
-  const { components, exclude } = props;
+  const { components, include, exclude } = props;

-  const tabs = addComponentTabs({}, components, context, exclude);
+  const tabs = addComponentTabs({}, components, context, include, exclude);
  return <TabbedArgsTable tabs={tabs} />;
 };

@ -167,7 +176,7 @@ export const Props: FC<PropsProps> = (props) => {
    parameters: { subcomponents },
  } = context;

-  const { exclude, components } = props as ComponentsProps;
+  const { include, exclude, components } = props as ComponentsProps;
  const { story } = props as StoryProps;

  let allComponents = components;
@ -185,14 +194,14 @@ export const Props: FC<PropsProps> = (props) => {
  if (!components && !subcomponents) {
    let mainProps;
    try {
-      mainProps = { rows: extractComponentArgTypes(main, context, exclude) };
+      mainProps = { rows: extractComponentArgTypes(main, context, include, exclude) };
    } catch (err) {
      mainProps = { error: err.message };
    }
    return <ArgsTable {...mainProps} />;
  }

-  return <ComponentsTable exclude={exclude} components={allComponents} />;
+  return <ComponentsTable {...(props as ComponentsProps)} components={allComponents} />;
 };

 Props.defaultProps = {
--- a/addons/docs/src/frameworks/vue/config.tsx
+++ b/addons/docs/src/frameworks/vue/config.tsx
@ -7,6 +7,7 @@ import { extractComponentDescription } from '../../lib/docgen';

 addParameters({
  docs: {
+    inlineStories: true,
    prepareForInline: (storyFn: StoryFn) => {
      const Story = toReact(storyFn());
      return <Story />;
--- a/addons/docs/vue/README.md
+++ b/addons/docs/vue/README.md
@ -10,11 +10,13 @@ Storybook Docs transforms your Storybook stories into world-class component docu

 To learn more about Storybook Docs, read the [general documentation](../README.md). To learn the Vue specifics, read on!

- [Installation](#installation)
- [DocsPage](#docspage)
- [MDX](#mdx)
- [Inline stories](#inline-stories)
- [More resources](#more-resources)
+- [Storybook Docs for Vue](#storybook-docs-for-vue)
+  - [Installation](#installation)
+  - [Preset options](#preset-options)
+  - [DocsPage](#docspage)
+  - [MDX](#mdx)
+  - [Inline Stories](#inline-stories)
+  - [More resources](#more-resources)

 ## Installation

@ -131,7 +133,7 @@ Yes, it's redundant to declare `component` twice. [Coming soon](https://github.c

 Storybook Docs renders all Vue stories inside IFrames, with a default height of `60px` (configurable using the `docs.iframeHeight` story parameter).

-Starting in 5.3, you can also render stories inline, and in 6.0 this will become the default behavior. To render inline, update `.storybook/preview.js`:
+Starting in 5.3, you can also render stories inline, and in 6.0 this has become the default behavior. To render inline, update `.storybook/preview.js`:

 ```js
 import { addParameters } from '@storybook/vue';
@ -147,7 +149,6 @@ addParameters({

 Want to learn more? Here are some more articles on Storybook Docs:

- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md)
- Vision: [Storybook Docs sneak peak](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a)
- Announcement: [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf)
+- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md) / [Props](../docs/props-tables.md)
+- Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
 - Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/docs/web-components/README.md
+++ b/addons/docs/web-components/README.md
@ -92,3 +92,11 @@ or add it to individual stories.
 ```js
 <Story inline={false} />
 ```
+
+## More resources
+
+Want to learn more? Here are some more articles on Storybook Docs:
+
+- References: [DocsPage](../docs/docspage.md) / [MDX](../docs/mdx.md) / [FAQ](../docs/faq.md) / [Recipes](../docs/recipes.md) / [Theming](../docs/theming.md) / [Props](../docs/props-tables.md)
+- Announcements: [Vision](https://medium.com/storybookjs/storybook-docs-sneak-peak-5be78445094a) / [DocsPage](https://medium.com/storybookjs/storybook-docspage-e185bc3622bf) / [MDX](https://medium.com/storybookjs/rich-docs-with-storybook-mdx-61bc145ae7bc) / [Framework support](https://medium.com/storybookjs/storybook-docs-for-new-frameworks-b1f6090ee0ea)
+- Example: [Storybook Design System](https://github.com/storybookjs/design-system)
--- a/addons/essentials/package.json
+++ b/addons/essentials/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-essentials",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Curated addons to bring out the best of Storybook",
  "keywords": [
    "addon",
@ -28,11 +28,11 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/node-logger": "6.0.0-alpha.35",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/node-logger": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "regenerator-runtime": "^0.13.3",
    "ts-dedent": "^1.1.1"
--- a/addons/events/package.json
+++ b/addons/events/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-events",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Add events to your Storybook stories.",
  "keywords": [
    "addon",
@ -31,11 +31,11 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "format-json": "^1.0.3",
    "lodash": "^4.17.15",
--- a/addons/google-analytics/package.json
+++ b/addons/google-analytics/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-google-analytics",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook addon for google analytics",
  "keywords": [
    "addon",
@ -20,8 +20,8 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "react-ga": "^2.5.7",
--- a/addons/graphql/package.json
+++ b/addons/graphql/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-graphql",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook addon to display the GraphiQL IDE",
  "keywords": [
    "addon",
@ -30,8 +30,8 @@
  },
  "dependencies": {
    "@babel/plugin-transform-classes": "^7.9.2",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "graphiql": "^0.17.5",
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-jest",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "React storybook addon that show component jest report",
  "keywords": [
    "addon",
@ -35,11 +35,11 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "react": "^16.8.3",
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-knobs",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook Addon Prop Editor Component",
  "keywords": [
    "addon",
@ -29,13 +29,13 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/channels": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/channels": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "@types/react-color": "^3.0.1",
    "copy-to-clipboard": "^3.0.8",
    "core-js": "^3.0.1",
--- a/addons/links/package.json
+++ b/addons/links/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-links",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Story Links addon for storybook",
  "keywords": [
    "addon",
@ -29,11 +29,11 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
    "@storybook/csf": "0.0.1",
-    "@storybook/router": "6.0.0-alpha.35",
+    "@storybook/router": "6.0.0-alpha.39",
    "@types/qs": "^6.9.0",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
--- a/addons/queryparams/README.md
+++ b/addons/queryparams/README.md
@ -1,6 +1,6 @@
 # storybook-addon-queryparams

-This storybook addon can be helpful if your components need special query parameters to work the way you want them.
+This storybook addon can be helpful if your components need special query parameters to work the way you want them to. It allows you to mock query params per story so that you can easily reproduce different states of your component.

 ## Getting started

@ -10,7 +10,7 @@ First, install the addon.
 $ yarn add @storybook/addon-queryparams --dev
 ```

-Add this line to your `main.js` file (create this file inside your storybook config directory if needed).
+Register it by adding it in the addons attribute in your `main.js` file (create this file inside your storybook config directory if needed).

 ```js
 module.exports = {
@ -18,6 +18,34 @@ module.exports = {
 };
 ```

+In your story, add the `withQuery` decorator and define the query parameters you want to mock:
+
+```js
+import React from 'react';
+import { Button } from '@storybook/react/demo';
+import { withQuery } from '@storybook/addon-queryparams';
+
+export default {
+  title: 'Button',
+  component: Button,
+  decorators: [withQuery],
+  parameters: {
+    query: {
+      mock: 'Hello world!',
+    },
+  },
+};
+
+export const WithMockedSearch = () => {
+  const urlParams = new URLSearchParams(document.location.search);
+  const mockedParam = urlParams.get('mock');
+  return <div>Mocked value: {mockedParam}</div>;
+};
+```
+
+<details>
+  <summary>Example with storiesOf API</summary>
+
 ```js
 import React from 'react';
 import { storiesOf } from '@storybook/react';
@ -25,12 +53,14 @@ import { storiesOf } from '@storybook/react';
 storiesOf('button', module)
  .addParameters({
    query: {
-      mock: true,
-    }
+      mock: 'Hello World!',
+    },
  })
-  .add('Prints the document.search', () => (
-    <div>
-      This is the current document.search: {document.search}, it includes `mock`!
-    </div>
-  ));
+  .add('Prints the mocked parameter', () => {
+    const urlParams = new URLSearchParams(document.location.search);
+    const mockedParam = urlParams.get('mock');
+    return <div>Mocked value: {mockedParam}</div>;
+  });
 ```
+
+</details>
--- a/addons/queryparams/package.json
+++ b/addons/queryparams/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-queryparams",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "parameter addon for storybook",
  "keywords": [
    "addon",
@ -30,12 +30,12 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "qs": "^6.6.0",
--- a/addons/storyshots/storyshots-core/package.json
+++ b/addons/storyshots/storyshots-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-storyshots",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
  "keywords": [
    "addon",
@ -33,9 +33,9 @@
  },
  "dependencies": {
    "@jest/transform": "^25.2.4",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "@types/glob": "^7.1.1",
    "@types/jest": "^25.1.1",
    "@types/jest-specific-snapshot": "^0.5.3",
@ -50,8 +50,8 @@
    "ts-dedent": "^1.1.1"
  },
  "devDependencies": {
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/react": "6.0.0-alpha.35",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/react": "6.0.0-alpha.39",
    "babel-loader": "^8.0.6",
    "enzyme": "^3.11.0",
    "enzyme-to-json": "^3.4.1",
--- a/addons/storyshots/storyshots-puppeteer/package.json
+++ b/addons/storyshots/storyshots-puppeteer/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-storyshots-puppeteer",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Image snapshots addition to StoryShots based on puppeteer",
  "keywords": [
    "addon",
@ -30,7 +30,7 @@
  },
  "dependencies": {
    "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-alpha.35",
+    "@storybook/node-logger": "6.0.0-alpha.39",
    "@types/jest-image-snapshot": "^2.8.0",
    "@wordpress/jest-puppeteer-axe": "^1.5.0",
    "core-js": "^3.0.1",
@ -42,7 +42,7 @@
    "@types/puppeteer": "^2.0.0"
  },
  "peerDependencies": {
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
    "puppeteer": "^1.12.2 || ^2.0.0"
  },
  "peerDependenciesMeta": {
--- a/addons/storysource/package.json
+++ b/addons/storysource/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-storysource",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Stories addon for storybook",
  "keywords": [
    "addon",
@ -29,13 +29,13 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/router": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/router": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "estraverse": "^4.2.0",
    "loader-utils": "^2.0.0",
--- a/addons/toolbars/package.json
+++ b/addons/toolbars/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-toolbars",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook toolbars addon",
  "keywords": [
    "addon",
@ -30,10 +30,10 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35"
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39"
  },
  "peerDependencies": {
    "react": "*"
--- a/addons/viewport/package.json
+++ b/addons/viewport/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-viewport",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook addon to change the viewport size to mobile",
  "keywords": [
    "addon",
@ -29,12 +29,12 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "memoizerific": "^1.11.3",
--- a/app/angular/package.json
+++ b/app/angular/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/angular",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -34,9 +34,9 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
-    "@storybook/node-logger": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
+    "@storybook/node-logger": "6.0.0-alpha.39",
    "@types/webpack-env": "^1.15.1",
    "core-js": "^3.0.1",
    "fork-ts-checker-webpack-plugin": "^4.0.3",
--- a/app/ember/package.json
+++ b/app/ember/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/ember",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.",
  "homepage": "https://github.com/storybookjs/storybook/tree/master/app/ember",
  "bugs": {
@ -32,7 +32,7 @@
  },
  "dependencies": {
    "@ember/test-helpers": "^1.7.0",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/core": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "regenerator-runtime": "^0.13.3",
--- a/app/html/package.json
+++ b/app/html/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/html",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -34,8 +34,8 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "@types/webpack-env": "^1.15.1",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
--- a/app/marionette/package.json
+++ b/app/marionette/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/marionette",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Marionette: Develop Marionette.js component in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -25,7 +25,7 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/core": "6.0.0-alpha.39",
    "common-tags": "^1.8.0",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
--- a/app/marko/package.json
+++ b/app/marko/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/marko",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Marko: Develop Marko Component in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -34,8 +34,8 @@
  },
  "dependencies": {
    "@marko/webpack": "^2.1.0",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "regenerator-runtime": "^0.13.3",
--- a/app/mithril/package.json
+++ b/app/mithril/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/mithril",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Mithril: Develop Mithril Component in isolation.",
  "keywords": [
    "storybook"
@ -36,8 +36,8 @@
  "dependencies": {
    "@babel/core": "^7.8.4",
    "@babel/plugin-transform-react-jsx": "^7.3.0",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "@types/mithril": "^2.0.0",
    "@types/webpack-env": "^1.15.1",
    "core-js": "^3.0.1",
--- a/app/preact/package.json
+++ b/app/preact/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/preact",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Preact: Develop Preact Component in isolation.",
  "keywords": [
    "storybook"
@ -35,8 +35,8 @@
  },
  "dependencies": {
    "@babel/plugin-transform-react-jsx": "^7.3.0",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "@types/webpack-env": "^1.15.1",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
--- a/app/rax/package.json
+++ b/app/rax/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/rax",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Rax: Develop Rax Component in isolation.",
  "keywords": [
    "rax",
@ -34,7 +34,7 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/core": "6.0.0-alpha.39",
    "babel-preset-rax": "^1.0.0-beta.0",
    "core-js": "^3.0.1",
    "driver-dom": "^2.0.0",
--- a/app/react/package.json
+++ b/app/react/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/react",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -37,9 +37,9 @@
    "@babel/plugin-transform-react-constant-elements": "^7.6.3",
    "@babel/preset-flow": "^7.0.0",
    "@babel/preset-react": "^7.0.0",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
-    "@storybook/node-logger": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
+    "@storybook/node-logger": "6.0.0-alpha.39",
    "@svgr/webpack": "^5.1.0",
    "@types/webpack-env": "^1.15.1",
    "babel-plugin-add-react-displayname": "^0.0.5",
@ -57,7 +57,7 @@
    "webpack": "^4.33.0"
  },
  "devDependencies": {
-    "@storybook/client-api": "6.0.0-alpha.35",
+    "@storybook/client-api": "6.0.0-alpha.39",
    "@types/mini-css-extract-plugin": "^0.9.0",
    "@types/node": "^13.9.5",
    "@types/webpack": "^4.41.9"
--- a/app/react/src/server/framework-preset-cra.ts
+++ b/app/react/src/server/framework-preset-cra.ts
@ -15,7 +15,7 @@ const checkForNewPreset = (presetsList: Preset[]) => {
  if (!hasNewPreset) {
    logger.warn('Storybook support for Create React App is now a separate preset.');
    logger.warn(
-      'To get started with the new preset, simply add `@storybook/preset-create-react-app` to your project.'
+      'To use the new preset, add `@storybook/preset-create-react-app` to the list of `addons` in your `.storybook/main.js` config file.'
    );
    logger.warn('The built-in preset will be disabled in Storybook 6.0.');
    return false;
--- a/app/riot/package.json
+++ b/app/riot/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/riot",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for riot.js: View riot snippets in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -34,7 +34,7 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/core": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "raw-loader": "^4.0.0",
--- a/app/server/package.json
+++ b/app/server/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/server",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -34,8 +34,8 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "@storybook/node-logger": "^5.2.8",
    "@types/webpack-env": "^1.13.9",
    "core-js": "^3.0.1",
--- a/app/server/src/lib/compiler/testfixtures/knobs.json
+++ b/app/server/src/lib/compiler/testfixtures/knobs.json
@ -12,7 +12,24 @@
      },
      "knobs": [
        { "type": "text", "name": "Name", "value": "John Doe", "param": "name"},
-        { "type": "number", "name": "Age", "value": 44, "param": "age"}
+        { "type": "date", "name": "Birthday", "value": "1960-12-25T00:42:03.600Z", "param": "birthday"},
+        { "type": "color", "name": "Favorite Color", "value": "red", "param": "favorite_color"},
+        { "type": "boolean", "name": "Active", "value": true, "param": "active"},
+        { "type": "number", "name": "Pets", "value": 2, "param": "pets"},
+        { "type": "array", "name": "Sports", "value": ["football", "baseball"], "param": "sports"},
+          { 
+            "type": "select",
+            "name": "Favorite Food",
+            "value": "Ice Cream",
+            "options": {
+              "hot_dog": "Hot Dog",
+              "pizza": "Pizza",
+              "burgers": "Burgers",
+              "ice_cream": "Ice Cream"
+            },
+            "param": "favorite_food"
+          },
+        { "type": "object", "name": "Other Things", "value": {"hair": "Brown", "eyes": "Blue"}, "param": "other_thinkgs"}
      ]
    }
  ]
--- a/app/server/src/lib/compiler/testfixtures/knobs.snapshot
+++ b/app/server/src/lib/compiler/testfixtures/knobs.snapshot
@ -18,7 +18,24 @@ export default {
 export const Simple = () => {
  return {
    name: text('Name', 'John Doe'),
-    age: number('Age', 44, {}),
+    birthday: new Date(date('Birthday', new Date('1960-12-25T00:42:03.600Z'))).toISOString(),
+    favorite_color: color('Favorite Color', 'red'),
+    active: boolean('Active', true),
+    pets: number('Pets', 2, {}),
+    sports: array('Sports', [
+      'football',
+      'baseball'
+    ], ',').join(','),
+    favorite_food: select('Favorite Food', {
+      hot_dog: 'Hot Dog',
+      pizza: 'Pizza',
+      burgers: 'Burgers',
+      ice_cream: 'Ice Cream'
+    }, 'Ice Cream'),
+    other_thinkgs: JSON.stringify(object('Other Things', {
+      hair: 'Brown',
+      eyes: 'Blue'
+    })),
  };
 };
 Simple.story = {
--- a/app/server/src/lib/compiler/decorators/knobs.ts
+++ b/app/server/src/lib/compiler/decorators/knobs.ts
@ -27,14 +27,16 @@ function stringifyKnob(knob: StoryKnob) {
        return `number('${name}', ${stringifiedValue}, ${stringifyObject(opts, level)})`;
      case 'color':
        return `color('${name}', ${stringifiedValue})`;
-      case 'array':
-        return `array('${name}', ${stringifiedValue}).join(',')`;
+      case 'array': {
+        const separator = opts.separator || ',';
+        return `array('${name}', ${stringifiedValue}, '${separator}').join('${separator}')`;
+      }
      case 'boolean':
        return `boolean('${name}', ${stringifiedValue})`;
      case 'object':
-        return `object('${name}', ${stringifiedValue})`;
+        return `JSON.stringify(object('${name}', ${stringifiedValue}))`;
      case 'date':
-        return `date('${name}', new Date(${stringifiedValue}))`;
+        return `new Date(date('${name}', new Date(${stringifiedValue}))).toISOString()`;
      case 'select':
        return `select('${name}', ${stringifyObject(opts.options, level)}, ${stringifiedValue})`;
      default:
--- a/app/svelte/package.json
+++ b/app/svelte/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/svelte",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -34,8 +34,8 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "regenerator-runtime": "^0.13.3",
--- a/app/vue/package.json
+++ b/app/vue/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/vue",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
  "keywords": [
    "storybook"
@ -34,8 +34,8 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "@types/webpack-env": "^1.15.1",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
--- a/app/web-components/package.json
+++ b/app/web-components/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/web-components",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.",
  "keywords": [
    "lit-html",
@ -38,8 +38,8 @@
  "dependencies": {
    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
    "@babel/plugin-syntax-import-meta": "^7.2.0",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
    "@types/webpack-env": "^1.15.1",
    "babel-plugin-bundled-import-meta": "^0.3.1",
    "core-js": "^3.0.1",
--- a/dev-kits/addon-decorator/package.json
+++ b/dev-kits/addon-decorator/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-decorator",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "decorator addon for storybook",
  "keywords": [
    "addon",
@ -24,8 +24,8 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.4.0"
  },
--- a/dev-kits/addon-parameter/package.json
+++ b/dev-kits/addon-parameter/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-parameter",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "parameter addon for storybook",
  "keywords": [
    "addon",
@ -24,12 +24,12 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "react": "^16.8.3",
--- a/dev-kits/addon-preview-wrapper/package.json
+++ b/dev-kits/addon-preview-wrapper/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-preview-wrapper",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "preview wrapper addon for storybook",
  "keywords": [
    "addon",
@ -24,7 +24,7 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
    "react": "^16.8.3"
  },
  "publishConfig": {
--- a/dev-kits/addon-roundtrip/package.json
+++ b/dev-kits/addon-roundtrip/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-roundtrip",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "roundtrip addon for storybook",
  "keywords": [
    "addon",
@ -24,13 +24,13 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "react": "^16.8.3",
--- a/docs/src/versions/next.json
+++ b/docs/src/versions/next.json
@ -1 +1 @@
-{"version":"6.0.0-alpha.35","info":{"plain":"### Bug Fixes\n\n- Core: Fix static build with DLL ([#10377](https://github.com/storybookjs/storybook/pull/10377))\n- Addon-Docs: Fix Args table generation for story with no component ([#10436](https://github.com/storybookjs/storybook/pull/10436))\n\n### Maintenance\n\n- Yarn 2: Fix compatibility with `.storybook/preview.js` file ([#10342](https://github.com/storybookjs/storybook/pull/10342))\n- Official-storybook: Fix passArgsFirst problems ([#10432](https://github.com/storybookjs/storybook/pull/10432))"}}
+{"version":"6.0.0-alpha.39","info":{"plain":"### Breaking Changes\n\n- Addon-docs: Inline stories in Vue by default ([#10463](https://github.com/storybookjs/storybook/pull/10463))\n\n### Features\n\n- Addon-docs: Provide better props include/exclude features ([#10464](https://github.com/storybookjs/storybook/pull/10464))\n- UI: Improve loading state ([#10444](https://github.com/storybookjs/storybook/pull/10444))\n\n### Bug Fixes\n\n- UI: Fix bad shortcutpage layout ([#10445](https://github.com/storybookjs/storybook/pull/10445))"}}
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "angular-cli",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "license": "MIT",
  "scripts": {
@ -37,18 +37,18 @@
    "@angular/cli": "^9.1.0",
    "@angular/compiler-cli": "^9.1.0",
    "@compodoc/compodoc": "^1.1.11",
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/addon-jest": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/angular": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/addon-jest": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/angular": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
    "@types/core-js": "^2.5.0",
    "@types/jest": "^25.1.1",
    "@types/node": "^13.9.5",
--- a/examples/angular-cli/src/stories/snapshots/core.stories.storyshot
+++ b/examples/angular-cli/src/stories/snapshots/core.stories.storyshot
@ -12,7 +12,16 @@ exports[`Storyshots Core/Parameters passed to story 1`] = `
    <button
      _ngcontent-a-c17=""
    >
-      Parameters are {"docs":{"iframeHeight":"60px"},"globalParameter":"globalParameter","framework":"angular","chapterParameter":"chapterParameter","storyParameter":"storyParameter","__id":"core-parameters--passed-to-story"}
+      Parameters are {
+    "docs": {
+      "iframeHeight": "60px"
+    },
+    "globalParameter": "globalParameter",
+    "framework": "angular",
+    "chapterParameter": "chapterParameter",
+    "storyParameter": "storyParameter",
+    "__id": "core-parameters--passed-to-story"
+  }
    </button>
  </storybook-button-component>
 </storybook-dynamic-app-root>
--- a/examples/angular-cli/src/stories/core.stories.ts
+++ b/examples/angular-cli/src/stories/core.stories.ts
@ -17,7 +17,7 @@ export default {
 export const PassedToStory = ({ parameters: { fileName, ...parameters } }) => ({
  component: Button,
  props: {
-    text: `Parameters are ${JSON.stringify(parameters)}`,
+    text: `Parameters are ${JSON.stringify(parameters, null, 2)}`,
    onClick: () => 0,
  },
 });
--- a/examples/cra-kitchen-sink/package.json
+++ b/examples/cra-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "cra-kitchen-sink",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "react-scripts build",
@ -18,19 +18,19 @@
    "react-lifecycles-compat": "^3.0.4"
  },
  "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/addon-events": "6.0.0-alpha.35",
-    "@storybook/addon-jest": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/react": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/addon-events": "6.0.0-alpha.39",
+    "@storybook/addon-jest": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/react": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "react-scripts": "^3.0.1"
  },
  "storybook": {
--- a/examples/cra-react15/package.json
+++ b/examples/cra-react15/package.json
@ -1,6 +1,6 @@
 {
  "name": "cra-react15",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "react-scripts build",
@ -18,11 +18,11 @@
    "react-scripts": "3.0.1"
  },
  "devDependencies": {
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/react": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/react": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "babel-core": "6",
    "babel-runtime": "6"
  },
--- a/examples/cra-ts-essentials/package.json
+++ b/examples/cra-ts-essentials/package.json
@ -1,6 +1,6 @@
 {
  "name": "cra-ts-essentials",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "react-scripts build",
@ -34,10 +34,10 @@
    "typescript": "3.8.3"
  },
  "devDependencies": {
-    "@storybook/addon-essentials": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
+    "@storybook/addon-essentials": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
    "@storybook/preset-create-react-app": "^2.1.1",
-    "@storybook/react": "6.0.0-alpha.35"
+    "@storybook/react": "6.0.0-alpha.39"
  },
  "storybook": {
    "chromatic": {
--- 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": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "react-scripts build",
@ -34,13 +34,13 @@
    "typescript": "3.8.3"
  },
  "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
    "@storybook/preset-create-react-app": "^2.1.1",
-    "@storybook/react": "6.0.0-alpha.35",
+    "@storybook/react": "6.0.0-alpha.39",
    "@types/enzyme": "^3.9.0",
    "enzyme": "^3.9.0",
    "enzyme-adapter-react-16": "^1.9.1",
--- a/examples/dev-kits/package.json
+++ b/examples/dev-kits/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/example-devkits",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
@ -8,18 +8,18 @@
    "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ --no-dll"
  },
  "devDependencies": {
-    "@storybook/addon-decorator": "6.0.0-alpha.35",
-    "@storybook/addon-parameter": "6.0.0-alpha.35",
-    "@storybook/addon-preview-wrapper": "6.0.0-alpha.35",
-    "@storybook/addon-roundtrip": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/node-logger": "6.0.0-alpha.35",
-    "@storybook/react": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addon-decorator": "6.0.0-alpha.39",
+    "@storybook/addon-parameter": "6.0.0-alpha.39",
+    "@storybook/addon-preview-wrapper": "6.0.0-alpha.39",
+    "@storybook/addon-roundtrip": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/node-logger": "6.0.0-alpha.39",
+    "@storybook/react": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "cors": "^2.8.5",
    "cross-env": "^7.0.0",
    "enzyme-to-json": "^3.4.1",
--- a/examples/ember-cli/package.json
+++ b/examples/ember-cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "ember-example",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "ember build --output-path ember-output",
@ -16,18 +16,18 @@
  "devDependencies": {
    "@babel/core": "^7.8.4",
    "@ember/optional-features": "^1.3.0",
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/ember": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/ember": "6.0.0-alpha.39",
    "@storybook/ember-cli-storybook": "^0.2.1",
-    "@storybook/source-loader": "6.0.0-alpha.35",
+    "@storybook/source-loader": "6.0.0-alpha.39",
    "babel-loader": "^8",
    "broccoli-asset-rev": "^3.0.0",
    "cross-env": "^7.0.0",
--- a/examples/html-kitchen-sink/package.json
+++ b/examples/html-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "html-kitchen-sink",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "description": "",
  "keywords": [],
@ -13,23 +13,23 @@
    "storybook": "start-storybook -p 9006"
  },
  "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/addon-events": "6.0.0-alpha.35",
-    "@storybook/addon-jest": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/html": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/addon-events": "6.0.0-alpha.39",
+    "@storybook/addon-jest": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/html": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
    "eventemitter3": "^4.0.0",
    "format-json": "^1.0.3",
    "global": "^4.3.2",
--- a/examples/marko-cli/package.json
+++ b/examples/marko-cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "marko-cli",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "description": "Demo of how to build an app using marko-starter",
  "repository": {
@ -23,13 +23,13 @@
    "marko-starter": "^2.1.0"
  },
  "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/marko": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/marko": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
    "prettier": "^2.0.2",
    "webpack": "^4.33.0"
  },
--- a/examples/mithril-kitchen-sink/package.json
+++ b/examples/mithril-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "mithril-example",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build-storybook": "build-storybook",
@ -10,17 +10,17 @@
    "mithril": "^1.1.6"
  },
  "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/mithril": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/mithril": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
    "webpack": "^4.33.0"
  },
  "storybook": {
--- a/examples/official-storybook/package.json
+++ b/examples/official-storybook/package.json
@ -1,6 +1,6 @@
 {
  "name": "official-storybook",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
@ -14,32 +14,32 @@
  },
  "devDependencies": {
    "@packtracker/webpack-plugin": "^2.0.1",
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-contexts": "6.0.0-alpha.35",
-    "@storybook/addon-cssresources": "6.0.0-alpha.35",
-    "@storybook/addon-design-assets": "6.0.0-alpha.35",
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/addon-events": "6.0.0-alpha.35",
-    "@storybook/addon-graphql": "6.0.0-alpha.35",
-    "@storybook/addon-jest": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-queryparams": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots-puppeteer": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-toolbars": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/cli": "6.0.0-alpha.35",
-    "@storybook/components": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/node-logger": "6.0.0-alpha.35",
-    "@storybook/react": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-contexts": "6.0.0-alpha.39",
+    "@storybook/addon-cssresources": "6.0.0-alpha.39",
+    "@storybook/addon-design-assets": "6.0.0-alpha.39",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/addon-events": "6.0.0-alpha.39",
+    "@storybook/addon-graphql": "6.0.0-alpha.39",
+    "@storybook/addon-jest": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-queryparams": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots-puppeteer": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-toolbars": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/cli": "6.0.0-alpha.39",
+    "@storybook/components": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/node-logger": "6.0.0-alpha.39",
+    "@storybook/react": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "cors": "^2.8.5",
    "cross-env": "^7.0.0",
    "enzyme-to-json": "^3.4.1",
--- a/examples/official-storybook/stories/addon-docs/props-include-exclude.stories.mdx
+++ b/examples/official-storybook/stories/addon-docs/props-include-exclude.stories.mdx
@ -0,0 +1,24 @@
+import { Props, Meta } from '@storybook/addon-docs/blocks';
+import { DocgenButton } from '../../components/DocgenButton';
+
+<Meta title="Addons/Docs/IncludeExclude" />
+
+## Include
+
+### Array
+
+<Props of={DocgenButton} include={['disabled', 'label']} />
+
+### Regex
+
+<Props of={DocgenButton} include={/^o.*/} />
+
+## Exclude
+
+### Regex
+
+<Props of={DocgenButton} exclude={/^o.*|^...$/} />
+
+## Mixed
+
+<Props of={DocgenButton} include={/^o.*/} exclude={['one', 'obj']} />
--- a/examples/official-storybook/stories/core/parameters.stories.js
+++ b/examples/official-storybook/stories/core/parameters.stories.js
@ -15,7 +15,10 @@ export default {
 // I'm not sure what we should recommend regarding propTypes? are they a good idea for examples?
 // Given we sort of control the props, should we export a prop type?
 export const Passed = (_args, { parameters: { options, fileName, ...parameters }, ...rest }) => (
-  <pre>Parameters: {JSON.stringify(parameters, null, 2)}</pre>
+  <div>
+    Parameters:
+    <pre>{JSON.stringify(parameters, null, 2)}</pre>
+  </div>
 );
 Passed.story = {
  name: 'passed to story',
--- a/examples/preact-kitchen-sink/package.json
+++ b/examples/preact-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "preact-example",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@ -15,18 +15,18 @@
  "devDependencies": {
    "@babel/core": "^7.8.4",
    "@babel/plugin-transform-runtime": "^7.2.0",
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-contexts": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/preact": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-contexts": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/preact": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
    "babel-loader": "^8.0.4",
    "cross-env": "^7.0.0",
    "file-loader": "^6.0.0",
--- a/examples/rax-kitchen-sink/package.json
+++ b/examples/rax-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "rax-kitchen-sink",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "build-scripts build",
@ -20,20 +20,20 @@
  "devDependencies": {
    "@alib/build-scripts": "^0.1.8",
    "@babel/preset-react": "^7.7.4",
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-events": "6.0.0-alpha.35",
-    "@storybook/addon-jest": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/rax": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-events": "6.0.0-alpha.39",
+    "@storybook/addon-jest": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/rax": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "babel-eslint": "^10.0.3",
    "build-plugin-rax-app": "^0.2.0",
    "stylesheet-loader": "^0.8.0"
--- a/examples/riot-kitchen-sink/package.json
+++ b/examples/riot-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "riot-example",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@ -15,17 +15,17 @@
  },
  "devDependencies": {
    "@babel/core": "^7.8.4",
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/riot": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/riot": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
    "babel-loader": "^8.0.4",
    "cross-env": "^7.0.0",
    "file-loader": "^6.0.0",
--- a/examples/riot-kitchen-sink/src/stories/snapshots/core.stories.storyshot
+++ b/examples/riot-kitchen-sink/src/stories/snapshots/core.stories.storyshot
@ -6,7 +6,18 @@ exports[`Storyshots Core/Parameters passed to story 1`] = `
  id="root"
 >
  <div>
-    Parameters are {"globalParameter":"globalParameter","framework":"riot","chapterParameter":"chapterParameter","__id":"core-parameters--passed-to-story","storyParameter":"storyParameter","id":"root","dataIs":"parameters"}
+    Parameters are 
+    <pre>
+      {
+  "globalParameter": "globalParameter",
+  "framework": "riot",
+  "chapterParameter": "chapterParameter",
+  "__id": "core-parameters--passed-to-story",
+  "storyParameter": "storyParameter",
+  "id": "root",
+  "dataIs": "parameters"
+}
+    </pre>
  </div>
 </div>
 `;
--- a/examples/riot-kitchen-sink/src/stories/core.stories.js
+++ b/examples/riot-kitchen-sink/src/stories/core.stories.js
@ -4,7 +4,13 @@ const globalParameter = 'globalParameter';
 const chapterParameter = 'chapterParameter';
 const storyParameter = 'storyParameter';

-tag('parameters', '<div>Parameters are {JSON.stringify (this.opts)}</div>', '', '', () => {});
+tag(
+  'parameters',
+  '<div>Parameters are <pre>{JSON.stringify(this.opts, null, 2)}</pre></div>',
+  '',
+  '',
+  () => {}
+);

 addParameters({ globalParameter });

--- a/examples/server-kitchen-sink/package.json
+++ b/examples/server-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "server-kitchen-sink",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "description": "",
  "keywords": [],
@ -14,13 +14,13 @@
    "storybook": "SERVER_PORT=1137 start-storybook -p 9006 --quiet"
  },
  "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/node-logger": "6.0.0-alpha.35",
-    "@storybook/server": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/node-logger": "6.0.0-alpha.39",
+    "@storybook/server": "6.0.0-alpha.39",
    "concurrently": "^5.0.2",
    "cors": "^2.8.5",
    "express": "~4.17.1",
--- a/examples/standalone-preview/package.json
+++ b/examples/standalone-preview/package.json
@ -1,12 +1,12 @@
 {
  "name": "standalone-preview",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "storybook": "parcel ./storybook.html --port 1337"
  },
  "devDependencies": {
-    "@storybook/react": "6.0.0-alpha.35",
+    "@storybook/react": "6.0.0-alpha.39",
    "parcel": "^1.12.3",
    "react": "^16.8.4",
    "react-dom": "^16.8.4"
--- a/examples/svelte-kitchen-sink/package.json
+++ b/examples/svelte-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "svelte-example",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build-storybook": "build-storybook -s public",
@ -10,18 +10,18 @@
    "global": "^4.3.2"
  },
  "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
-    "@storybook/svelte": "6.0.0-alpha.35"
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
+    "@storybook/svelte": "6.0.0-alpha.39"
  },
  "storybook": {
    "chromatic": {
--- a/examples/vue-kitchen-sink/.storybook/preview.js
+++ b/examples/vue-kitchen-sink/.storybook/preview.js
@ -9,7 +9,6 @@ Vue.use(Vuex);

 addParameters({
  docs: {
-    inlineStories: true,
    iframeHeight: '60px',
  },
 });
--- a/examples/vue-kitchen-sink/package.json
+++ b/examples/vue-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "vue-example",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "scripts": {
    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@ -14,19 +14,19 @@
  },
  "devDependencies": {
    "@babel/core": "^7.8.4",
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-contexts": "6.0.0-alpha.35",
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
-    "@storybook/vue": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-contexts": "6.0.0-alpha.39",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
+    "@storybook/vue": "6.0.0-alpha.39",
    "babel-core": "^7.0.0-bridge.0",
    "babel-loader": "^8.0.5",
    "cross-env": "^7.0.0",
--- a/examples/vue-kitchen-sink/src/stories/snapshots/core.stories.storyshot
+++ b/examples/vue-kitchen-sink/src/stories/snapshots/core.stories.storyshot
@ -2,6 +2,18 @@

 exports[`Storyshots Core/Parameters passed to story 1`] = `
 <div>
-  Parameters are {"docs":{"inlineStories":true,"iframeHeight":"60px"},"globalParameter":"globalParameter","framework":"vue","chapterParameter":"chapterParameter","storyParameter":"storyParameter","__id":"core-parameters--passed-to-story"}
+  Parameters are 
+  <pre>
+    {
+  "docs": {
+    "iframeHeight": "60px"
+  },
+  "globalParameter": "globalParameter",
+  "framework": "vue",
+  "chapterParameter": "chapterParameter",
+  "storyParameter": "storyParameter",
+  "__id": "core-parameters--passed-to-story"
+}
+  </pre>
 </div>
 `;
--- a/examples/vue-kitchen-sink/src/stories/snapshots/custom-decorators.stories.storyshot
+++ b/examples/vue-kitchen-sink/src/stories/snapshots/custom-decorators.stories.storyshot
@ -49,7 +49,6 @@ exports[`Storyshots Custom/Decorator for Vue With Data 1`] = `
  "story": "With Data",
  "parameters": {
    "docs": {
-      "inlineStories": true,
      "iframeHeight": "60px"
    },
    "globalParameter": "globalParameter",
--- a/examples/vue-kitchen-sink/src/stories/core.stories.js
+++ b/examples/vue-kitchen-sink/src/stories/core.stories.js
@ -14,7 +14,7 @@ export default {
 };

 export const PassedToStory = ({ parameters: { fileName, ...parameters } }) => ({
-  template: `<div>Parameters are ${JSON.stringify(parameters)}</div>`,
+  template: `<div>Parameters are <pre>${JSON.stringify(parameters, null, 2)}</pre></div>`,
 });

 PassedToStory.story = {
--- a/examples/web-components-kitchen-sink/package.json
+++ b/examples/web-components-kitchen-sink/package.json
@ -1,6 +1,6 @@
 {
  "name": "web-components-kitchen-sink",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "private": true,
  "description": "",
  "keywords": [],
@ -12,23 +12,23 @@
    "storybook": "start-storybook -p 9006"
  },
  "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-alpha.35",
-    "@storybook/addon-actions": "6.0.0-alpha.35",
-    "@storybook/addon-backgrounds": "6.0.0-alpha.35",
-    "@storybook/addon-docs": "6.0.0-alpha.35",
-    "@storybook/addon-events": "6.0.0-alpha.35",
-    "@storybook/addon-jest": "6.0.0-alpha.35",
-    "@storybook/addon-knobs": "6.0.0-alpha.35",
-    "@storybook/addon-links": "6.0.0-alpha.35",
-    "@storybook/addon-storyshots": "6.0.0-alpha.35",
-    "@storybook/addon-storysource": "6.0.0-alpha.35",
-    "@storybook/addon-viewport": "6.0.0-alpha.35",
-    "@storybook/addons": "6.0.0-alpha.35",
-    "@storybook/client-api": "6.0.0-alpha.35",
-    "@storybook/core": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/source-loader": "6.0.0-alpha.35",
-    "@storybook/web-components": "6.0.0-alpha.35",
+    "@storybook/addon-a11y": "6.0.0-alpha.39",
+    "@storybook/addon-actions": "6.0.0-alpha.39",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.39",
+    "@storybook/addon-docs": "6.0.0-alpha.39",
+    "@storybook/addon-events": "6.0.0-alpha.39",
+    "@storybook/addon-jest": "6.0.0-alpha.39",
+    "@storybook/addon-knobs": "6.0.0-alpha.39",
+    "@storybook/addon-links": "6.0.0-alpha.39",
+    "@storybook/addon-storyshots": "6.0.0-alpha.39",
+    "@storybook/addon-storysource": "6.0.0-alpha.39",
+    "@storybook/addon-viewport": "6.0.0-alpha.39",
+    "@storybook/addons": "6.0.0-alpha.39",
+    "@storybook/client-api": "6.0.0-alpha.39",
+    "@storybook/core": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/source-loader": "6.0.0-alpha.39",
+    "@storybook/web-components": "6.0.0-alpha.39",
    "babel-loader": "^8.0.5",
    "eventemitter3": "^4.0.0",
    "format-json": "^1.0.3",
--- a/lerna.json
+++ b/lerna.json
@ -2,5 +2,5 @@
  "npmClient": "yarn",
  "useWorkspaces": true,
  "registry": "https://registry.npmjs.org",
-  "version": "6.0.0-alpha.35"
+  "version": "6.0.0-alpha.39"
 }
--- a/lib/addons/package.json
+++ b/lib/addons/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/addons",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Storybook addons store",
  "keywords": [
    "storybook"
@ -28,12 +28,12 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/api": "6.0.0-alpha.35",
-    "@storybook/channels": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
-    "@storybook/router": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/api": "6.0.0-alpha.39",
+    "@storybook/channels": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
+    "@storybook/router": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "regenerator-runtime": "^0.13.3"
--- a/lib/api/package.json
+++ b/lib/api/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/api",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "Core Storybook API & Context",
  "keywords": [
    "storybook"
@ -28,12 +28,12 @@
  },
  "dependencies": {
    "@reach/router": "^1.3.3",
-    "@storybook/channels": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
+    "@storybook/channels": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
    "@storybook/csf": "0.0.1",
-    "@storybook/router": "6.0.0-alpha.35",
-    "@storybook/theming": "6.0.0-alpha.35",
+    "@storybook/router": "6.0.0-alpha.39",
+    "@storybook/theming": "6.0.0-alpha.39",
    "@types/reach__router": "^1.2.3",
    "core-js": "^3.0.1",
    "fast-deep-equal": "^3.1.1",
--- a/lib/api/src/version.ts
+++ b/lib/api/src/version.ts
@ -1 +1 @@
-export const version = '6.0.0-alpha.35';
+export const version = '6.0.0-alpha.39';
--- a/lib/channel-postmessage/package.json
+++ b/lib/channel-postmessage/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/channel-postmessage",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "",
  "keywords": [
    "storybook"
@ -28,9 +28,9 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/channels": "6.0.0-alpha.35",
-    "@storybook/client-logger": "6.0.0-alpha.35",
-    "@storybook/core-events": "6.0.0-alpha.35",
+    "@storybook/channels": "6.0.0-alpha.39",
+    "@storybook/client-logger": "6.0.0-alpha.39",
+    "@storybook/core-events": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "telejson": "^3.2.0"
--- a/lib/channel-postmessage/src/index.ts
+++ b/lib/channel-postmessage/src/index.ts
@ -170,10 +170,11 @@ export class PostmsgTransport {
          ? `<span style="color: #FF4785">${event.type}</span>`
          : `<span style="color: #FFAE00">${event.type}</span>`;

-        event.source = source || getEventSourceUrl(rawEvent);
+        event.source =
+          source || this.config.page === 'preview' ? rawEvent.origin : getEventSourceUrl(rawEvent);

        if (!event.source) {
-          logger.error(
+          pretty.error(
            `${pageString} received ${eventString} but was unable to determine the source of the event`
          );

@ -195,8 +196,7 @@ export class PostmsgTransport {
 }

 const getEventSourceUrl = (event: MessageEvent) => {
-  const frames: HTMLIFrameElement[] = [...document.getElementsByTagName('iframe')];
-
+  const frames = [...document.querySelectorAll('iframe[data-is-storybook]')];
  // try to find the originating iframe by matching it's contentWindow
  // This might not be cross-origin safe
  const [frame, ...remainder] = frames.filter((element) => {
@ -217,15 +217,19 @@ const getEventSourceUrl = (event: MessageEvent) => {
    return origin === event.origin;
  });

-  // If we found multiple matches, there's going to be trouble
-  if (remainder.length) {
-    console.error('unable to locate origin of postmessage');
-    return null;
+  if (frame && remainder.length === 0) {
+    const src = frame.getAttribute('src');
+    const { origin, pathname } = new URL(src, document.location);
+    return origin + pathname;
  }

-  const src = frame.getAttribute('src');
-  const { origin, pathname } = new URL(src, document.location);
-  return origin + pathname;
+  if (remainder.length > 0) {
+    // If we found multiple matches, there's going to be trouble
+    logger.error('found multiple candidates for event source');
+  }
+
+  // If we found no frames of matches
+  return null;
 };

 /**
--- a/lib/channel-websocket/package.json
+++ b/lib/channel-websocket/package.json
@ -1,6 +1,6 @@
 {
  "name": "@storybook/channel-websocket",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.39",
  "description": "",
  "keywords": [
    "storybook"
@ -28,7 +28,7 @@
    "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
-    "@storybook/channels": "6.0.0-alpha.35",
+    "@storybook/channels": "6.0.0-alpha.39",
    "core-js": "^3.0.1",
    "global": "^4.3.2",
    "telejson": "^3.2.0"
--- a/Show More
+++ b/Show More