Merge branch 'storybookjs:next' into my-first-storybook-contribution

.github/workflows/tests-unit.yml

@@ -7,19 +7,15 @@ jobs:
     name: Core Unit Tests
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '12.x'
-    - uses: actions/checkout@v2
-    - name: Cache node modules
-      uses: actions/cache@v2
-      with:
-        path: node_modules
-        key: yarn-2-cache-v1-${{ hashFiles('**/yarn.lock') }}
-    - name: install, bootstrap
-      run: |
-        yarn install --immutable
-        yarn bootstrap --core
-    - name: test
-      run: |
-        yarn test --runInBand --ci
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "12.x"
+          cache: yarn
+      - name: install, bootstrap
+        run: |
+          yarn install --immutable
+          yarn bootstrap --core
+      - name: test
+        run: |
+          yarn test --runInBand --ci

CHANGELOG.md

@@ -1,3 +1,71 @@
+## 6.4.0-alpha.13 (July 9, 2021)
+
+### Bug Fixes
+
+- Addon-docs/Angular: Add unique id to Angular stories ([#15501](https://github.com/storybookjs/storybook/pull/15501))
+- Composition: Fix refs ordering ([#15527](https://github.com/storybookjs/storybook/pull/15527))
+
+### Maintenance
+
+- Essentials: Add outline addon to monorepo ([#15526](https://github.com/storybookjs/storybook/pull/15526))
+- Build: Fix cache setup in GitHub Actions workflow ([#15523](https://github.com/storybookjs/storybook/pull/15523))
+
+## 6.3.4 (July 8, 2021)
+
+### Maintenance
+
+- Addon-docs: Cache DocsContext on window to prevent duplication ([#15428](https://github.com/storybookjs/storybook/pull/15428))
+
+## 6.3.3 (July 7, 2021)
+
+### Bug Fixes
+
+- Webpack5: Quit process after finishing a static build ([#15483](https://github.com/storybookjs/storybook/pull/15483))
+- Addon-docs/Angular: Fix numeric args default value handling ([#15491](https://github.com/storybookjs/storybook/pull/15491))
+- Angular: Fix circular reference not being handled in moduleMetadata ([#15410](https://github.com/storybookjs/storybook/pull/15410))
+- Core: Fix double rebuilds by removing aggregateTimeout ([#15372](https://github.com/storybookjs/storybook/pull/15372))
+- CLI: Fix NPM typo ([#15461](https://github.com/storybookjs/storybook/pull/15461))
+
+## 6.4.0-alpha.12 (July 7, 2021)
+
+### Bug Fixes
+
+- Webpack5: Quit process after finishing a static build ([#15483](https://github.com/storybookjs/storybook/pull/15483))
+- Addon-docs/Angular: Fix numeric args default value handling ([#15491](https://github.com/storybookjs/storybook/pull/15491))
+
+### Maintenance
+
+- Angular: Make Ivy work by default in the angular-cli example ([#15280](https://github.com/storybookjs/storybook/pull/15280))
+- Official-storybook: Fix shortcut for navigating to previous language ([#15489](https://github.com/storybookjs/storybook/pull/15489))
+- Addon-docs: Add docs to standalone example ([#7848](https://github.com/storybookjs/storybook/pull/7848))
+- Build: Update Yarn cache setup in GitHub Actions workflow ([#15480](https://github.com/storybookjs/storybook/pull/15480))
+
+## 6.4.0-alpha.11 (July 3, 2021)
+
+### Bug Fixes
+
+- UI: Fix sidebar toggle in fullscreen mode ([#15459](https://github.com/storybookjs/storybook/pull/15459))
+- Angular: Fix circular reference not being handled in moduleMetadata ([#15410](https://github.com/storybookjs/storybook/pull/15410))
+
+### Maintenance
+
+- Addon-a11y: Reverse help and description labels in accordion ([#15466](https://github.com/storybookjs/storybook/pull/15466))
+
+## 6.4.0-alpha.10 (July 2, 2021)
+
+### Features
+
+- UI: Display menu icon on the toolbar when the sidebar is collapsed ([#15369](https://github.com/storybookjs/storybook/pull/15369))
+
+### Bug Fixes
+
+- Core: Fix double rebuilds by removing aggregateTimeout ([#15372](https://github.com/storybookjs/storybook/pull/15372))
+- CLI: Fix NPM typo ([#15461](https://github.com/storybookjs/storybook/pull/15461))
+
+### Maintenance
+
+- Addon-docs: Cache DocsContext on window to prevent duplication ([#15428](https://github.com/storybookjs/storybook/pull/15428))
+
 ## 6.3.2 (June 30, 2021)
 
 ### Bug Fixes

MIGRATION.md

@@ -176,6 +176,14 @@ yarn add @storybook/manager-webpack5 --dev
 npm install @storybook/manager-webpack5 --save-dev
 ```
 
+Because Storybook uses `webpack@4` as the default, it's possible for the wrong version of webpack to get hoisted by your package manager. If you receive an error that looks like you might be using the wrong version of webpack, install `webpack@5` explicitly as a dev dependency to force it to be hoisted:
+
+```shell
+yarn add webpack@5 --dev
+# Or
+npm install webpack@5 --save-dev
+```
+
 ### Angular 12 upgrade
 
 Storybook 6.3 supports Angular 12 out of the box when you install it fresh. However, if you're upgrading your project from a previous version, you'll need to do the following steps to force Storybook to use webpack 5 for building your project:

addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "6.4.0-alpha.9",
+  "version": "6.4.0-alpha.13",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
@@ -11,13 +11,13 @@
     "verify",
     "test"
   ],
-  "homepage": "https://github.com/storybookjs/storybook#readme",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/a11y",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/storybookjs/storybook.git",
+    "url": "https://github.com/storybookjs/storybook.git",
     "directory": "addons/a11y"
   },
   "funding": {
@@ -45,14 +45,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-alpha.9",
-    "@storybook/api": "6.4.0-alpha.9",
-    "@storybook/channels": "6.4.0-alpha.9",
-    "@storybook/client-api": "6.4.0-alpha.9",
-    "@storybook/client-logger": "6.4.0-alpha.9",
-    "@storybook/components": "6.4.0-alpha.9",
-    "@storybook/core-events": "6.4.0-alpha.9",
-    "@storybook/theming": "6.4.0-alpha.9",
+    "@storybook/addons": "6.4.0-alpha.13",
+    "@storybook/api": "6.4.0-alpha.13",
+    "@storybook/channels": "6.4.0-alpha.13",
+    "@storybook/client-api": "6.4.0-alpha.13",
+    "@storybook/client-logger": "6.4.0-alpha.13",
+    "@storybook/components": "6.4.0-alpha.13",
+    "@storybook/core-events": "6.4.0-alpha.13",
+    "@storybook/theming": "6.4.0-alpha.13",
     "axe-core": "^4.2.0",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
@@ -81,7 +81,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b9b9f9484bfe3cb9f259c26bc71e7635362addde",
+  "gitHead": "417958f6d40b4ac7d361c706d9b96dd4123231cd",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Accessibility",

addons/a11y/src/components/Report/Info.tsx

@@ -7,7 +7,7 @@ const Wrapper = styled.div({
   padding: 12,
   marginBottom: 10,
 });
-const Help = styled.p({
+const Description = styled.p({
   margin: '0 0 12px',
 });
 const Link = styled.a({
@@ -24,7 +24,7 @@ interface InfoProps {
 export const Info: FunctionComponent<InfoProps> = ({ item }) => {
   return (
     <Wrapper>
-      <Help>{item.help}</Help>
+      <Description>{item.description}</Description>
       <Link href={item.helpUrl} target="_blank">
         More info...
       </Link>

addons/a11y/src/components/Report/Item.tsx

@@ -82,7 +82,7 @@ export const Item = (props: ItemProps) => {
               transform: `rotate(${open ? 0 : -90}deg)`,
             }}
           />
-          {item.description}
+          {item.help}
         </HeaderBar>
         <HighlightToggleElement>
           <HighlightToggle toggleId={highlightToggleId} elementsToHighlight={item.nodes} />

addons/actions/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "6.4.0-alpha.9",
+  "version": "6.4.0-alpha.13",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",
     "essentials",
     "data-state"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/master/addons/actions",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/actions",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
@@ -41,12 +41,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-alpha.9",
-    "@storybook/api": "6.4.0-alpha.9",
-    "@storybook/client-api": "6.4.0-alpha.9",
-    "@storybook/components": "6.4.0-alpha.9",
-    "@storybook/core-events": "6.4.0-alpha.9",
-    "@storybook/theming": "6.4.0-alpha.9",
+    "@storybook/addons": "6.4.0-alpha.13",
+    "@storybook/api": "6.4.0-alpha.13",
+    "@storybook/client-api": "6.4.0-alpha.13",
+    "@storybook/components": "6.4.0-alpha.13",
+    "@storybook/core-events": "6.4.0-alpha.13",
+    "@storybook/theming": "6.4.0-alpha.13",
     "core-js": "^3.8.2",
     "fast-deep-equal": "^3.1.3",
     "global": "^4.4.0",
@@ -78,7 +78,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b9b9f9484bfe3cb9f259c26bc71e7635362addde",
+  "gitHead": "417958f6d40b4ac7d361c706d9b96dd4123231cd",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Actions",

addons/backgrounds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "6.4.0-alpha.9",
+  "version": "6.4.0-alpha.13",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",
@@ -10,7 +10,7 @@
     "essentials",
     "design"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/master/addons/backgrounds",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/backgrounds",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
@@ -45,12 +45,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-alpha.9",
-    "@storybook/api": "6.4.0-alpha.9",
-    "@storybook/client-logger": "6.4.0-alpha.9",
-    "@storybook/components": "6.4.0-alpha.9",
-    "@storybook/core-events": "6.4.0-alpha.9",
-    "@storybook/theming": "6.4.0-alpha.9",
+    "@storybook/addons": "6.4.0-alpha.13",
+    "@storybook/api": "6.4.0-alpha.13",
+    "@storybook/client-logger": "6.4.0-alpha.13",
+    "@storybook/components": "6.4.0-alpha.13",
+    "@storybook/core-events": "6.4.0-alpha.13",
+    "@storybook/theming": "6.4.0-alpha.13",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
     "memoizerific": "^1.11.3",
@@ -76,7 +76,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b9b9f9484bfe3cb9f259c26bc71e7635362addde",
+  "gitHead": "417958f6d40b4ac7d361c706d9b96dd4123231cd",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Backgrounds",

addons/controls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "6.4.0-alpha.9",
+  "version": "6.4.0-alpha.13",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
@@ -45,12 +45,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-alpha.9",
-    "@storybook/api": "6.4.0-alpha.9",
-    "@storybook/client-api": "6.4.0-alpha.9",
-    "@storybook/components": "6.4.0-alpha.9",
-    "@storybook/node-logger": "6.4.0-alpha.9",
-    "@storybook/theming": "6.4.0-alpha.9",
+    "@storybook/addons": "6.4.0-alpha.13",
+    "@storybook/api": "6.4.0-alpha.13",
+    "@storybook/client-api": "6.4.0-alpha.13",
+    "@storybook/components": "6.4.0-alpha.13",
+    "@storybook/node-logger": "6.4.0-alpha.13",
+    "@storybook/theming": "6.4.0-alpha.13",
     "core-js": "^3.8.2",
     "ts-dedent": "^2.0.0"
   },
@@ -69,7 +69,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b9b9f9484bfe3cb9f259c26bc71e7635362addde",
+  "gitHead": "417958f6d40b4ac7d361c706d9b96dd4123231cd",
   "sbmodern": "dist/modern/register.js",
   "storybook": {
     "displayName": "Controls",