Merge branch 'next' into 13296-event-key

storybookjs · Nov 28, 2020 · ea753eb · ea753eb
2 parents 8724e7d + 1cccad8
commit ea753eb
Show file tree

Hide file tree

Showing 93 changed files with 711 additions and 674 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 6.1.8 (November 27, 2020)
+
+### Bug Fixes
+
+- Core: Fix preview URL dropped hashes ([#13308](https://github.com/storybookjs/storybook/pull/13308))
+- Core: Fix template script tag support ([#13271](https://github.com/storybookjs/storybook/pull/13271))
+- Addon-docs: Fix Vue source snippets for function attributes ([#13288](https://github.com/storybookjs/storybook/pull/13288))
+- Components: Fix Zoom for IE11 ([#13302](https://github.com/storybookjs/storybook/pull/13302))
+- React: Don't add FastRefresh if already enabled ([#13303](https://github.com/storybookjs/storybook/pull/13303))
+- CLI: Fix storybook-deployer upgrade warning ([#13306](https://github.com/storybookjs/storybook/pull/13306))
+
+### Maintenance
+
+- React: Expose StorybookConfig types ([#13309](https://github.com/storybookjs/storybook/pull/13309))
+- React: Fix unit tests for react preset ([#13315](https://github.com/storybookjs/storybook/pull/13315))
+
 ## 6.1.7 (November 27, 2020)
 
 ### Bug Fixes

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -40,14 +40,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.7",
-    "@storybook/api": "6.1.7",
-    "@storybook/channels": "6.1.7",
-    "@storybook/client-api": "6.1.7",
-    "@storybook/client-logger": "6.1.7",
-    "@storybook/components": "6.1.7",
-    "@storybook/core-events": "6.1.7",
-    "@storybook/theming": "6.1.7",
+    "@storybook/addons": "6.1.8",
+    "@storybook/api": "6.1.8",
+    "@storybook/channels": "6.1.8",
+    "@storybook/client-api": "6.1.8",
+    "@storybook/client-logger": "6.1.8",
+    "@storybook/components": "6.1.8",
+    "@storybook/core-events": "6.1.8",
+    "@storybook/theming": "6.1.8",
     "axe-core": "^4.0.1",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -76,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "303d951f9ae4aa2241c9823e1cb6edbfd50fb093"
+  "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9"
 }
diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -35,12 +35,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.7",
-    "@storybook/api": "6.1.7",
-    "@storybook/client-api": "6.1.7",
-    "@storybook/components": "6.1.7",
-    "@storybook/core-events": "6.1.7",
-    "@storybook/theming": "6.1.7",
+    "@storybook/addons": "6.1.8",
+    "@storybook/api": "6.1.8",
+    "@storybook/client-api": "6.1.8",
+    "@storybook/components": "6.1.8",
+    "@storybook/core-events": "6.1.8",
+    "@storybook/theming": "6.1.8",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^3.1.1",
     "global": "^4.3.2",
@@ -73,5 +73,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "303d951f9ae4aa2241c9823e1cb6edbfd50fb093"
+  "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9"
 }
diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -39,12 +39,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.7",
-    "@storybook/api": "6.1.7",
-    "@storybook/client-logger": "6.1.7",
-    "@storybook/components": "6.1.7",
-    "@storybook/core-events": "6.1.7",
-    "@storybook/theming": "6.1.7",
+    "@storybook/addons": "6.1.8",
+    "@storybook/api": "6.1.8",
+    "@storybook/client-logger": "6.1.8",
+    "@storybook/components": "6.1.8",
+    "@storybook/core-events": "6.1.8",
+    "@storybook/theming": "6.1.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "memoizerific": "^1.11.3",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "303d951f9ae4aa2241c9823e1cb6edbfd50fb093"
+  "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9"
 }
diff --git a/addons/controls/package.json b/addons/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "description": "Controls for component properties",
   "keywords": [
     "addon",
@@ -30,12 +30,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.7",
-    "@storybook/api": "6.1.7",
-    "@storybook/client-api": "6.1.7",
-    "@storybook/components": "6.1.7",
-    "@storybook/node-logger": "6.1.7",
-    "@storybook/theming": "6.1.7",
+    "@storybook/addons": "6.1.8",
+    "@storybook/api": "6.1.8",
+    "@storybook/client-api": "6.1.8",
+    "@storybook/components": "6.1.8",
+    "@storybook/node-logger": "6.1.8",
+    "@storybook/theming": "6.1.8",
     "core-js": "^3.0.1",
     "ts-dedent": "^2.0.0"
   },
@@ -54,5 +54,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "303d951f9ae4aa2241c9823e1cb6edbfd50fb093"
+  "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9"
 }
diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "description": "A storybook addon to switch between css resources at runtime for your story",
   "keywords": [
     "addon",
@@ -39,11 +39,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.7",
-    "@storybook/api": "6.1.7",
-    "@storybook/components": "6.1.7",
-    "@storybook/core-events": "6.1.7",
-    "@storybook/theming": "6.1.7",
+    "@storybook/addons": "6.1.8",
+    "@storybook/api": "6.1.8",
+    "@storybook/components": "6.1.8",
+    "@storybook/core-events": "6.1.8",
+    "@storybook/theming": "6.1.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.7"
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "303d951f9ae4aa2241c9823e1cb6edbfd50fb093"
+  "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9"
 }
diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-design-assets",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "description": "Design asset preview for storybook",
   "keywords": [
     "addon",
@@ -41,12 +41,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.1.7",
-    "@storybook/api": "6.1.7",
-    "@storybook/client-logger": "6.1.7",
-    "@storybook/components": "6.1.7",
-    "@storybook/core-events": "6.1.7",
-    "@storybook/theming": "6.1.7",
+    "@storybook/addons": "6.1.8",
+    "@storybook/api": "6.1.8",
+    "@storybook/client-logger": "6.1.8",
+    "@storybook/components": "6.1.8",
+    "@storybook/core-events": "6.1.8",
+    "@storybook/theming": "6.1.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.7",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "303d951f9ae4aa2241c9823e1cb6edbfd50fb093"
+  "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9"
 }
diff --git a/addons/docs/package.json b/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "description": "Superior documentation for your components",
   "keywords": [
     "addon",
@@ -55,18 +55,18 @@
     "@mdx-js/loader": "^1.6.19",
     "@mdx-js/mdx": "^1.6.19",
     "@mdx-js/react": "^1.6.19",
-    "@storybook/addons": "6.1.7",
-    "@storybook/api": "6.1.7",
-    "@storybook/client-api": "6.1.7",
-    "@storybook/client-logger": "6.1.7",
-    "@storybook/components": "6.1.7",
-    "@storybook/core": "6.1.7",
-    "@storybook/core-events": "6.1.7",
+    "@storybook/addons": "6.1.8",
+    "@storybook/api": "6.1.8",
+    "@storybook/client-api": "6.1.8",
+    "@storybook/client-logger": "6.1.8",
+    "@storybook/components": "6.1.8",
+    "@storybook/core": "6.1.8",
+    "@storybook/core-events": "6.1.8",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.1.7",
-    "@storybook/postinstall": "6.1.7",
-    "@storybook/source-loader": "6.1.7",
-    "@storybook/theming": "6.1.7",
+    "@storybook/node-logger": "6.1.8",
+    "@storybook/postinstall": "6.1.8",
+    "@storybook/source-loader": "6.1.8",
+    "@storybook/theming": "6.1.8",
     "acorn": "^7.1.0",
     "acorn-jsx": "^5.1.0",
     "acorn-walk": "^7.0.0",
@@ -92,9 +92,9 @@
     "@babel/core": "^7.12.3",
     "@emotion/core": "^10.1.1",
     "@emotion/styled": "^10.0.23",
-    "@storybook/react": "6.1.7",
-    "@storybook/vue": "6.1.7",
-    "@storybook/web-components": "6.1.7",
+    "@storybook/react": "6.1.8",
+    "@storybook/vue": "6.1.8",
+    "@storybook/web-components": "6.1.8",
     "@types/cross-spawn": "^6.0.1",
     "@types/doctrine": "^0.0.3",
     "@types/enzyme": "^3.10.3",
@@ -123,7 +123,7 @@
   },
   "peerDependencies": {
     "@babel/core": "^7.11.5",
-    "@storybook/vue": "6.1.7",
+    "@storybook/vue": "6.1.8",
     "babel-loader": "^8.0.0",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0",
@@ -154,5 +154,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "303d951f9ae4aa2241c9823e1cb6edbfd50fb093"
+  "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9"
 }
diff --git a/addons/docs/src/frameworks/vue/sourceDecorator.test.ts b/addons/docs/src/frameworks/vue/sourceDecorator.test.ts
@@ -32,7 +32,7 @@ describe('vnodeToString', () => {
 
   it('attributes', () => {
     const MyComponent: ComponentOptions<any, any, any> = {
-      props: ['propA', 'propB', 'propC', 'propD'],
+      props: ['propA', 'propB', 'propC', 'propD', 'propE', 'propF', 'propG'],
       template: '<div/>',
     };
 
@@ -49,14 +49,21 @@ describe('vnodeToString', () => {
                 propD: {
                   foo: 'bar',
                 },
+                propE: true,
+                propF() {
+                  const foo = 'bar';
+
+                  return foo;
+                },
+                propG: undefined,
               },
             };
           },
           template: `<my-component v-bind="props"/>`,
         })
       )
     ).toMatchInlineSnapshot(
-      `<my-component :propD='{"foo":"bar"}' :propC="null" :propB="1" propA="propA"/>`
+      `<my-component propE :propD='{"foo":"bar"}' :propC="null" :propB="1" propA="propA"/>`
     );
   });
 

diff --git a/addons/docs/src/frameworks/vue/sourceDecorator.ts b/addons/docs/src/frameworks/vue/sourceDecorator.ts
@@ -123,7 +123,7 @@ export function vnodeToString(vnode: Vue.VNode): string {
 }
 
 function stringifyAttr(attrName: string, value?: any): string | null {
-  if (typeof value === 'undefined') {
+  if (typeof value === 'undefined' || typeof value === 'function') {
     return null;
   }
 

diff --git a/addons/essentials/package.json b/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -35,28 +35,28 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "6.1.7",
-    "@storybook/addon-backgrounds": "6.1.7",
-    "@storybook/addon-controls": "6.1.7",
-    "@storybook/addon-docs": "6.1.7",
-    "@storybook/addon-toolbars": "6.1.7",
-    "@storybook/addon-viewport": "6.1.7",
-    "@storybook/addons": "6.1.7",
-    "@storybook/api": "6.1.7",
-    "@storybook/node-logger": "6.1.7",
+    "@storybook/addon-actions": "6.1.8",
+    "@storybook/addon-backgrounds": "6.1.8",
+    "@storybook/addon-controls": "6.1.8",
+    "@storybook/addon-docs": "6.1.8",
+    "@storybook/addon-toolbars": "6.1.8",
+    "@storybook/addon-viewport": "6.1.8",
+    "@storybook/addons": "6.1.8",
+    "@storybook/api": "6.1.8",
+    "@storybook/node-logger": "6.1.8",
     "core-js": "^3.0.1",
     "regenerator-runtime": "^0.13.7",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/vue": "6.1.7",
+    "@storybook/vue": "6.1.8",
     "@types/jest": "^25.1.1",
     "@types/webpack-env": "^1.15.3"
   },
   "peerDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/vue": "6.1.7",
+    "@storybook/vue": "6.1.8",
     "babel-loader": "^8.0.0",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "303d951f9ae4aa2241c9823e1cb6edbfd50fb093"
+  "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9"
 }