diff --git a/.circleci/config.yml b/.circleci/config.yml
index 01895a5a8cf..7944b8676a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,7 +55,7 @@ jobs:
             - lib
   chromatic:
     <<: *defaults
-    parallelism: 10
+    parallelism: 11
     steps:
       - checkout
       - attach_workspace:
@@ -77,7 +77,7 @@ jobs:
             yarn packtracker
   examples:
     <<: *defaults
-    parallelism: 10
+    parallelism: 11
     steps:
       - checkout
       - attach_workspace:
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000000..66d2c072fcd
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "deepscan.enable": true
+}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f69230f3e7..5dbd9b6bae1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,51 @@
+## 6.0.0-beta.12 (May 21, 2020)
+
+### Breaking Changes
+
+- Core: Zero-config TypeScript loading ([#10813](https://github.com/storybookjs/storybook/pull/10813))
+
+## 6.0.0-beta.11 (May 21, 2020)
+
+Failed publish
+
+## 6.0.0-beta.10 (May 21, 2020)
+
+Failed publish
+
+## 6.0.0-beta.9 (May 21, 2020)
+
+### Bug Fixes
+
+- UI: Avoid full refresh when on some tab changes ([#10838](https://github.com/storybookjs/storybook/pull/10838))
+- Composition: Fix refs not authenticating ([#10819](https://github.com/storybookjs/storybook/pull/10819))
+- Core: Fix global args initial state for addon-toolbars ([#10833](https://github.com/storybookjs/storybook/pull/10833))
+- Addon-a11y: Add deprecated withA11y ([#10814](https://github.com/storybookjs/storybook/pull/10814))
+- Core: Transpile minimum node_modules ([#10725](https://github.com/storybookjs/storybook/pull/10725))
+- UI: Change default view to Canvas on mobile ([#10818](https://github.com/storybookjs/storybook/pull/10818))
+- Docs: Improve Preview zoom handling ([#10801](https://github.com/storybookjs/storybook/pull/10801))
+
+### Maintenance
+
+- CI: example overhaul clean ([#10702](https://github.com/storybookjs/storybook/pull/10702))
+- CLI: Migrate CLI to TypeScript ([#10802](https://github.com/storybookjs/storybook/pull/10802))
+
+### Dependency Upgrades
+
+- Upgrade and add some missing dependencies in core, router, api ([#10825](https://github.com/storybookjs/storybook/pull/10825))
+
 ## 6.0.0-beta.8 (May 17, 2020)
 
 ### Features
 
-* Addon-toolbars: Show tool icons for all viewModes ([#10810](https://github.com/storybookjs/storybook/pull/10810))
+- Addon-toolbars: Show tool icons for all viewModes ([#10810](https://github.com/storybookjs/storybook/pull/10810))
 
 ### Bug Fixes
 
-* Addon-docs: Eval argTypes default value ([#10812](https://github.com/storybookjs/storybook/pull/10812))
+- Addon-docs: Eval argTypes default value ([#10812](https://github.com/storybookjs/storybook/pull/10812))
 
 ### Maintenance
 
-* Scripts: parallel execution on build package scripts ([#10808](https://github.com/storybookjs/storybook/pull/10808))
+- Scripts: parallel execution on build package scripts ([#10808](https://github.com/storybookjs/storybook/pull/10808))
 
 ## 6.0.0-beta.7 (May 15, 2020)
 
diff --git a/MIGRATION.md b/MIGRATION.md
index 185de7ed25c..e90469c0838 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -1,6 +1,7 @@
 <h1>Migration</h1>
 
 - [From version 5.3.x to 6.0.x](#from-version-53x-to-60x)
+  - [Zero config typescript](#zero-config-typescript)
   - [Backgrounds addon has a new api](#backgrounds-addon-has-a-new-api)
   - [CRA preset removed](#cra-preset-removed)
   - [Args passed as first argument to story](#args-passed-as-first-argument-to-story)
@@ -113,6 +114,12 @@
 
 ## From version 5.3.x to 6.0.x
 
+### Zero config typescript
+
+Storybook has built-in Typescript support in 6.0. That means you should remove your complex Typescript configurations from your `.storybook` config. We've tried to pick sensible defaults that work out of the box, especially for nice prop table generation in `@storybook/addon-docs`.
+
+To migrate from an old setup, we recommend deleting any typescript-specific webpack/babel configurations in your project. If you want to override the defaults, see the [typescript configuration docs](https://github.com/storybookjs/storybook/blob/next/docs/src/pages/configurations/typescript-config/index.md).
+
 ### Backgrounds addon has a new api
 
 Starting in 6.0, the backgrounds addon now receives an object instead of an array as parameter, with a property to define the default background.
diff --git a/addons/a11y/package.json b/addons/a11y/package.json
index 41cc90c71d3..601ed7743a7 100644
--- a/addons/a11y/package.json
+++ b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,14 +33,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/channels": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/channels": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "axe-core": "^3.5.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/addons/actions/package.json b/addons/actions/package.json
index bd20ac71f0d..7eb12b9f546 100644
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^3.1.1",
     "global": "^4.3.2",
diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
index f00e3537b15..f8cd9ae9283 100644
--- a/addons/backgrounds/package.json
+++ b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "memoizerific": "^1.11.3",
     "react": "^16.8.3",
diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
index d08f0734811..59ef5a42ae1 100644
--- a/addons/cssresources/package.json
+++ b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json
index 0e87f5b206b..2c51dc50475 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Design asset preview for storybook",
   "keywords": [
     "addon",
@@ -34,12 +34,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/addons/docs/package.json b/addons/docs/package.json
index a2617634829..707d6502d14 100644
--- a/addons/docs/package.json
+++ b/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Superior documentation for your components",
   "keywords": [
     "addon",
@@ -48,17 +48,17 @@
     "@mdx-js/loader": "^1.5.1",
     "@mdx-js/mdx": "^1.5.1",
     "@mdx-js/react": "^1.5.1",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-beta.8",
-    "@storybook/postinstall": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.12",
+    "@storybook/postinstall": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "acorn": "^7.1.0",
     "acorn-jsx": "^5.1.0",
     "acorn-walk": "^7.0.0",
@@ -84,8 +84,8 @@
     "@babel/core": "^7.9.6",
     "@emotion/core": "^10.0.20",
     "@emotion/styled": "^10.0.17",
-    "@storybook/react": "6.0.0-beta.8",
-    "@storybook/web-components": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.12",
+    "@storybook/web-components": "6.0.0-beta.12",
     "@types/cross-spawn": "^6.0.1",
     "@types/doctrine": "^0.0.3",
     "@types/enzyme": "^3.10.3",
diff --git a/addons/essentials/package.json b/addons/essentials/package.json
index 7ab5683ace2..218d0b383b6 100644
--- a/addons/essentials/package.json
+++ b/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -28,13 +28,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/node-logger": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "regenerator-runtime": "^0.13.3",
     "ts-dedent": "^1.1.1"
diff --git a/addons/events/package.json b/addons/events/package.json
index 17afb09398b..ec95f8679e7 100644
--- a/addons/events/package.json
+++ b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -31,11 +31,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "format-json": "^1.0.3",
     "lodash": "^4.17.15",
diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json
index 639c8d69e6a..fbfc0b314c4 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react-ga": "^2.5.7",
diff --git a/addons/graphql/package.json b/addons/graphql/package.json
index eb968a200e8..ceb8ba4d433 100644
--- a/addons/graphql/package.json
+++ b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-transform-classes": "^7.9.2",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
     "@types/webpack": "^4.41.9",
     "babel-loader": "^8.0.6",
     "core-js": "^3.0.1",
diff --git a/addons/jest/package.json b/addons/jest/package.json
index 3e820362e89..e323fc93e9c 100644
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/addons/knobs/package.json b/addons/knobs/package.json
index 580e6af4fab..04019c09d91 100644
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook Addon Prop Editor Component",
   "keywords": [
     "addon",
@@ -29,13 +29,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/channels": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/channels": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "@types/react-color": "^3.0.1",
     "copy-to-clipboard": "^3.0.8",
     "core-js": "^3.0.1",
diff --git a/addons/links/package.json b/addons/links/package.json
index b99ca01982b..edb0525d870 100644
--- a/addons/links/package.json
+++ b/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Story Links addon for storybook",
   "keywords": [
     "addon",
@@ -29,11 +29,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
     "@storybook/csf": "0.0.1",
-    "@storybook/router": "6.0.0-beta.8",
+    "@storybook/router": "6.0.0-beta.12",
     "@types/qs": "^6.9.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/addons/queryparams/package.json b/addons/queryparams/package.json
index 684d78a4257..b2759ff6ee2 100644
--- a/addons/queryparams/package.json
+++ b/addons/queryparams/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-queryparams",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "parameter addon for storybook",
   "keywords": [
     "addon",
@@ -30,12 +30,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "qs": "^6.6.0",
diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json
index 084bfb907b1..bcf0f25c0dc 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "keywords": [
     "addon",
@@ -33,9 +33,9 @@
   },
   "dependencies": {
     "@jest/transform": "^26.0.0",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "@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-beta.8",
-    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/react": "6.0.0-beta.12",
     "babel-loader": "^8.0.6",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.4.1",
diff --git a/addons/storyshots/storyshots-puppeteer/package.json b/addons/storyshots/storyshots-puppeteer/package.json
index e26919ae124..ccb799d5b5a 100644
--- a/addons/storyshots/storyshots-puppeteer/package.json
+++ b/addons/storyshots/storyshots-puppeteer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots-puppeteer",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.12",
     "@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-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
     "puppeteer": "^2.0.0 || ^3.0.0"
   },
   "peerDependenciesMeta": {
diff --git a/addons/storysource/package.json b/addons/storysource/package.json
index 963802b32d7..06e217585db 100644
--- a/addons/storysource/package.json
+++ b/addons/storysource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Stories addon for storybook",
   "keywords": [
     "addon",
@@ -29,13 +29,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/router": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/router": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "estraverse": "^4.2.0",
     "loader-utils": "^2.0.0",
diff --git a/addons/toolbars/package.json b/addons/toolbars/package.json
index 7523f4e3df1..e373a800d48 100644
--- a/addons/toolbars/package.json
+++ b/addons/toolbars/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-toolbars",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook toolbars addon",
   "keywords": [
     "addon",
@@ -30,10 +30,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
     "core-js": "^3.0.1"
   },
   "peerDependencies": {
diff --git a/addons/viewport/package.json b/addons/viewport/package.json
index 0fefe3569de..fc512961b6a 100644
--- a/addons/viewport/package.json
+++ b/addons/viewport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "memoizerific": "^1.11.3",
diff --git a/app/angular/package.json b/app/angular/package.json
index 7d51783c545..bafb4c68b09 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
-    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
+    "@storybook/node-logger": "6.0.0-beta.12",
     "@types/webpack-env": "^1.15.2",
     "autoprefixer": "^9.7.6",
     "core-js": "^3.0.1",
diff --git a/app/aurelia/package.json b/app/aurelia/package.json
index 36fa58ae528..0906971c646 100644
--- a/app/aurelia/package.json
+++ b/app/aurelia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/aurelia",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook for Aurelia: Develop Aurelia Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -26,10 +26,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
-    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
+    "@storybook/node-logger": "6.0.0-beta.12",
     "fork-ts-checker-webpack-plugin": "^4.0.3",
     "global": "^4.3.2",
     "ts-loader": "^6.0.1",
diff --git a/app/ember/package.json b/app/ember/package.json
index 71c5269c599..661952ded0c 100644
--- a/app/ember/package.json
+++ b/app/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ember",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
+    "@storybook/core": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
diff --git a/app/html/package.json b/app/html/package.json
index 7b23898b6ad..05e4ec4e1c5 100644
--- a/app/html/package.json
+++ b/app/html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/app/marionette/package.json b/app/marionette/package.json
index c71b11e858c..9e785a4c024 100644
--- a/app/marionette/package.json
+++ b/app/marionette/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/marionette",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
+    "@storybook/core": "6.0.0-beta.12",
     "common-tags": "^1.8.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/app/marko/package.json b/app/marko/package.json
index 16ece24c7ba..07f076f898b 100644
--- a/app/marko/package.json
+++ b/app/marko/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/marko",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
diff --git a/app/mithril/package.json b/app/mithril/package.json
index 9034b124059..c48c20a3216 100644
--- a/app/mithril/package.json
+++ b/app/mithril/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/mithril",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook for Mithril: Develop Mithril Component in isolation.",
   "keywords": [
     "storybook"
@@ -36,8 +36,8 @@
   "dependencies": {
     "@babel/core": "^7.9.6",
     "@babel/plugin-transform-react-jsx": "^7.3.0",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "@types/mithril": "^2.0.0",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
diff --git a/app/preact/package.json b/app/preact/package.json
index 040c01f6d55..408e5314e58 100644
--- a/app/preact/package.json
+++ b/app/preact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/app/rax/package.json b/app/rax/package.json
index da6e69dd53e..b50042fb716 100644
--- a/app/rax/package.json
+++ b/app/rax/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/rax",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
+    "@storybook/core": "6.0.0-beta.12",
     "babel-preset-rax": "^1.0.0-beta.0",
     "core-js": "^3.0.1",
     "driver-dom": "^2.0.0",
diff --git a/app/react/package.json b/app/react/package.json
index 990141b2f51..09612ddb8b1 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
-    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
+    "@storybook/node-logger": "6.0.0-beta.12",
     "@svgr/webpack": "^5.4.0",
     "@types/webpack-env": "^1.15.2",
     "babel-plugin-add-react-displayname": "^0.0.5",
@@ -57,7 +57,7 @@
     "webpack": "^4.43.0"
   },
   "devDependencies": {
-    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.12",
     "@types/node": "^13.13.4",
     "@types/webpack": "^4.41.12"
   },
diff --git a/app/riot/package.json b/app/riot/package.json
index 06e9b833457..c71913cd58a 100644
--- a/app/riot/package.json
+++ b/app/riot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/riot",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
+    "@storybook/core": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "raw-loader": "^4.0.1",
diff --git a/app/server/package.json b/app/server/package.json
index 015e868c909..c7a4a15c198 100644
--- a/app/server/package.json
+++ b/app/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "@storybook/node-logger": "^5.2.8",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
diff --git a/app/svelte/package.json b/app/svelte/package.json
index d8c62735f67..a711f548aa1 100644
--- a/app/svelte/package.json
+++ b/app/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
diff --git a/app/vue/package.json b/app/vue/package.json
index 740cb724cee..e83de631608 100644
--- a/app/vue/package.json
+++ b/app/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,19 +34,20 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
     "ts-dedent": "^1.1.1",
-    "ts-loader": "^7.0.4",
+    "ts-loader": "^6.2.2",
     "webpack": "^4.43.0"
   },
   "devDependencies": {
     "@types/node": "^13.13.4",
     "@types/webpack": "^4.41.12",
+    "babel-preset-vue": "^2.0.2",
     "vue": "^2.6.8",
     "vue-loader": "^15.7.0",
     "vue-template-compiler": "^2.6.8"
@@ -57,7 +58,7 @@
     "css-loader": "*",
     "react": "*",
     "react-dom": "*",
-    "ts-loader": "^7.0.4",
+    "ts-loader": "^6.2.2",
     "vue": "^2.6.8",
     "vue-loader": "^15.7.0",
     "vue-template-compiler": "^2.6.8"
diff --git a/app/vue/src/server/framework-preset-vue.ts b/app/vue/src/server/framework-preset-vue.ts
index bf6f79b53ad..490aa2d9b81 100644
--- a/app/vue/src/server/framework-preset-vue.ts
+++ b/app/vue/src/server/framework-preset-vue.ts
@@ -38,3 +38,10 @@ export function webpack(config: Configuration) {
     },
   };
 }
+
+export function babelDefault(config: any) {
+  return {
+    ...config,
+    presets: [...config.presets, require.resolve('babel-preset-vue')],
+  };
+}
diff --git a/app/web-components/package.json b/app/web-components/package.json
index 148dc3b67ae..3e4137e1813 100644
--- a/app/web-components/package.json
+++ b/app/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
     "@types/webpack-env": "^1.15.2",
     "babel-plugin-bundled-import-meta": "^0.3.1",
     "core-js": "^3.0.1",
diff --git a/cypress/helper.ts b/cypress/helper.ts
index 028c9393229..d886439d90b 100644
--- a/cypress/helper.ts
+++ b/cypress/helper.ts
@@ -15,7 +15,7 @@ export const visit = (route = '') => {
     .clearLocalStorage()
     .visit(getUrl(route))
     .get(`#storybook-preview-iframe`)
-    .then({ timeout: 10000 }, (iframe) => {
+    .then({ timeout: 15000 }, (iframe) => {
       return cy.wrap(iframe, { timeout: 10000 }).should(() => {
         const content: Document | null = (iframe[0] as HTMLIFrameElement).contentDocument;
         const element: HTMLElement | null = content !== null ? content.documentElement : null;
diff --git a/dev-kits/addon-decorator/package.json b/dev-kits/addon-decorator/package.json
index 88e296abff1..e234cd5d136 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "decorator addon for storybook",
   "keywords": [
     "addon",
@@ -24,8 +24,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.4.0"
   },
diff --git a/dev-kits/addon-parameter/package.json b/dev-kits/addon-parameter/package.json
index a8d3361c24f..e75738cd197 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "parameter addon for storybook",
   "keywords": [
     "addon",
@@ -24,12 +24,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/dev-kits/addon-preview-wrapper/package.json b/dev-kits/addon-preview-wrapper/package.json
index da7a29c98b4..75815202cc6 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "preview wrapper addon for storybook",
   "keywords": [
     "addon",
@@ -24,7 +24,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
     "react": "^16.8.3"
   },
   "publishConfig": {
diff --git a/dev-kits/addon-roundtrip/package.json b/dev-kits/addon-roundtrip/package.json
index e3f21d7a832..f7672e19156 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "roundtrip addon for storybook",
   "keywords": [
     "addon",
@@ -24,13 +24,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/docs/src/pages/configurations/typescript-config/index.md b/docs/src/pages/configurations/typescript-config/index.md
index f239eb5b5c1..9996c71fc29 100644
--- a/docs/src/pages/configurations/typescript-config/index.md
+++ b/docs/src/pages/configurations/typescript-config/index.md
@@ -3,235 +3,56 @@ id: 'typescript-config'
 title: 'TypeScript Config'
 ---
 
-> migration guide: This page documents the method to configure storybook introduced recently in 5.3.0, consult the [migration guide](https://github.com/storybookjs/storybook/blob/next/MIGRATION.md) if you want to migrate to this format of configuring storybook.
+Storybook has built-in Typescript support, so your Typescript project should work with zero configuration needed.
 
-This is a central reference for using Storybook with TypeScript.
+- [Default configuration](#default-configuration)
+- [Main.js configuration](#mainjs-configuration)
+- [Manual configuration](#manual-configuration)
+- [More Resources](#more-resources)
 
-## Typescript configuration presets
+## Default configuration
 
-The fastest and easiest way to write and configure your stories in TypeScript is by using a Storybook preset.
+The base Typescript configuration uses `babel-loader` for Typescript transpilation, and optionally `fork-ts-checker-webpack-plugin` for checking.
 
-* If you're using Create React App (CRA) and have configured it to work with TS, you should use [`@storybook/preset-create-react-app`](https://github.com/storybookjs/presets/tree/master/packages/preset-create-react-app), which configures Storybook to reuse CRA's TS handling.
+Each framework uses the base configuration unless otherwise specified:
 
-* If you are not using CRA or have other requirements, then the next best option is [`@storybook/preset-typescript`](https://github.com/storybookjs/presets/tree/master/packages/preset-typescript), which configures `ts-loader` under the hood.
+- **Angular** ignores the base and uses `ts-loader` and `ngx-template-loader`.
+- **Vue** ignores the uses `ts-loader` and applies it to both `.tsx?` and `.vue` files.
+- **React** adds `react-docgen-typescript-loader` the base.
 
-If you need more control than these presets offer, read on for manual configuration instructions.
+## Main.js configuration
 
-You can learn more about Storybook presets [over here](../../presets/introduction).
+To make it easier to configure Typescript handling, we've added a new field, `typescript`, to [`main.js`](../overview/index.md).
 
-> If using TypeScript, some addons require features available in TS version 3.4+.
-
-## Setting up TypeScript with ts-loader
-
-### Dependencies you may need
-
-```bash
-yarn add -D typescript
-yarn add -D ts-loader
-yarn add -D @storybook/addon-info react-docgen-typescript-loader # optional but recommended
-yarn add -D jest "@types/jest" ts-jest #testing
-```
-
-### Setting up TypeScript to work with Storybook
-
-We [configure storybook's webpack](/configurations/custom-webpack-config/#full-control-mode--default) by changing `.storybook/main.js`:
+Here are the default values:
 
 ```js
 module.exports = {
-  webpackFinal: async config => {
-    config.module.rules.push({
-      test: /\.(ts|tsx)$/,
-      use: [
-        {
-          loader: require.resolve('ts-loader'),
-        },
-        // Optional
-        {
-          loader: require.resolve('react-docgen-typescript-loader'),
-        },
-      ],
-    });
-    config.resolve.extensions.push('.ts', '.tsx');
-    return config;
-  },
-};
-```
-
-The above example shows a working Webpack config with the [TSDocgen plugin](https://github.com/strothj/react-docgen-typescript-loader) integrated. This plugin is not necessary to use Storybook and the section marked `// optional` can be safely removed if the features of TSDocgen are not required.
-
-### `tsconfig.json`
-
-```json
-{
-  "compilerOptions": {
-    "outDir": "build/lib",
-    "module": "commonjs",
-    "target": "es5",
-    "lib": ["es5", "es6", "es7", "es2017", "dom"],
-    "sourceMap": true,
-    "allowJs": false,
-    "jsx": "react",
-    "moduleResolution": "node",
-    "rootDirs": ["src", "stories"],
-    "baseUrl": "src",
-    "forceConsistentCasingInFileNames": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "noUnusedLocals": true,
-    "declaration": true,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "build", "scripts"]
-}
-```
-
-This is for the default configuration where `/stories` is a peer of `src`. If you have them all in `src`, you may wish to replace `"rootDirs": ["src", "stories"]` above with `"rootDir": "src",`.
-
-## Setting up TypeScript with babel-loader
-
-### A note for Create React App users
-
-Please use [`@storybook/preset-create-react-app`](https://github.com/storybookjs/presets/tree/master/packages/preset-create-react-app) for full compatibility with [Create React App](https://create-react-app.dev/) features - which includes TypeScript support.
-
-### Setting up TypeScript to work with Storybook
-
-The following code uses [`babel-preset-react-app`](https://github.com/facebook/create-react-app/tree/master/packages/babel-preset-react-app).
-
-We will create a [custom Webpack config](/configurations/custom-webpack-config/) by creating editing/creating the `.storybook/main.js`:
-
-```js
-module.exports = {
-  stories: ['../src/**/*.stories.tsx'],
-  webpackFinal: async config => {
-    config.module.rules.push({
-      test: /\.(ts|tsx)$/,
-      loader: require.resolve('babel-loader'),
-      options: {
-        presets: [['react-app', { flow: false, typescript: true }]],
-      },
-    });
-    config.resolve.extensions.push('.ts', '.tsx');
-    return config;
-  },
-};
-```
-
-### `tsconfig.json`
-
-If your stories are outside the `src` folder, for example the `stories` folder in root, then `"rootDirs": ["src", "stories"]` needs to be added to be added to `compilerOptions` so it knows what folders to compile. Make sure `jsx` is set to preserve. Should be unchanged.
-
-## Create a TSX storybook index
-
-The default storybook index file is `stories/index.stories.js` -- you'll want to rename this to `stories/index.stories.tsx`.
-
-## Using TypeScript with the TSDocgen addon
-
-The very handy [Storybook Info addon](https://github.com/storybookjs/storybook/tree/master/addons/info) autogenerates prop tables documentation for each component, however it doesn't work with Typescript types. The current solution is to use [react-docgen-typescript-loader](https://github.com/strothj/react-docgen-typescript-loader) to preprocess the TypeScript files to give the Info addon what it needs. The webpack config above does this, and so for the rest of your stories you use it as per normal:
-
-```js
-import * as React from 'react';
-import TicTacToeCell from './TicTacToeCell';
-
-export default {
-  title: 'Components',
-  parameters: {
-    info: { inline: true },
-  },
-};
-
-export const TicTacToeCell = () => (
-  <TicTacToeCell value="X" position={{ x: 0, y: 0 }} />,
-);
-```
-
-## Customizing Type annotations/descriptions
-
-Please refer to the [react-docgen-typescript-loader](https://github.com/strothj/react-docgen-typescript-loader) docs for writing prop descriptions and other annotations to your Typescript interfaces.
-
-Additional annotation can be achieved by setting a default set of info parameters in `.storybook/preview.js`:
-
-```ts
-import { addDecorator } from '@storybook/react';
-import { withInfo } from '@storybook/addon-info';
-
-addDecorator(
-  withInfo({
-    styles: {
-      header: {
-        h1: {
-          marginRight: '20px',
-          fontSize: '25px',
-          display: 'inline',
-        },
-        body: {
-          paddingTop: 0,
-          paddingBottom: 0,
-        },
-        h2: {
-          display: 'inline',
-          color: '#999',
-        },
-      },
-      infoBody: {
-        backgroundColor: '#eee',
-        padding: '0px 5px',
-        lineHeight: '2',
-      },
+  typescript: {
+    check: false,
+    checkOptions: {},
+    reactDocgen: 'react-docgen-typescript',
+    reactDocgenTypescriptOptions: {
+      propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
     },
-    inline: true,
-    source: false,
-  })
-);
-```
-
-Note: Component docgen information can not be generated for components that are only exported as default. You can work around the issue by exporting the component using a named export.
-
-## Setting up Jest tests
-
-The ts-jest [README](https://github.com/kulshekhar/ts-jest) explains pretty clearly how to get Jest to recognize TypeScript code.
-
-This is an example `jest.config.js` file for jest:
-
-```js
-module.exports = {
-  transform: {
-    '.(ts|tsx)': 'ts-jest',
   },
-  testPathIgnorePatterns: ['/node_modules/', '/lib/'],
-  testRegex: '(/test/.*|\\.(test|spec))\\.(ts|tsx|js)$',
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
 };
 ```
 
-## Building your TypeScript Storybook
+And here are the meaning of each field:
 
-You will need to set up some scripts - these may help:
+| Field                            | Framework | Description                                                                                  | Type                                                                     |
+| -------------------------------- | --------- | -------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------ |
+| **check**                        | All       | optionally run `fork-ts-checker-webpack-plugin`                                              | `boolean`                                                                |
+| **checkOptions**                 | All       | Options to pass to `fork-ts-checker-webpack-plugin` if it's enabled                          | [See docs](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin) |
+| **reactDocgen**                  | React     | which variant docgen processor to run                                                        | `'react-docgen-typescript' | 'react-docgen' | false`                     |
+| **reactDocgenTypescriptOptions** | React     | Options to pass to `react-docgen-typescript-loader` if `react-docgen-typescript` is enabled. | [See docs](https://github.com/strothj/react-docgen-typescript-loader)    |
 
-```json
-  "scripts": {
-    "start": "react-scripts-ts start",
-    "build": "npm run lint && npm run build-lib && build-storybook",
-    "build-lib-watch": "tsc -w",
-    "build-lib": "tsc && npm run copy-css-to-lib && npm run copy-svg-to-lib && npm run copy-png-to-lib && npm run copy-woff2-to-lib",
-    "test": "react-scripts-ts test --env=jsdom",
-    "test:coverage": "npm test -- --coverage",
-    "eject": "react-scripts-ts eject",
-    "storybook": "start-storybook -p 6006",
-    "build-storybook": "build-storybook",
-    "copy-css-to-lib": "cpx \"./src/**/*.css\" ./build/lib",
-    "copy-woff2-to-lib": "cpx \"./src/**/*.woff2\" ./build/lib",
-    "copy-svg-to-lib": "cpx \"./src/**/*.svg\" ./build/lib",
-    "copy-png-to-lib": "cpx \"./src/**/*.png\" ./build/lib",
-  },
-```
+## Manual configuration
 
-## Related Issues and Helpful Resources
+Manual configuration support will be added in a later pre-release.
+
+## More Resources
 
 - [Storybook, React, TypeScript and Jest](https://medium.com/@mtiller/storybook-react-typescript-and-jest-c9059ea06fa7)
 - [React, Storybook & TypeScript](http://www.joshschreuder.me/react-storybooks-with-typescript/)
diff --git a/docs/src/versions/next.json b/docs/src/versions/next.json
index efb268af7e7..314ed0e5769 100644
--- a/docs/src/versions/next.json
+++ b/docs/src/versions/next.json
@@ -1 +1 @@
-{"version":"6.0.0-beta.8","info":{"plain":"### Features\n\n* Addon-toolbars: Show tool icons for all viewModes ([#10810](https://github.com/storybookjs/storybook/pull/10810))\n\n### Bug Fixes\n\n* Addon-docs: Eval argTypes default value ([#10812](https://github.com/storybookjs/storybook/pull/10812))\n\n### Maintenance\n\n* Scripts: parallel execution on build package scripts ([#10808](https://github.com/storybookjs/storybook/pull/10808))"}}
\ No newline at end of file
+{"version":"6.0.0-beta.12","info":{"plain":"### Breaking Changes\n\n- Core: Zero-config TypeScript loading ([#10813](https://github.com/storybookjs/storybook/pull/10813))"}}
\ No newline at end of file
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index b849f62b5a9..3aac5897a4e 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-jest": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/angular": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-jest": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/angular": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
     "@types/core-js": "^2.5.0",
     "@types/jest": "^25.1.1",
     "@types/node": "^13.13.4",
diff --git a/examples/aurelia-kitchen-sink/package.json b/examples/aurelia-kitchen-sink/package.json
index 062b77cb69a..2b47ae93857 100644
--- a/examples/aurelia-kitchen-sink/package.json
+++ b/examples/aurelia-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-kitchen-sink",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "description": "An Aurelia client application.",
   "repository": {
@@ -25,18 +25,18 @@
     "@aurelia/jit-html-browser": "^0.6.0",
     "@aurelia/runtime": "^0.6.0",
     "@aurelia/webpack-loader": "dev",
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-jest": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/aurelia": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-jest": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/aurelia": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
     "@types/node": "^12.0.0",
     "css-loader": "^3.0.0",
     "file-loader": "^4.2.0",
diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
index 74d495bc205..5860102a6e3 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -18,19 +18,19 @@
     "react-lifecycles-compat": "^3.0.4"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-events": "6.0.0-beta.8",
-    "@storybook/addon-jest": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/react": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-events": "6.0.0-beta.12",
+    "@storybook/addon-jest": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/react": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "react-scripts": "^3.0.1"
   },
   "storybook": {
diff --git a/examples/cra-react15/package.json b/examples/cra-react15/package.json
index a61beae8da6..58f33a3b73e 100644
--- a/examples/cra-react15/package.json
+++ b/examples/cra-react15/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-react15",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -18,11 +18,11 @@
     "react-scripts": "3.0.1"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/react": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/react": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "babel-core": "6",
     "babel-runtime": "6"
   },
diff --git a/examples/cra-ts-essentials/package.json b/examples/cra-ts-essentials/package.json
index 11946384924..7abe59e3cba 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -34,10 +34,10 @@
     "typescript": "3.8.3"
   },
   "devDependencies": {
-    "@storybook/addon-essentials": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/addon-essentials": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
     "@storybook/preset-create-react-app": "^2.1.1",
-    "@storybook/react": "6.0.0-beta.8"
+    "@storybook/react": "6.0.0-beta.12"
   },
   "storybook": {
     "chromatic": {
diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json
index 2f2980a51f0..32f3953a43f 100644
--- a/examples/cra-ts-kitchen-sink/package.json
+++ b/examples/cra-ts-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-ts-kitchen-sink",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -34,14 +34,14 @@
     "typescript": "3.8.3"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
     "@storybook/preset-create-react-app": "^2.1.1",
-    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.12",
     "@types/enzyme": "^3.9.0",
     "enzyme": "^3.9.0",
     "enzyme-adapter-react-16": "^1.9.1",
diff --git a/examples/dev-kits/package.json b/examples/dev-kits/package.json
index 05830bbf9b2..b84bf479895 100644
--- a/examples/dev-kits/package.json
+++ b/examples/dev-kits/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/example-devkits",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/addon-parameter": "6.0.0-beta.8",
-    "@storybook/addon-preview-wrapper": "6.0.0-beta.8",
-    "@storybook/addon-roundtrip": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/node-logger": "6.0.0-beta.8",
-    "@storybook/react": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addon-decorator": "6.0.0-beta.12",
+    "@storybook/addon-parameter": "6.0.0-beta.12",
+    "@storybook/addon-preview-wrapper": "6.0.0-beta.12",
+    "@storybook/addon-roundtrip": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/node-logger": "6.0.0-beta.12",
+    "@storybook/react": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "cors": "^2.8.5",
     "cross-env": "^7.0.0",
     "enzyme-to-json": "^3.4.1",
diff --git a/examples/ember-cli/package.json b/examples/ember-cli/package.json
index a32b78a816a..54766779c45 100644
--- a/examples/ember-cli/package.json
+++ b/examples/ember-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-example",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "ember build --output-path ember-output",
@@ -16,18 +16,18 @@
   "devDependencies": {
     "@babel/core": "^7.9.6",
     "@ember/optional-features": "^1.3.0",
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/ember": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/ember": "6.0.0-beta.12",
     "@storybook/ember-cli-storybook": "^0.2.1",
-    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.12",
     "babel-loader": "^8",
     "broccoli-asset-rev": "^3.0.0",
     "cross-env": "^7.0.0",
diff --git a/examples/html-kitchen-sink/package.json b/examples/html-kitchen-sink/package.json
index e7471d349e3..7211861d342 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "description": "",
   "keywords": [],
@@ -13,23 +13,23 @@
     "storybook": "start-storybook -p 9006"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-events": "6.0.0-beta.8",
-    "@storybook/addon-jest": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/html": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-events": "6.0.0-beta.12",
+    "@storybook/addon-jest": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/html": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
     "eventemitter3": "^4.0.0",
     "format-json": "^1.0.3",
     "global": "^4.3.2",
diff --git a/examples/marko-cli/package.json b/examples/marko-cli/package.json
index 659def7ff0d..17d00d7acb0 100644
--- a/examples/marko-cli/package.json
+++ b/examples/marko-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "marko-cli",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/marko": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/marko": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
     "prettier": "^2.0.5",
     "webpack": "^4.33.0"
   },
diff --git a/examples/mithril-kitchen-sink/package.json b/examples/mithril-kitchen-sink/package.json
index 071c9c4d3b1..f24a8411dc8 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook",
@@ -10,17 +10,17 @@
     "mithril": "^1.1.6"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/mithril": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/mithril": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
     "webpack": "^4.33.0"
   },
   "storybook": {
diff --git a/examples/official-storybook/main.js b/examples/official-storybook/main.ts
similarity index 96%
rename from examples/official-storybook/main.js
rename to examples/official-storybook/main.ts
index 6eea9d783a0..2c249eff765 100644
--- a/examples/official-storybook/main.js
+++ b/examples/official-storybook/main.ts
@@ -1,3 +1,5 @@
+import type { StorybookConfig } from '@storybook/core/types';
+
 module.exports = {
   stories: [
     // FIXME: Breaks e2e tests './intro.stories.mdx',
@@ -74,4 +76,4 @@ module.exports = {
       extensions: [...(config.resolve.extensions || []), '.ts', '.tsx'],
     },
   }),
-};
+} as StorybookConfig;
diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
index ce692a81733..2f7ed962b99 100644
--- a/examples/official-storybook/package.json
+++ b/examples/official-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "official-storybook",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
@@ -14,31 +14,31 @@
   },
   "devDependencies": {
     "@packtracker/webpack-plugin": "^2.0.1",
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-cssresources": "6.0.0-beta.8",
-    "@storybook/addon-design-assets": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-events": "6.0.0-beta.8",
-    "@storybook/addon-graphql": "6.0.0-beta.8",
-    "@storybook/addon-jest": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-queryparams": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storyshots-puppeteer": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-toolbars": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/cli": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/node-logger": "6.0.0-beta.8",
-    "@storybook/react": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-cssresources": "6.0.0-beta.12",
+    "@storybook/addon-design-assets": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-events": "6.0.0-beta.12",
+    "@storybook/addon-graphql": "6.0.0-beta.12",
+    "@storybook/addon-jest": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-queryparams": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storyshots-puppeteer": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-toolbars": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/cli": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/node-logger": "6.0.0-beta.12",
+    "@storybook/react": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "chromatic": "^4.0.2",
     "cors": "^2.8.5",
     "cross-env": "^7.0.0",
diff --git a/examples/preact-kitchen-sink/package.json b/examples/preact-kitchen-sink/package.json
index 72edbca88a7..17348ca5b4f 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -15,17 +15,17 @@
   "devDependencies": {
     "@babel/core": "^7.9.6",
     "@babel/plugin-transform-runtime": "^7.9.6",
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/preact": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/preact": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
     "babel-loader": "^8.0.4",
     "cross-env": "^7.0.0",
     "file-loader": "^6.0.0",
diff --git a/examples/rax-kitchen-sink/package.json b/examples/rax-kitchen-sink/package.json
index df4b53036aa..ebc18184a6c 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "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-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-events": "6.0.0-beta.8",
-    "@storybook/addon-jest": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/rax": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-events": "6.0.0-beta.12",
+    "@storybook/addon-jest": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/rax": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "babel-eslint": "^10.0.3",
     "build-plugin-rax-app": "^0.2.0",
     "stylesheet-loader": "^0.8.0"
diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json
index 0d31cc0c602..0d5f99cb6f6 100644
--- a/examples/react-ts/package.json
+++ b/examples/react-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/example-react-ts",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
diff --git a/examples/riot-kitchen-sink/package.json b/examples/riot-kitchen-sink/package.json
index 12acb41bfef..5a51c226074 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -15,17 +15,17 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/riot": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/riot": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
     "babel-loader": "^8.0.4",
     "cross-env": "^7.0.0",
     "file-loader": "^6.0.0",
diff --git a/examples/server-kitchen-sink/package.json b/examples/server-kitchen-sink/package.json
index 7be403ebe52..2ea61103511 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "description": "",
   "keywords": [],
@@ -14,13 +14,13 @@
     "storybook": "SERVER_PORT=1137 start-storybook -p 9006 --quiet"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/node-logger": "6.0.0-beta.8",
-    "@storybook/server": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/node-logger": "6.0.0-beta.12",
+    "@storybook/server": "6.0.0-beta.12",
     "concurrently": "^5.2.0",
     "cors": "^2.8.5",
     "express": "~4.17.1",
diff --git a/examples/standalone-preview/package.json b/examples/standalone-preview/package.json
index 882597c3035..076c7a28b0a 100644
--- a/examples/standalone-preview/package.json
+++ b/examples/standalone-preview/package.json
@@ -1,12 +1,12 @@
 {
   "name": "standalone-preview",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "storybook": "parcel ./storybook.html --port 1337"
   },
   "devDependencies": {
-    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.12",
     "parcel": "^1.12.3",
     "react": "^16.8.4",
     "react-dom": "^16.8.4"
diff --git a/examples/svelte-kitchen-sink/package.json b/examples/svelte-kitchen-sink/package.json
index dd67bccecad..ad4359f48b4 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook -s public",
@@ -10,18 +10,18 @@
     "global": "^4.3.2"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
-    "@storybook/svelte": "6.0.0-beta.8"
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
+    "@storybook/svelte": "6.0.0-beta.12"
   },
   "storybook": {
     "chromatic": {
diff --git a/examples/vue-cli/package.json b/examples/vue-cli/package.json
index 2f1f2cf6918..7f8c4e93de1 100644
--- a/examples/vue-cli/package.json
+++ b/examples/vue-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-example",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build",
diff --git a/examples/vue-kitchen-sink/babel.config.json b/examples/vue-kitchen-sink/babel.config.json
deleted file mode 100644
index 1b11af8a9a9..00000000000
--- a/examples/vue-kitchen-sink/babel.config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["babel-preset-vue"]
-}
\ No newline at end of file
diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
index 9ca68377203..b6dbe5cf983 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -14,21 +14,20 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
-    "@storybook/vue": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
+    "@storybook/vue": "6.0.0-beta.12",
     "babel-core": "^7.0.0-bridge.0",
     "babel-loader": "^8.0.5",
-    "babel-preset-vue": "^2.0.2",
     "cross-env": "^7.0.0",
     "file-loader": "^6.0.0",
     "prop-types": "^15.7.2",
diff --git a/examples/web-components-kitchen-sink/package.json b/examples/web-components-kitchen-sink/package.json
index f5c50cce76b..bca4350f1fc 100644
--- 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-beta.8",
+  "version": "6.0.0-beta.12",
   "private": true,
   "description": "",
   "keywords": [],
@@ -12,23 +12,23 @@
     "storybook": "start-storybook -p 9006"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.8",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-backgrounds": "6.0.0-beta.8",
-    "@storybook/addon-docs": "6.0.0-beta.8",
-    "@storybook/addon-events": "6.0.0-beta.8",
-    "@storybook/addon-jest": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addon-storysource": "6.0.0-beta.8",
-    "@storybook/addon-viewport": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/core": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/source-loader": "6.0.0-beta.8",
-    "@storybook/web-components": "6.0.0-beta.8",
+    "@storybook/addon-a11y": "6.0.0-beta.12",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-backgrounds": "6.0.0-beta.12",
+    "@storybook/addon-docs": "6.0.0-beta.12",
+    "@storybook/addon-events": "6.0.0-beta.12",
+    "@storybook/addon-jest": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addon-storysource": "6.0.0-beta.12",
+    "@storybook/addon-viewport": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/core": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/source-loader": "6.0.0-beta.12",
+    "@storybook/web-components": "6.0.0-beta.12",
     "babel-loader": "^8.0.5",
     "eventemitter3": "^4.0.0",
     "format-json": "^1.0.3",
diff --git a/lerna.json b/lerna.json
index 06a2417d80b..9ae4debecc1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "registry": "https://registry.npmjs.org",
-  "version": "6.0.0-beta.8"
+  "version": "6.0.0-beta.12"
 }
diff --git a/lib/addons/package.json b/lib/addons/package.json
index d394f979b00..d6a9b3e73df 100644
--- a/lib/addons/package.json
+++ b/lib/addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addons",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook addons store",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/channels": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/router": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/channels": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/router": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3"
diff --git a/lib/api/package.json b/lib/api/package.json
index 5488c59d996..f53ba382a71 100644
--- a/lib/api/package.json
+++ b/lib/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/api",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Core Storybook API & Context",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
   },
   "dependencies": {
     "@reach/router": "^1.3.3",
-    "@storybook/channels": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
     "@storybook/csf": "0.0.1",
-    "@storybook/router": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/router": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "@types/reach__router": "^1.3.5",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^3.1.1",
diff --git a/lib/api/src/version.ts b/lib/api/src/version.ts
index 19af512dd8f..15ba4a6b5f5 100644
--- a/lib/api/src/version.ts
+++ b/lib/api/src/version.ts
@@ -1 +1 @@
-export const version = '6.0.0-beta.8';
+export const version = '6.0.0-beta.12';
diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json
index 79f18d14a4c..5dee0868377 100644
--- a/lib/channel-postmessage/package.json
+++ b/lib/channel-postmessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-postmessage",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "",
   "keywords": [
     "storybook"
@@ -28,9 +28,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "telejson": "^4.0.0"
diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json
index 3e1ce98decd..4e75d59b32e 100644
--- a/lib/channel-websocket/package.json
+++ b/lib/channel-websocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-websocket",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "",
   "keywords": [
     "storybook"
@@ -28,7 +28,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "telejson": "^4.0.0"
diff --git a/lib/channels/package.json b/lib/channels/package.json
index 4285316ec59..683a5dbbbaa 100644
--- a/lib/channels/package.json
+++ b/lib/channels/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channels",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/lib/cli-sb/package.json b/lib/cli-sb/package.json
index f6d0bf2c5f5..655b10d250b 100644
--- a/lib/cli-sb/package.json
+++ b/lib/cli-sb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sb",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
@@ -22,7 +22,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/cli": "6.0.0-beta.8"
+    "@storybook/cli": "6.0.0-beta.12"
   },
   "publishConfig": {
     "access": "public"
diff --git a/lib/cli-storybook/package.json b/lib/cli-storybook/package.json
index 6a19cf6a187..626c3e79af9 100644
--- a/lib/cli-storybook/package.json
+++ b/lib/cli-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "storybook",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
@@ -23,7 +23,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/cli": "6.0.0-beta.8"
+    "@storybook/cli": "6.0.0-beta.12"
   },
   "publishConfig": {
     "access": "public"
diff --git a/lib/cli/package.json b/lib/cli/package.json
index 832bf4b7dc2..5914c13983a 100644
--- a/lib/cli/package.json
+++ b/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -40,8 +40,8 @@
   "dependencies": {
     "@babel/core": "^7.9.6",
     "@babel/preset-env": "^7.9.6",
-    "@storybook/codemod": "6.0.0-beta.8",
-    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/codemod": "6.0.0-beta.12",
+    "@storybook/node-logger": "6.0.0-beta.12",
     "chalk": "^4.0.0",
     "commander": "^5.0.0",
     "core-js": "^3.0.1",
@@ -63,30 +63,30 @@
     "update-notifier": "^4.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-graphql": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/addon-links": "6.0.0-beta.8",
-    "@storybook/addon-storyshots": "6.0.0-beta.8",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/angular": "6.0.0-beta.8",
-    "@storybook/channel-postmessage": "6.0.0-beta.8",
-    "@storybook/channel-websocket": "6.0.0-beta.8",
-    "@storybook/channels": "6.0.0-beta.8",
-    "@storybook/ember": "6.0.0-beta.8",
-    "@storybook/html": "6.0.0-beta.8",
-    "@storybook/marionette": "6.0.0-beta.8",
-    "@storybook/marko": "6.0.0-beta.8",
-    "@storybook/mithril": "6.0.0-beta.8",
-    "@storybook/preact": "6.0.0-beta.8",
-    "@storybook/rax": "6.0.0-beta.8",
-    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-graphql": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/addon-links": "6.0.0-beta.12",
+    "@storybook/addon-storyshots": "6.0.0-beta.12",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/angular": "6.0.0-beta.12",
+    "@storybook/channel-postmessage": "6.0.0-beta.12",
+    "@storybook/channel-websocket": "6.0.0-beta.12",
+    "@storybook/channels": "6.0.0-beta.12",
+    "@storybook/ember": "6.0.0-beta.12",
+    "@storybook/html": "6.0.0-beta.12",
+    "@storybook/marionette": "6.0.0-beta.12",
+    "@storybook/marko": "6.0.0-beta.12",
+    "@storybook/mithril": "6.0.0-beta.12",
+    "@storybook/preact": "6.0.0-beta.12",
+    "@storybook/rax": "6.0.0-beta.12",
+    "@storybook/react": "6.0.0-beta.12",
     "@storybook/react-native": "6.0.0-alpha.0",
-    "@storybook/riot": "6.0.0-beta.8",
-    "@storybook/svelte": "6.0.0-beta.8",
-    "@storybook/ui": "6.0.0-beta.8",
-    "@storybook/vue": "6.0.0-beta.8",
-    "@storybook/web-components": "6.0.0-beta.8",
+    "@storybook/riot": "6.0.0-beta.12",
+    "@storybook/svelte": "6.0.0-beta.12",
+    "@storybook/ui": "6.0.0-beta.12",
+    "@storybook/vue": "6.0.0-beta.12",
+    "@storybook/web-components": "6.0.0-beta.12",
     "@types/cross-spawn": "^6.0.1",
     "@types/inquirer": "^6.5.0",
     "@types/puppeteer-core": "^2.0.0",
diff --git a/lib/cli/test/fixtures/sfc_vue/.babelrc b/lib/cli/test/fixtures/sfc_vue/.babelrc
index 32df804ee90..ba3f407ed47 100644
--- a/lib/cli/test/fixtures/sfc_vue/.babelrc
+++ b/lib/cli/test/fixtures/sfc_vue/.babelrc
@@ -5,7 +5,7 @@
       "targets": {
         "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
       }
-    }],
+    }]
   ],
   "plugins": ["@babel/plugin-transform-runtime"],
   "env": {
diff --git a/lib/cli/versions.json b/lib/cli/versions.json
index 0700b245f92..577cc998a90 100644
--- a/lib/cli/versions.json
+++ b/lib/cli/versions.json
@@ -1,17 +1,17 @@
 {
-  "@storybook/angular": "6.0.0-beta.8",
-  "@storybook/aurelia": "6.0.0-beta.8",
-  "@storybook/ember": "6.0.0-beta.8",
-  "@storybook/html": "6.0.0-beta.8",
-  "@storybook/marionette": "6.0.0-beta.8",
-  "@storybook/marko": "6.0.0-beta.8",
-  "@storybook/mithril": "6.0.0-beta.8",
-  "@storybook/preact": "6.0.0-beta.8",
-  "@storybook/rax": "6.0.0-beta.8",
-  "@storybook/react": "6.0.0-beta.8",
-  "@storybook/riot": "6.0.0-beta.8",
-  "@storybook/server": "6.0.0-beta.8",
-  "@storybook/svelte": "6.0.0-beta.8",
-  "@storybook/vue": "6.0.0-beta.8",
-  "@storybook/web-components": "6.0.0-beta.8"
+  "@storybook/angular": "6.0.0-beta.12",
+  "@storybook/aurelia": "6.0.0-beta.12",
+  "@storybook/ember": "6.0.0-beta.12",
+  "@storybook/html": "6.0.0-beta.12",
+  "@storybook/marionette": "6.0.0-beta.12",
+  "@storybook/marko": "6.0.0-beta.12",
+  "@storybook/mithril": "6.0.0-beta.12",
+  "@storybook/preact": "6.0.0-beta.12",
+  "@storybook/rax": "6.0.0-beta.12",
+  "@storybook/react": "6.0.0-beta.12",
+  "@storybook/riot": "6.0.0-beta.12",
+  "@storybook/server": "6.0.0-beta.12",
+  "@storybook/svelte": "6.0.0-beta.12",
+  "@storybook/vue": "6.0.0-beta.12",
+  "@storybook/web-components": "6.0.0-beta.12"
 }
\ No newline at end of file
diff --git a/lib/client-api/package.json b/lib/client-api/package.json
index cc5379e42d5..3aff3e7d704 100644
--- a/lib/client-api/package.json
+++ b/lib/client-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-api",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook Client API",
   "keywords": [
     "storybook"
@@ -28,11 +28,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/channel-postmessage": "6.0.0-beta.8",
-    "@storybook/channels": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/channel-postmessage": "6.0.0-beta.12",
+    "@storybook/channels": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
     "@storybook/csf": "0.0.1",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json
index 0321ba6c71c..b75cc8c8c44 100644
--- a/lib/client-logger/package.json
+++ b/lib/client-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-logger",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/lib/codemod/package.json b/lib/codemod/package.json
index 64b59d883ba..572adf21ef8 100644
--- a/lib/codemod/package.json
+++ b/lib/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/codemod",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "A collection of codemod scripts written with JSCodeshift",
   "keywords": [
     "storybook"
@@ -30,7 +30,7 @@
   "dependencies": {
     "@mdx-js/mdx": "^1.5.1",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "cross-spawn": "^7.0.0",
     "globby": "^11.0.0",
diff --git a/lib/components/package.json b/lib/components/package.json
index 5bd3bcaf414..536b045164a 100644
--- a/lib/components/package.json
+++ b/lib/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/components",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
@@ -28,9 +28,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.12",
     "@storybook/csf": "0.0.1",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.12",
     "@types/overlayscrollbars": "^1.9.0",
     "@types/react-color": "^3.0.1",
     "@types/react-syntax-highlighter": "11.0.4",
diff --git a/lib/core-events/package.json b/lib/core-events/package.json
index 092e8c59c09..182483ef24c 100644
--- a/lib/core-events/package.json
+++ b/lib/core-events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-events",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Event names used in storybook core",
   "keywords": [
     "storybook"
diff --git a/lib/core/package.json b/lib/core/package.json
index 244c5d12444..ac41b9ae836 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -48,17 +48,17 @@
     "@babel/preset-react": "^7.8.3",
     "@babel/preset-typescript": "^7.9.0",
     "@babel/register": "^7.8.3",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/channel-postmessage": "6.0.0-beta.8",
-    "@storybook/client-api": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/channel-postmessage": "6.0.0-beta.12",
+    "@storybook/client-api": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-beta.8",
-    "@storybook/router": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
-    "@storybook/ui": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.12",
+    "@storybook/router": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
+    "@storybook/ui": "6.0.0-beta.12",
     "@types/node-fetch": "^2.5.4",
     "airbnb-js-shims": "^2.2.1",
     "ansi-to-html": "^0.6.11",
diff --git a/lib/core/src/server/config.js b/lib/core/src/server/config.js
index 7e5970bf30d..f29703372af 100644
--- a/lib/core/src/server/config.js
+++ b/lib/core/src/server/config.js
@@ -16,6 +16,11 @@ async function getPreviewWebpackConfig(options, presets) {
   );
 }
 
+export const filterPresetsConfig = (presetsConfig) =>
+  presetsConfig.filter(
+    (preset) => !/@storybook[\\\\/]preset-typescript/.test(preset.name || preset)
+  );
+
 export default async (options) => {
   const { corePresets = [], frameworkPresets = [], overridePresets = [], ...restOptions } = options;
 
@@ -28,9 +33,7 @@ export default async (options) => {
   ];
 
   // Remove `@storybook/preset-typescript` and add a warning if in use.
-  const filteredPresetConfig = presetsConfig.filter(
-    (preset) => !/@storybook[\\\\/]preset-typescript/.test(preset)
-  );
+  const filteredPresetConfig = filterPresetsConfig(presetsConfig);
   if (filteredPresetConfig.length < presetsConfig.length) {
     logger.warn(
       'Storybook now supports TypeScript natively. You can safely remove `@storybook/preset-typescript`.'
diff --git a/lib/core/src/server/config.test.js b/lib/core/src/server/config.test.js
new file mode 100644
index 00000000000..44cf29c13ea
--- /dev/null
+++ b/lib/core/src/server/config.test.js
@@ -0,0 +1,21 @@
+import { filterPresetsConfig } from './config';
+
+describe('filterPresetsConfig', () => {
+  it('string config', () => {
+    expect(
+      filterPresetsConfig(['@storybook/preset-scss', '@storybook/preset-typescript'])
+    ).toEqual(['@storybook/preset-scss']);
+  });
+
+  it('windows paths', () => {
+    expect(filterPresetsConfig(['a', '@storybook\\preset-typescript'])).toEqual(['a']);
+  });
+
+  it('object config', () => {
+    const tsConfig = {
+      name: '@storybook/preset-typescript',
+      options: { foo: 1 },
+    };
+    expect(filterPresetsConfig([tsConfig, 'a'])).toEqual(['a']);
+  });
+});
diff --git a/lib/core/src/server/config/defaults.js b/lib/core/src/server/config/defaults.js
index 28c4b29435c..a2ba128cc83 100644
--- a/lib/core/src/server/config/defaults.js
+++ b/lib/core/src/server/config/defaults.js
@@ -1,4 +1,7 @@
 export const typeScriptDefaults = {
   check: false,
   reactDocgen: 'react-docgen-typescript',
+  reactDocgenTypescriptOptions: {
+    propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
+  },
 };
diff --git a/lib/core/types/index.ts b/lib/core/types/index.ts
index 2edb4149737..2369d784dcc 100644
--- a/lib/core/types/index.ts
+++ b/lib/core/types/index.ts
@@ -1,8 +1,9 @@
 import type ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import type LoaderOptions from 'react-docgen-typescript-loader/dist/LoaderOptions';
+import { Configuration } from 'webpack';
 
 /**
- * The interface for Storybook configuration in `main.js` files.
+ * The interface for Storybook configuration in `main.ts` files.
  */
 export interface StorybookConfig {
   /**
@@ -10,7 +11,7 @@ export interface StorybookConfig {
    *
    * @example `['@storybook/addon-essentials']`
    */
-  addons: string[];
+  addons?: string[];
   /**
    * Tells Storybook where to find stories.
    *
@@ -21,12 +22,20 @@ export interface StorybookConfig {
    * Controls how Storybook hanldes TypeScript files.
    */
   typescript?: Partial<TypescriptOptions>;
+  /**
+   * Modify or return a custom Webpack config.
+   */
+  webpackFinal?: (
+    config: Configuration,
+    options: StorybookOptions
+  ) => Configuration | Promise<Configuration>;
 }
 
 /**
  * The internal options object, used by Storybook frameworks and adddons.
  */
 export interface StorybookOptions {
+  configType: 'DEVELOPMENT' | 'PRODUCTION';
   typescriptOptions: TypescriptOptions;
 }
 
@@ -52,6 +61,9 @@ export interface TypescriptOptions {
   reactDocgen: 'react-docgen-typescript' | 'react-docgen' | false;
   /**
    * Configures `react-docgen-typescript-loader`
+   *
+   * @default
+   * @see https://github.com/storybookjs/storybook/blob/next/lib/core/src/server/config/defaults.js#L4-L6
    */
-  reactDocgenTypescriptOptions?: LoaderOptions;
+  reactDocgenTypescriptOptions: LoaderOptions;
 }
diff --git a/lib/node-logger/package.json b/lib/node-logger/package.json
index 6cf0d0dddf0..308021151fe 100644
--- a/lib/node-logger/package.json
+++ b/lib/node-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/node-logger",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/lib/postinstall/package.json b/lib/postinstall/package.json
index d83cf824c1f..29315167ad7 100644
--- a/lib/postinstall/package.json
+++ b/lib/postinstall/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/postinstall",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Storybook addons postinstall utilities",
   "keywords": [
     "api",
diff --git a/lib/router/package.json b/lib/router/package.json
index e28be2e3342..04d25c0b214 100644
--- a/lib/router/package.json
+++ b/lib/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/router",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Core Storybook Router",
   "keywords": [
     "storybook"
diff --git a/lib/source-loader/package.json b/lib/source-loader/package.json
index 4c624f34889..8ad35d86ebb 100644
--- a/lib/source-loader/package.json
+++ b/lib/source-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/source-loader",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Source loader",
   "keywords": [
     "lib",
@@ -29,8 +29,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
     "@storybook/csf": "0.0.1",
     "core-js": "^3.0.1",
     "estraverse": "^4.2.0",
diff --git a/lib/theming/package.json b/lib/theming/package.json
index f1dd0a60aaf..ef63b39cfd9 100644
--- a/lib/theming/package.json
+++ b/lib/theming/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/theming",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
@@ -31,7 +31,7 @@
     "@emotion/core": "^10.0.20",
     "@emotion/is-prop-valid": "^0.8.6",
     "@emotion/styled": "^10.0.17",
-    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.12",
     "core-js": "^3.0.1",
     "deep-object-diff": "^1.1.0",
     "emotion-theming": "^10.0.19",
diff --git a/lib/ui/package.json b/lib/ui/package.json
index 5fc5dbb3c9d..66ae9dd4949 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ui",
-  "version": "6.0.0-beta.8",
+  "version": "6.0.0-beta.12",
   "description": "Core Storybook UI",
   "keywords": [
     "storybook"
@@ -29,14 +29,14 @@
   },
   "dependencies": {
     "@emotion/core": "^10.0.20",
-    "@storybook/addons": "6.0.0-beta.8",
-    "@storybook/api": "6.0.0-beta.8",
-    "@storybook/channels": "6.0.0-beta.8",
-    "@storybook/client-logger": "6.0.0-beta.8",
-    "@storybook/components": "6.0.0-beta.8",
-    "@storybook/core-events": "6.0.0-beta.8",
-    "@storybook/router": "6.0.0-beta.8",
-    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.12",
+    "@storybook/api": "6.0.0-beta.12",
+    "@storybook/channels": "6.0.0-beta.12",
+    "@storybook/client-logger": "6.0.0-beta.12",
+    "@storybook/components": "6.0.0-beta.12",
+    "@storybook/core-events": "6.0.0-beta.12",
+    "@storybook/router": "6.0.0-beta.12",
+    "@storybook/theming": "6.0.0-beta.12",
     "@types/markdown-to-jsx": "^6.9.1",
     "@types/rfdc": "^1.1.0",
     "copy-to-clipboard": "^3.0.8",
@@ -66,9 +66,9 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/addon-actions": "6.0.0-beta.8",
-    "@storybook/addon-knobs": "6.0.0-beta.8",
-    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.12",
+    "@storybook/addon-knobs": "6.0.0-beta.12",
+    "@storybook/react": "6.0.0-beta.12",
     "@testing-library/react": "^10.0.3",
     "babel-loader": "^8.0.6",
     "chromatic": "^4.0.2",
diff --git a/scripts/build-storybooks.js b/scripts/build-storybooks.js
index 52b074873be..4be6f9787a0 100755
--- a/scripts/build-storybooks.js
+++ b/scripts/build-storybooks.js
@@ -144,7 +144,7 @@ const run = async () => {
     logger.log(
       `will build: ${deployables.join(', ')} (${
         deployables.length
-      } total - offset: ${offset} | step: ${step})`
+      } total - offset: ${offset} | step: ${step} | length: ${length} | node_index: ${a} | total: ${b} |)`
     );
     await handleExamples(deployables);
   }
diff --git a/yarn.lock b/yarn.lock
index 98161cebaeb..269c54c59ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31437,17 +31437,6 @@ ts-loader@^6.0.0, ts-loader@^6.0.1, ts-loader@^6.2.0, ts-loader@^6.2.2:
     micromatch "^4.0.0"
     semver "^6.0.0"
 
-ts-loader@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.4.tgz#5d9b95227de5afb91fdd9668f8920eb193cfe0cc"
-  integrity sha512-5du6OQHl+4ZjO4crEyoYUyWSrmmo7bAO+inkaILZ68mvahqrfoa4nn0DRmpQ4ruT4l+cuJCgF0xD7SBIyLeeow==
-  dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^1.0.2"
-    micromatch "^4.0.0"
-    semver "^6.0.0"
-
 ts-map@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/ts-map/-/ts-map-1.0.3.tgz#1c4d218dec813d2103b7e04e4bcf348e1471c1ff"