Merge branch 'next' into tech/migrate-cli-to-TS

storybookjs · May 17, 2020 · 9583c02 · 9583c02
2 parents 5860974 + d6878e6
commit 9583c02
Show file tree

Hide file tree

Showing 86 changed files with 565 additions and 555 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 6.0.0-beta.8 (May 17, 2020)
+
+### Features
+
+* Addon-toolbars: Show tool icons for all viewModes ([#10810](https://github.com/storybookjs/storybook/pull/10810))
+
+### Bug Fixes
+
+* Addon-docs: Eval argTypes default value ([#10812](https://github.com/storybookjs/storybook/pull/10812))
+
+### Maintenance
+
+* Scripts: parallel execution on build package scripts ([#10808](https://github.com/storybookjs/storybook/pull/10808))
+
 ## 6.0.0-beta.7 (May 15, 2020)
 
 ### Breaking changes

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,14 +33,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "axe-core": "^3.5.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^3.1.1",
     "global": "^4.3.2",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -32,12 +32,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "memoizerific": "^1.11.3",
     "react": "^16.8.3",

diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "A storybook addon to switch between css resources at runtime for your story",
   "keywords": [
     "addon",
@@ -32,11 +32,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",

diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-design-assets",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Design asset preview for storybook",
   "keywords": [
     "addon",
@@ -34,12 +34,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",

diff --git a/addons/docs/package.json b/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Superior documentation for your components",
   "keywords": [
     "addon",
@@ -48,17 +48,17 @@
     "@mdx-js/loader": "^1.5.1",
     "@mdx-js/mdx": "^1.5.1",
     "@mdx-js/react": "^1.5.1",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-beta.7",
-    "@storybook/postinstall": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/postinstall": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "acorn": "^7.1.0",
     "acorn-jsx": "^5.1.0",
     "acorn-walk": "^7.0.0",
@@ -84,8 +84,8 @@
     "@babel/core": "^7.9.6",
     "@emotion/core": "^10.0.20",
     "@emotion/styled": "^10.0.17",
-    "@storybook/react": "6.0.0-beta.7",
-    "@storybook/web-components": "6.0.0-beta.7",
+    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/web-components": "6.0.0-beta.8",
     "@types/cross-spawn": "^6.0.1",
     "@types/doctrine": "^0.0.3",
     "@types/enzyme": "^3.10.3",

diff --git a/addons/docs/src/frameworks/react/extractArgTypes.ts b/addons/docs/src/frameworks/react/extractArgTypes.ts
@@ -1,26 +1,30 @@
 import { PropDef, PropsTableRowsProps } from '@storybook/components';
 import { ArgTypes } from '@storybook/api';
 import { ArgTypesExtractor } from '../../lib/docgen';
-import { trimQuotes } from '../../lib/sbtypes/utils';
 import { extractProps } from './extractProps';
 
-const trim = (val: any) => (val && typeof val === 'string' ? trimQuotes(val) : val);
-
 export const extractArgTypes: ArgTypesExtractor = (component) => {
   if (component) {
     const props = extractProps(component);
     const { rows } = props as PropsTableRowsProps;
     if (rows) {
       return rows.reduce((acc: ArgTypes, row: PropDef) => {
-        const { type, sbType, defaultValue, jsDocTags, required } = row;
+        const { type, sbType, defaultValue: defaultSummary, jsDocTags, required } = row;
+        let defaultValue = defaultSummary && (defaultSummary.detail || defaultSummary.summary);
+        try {
+          // eslint-disable-next-line no-eval
+          defaultValue = eval(defaultValue);
+          // eslint-disable-next-line no-empty
+        } catch {}
+
         acc[row.name] = {
           ...row,
-          defaultValue: defaultValue && trim(defaultValue.detail || defaultValue.summary),
+          defaultValue,
           type: { required, ...sbType },
           table: {
             type,
             jsDocTags,
-            defaultValue,
+            defaultValue: defaultSummary,
           },
         };
         return acc;

diff --git a/addons/essentials/package.json b/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -28,13 +28,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "regenerator-runtime": "^0.13.3",
     "ts-dedent": "^1.1.1"

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -31,11 +31,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "format-json": "^1.0.3",
     "lodash": "^4.17.15",

diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-google-analytics",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react-ga": "^2.5.7",

diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-transform-classes": "^7.9.2",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
     "@types/webpack": "^4.41.9",
     "babel-loader": "^8.0.6",
     "core-js": "^3.0.1",

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -35,11 +35,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook Addon Prop Editor Component",
   "keywords": [
     "addon",
@@ -29,13 +29,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "@types/react-color": "^3.0.1",
     "copy-to-clipboard": "^3.0.8",
     "core-js": "^3.0.1",