Merge branch 'next-6.0.0' into chore-supplement-rax

.eslintignore

@@ -19,7 +19,7 @@ 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

.gitattributes

@@ -0,0 +1 @@
+.yarn/releases/yarn-*.js linguist-generated=true

.prettierignore

@@ -0,0 +1 @@
+.yarn

.yarnrc

@@ -0,0 +1,7 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+frozen-lockfile true
+lastUpdateCheck 1576044003885
+yarn-path ".yarn/releases/yarn-1.21.1.js"

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