Merge branch 'next' into fix/react-component-name

storybookjs · Oct 5, 2020 · b39e816 · b39e816
2 parents 861e9b0 + cbe72d0
commit b39e816
Show file tree

Hide file tree

Showing 106 changed files with 1,021 additions and 1,011 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 };
 }