diff --git a/.circleci/config.yml b/.circleci/config.yml
index 550dc9e6b994..e124f267f1ba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -836,27 +836,27 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 14
+          parallelism: 13
           requires:
             - build
       - build-sandboxes:
-          parallelism: 14
+          parallelism: 13
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 11
+          parallelism: 10
           requires:
             - build-sandboxes
       - e2e-production:
-          parallelism: 9
+          parallelism: 8
           requires:
             - build-sandboxes
       - e2e-dev:
-          parallelism: 2
+          parallelism: 1
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 9
+          parallelism: 8
           requires:
             - build-sandboxes
       - vitest-integration:
@@ -912,27 +912,27 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 20
+          parallelism: 19
           requires:
             - build
       - build-sandboxes:
-          parallelism: 20
+          parallelism: 19
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 17
+          parallelism: 16
           requires:
             - build-sandboxes
       - e2e-production:
-          parallelism: 15
+          parallelism: 14
           requires:
             - build-sandboxes
       - e2e-dev:
-          parallelism: 2
+          parallelism: 1
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 15
+          parallelism: 14
           requires:
             - build-sandboxes
       - vitest-integration:
@@ -986,30 +986,30 @@ workflows:
           requires:
             - build
       - create-sandboxes:
-          parallelism: 38
+          parallelism: 36
           requires:
             - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
       - build-sandboxes:
-          parallelism: 38
+          parallelism: 36
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 35
+          parallelism: 33
           requires:
             - build-sandboxes
       - e2e-production:
-          parallelism: 33
+          parallelism: 31
           requires:
             - build-sandboxes
       - e2e-dev:
-          parallelism: 2
+          parallelism: 1
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 33
+          parallelism: 31
           requires:
             - build-sandboxes
       - vitest-integration:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60adcc476fb3..38eb1cc6cb56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 8.4.7
+
+- Telemetry: Improve anonymous id calculation - [#29736](https://github.com/storybookjs/storybook/pull/29736), thanks @tmeasday!
+- Vue: Properly resolve Vite plugin - [#29795](https://github.com/storybookjs/storybook/pull/29795), thanks @tobiasdiez!
+
 ## 8.4.6
 
 - Addon Test: Use pathe for better windows support - [#29676](https://github.com/storybookjs/storybook/pull/29676), thanks @yannbf!
diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
index 2ad71c357e65..baec48071eda 100644
--- a/CHANGELOG.prerelease.md
+++ b/CHANGELOG.prerelease.md
@@ -1,3 +1,12 @@
+## 8.5.0-alpha.18
+
+- Addon Test: Clarify message when `vitest` detects missing deps - [#29763](https://github.com/storybookjs/storybook/pull/29763), thanks @ndelangen!
+- Addon Test: Refactor test addon to include stories automatically - [#29367](https://github.com/storybookjs/storybook/pull/29367), thanks @yannbf!
+- Addon Test: Replace `glob` with `tinyglobby` - [#29817](https://github.com/storybookjs/storybook/pull/29817), thanks @ghengeveld!
+- Addon Test: Support Storybook environment variables in Vitest - [#29792](https://github.com/storybookjs/storybook/pull/29792), thanks @ghengeveld!
+- Composition: Hide contextMenu on composed storybooks - [#29803](https://github.com/storybookjs/storybook/pull/29803), thanks @ndelangen!
+- Vue: Properly resolve Vite plugin - [#29795](https://github.com/storybookjs/storybook/pull/29795), thanks @tobiasdiez!
+
 ## 8.5.0-alpha.17
 
 - CLI: Fix new-frameworks automigration - [#29804](https://github.com/storybookjs/storybook/pull/29804), thanks @yannbf!
diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
index 7d5bf26178e9..13814fc39390 100644
--- a/code/addons/a11y/package.json
+++ b/code/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json
index f881da3d1fad..efb51f302fc5 100644
--- a/code/addons/actions/package.json
+++ b/code/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",
diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json
index f93c053628ec..2bfa78900bc6 100644
--- a/code/addons/backgrounds/package.json
+++ b/code/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",
diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json
index 982b0bc73b1f..255546cd3bd6 100644
--- a/code/addons/controls/package.json
+++ b/code/addons/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
index fcd41b1d8d4e..f5834a822026 100644
--- a/code/addons/docs/package.json
+++ b/code/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json
index a94dfffa5412..4f7ad700ec0d 100644
--- a/code/addons/essentials/package.json
+++ b/code/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
diff --git a/code/addons/gfm/package.json b/code/addons/gfm/package.json
index 45830d2ae7e6..277e1663e385 100644
--- a/code/addons/gfm/package.json
+++ b/code/addons/gfm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-mdx-gfm",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "GitHub Flavored Markdown in Storybook",
   "keywords": [
     "addon",
diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json
index f5a59dcfd643..dc5588ee1d30 100644
--- a/code/addons/highlight/package.json
+++ b/code/addons/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-highlight",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Highlight DOM nodes within your stories",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
index 74d3a61efcd1..801c627195a0 100644
--- a/code/addons/interactions/package.json
+++ b/code/addons/interactions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-interactions",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Automate, test and debug user interactions",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json
index 45ba80320344..42f5f52b88aa 100644
--- a/code/addons/jest/package.json
+++ b/code/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
diff --git a/code/addons/links/package.json b/code/addons/links/package.json
index d1dd93522569..5a99aa4267c9 100644
--- a/code/addons/links/package.json
+++ b/code/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Link stories together to build demos and prototypes with your UI components",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json
index 738500a18216..dfebd2ef6b2d 100644
--- a/code/addons/measure/package.json
+++ b/code/addons/measure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-measure",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Inspect layouts by visualizing the box model",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/onboarding/package.json b/code/addons/onboarding/package.json
index 99f3654066c9..0fc9ef53a4ef 100644
--- a/code/addons/onboarding/package.json
+++ b/code/addons/onboarding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-onboarding",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook Addon Onboarding - Introduces a new onboarding experience",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json
index 3b0de09718e8..05786228223d 100644
--- a/code/addons/outline/package.json
+++ b/code/addons/outline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-outline",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Outline all elements with CSS to help with layout placement and alignment",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json
index 3e2e8ec23138..104218a0957c 100644
--- a/code/addons/storysource/package.json
+++ b/code/addons/storysource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "View a story’s source code to see how it works and paste into your app",
   "keywords": [
     "addon",
diff --git a/code/addons/test/package.json b/code/addons/test/package.json
index 004d47ee7e90..9bcf07d466d2 100644
--- a/code/addons/test/package.json
+++ b/code/addons/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/experimental-addon-test",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Integrate Vitest with Storybook",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/themes/package.json b/code/addons/themes/package.json
index 35838634d2d5..c67ac2dabd3e 100644
--- a/code/addons/themes/package.json
+++ b/code/addons/themes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-themes",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Switch between multiple themes for you components in Storybook",
   "keywords": [
     "css",
diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json
index dfd11a54904b..56b19d684c07 100644
--- a/code/addons/toolbars/package.json
+++ b/code/addons/toolbars/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-toolbars",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Create your own toolbar items that control story rendering",
   "keywords": [
     "addon",
diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json
index 75ce47aa85b0..4c7ad1d5916f 100644
--- a/code/addons/viewport/package.json
+++ b/code/addons/viewport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Build responsive components by adjusting Storybook’s viewport size and orientation",
   "keywords": [
     "addon",
diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json
index 91a869927030..15111a219775 100644
--- a/code/builders/builder-vite/package.json
+++ b/code/builders/builder-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "A plugin to run and build Storybooks with Vite",
   "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme",
   "bugs": {
diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json
index 4d881c5a5e61..6c7c000ea5cc 100644
--- a/code/builders/builder-webpack5/package.json
+++ b/code/builders/builder-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-webpack5",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/core/package.json b/code/core/package.json
index 28781c66226d..cbd3091aeb8d 100644
--- a/code/core/package.json
+++ b/code/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts
index 5d60eaff5ae7..93a8bf53d3b6 100644
--- a/code/core/src/common/versions.ts
+++ b/code/core/src/common/versions.ts
@@ -1,88 +1,88 @@
 // auto generated file, do not edit
 export default {
-  '@storybook/addon-a11y': '8.5.0-alpha.17',
-  '@storybook/addon-actions': '8.5.0-alpha.17',
-  '@storybook/addon-backgrounds': '8.5.0-alpha.17',
-  '@storybook/addon-controls': '8.5.0-alpha.17',
-  '@storybook/addon-docs': '8.5.0-alpha.17',
-  '@storybook/addon-essentials': '8.5.0-alpha.17',
-  '@storybook/addon-mdx-gfm': '8.5.0-alpha.17',
-  '@storybook/addon-highlight': '8.5.0-alpha.17',
-  '@storybook/addon-interactions': '8.5.0-alpha.17',
-  '@storybook/addon-jest': '8.5.0-alpha.17',
-  '@storybook/addon-links': '8.5.0-alpha.17',
-  '@storybook/addon-measure': '8.5.0-alpha.17',
-  '@storybook/addon-onboarding': '8.5.0-alpha.17',
-  '@storybook/addon-outline': '8.5.0-alpha.17',
-  '@storybook/addon-storysource': '8.5.0-alpha.17',
-  '@storybook/experimental-addon-test': '8.5.0-alpha.17',
-  '@storybook/addon-themes': '8.5.0-alpha.17',
-  '@storybook/addon-toolbars': '8.5.0-alpha.17',
-  '@storybook/addon-viewport': '8.5.0-alpha.17',
-  '@storybook/builder-vite': '8.5.0-alpha.17',
-  '@storybook/builder-webpack5': '8.5.0-alpha.17',
-  '@storybook/core': '8.5.0-alpha.17',
-  '@storybook/builder-manager': '8.5.0-alpha.17',
-  '@storybook/channels': '8.5.0-alpha.17',
-  '@storybook/client-logger': '8.5.0-alpha.17',
-  '@storybook/components': '8.5.0-alpha.17',
-  '@storybook/core-common': '8.5.0-alpha.17',
-  '@storybook/core-events': '8.5.0-alpha.17',
-  '@storybook/core-server': '8.5.0-alpha.17',
-  '@storybook/csf-tools': '8.5.0-alpha.17',
-  '@storybook/docs-tools': '8.5.0-alpha.17',
-  '@storybook/manager': '8.5.0-alpha.17',
-  '@storybook/manager-api': '8.5.0-alpha.17',
-  '@storybook/node-logger': '8.5.0-alpha.17',
-  '@storybook/preview': '8.5.0-alpha.17',
-  '@storybook/preview-api': '8.5.0-alpha.17',
-  '@storybook/router': '8.5.0-alpha.17',
-  '@storybook/telemetry': '8.5.0-alpha.17',
-  '@storybook/theming': '8.5.0-alpha.17',
-  '@storybook/types': '8.5.0-alpha.17',
-  '@storybook/angular': '8.5.0-alpha.17',
-  '@storybook/ember': '8.5.0-alpha.17',
-  '@storybook/experimental-nextjs-vite': '8.5.0-alpha.17',
-  '@storybook/html-vite': '8.5.0-alpha.17',
-  '@storybook/html-webpack5': '8.5.0-alpha.17',
-  '@storybook/nextjs': '8.5.0-alpha.17',
-  '@storybook/preact-vite': '8.5.0-alpha.17',
-  '@storybook/preact-webpack5': '8.5.0-alpha.17',
-  '@storybook/react-native-web-vite': '8.5.0-alpha.17',
-  '@storybook/react-vite': '8.5.0-alpha.17',
-  '@storybook/react-webpack5': '8.5.0-alpha.17',
-  '@storybook/server-webpack5': '8.5.0-alpha.17',
-  '@storybook/svelte-vite': '8.5.0-alpha.17',
-  '@storybook/svelte-webpack5': '8.5.0-alpha.17',
-  '@storybook/sveltekit': '8.5.0-alpha.17',
-  '@storybook/vue3-vite': '8.5.0-alpha.17',
-  '@storybook/vue3-webpack5': '8.5.0-alpha.17',
-  '@storybook/web-components-vite': '8.5.0-alpha.17',
-  '@storybook/web-components-webpack5': '8.5.0-alpha.17',
-  '@storybook/blocks': '8.5.0-alpha.17',
-  storybook: '8.5.0-alpha.17',
-  sb: '8.5.0-alpha.17',
-  '@storybook/cli': '8.5.0-alpha.17',
-  '@storybook/codemod': '8.5.0-alpha.17',
-  '@storybook/core-webpack': '8.5.0-alpha.17',
-  'create-storybook': '8.5.0-alpha.17',
-  '@storybook/csf-plugin': '8.5.0-alpha.17',
-  '@storybook/instrumenter': '8.5.0-alpha.17',
-  '@storybook/react-dom-shim': '8.5.0-alpha.17',
-  '@storybook/source-loader': '8.5.0-alpha.17',
-  '@storybook/test': '8.5.0-alpha.17',
-  '@storybook/preset-create-react-app': '8.5.0-alpha.17',
-  '@storybook/preset-html-webpack': '8.5.0-alpha.17',
-  '@storybook/preset-preact-webpack': '8.5.0-alpha.17',
-  '@storybook/preset-react-webpack': '8.5.0-alpha.17',
-  '@storybook/preset-server-webpack': '8.5.0-alpha.17',
-  '@storybook/preset-svelte-webpack': '8.5.0-alpha.17',
-  '@storybook/preset-vue3-webpack': '8.5.0-alpha.17',
-  '@storybook/html': '8.5.0-alpha.17',
-  '@storybook/preact': '8.5.0-alpha.17',
-  '@storybook/react': '8.5.0-alpha.17',
-  '@storybook/server': '8.5.0-alpha.17',
-  '@storybook/svelte': '8.5.0-alpha.17',
-  '@storybook/vue3': '8.5.0-alpha.17',
-  '@storybook/web-components': '8.5.0-alpha.17',
+  '@storybook/addon-a11y': '8.5.0-alpha.18',
+  '@storybook/addon-actions': '8.5.0-alpha.18',
+  '@storybook/addon-backgrounds': '8.5.0-alpha.18',
+  '@storybook/addon-controls': '8.5.0-alpha.18',
+  '@storybook/addon-docs': '8.5.0-alpha.18',
+  '@storybook/addon-essentials': '8.5.0-alpha.18',
+  '@storybook/addon-mdx-gfm': '8.5.0-alpha.18',
+  '@storybook/addon-highlight': '8.5.0-alpha.18',
+  '@storybook/addon-interactions': '8.5.0-alpha.18',
+  '@storybook/addon-jest': '8.5.0-alpha.18',
+  '@storybook/addon-links': '8.5.0-alpha.18',
+  '@storybook/addon-measure': '8.5.0-alpha.18',
+  '@storybook/addon-onboarding': '8.5.0-alpha.18',
+  '@storybook/addon-outline': '8.5.0-alpha.18',
+  '@storybook/addon-storysource': '8.5.0-alpha.18',
+  '@storybook/experimental-addon-test': '8.5.0-alpha.18',
+  '@storybook/addon-themes': '8.5.0-alpha.18',
+  '@storybook/addon-toolbars': '8.5.0-alpha.18',
+  '@storybook/addon-viewport': '8.5.0-alpha.18',
+  '@storybook/builder-vite': '8.5.0-alpha.18',
+  '@storybook/builder-webpack5': '8.5.0-alpha.18',
+  '@storybook/core': '8.5.0-alpha.18',
+  '@storybook/builder-manager': '8.5.0-alpha.18',
+  '@storybook/channels': '8.5.0-alpha.18',
+  '@storybook/client-logger': '8.5.0-alpha.18',
+  '@storybook/components': '8.5.0-alpha.18',
+  '@storybook/core-common': '8.5.0-alpha.18',
+  '@storybook/core-events': '8.5.0-alpha.18',
+  '@storybook/core-server': '8.5.0-alpha.18',
+  '@storybook/csf-tools': '8.5.0-alpha.18',
+  '@storybook/docs-tools': '8.5.0-alpha.18',
+  '@storybook/manager': '8.5.0-alpha.18',
+  '@storybook/manager-api': '8.5.0-alpha.18',
+  '@storybook/node-logger': '8.5.0-alpha.18',
+  '@storybook/preview': '8.5.0-alpha.18',
+  '@storybook/preview-api': '8.5.0-alpha.18',
+  '@storybook/router': '8.5.0-alpha.18',
+  '@storybook/telemetry': '8.5.0-alpha.18',
+  '@storybook/theming': '8.5.0-alpha.18',
+  '@storybook/types': '8.5.0-alpha.18',
+  '@storybook/angular': '8.5.0-alpha.18',
+  '@storybook/ember': '8.5.0-alpha.18',
+  '@storybook/experimental-nextjs-vite': '8.5.0-alpha.18',
+  '@storybook/html-vite': '8.5.0-alpha.18',
+  '@storybook/html-webpack5': '8.5.0-alpha.18',
+  '@storybook/nextjs': '8.5.0-alpha.18',
+  '@storybook/preact-vite': '8.5.0-alpha.18',
+  '@storybook/preact-webpack5': '8.5.0-alpha.18',
+  '@storybook/react-native-web-vite': '8.5.0-alpha.18',
+  '@storybook/react-vite': '8.5.0-alpha.18',
+  '@storybook/react-webpack5': '8.5.0-alpha.18',
+  '@storybook/server-webpack5': '8.5.0-alpha.18',
+  '@storybook/svelte-vite': '8.5.0-alpha.18',
+  '@storybook/svelte-webpack5': '8.5.0-alpha.18',
+  '@storybook/sveltekit': '8.5.0-alpha.18',
+  '@storybook/vue3-vite': '8.5.0-alpha.18',
+  '@storybook/vue3-webpack5': '8.5.0-alpha.18',
+  '@storybook/web-components-vite': '8.5.0-alpha.18',
+  '@storybook/web-components-webpack5': '8.5.0-alpha.18',
+  '@storybook/blocks': '8.5.0-alpha.18',
+  storybook: '8.5.0-alpha.18',
+  sb: '8.5.0-alpha.18',
+  '@storybook/cli': '8.5.0-alpha.18',
+  '@storybook/codemod': '8.5.0-alpha.18',
+  '@storybook/core-webpack': '8.5.0-alpha.18',
+  'create-storybook': '8.5.0-alpha.18',
+  '@storybook/csf-plugin': '8.5.0-alpha.18',
+  '@storybook/instrumenter': '8.5.0-alpha.18',
+  '@storybook/react-dom-shim': '8.5.0-alpha.18',
+  '@storybook/source-loader': '8.5.0-alpha.18',
+  '@storybook/test': '8.5.0-alpha.18',
+  '@storybook/preset-create-react-app': '8.5.0-alpha.18',
+  '@storybook/preset-html-webpack': '8.5.0-alpha.18',
+  '@storybook/preset-preact-webpack': '8.5.0-alpha.18',
+  '@storybook/preset-react-webpack': '8.5.0-alpha.18',
+  '@storybook/preset-server-webpack': '8.5.0-alpha.18',
+  '@storybook/preset-svelte-webpack': '8.5.0-alpha.18',
+  '@storybook/preset-vue3-webpack': '8.5.0-alpha.18',
+  '@storybook/html': '8.5.0-alpha.18',
+  '@storybook/preact': '8.5.0-alpha.18',
+  '@storybook/react': '8.5.0-alpha.18',
+  '@storybook/server': '8.5.0-alpha.18',
+  '@storybook/svelte': '8.5.0-alpha.18',
+  '@storybook/vue3': '8.5.0-alpha.18',
+  '@storybook/web-components': '8.5.0-alpha.18',
 };
diff --git a/code/core/src/manager-api/version.ts b/code/core/src/manager-api/version.ts
index ef7f07de9ff6..b54cfe6a0a07 100644
--- a/code/core/src/manager-api/version.ts
+++ b/code/core/src/manager-api/version.ts
@@ -1 +1 @@
-export const version = '8.5.0-alpha.17';
+export const version = '8.5.0-alpha.18';
diff --git a/code/deprecated/builder-manager/package.json b/code/deprecated/builder-manager/package.json
index 95022153a11c..2509c211d6bf 100644
--- a/code/deprecated/builder-manager/package.json
+++ b/code/deprecated/builder-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-manager",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook manager builder",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/channels/package.json b/code/deprecated/channels/package.json
index 4fd3d1afac0d..abec6882d2dc 100644
--- a/code/deprecated/channels/package.json
+++ b/code/deprecated/channels/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channels",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/client-logger/package.json b/code/deprecated/client-logger/package.json
index 663584c1627a..caf80b13a3d0 100644
--- a/code/deprecated/client-logger/package.json
+++ b/code/deprecated/client-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-logger",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/components/package.json b/code/deprecated/components/package.json
index fa9a3565a55c..30e9a7ab202f 100644
--- a/code/deprecated/components/package.json
+++ b/code/deprecated/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/components",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/core-common/package.json b/code/deprecated/core-common/package.json
index 32e814ab3cb8..ad5da180fdf5 100644
--- a/code/deprecated/core-common/package.json
+++ b/code/deprecated/core-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-common",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/core-events/package.json b/code/deprecated/core-events/package.json
index 6cc5140095e5..9823b20089fb 100644
--- a/code/deprecated/core-events/package.json
+++ b/code/deprecated/core-events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-events",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Event names used in storybook core",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/core-server/package.json b/code/deprecated/core-server/package.json
index 424244333353..5c42483a47a8 100644
--- a/code/deprecated/core-server/package.json
+++ b/code/deprecated/core-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/csf-tools/package.json b/code/deprecated/csf-tools/package.json
index 1f90842029fa..a13e29cd0c01 100644
--- a/code/deprecated/csf-tools/package.json
+++ b/code/deprecated/csf-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/csf-tools",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Parse and manipulate CSF and Storybook config files",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/docs-tools/package.json b/code/deprecated/docs-tools/package.json
index 85967dd5cc40..9fc426e57327 100644
--- a/code/deprecated/docs-tools/package.json
+++ b/code/deprecated/docs-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/docs-tools",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Shared utility functions for frameworks to implement docs",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/manager-api/package.json b/code/deprecated/manager-api/package.json
index 8283b52fc703..955551c55c0b 100644
--- a/code/deprecated/manager-api/package.json
+++ b/code/deprecated/manager-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/manager-api",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Core Storybook Manager API & Context",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/manager/package.json b/code/deprecated/manager/package.json
index 1a59c9d73983..b1f00d95a22d 100644
--- a/code/deprecated/manager/package.json
+++ b/code/deprecated/manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/manager",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Core Storybook UI",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/node-logger/package.json b/code/deprecated/node-logger/package.json
index 4efeb7a29fc4..d0c86432b964 100644
--- a/code/deprecated/node-logger/package.json
+++ b/code/deprecated/node-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/node-logger",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/preview-api/package.json b/code/deprecated/preview-api/package.json
index 09aab03491d7..e3b092c1a9b1 100644
--- a/code/deprecated/preview-api/package.json
+++ b/code/deprecated/preview-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preview-api",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/preview/package.json b/code/deprecated/preview/package.json
index 5d427c8b7a28..479c337042d7 100644
--- a/code/deprecated/preview/package.json
+++ b/code/deprecated/preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preview",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/router/package.json b/code/deprecated/router/package.json
index 77e697ec38c5..af05453070d3 100644
--- a/code/deprecated/router/package.json
+++ b/code/deprecated/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/router",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Core Storybook Router",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/telemetry/package.json b/code/deprecated/telemetry/package.json
index 4931992f24b5..22e48c1a6ccd 100644
--- a/code/deprecated/telemetry/package.json
+++ b/code/deprecated/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/telemetry",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Telemetry logging for crash reports and usage statistics",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/theming/package.json b/code/deprecated/theming/package.json
index 08c4650e6841..c82476b5afc5 100644
--- a/code/deprecated/theming/package.json
+++ b/code/deprecated/theming/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/theming",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/types/package.json b/code/deprecated/types/package.json
index 96daf9af4218..13cdd9a8664a 100644
--- a/code/deprecated/types/package.json
+++ b/code/deprecated/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/types",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Core Storybook TS Types",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json
index 7d930e4e898d..3d073e66109b 100644
--- a/code/frameworks/angular/package.json
+++ b/code/frameworks/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.",
   "keywords": [
     "storybook",
diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json
index 5297d8c08942..dabea4045fe4 100644
--- a/code/frameworks/ember/package.json
+++ b/code/frameworks/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ember",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybookjs/storybook/tree/next/code/frameworks/ember",
   "bugs": {
diff --git a/code/frameworks/experimental-nextjs-vite/package.json b/code/frameworks/experimental-nextjs-vite/package.json
index 356177bfabeb..31810fbfb604 100644
--- a/code/frameworks/experimental-nextjs-vite/package.json
+++ b/code/frameworks/experimental-nextjs-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/experimental-nextjs-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Next.js and Vite",
   "keywords": [
     "storybook",
diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json
index da351944deaf..888dba46797b 100644
--- a/code/frameworks/html-vite/package.json
+++ b/code/frameworks/html-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json
index 5446956bf254..e2c55679ed13 100644
--- a/code/frameworks/html-webpack5/package.json
+++ b/code/frameworks/html-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html-webpack5",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json
index 39e1377178bd..8739b514df43 100644
--- a/code/frameworks/nextjs/package.json
+++ b/code/frameworks/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/nextjs",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Next.js",
   "keywords": [
     "storybook",
diff --git a/code/frameworks/preact-vite/package.json b/code/frameworks/preact-vite/package.json
index 00b87f2eb2e2..3722bec49c14 100644
--- a/code/frameworks/preact-vite/package.json
+++ b/code/frameworks/preact-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Preact and Vite: Develop Preact components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json
index 2a95bfd90838..9a177ab76ba7 100644
--- a/code/frameworks/preact-webpack5/package.json
+++ b/code/frameworks/preact-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact-webpack5",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Preact: Develop Preact Component in isolation.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/react-native-web-vite/package.json b/code/frameworks/react-native-web-vite/package.json
index d47ba8a339e9..8bc3e9b0d2bc 100644
--- a/code/frameworks/react-native-web-vite/package.json
+++ b/code/frameworks/react-native-web-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native-web-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Develop react-native components an isolated web environment with hot reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json
index a6049e65c674..5f304a9f1abc 100644
--- a/code/frameworks/react-vite/package.json
+++ b/code/frameworks/react-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for React and Vite: Develop React components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json
index 445c74b42ee6..a2bcd11ae6b5 100644
--- a/code/frameworks/react-webpack5/package.json
+++ b/code/frameworks/react-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-webpack5",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json
index 46a3a19de014..69d960f2b567 100644
--- a/code/frameworks/server-webpack5/package.json
+++ b/code/frameworks/server-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server-webpack5",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
index fcd75dcd9f03..f65153136284 100644
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Svelte and Vite: Develop Svelte components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json
index f0bf9acd8682..f722bd1d401d 100644
--- a/code/frameworks/svelte-webpack5/package.json
+++ b/code/frameworks/svelte-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte-webpack5",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
index 25dc37416764..57329852173a 100644
--- a/code/frameworks/sveltekit/package.json
+++ b/code/frameworks/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/sveltekit",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for SvelteKit",
   "keywords": [
     "storybook",
diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json
index f1903828c629..519802837256 100644
--- a/code/frameworks/vue3-vite/package.json
+++ b/code/frameworks/vue3-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue3-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Vue3 and Vite: Develop Vue3 components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts b/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts
index 2f3c13b59897..82c9f4dc3109 100644
--- a/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts
+++ b/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts
@@ -3,7 +3,7 @@ import { dirname, join, parse, relative, resolve } from 'node:path';
 
 import findPackageJson from 'find-package-json';
 import MagicString from 'magic-string';
-import type { ModuleNode, PluginOption } from 'vite';
+import type { ModuleNode, Plugin } from 'vite';
 import {
   type ComponentMeta,
   type MetaCheckerOptions,
@@ -21,7 +21,7 @@ type MetaSource = {
 } & ComponentMeta &
   MetaCheckerOptions['schema'];
 
-export async function vueComponentMeta(tsconfigPath = 'tsconfig.json'): Promise<PluginOption> {
+export async function vueComponentMeta(tsconfigPath = 'tsconfig.json'): Promise<Plugin> {
   const { createFilter } = await import('vite');
 
   // exclude stories, virtual modules and storybook internals
diff --git a/code/frameworks/vue3-vite/src/plugins/vue-docgen.ts b/code/frameworks/vue3-vite/src/plugins/vue-docgen.ts
index 502264f88f14..c8b9268d0f46 100644
--- a/code/frameworks/vue3-vite/src/plugins/vue-docgen.ts
+++ b/code/frameworks/vue3-vite/src/plugins/vue-docgen.ts
@@ -1,8 +1,8 @@
 import MagicString from 'magic-string';
-import type { PluginOption } from 'vite';
+import type { Plugin } from 'vite';
 import { parse } from 'vue-docgen-api';
 
-export async function vueDocgen(): Promise<PluginOption> {
+export async function vueDocgen(): Promise<Plugin> {
   const { createFilter } = await import('vite');
 
   const include = /\.(vue)$/;
diff --git a/code/frameworks/vue3-vite/src/plugins/vue-template.ts b/code/frameworks/vue3-vite/src/plugins/vue-template.ts
index 325bc20341b4..22751c20222b 100644
--- a/code/frameworks/vue3-vite/src/plugins/vue-template.ts
+++ b/code/frameworks/vue3-vite/src/plugins/vue-template.ts
@@ -1,6 +1,6 @@
 import type { Plugin } from 'vite';
 
-export async function templateCompilation() {
+export async function templateCompilation(): Promise<Plugin> {
   return {
     name: 'storybook:vue-template-compilation',
     config: () => ({
diff --git a/code/frameworks/vue3-vite/src/preset.ts b/code/frameworks/vue3-vite/src/preset.ts
index 8bbaf394d442..d565b947587c 100644
--- a/code/frameworks/vue3-vite/src/preset.ts
+++ b/code/frameworks/vue3-vite/src/preset.ts
@@ -2,7 +2,7 @@ import { dirname, join } from 'node:path';
 
 import type { PresetProperty } from 'storybook/internal/types';
 
-import type { PluginOption } from 'vite';
+import type { Plugin } from 'vite';
 
 import { vueComponentMeta } from './plugins/vue-component-meta';
 import { vueDocgen } from './plugins/vue-docgen';
@@ -18,7 +18,7 @@ export const core: PresetProperty<'core'> = {
 };
 
 export const viteFinal: StorybookConfig['viteFinal'] = async (config, options) => {
-  const plugins: PluginOption[] = [templateCompilation()];
+  const plugins: Plugin[] = [await templateCompilation()];
 
   const framework = await options.presets.apply('framework');
   const frameworkOptions: FrameworkOptions =
diff --git a/code/frameworks/vue3-vite/src/vite-plugin.ts b/code/frameworks/vue3-vite/src/vite-plugin.ts
index eb2a3345e937..8b90ffe73ffa 100644
--- a/code/frameworks/vue3-vite/src/vite-plugin.ts
+++ b/code/frameworks/vue3-vite/src/vite-plugin.ts
@@ -1,5 +1,7 @@
+import type { Plugin } from 'vite';
+
 import { templateCompilation } from './plugins/vue-template';
 
-export const storybookVuePlugin = () => {
+export const storybookVuePlugin = (): Promise<Plugin>[] => {
   return [templateCompilation()];
 };
diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json
index 6d22eb734978..3df3e880c3de 100644
--- a/code/frameworks/vue3-webpack5/package.json
+++ b/code/frameworks/vue3-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue3-webpack5",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json
index 7e33521f21f2..a1350863cdcd 100644
--- a/code/frameworks/web-components-vite/package.json
+++ b/code/frameworks/web-components-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components-vite",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for web-components and Vite: Develop Web Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json
index 20ed1383eeca..9296e9586d5b 100644
--- a/code/frameworks/web-components-webpack5/package.json
+++ b/code/frameworks/web-components-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components-webpack5",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.",
   "keywords": [
     "lit",
diff --git a/code/lib/blocks/package.json b/code/lib/blocks/package.json
index c5c92e6c1984..5d65fafe45d5 100644
--- a/code/lib/blocks/package.json
+++ b/code/lib/blocks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/blocks",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook Doc Blocks",
   "keywords": [
     "storybook"
diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json
index f7c1a3bbb5e8..5a6d260e0e01 100644
--- a/code/lib/cli-sb/package.json
+++ b/code/lib/cli-sb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sb",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json
index 5f507b5d15ec..4539ae8a93fd 100644
--- a/code/lib/cli-storybook/package.json
+++ b/code/lib/cli-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
diff --git a/code/lib/cli-storybook/src/sandbox-templates.ts b/code/lib/cli-storybook/src/sandbox-templates.ts
index fe89f9decae0..f905d2841803 100644
--- a/code/lib/cli-storybook/src/sandbox-templates.ts
+++ b/code/lib/cli-storybook/src/sandbox-templates.ts
@@ -172,7 +172,6 @@ const baseTemplates = {
       extraDependencies: ['server-only', 'prop-types'],
     },
     skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
-    inDevelopment: true,
   },
   'nextjs/default-ts': {
     name: 'Next.js Latest (Webpack | TypeScript)',
@@ -229,7 +228,6 @@ const baseTemplates = {
         'prop-types',
       ],
     },
-    inDevelopment: true,
     skipTasks: ['e2e-tests-dev', 'bench'],
   },
   'experimental-nextjs-vite/default-ts': {
@@ -806,7 +804,8 @@ export const allTemplates: Record<TemplateKey, Template> = {
 };
 
 export const normal: TemplateKey[] = [
-  'cra/default-ts',
+  // TODO: Add this back once we resolve the React 19 issues
+  // 'cra/default-ts',
   'react-vite/default-ts',
   'angular-cli/default-ts',
   'vue3-vite/default-ts',
@@ -836,7 +835,8 @@ export const merged: TemplateKey[] = [
 export const daily: TemplateKey[] = [
   ...merged,
   'angular-cli/prerelease',
-  'cra/default-js',
+  // TODO: Add this back once we resolve the React 19 issues
+  // 'cra/default-js',
   'react-vite/default-js',
   'react-vite/prerelease-ts',
   'react-webpack/prerelease-ts',
diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json
index a4b7659b84bf..985f6ce73c62 100644
--- a/code/lib/cli/package.json
+++ b/code/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "storybook",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook's CLI - install, dev, build, upgrade, and more",
   "keywords": [
     "cli",
diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json
index 79988f64ebbf..b01b15c2ac07 100644
--- a/code/lib/codemod/package.json
+++ b/code/lib/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/codemod",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "A collection of codemod scripts written with JSCodeshift",
   "keywords": [
     "storybook"
diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json
index 68a206e8226d..f51817adb707 100644
--- a/code/lib/core-webpack/package.json
+++ b/code/lib/core-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-webpack",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/lib/create-storybook/package.json b/code/lib/create-storybook/package.json
index e87e1d2b9cf8..abf70ebc4d68 100644
--- a/code/lib/create-storybook/package.json
+++ b/code/lib/create-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-storybook",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Initialize Storybook into your project",
   "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/create-storybook",
   "bugs": {
diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json
index 890823e8f6b2..2b8cd390b7ea 100644
--- a/code/lib/csf-plugin/package.json
+++ b/code/lib/csf-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/csf-plugin",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Enrich CSF files via static analysis",
   "keywords": [
     "storybook"
diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json
index 3dd7c43d0089..a987140baea3 100644
--- a/code/lib/instrumenter/package.json
+++ b/code/lib/instrumenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/instrumenter",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/react-dom-shim/package.json b/code/lib/react-dom-shim/package.json
index cadeff76a926..5b007a076649 100644
--- a/code/lib/react-dom-shim/package.json
+++ b/code/lib/react-dom-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-dom-shim",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json
index 889a76a0fea1..14a48e23f5c4 100644
--- a/code/lib/source-loader/package.json
+++ b/code/lib/source-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/source-loader",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Source loader",
   "keywords": [
     "lib",
diff --git a/code/lib/test/package.json b/code/lib/test/package.json
index 4172a1431fc4..6d044f1b8708 100644
--- a/code/lib/test/package.json
+++ b/code/lib/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/test",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/package.json b/code/package.json
index b030cd2c70a9..5cac1d039ea0 100644
--- a/code/package.json
+++ b/code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/root",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "private": true,
   "description": "Storybook root",
   "homepage": "https://storybook.js.org/",
diff --git a/code/presets/create-react-app/package.json b/code/presets/create-react-app/package.json
index 54bacb590847..0abf32c7f106 100644
--- a/code/presets/create-react-app/package.json
+++ b/code/presets/create-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-create-react-app",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Create React App preset",
   "keywords": [
     "storybook"
diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json
index c861a9fff86f..04259562e42f 100644
--- a/code/presets/html-webpack/package.json
+++ b/code/presets/html-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-html-webpack",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json
index 9867e38bc2e5..47a58f5fcc54 100644
--- a/code/presets/preact-webpack/package.json
+++ b/code/presets/preact-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-preact-webpack",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Preact: Develop Preact Component in isolation.",
   "keywords": [
     "storybook"
diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json
index de9286d21a0a..439ac42128e6 100644
--- a/code/presets/react-webpack/package.json
+++ b/code/presets/react-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-react-webpack",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading",
   "keywords": [
     "storybook"
diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json
index 1d41d0a14a4f..1b8f29882f35 100644
--- a/code/presets/server-webpack/package.json
+++ b/code/presets/server-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-server-webpack",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json
index c34834d43e35..24182a57dce7 100644
--- a/code/presets/svelte-webpack/package.json
+++ b/code/presets/svelte-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-svelte-webpack",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json
index 22658bfcfc8f..78d39c601e8f 100644
--- a/code/presets/vue3-webpack/package.json
+++ b/code/presets/vue3-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-vue3-webpack",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json
index c5c8bfe35d3d..05f5083e0ada 100644
--- a/code/renderers/html/package.json
+++ b/code/renderers/html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook HTML renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json
index e21314855f0d..4b9ac43bb3b4 100644
--- a/code/renderers/preact/package.json
+++ b/code/renderers/preact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook Preact renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json
index 50088969f982..28bffef0c467 100644
--- a/code/renderers/react/package.json
+++ b/code/renderers/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook React renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json
index 05379fd41b5e..cdd333669721 100644
--- a/code/renderers/server/package.json
+++ b/code/renderers/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook Server renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
index 866dc0b19789..369cebded2bf 100644
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook Svelte renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json
index 0f0c58fdbcb1..dbf5c570fcd0 100644
--- a/code/renderers/vue3/package.json
+++ b/code/renderers/vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue3",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook Vue 3 renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json
index a240bd3d3b9a..1e77bedb4997 100644
--- a/code/renderers/web-components/package.json
+++ b/code/renderers/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components",
-  "version": "8.5.0-alpha.17",
+  "version": "8.5.0-alpha.18",
   "description": "Storybook web-components renderer",
   "keywords": [
     "lit",
diff --git a/docs/versions/next.json b/docs/versions/next.json
index 37255d98f54a..0fee1f4e6446 100644
--- a/docs/versions/next.json
+++ b/docs/versions/next.json
@@ -1 +1 @@
-{"version":"8.5.0-alpha.17","info":{"plain":"- CLI: Fix new-frameworks automigration - [#29804](https://github.com/storybookjs/storybook/pull/29804), thanks @yannbf!\n- ReactVite: Add `@storybook/test` as optional peer dependency - [#29754](https://github.com/storybookjs/storybook/pull/29754), thanks @yannbf!\n- Vite: Fix preview runtime import - [#29802](https://github.com/storybookjs/storybook/pull/29802), thanks @yannbf!"}}
+{"version":"8.5.0-alpha.18","info":{"plain":"- Addon Test: Clarify message when `vitest` detects missing deps - [#29763](https://github.com/storybookjs/storybook/pull/29763), thanks @ndelangen!\n- Addon Test: Refactor test addon to include stories automatically - [#29367](https://github.com/storybookjs/storybook/pull/29367), thanks @yannbf!\n- Addon Test: Replace `glob` with `tinyglobby` - [#29817](https://github.com/storybookjs/storybook/pull/29817), thanks @ghengeveld!\n- Addon Test: Support Storybook environment variables in Vitest - [#29792](https://github.com/storybookjs/storybook/pull/29792), thanks @ghengeveld!\n- Composition: Hide contextMenu on composed storybooks - [#29803](https://github.com/storybookjs/storybook/pull/29803), thanks @ndelangen!\n- Vue: Properly resolve Vite plugin - [#29795](https://github.com/storybookjs/storybook/pull/29795), thanks @tobiasdiez!"}}
diff --git a/scripts/bench/bench-packages.ts b/scripts/bench/bench-packages.ts
index 1651f5507301..e7dd22ff1a87 100644
--- a/scripts/bench/bench-packages.ts
+++ b/scripts/bench/bench-packages.ts
@@ -92,10 +92,10 @@ export const benchPackage = async (packageName: PackageName) => {
       2
     )
   );
-
   const npmInstallResult = await x(
     'npm',
-    `install --registry http://localhost:6001 --omit peer --json`.split(' '),
+    // --force to ignore peer dependency warnings, we aren't installing peer dependencies anyway
+    `install --registry http://localhost:6001 --omit peer --json --force`.split(' '),
     {
       nodeOptions: { cwd: tmpBenchPackagePath },
     }