Merge branch 'next' into angular/add-builder-styles

.github/workflows/linear-export.yml

@@ -12,12 +12,16 @@ jobs:
     name: Export to linear
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: yarn install
-      - name: Export to linear
-        run: >
-          yarn linear-export ${{ github.event.issue.number }}
-        env:
-          GH_TOKEN: ${{ secrets.LINEAR_GH_TOKEN }}
-          LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
+      # - uses: hmarr/debug-action@v2
+      - name: Linear action
+        uses: shilman/linear-action@v1
+        with:
+          ghIssueNumber: ${{ github.event.number || github.event.issue.number }}
+          ghRepoOwner: ${{ github.event.repository.owner.login }}
+          ghRepoName: ${{ github.event.repository.name }}
+          ghToken: ${{ secrets.LINEAR_GH_TOKEN }}
+          linearIssuePrefix: SB
+          linearLabel: Storybook
+          linearPRLabel: PR
+          linearTeam: CH
+          linearApiKey: ${{ secrets.LINEAR_API_KEY }}

CHANGELOG.md

@@ -1,3 +1,56 @@
+## 6.4.0-rc.7 (November 24, 2021)
+
+### Bug Fixes
+
+- Core: Add `./` to start of hidden file & folder paths ([#16723](https://github.com/storybookjs/storybook/pull/16723))
+
+### Dependency Upgrades
+
+- Update peer dependencies for angular 13 support ([#16758](https://github.com/storybookjs/storybook/pull/16758))
+
+## 6.4.0-rc.6 (November 22, 2021)
+
+### Bug Fixes
+
+- CSF: Fix component id handling ([#16746](https://github.com/storybookjs/storybook/pull/16746))
+- Addon-docs: Improved loading state ([#16709](https://github.com/storybookjs/storybook/pull/16709))
+
+### Maintenance
+
+- WebComponents: Update Lit peerDep to use Lit 2 stable version ([#16670](https://github.com/storybookjs/storybook/pull/16670))
+
+### Dependency Upgrades
+
+- Upgrade react-router to 6.0.0 ([#16742](https://github.com/storybookjs/storybook/pull/16742))
+
+## 6.4.0-rc.5 (November 19, 2021)
+
+### Bug Fixes
+
+- Core: Restore `stringifyEnvs` utility used by Vite builder ([#16731](https://github.com/storybookjs/storybook/pull/16731))
+
+## 6.4.0-rc.4 (November 19, 2021)
+
+### Bug Fixes
+
+- Core: Fix `process.env` stringification ([#16725](https://github.com/storybookjs/storybook/pull/16725))
+- Core: Fix build-storybook sort bug in v6-mode ([#16724](https://github.com/storybookjs/storybook/pull/16724))
+- Addon-docs/Angular: fix extractEnumValues undefined error ([#16524](https://github.com/storybookjs/storybook/pull/16524))
+
+### Maintenance
+
+- Angular: update addon interactions example ([#16698](https://github.com/storybookjs/storybook/pull/16698))
+
+### Dependency Upgrades
+
+- Upgrade from node-sass to sass in examples/angular-cli ([#16663](https://github.com/storybookjs/storybook/pull/16663))
+
+## 6.4.0-rc.3 (November 16, 2021)
+
+### Bug Fixes
+
+- Angular: Fix detection of @angular/cli package version ([#16696](https://github.com/storybookjs/storybook/pull/16696))
+
 ## 6.4.0-rc.2 (November 16, 2021)
 
 ### Features

MIGRATION.md

@@ -1,6 +1,7 @@
 <h1>Migration</h1>
 
 - [From version 6.3.x to 6.4.0](#from-version-63x-to-640)
+  - [Automigrate](#automigrate)
   - [CRA5 upgrade](#cra5-upgrade)
   - [CSF3 enabled](#csf3-enabled)
     - [Optional titles](#optional-titles)
@@ -10,8 +11,8 @@
     - [Behavioral differences](#behavioral-differences)
     - [Main.js framework field](#mainjs-framework-field)
     - [Using the v7 store](#using-the-v7-store)
-    - [V7-style story sort](#v7-style-story-sort)
-    - [V7 Store API changes for addon authors](#v7-store-api-changes-for-addon-authors)
+    - [v7-style story sort](#v7-style-story-sort)
+    - [v7 Store API changes for addon authors](#v7-store-api-changes-for-addon-authors)
     - [Storyshots compatibility in the v7 store](#storyshots-compatibility-in-the-v7-store)
   - [Emotion11 quasi-compatibility](#emotion11-quasi-compatibility)
   - [Babel mode v7](#babel-mode-v7)
@@ -186,10 +187,25 @@
 
 ## From version 6.3.x to 6.4.0
 
+### Automigrate
+
+Automigrate is a new 6.4 feature that provides zero-config upgrades to your dependencies, configurations, and story files.
+
+Each automigration analyzes your project, and if it's is applicable, propose a change alongside relevant documentation. If you accept the changes, the automigration will update your files accordingly.
+
+For example, if you're in a webpack5 project but still use Storybook's default webpack4 builder, the automigration can detect this and propose an upgrade. If you opt-in, it will install the webpack5 builder and update your `main.js` configuration automatically.
+
+You can run the existing suite of automigrations to see which ones apply to your project. This won't update any files unless you accept the changes:
+
+```
+npx sb@next automigrate
+```
+
+The automigration suite also runs when you create a new project (`sb init`) or when you update storybook (`sb upgrade`).
+
 ### CRA5 upgrade
 
-Storybook 6.3 supports CRA5 out of the box when you install it fresh. However, if you're upgrading your project from a previous version, you'll need to
-upgrade the configuration. You can do this automatically by running:
+Storybook 6.3 supports CRA5 out of the box when you install it fresh. However, if you're upgrading your project from a previous version, you'll need to upgrade the configuration. You can do this automatically by running:
 
 ```
 npx sb@next automigrate

addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "6.4.0-rc.2",
+  "version": "6.4.0-rc.7",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
@@ -45,14 +45,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-rc.2",
-    "@storybook/api": "6.4.0-rc.2",
-    "@storybook/channels": "6.4.0-rc.2",
-    "@storybook/client-logger": "6.4.0-rc.2",
-    "@storybook/components": "6.4.0-rc.2",
-    "@storybook/core-events": "6.4.0-rc.2",
+    "@storybook/addons": "6.4.0-rc.7",
+    "@storybook/api": "6.4.0-rc.7",
+    "@storybook/channels": "6.4.0-rc.7",
+    "@storybook/client-logger": "6.4.0-rc.7",
+    "@storybook/components": "6.4.0-rc.7",
+    "@storybook/core-events": "6.4.0-rc.7",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/theming": "6.4.0-rc.2",
+    "@storybook/theming": "6.4.0-rc.7",
     "axe-core": "^4.2.0",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
@@ -81,7 +81,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16be10b522569b4b55c684e1556b91b300009bf4",
+  "gitHead": "7162286c0d8d122c7206265fab41c4c191c86d40",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Accessibility",

addons/actions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "6.4.0-rc.2",
+  "version": "6.4.0-rc.7",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",
@@ -41,12 +41,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-rc.2",
-    "@storybook/api": "6.4.0-rc.2",
-    "@storybook/components": "6.4.0-rc.2",
-    "@storybook/core-events": "6.4.0-rc.2",
+    "@storybook/addons": "6.4.0-rc.7",
+    "@storybook/api": "6.4.0-rc.7",
+    "@storybook/components": "6.4.0-rc.7",
+    "@storybook/core-events": "6.4.0-rc.7",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/theming": "6.4.0-rc.2",
+    "@storybook/theming": "6.4.0-rc.7",
     "core-js": "^3.8.2",
     "fast-deep-equal": "^3.1.3",
     "global": "^4.4.0",
@@ -79,7 +79,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16be10b522569b4b55c684e1556b91b300009bf4",
+  "gitHead": "7162286c0d8d122c7206265fab41c4c191c86d40",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Actions",

addons/backgrounds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "6.4.0-rc.2",
+  "version": "6.4.0-rc.7",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",
@@ -45,13 +45,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-rc.2",
-    "@storybook/api": "6.4.0-rc.2",
-    "@storybook/client-logger": "6.4.0-rc.2",
-    "@storybook/components": "6.4.0-rc.2",
-    "@storybook/core-events": "6.4.0-rc.2",
+    "@storybook/addons": "6.4.0-rc.7",
+    "@storybook/api": "6.4.0-rc.7",
+    "@storybook/client-logger": "6.4.0-rc.7",
+    "@storybook/components": "6.4.0-rc.7",
+    "@storybook/core-events": "6.4.0-rc.7",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/theming": "6.4.0-rc.2",
+    "@storybook/theming": "6.4.0-rc.7",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
     "memoizerific": "^1.11.3",
@@ -77,7 +77,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16be10b522569b4b55c684e1556b91b300009bf4",
+  "gitHead": "7162286c0d8d122c7206265fab41c4c191c86d40",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Backgrounds",

addons/controls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "6.4.0-rc.2",
+  "version": "6.4.0-rc.7",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
@@ -45,15 +45,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-rc.2",
-    "@storybook/api": "6.4.0-rc.2",
-    "@storybook/client-logger": "6.4.0-rc.2",
-    "@storybook/components": "6.4.0-rc.2",
-    "@storybook/core-common": "6.4.0-rc.2",
+    "@storybook/addons": "6.4.0-rc.7",
+    "@storybook/api": "6.4.0-rc.7",
+    "@storybook/client-logger": "6.4.0-rc.7",
+    "@storybook/components": "6.4.0-rc.7",
+    "@storybook/core-common": "6.4.0-rc.7",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/node-logger": "6.4.0-rc.2",
-    "@storybook/store": "6.4.0-rc.2",
-    "@storybook/theming": "6.4.0-rc.2",
+    "@storybook/node-logger": "6.4.0-rc.7",
+    "@storybook/store": "6.4.0-rc.7",
+    "@storybook/theming": "6.4.0-rc.7",
     "core-js": "^3.8.2",
     "lodash": "^4.17.20",
     "ts-dedent": "^2.0.0"
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16be10b522569b4b55c684e1556b91b300009bf4",
+  "gitHead": "7162286c0d8d122c7206265fab41c4c191c86d40",
   "sbmodern": "dist/modern/register.js",
   "storybook": {
     "displayName": "Controls",

addons/docs/docs/recipes.md

@@ -63,7 +63,8 @@ basic.parameters = {
 
 ```md
 import { Meta, Story } from '@storybook/addon-docs';
-import \* as stories from './Button.stories.js';
+import * as stories from './Button.stories.js';
+import { Button } from './Button';
 import { SomeComponent } from 'path/to/SomeComponent';
 
 <Meta title="Demo/Button" component={Button} />

addons/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.4.0-rc.2",
+  "version": "6.4.0-rc.7",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -63,21 +63,21 @@
     "@mdx-js/loader": "^1.6.22",
     "@mdx-js/mdx": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
-    "@storybook/addons": "6.4.0-rc.2",
-    "@storybook/api": "6.4.0-rc.2",
-    "@storybook/builder-webpack4": "6.4.0-rc.2",
-    "@storybook/client-logger": "6.4.0-rc.2",
-    "@storybook/components": "6.4.0-rc.2",
-    "@storybook/core": "6.4.0-rc.2",
-    "@storybook/core-events": "6.4.0-rc.2",
+    "@storybook/addons": "6.4.0-rc.7",
+    "@storybook/api": "6.4.0-rc.7",
+    "@storybook/builder-webpack4": "6.4.0-rc.7",
+    "@storybook/client-logger": "6.4.0-rc.7",
+    "@storybook/components": "6.4.0-rc.7",
+    "@storybook/core": "6.4.0-rc.7",
+    "@storybook/core-events": "6.4.0-rc.7",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/csf-tools": "6.4.0-rc.2",
-    "@storybook/node-logger": "6.4.0-rc.2",
-    "@storybook/postinstall": "6.4.0-rc.2",
-    "@storybook/preview-web": "6.4.0-rc.2",
-    "@storybook/source-loader": "6.4.0-rc.2",
-    "@storybook/store": "6.4.0-rc.2",
-    "@storybook/theming": "6.4.0-rc.2",
+    "@storybook/csf-tools": "6.4.0-rc.7",
+    "@storybook/node-logger": "6.4.0-rc.7",
+    "@storybook/postinstall": "6.4.0-rc.7",
+    "@storybook/preview-web": "6.4.0-rc.7",
+    "@storybook/source-loader": "6.4.0-rc.7",
+    "@storybook/store": "6.4.0-rc.7",
+    "@storybook/theming": "6.4.0-rc.7",
     "acorn": "^7.4.1",
     "acorn-jsx": "^5.3.1",
     "acorn-walk": "^7.2.0",
@@ -106,11 +106,11 @@
     "@babel/core": "^7.12.10",
     "@emotion/core": "^10.1.1",
     "@emotion/styled": "^10.0.27",
-    "@storybook/angular": "6.4.0-rc.2",
-    "@storybook/html": "6.4.0-rc.2",
-    "@storybook/react": "6.4.0-rc.2",
-    "@storybook/vue": "6.4.0-rc.2",
-    "@storybook/web-components": "6.4.0-rc.2",
+    "@storybook/angular": "6.4.0-rc.7",
+    "@storybook/html": "6.4.0-rc.7",
+    "@storybook/react": "6.4.0-rc.7",
+    "@storybook/vue": "6.4.0-rc.7",
+    "@storybook/web-components": "6.4.0-rc.7",
     "@types/cross-spawn": "^6.0.2",
     "@types/doctrine": "^0.0.3",
     "@types/enzyme": "^3.10.8",
@@ -126,8 +126,8 @@
     "fs-extra": "^9.0.1",
     "jest": "^26.6.3",
     "jest-specific-snapshot": "^4.0.0",
-    "lit-element": "^3.0.0-rc.2",
-    "lit-html": "^2.0.0-rc.3",
+    "lit-element": "^3.0.2",
+    "lit-html": "^2.0.2",
     "require-from-string": "^2.0.2",
     "rxjs": "^6.6.3",
     "styled-components": "^5.2.1",
@@ -140,14 +140,14 @@
     "zone.js": "^0.11.3"
   },
   "peerDependencies": {
-    "@storybook/angular": "6.4.0-rc.2",
-    "@storybook/html": "6.4.0-rc.2",
-    "@storybook/react": "6.4.0-rc.2",
-    "@storybook/vue": "6.4.0-rc.2",
-    "@storybook/vue3": "6.4.0-rc.2",
-    "@storybook/web-components": "6.4.0-rc.2",
-    "lit": "^2.0.0-rc.1",
-    "lit-html": "^1.4.1 || ^2.0.0-rc.3",
+    "@storybook/angular": "6.4.0-rc.7",
+    "@storybook/html": "6.4.0-rc.7",
+    "@storybook/react": "6.4.0-rc.7",
+    "@storybook/vue": "6.4.0-rc.7",
+    "@storybook/vue3": "6.4.0-rc.7",
+    "@storybook/web-components": "6.4.0-rc.7",
+    "lit": "^2.0.0",
+    "lit-html": "^1.4.1 || ^2.0.0",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0",
     "svelte": "^3.31.2",
@@ -202,7 +202,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16be10b522569b4b55c684e1556b91b300009bf4",
+  "gitHead": "7162286c0d8d122c7206265fab41c4c191c86d40",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Docs",