Merge branch 'next' into core/netlify-again

storybookjs · Jan 21, 2020 · 8a1c563 · 8a1c563 · vercel · Jan 21, 2020
2 parents 2d116d9 + ddadab0
commit 8a1c563
Show file tree

Hide file tree

Showing 96 changed files with 4,064 additions and 3,601 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,6 +14,7 @@ module.exports = {
     'react/jsx-fragments': 'off',
     '@typescript-eslint/ban-ts-ignore': 'off',
     '@typescript-eslint/no-object-literal-type-assertion': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
     'react/sort-comp': [
       'error',
       {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,27 +2,41 @@
 
 ### Features
 
+* API: Add useSharedState, useStoryState ([#9566](https://github.com/storybookjs/storybook/pull/9566))
+* Addon-docs: Named colors with ColorPalette ([#9453](https://github.com/storybookjs/storybook/pull/9453))
+* Core: Add preview layouts ([#9229](https://github.com/storybookjs/storybook/pull/9229))
+* Marionette: Add marionette support ([#7981](https://github.com/storybookjs/storybook/pull/7981))
 * Addon-a11y: Support manual run ([#8883](https://github.com/storybookjs/storybook/pull/8883))
 * Addon-cssresources: Disable SyntaxHighlighter for long code ([#9360](https://github.com/storybookjs/storybook/pull/9360))
 * Core: Improve monorepo support ([#8822](https://github.com/storybookjs/storybook/pull/8822))
 
 ### Bug Fixes
 
+* Addon-docs: Fix TS false default value in prop table ([#9560](https://github.com/storybookjs/storybook/pull/9560))
+* Addon-docs: Remove hard-coded lineHeight in Typeset block ([#9567](https://github.com/storybookjs/storybook/pull/9567))
 * Fixed Angular button example story ([#9540](https://github.com/storybookjs/storybook/pull/9540))
 * Core: Fix generated entry to import at top of file ([#9398](https://github.com/storybookjs/storybook/pull/9398))
 * Preact: Fix story function typescript type ([#9123](https://github.com/storybookjs/storybook/pull/9123))
 * UI: Make canvas link a link ([#9257](https://github.com/storybookjs/storybook/pull/9257))
 
 ### Maintenance
 
+* Build: the build-storybooks script ([#9569](https://github.com/storybookjs/storybook/pull/9569))
+* CLI: Improve Rax template ([#9574](https://github.com/storybookjs/storybook/pull/9574))
+* Typescript: Migrate polymer ([#9565](https://github.com/storybookjs/storybook/pull/9565))
 * Typescript: Migrate ember ([#9020](https://github.com/storybookjs/storybook/pull/9020))
 * Next 6.0.0 ([#9212](https://github.com/storybookjs/storybook/pull/9212))
-* Lock yarn version ([#9138](https://github.com/storybookjs/storybook/pull/9138))
 * REMOVE subscription_store ([#9228](https://github.com/storybookjs/storybook/pull/9228))
 
 ### Dependency Upgrades
 
 * Update husky to v4 ([#9509](https://github.com/storybookjs/storybook/pull/9509))
+* Bumped react-dev-utils dependency to v10. ([#9579](https://github.com/storybookjs/storybook/pull/9579))
+* Bump babel-plugin-macros from 2.7.1 to 2.8.0 ([#9236](https://github.com/storybookjs/storybook/pull/9236))
+* Bump babel-plugin-emotion from 10.0.23 to 10.0.27 ([#9239](https://github.com/storybookjs/storybook/pull/9239))
+* Bump @babel/runtime from 7.7.4 to 7.7.7 ([#9277](https://github.com/storybookjs/storybook/pull/9277))
+* Bump corejs-upgrade-webpack-plugin from 2.2.0 to 3.0.1 ([#9427](https://github.com/storybookjs/storybook/pull/9427))
+* Bump terser-webpack-plugin from 2.2.1 to 2.3.2 ([#9386](https://github.com/storybookjs/storybook/pull/9386))
 
 ## 5.3.7 (January 20, 2020)
 

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "5.3.7",
+  "version": "6.0.0-alpha.0",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,12 +33,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/client-logger": "5.3.7",
-    "@storybook/components": "5.3.7",
-    "@storybook/core-events": "5.3.7",
-    "@storybook/theming": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/client-logger": "6.0.0-alpha.0",
+    "@storybook/components": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.0",
+    "@storybook/theming": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.0",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/client-api": "5.3.7",
-    "@storybook/components": "5.3.7",
-    "@storybook/core-events": "5.3.7",
-    "@storybook/theming": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/client-api": "6.0.0-alpha.0",
+    "@storybook/components": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.0",
+    "@storybook/theming": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.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.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/client-logger": "5.3.7",
-    "@storybook/components": "5.3.7",
-    "@storybook/core-events": "5.3.7",
-    "@storybook/theming": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/client-logger": "6.0.0-alpha.0",
+    "@storybook/components": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.0",
+    "@storybook/theming": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.0",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",
@@ -29,7 +29,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.0",
   "description": "Storybook Addon Contexts",
   "keywords": [
     "preact",
@@ -27,10 +27,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/components": "5.3.7",
-    "@storybook/core-events": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/components": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.0",
   "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": "5.3.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/components": "5.3.7",
-    "@storybook/core-events": "5.3.7",
-    "@storybook/theming": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/components": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.0",
+    "@storybook/theming": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.0",
   "description": "Design asset preview for storybook",
   "keywords": [
     "addon",
@@ -34,12 +34,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/client-logger": "5.3.7",
-    "@storybook/components": "5.3.7",
-    "@storybook/core-events": "5.3.7",
-    "@storybook/theming": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/client-logger": "6.0.0-alpha.0",
+    "@storybook/components": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.0",
+    "@storybook/theming": "6.0.0-alpha.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",

diff --git a/addons/docs/docs/recipes.md b/addons/docs/docs/recipes.md
@@ -76,9 +76,7 @@ And I can also embed arbitrary markdown & JSX in this file.
 What's happening here:
 
 - Your stories are defined in CSF, but because of `includeStories: []`, they are not actually added to Storybook.
-- The MDX file is adding the stories to Storybook, and using the story function defined in CSF.
-- The MDX loader is using story metadata from CSF, such as name, decorators, parameters, but will give giving preference to anything defined in the MDX file.
-- The MDX file is using the Meta `default` defined in the CSF.
+- The MDX file is simply importing stories as functions in the MDX, and other aspects of the CSF file, such as decorators, parameters, and any other metadata should be applied as needed in the MDX from the import.
 
 ## CSF Stories with arbitrary MDX
 

diff --git a/addons/docs/package.json b/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "5.3.7",
+  "version": "6.0.0-alpha.0",
   "description": "Superior documentation for your components",
   "keywords": [
     "addon",
@@ -46,14 +46,14 @@
     "@mdx-js/loader": "^1.5.1",
     "@mdx-js/mdx": "^1.5.1",
     "@mdx-js/react": "^1.5.1",
-    "@storybook/addons": "5.3.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/components": "5.3.7",
-    "@storybook/core-events": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/components": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.0",
     "@storybook/csf": "0.0.1",
-    "@storybook/postinstall": "5.3.7",
-    "@storybook/source-loader": "5.3.7",
-    "@storybook/theming": "5.3.7",
+    "@storybook/postinstall": "6.0.0-alpha.0",
+    "@storybook/source-loader": "6.0.0-alpha.0",
+    "@storybook/theming": "6.0.0-alpha.0",
     "acorn": "^7.1.0",
     "acorn-jsx": "^5.1.0",
     "acorn-walk": "^7.0.0",

diff --git a/addons/essentials/package.json b/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "5.3.7",
+  "version": "6.0.0-alpha.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.7",
-    "@storybook/addon-viewport": "5.3.7",
-    "@storybook/addons": "5.3.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/node-logger": "5.3.7",
+    "@storybook/addon-backgrounds": "6.0.0-alpha.0",
+    "@storybook/addon-viewport": "6.0.0-alpha.0",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/node-logger": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.0",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -31,11 +31,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.7",
-    "@storybook/api": "5.3.7",
-    "@storybook/client-api": "5.3.7",
-    "@storybook/core-events": "5.3.7",
-    "@storybook/theming": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.0",
+    "@storybook/client-api": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.0",
+    "@storybook/theming": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.0",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.7",
-    "@storybook/core-events": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/core-events": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.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.7",
-    "@storybook/api": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/api": "6.0.0-alpha.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.7",
+  "version": "6.0.0-alpha.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.7",
-    "@storybook/client-logger": "5.3.7",
-    "@storybook/components": "5.3.7",
-    "@storybook/theming": "5.3.7",
+    "@storybook/addons": "6.0.0-alpha.0",
+    "@storybook/client-logger": "6.0.0-alpha.0",
+    "@storybook/components": "6.0.0-alpha.0",
+    "@storybook/theming": "6.0.0-alpha.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "marksy": "^8.0.0",