Merge branch 'next' into chore/update-nx-latest

# Conflicts: # code/nx.json # code/yarn.lock
storybookjs · Sep 1, 2022 · 2fbb631 · 2fbb631
2 parents 6ebe534 + 9d198e5
commit 2fbb631
Show file tree

Hide file tree

Showing 122 changed files with 1,750 additions and 1,713 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 7.0.0-alpha.28 (September 2, 2022)
+
+#### Features
+
+-   Vite: Automatically use vite.config.js [#19026](https://github.com/storybooks/storybook/pull/19026)
+
+#### Bug Fixes
+
+-   CLI: Fix race condition in sb init [#19083](https://github.com/storybooks/storybook/pull/19083)
+-   Vite: Fix framework option checks, and SSv6 [#19062](https://github.com/storybooks/storybook/pull/19062)
+-   Core: Fix WebProjectAnnotations export in preview-web for back-compat [#19048](https://github.com/storybooks/storybook/pull/19048)
+
+#### Maintenance
+
+-   Update to new TS reference format (?) [#19072](https://github.com/storybooks/storybook/pull/19072)
+-   Build: Conditionally force vite rebuilds in sandbox [#19063](https://github.com/storybooks/storybook/pull/19063)
+-   Build: Fix CRA bench [#19066](https://github.com/storybooks/storybook/pull/19066)
+
 ## 7.0.0-alpha.27 (August 31, 2022)
 
 #### Features

diff --git a/MIGRATION.md b/MIGRATION.md
@@ -18,6 +18,7 @@
     - [Docs modern inline rendering by default](#docs-modern-inline-rendering-by-default)
     - [Babel mode v7 by default](#babel-mode-v7-by-default)
     - [7.0 feature flags removed](#70-feature-flags-removed)
+    - [Vite builder uses vite config automatically](#vite-builder-uses-vite-config-automatically)
     - [Removed docs.getContainer and getPage parameters](#removed-docsgetcontainer-and-getpage-parameters)
     - [Icons API changed](#icons-api-changed)
   - [Docs Changes](#docs-changes)
@@ -430,10 +431,13 @@ In 7.0, frameworks also specify the builder to be used. For example, The current
 - `@storybook/html-webpack5`
 - `@storybook/preact-webpack5`
 - `@storybook/react-webpack5`
+- `@storybook/react-vite`
 - `@storybook/server-webpack5`
 - `@storybook/svelte-webpack5`
+- `@storybook/svelte-vite`
 - `@storybook/vue-webpack5`
 - `@storybook/vue3-webpack5`
+- `@storybook/vue3-vite`
 - `@storybook/web-components-webpack5`
 
 We will be expanding this list over the course of the 7.0 development cycle. More info on the rationale here: [Frameworks RFC](https://www.notion.so/chromatic-ui/Frameworks-RFC-89f8aafe3f0941ceb4c24683859ed65c).
@@ -514,6 +518,12 @@ In 7.0 we've removed the following feature flags:
 | `emotionAlias`      | This flag is no longer needed and should be deleted. |
 | `breakingChangesV7` | This flag is no longer needed and should be deleted. |
 
+#### Vite builder uses vite config automatically
+
+When using a [Vite-based framework](#framework-field-mandatory), Storybook will automatically use your `vite.config.(ctm)js` config file starting in 7.0.  
+Some settings will be overridden by storybook so that it can function properly, and the merged settings can be modified using `viteFinal` in `.storybook/main.js` (see the [Storybook Vite configuration docs](https://storybook.js.org/docs/react/builders/vite#configuration)).  
+If you were using `viteFinal` in 6.5 to simply merge in your project's standard vite config, you can now remove it.
+
 #### Removed docs.getContainer and getPage parameters
 
 It is no longer possible to set `parameters.docs.getContainer()` and `getPage()`. Instead use `parameters.docs.container` or `parameters.docs.page` directly.

diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "7.0.0-alpha.27",
+  "version": "7.0.0-alpha.28",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
@@ -59,18 +59,18 @@
   ],
   "scripts": {
     "check": "tsc --noEmit",
-    "prepare": "../../../scripts/prepare/bundle.ts"
+    "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addon-highlight": "7.0.0-alpha.27",
-    "@storybook/addons": "7.0.0-alpha.27",
-    "@storybook/api": "7.0.0-alpha.27",
-    "@storybook/channels": "7.0.0-alpha.27",
-    "@storybook/client-logger": "7.0.0-alpha.27",
-    "@storybook/components": "7.0.0-alpha.27",
-    "@storybook/core-events": "7.0.0-alpha.27",
+    "@storybook/addon-highlight": "7.0.0-alpha.28",
+    "@storybook/addons": "7.0.0-alpha.28",
+    "@storybook/api": "7.0.0-alpha.28",
+    "@storybook/channels": "7.0.0-alpha.28",
+    "@storybook/client-logger": "7.0.0-alpha.28",
+    "@storybook/components": "7.0.0-alpha.28",
+    "@storybook/core-events": "7.0.0-alpha.28",
     "@storybook/csf": "0.0.2--canary.0899bb7.0",
-    "@storybook/theming": "7.0.0-alpha.27",
+    "@storybook/theming": "7.0.0-alpha.28",
     "axe-core": "^4.2.0",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
@@ -105,7 +105,7 @@
       "./src/preview.tsx"
     ]
   },
-  "gitHead": "3e33f0709dd97151b7dfd86fd9858d13fd1c5738",
+  "gitHead": "941b85ce04c2e7c4328edb3568c1dece36dfbcf3",
   "storybook": {
     "displayName": "Accessibility",
     "icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",

diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "7.0.0-alpha.27",
+  "version": "7.0.0-alpha.28",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",
@@ -32,16 +32,16 @@
   ],
   "scripts": {
     "check": "tsc --noEmit",
-    "prepare": "node ../../../scripts/prepare.js"
+    "prep": "node ../../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.27",
-    "@storybook/api": "7.0.0-alpha.27",
-    "@storybook/client-logger": "7.0.0-alpha.27",
-    "@storybook/components": "7.0.0-alpha.27",
-    "@storybook/core-events": "7.0.0-alpha.27",
+    "@storybook/addons": "7.0.0-alpha.28",
+    "@storybook/api": "7.0.0-alpha.28",
+    "@storybook/client-logger": "7.0.0-alpha.28",
+    "@storybook/components": "7.0.0-alpha.28",
+    "@storybook/core-events": "7.0.0-alpha.28",
     "@storybook/csf": "0.0.2--canary.0899bb7.0",
-    "@storybook/theming": "7.0.0-alpha.27",
+    "@storybook/theming": "7.0.0-alpha.28",
     "core-js": "^3.8.2",
     "dequal": "^2.0.2",
     "global": "^4.4.0",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3e33f0709dd97151b7dfd86fd9858d13fd1c5738",
+  "gitHead": "941b85ce04c2e7c4328edb3568c1dece36dfbcf3",
   "storybook": {
     "displayName": "Actions",
     "unsupportedFrameworks": [

diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "7.0.0-alpha.27",
+  "version": "7.0.0-alpha.28",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",
@@ -59,16 +59,16 @@
   ],
   "scripts": {
     "check": "tsc --noEmit",
-    "prepare": "../../../scripts/prepare/bundle.ts"
+    "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.27",
-    "@storybook/api": "7.0.0-alpha.27",
-    "@storybook/client-logger": "7.0.0-alpha.27",
-    "@storybook/components": "7.0.0-alpha.27",
-    "@storybook/core-events": "7.0.0-alpha.27",
+    "@storybook/addons": "7.0.0-alpha.28",
+    "@storybook/api": "7.0.0-alpha.28",
+    "@storybook/client-logger": "7.0.0-alpha.28",
+    "@storybook/components": "7.0.0-alpha.28",
+    "@storybook/core-events": "7.0.0-alpha.28",
     "@storybook/csf": "0.0.2--canary.0899bb7.0",
-    "@storybook/theming": "7.0.0-alpha.27",
+    "@storybook/theming": "7.0.0-alpha.28",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
     "memoizerific": "^1.11.3",
@@ -100,7 +100,7 @@
       "./src/preview.tsx"
     ]
   },
-  "gitHead": "3e33f0709dd97151b7dfd86fd9858d13fd1c5738",
+  "gitHead": "941b85ce04c2e7c4328edb3568c1dece36dfbcf3",
   "storybook": {
     "displayName": "Backgrounds",
     "icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png",

diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "7.0.0-alpha.27",
+  "version": "7.0.0-alpha.28",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
@@ -54,19 +54,19 @@
   ],
   "scripts": {
     "check": "tsc --noEmit",
-    "prepare": "../../../scripts/prepare/bundle.ts"
+    "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.27",
-    "@storybook/api": "7.0.0-alpha.27",
-    "@storybook/blocks": "7.0.0-alpha.27",
-    "@storybook/client-logger": "7.0.0-alpha.27",
-    "@storybook/components": "7.0.0-alpha.27",
-    "@storybook/core-common": "7.0.0-alpha.27",
+    "@storybook/addons": "7.0.0-alpha.28",
+    "@storybook/api": "7.0.0-alpha.28",
+    "@storybook/blocks": "7.0.0-alpha.28",
+    "@storybook/client-logger": "7.0.0-alpha.28",
+    "@storybook/components": "7.0.0-alpha.28",
+    "@storybook/core-common": "7.0.0-alpha.28",
     "@storybook/csf": "0.0.2--canary.0899bb7.0",
-    "@storybook/node-logger": "7.0.0-alpha.27",
-    "@storybook/store": "7.0.0-alpha.27",
-    "@storybook/theming": "7.0.0-alpha.27",
+    "@storybook/node-logger": "7.0.0-alpha.28",
+    "@storybook/store": "7.0.0-alpha.28",
+    "@storybook/theming": "7.0.0-alpha.28",
     "core-js": "^3.8.2",
     "lodash": "^4.17.21",
     "ts-dedent": "^2.0.0"
@@ -93,7 +93,7 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "3e33f0709dd97151b7dfd86fd9858d13fd1c5738",
+  "gitHead": "941b85ce04c2e7c4328edb3568c1dece36dfbcf3",
   "storybook": {
     "displayName": "Controls",
     "icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png",

diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "7.0.0-alpha.27",
+  "version": "7.0.0-alpha.28",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -46,29 +46,29 @@
   ],
   "scripts": {
     "check": "tsc --noEmit",
-    "prepare": "node ../../../scripts/prepare.js"
+    "prep": "node ../../../scripts/prepare.js"
   },
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "^7.12.12",
     "@babel/preset-env": "^7.12.11",
     "@jest/transform": "^26.6.2",
     "@mdx-js/react": "^1.6.22",
-    "@storybook/addons": "7.0.0-alpha.27",
-    "@storybook/api": "7.0.0-alpha.27",
-    "@storybook/blocks": "7.0.0-alpha.27",
-    "@storybook/components": "7.0.0-alpha.27",
-    "@storybook/core-common": "7.0.0-alpha.27",
-    "@storybook/core-events": "7.0.0-alpha.27",
+    "@storybook/addons": "7.0.0-alpha.28",
+    "@storybook/api": "7.0.0-alpha.28",
+    "@storybook/blocks": "7.0.0-alpha.28",
+    "@storybook/components": "7.0.0-alpha.28",
+    "@storybook/core-common": "7.0.0-alpha.28",
+    "@storybook/core-events": "7.0.0-alpha.28",
     "@storybook/csf": "0.0.2--canary.0899bb7.0",
-    "@storybook/csf-tools": "7.0.0-alpha.27",
-    "@storybook/docs-tools": "7.0.0-alpha.27",
+    "@storybook/csf-tools": "7.0.0-alpha.28",
+    "@storybook/docs-tools": "7.0.0-alpha.28",
     "@storybook/mdx1-csf": "0.0.5-canary.13.9ce928a.0",
-    "@storybook/node-logger": "7.0.0-alpha.27",
-    "@storybook/postinstall": "7.0.0-alpha.27",
-    "@storybook/preview-web": "7.0.0-alpha.27",
-    "@storybook/source-loader": "7.0.0-alpha.27",
-    "@storybook/store": "7.0.0-alpha.27",
-    "@storybook/theming": "7.0.0-alpha.27",
+    "@storybook/node-logger": "7.0.0-alpha.28",
+    "@storybook/postinstall": "7.0.0-alpha.28",
+    "@storybook/preview-web": "7.0.0-alpha.28",
+    "@storybook/source-loader": "7.0.0-alpha.28",
+    "@storybook/store": "7.0.0-alpha.28",
+    "@storybook/theming": "7.0.0-alpha.28",
     "babel-loader": "^8.2.5",
     "core-js": "^3.8.2",
     "dequal": "^2.0.2",
@@ -104,7 +104,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3e33f0709dd97151b7dfd86fd9858d13fd1c5738",
+  "gitHead": "941b85ce04c2e7c4328edb3568c1dece36dfbcf3",
   "storybook": {
     "displayName": "Docs",
     "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",

diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "7.0.0-alpha.27",
+  "version": "7.0.0-alpha.28",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -30,28 +30,28 @@
   ],
   "scripts": {
     "check": "tsc --noEmit",
-    "prepare": "node ../../../scripts/prepare.js"
+    "prep": "node ../../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "7.0.0-alpha.27",
-    "@storybook/addon-backgrounds": "7.0.0-alpha.27",
-    "@storybook/addon-controls": "7.0.0-alpha.27",
-    "@storybook/addon-docs": "7.0.0-alpha.27",
-    "@storybook/addon-highlight": "7.0.0-alpha.27",
-    "@storybook/addon-measure": "7.0.0-alpha.27",
-    "@storybook/addon-outline": "7.0.0-alpha.27",
-    "@storybook/addon-toolbars": "7.0.0-alpha.27",
-    "@storybook/addon-viewport": "7.0.0-alpha.27",
-    "@storybook/addons": "7.0.0-alpha.27",
-    "@storybook/api": "7.0.0-alpha.27",
-    "@storybook/core-common": "7.0.0-alpha.27",
-    "@storybook/node-logger": "7.0.0-alpha.27",
+    "@storybook/addon-actions": "7.0.0-alpha.28",
+    "@storybook/addon-backgrounds": "7.0.0-alpha.28",
+    "@storybook/addon-controls": "7.0.0-alpha.28",
+    "@storybook/addon-docs": "7.0.0-alpha.28",
+    "@storybook/addon-highlight": "7.0.0-alpha.28",
+    "@storybook/addon-measure": "7.0.0-alpha.28",
+    "@storybook/addon-outline": "7.0.0-alpha.28",
+    "@storybook/addon-toolbars": "7.0.0-alpha.28",
+    "@storybook/addon-viewport": "7.0.0-alpha.28",
+    "@storybook/addons": "7.0.0-alpha.28",
+    "@storybook/api": "7.0.0-alpha.28",
+    "@storybook/core-common": "7.0.0-alpha.28",
+    "@storybook/node-logger": "7.0.0-alpha.28",
     "core-js": "^3.8.2",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
-    "@storybook/vue": "7.0.0-alpha.27",
+    "@storybook/vue": "7.0.0-alpha.28",
     "@types/jest": "^26.0.16",
     "typescript": "~4.6.3"
   },
@@ -99,5 +99,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3e33f0709dd97151b7dfd86fd9858d13fd1c5738"
+  "gitHead": "941b85ce04c2e7c4328edb3568c1dece36dfbcf3"
 }
diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-highlight",
-  "version": "7.0.0-alpha.27",
+  "version": "7.0.0-alpha.28",
   "description": "Highlight DOM nodes within your stories",
   "keywords": [
     "storybook-addons",
@@ -34,11 +34,11 @@
   ],
   "scripts": {
     "check": "tsc --noEmit",
-    "prepare": "node ../../../scripts/prepare.js"
+    "prep": "node ../../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.27",
-    "@storybook/core-events": "7.0.0-alpha.27",
+    "@storybook/addons": "7.0.0-alpha.28",
+    "@storybook/core-events": "7.0.0-alpha.28",
     "core-js": "^3.8.2",
     "global": "^4.4.0"
   },
@@ -49,7 +49,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3e33f0709dd97151b7dfd86fd9858d13fd1c5738",
+  "gitHead": "941b85ce04c2e7c4328edb3568c1dece36dfbcf3",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Highlight",