diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5edc1b26082c..c18b43260fba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## 6.0.25 (October 4, 2020)
+
+### Bug Fixes
+
+- CLI: Workaround for react native `sb init` ([#12405](https://github.com/storybookjs/storybook/pull/12405))
+
+## 6.0.24 (October 4, 2020)
+
+Failed NPM publish
+
+## 6.0.23 (October 4, 2020)
+
+Failed NPM publish
+
+## 6.1.0-alpha.19 (October 3, 2020)
+
+### Maintenance
+
+- ArgsTable: Remove the "simple" detection for enum types ([#12587](https://github.com/storybookjs/storybook/pull/12587))
+- Addon-docs: Move summary & detail equality check to createSummaryValue ([#12588](https://github.com/storybookjs/storybook/pull/12588))
+- Essentials: Make controls tab show first ([#12652](https://github.com/storybookjs/storybook/pull/12652))
+- Misc: Clean usage and place in the monorepo of some dependencies ([#12653](https://github.com/storybookjs/storybook/pull/12653))
+
 ## 6.1.0-alpha.18 (September 30, 2020)
 
 ### Bug Fixes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d8dca81e1c03..d7c3e45ed4fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -303,7 +303,7 @@ If you're working on one or a few packages, for every change that you make, you
 - Run `yarn build <package-name>` to build that package specifically. \
   For the package name, use its short version. Example: for `@storybook/addon-docs`, run `yarn build addon-docs`.
 - Run `yarn build --all` to build everything.
-- Add `--watch` to run automatically in watch more if you are either building a selection of packages by name or building all.
+- Add `--watch` to run automatically in watch mode if you are either building a selection of packages by name or building all.
   Example: `yarn build core addon-docs --watch` or `yarn build --all --watch`.
 
 ### Working with the kitchen sink apps
diff --git a/addons/a11y/package.json b/addons/a11y/package.json
index ca7edd684136..a82e55ee1e9e 100644
--- a/addons/a11y/package.json
+++ b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,14 +33,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/channels": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/channels": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "axe-core": "^4.0.1",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -59,7 +59,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/actions/package.json b/addons/actions/package.json
index 4e80861722b1..ea6595d9d888 100644
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^3.1.1",
     "global": "^4.3.2",
@@ -56,7 +56,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
index bc92d43a96d5..81d7b6dd921f 100644
--- a/addons/backgrounds/package.json
+++ b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "memoizerific": "^1.11.3",
@@ -53,7 +53,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/controls/package.json b/addons/controls/package.json
index 789f684ee4fa..f73146e8198e 100644
--- a/addons/controls/package.json
+++ b/addons/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Controls for component properties",
   "keywords": [
     "addon",
@@ -30,12 +30,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "react": "^16.8.3",
     "react-dom": "^16.8.3",
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b"
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1"
 }
diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
index 95b3a9160164..b45dc3ee8ec2 100644
--- a/addons/cssresources/package.json
+++ b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
@@ -51,7 +51,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json
index a91d669a5e97..8dad3d6d0da4 100644
--- a/addons/design-assets/package.json
+++ b/addons/design-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-design-assets",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Design asset preview for storybook",
   "keywords": [
     "addon",
@@ -34,12 +34,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
@@ -51,7 +51,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/docs/package.json b/addons/docs/package.json
index b4a34411132e..de6fec1f061e 100644
--- a/addons/docs/package.json
+++ b/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Superior documentation for your components",
   "keywords": [
     "addon",
@@ -47,18 +47,18 @@
     "@mdx-js/loader": "^1.5.1",
     "@mdx-js/mdx": "^1.5.1",
     "@mdx-js/react": "^1.5.1",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.1.0-alpha.18",
-    "@storybook/postinstall": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/node-logger": "6.1.0-alpha.19",
+    "@storybook/postinstall": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "acorn": "^7.1.0",
     "acorn-jsx": "^5.1.0",
     "acorn-walk": "^7.0.0",
@@ -86,9 +86,9 @@
     "@babel/core": "^7.11.5",
     "@emotion/core": "^10.0.20",
     "@emotion/styled": "^10.0.17",
-    "@storybook/react": "6.1.0-alpha.18",
-    "@storybook/vue": "6.1.0-alpha.18",
-    "@storybook/web-components": "6.1.0-alpha.18",
+    "@storybook/react": "6.1.0-alpha.19",
+    "@storybook/vue": "6.1.0-alpha.19",
+    "@storybook/web-components": "6.1.0-alpha.19",
     "@types/cross-spawn": "^6.0.1",
     "@types/doctrine": "^0.0.3",
     "@types/enzyme": "^3.10.3",
@@ -119,7 +119,7 @@
   },
   "peerDependencies": {
     "@babel/core": "^7.11.5",
-    "@storybook/vue": "6.1.0-alpha.18",
+    "@storybook/vue": "6.1.0-alpha.19",
     "babel-loader": "^8.0.0",
     "sveltedoc-parser": "^3.0.4",
     "vue": "^2.6.10",
@@ -142,7 +142,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/docs/src/frameworks/react/lib/defaultValues/createDefaultValue.ts b/addons/docs/src/frameworks/react/lib/defaultValues/createDefaultValue.ts
index a7ad97be6cc4..c4cd930e1011 100644
--- a/addons/docs/src/frameworks/react/lib/defaultValues/createDefaultValue.ts
+++ b/addons/docs/src/frameworks/react/lib/defaultValues/createDefaultValue.ts
@@ -47,10 +47,7 @@ function generateElement(
         inferredType as InspectionIdentifiableInferedType
       );
 
-      return createSummaryValue(
-        prettyIdentifier,
-        prettyIdentifier !== defaultValue ? defaultValue : undefined
-      );
+      return createSummaryValue(prettyIdentifier, defaultValue);
     }
   }
 
diff --git a/addons/docs/src/frameworks/react/lib/defaultValues/createFromRawDefaultProp.ts b/addons/docs/src/frameworks/react/lib/defaultValues/createFromRawDefaultProp.ts
index 577bd02168a1..89bbe589682c 100644
--- a/addons/docs/src/frameworks/react/lib/defaultValues/createFromRawDefaultProp.ts
+++ b/addons/docs/src/frameworks/react/lib/defaultValues/createFromRawDefaultProp.ts
@@ -50,7 +50,7 @@ function generateReactObject(rawDefaultProp: any) {
   if (displayName != null) {
     const prettyIdentifier = getPrettyElementIdentifier(displayName);
 
-    return createSummaryValue(prettyIdentifier, prettyIdentifier !== jsx ? jsx : undefined);
+    return createSummaryValue(prettyIdentifier, jsx);
   }
 
   if (isString(type)) {
diff --git a/addons/docs/src/frameworks/react/propTypes/createType.ts b/addons/docs/src/frameworks/react/propTypes/createType.ts
index 94af646f02bb..6af9bc582898 100644
--- a/addons/docs/src/frameworks/react/propTypes/createType.ts
+++ b/addons/docs/src/frameworks/react/propTypes/createType.ts
@@ -381,7 +381,7 @@ export function createType(extractedProp: ExtractedProp): PropType {
           }
         }
 
-        return createSummaryValue(short, short !== full ? full : undefined);
+        return createSummaryValue(short, full);
       }
       case PropTypesType.FUNC: {
         const { short, full } = generateType(type, extractedProp);
diff --git a/addons/docs/src/frameworks/react/propTypes/rawDefaultPropResolvers.ts b/addons/docs/src/frameworks/react/propTypes/rawDefaultPropResolvers.ts
index 81c8b5aafd17..9433159adde6 100644
--- a/addons/docs/src/frameworks/react/propTypes/rawDefaultPropResolvers.ts
+++ b/addons/docs/src/frameworks/react/propTypes/rawDefaultPropResolvers.ts
@@ -17,7 +17,8 @@ const funcResolver: TypeResolver = (rawDefaultProp, { name, type }) => {
       return createSummaryValue(getPrettyElementIdentifier(funcName));
     }
 
-    const { hasParams } = inspectValue(rawDefaultProp.toString()).inferredType as InspectionFunction;
+    const { hasParams } = inspectValue(rawDefaultProp.toString())
+      .inferredType as InspectionFunction;
 
     return createSummaryValue(getPrettyFuncIdentifier(funcName, hasParams));
   }
diff --git a/addons/docs/src/lib/utils.test.ts b/addons/docs/src/lib/utils.test.ts
new file mode 100644
index 000000000000..0cd887200ded
--- /dev/null
+++ b/addons/docs/src/lib/utils.test.ts
@@ -0,0 +1,20 @@
+import { createSummaryValue } from './utils';
+
+describe('createSummaryValue', () => {
+  it('creates an object with just summary if detail is not passed', () => {
+    const summary = 'boolean';
+    expect(createSummaryValue(summary)).toEqual({ summary });
+  });
+
+  it('creates an object with summary & detail if passed', () => {
+    const summary = 'MyType';
+    const detail = 'boolean | string';
+    expect(createSummaryValue(summary, detail)).toEqual({ summary, detail });
+  });
+
+  it('creates an object with just summary if details are equal', () => {
+    const summary = 'boolean';
+    const detail = 'boolean';
+    expect(createSummaryValue(summary, detail)).toEqual({ summary });
+  });
+});
diff --git a/addons/docs/src/lib/utils.ts b/addons/docs/src/lib/utils.ts
index 58f9d75efdf2..b623c12e19b7 100644
--- a/addons/docs/src/lib/utils.ts
+++ b/addons/docs/src/lib/utils.ts
@@ -12,6 +12,9 @@ export function isTooLongForDefaultValueSummary(value: string): boolean {
 }
 
 export function createSummaryValue(summary: string, detail?: string): PropSummaryValue {
+  if (summary === detail) {
+    return { summary };
+  }
   return { summary, detail };
 }
 
diff --git a/addons/essentials/package.json b/addons/essentials/package.json
index 71df28236831..36ee92b6ef28 100644
--- a/addons/essentials/package.json
+++ b/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -28,15 +28,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-toolbars": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-toolbars": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "react": "^16.8.3",
     "react-dom": "^16.8.3",
@@ -46,13 +46,13 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/vue": "6.1.0-alpha.18",
+    "@storybook/vue": "6.1.0-alpha.19",
     "@types/jest": "^25.1.1",
     "@types/webpack-env": "^1.15.2"
   },
   "peerDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/vue": "6.1.0-alpha.18",
+    "@storybook/vue": "6.1.0-alpha.19",
     "babel-loader": "^8.0.0",
     "webpack": ">=4"
   },
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/essentials/src/index.ts b/addons/essentials/src/index.ts
index 5a3eb4b928b1..bd5aead894c8 100644
--- a/addons/essentials/src/index.ts
+++ b/addons/essentials/src/index.ts
@@ -34,7 +34,7 @@ export function addons(options: PresetOptions = {}) {
 
   const main = requireMain(options.configDir);
   return (
-    ['actions', 'docs', 'controls', 'backgrounds', 'viewport', 'toolbars']
+    ['docs', 'controls', 'actions', 'backgrounds', 'viewport', 'toolbars']
       .filter((key) => (options as any)[key] !== false)
       .map((key) => `@storybook/addon-${key}`)
       .filter((addon) => !checkInstalled(addon, main))
diff --git a/addons/events/package.json b/addons/events/package.json
index cfea49d4f81f..2c0680638e7e 100644
--- a/addons/events/package.json
+++ b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -31,11 +31,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "format-json": "^1.0.3",
     "lodash": "^4.17.15",
@@ -52,7 +52,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json
index c26bdac8fef1..2146669164c9 100644
--- a/addons/google-analytics/package.json
+++ b/addons/google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-google-analytics",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b"
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1"
 }
diff --git a/addons/graphql/package.json b/addons/graphql/package.json
index 42fff708ba8e..72859d8a2f30 100644
--- a/addons/graphql/package.json
+++ b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@babel/core": "^7.11.5",
     "@babel/plugin-transform-classes": "^7.10.4",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
     "@types/webpack": "^4.41.9",
     "babel-loader": "^8.0.6",
     "core-js": "^3.0.1",
@@ -48,7 +48,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/jest/package.json b/addons/jest/package.json
index 2383faab5022..f4afec319bc4 100644
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -35,11 +35,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
@@ -54,7 +54,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/knobs/package.json b/addons/knobs/package.json
index 99f69872485c..78734ff6f893 100644
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook Addon Prop Editor Component",
   "keywords": [
     "addon",
@@ -29,13 +29,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/channels": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/channels": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "copy-to-clipboard": "^3.0.8",
     "core-js": "^3.0.1",
     "escape-html": "^1.0.3",
@@ -63,7 +63,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/links/package.json b/addons/links/package.json
index 27d98cf2d16f..7fe5737eab52 100644
--- a/addons/links/package.json
+++ b/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Story Links addon for storybook",
   "keywords": [
     "addon",
@@ -29,11 +29,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
     "@storybook/csf": "0.0.1",
-    "@storybook/router": "6.1.0-alpha.18",
+    "@storybook/router": "6.1.0-alpha.19",
     "@types/qs": "^6.9.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -51,7 +51,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/queryparams/package.json b/addons/queryparams/package.json
index d0f4263942e6..6cc743c1ea5e 100644
--- a/addons/queryparams/package.json
+++ b/addons/queryparams/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-queryparams",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "parameter addon for storybook",
   "keywords": [
     "addon",
@@ -30,12 +30,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "qs": "^6.6.0",
@@ -50,7 +50,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json
index 04af2478d154..b94510d0e3a8 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
     "@types/glob": "^7.1.1",
     "@types/jest": "^25.1.1",
     "@types/jest-specific-snapshot": "^0.5.3",
@@ -53,17 +53,31 @@
     "ts-dedent": "^1.1.1"
   },
   "devDependencies": {
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/react": "6.1.0-alpha.18",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/react": "6.1.0-alpha.19",
     "babel-loader": "^8.0.6",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.4.1",
-    "jest-emotion": "^10.0.17"
+    "jest-emotion": "^10.0.17",
+    "jest-preset-angular": "^8.2.0",
+    "jest-vue-preprocessor": "^1.5.0"
+  },
+  "peerDependencies": {
+    "jest-preset-angular": "*",
+    "jest-vue-preprocessor": "*"
+  },
+  "peerDependenciesMeta": {
+    "jest-preset-angular": {
+      "optional": true
+    },
+    "jest-vue-preprocessor": {
+      "optional": true
+    }
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/storyshots/storyshots-core/src/api/StoryshotsOptions.ts b/addons/storyshots/storyshots-core/src/api/StoryshotsOptions.ts
index 8f1837d9d920..ee35d4443641 100644
--- a/addons/storyshots/storyshots-core/src/api/StoryshotsOptions.ts
+++ b/addons/storyshots/storyshots-core/src/api/StoryshotsOptions.ts
@@ -3,6 +3,24 @@ import { Stories2SnapsConverter } from '../Stories2SnapsConverter';
 import { SupportedFramework } from '../frameworks';
 import { RenderTree } from '../frameworks/Loader';
 
+export interface TestMethodOptions {
+  story: any;
+  context: any;
+  renderTree: RenderTree;
+  renderShallowTree: RenderTree;
+  stories2snapsConverter: Stories2SnapsConverter;
+  snapshotFileName: string;
+  options: any;
+}
+
+export interface StoryshotsTestMethod {
+  (args: TestMethodOptions): any;
+  beforeAll?: () => void | Promise<void>;
+  beforeEach?: () => void | Promise<void>;
+  afterAll?: () => void | Promise<void>;
+  afterEach?: () => void | Promise<void>;
+}
+
 export interface StoryshotsOptions {
   asyncJest?: boolean;
   config?: (options: any) => void;
@@ -12,7 +30,7 @@ export interface StoryshotsOptions {
   storyKindRegex?: RegExp | string;
   storyNameRegex?: RegExp | string;
   framework?: SupportedFramework;
-  test?: (story: any, context: any, renderTree: RenderTree, options?: any) => any;
+  test?: StoryshotsTestMethod;
   renderer?: Function;
   snapshotSerializers?: jest.SnapshotSerializerPlugin[];
   /**
diff --git a/addons/storyshots/storyshots-core/src/api/snapshotsTestsTemplate.ts b/addons/storyshots/storyshots-core/src/api/snapshotsTestsTemplate.ts
index a2564022f4e6..deef13602eb8 100644
--- a/addons/storyshots/storyshots-core/src/api/snapshotsTestsTemplate.ts
+++ b/addons/storyshots/storyshots-core/src/api/snapshotsTestsTemplate.ts
@@ -11,9 +11,9 @@ function snapshotTest({ item, asyncJest, framework, testMethod, testMethodParams
     it(
       name,
       () =>
-        new Promise((done) =>
+        new Promise((resolve, reject) =>
           testMethod({
-            done,
+            done: (error: any) => (error ? reject(error) : resolve()),
             story: item,
             context,
             ...testMethodParams,
diff --git a/addons/storyshots/storyshots-core/src/frameworks/angular/renderTree.ts b/addons/storyshots/storyshots-core/src/frameworks/angular/renderTree.ts
index 2e55f4bcaebb..60ca875cfefa 100644
--- a/addons/storyshots/storyshots-core/src/frameworks/angular/renderTree.ts
+++ b/addons/storyshots/storyshots-core/src/frameworks/angular/renderTree.ts
@@ -1,6 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
 import AngularSnapshotSerializer from 'jest-preset-angular/build/AngularSnapshotSerializer';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import HTMLCommentSerializer from 'jest-preset-angular/build/HTMLCommentSerializer';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { TestBed } from '@angular/core/testing';
diff --git a/addons/storyshots/storyshots-core/src/test-bodies.ts b/addons/storyshots/storyshots-core/src/test-bodies.ts
index d85fbe646a59..e8fbc7f674ff 100644
--- a/addons/storyshots/storyshots-core/src/test-bodies.ts
+++ b/addons/storyshots/storyshots-core/src/test-bodies.ts
@@ -1,104 +1,76 @@
 import 'jest-specific-snapshot';
-import { RenderTree } from './frameworks/Loader';
-import { Stories2SnapsConverter } from './Stories2SnapsConverter';
+import { StoryshotsTestMethod, TestMethodOptions } from './api/StoryshotsOptions';
 
 const isFunction = (obj: any) => !!(obj && obj.constructor && obj.call && obj.apply);
 const optionsOrCallOptions = (opts: any, story: any) => (isFunction(opts) ? opts(story) : opts);
 
-export const snapshotWithOptions = (
+type SnapshotsWithOptionsReturnType = (
+  options: Pick<TestMethodOptions, 'story' | 'context' | 'renderTree' | 'snapshotFileName'>
+) => any;
+
+export function snapshotWithOptions(
   options: { renderer?: any; serializer?: any } | Function = {}
-) => ({
-  story,
-  context,
-  renderTree,
-  snapshotFileName,
-}: {
-  story: any;
-  context: any;
-  renderTree: RenderTree;
-  snapshotFileName: string;
-}): Promise<void> | void => {
-  const result = renderTree(story, context, optionsOrCallOptions(options, story));
+): SnapshotsWithOptionsReturnType {
+  return ({ story, context, renderTree, snapshotFileName }) => {
+    const result = renderTree(story, context, optionsOrCallOptions(options, story));
 
-  function match(tree: any) {
-    let target = tree;
-    const isReact = story.parameters.framework === 'react';
+    function match(tree: any) {
+      let target = tree;
+      const isReact = story.parameters.framework === 'react';
 
-    if (isReact && typeof tree.childAt === 'function') {
-      target = tree.childAt(0);
-    }
-    if (isReact && Array.isArray(tree.children)) {
-      [target] = tree.children;
-    }
+      if (isReact && typeof tree.childAt === 'function') {
+        target = tree.childAt(0);
+      }
+      if (isReact && Array.isArray(tree.children)) {
+        [target] = tree.children;
+      }
 
-    if (snapshotFileName) {
-      expect(target).toMatchSpecificSnapshot(snapshotFileName);
-    } else {
-      expect(target).toMatchSnapshot();
-    }
+      if (snapshotFileName) {
+        expect(target).toMatchSpecificSnapshot(snapshotFileName);
+      } else {
+        expect(target).toMatchSnapshot();
+      }
 
-    if (typeof tree.unmount === 'function') {
-      tree.unmount();
+      if (typeof tree.unmount === 'function') {
+        tree.unmount();
+      }
     }
-  }
 
-  if (typeof result.then === 'function') {
-    return result.then(match);
-  }
+    if (typeof result.then === 'function') {
+      return result.then(match);
+    }
 
-  return match(result);
-};
+    return match(result);
+  };
+}
 
-export const multiSnapshotWithOptions = (options = {}) => ({
-  story,
-  context,
-  renderTree,
-  stories2snapsConverter,
-}: {
-  story: any;
-  context: any;
-  renderTree: RenderTree;
-  stories2snapsConverter: Stories2SnapsConverter;
-}) =>
-  snapshotWithOptions(options)({
-    story,
-    context,
-    renderTree,
-    snapshotFileName: stories2snapsConverter.getSnapshotFileName(context),
-  });
+export function multiSnapshotWithOptions(options = {}): StoryshotsTestMethod {
+  return ({ story, context, renderTree, stories2snapsConverter }) => {
+    const snapshotFileName = stories2snapsConverter.getSnapshotFileName(context);
+    return snapshotWithOptions(options)({ story, context, renderTree, snapshotFileName });
+  };
+}
 
-export function shallowSnapshot({
+export const shallowSnapshot: StoryshotsTestMethod = ({
   story,
   context,
   renderShallowTree,
   options = {},
-}: {
-  story: any;
-  context: any;
-  renderShallowTree: RenderTree;
-  options: any;
-}) {
+}) => {
   const result = renderShallowTree(story, context, options);
   expect(result).toMatchSnapshot();
-}
-
-export const renderWithOptions = (options = {}) => ({
-  story,
-  context,
-  renderTree,
-}: {
-  story: any;
-  context: any;
-  renderTree: RenderTree;
-}) => {
-  const result = renderTree(story, context, options);
+};
 
-  if (typeof result.then === 'function') {
-    return result;
-  }
+export function renderWithOptions(options = {}): StoryshotsTestMethod {
+  return ({ story, context, renderTree }) => {
+    const result = renderTree(story, context, options);
+    if (typeof result.then === 'function') {
+      return result;
+    }
 
-  return undefined;
-};
+    return undefined;
+  };
+}
 
 export const renderOnly = renderWithOptions();
 
diff --git a/addons/storyshots/storyshots-puppeteer/package.json b/addons/storyshots/storyshots-puppeteer/package.json
index 44e7ca36fe28..a484ac495896 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
+    "@storybook/node-logger": "6.1.0-alpha.19",
     "@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.1.0-alpha.18",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
     "puppeteer": "^2.0.0 || ^3.0.0"
   },
   "peerDependenciesMeta": {
@@ -53,7 +53,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/storyshots/storyshots-puppeteer/src/imageSnapshot.ts b/addons/storyshots/storyshots-puppeteer/src/imageSnapshot.ts
index d2e950401f7a..e069f7b22d2b 100644
--- a/addons/storyshots/storyshots-puppeteer/src/imageSnapshot.ts
+++ b/addons/storyshots/storyshots-puppeteer/src/imageSnapshot.ts
@@ -11,7 +11,7 @@ export const imageSnapshot = (customConfig: Partial<ImageSnapshotConfig> = {}) =
   return puppeteerTest({
     ...config,
     async testBody(page, options) {
-      expect.assertions(1);
+      expect.hasAssertions();
       const element = await beforeScreenshot(page, options);
       const image = await (element || page).screenshot(getScreenshotOptions(options));
       await afterScreenshot({ image, context: options.context });
diff --git a/addons/storysource/package.json b/addons/storysource/package.json
index 8fcf7882cd78..3280fc5f6cf7 100644
--- a/addons/storysource/package.json
+++ b/addons/storysource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Stories addon for storybook",
   "keywords": [
     "addon",
@@ -29,13 +29,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/router": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/router": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "estraverse": "^4.2.0",
     "loader-utils": "^2.0.0",
@@ -53,7 +53,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/addons/toolbars/package.json b/addons/toolbars/package.json
index 82af21cd5a09..d991a92ea696 100644
--- a/addons/toolbars/package.json
+++ b/addons/toolbars/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-toolbars",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook toolbars addon",
   "keywords": [
     "addon",
@@ -30,10 +30,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "react": "^16.8.3",
     "react-dom": "^16.8.3"
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b"
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1"
 }
diff --git a/addons/viewport/package.json b/addons/viewport/package.json
index 81271b68b965..06e095c13d0c 100644
--- a/addons/viewport/package.json
+++ b/addons/viewport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "memoizerific": "^1.11.3",
@@ -46,7 +46,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/angular/package.json b/app/angular/package.json
index 7858b3b3c46b..c62d0ff24fe2 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
     "@types/webpack-env": "^1.15.2",
     "autoprefixer": "^9.7.6",
     "core-js": "^3.0.1",
@@ -52,6 +52,14 @@
     "webpack": "^4.43.0"
   },
   "devDependencies": {
+    "@angular-devkit/build-angular": "~0.901.0",
+    "@angular-devkit/core": "^9.1.0",
+    "@angular/common": "^9.1.0",
+    "@angular/compiler": "^9.1.0",
+    "@angular/core": "^9.1.0",
+    "@angular/forms": "^9.1.0",
+    "@angular/platform-browser": "^9.1.0",
+    "@angular/platform-browser-dynamic": "^9.1.0",
     "@types/autoprefixer": "^9.4.0"
   },
   "peerDependencies": {
@@ -74,7 +82,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/angular/src/client/preview/angular/components/app.component.ts b/app/angular/src/client/preview/angular/components/app.component.ts
index 81d2cada177c..57bd79442abc 100644
--- a/app/angular/src/client/preview/angular/components/app.component.ts
+++ b/app/angular/src/client/preview/angular/components/app.component.ts
@@ -33,7 +33,7 @@ export class AppComponent implements OnInit, OnDestroy {
 
   subscription: Subscription;
 
-  propSubscriptions = new Map<any, { prop: any, sub: Subscription }>();
+  propSubscriptions = new Map<any, { prop: any; sub: Subscription }>();
 
   constructor(
     private cfr: ComponentFactoryResolver,
@@ -67,11 +67,11 @@ export class AppComponent implements OnInit, OnDestroy {
       this.subscription.unsubscribe();
     }
 
-    this.propSubscriptions.forEach(v => {
+    this.propSubscriptions.forEach((v) => {
       if (!v.sub.closed) {
         v.sub.unsubscribe();
       }
-    })
+    });
     this.propSubscriptions.clear();
   }
 
@@ -150,7 +150,7 @@ export class AppComponent implements OnInit, OnDestroy {
         v.sub.unsubscribe();
       }
     }
-    
+
     const sub = instanceProperty.subscribe(value);
     this.propSubscriptions.set(key, { prop: value, sub });
   }
diff --git a/app/aurelia/package.json b/app/aurelia/package.json
index b4a6899018f2..ba79517b3439 100644
--- a/app/aurelia/package.json
+++ b/app/aurelia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/aurelia",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for Aurelia: Develop Aurelia Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -27,10 +27,10 @@
   },
   "dependencies": {
     "@aurelia/webpack-loader": "^0.7.0",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
     "fork-ts-checker-webpack-plugin": "^4.0.3",
     "global": "^4.3.2",
     "ts-loader": "^6.0.1",
@@ -40,6 +40,7 @@
   "devDependencies": {
     "@types/node": "^14.0.10",
     "@types/webpack-env": "^1.15.1",
+    "aurelia": "^0.7.0",
     "css-loader": "^3.0.0",
     "file-loader": "^4.2.0",
     "html-webpack-plugin": "^3.0.0",
@@ -52,10 +53,10 @@
     "webpack": "^4.33.0"
   },
   "peerDependencies": {
-    "aurelia": "dev"
+    "aurelia": "*"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b"
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1"
 }
diff --git a/app/ember/package.json b/app/ember/package.json
index 8b68b4ea1a12..49f600b8a5fc 100644
--- a/app/ember/package.json
+++ b/app/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ember",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
+    "@storybook/core": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
@@ -50,7 +50,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/html/package.json b/app/html/package.json
index cb5eee3bf4d0..753bb7535f28 100644
--- a/app/html/package.json
+++ b/app/html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,9 +34,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -53,7 +53,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/marionette/package.json b/app/marionette/package.json
index 58b06d080450..b2c251bceab5 100644
--- a/app/marionette/package.json
+++ b/app/marionette/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/marionette",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
+    "@storybook/core": "6.1.0-alpha.19",
     "common-tags": "^1.8.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -47,5 +47,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b"
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1"
 }
diff --git a/app/marko/package.json b/app/marko/package.json
index f727b800d299..8a7f6e498722 100644
--- a/app/marko/package.json
+++ b/app/marko/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/marko",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for Marko: Develop Marko Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -33,9 +33,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@marko/webpack": "^2.1.0",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
+    "@marko/webpack": "^6.2.8",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
@@ -43,7 +43,7 @@
   },
   "peerDependencies": {
     "@babel/core": "*",
-    "marko": "^4.15.2",
+    "marko": "^4.15.2 || ^5.0.0-next || ^5",
     "webpack": "^4"
   },
   "engines": {
@@ -52,7 +52,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/mithril/package.json b/app/mithril/package.json
index 34eed9f1a75a..c95fcdc6ac83 100644
--- a/app/mithril/package.json
+++ b/app/mithril/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/mithril",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for Mithril: Develop Mithril Component in isolation.",
   "keywords": [
     "storybook"
@@ -36,8 +36,8 @@
   "dependencies": {
     "@babel/core": "^7.11.5",
     "@babel/plugin-transform-react-jsx": "^7.10.4",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
     "@types/mithril": "^2.0.0",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
@@ -58,7 +58,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/preact/package.json b/app/preact/package.json
index 0ff8382be5a0..c4719243e3e6 100644
--- a/app/preact/package.json
+++ b/app/preact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for Preact: Develop Preact Component in isolation.",
   "keywords": [
     "storybook"
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "^7.10.4",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -56,7 +56,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/rax/package.json b/app/rax/package.json
index 91797bb31b76..b182c73cc1a1 100644
--- a/app/rax/package.json
+++ b/app/rax/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/rax",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for Rax: Develop Rax Component in isolation.",
   "keywords": [
     "rax",
@@ -34,7 +34,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core": "6.1.0-alpha.18",
+    "@storybook/core": "6.1.0-alpha.19",
     "babel-preset-rax": "^1.0.0-beta.0",
     "core-js": "^3.0.1",
     "driver-dom": "^2.0.0",
@@ -52,7 +52,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/react/package.json b/app/react/package.json
index 02674a004731..f91a71ef5b7f 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -37,9 +37,9 @@
     "@babel/preset-flow": "^7.10.4",
     "@babel/preset-react": "^7.10.4",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.4.2",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
     "@storybook/semver": "^7.3.2",
     "@svgr/webpack": "^5.4.0",
     "@types/webpack-env": "^1.15.2",
@@ -60,7 +60,7 @@
     "webpack": "^4.43.0"
   },
   "devDependencies": {
-    "@storybook/client-api": "6.1.0-alpha.18",
+    "@storybook/client-api": "6.1.0-alpha.19",
     "@types/node": "^14.0.10",
     "@types/webpack": "^4.41.12"
   },
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "types-6-0": [
diff --git a/app/riot/package.json b/app/riot/package.json
index ee7ec0f4a087..c7ca8a004b1d 100644
--- a/app/riot/package.json
+++ b/app/riot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/riot",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
+    "@storybook/core": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "raw-loader": "^4.0.1",
@@ -61,7 +61,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/server/package.json b/app/server/package.json
index 8f54c643b060..f642e11e8219 100644
--- a/app/server/package.json
+++ b/app/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,11 +34,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -55,7 +55,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/svelte/package.json b/app/svelte/package.json
index 599399cf0e47..d53f58328e46 100644
--- a/app/svelte/package.json
+++ b/app/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
@@ -58,7 +58,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/vue/package.json b/app/vue/package.json
index dde0aefc2ffc..ece45f6347a1 100644
--- a/app/vue/package.json
+++ b/app/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,8 +34,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -68,7 +68,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/app/web-components/package.json b/app/web-components/package.json
index ab17aba74ee0..b1c914a161f7 100644
--- a/app/web-components/package.json
+++ b/app/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.",
   "keywords": [
     "lit-html",
@@ -39,9 +39,9 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/preset-env": "^7.11.5",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
     "@types/webpack-env": "^1.15.2",
     "babel-plugin-bundled-import-meta": "^0.3.1",
     "core-js": "^3.0.1",
@@ -63,7 +63,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/dev-kits/addon-decorator/package.json b/dev-kits/addon-decorator/package.json
index 2270da29147a..429f4a2ac34a 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "decorator addon for storybook",
   "keywords": [
     "addon",
@@ -24,15 +24,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.4.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/dev-kits/addon-parameter/package.json b/dev-kits/addon-parameter/package.json
index 099db1e11556..9a3e2698d280 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "parameter addon for storybook",
   "keywords": [
     "addon",
@@ -24,12 +24,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
@@ -38,7 +38,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/dev-kits/addon-preview-wrapper/package.json b/dev-kits/addon-preview-wrapper/package.json
index 1be88da49065..5467394f4879 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "preview wrapper addon for storybook",
   "keywords": [
     "addon",
@@ -24,13 +24,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
     "react": "^16.8.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/dev-kits/addon-roundtrip/package.json b/dev-kits/addon-roundtrip/package.json
index 906d6c084ad2..b615cab6e2e8 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "roundtrip addon for storybook",
   "keywords": [
     "addon",
@@ -24,13 +24,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
@@ -39,7 +39,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/docs/snippets/common/storybook-generated-argtypes.js.mdx b/docs/snippets/common/storybook-generated-argtypes.js.mdx
index de4a45b8a2a0..cd8f236ad887 100644
--- a/docs/snippets/common/storybook-generated-argtypes.js.mdx
+++ b/docs/snippets/common/storybook-generated-argtypes.js.mdx
@@ -8,10 +8,10 @@ const argTypes = {
     table: {
       type: { summary: 'string' },
       defaultValue: { summary: 'Hello' },
-    }
+    },
     control: {
       type: 'text'
     }
   }
 }
-```
\ No newline at end of file
+```
diff --git a/docs/versions/next.json b/docs/versions/next.json
index dcb3eaab06f9..920608917eb5 100644
--- a/docs/versions/next.json
+++ b/docs/versions/next.json
@@ -1 +1 @@
-{"version":"6.1.0-alpha.18","info":{"plain":"### Bug Fixes\n\n- Composition: Rename `disabled` parameter => `disable` ([#12603](https://github.com/storybookjs/storybook/pull/12603))\n- UI: Fix page title for non-alpha chars ([#12583](https://github.com/storybookjs/storybook/pull/12583))\n\n### Maintenance\n\n- Fix spelling errors ([#12590](https://github.com/storybookjs/storybook/pull/12590))"}}
\ No newline at end of file
+{"version":"6.1.0-alpha.19","info":{"plain":"### Maintenance\n\n- ArgsTable: Remove the \"simple\" detection for enum types ([#12587](https://github.com/storybookjs/storybook/pull/12587))\n- Addon-docs: Move summary & detail equality check to createSummaryValue ([#12588](https://github.com/storybookjs/storybook/pull/12588))\n- Essentials: Make controls tab show first ([#12652](https://github.com/storybookjs/storybook/pull/12652))\n- Misc: Clean usage and place in the monorepo of some dependencies ([#12653](https://github.com/storybookjs/storybook/pull/12653))"}}
\ No newline at end of file
diff --git a/docs/workflows/faq.md b/docs/workflows/faq.md
index 6c022bec835f..6625ec47a009 100644
--- a/docs/workflows/faq.md
+++ b/docs/workflows/faq.md
@@ -93,3 +93,11 @@ class MyComponent extends Component {
 
 export const defaultView = () => <MyComponent initialState={} />;
 ```
+
+### Which community addons are compatible with the latest version of Storybook?
+
+Starting with Storybook version 6.0 we've introduced some great features aimed at streamlining your development workflow.
+
+With this we would like to point out that if you plan on using addons created by our fantastic community, you need to take in consideration that some of those addons might be working with a outdated version of Storybook. 
+
+We're actively working in providing a better way to address this situation, but in the meantime we would ask a bit of caution on your end so that you don't run into unexpected problems. Let us know by creating a issue in the [Storybook repo](https://github.com/storybookjs/storybook/issues) so that we can gather information and create a curated list with those addons to help not only you but the rest of the community.
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index d6dae369e068..ff4496045b4c 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -37,19 +37,19 @@
     "@angular/cli": "^9.1.0",
     "@angular/compiler-cli": "^9.1.0",
     "@compodoc/compodoc": "^1.1.11",
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-jest": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/angular": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-jest": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/angular": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
     "@types/core-js": "^2.5.0",
     "@types/jest": "^25.1.1",
     "@types/node": "^14.0.10",
diff --git a/examples/aurelia-kitchen-sink/package.json b/examples/aurelia-kitchen-sink/package.json
index 6e02658acb27..ae8ab3814641 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "description": "An Aurelia client application.",
   "repository": {
@@ -16,24 +16,24 @@
     "storybook": "start-storybook -p 9009 -s dist"
   },
   "dependencies": {
-    "aurelia": "dev",
+    "aurelia": "^0.7.0",
     "bootstrap": "^4.3.1",
     "promise-polyfill": "^8.1.3"
   },
   "devDependencies": {
-    "@aurelia/webpack-loader": "dev",
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-jest": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/aurelia": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
+    "@aurelia/webpack-loader": "^0.7.0",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-jest": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/aurelia": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
     "@types/node": "^14.0.10",
     "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 bf93106da2eb..bb08a5279784 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -18,19 +18,19 @@
     "react-lifecycles-compat": "^3.0.4"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-events": "6.1.0-alpha.18",
-    "@storybook/addon-jest": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/react": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-events": "6.1.0-alpha.19",
+    "@storybook/addon-jest": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/react": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "react-scripts": "^3.0.1"
   },
   "storybook": {
diff --git a/examples/cra-react15/package.json b/examples/cra-react15/package.json
index 645408ab5867..787e41e636fc 100644
--- a/examples/cra-react15/package.json
+++ b/examples/cra-react15/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-react15",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -18,11 +18,11 @@
     "react-scripts": "3.0.1"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/react": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/react": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "babel-core": "6",
     "babel-runtime": "6"
   },
diff --git a/examples/cra-ts-essentials/package.json b/examples/cra-ts-essentials/package.json
index 22ade553849c..669f2a52fb78 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -34,10 +34,10 @@
     "typescript": "^3.9.3"
   },
   "devDependencies": {
-    "@storybook/addon-essentials": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
+    "@storybook/addon-essentials": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
     "@storybook/preset-create-react-app": "^3.1.4",
-    "@storybook/react": "6.1.0-alpha.18"
+    "@storybook/react": "6.1.0-alpha.19"
   },
   "storybook": {
     "chromatic": {
diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json
index 4403e967df1b..7ba28bd6be98 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -34,14 +34,14 @@
     "typescript": "^3.9.3"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
     "@storybook/preset-create-react-app": "^3.1.4",
-    "@storybook/react": "6.1.0-alpha.18",
+    "@storybook/react": "6.1.0-alpha.19",
     "@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 77ccbb4b57c0..77c8ae896cb8 100644
--- a/examples/dev-kits/package.json
+++ b/examples/dev-kits/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/example-devkits",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
-    "@storybook/addon-parameter": "6.1.0-alpha.18",
-    "@storybook/addon-preview-wrapper": "6.1.0-alpha.18",
-    "@storybook/addon-roundtrip": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
-    "@storybook/react": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addon-decorator": "6.1.0-alpha.19",
+    "@storybook/addon-parameter": "6.1.0-alpha.19",
+    "@storybook/addon-preview-wrapper": "6.1.0-alpha.19",
+    "@storybook/addon-roundtrip": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
+    "@storybook/react": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "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 801979550486..df84a9b163b0 100644
--- a/examples/ember-cli/package.json
+++ b/examples/ember-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-example",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "ember build --output-path ember-output",
@@ -17,19 +17,19 @@
   "devDependencies": {
     "@babel/core": "^7.11.5",
     "@ember/optional-features": "^1.3.0",
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/ember": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/ember": "6.1.0-alpha.19",
     "@storybook/ember-cli-storybook": "^0.2.1",
-    "@storybook/source-loader": "6.1.0-alpha.18",
+    "@storybook/source-loader": "6.1.0-alpha.19",
     "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 9c054576153b..2a7df4a6aa94 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "description": "",
   "keywords": [],
@@ -13,24 +13,24 @@
     "storybook": "start-storybook -p 9006"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-events": "6.1.0-alpha.18",
-    "@storybook/addon-jest": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/html": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-events": "6.1.0-alpha.19",
+    "@storybook/addon-jest": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/html": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
     "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 f67bfcd51bc1..166eb7ab2074 100644
--- a/examples/marko-cli/package.json
+++ b/examples/marko-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "marko-cli",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/marko": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/marko": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
     "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 da5616f0b42a..4c7ee2979796 100644
--- a/examples/mithril-kitchen-sink/package.json
+++ b/examples/mithril-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mithril-example",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook",
@@ -10,17 +10,17 @@
     "mithril": "^1.1.6"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/mithril": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/mithril": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
     "webpack": "^4.33.0"
   },
   "storybook": {
diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
index 1f6e250dcf36..39e329e83e12 100644
--- a/examples/official-storybook/package.json
+++ b/examples/official-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "official-storybook",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
@@ -14,33 +14,33 @@
   },
   "devDependencies": {
     "@packtracker/webpack-plugin": "^2.0.1",
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-cssresources": "6.1.0-alpha.18",
-    "@storybook/addon-design-assets": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-events": "6.1.0-alpha.18",
-    "@storybook/addon-graphql": "6.1.0-alpha.18",
-    "@storybook/addon-jest": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-queryparams": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots-puppeteer": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-toolbars": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/cli": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-cssresources": "6.1.0-alpha.19",
+    "@storybook/addon-design-assets": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-events": "6.1.0-alpha.19",
+    "@storybook/addon-graphql": "6.1.0-alpha.19",
+    "@storybook/addon-jest": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-queryparams": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots-puppeteer": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-toolbars": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/cli": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
     "@storybook/design-system": "^5.1.0",
-    "@storybook/node-logger": "6.1.0-alpha.18",
-    "@storybook/react": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/node-logger": "6.1.0-alpha.19",
+    "@storybook/react": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "chromatic": "^5.0.0",
     "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 528ce2df99da..b8c0e4735a2e 100644
--- a/examples/preact-kitchen-sink/package.json
+++ b/examples/preact-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preact-example",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -15,17 +15,17 @@
   "devDependencies": {
     "@babel/core": "^7.11.5",
     "@babel/plugin-transform-runtime": "^7.11.5",
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/preact": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/preact": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
     "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 3d4219631b3e..57d61bb989d6 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "build-scripts build",
@@ -20,20 +20,20 @@
   "devDependencies": {
     "@alib/build-scripts": "^0.1.8",
     "@babel/preset-react": "^7.10.4",
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-events": "6.1.0-alpha.18",
-    "@storybook/addon-jest": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/rax": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-events": "6.1.0-alpha.19",
+    "@storybook/addon-jest": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/rax": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "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 7092f5df74ae..85ae12636767 100644
--- a/examples/react-ts/package.json
+++ b/examples/react-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/example-react-ts",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
@@ -8,9 +8,9 @@
     "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ --no-dll"
   },
   "dependencies": {
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-essentials": "6.1.0-alpha.18",
-    "@storybook/react": "6.1.0-alpha.18",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-essentials": "6.1.0-alpha.19",
+    "@storybook/react": "6.1.0-alpha.19",
     "@types/react": "^16.9.35",
     "@types/react-dom": "^16.9.8",
     "prop-types": "15.7.2",
diff --git a/examples/riot-kitchen-sink/package.json b/examples/riot-kitchen-sink/package.json
index 29e14496fe0b..431baf48d919 100644
--- a/examples/riot-kitchen-sink/package.json
+++ b/examples/riot-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "riot-example",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -15,17 +15,17 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.5",
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/riot": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/riot": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
     "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 08b3f9d1a6d0..55d19d1cf750 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "description": "",
   "keywords": [],
@@ -14,13 +14,13 @@
     "storybook": "SERVER_PORT=1137 start-storybook -p 9006 --quiet"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
-    "@storybook/server": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
+    "@storybook/server": "6.1.0-alpha.19",
     "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 6a5e2fc5c926..90a1065cfcd3 100644
--- a/examples/standalone-preview/package.json
+++ b/examples/standalone-preview/package.json
@@ -1,12 +1,12 @@
 {
   "name": "standalone-preview",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "storybook": "parcel ./storybook.html --port 1337"
   },
   "devDependencies": {
-    "@storybook/react": "6.1.0-alpha.18",
+    "@storybook/react": "6.1.0-alpha.19",
     "parcel": "^1.12.3",
     "react": "^16.8.3",
     "react-dom": "^16.8.3"
diff --git a/examples/svelte-kitchen-sink/package.json b/examples/svelte-kitchen-sink/package.json
index 5fc9418b12f0..d08eef8e273c 100644
--- a/examples/svelte-kitchen-sink/package.json
+++ b/examples/svelte-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte-example",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook -s public",
@@ -10,19 +10,19 @@
     "global": "^4.3.2"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
-    "@storybook/svelte": "6.1.0-alpha.18"
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
+    "@storybook/svelte": "6.1.0-alpha.19"
   },
   "storybook": {
     "chromatic": {
diff --git a/examples/vue-cli/package.json b/examples/vue-cli/package.json
index 159810205f0e..70481e187be8 100644
--- a/examples/vue-cli/package.json
+++ b/examples/vue-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-example",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build",
@@ -15,11 +15,11 @@
     "vue-property-decorator": "^9.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-essentials": "6.1.0-alpha.18",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-essentials": "6.1.0-alpha.19",
     "@storybook/preset-scss": "^1.0.2",
-    "@storybook/source-loader": "6.1.0-alpha.18",
-    "@storybook/vue": "6.1.0-alpha.18",
+    "@storybook/source-loader": "6.1.0-alpha.19",
+    "@storybook/vue": "6.1.0-alpha.19",
     "@vue/cli-plugin-babel": "~4.3.0",
     "@vue/cli-plugin-typescript": "~4.3.0",
     "@vue/cli-service": "~4.3.0",
diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
index 3b933175f6d0..51951a23ee7c 100644
--- a/examples/vue-kitchen-sink/package.json
+++ b/examples/vue-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-example",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -14,19 +14,19 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.5",
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
-    "@storybook/vue": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
+    "@storybook/vue": "6.1.0-alpha.19",
     "@vue/babel-preset-jsx": "^1.1.2",
     "babel-loader": "^8.0.5",
     "cross-env": "^7.0.0",
diff --git a/examples/web-components-kitchen-sink/package.json b/examples/web-components-kitchen-sink/package.json
index 29e30897d042..2b3f0e749015 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.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "description": "",
   "keywords": [],
@@ -12,24 +12,24 @@
     "storybook": "start-storybook -p 9006"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.1.0-alpha.18",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-    "@storybook/addon-controls": "6.1.0-alpha.18",
-    "@storybook/addon-docs": "6.1.0-alpha.18",
-    "@storybook/addon-events": "6.1.0-alpha.18",
-    "@storybook/addon-jest": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/addon-links": "6.1.0-alpha.18",
-    "@storybook/addon-storyshots": "6.1.0-alpha.18",
-    "@storybook/addon-storysource": "6.1.0-alpha.18",
-    "@storybook/addon-viewport": "6.1.0-alpha.18",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/core": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/source-loader": "6.1.0-alpha.18",
-    "@storybook/web-components": "6.1.0-alpha.18",
+    "@storybook/addon-a11y": "6.1.0-alpha.19",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+    "@storybook/addon-controls": "6.1.0-alpha.19",
+    "@storybook/addon-docs": "6.1.0-alpha.19",
+    "@storybook/addon-events": "6.1.0-alpha.19",
+    "@storybook/addon-jest": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/addon-links": "6.1.0-alpha.19",
+    "@storybook/addon-storyshots": "6.1.0-alpha.19",
+    "@storybook/addon-storysource": "6.1.0-alpha.19",
+    "@storybook/addon-viewport": "6.1.0-alpha.19",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/core": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/source-loader": "6.1.0-alpha.19",
+    "@storybook/web-components": "6.1.0-alpha.19",
     "babel-loader": "^8.0.5",
     "eventemitter3": "^4.0.0",
     "format-json": "^1.0.3",
diff --git a/lerna.json b/lerna.json
index 8ca7fc2a3a30..1bd777c52731 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "registry": "https://registry.npmjs.org",
-  "version": "6.1.0-alpha.18"
+  "version": "6.1.0-alpha.19"
 }
diff --git a/lib/addons/package.json b/lib/addons/package.json
index 6c7fd51598bc..2a90d8588062 100644
--- a/lib/addons/package.json
+++ b/lib/addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addons",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook addons store",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/channels": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/router": "6.1.0-alpha.18",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/channels": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/router": "6.1.0-alpha.19",
+    "@storybook/theming": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
@@ -43,7 +43,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/api/package.json b/lib/api/package.json
index ae991259f0f8..553967e02e4f 100644
--- a/lib/api/package.json
+++ b/lib/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/api",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Core Storybook API & Context",
   "keywords": [
     "storybook"
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@reach/router": "^1.3.3",
-    "@storybook/channels": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
+    "@storybook/channels": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
     "@storybook/csf": "0.0.1",
-    "@storybook/router": "6.1.0-alpha.18",
+    "@storybook/router": "6.1.0-alpha.19",
     "@storybook/semver": "^7.3.2",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/theming": "6.1.0-alpha.19",
     "@types/reach__router": "^1.3.5",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^3.1.1",
@@ -59,7 +59,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/api/src/version.ts b/lib/api/src/version.ts
index aeb20656c5d6..827a19c3339d 100644
--- a/lib/api/src/version.ts
+++ b/lib/api/src/version.ts
@@ -1 +1 @@
-export const version = '6.1.0-alpha.18';
+export const version = '6.1.0-alpha.19';
diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json
index df244e34e122..82e3f9a75ce5 100644
--- a/lib/channel-postmessage/package.json
+++ b/lib/channel-postmessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-postmessage",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "",
   "keywords": [
     "storybook"
@@ -28,9 +28,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
+    "@storybook/channels": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "qs": "^6.6.0",
@@ -39,7 +39,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json
index 1f338dacbd07..8421b81416ee 100644
--- a/lib/channel-websocket/package.json
+++ b/lib/channel-websocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-websocket",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "",
   "keywords": [
     "storybook"
@@ -28,7 +28,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "6.1.0-alpha.18",
+    "@storybook/channels": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "telejson": "^5.0.2"
@@ -36,7 +36,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/channels/package.json b/lib/channels/package.json
index bed4dd9e2d44..307a70e197da 100644
--- a/lib/channels/package.json
+++ b/lib/channels/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channels",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "",
   "keywords": [
     "storybook"
@@ -35,7 +35,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/cli-sb/package.json b/lib/cli-sb/package.json
index 11aa916ec774..40400c40f1cf 100644
--- a/lib/cli-sb/package.json
+++ b/lib/cli-sb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sb",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
@@ -22,10 +22,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/cli": "6.1.0-alpha.18"
+    "@storybook/cli": "6.1.0-alpha.19"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b"
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1"
 }
diff --git a/lib/cli-storybook/package.json b/lib/cli-storybook/package.json
index 03b5f22c5b10..4a513f40c8ad 100644
--- a/lib/cli-storybook/package.json
+++ b/lib/cli-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "storybook",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
@@ -23,10 +23,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/cli": "6.1.0-alpha.18"
+    "@storybook/cli": "6.1.0-alpha.19"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b"
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1"
 }
diff --git a/lib/cli/package.json b/lib/cli/package.json
index 25fd01a7486c..898f61284377 100644
--- a/lib/cli/package.json
+++ b/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -39,8 +39,8 @@
   "dependencies": {
     "@babel/core": "^7.11.5",
     "@babel/preset-env": "^7.11.5",
-    "@storybook/codemod": "6.1.0-alpha.18",
-    "@storybook/node-logger": "6.1.0-alpha.18",
+    "@storybook/codemod": "6.1.0-alpha.19",
+    "@storybook/node-logger": "6.1.0-alpha.19",
     "@storybook/semver": "^7.3.2",
     "chalk": "^4.0.0",
     "commander": "^5.0.0",
@@ -62,7 +62,7 @@
     "update-notifier": "^4.0.0"
   },
   "devDependencies": {
-    "@storybook/client-api": "6.1.0-alpha.18",
+    "@storybook/client-api": "6.1.0-alpha.19",
     "@types/cross-spawn": "^6.0.1",
     "@types/inquirer": "^6.5.0",
     "@types/puppeteer-core": "^2.0.0",
@@ -76,7 +76,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/cli/versions.json b/lib/cli/versions.json
index bd3cc7650adc..4548a41e3f93 100644
--- a/lib/cli/versions.json
+++ b/lib/cli/versions.json
@@ -1,55 +1,55 @@
 {
-  "@storybook/addon-a11y": "6.1.0-alpha.18",
-  "@storybook/addon-actions": "6.1.0-alpha.18",
-  "@storybook/addon-backgrounds": "6.1.0-alpha.18",
-  "@storybook/addon-controls": "6.1.0-alpha.18",
-  "@storybook/addon-cssresources": "6.1.0-alpha.18",
-  "@storybook/addon-design-assets": "6.1.0-alpha.18",
-  "@storybook/addon-docs": "6.1.0-alpha.18",
-  "@storybook/addon-essentials": "6.1.0-alpha.18",
-  "@storybook/addon-events": "6.1.0-alpha.18",
-  "@storybook/addon-google-analytics": "6.1.0-alpha.18",
-  "@storybook/addon-graphql": "6.1.0-alpha.18",
-  "@storybook/addon-jest": "6.1.0-alpha.18",
-  "@storybook/addon-knobs": "6.1.0-alpha.18",
-  "@storybook/addon-links": "6.1.0-alpha.18",
-  "@storybook/addon-queryparams": "6.1.0-alpha.18",
-  "@storybook/addon-storyshots": "6.1.0-alpha.18",
-  "@storybook/addon-storyshots-puppeteer": "6.1.0-alpha.18",
-  "@storybook/addon-storysource": "6.1.0-alpha.18",
-  "@storybook/addon-toolbars": "6.1.0-alpha.18",
-  "@storybook/addon-viewport": "6.1.0-alpha.18",
-  "@storybook/addons": "6.1.0-alpha.18",
-  "@storybook/angular": "6.1.0-alpha.18",
-  "@storybook/api": "6.1.0-alpha.18",
-  "@storybook/aurelia": "6.1.0-alpha.18",
-  "@storybook/channel-postmessage": "6.1.0-alpha.18",
-  "@storybook/channel-websocket": "6.1.0-alpha.18",
-  "@storybook/channels": "6.1.0-alpha.18",
-  "@storybook/cli": "6.1.0-alpha.18",
-  "@storybook/client-api": "6.1.0-alpha.18",
-  "@storybook/client-logger": "6.1.0-alpha.18",
-  "@storybook/codemod": "6.1.0-alpha.18",
-  "@storybook/components": "6.1.0-alpha.18",
-  "@storybook/core": "6.1.0-alpha.18",
-  "@storybook/core-events": "6.1.0-alpha.18",
-  "@storybook/ember": "6.1.0-alpha.18",
-  "@storybook/html": "6.1.0-alpha.18",
-  "@storybook/marionette": "6.1.0-alpha.18",
-  "@storybook/marko": "6.1.0-alpha.18",
-  "@storybook/mithril": "6.1.0-alpha.18",
-  "@storybook/node-logger": "6.1.0-alpha.18",
-  "@storybook/postinstall": "6.1.0-alpha.18",
-  "@storybook/preact": "6.1.0-alpha.18",
-  "@storybook/rax": "6.1.0-alpha.18",
-  "@storybook/react": "6.1.0-alpha.18",
-  "@storybook/riot": "6.1.0-alpha.18",
-  "@storybook/router": "6.1.0-alpha.18",
-  "@storybook/server": "6.1.0-alpha.18",
-  "@storybook/source-loader": "6.1.0-alpha.18",
-  "@storybook/svelte": "6.1.0-alpha.18",
-  "@storybook/theming": "6.1.0-alpha.18",
-  "@storybook/ui": "6.1.0-alpha.18",
-  "@storybook/vue": "6.1.0-alpha.18",
-  "@storybook/web-components": "6.1.0-alpha.18"
+  "@storybook/addon-a11y": "6.1.0-alpha.19",
+  "@storybook/addon-actions": "6.1.0-alpha.19",
+  "@storybook/addon-backgrounds": "6.1.0-alpha.19",
+  "@storybook/addon-controls": "6.1.0-alpha.19",
+  "@storybook/addon-cssresources": "6.1.0-alpha.19",
+  "@storybook/addon-design-assets": "6.1.0-alpha.19",
+  "@storybook/addon-docs": "6.1.0-alpha.19",
+  "@storybook/addon-essentials": "6.1.0-alpha.19",
+  "@storybook/addon-events": "6.1.0-alpha.19",
+  "@storybook/addon-google-analytics": "6.1.0-alpha.19",
+  "@storybook/addon-graphql": "6.1.0-alpha.19",
+  "@storybook/addon-jest": "6.1.0-alpha.19",
+  "@storybook/addon-knobs": "6.1.0-alpha.19",
+  "@storybook/addon-links": "6.1.0-alpha.19",
+  "@storybook/addon-queryparams": "6.1.0-alpha.19",
+  "@storybook/addon-storyshots": "6.1.0-alpha.19",
+  "@storybook/addon-storyshots-puppeteer": "6.1.0-alpha.19",
+  "@storybook/addon-storysource": "6.1.0-alpha.19",
+  "@storybook/addon-toolbars": "6.1.0-alpha.19",
+  "@storybook/addon-viewport": "6.1.0-alpha.19",
+  "@storybook/addons": "6.1.0-alpha.19",
+  "@storybook/angular": "6.1.0-alpha.19",
+  "@storybook/api": "6.1.0-alpha.19",
+  "@storybook/aurelia": "6.1.0-alpha.19",
+  "@storybook/channel-postmessage": "6.1.0-alpha.19",
+  "@storybook/channel-websocket": "6.1.0-alpha.19",
+  "@storybook/channels": "6.1.0-alpha.19",
+  "@storybook/cli": "6.1.0-alpha.19",
+  "@storybook/client-api": "6.1.0-alpha.19",
+  "@storybook/client-logger": "6.1.0-alpha.19",
+  "@storybook/codemod": "6.1.0-alpha.19",
+  "@storybook/components": "6.1.0-alpha.19",
+  "@storybook/core": "6.1.0-alpha.19",
+  "@storybook/core-events": "6.1.0-alpha.19",
+  "@storybook/ember": "6.1.0-alpha.19",
+  "@storybook/html": "6.1.0-alpha.19",
+  "@storybook/marionette": "6.1.0-alpha.19",
+  "@storybook/marko": "6.1.0-alpha.19",
+  "@storybook/mithril": "6.1.0-alpha.19",
+  "@storybook/node-logger": "6.1.0-alpha.19",
+  "@storybook/postinstall": "6.1.0-alpha.19",
+  "@storybook/preact": "6.1.0-alpha.19",
+  "@storybook/rax": "6.1.0-alpha.19",
+  "@storybook/react": "6.1.0-alpha.19",
+  "@storybook/riot": "6.1.0-alpha.19",
+  "@storybook/router": "6.1.0-alpha.19",
+  "@storybook/server": "6.1.0-alpha.19",
+  "@storybook/source-loader": "6.1.0-alpha.19",
+  "@storybook/svelte": "6.1.0-alpha.19",
+  "@storybook/theming": "6.1.0-alpha.19",
+  "@storybook/ui": "6.1.0-alpha.19",
+  "@storybook/vue": "6.1.0-alpha.19",
+  "@storybook/web-components": "6.1.0-alpha.19"
 }
diff --git a/lib/client-api/package.json b/lib/client-api/package.json
index 30e97cb2be9d..800873ba1ce4 100644
--- a/lib/client-api/package.json
+++ b/lib/client-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-api",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook Client API",
   "keywords": [
     "storybook"
@@ -28,11 +28,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/channel-postmessage": "6.1.0-alpha.18",
-    "@storybook/channels": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/channel-postmessage": "6.1.0-alpha.19",
+    "@storybook/channels": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
     "@storybook/csf": "0.0.1",
     "@types/qs": "^6.9.0",
     "@types/webpack-env": "^1.15.2",
@@ -51,7 +51,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json
index 646e54bb57de..1a5d9f33c715 100644
--- a/lib/client-logger/package.json
+++ b/lib/client-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-logger",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "",
   "keywords": [
     "storybook"
@@ -34,7 +34,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/codemod/package.json b/lib/codemod/package.json
index fddbca3c2e0c..b679714036c7 100644
--- a/lib/codemod/package.json
+++ b/lib/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/codemod",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
+    "@storybook/node-logger": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "cross-spawn": "^7.0.0",
     "globby": "^11.0.0",
@@ -47,7 +47,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/components/package.json b/lib/components/package.json
index 842d49a6ba39..f8128ead632d 100644
--- a/lib/components/package.json
+++ b/lib/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/components",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
@@ -29,9 +29,9 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.4.4",
-    "@storybook/client-logger": "6.1.0-alpha.18",
+    "@storybook/client-logger": "6.1.0-alpha.19",
     "@storybook/csf": "0.0.1",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/theming": "6.1.0-alpha.19",
     "@types/overlayscrollbars": "^1.9.0",
     "@types/react-color": "^3.0.1",
     "@types/react-syntax-highlighter": "11.0.4",
@@ -60,7 +60,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/components/src/blocks/ArgsTable/ArgValue.tsx b/lib/components/src/blocks/ArgsTable/ArgValue.tsx
index 14e15015851f..bc1b278ccd32 100644
--- a/lib/components/src/blocks/ArgsTable/ArgValue.tsx
+++ b/lib/components/src/blocks/ArgsTable/ArgValue.tsx
@@ -141,7 +141,7 @@ const ArgSummary: FC<ArgSummaryProps> = ({ value, initialExpandedArgs }) => {
     const cannotBeSafelySplitted = /[(){}[\]<>]/.test(summaryAsString);
 
     if (cannotBeSafelySplitted) {
-      return <ArgText text={summaryAsString} simple={summaryAsString.includes('|')} />;
+      return <ArgText text={summaryAsString} />;
     }
 
     const summaryItems = getSummaryItems(summaryAsString);
diff --git a/lib/core-events/package.json b/lib/core-events/package.json
index 5526f3e34bb3..844de97d6f14 100644
--- a/lib/core-events/package.json
+++ b/lib/core-events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-events",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Event names used in storybook core",
   "keywords": [
     "storybook"
@@ -33,7 +33,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/core/package.json b/lib/core/package.json
index 15388bc03e25..68027b98624d 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -52,20 +52,20 @@
     "@babel/preset-react": "^7.10.4",
     "@babel/preset-typescript": "^7.10.4",
     "@babel/register": "^7.11.5",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/channel-postmessage": "6.1.0-alpha.18",
-    "@storybook/channels": "6.1.0-alpha.18",
-    "@storybook/client-api": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/channel-postmessage": "6.1.0-alpha.19",
+    "@storybook/channels": "6.1.0-alpha.19",
+    "@storybook/client-api": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.1.0-alpha.18",
-    "@storybook/router": "6.1.0-alpha.18",
+    "@storybook/node-logger": "6.1.0-alpha.19",
+    "@storybook/router": "6.1.0-alpha.19",
     "@storybook/semver": "^7.3.2",
-    "@storybook/theming": "6.1.0-alpha.18",
-    "@storybook/ui": "6.1.0-alpha.18",
+    "@storybook/theming": "6.1.0-alpha.19",
+    "@storybook/ui": "6.1.0-alpha.19",
     "@types/glob-base": "^0.3.0",
     "@types/micromatch": "^4.0.1",
     "@types/node-fetch": "^2.5.4",
@@ -138,7 +138,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/node-logger/package.json b/lib/node-logger/package.json
index 1444b5961bfd..eb87ba4020f9 100644
--- a/lib/node-logger/package.json
+++ b/lib/node-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/node-logger",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "",
   "keywords": [
     "storybook"
@@ -40,7 +40,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/postinstall/package.json b/lib/postinstall/package.json
index ce6c0a6789fb..36ac9dd83ab7 100644
--- a/lib/postinstall/package.json
+++ b/lib/postinstall/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/postinstall",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Storybook addons postinstall utilities",
   "keywords": [
     "api",
@@ -39,7 +39,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/router/package.json b/lib/router/package.json
index 4c8ce6ad10ef..14eb6b387969 100644
--- a/lib/router/package.json
+++ b/lib/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/router",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Core Storybook Router",
   "keywords": [
     "storybook"
@@ -40,7 +40,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/source-loader/package.json b/lib/source-loader/package.json
index feccf66b8679..f5d032822f59 100644
--- a/lib/source-loader/package.json
+++ b/lib/source-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/source-loader",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Source loader",
   "keywords": [
     "lib",
@@ -29,8 +29,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
     "@storybook/csf": "0.0.1",
     "core-js": "^3.0.1",
     "estraverse": "^4.2.0",
@@ -45,7 +45,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/theming/package.json b/lib/theming/package.json
index 27303388dd2c..3f85c9e5af71 100644
--- a/lib/theming/package.json
+++ b/lib/theming/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/theming",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "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.1.0-alpha.18",
+    "@storybook/client-logger": "6.1.0-alpha.19",
     "core-js": "^3.0.1",
     "deep-object-diff": "^1.1.0",
     "emotion-theming": "^10.0.19",
@@ -46,7 +46,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/ui/package.json b/lib/ui/package.json
index 2c4160446d09..ac28d0f65381 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ui",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "description": "Core Storybook UI",
   "keywords": [
     "storybook"
@@ -29,15 +29,15 @@
   },
   "dependencies": {
     "@emotion/core": "^10.0.20",
-    "@storybook/addons": "6.1.0-alpha.18",
-    "@storybook/api": "6.1.0-alpha.18",
-    "@storybook/channels": "6.1.0-alpha.18",
-    "@storybook/client-logger": "6.1.0-alpha.18",
-    "@storybook/components": "6.1.0-alpha.18",
-    "@storybook/core-events": "6.1.0-alpha.18",
-    "@storybook/router": "6.1.0-alpha.18",
+    "@storybook/addons": "6.1.0-alpha.19",
+    "@storybook/api": "6.1.0-alpha.19",
+    "@storybook/channels": "6.1.0-alpha.19",
+    "@storybook/client-logger": "6.1.0-alpha.19",
+    "@storybook/components": "6.1.0-alpha.19",
+    "@storybook/core-events": "6.1.0-alpha.19",
+    "@storybook/router": "6.1.0-alpha.19",
     "@storybook/semver": "^7.3.2",
-    "@storybook/theming": "6.1.0-alpha.18",
+    "@storybook/theming": "6.1.0-alpha.19",
     "@types/markdown-to-jsx": "^6.11.0",
     "copy-to-clipboard": "^3.0.8",
     "core-js": "^3.0.1",
@@ -62,9 +62,9 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.5",
-    "@storybook/addon-actions": "6.1.0-alpha.18",
-    "@storybook/addon-knobs": "6.1.0-alpha.18",
-    "@storybook/react": "6.1.0-alpha.18",
+    "@storybook/addon-actions": "6.1.0-alpha.19",
+    "@storybook/addon-knobs": "6.1.0-alpha.19",
+    "@storybook/react": "6.1.0-alpha.19",
     "@testing-library/react": "^10.0.3",
     "babel-loader": "^8.0.6",
     "chromatic": "^5.0.0",
@@ -76,7 +76,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7bd08008b5a105726ddab6abc4478f46b5fda95b",
+  "gitHead": "6a3203004afecbcf8fa027d38a6088fd927714b1",
   "typesVersions": {
     "<3.8": {
       "*": [
diff --git a/lib/ui/src/containers/preview.tsx b/lib/ui/src/containers/preview.tsx
index 84d10242aeb0..ff6f6b3beb0f 100644
--- a/lib/ui/src/containers/preview.tsx
+++ b/lib/ui/src/containers/preview.tsx
@@ -7,7 +7,8 @@ import { Preview } from '../components/preview/preview';
 
 export type Item = StoriesHash[keyof StoriesHash];
 
-const splitTitleAddExtraSpace = (input: string) => input.split('/').join(' / ').replace(/\s\s/, ' ');
+const splitTitleAddExtraSpace = (input: string) =>
+  input.split('/').join(' / ').replace(/\s\s/, ' ');
 
 const getDescription = (item: Item) => {
   if (isRoot(item)) {
diff --git a/package.json b/package.json
index 5616e27853a3..9b363328e458 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/root",
-  "version": "6.1.0-alpha.18",
+  "version": "6.1.0-alpha.19",
   "private": true,
   "description": "Storybook is an open source tool for developing UI components in isolation for React, Vue and Angular. It makes building stunning UIs organized and efficient.",
   "keywords": [
@@ -94,12 +94,6 @@
     "serialize-javascript": "^3.0.0"
   },
   "devDependencies": {
-    "@angular/common": "^9.1.0",
-    "@angular/compiler": "^9.1.0",
-    "@angular/core": "^9.1.0",
-    "@angular/forms": "^9.1.0",
-    "@angular/platform-browser": "^9.1.0",
-    "@angular/platform-browser-dynamic": "^9.1.0",
     "@babel/cli": "^7.11.5",
     "@babel/core": "^7.11.5",
     "@babel/plugin-proposal-class-properties": "^7.10.4",
@@ -123,6 +117,7 @@
     "@types/enzyme": "^3.10.3",
     "@types/escodegen": "^0.0.6",
     "@types/express": "^4.17.6",
+    "@types/fs-extra": "^9.0.1",
     "@types/jest": "^25.1.1",
     "@types/js-yaml": "^3.12.4",
     "@types/lodash": "^4.14.150",
@@ -146,7 +141,6 @@
     "chalk": "^4.0.0",
     "chromatic": "^5.0.0",
     "codecov": "^3.5.0",
-    "codelyzer": "^5.0.0",
     "commander": "^5.1.0",
     "concurrently": "^5.2.0",
     "core-js": "^3.0.1",
@@ -181,11 +175,9 @@
     "jest-image-snapshot": "^4.0.2",
     "jest-jasmine2": "^26.0.0",
     "jest-matcher-utils": "^26.0.0",
-    "jest-preset-angular": "^8.2.0",
     "jest-raw-loader": "^1.0.1",
     "jest-serializer-html": "^7.0.0",
     "jest-teamcity": "^1.7.0",
-    "jest-vue-preprocessor": "^1.5.0",
     "jest-watch-typeahead": "^0.5.0",
     "js-yaml": "^3.13.1",
     "lerna": "^3.19.0",
@@ -204,6 +196,7 @@
     "react-test-renderer": "^16.8.3",
     "recursive-copy": "^2.0.10",
     "regenerator-runtime": "^0.13.3",
+    "remark": "^12.0.0",
     "remark-cli": "^8.0.0",
     "remark-lint": "^7.0.0",
     "remark-preset-lint-recommended": "^4.0.0",
@@ -221,12 +214,14 @@
     "ts-node": "^8.10.2",
     "typescript": "^3.9.3",
     "wait-on": "^4.0.0",
+    "webpack": "^4.43.0",
     "window-size": "^1.1.1"
   },
   "optionalDependencies": {
     "@cypress/webpack-preprocessor": "^5.1.2",
     "cypress": "4.7.0",
     "puppeteer": "^2.0.0",
+    "ts-loader": "^8.0.4",
     "verdaccio": "^4.5.1",
     "verdaccio-auth-memory": "^9.4.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 087b5affc20e..5f8f9f68e44e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -130,6 +130,17 @@
     rxjs "6.5.4"
     source-map "0.7.3"
 
+"@angular-devkit/core@^9.1.0":
+  version "9.1.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.12.tgz#7cebce51918fe7f3462d8c58c9fbd5a3e2c3b3e7"
+  integrity sha512-D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA==
+  dependencies:
+    ajv "6.12.3"
+    fast-json-stable-stringify "2.1.0"
+    magic-string "0.25.7"
+    rxjs "6.5.4"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@9.1.7":
   version "9.1.7"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.7.tgz#45394a1c928db449b412dacf205c3ec78fb5ef0c"
@@ -213,63 +224,63 @@
   resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.1.9.tgz#c2fcc50aebfdc268521b407e32dc0d967cb40411"
   integrity sha512-V861X3MxJp1AlMTnkUPldpBLIJbApXF3ka0A5Dq2nVJCyOFeteGkaRWSBgqe2jxmq+LVpJbzcNvtDFXw6mQ0jA==
 
-"@aurelia/debug@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/debug/-/debug-0.8.0-dev.202005200307.tgz#820d843bc68c8f086d9b5076e3a2d81b796a3e2f"
-  integrity sha512-6zpGu1c3tlaapJeQ9oKvv5d6iSNeKfQNeifQAfwyBso/WoioxnZmdB3jacwlof1P2hemxB8RI0e/+P5WdTcVWw==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-
-"@aurelia/fetch-client@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/fetch-client/-/fetch-client-0.8.0-dev.202005200307.tgz#085da01ab1c11753b971b647520f1ad7310b7624"
-  integrity sha512-EwnqLm6VnjBQkY2ExShh6X5aAb/GaqjuPrqaFHXJuCkAIUzX3iD9B4LmMUk5LzDawdhUsG5cEunioe0Ww0jQfA==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime-html" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-
-"@aurelia/jit-html-browser@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/jit-html-browser/-/jit-html-browser-0.8.0-dev.202005200307.tgz#56243740833c82a26b341a7c0486606e86995e90"
-  integrity sha512-gSdZ4cPrin85eGLf3XMgFjbXf0hYzE1tB081m0WtnEXOtMTxP1bqYd2ZMzekA+NFMpZZQBDUkQ4HcBOsDzWF9A==
-  dependencies:
-    "@aurelia/jit" "^0.8.0-dev.202005200307"
-    "@aurelia/jit-html" "^0.8.0-dev.202005200307"
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime-html" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime-html-browser" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler-dom" "^0.8.0-dev.202005200307"
-
-"@aurelia/jit-html@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/jit-html/-/jit-html-0.8.0-dev.202005200307.tgz#6060ff20b104a6dbf0f0880c17408a7710d07c4d"
-  integrity sha512-OjMR1AxynsBMaIcSVsEHOWUa5VZeYJQteC+uWy2lShBQG4wMGozNLcp4OePY8rYuNgvNefRxJSTDQF9bJUmKpQ==
-  dependencies:
-    "@aurelia/jit" "^0.8.0-dev.202005200307"
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime-html" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-
-"@aurelia/jit@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/jit/-/jit-0.8.0-dev.202005200307.tgz#f6df793cc6911b8b547d3ea17dfab39a97b1ca22"
-  integrity sha512-/LeYypR37kIZ2DZVLOTsaP8nMc4arlpXEYYSvGOgp80ZkV5GKCe815lCWD07dzuJK6ltCR5OQHyG+DjtcdhLbA==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
+"@aurelia/debug@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/debug/-/debug-0.7.0.tgz#7ed996f763e99fb23b3cd3444a4b29335983b991"
+  integrity sha512-ODiWypcwwrrdCH5dGMVghqS7NxnpYT5QJgWUbYRthgZuc3GTpXK09PWEt1QWR1H410lj2m3PMQFUndl+7btqWA==
+  dependencies:
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
+
+"@aurelia/fetch-client@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/fetch-client/-/fetch-client-0.7.0.tgz#5f17e22690604434098b1b85c43f01946c2bce2d"
+  integrity sha512-Clh+kY1aKkaWJuo3LH7zv9Y7adCxB63Dlb6e6dZo6xIv9t/xQ1Do9KG9JXqI6Ad6gTu5FvbCdftGiSAVYhV7dg==
+  dependencies:
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/runtime-html" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
+
+"@aurelia/jit-html-browser@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/jit-html-browser/-/jit-html-browser-0.7.0.tgz#b32a1147cb9c8e530e3c649aea82f3c9f3ead299"
+  integrity sha512-LI/g/auL0Hh/Kz4UDtmSi0hqmwKlU8cfw4mZv2BFYjOEyEAaiSyEVsfIZF+uXa1kRQh2hbUUQmnKzAQ3K7nYkA==
+  dependencies:
+    "@aurelia/jit" "^0.7.0"
+    "@aurelia/jit-html" "^0.7.0"
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/runtime-html" "^0.7.0"
+    "@aurelia/runtime-html-browser" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
+    "@aurelia/scheduler-dom" "^0.7.0"
+
+"@aurelia/jit-html@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/jit-html/-/jit-html-0.7.0.tgz#4159d86f5c1760f383584111ed44562858b3a330"
+  integrity sha512-hApNutugWtvnLPMnPYO9Z0Om0h+SwZdCqiLJBJli7IAaKrpkHupWKeLtjUHjUqyfUwLdttFpS98xgBuvtUjrjg==
+  dependencies:
+    "@aurelia/jit" "^0.7.0"
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/runtime-html" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
+
+"@aurelia/jit@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/jit/-/jit-0.7.0.tgz#b1428e64f8e1e931a59fcddff5984c7bf6ebae9e"
+  integrity sha512-vZaCRZj3nTWhkrOFglIsx8Y59KiY1DEgbPwgLuSbC6nAEOLI/1T2f/eQJPiB5waX2klgBlBI6NX9f748o8MZyA==
+  dependencies:
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
 
 "@aurelia/kernel@^0.7.0":
   version "0.7.0"
@@ -278,23 +289,11 @@
   dependencies:
     "@aurelia/metadata" "^0.7.0"
 
-"@aurelia/kernel@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/kernel/-/kernel-0.8.0-dev.202005200307.tgz#e70afd984a15141c4f52c90e47f77f36c9d680e6"
-  integrity sha512-aonZjKeCAOQjF+Ml5YCoByMApo39SXa4obTMxPNJrmSsC5UWQYcWTTmFVKrfDfWl+iA6QFe4Z6SIzbG0ym2XCQ==
-  dependencies:
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-
 "@aurelia/metadata@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@aurelia/metadata/-/metadata-0.7.0.tgz#97dd797975ffa1b207ad24070a4e955d8c71f1cb"
   integrity sha512-PnHoyxRLMK2iUeSqfgIeJfhFY6JfRRKC2RJL/Q05TyXWASYS5QGZtdYqGJCzXaxVas5kZHCFCFVh4iVc/P1wfw==
 
-"@aurelia/metadata@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/metadata/-/metadata-0.8.0-dev.202005200307.tgz#296276e6978012e8830ce237d9d2b740b9c1efcf"
-  integrity sha512-qsazQG0Z4klyTBFNJsD50C74p088YI6N3Q3et2eS4zhFTPk+F49f+arAsKZNyB8aA//gKuWJt/QNmr9D1aoSMQ==
-
 "@aurelia/plugin-conventions@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@aurelia/plugin-conventions/-/plugin-conventions-0.7.0.tgz#f40751a3e1446dccc541c1032938d2f5b311a951"
@@ -308,57 +307,44 @@
     parse5 "^5.1.1"
     typescript "^3.8.3"
 
-"@aurelia/plugin-conventions@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/plugin-conventions/-/plugin-conventions-0.8.0-dev.202005200307.tgz#a52d29dacc0f17b6eb46519d0ed82857d1d80db5"
-  integrity sha512-s+76+WSBqHQxs5Vq6wpQiNjdSPBbztx4P5bbKrYdb8HSr/l3Hm4BRrmF022bK9mL15Z93pFgWgVMeRNeTzRV8g==
+"@aurelia/route-recognizer@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/route-recognizer/-/route-recognizer-0.7.0.tgz#87b4f126e5029eadc09b63362fb31fcc665c62af"
+  integrity sha512-hFuxV/pamowjjYAGJsNipuFZ7yP4YseRqo2nINmvW69dWYbG0CSZL2+i5xxJThdH42Dohi5rGNPgD5+d52rK/g==
+
+"@aurelia/router@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/router/-/router-0.7.0.tgz#f58b580e6c54caea4acd0e4c5b5a876b0c2b39ca"
+  integrity sha512-dzHQgcMEBeSG7CFv5JXS3te//r2QJZKd5FRUj41uvJr8CU1OMEgEuU5gwAPQosbYs6av3/sL+awA5AdQOkJZwg==
   dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-    modify-code "^1.2.0"
-    parse5 "^5.1.1"
-    typescript "^3.8.3"
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/route-recognizer" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/runtime-html" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
 
-"@aurelia/route-recognizer@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/route-recognizer/-/route-recognizer-0.8.0-dev.202005200307.tgz#ef4bcb2d799fbbb504a8bf707bf28891c66092aa"
-  integrity sha512-B73cskP6dDQJQ0WU725hCSRCLFZCCAAW9k5n+K5WP/8cxOO1vy3GdxEUEZQeefNRZUGEBeXCBLbLLfY0G/zx1A==
-
-"@aurelia/router@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/router/-/router-0.8.0-dev.202005200307.tgz#30a6937728c0a8ca4349eed5a76c08a7c37b0440"
-  integrity sha512-dNflKScsSclwBpW6NnfArbqUQGL6QMXO1xWLo+Cv4xz5k9XXZGoZMIKVk2SNbPrtSMSORyBcH9o2dYiuWgb7OA==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/route-recognizer" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime-html" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-
-"@aurelia/runtime-html-browser@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/runtime-html-browser/-/runtime-html-browser-0.8.0-dev.202005200307.tgz#4294af53075d5d63e8c03201d1b89c6608cdc6d6"
-  integrity sha512-+eywZ5kaKVIZ5uE+wz2V7TVon61DQOWC6buOHjAONSUI2Ohhs/+ts6CkjMSJ/sJOb315w2jZdwvm0J2XY/8fYw==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime-html" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler-dom" "^0.8.0-dev.202005200307"
-
-"@aurelia/runtime-html@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/runtime-html/-/runtime-html-0.8.0-dev.202005200307.tgz#57f198475d1a0ee959e45f528f6bd394065f3e6f"
-  integrity sha512-8VrNAg6b3LghldKTX5WGz7hwoiBYbbkR3CXWj14gEqKig1VYjemDt6AVx54rOPIA0uE14hyRo4djCboo/JU7VA==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
+"@aurelia/runtime-html-browser@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/runtime-html-browser/-/runtime-html-browser-0.7.0.tgz#6083ab73ec401faee9059c6fa8bde2f72514301d"
+  integrity sha512-59B1CDmMReEE27lkuFILWAZqpGV5RjkSFBG+ocUBI7CNsAYjBWJP2Y1x0VpWfGafnx4vIOErf/w2EUn7IthLsA==
+  dependencies:
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/runtime-html" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
+    "@aurelia/scheduler-dom" "^0.7.0"
+
+"@aurelia/runtime-html@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/runtime-html/-/runtime-html-0.7.0.tgz#770391e4773b68e27eb5f281f10c4377a4c17b8c"
+  integrity sha512-H2AYhmRzs3sSefiguWs6aWFlWo4yK6o8vlBK4cJ5CPqB2Q6DXKS0N3HykCYnvkBXMrHxhycz86Yk67NUWJgBEA==
+  dependencies:
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
 
 "@aurelia/runtime@^0.7.0":
   version "0.7.0"
@@ -369,23 +355,14 @@
     "@aurelia/metadata" "^0.7.0"
     "@aurelia/scheduler" "^0.7.0"
 
-"@aurelia/runtime@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/runtime/-/runtime-0.8.0-dev.202005200307.tgz#83fcf0857f3c333234949b7eaf9544ea6884ecb7"
-  integrity sha512-EPzk8SWaPwaxklPDWIWx7nXZ+wWSypbpyLomael8ReaVtLIsjFtcGClxzlY50G9D/G5/bSrFlLWGbEHjl7SblA==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-
-"@aurelia/scheduler-dom@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/scheduler-dom/-/scheduler-dom-0.8.0-dev.202005200307.tgz#c1d85d2c8200bde48fae4d2fea441cba49784112"
-  integrity sha512-OCHF8Dgm5nzZe7eOHr4SLGnUH8/ebEDi+GpUPnEQcy/Z31nEjegPBg2Y8ohMdC719CTi7YUzi5uuJNjvJ+IMow==
+"@aurelia/scheduler-dom@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@aurelia/scheduler-dom/-/scheduler-dom-0.7.0.tgz#608e61b8b46c135fb6378cfef74df99a964ab9f6"
+  integrity sha512-WNiHLSge2A7UHWBgJIDNj3PjrUrmVzgyWVRJ+HYYkKaRsSuuxBTtikmyugq2uwNTUiZVgqpum6vnRPKdr+FQQg==
   dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
 
 "@aurelia/scheduler@^0.7.0":
   version "0.7.0"
@@ -395,14 +372,6 @@
     "@aurelia/kernel" "^0.7.0"
     "@aurelia/metadata" "^0.7.0"
 
-"@aurelia/scheduler@^0.8.0-dev.202005200307":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/scheduler/-/scheduler-0.8.0-dev.202005200307.tgz#ba215dcf94c388c50c9360d46917e5a8d2784a02"
-  integrity sha512-0zUDUd2YicBxrlv6iAy7zWFYpA9l6X9kOklq6ouboomkH7zlaxrdKvvAp0F4/WkJ0YWHUlf6ufA9wo10/aM2rA==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-
 "@aurelia/webpack-loader@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@aurelia/webpack-loader/-/webpack-loader-0.7.0.tgz#483ca0f69bc262f7e49ad24a3c2953b8aaca5be4"
@@ -416,19 +385,6 @@
     loader-utils "^1.2.3"
     webpack "^4.41.4"
 
-"@aurelia/webpack-loader@dev":
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/@aurelia/webpack-loader/-/webpack-loader-0.8.0-dev.202005200307.tgz#147b918d362468254f8806b95b24dbae772beeb8"
-  integrity sha512-dffvCzo8J51oBq0F4ltskxz/SxQnBnnFqiLtGo+wxeWiC1BOIzqJaO22lYwLbu8NgiL2SucQ78099VZyuzEuZA==
-  dependencies:
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/plugin-conventions" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-    loader-utils "^1.2.3"
-    webpack "^4.41.4"
-
 "@babel/cli@^7.11.5":
   version "7.11.6"
   resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.11.6.tgz#1fcbe61c2a6900c3539c06ee58901141f3558482"
@@ -546,7 +502,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@7.9.6", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.2.2", "@babel/core@^7.3.4", "@babel/core@^7.4.4", "@babel/core@^7.4.5", "@babel/core@^7.5.5", "@babel/core@^7.7.5", "@babel/core@^7.8.3", "@babel/core@^7.8.4", "@babel/core@^7.9.0":
+"@babel/core@7.9.6", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.2.2", "@babel/core@^7.3.4", "@babel/core@^7.4.4", "@babel/core@^7.4.5", "@babel/core@^7.5.5", "@babel/core@^7.7.5", "@babel/core@^7.8.3", "@babel/core@^7.8.4", "@babel/core@^7.9.0", "@babel/core@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
   integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
@@ -568,7 +524,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.11.0", "@babel/core@^7.11.5", "@babel/core@^7.9.6":
+"@babel/core@^7.11.0", "@babel/core@^7.11.5":
   version "7.11.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
   integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
@@ -4426,17 +4382,18 @@
     npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
 
-"@marko/webpack@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@marko/webpack/-/webpack-2.1.0.tgz#2042556c142201b3d05cdee8703b1b44afee089b"
-  integrity sha512-FYaQyZpdCFW07PRy4Yize7WJsxLxGZU+C611SAlanSisTaCGy1bof7V9YuvbddUf5XalmP4T2Qns0XyL2zkdhw==
+"@marko/webpack@^6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@marko/webpack/-/webpack-6.2.8.tgz#d8c0542dcb2b0950b72a06e3d2ff179729e1a02f"
+  integrity sha512-gXoGXKl0vCawIK4KGVg9F5XVYMUKLDTaXxH8i5bQXzdFw+7VfONug0GnKJn8EDUbCgeHS219dS39+igFSbB0dw==
   dependencies:
-    base-x "^3.0.5"
+    base-x "^3.0.7"
+    concat-with-sourcemaps "^1.1.0"
     lasso-modules-client "^2.0.5"
-    loader-utils "^1.2.3"
-    sort-keys "^2.0.0"
+    loader-utils "^1.4.0"
+    sort-keys "^4.0.0"
     tslib "^1.10.0"
-    webpack-virtual-modules "^0.1.10"
+    webpack-virtual-modules "^0.2.1"
 
 "@mdx-js/loader@^1.5.1":
   version "1.6.4"
@@ -5373,6 +5330,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/fs-extra@^9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"
+  integrity sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/glob-base@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@types/glob-base/-/glob-base-0.3.0.tgz#a581d688347e10e50dd7c17d6f2880a10354319d"
@@ -6828,6 +6792,16 @@ ajv@6.12.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@6.12.3:
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@^5.1.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -7039,11 +7013,6 @@ app-root-dir@^1.0.2:
   resolved "https://registry.yarnpkg.com/app-root-dir/-/app-root-dir-1.0.2.tgz#38187ec2dea7577fff033ffcb12172692ff6e118"
   integrity sha1-OBh+wt6nV3//Az/8sSFyaS/24Rg=
 
-app-root-path@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
-  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -7496,25 +7465,25 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-aurelia@dev:
-  version "0.8.0-dev.202005200307"
-  resolved "https://registry.yarnpkg.com/aurelia/-/aurelia-0.8.0-dev.202005200307.tgz#0afaaff3cb5e2ac43c8f14a5856da3a0d81b27e0"
-  integrity sha512-y8TKxHz7slfWsIUQXd+tqdwDnilzgGtkB+VSvCtUFvdqfQxVZL2r3mlfINKrRdUB8p1/7s4SMDhViWgxiCUVoQ==
-  dependencies:
-    "@aurelia/debug" "^0.8.0-dev.202005200307"
-    "@aurelia/fetch-client" "^0.8.0-dev.202005200307"
-    "@aurelia/jit" "^0.8.0-dev.202005200307"
-    "@aurelia/jit-html" "^0.8.0-dev.202005200307"
-    "@aurelia/jit-html-browser" "^0.8.0-dev.202005200307"
-    "@aurelia/kernel" "^0.8.0-dev.202005200307"
-    "@aurelia/metadata" "^0.8.0-dev.202005200307"
-    "@aurelia/route-recognizer" "^0.8.0-dev.202005200307"
-    "@aurelia/router" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime-html" "^0.8.0-dev.202005200307"
-    "@aurelia/runtime-html-browser" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler" "^0.8.0-dev.202005200307"
-    "@aurelia/scheduler-dom" "^0.8.0-dev.202005200307"
+aurelia@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aurelia/-/aurelia-0.7.0.tgz#37938b4a4c7a8d2fe7746ef4757a7ee86a6ec816"
+  integrity sha512-Jy0epfWP6M6NTt4XP6G/0SgO4uJOZ+pyajxJdvOpjZlKwPevOKXh1lEzKTTZ3myiwQCHmPoUZK+1mToQPLD2IQ==
+  dependencies:
+    "@aurelia/debug" "^0.7.0"
+    "@aurelia/fetch-client" "^0.7.0"
+    "@aurelia/jit" "^0.7.0"
+    "@aurelia/jit-html" "^0.7.0"
+    "@aurelia/jit-html-browser" "^0.7.0"
+    "@aurelia/kernel" "^0.7.0"
+    "@aurelia/metadata" "^0.7.0"
+    "@aurelia/route-recognizer" "^0.7.0"
+    "@aurelia/router" "^0.7.0"
+    "@aurelia/runtime" "^0.7.0"
+    "@aurelia/runtime-html" "^0.7.0"
+    "@aurelia/runtime-html-browser" "^0.7.0"
+    "@aurelia/scheduler" "^0.7.0"
+    "@aurelia/scheduler-dom" "^0.7.0"
 
 autoprefixer@9.7.4:
   version "9.7.4"
@@ -7582,13 +7551,6 @@ axios@0.19.0:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
 
-axobject-query@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
-  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
-  dependencies:
-    ast-types-flow "0.0.7"
-
 axobject-query@^2.0.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz#2bdffc0371e643e5f03ba99065d5179b9ca79799"
@@ -8905,7 +8867,7 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base-x@^3.0.5:
+base-x@^3.0.7:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.8.tgz#1e1106c2537f0162e8b52474a557ebb09000018d"
   integrity sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==
@@ -11077,21 +11039,6 @@ codecov@^3.5.0:
     teeny-request "6.0.1"
     urlgrey "0.4.4"
 
-codelyzer@^5.0.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.2.2.tgz#d0530a455784e6bea0b6d7e97166c73c30a5347f"
-  integrity sha512-jB4FZ1Sx7kZhvZVdf+N2BaKTdrrNZOL0Bj10RRfrhHrb3zEvXjJvvq298JPMJAiyiCS/v4zs1QlGU0ip7xGqeA==
-  dependencies:
-    app-root-path "^2.2.1"
-    aria-query "^3.0.0"
-    axobject-query "2.0.2"
-    css-selector-tokenizer "^0.7.1"
-    cssauron "^1.4.0"
-    damerau-levenshtein "^1.0.4"
-    semver-dsl "^1.0.1"
-    source-map "^0.5.7"
-    sprintf-js "^1.1.2"
-
 codemirror-graphql@^0.11.6:
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.11.6.tgz#885e34afb5b7aacf0e328d4d5949e73ad21d5a4e"
@@ -11379,6 +11326,13 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
+concat-with-sourcemaps@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
+  dependencies:
+    source-map "^0.6.1"
+
 concurrently@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.2.0.tgz#ead55121d08a0fc817085584c123cedec2e08975"
@@ -12109,7 +12063,7 @@ css-select@^2.0.0:
     domutils "^1.7.0"
     nth-check "^1.0.2"
 
-css-selector-tokenizer@^0.7.0, css-selector-tokenizer@^0.7.1:
+css-selector-tokenizer@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz#11e5e27c9a48d90284f22d45061c303d7a25ad87"
   integrity sha512-yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw==
@@ -12189,13 +12143,6 @@ css@^3.0.0:
     source-map "^0.6.1"
     source-map-resolve "^0.6.0"
 
-cssauron@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
-  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
-  dependencies:
-    through X.X.X
-
 cssdb@^4.3.0, cssdb@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
@@ -29492,13 +29439,6 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-semver-dsl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
-  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
-  dependencies:
-    semver "^5.3.0"
-
 semver-intersect@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
@@ -30073,6 +30013,13 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+sort-keys@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.0.0.tgz#56dc5e256637bfe3fec8db0dc57c08b1a2be22d6"
+  integrity sha512-hlJLzrn/VN49uyNkZ8+9b+0q9DjmmYcYOnbMQtpkLrYpPwRApDPZfmqbUfJnAA3sb/nRib+nDot7Zi/1ER1fuA==
+  dependencies:
+    is-plain-obj "^2.0.0"
+
 sort-object-keys@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
@@ -30308,7 +30255,7 @@ split@^1.0.0:
   dependencies:
     through "2"
 
-sprintf-js@^1.0.3, sprintf-js@^1.1.2:
+sprintf-js@^1.0.3:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -31578,7 +31525,7 @@ through2@^3.0.0, through2@^3.0.1:
   dependencies:
     readable-stream "2 || 3"
 
-through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -32038,6 +31985,17 @@ 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@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.4.tgz#02b9c91fbcfdb3114d8b1e98a3829265270eee7a"
+  integrity sha512-5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ==
+  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"
@@ -32299,9 +32257,9 @@ typescript@^3.2.4, typescript@^3.5.3, typescript@^3.8.3, typescript@^3.9.3:
   integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
 
 typescript@^4.1.0-dev.20200804:
-  version "4.1.0-dev.20200920"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.0-dev.20200920.tgz#10ee53b47d59f8f9f5393923af2e2afb77be7faf"
-  integrity sha512-bGi57WKSfaYS4FefMMR3a6CcVAc/bmyx+df7EILzSzJk1gd9GSkT/9M2vHPyOEt/IjFBNhyOCB8hQ6PrQoqlFw==
+  version "4.1.0-dev.20200921"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.0-dev.20200921.tgz#dc9fb6938b046a71cfbe09b3cecd420ce8414910"
+  integrity sha512-3QUfGlMtdcNEj+PzW8YrM9ERAF86BCyUfAPhRaA7ioTGCpXQ0y593FZcKC/kU5axwIIyiMSloMNbkm6X+Mf8BQ==
 
 ua-parser-js@^0.7.18:
   version "0.7.21"
@@ -33754,14 +33712,7 @@ webpack-subresource-integrity@1.4.0:
   dependencies:
     webpack-sources "^1.3.0"
 
-webpack-virtual-modules@^0.1.10:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.1.12.tgz#ff6430c1d6f514eff12bae773ec03e5043a81943"
-  integrity sha512-uwVhcpmh7WykpP2fD4T//5DLdMuanPHGXQHCnIrKoRg10GgVNy5z2oAcn26HLF67a6HCSzgc9xar+SMtZhOnXw==
-  dependencies:
-    debug "^3.0.0"
-
-webpack-virtual-modules@^0.2.2:
+webpack-virtual-modules@^0.2.1, webpack-virtual-modules@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz#20863dc3cb6bb2104729fff951fbe14b18bd0299"
   integrity sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==