Merge branch 'next-6.0.0' into a11y-improve-ts-conf

storybookjs · Dec 21, 2019 · 78217ea · 78217ea
2 parents daec5a2 + 03efaa6
commit 78217ea
Show file tree

Hide file tree

Showing 124 changed files with 1,380 additions and 774 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 5.3.0-rc.0 (December 19, 2019)
+
+### Features
+
+* CSF: Use `__orderedExports` in loader if provided  ([#9181](https://github.com/storybookjs/storybook/pull/9181))
+
+### Bug Fixes
+
+* Addon-a11y: Fix selected blindness color filter ([#9179](https://github.com/storybookjs/storybook/pull/9179))
+
+### Maintenance
+
+* Addon-essentials: Remove actions, links, knobs ([#9184](https://github.com/storybookjs/storybook/pull/9184))
+
 ## 5.3.0-beta.31 (December 16, 2019)
 
 ### Features

diff --git a/MIGRATION.md b/MIGRATION.md
@@ -256,7 +256,7 @@ For example, here's how to sort by story ID using `storySort`:
 addParameters({
   options: {
     storySort: (a, b) =>
-      a[1].kind === b[1].kind ? 0 : a[1].id.localeCompare(b[1].id, { numeric: true }),
+      a[1].kind === b[1].kind ? 0 : a[1].id.localeCompare(b[1].id, undefined, { numeric: true }),
   },
 });
 ```

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "5.3.0-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,12 +33,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/client-logger": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
-    "@storybook/theming": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/client-logger": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
+    "@storybook/theming": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/client-api": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
-    "@storybook/theming": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/client-api": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
+    "@storybook/theming": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "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-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/client-logger": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
-    "@storybook/theming": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/client-logger": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
+    "@storybook/theming": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",
@@ -29,7 +29,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "Storybook Addon Contexts",
   "keywords": [
     "preact",
@@ -27,10 +27,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "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-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "Design asset preview for storybook",
   "keywords": [
     "addon",
@@ -34,12 +34,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/client-logger": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
-    "@storybook/theming": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/client-logger": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
+    "@storybook/theming": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "Superior documentation for your components",
   "keywords": [
     "addon",
@@ -45,13 +45,13 @@
     "@mdx-js/loader": "^1.5.1",
     "@mdx-js/mdx": "^1.5.1",
     "@mdx-js/react": "^1.5.1",
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
     "@storybook/csf": "0.0.1",
-    "@storybook/postinstall": "5.3.0-beta.31",
-    "@storybook/source-loader": "5.3.0-beta.31",
-    "@storybook/theming": "5.3.0-beta.31",
+    "@storybook/postinstall": "5.3.0-rc.0",
+    "@storybook/source-loader": "5.3.0-rc.0",
+    "@storybook/theming": "5.3.0-rc.0",
     "acorn": "^7.1.0",
     "acorn-jsx": "^5.1.0",
     "acorn-walk": "^7.0.0",

diff --git a/addons/docs/src/blocks/DocsPage.test.ts b/addons/docs/src/blocks/DocsPage.test.ts
@@ -15,4 +15,10 @@ describe('defaultTitleSlot', () => {
     expect(defaultTitleSlot({ selectedKind: 'a|b', parameters })).toBe('b');
     expect(defaultTitleSlot({ selectedKind: 'a/b/c.d', parameters })).toBe('d');
   });
+  it('empty options', () => {
+    const parameters = { options: {} };
+    expect(defaultTitleSlot({ selectedKind: 'a/b/c', parameters })).toBe('c');
+    expect(defaultTitleSlot({ selectedKind: 'a|b', parameters })).toBe('b');
+    expect(defaultTitleSlot({ selectedKind: 'a/b/c.d', parameters })).toBe('d');
+  });
 });
diff --git a/addons/docs/src/blocks/Title.tsx b/addons/docs/src/blocks/Title.tsx
@@ -11,13 +11,9 @@ interface TitleProps {
 export const defaultTitleSlot: StringSlot = ({ selectedKind, parameters }) => {
   const {
     showRoots,
-    hierarchyRootSeparator: rootSeparator,
-    hierarchySeparator: groupSeparator,
-  } = (parameters && parameters.options) || {
-    showRoots: undefined,
-    hierarchyRootSeparator: '|',
-    hierarchySeparator: /\/|\./,
-  };
+    hierarchyRootSeparator: rootSeparator = '|',
+    hierarchySeparator: groupSeparator = /\/|\./,
+  } = (parameters && parameters.options) || {};
 
   let groups;
   if (typeof showRoots !== 'undefined') {

diff --git a/addons/docs/src/preset.ts b/addons/docs/src/preset.ts
@@ -49,7 +49,7 @@ function withFrameworkExtensions(basePreset: Preset, mapper: FrameworkPresetMapp
 
 module.exports = withFrameworkExtensions(commonPreset, framework => {
   try {
-    return require.resolve(`./frameworks/${framework}/preset`);
+    return require.resolve(`./frameworks/${framework}/preset`) as string;
   } catch (err) {
     // there is no custom config for the user's framework, do nothing
     return null;

diff --git a/addons/essentials/package.json b/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "5.3.0-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -27,11 +27,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-backgrounds": "5.3.0-beta.31",
-    "@storybook/addon-viewport": "5.3.0-beta.31",
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/node-logger": "5.3.0-beta.31",
+    "@storybook/addon-backgrounds": "5.3.0-rc.0",
+    "@storybook/addon-viewport": "5.3.0-rc.0",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/node-logger": "5.3.0-rc.0",
     "ts-dedent": "^1.1.0"
   },
   "devDependencies": {

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "5.3.0-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -31,11 +31,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/client-api": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
-    "@storybook/theming": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/client-api": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
+    "@storybook/theming": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "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-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "description": "A Storybook addon to show additional information for your stories.",
   "keywords": [
     "addon",
@@ -28,10 +28,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-beta.31",
-    "@storybook/client-logger": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
-    "@storybook/theming": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/client-logger": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
+    "@storybook/theming": "5.3.0-rc.0",
     "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-beta.31",
+  "version": "5.3.0-rc.0",
   "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-beta.31",
-    "@storybook/api": "5.3.0-beta.31",
-    "@storybook/components": "5.3.0-beta.31",
-    "@storybook/core-events": "5.3.0-beta.31",
-    "@storybook/theming": "5.3.0-beta.31",
+    "@storybook/addons": "5.3.0-rc.0",
+    "@storybook/api": "5.3.0-rc.0",
+    "@storybook/components": "5.3.0-rc.0",
+    "@storybook/core-events": "5.3.0-rc.0",
+    "@storybook/theming": "5.3.0-rc.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",