Merge branch 'next' into move-react-docgen-dependency-to-docs-preset

storybookjs · Jan 21, 2020 · 8e7e05d · 8e7e05d
2 parents 4c0eb99 + 1deaeff
commit 8e7e05d
Show file tree

Hide file tree

Showing 246 changed files with 3,337 additions and 3,115 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -48,13 +48,6 @@ module.exports = {
         test: withTests,
       },
     },
-    {
-      test: './examples/rax-kitchen-sink',
-      presets: [
-        ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
-        ['babel-preset-rax', { development: process.env.BABEL_ENV === 'development' }],
-      ],
-    },
     {
       test: './lib',
       presets: [

diff --git a/.eslintignore b/.eslintignore
@@ -18,7 +18,8 @@ examples/cra-ts-kitchen-sink/*.json
 examples/cra-ts-kitchen-sink/public/*
 examples/cra-ts-essentials/*.json
 examples/cra-ts-essentials/public/*
-
+examples/rax-kitchen-sink/src/document/*
+.yarn
 !.remarkrc.js
 !.babelrc.js
 !.eslintrc.js

diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+.yarn/releases/yarn-*.js linguist-generated=true
diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml
@@ -15,6 +15,7 @@
 'app: angular': ["app/angular/**"]
 'app: polymer ': ["app/polymer/**"]
 'app: preact': ["app/preact/**"]
+'app: rax': ["app/rax/**"]
 'app: react-native': ["app/react-native/**"]
 'app: react': ["app/react/**"]
 'app: vue': ["app/vue/**"]

diff --git a/.github/automention.yml b/.github/automention.yml
@@ -4,6 +4,7 @@
 'app: marko': ['nm123github']
 'app: polymer': ['stijnkoopal', 'ndelangen']
 'app: preact': ['BartWaardenburg']
+'app: rax': ['SoloJiang']
 'app: react-native': ['benoitdion', 'gongreg']
 'app: react-native-server': ['benoitdion', 'gongreg']
 'app: svelte': ['rixo', 'cam-stitt', 'plumpNation']

diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+.yarn
diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md
@@ -1,25 +1,25 @@
 ## Addon / Framework Support Table
 
-| | [React](app/react)|[React Native](app/react-native)|[Vue](app/vue)|[Angular](app/angular)| [Polymer](app/polymer)| [Mithril](app/mithril)| [HTML](app/html)| [Marko](app/marko)| [Svelte](app/svelte)| [Riot](app/riot)| [Ember](app/ember)| [Preact](app/preact)|
+| | [React](app/react)|[React Native](app/react-native)|[Vue](app/vue)|[Angular](app/angular)| [Polymer](app/polymer)| [Mithril](app/mithril)| [HTML](app/html)| [Marko](app/marko)| [Svelte](app/svelte)| [Riot](app/riot)| [Ember](app/ember)| [Preact](app/preact)| [Rax](app/rax) |
 | ----------- |:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|
-|[a11y](addons/a11y)                         |+| |+|+|+|+|+|+|+|+|+|+|
-|[actions](addons/actions)                   |+|+*|+|+|+|+|+|+|+|+|+|+|
-|[backgrounds](addons/backgrounds)           |+|*|+|+|+|+|+|+|+|+|+|+|
-|[centered](addons/centered)                 |+| |+|+| |+|+| |+| |+|+|
-|[contexts](addons/contexts)                 |+| |+| | | | | | | | |+|
-|[events](addons/events)                     |+| |+|+|+|+|+|+| | |+|+|
-|[design assets](addons/design-assets)       |+| |+|+|+|+|+|+|+|+|+|+|
-|[graphql](addons/graphql)                   |+| | | | | | | | | | | |
-|[google-analytics](addons/google-analytics) |+|+|+|+|+|+|+|+|+|+|+|+|
-|[info](addons/info)                         |+| | | | | | | | | | | |
-|[jest](addons/jest)                         |+|+|+|+|+|+|+|+|+|+|+|+|
-|[knobs](addons/knobs)                       |+|+*|+|+|+|+|+|+|+|+|+|+|
-|[links](addons/links)                       |+|+|+|+|+|+|+| |+|+|+|+|
-|[notes](addons/notes)                       |+|+*|+|+|+|+|+| |+|+|+|+|
-|[options](addons/options)                   |+|+|+|+|+|+|+| |+|+|+|+|
-|[cssresources](addons/cssresources)         |+| |+|+|+|+|+|+|+|+|+|+|
-|[storyshots](addons/storyshots)             |+|+|+|+| | |+| |+|+| |+|
-|[storysource](addons/storysource)           |+| |+|+|+|+|+|+|+|+|+|+|
-|[viewport](addons/viewport)                 |+| |+|+|+|+|+|+|+|+|+|+|
+|[a11y](addons/a11y)                         |+| |+|+|+|+|+|+|+|+|+|+|+|
+|[actions](addons/actions)                   |+|+*|+|+|+|+|+|+|+|+|+|+|+|
+|[backgrounds](addons/backgrounds)           |+|*|+|+|+|+|+|+|+|+|+|+|+|
+|[centered](addons/centered)                 |+| |+|+| |+|+| |+| |+|+|+|
+|[contexts](addons/contexts)                 |+| |+| | | | | | | | |+|+|
+|[events](addons/events)                     |+| |+|+|+|+|+|+| | |+|+|+|
+|[design assets](addons/design-assets)       |+| |+|+|+|+|+|+|+|+|+|+|+|
+|[graphql](addons/graphql)                   |+| | | | | | | | | | | ||
+|[google-analytics](addons/google-analytics) |+|+|+|+|+|+|+|+|+|+|+|+|+|
+|[info](addons/info)                         |+| | | | | | | | | | | | |
+|[jest](addons/jest)                         |+|+|+|+|+|+|+|+|+|+|+|+|+|
+|[knobs](addons/knobs)                       |+|+*|+|+|+|+|+|+|+|+|+|+|+|
+|[links](addons/links)                       |+|+|+|+|+|+|+| |+|+|+|+|+|
+|[notes](addons/notes)                       |+|+*|+|+|+|+|+| |+|+|+|+|+|
+|[options](addons/options)                   |+|+|+|+|+|+|+| |+|+|+|+|+|
+|[cssresources](addons/cssresources)         |+| |+|+|+|+|+|+|+|+|+|+|+|
+|[storyshots](addons/storyshots)             |+|+|+|+| | |+| |+|+| |+|+|
+|[storysource](addons/storysource)           |+| |+|+|+|+|+|+|+|+|+|+|+|
+|[viewport](addons/viewport)                 |+| |+|+|+|+|+|+|+|+|+|+|+|
 
 `*` - React Native on device addon (addons/onDevice-\<name>) 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,45 @@
+## 6.0.0-alpha.0 (January 21, 2020)
+
+### Features
+
+* 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
+
+* 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
+
+* 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))
+
+## 5.3.7 (January 20, 2020)
+
+### Bug Fixes
+
+* Node-logger: Move `@types/npmlog` to dependencies  ([#9538](https://github.com/storybookjs/storybook/pull/9538))
+* Core: Fix legacy story URLs ([#9545](https://github.com/storybookjs/storybook/pull/9545))
+* Addon-docs: Convert default prop value to string ([#9525](https://github.com/storybookjs/storybook/pull/9525))
+* Addon-docs: Preserve Source indentation by default ([#9513](https://github.com/storybookjs/storybook/pull/9513))
+
+## 5.3.6 (January 17, 2020)
+
+### Bug Fixes
+
+* Source-loader: Bypass if file has no exports ([#9505](https://github.com/storybookjs/storybook/pull/9505))
+* Core: Fix default sorting of docs-only stories ([#9504](https://github.com/storybookjs/storybook/pull/9504))
+
 ## 5.3.5 (January 17, 2020)
 
 ### Bug Fixes

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Thanks for your interest in improving Storybook! We are a community-driven proje
 
 Please review this document to help to streamline the process and save everyone's precious time.
 
-This repo uses yarn workspaces, so you should install `yarn@1.3.2` or higher as a package manager. See [installation guide](https://yarnpkg.com/en/docs/install).
+This repo uses yarn workspaces, so you should install `yarn` as the package manager. See [installation guide](https://yarnpkg.com/en/docs/install).
 
 ## Issues
 
@@ -283,9 +283,10 @@ Within the `examples` folder of the Storybook repo, you will find kitchen sink e
 Not only do these show many of the options and add-ons available, they are also automatically linked to all the development packages. We highly encourage you to use these to develop/test contributions on.
 
 #### React and Vue
+
 1. `cd examples/official-storybook`
-2.  `yarn storybook`
-3.  Verify that your local version works
+2. `yarn storybook`
+3. Verify that your local version works
 
 ### Working with your own app
 

diff --git a/README.md b/README.md
@@ -116,13 +116,15 @@ For additional help, join us [in our Discord](https://discord.gg/sMFvFsG) or [Sl
 | [Vue](app/vue)                   | [v5.1.0](https://storybooks-vue.netlify.com/)     | [![Vue](https://img.shields.io/npm/dm/@storybook/vue.svg)](app/vue)                            |
 | [Angular](app/angular)           | [v5.1.0](https://storybooks-angular.netlify.com/) | [![Angular](https://img.shields.io/npm/dm/@storybook/angular.svg)](app/angular)                |
 | [Polymer](app/polymer)           | [v5.1.0](https://storybooks-polymer.netlify.com/) | [![Polymer](https://img.shields.io/npm/dm/@storybook/polymer.svg)](app/polymer)                |
+| [Marionette.js](app/marionette)  | -                                                 | [![Marionette.js](https://img.shields.io/npm/dm/@storybook/marionette.svg)](app/marionette)                |
 | [Mithril](app/mithril)           | [v5.1.0](https://storybooks-mithril.netlify.com/) | [![Mithril](https://img.shields.io/npm/dm/@storybook/mithril.svg)](app/mithril)                |
 | [Marko](app/marko)               | [v5.1.0](https://storybooks-marko.netlify.com/)   | [![Marko](https://img.shields.io/npm/dm/@storybook/marko.svg)](app/marko)                      |
 | [HTML](app/html)                 | [v5.1.0](https://storybooks-html.netlify.com/)    | [![HTML](https://img.shields.io/npm/dm/@storybook/html.svg)](app/html)                         |
 | [Svelte](app/svelte)             | [v5.1.0](https://storybooks-svelte.netlify.com/)  | [![Svelte](https://img.shields.io/npm/dm/@storybook/svelte.svg)](app/svelte)                   |
 | [Riot](app/riot)                 | [v5.1.0](https://storybooks-riot.netlify.com/)    | [![Riot](https://img.shields.io/npm/dm/@storybook/riot.svg)](app/riot)                         |
 | [Ember](app/ember)               | [v5.1.0](https://storybooks-ember.netlify.com/)   | [![Ember](https://img.shields.io/npm/dm/@storybook/ember.svg)](app/ember)                      |
 | [Preact](app/preact)             | [v5.1.0](https://storybooks-preact.netlify.com/)  | [![Preact](https://img.shields.io/npm/dm/@storybook/preact.svg)](app/preact)                   |
+| [Rax](app/rax)             | [v5.1.0](https://storybooks-rax.netlify.com/)  | [![Rax](https://img.shields.io/npm/dm/@storybook/rax.svg)](app/rax)                   |
 
 ### Sub Projects
 

diff --git a/addons/a11y/README.md b/addons/a11y/README.md
@@ -69,6 +69,8 @@ export default {
       config: {},
       // axe-core optionsParameter (https://github.com/dequelabs/axe-core/blob/develop/doc/API.md#options-parameter)
       options: {},
+       // optional flag to prevent the automatic check
+      manual: true,
     },
   },
 };

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "5.3.5",
+  "version": "5.3.7",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,12 +33,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.5",
-    "@storybook/api": "5.3.5",
-    "@storybook/client-logger": "5.3.5",
-    "@storybook/components": "5.3.5",
-    "@storybook/core-events": "5.3.5",
-    "@storybook/theming": "5.3.5",
+    "@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",
     "axe-core": "^3.3.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
@@ -51,7 +51,8 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@types/react-redux": "^7.0.6"
+    "@types/react-redux": "^7.0.6",
+    "@types/webpack-env": "^1.15.0"
   },
   "publishConfig": {
     "access": "public"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		.yarn/releases/yarn-*.js linguist-generated=true