merge(next) : Merge changes

storybookjs · Nov 6, 2019 · c14a10d · c14a10d
2 parents 128cca0 + 5770c8e
commit c14a10d
Show file tree

Hide file tree

Showing 89 changed files with 590 additions and 562 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 5.3.0-alpha.40 (November 6, 2019)
+
+### Features
+
+* TriConfig configuration refactor ([#8597](https://github.com/storybookjs/storybook/pull/8597))
+* Presets: Ability to combine presets into another preset ([#6828](https://github.com/storybookjs/storybook/pull/6828))
+
+### Bug Fixes
+
+* Theming: Fix invisible hr styles in typography ([#8659](https://github.com/storybookjs/storybook/pull/8659))
+
+### Maintenance
+
+* Build: caching to github workflows ([#8724](https://github.com/storybookjs/storybook/pull/8724))
+
 ## 5.3.0-alpha.39 (November 5, 2019)
 
 ### Breaking Changes

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,12 +33,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
-    "@storybook/client-logger": "5.3.0-alpha.39",
-    "@storybook/components": "5.3.0-alpha.39",
-    "@storybook/core-events": "5.3.0-alpha.39",
-    "@storybook/theming": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
+    "@storybook/client-logger": "5.3.0-alpha.40",
+    "@storybook/components": "5.3.0-alpha.40",
+    "@storybook/core-events": "5.3.0-alpha.40",
+    "@storybook/theming": "5.3.0-alpha.40",
     "axe-core": "^3.3.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": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
-    "@storybook/client-api": "5.3.0-alpha.39",
-    "@storybook/components": "5.3.0-alpha.39",
-    "@storybook/core-events": "5.3.0-alpha.39",
-    "@storybook/theming": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
+    "@storybook/client-api": "5.3.0-alpha.40",
+    "@storybook/components": "5.3.0-alpha.40",
+    "@storybook/core-events": "5.3.0-alpha.40",
+    "@storybook/theming": "5.3.0-alpha.40",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^2.0.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": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "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": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
-    "@storybook/client-logger": "5.3.0-alpha.39",
-    "@storybook/components": "5.3.0-alpha.39",
-    "@storybook/core-events": "5.3.0-alpha.39",
-    "@storybook/theming": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
+    "@storybook/client-logger": "5.3.0-alpha.40",
+    "@storybook/components": "5.3.0-alpha.40",
+    "@storybook/core-events": "5.3.0-alpha.40",
+    "@storybook/theming": "5.3.0-alpha.40",
     "core-js": "^3.0.1",
     "memoizerific": "^1.11.3",
     "react": "^16.8.3",

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",
@@ -29,7 +29,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "util-deprecate": "^1.0.2"

diff --git a/addons/contexts/package.json b/addons/contexts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-contexts",
-  "version": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Storybook Addon Contexts",
   "keywords": [
     "preact",
@@ -27,10 +27,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
-    "@storybook/components": "5.3.0-alpha.39",
-    "@storybook/core-events": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
+    "@storybook/components": "5.3.0-alpha.40",
+    "@storybook/core-events": "5.3.0-alpha.40",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "qs": "^6.6.0"

diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "A storybook addon to switch between css resources at runtime for your story",
   "keywords": [
     "addon",
@@ -32,10 +32,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
-    "@storybook/components": "5.3.0-alpha.39",
-    "@storybook/core-events": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
+    "@storybook/components": "5.3.0-alpha.40",
+    "@storybook/core-events": "5.3.0-alpha.40",
     "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": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Design asset preview for storybook",
   "keywords": [
     "addon",
@@ -34,12 +34,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
-    "@storybook/client-logger": "5.3.0-alpha.39",
-    "@storybook/components": "5.3.0-alpha.39",
-    "@storybook/core-events": "5.3.0-alpha.39",
-    "@storybook/theming": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
+    "@storybook/client-logger": "5.3.0-alpha.40",
+    "@storybook/components": "5.3.0-alpha.40",
+    "@storybook/core-events": "5.3.0-alpha.40",
+    "@storybook/theming": "5.3.0-alpha.40",
     "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": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Superior documentation for your components",
   "keywords": [
     "addon",
@@ -44,12 +44,12 @@
     "@mdx-js/loader": "^1.1.0",
     "@mdx-js/mdx": "^1.1.0",
     "@mdx-js/react": "^1.0.27",
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
-    "@storybook/components": "5.3.0-alpha.39",
-    "@storybook/router": "5.3.0-alpha.39",
-    "@storybook/source-loader": "5.3.0-alpha.39",
-    "@storybook/theming": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
+    "@storybook/components": "5.3.0-alpha.40",
+    "@storybook/router": "5.3.0-alpha.40",
+    "@storybook/source-loader": "5.3.0-alpha.40",
+    "@storybook/theming": "5.3.0-alpha.40",
     "core-js": "^3.0.1",
     "doctrine": "^3.0.0",
     "global": "^4.3.2",

diff --git a/addons/docs/src/lib/docgenUtils.ts b/addons/docs/src/lib/docgenUtils.ts
@@ -5,7 +5,7 @@ import { getTypeSystemHandler, getPropTypeSystem } from './type-system-handlers'
 
 export type PropsExtractor = (component: Component) => PropsTableProps | null;
 
-export type PropDefGetter = (type: Component, section: string) => PropDef[];
+export type PropDefGetter = (component: Component, section: string) => PropDef[];
 
 export const str = (o: any) => {
   if (!o) {
@@ -17,27 +17,24 @@ export const str = (o: any) => {
   throw new Error(`Description: expected string, got: ${JSON.stringify(o)}`);
 };
 
-export const hasDocgen = (obj: any) => !!obj.__docgenInfo;
+export const hasDocgen = (component: Component) => !!component.__docgenInfo;
 
-export const hasDocgenSection = (obj: any, section: string) =>
-  obj.__docgenInfo &&
-  obj.__docgenInfo[section] &&
-  Object.keys(obj.__docgenInfo[section]).length > 0;
+export const hasDocgenSection = (component: Component, section: string) =>
+  component &&
+  component.__docgenInfo &&
+  component.__docgenInfo[section] &&
+  Object.keys(component.__docgenInfo[section]).length > 0;
 
-export const extractPropsFromDocgen: PropDefGetter = (type, section) => {
-  const props: Record<string, PropDef> = {};
-
-  const docgenInfoProps = type.__docgenInfo[section];
-  if (!docgenInfoProps) {
+export const extractPropsFromDocgen: PropDefGetter = (component, section) => {
+  if (!hasDocgenSection(component, section)) {
     return [];
   }
 
+  const props: Record<string, PropDef> = {};
+  const docgenInfoProps = component.__docgenInfo[section];
   const propKeys = Object.keys(docgenInfoProps);
-  if (propKeys.length === 0) {
-    return [];
-  }
 
-  // Assuming the props for a given type will all have the same type system.
+  // Assuming the props for a given component will all have the same type system.
   const typeSystem = getPropTypeSystem(docgenInfoProps[propKeys[0]]);
   const typeSystemHandler = getTypeSystemHandler(typeSystem);
 

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -31,11 +31,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
-    "@storybook/client-api": "5.3.0-alpha.39",
-    "@storybook/core-events": "5.3.0-alpha.39",
-    "@storybook/theming": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
+    "@storybook/client-api": "5.3.0-alpha.40",
+    "@storybook/core-events": "5.3.0-alpha.40",
+    "@storybook/theming": "5.3.0-alpha.40",
     "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": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/core-events": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/core-events": "5.3.0-alpha.40",
     "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": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",
@@ -29,8 +29,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/api": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/api": "5.3.0-alpha.40",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "graphiql": "^0.16.0",

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "A Storybook addon to show additional information for your stories.",
   "keywords": [
     "addon",
@@ -29,10 +29,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/client-logger": "5.3.0-alpha.39",
-    "@storybook/components": "5.3.0-alpha.39",
-    "@storybook/theming": "5.3.0-alpha.39",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/client-logger": "5.3.0-alpha.40",
+    "@storybook/components": "5.3.0-alpha.40",
+    "@storybook/theming": "5.3.0-alpha.40",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "marksy": "^7.0.0",

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