Merge branch 'next' into feature/portable-stories-improvements

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -19,18 +19,19 @@ body:
     attributes:
       label: To Reproduce
       description: >-
-        We prioritize bug reports that have a reproduction. You can create a reproduction using [storybook.new](https://storybook.new), or by running `npx sb@next sandbox` and
-        following the instructions. Read our
-        [documentation](https://storybook.js.org/docs/react/contribute/how-to-reproduce)
-        to learn more about creating reproductions.
+        Due to the high volume of reports we receive, we can only prioritize bug reports that include a clear reproduction of the problem. Please use [storybook.new](https://storybook.new) to create one, and consult our [documentation](https://storybook.js.org/docs/react/contribute/how-to-reproduce) for guidance. Thank you for your understanding!
       placeholder: >-
-        Paste a link to your reproduction here. We prioritize issues with reproductions over those without.
+        Please provide a link to your reproduction here. If creating a reproduction really isn't feasible, let us know and be sure to include as much detail as you can to help us understand the issue. 
+    validations:
+      required: true
   - type: textarea
     id: system
     attributes:
       label: System
       description: Please paste the results of `npx storybook@latest info` here.
       render: bash
+    validations:
+      required: true
   - type: textarea
     id: context
     attributes:

.github/workflows/canary-release-pr.yml

@@ -49,18 +49,18 @@ jobs:
           echo "timestamp=$(date +%s)" >> $GITHUB_OUTPUT
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ steps.info.outputs.isFork == 'true' && steps.info.outputs.repository || null }}
           ref: ${{ steps.info.outputs.sha }}
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.yarn/berry/cache

.github/workflows/cron-weekly.yml

@@ -2,21 +2,21 @@ name: Markdown Links Check
 # runs every monday at 9 am
 on:
   schedule:
-    - cron: '0 9 * * 1'
+    - cron: "0 9 * * 1"
 
 jobs:
   check-links:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         # checks all markdown files from important folders including all subfolders
         with:
           # only show errors that occur instead of successful links + errors
-          use-quiet-mode: 'yes'
+          use-quiet-mode: "yes"
           # output full HTTP info for broken links
-          use-verbose-mode: 'yes'
-          config-file: '.github/workflows/markdown-link-check-config.json'   
+          use-verbose-mode: "yes"
+          config-file: ".github/workflows/markdown-link-check-config.json"
       # Notify to Discord channel on failure
       - name: Send Discord Notification
         if: failure() # Only run this step if previous steps failed

.github/workflows/danger-js.yml

@@ -21,10 +21,10 @@ jobs:
     name: Danger JS
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
       - name: Danger JS
         uses: danger/danger-js@11.2.6
         env:

.github/workflows/handle-release-branches.yml

@@ -23,7 +23,7 @@ jobs:
     if: ${{ needs.branch-checks.outputs.is-latest-branch == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - run: curl -X POST "https://api.netlify.com/build_hooks/${{ secrets.FRONTPAGE_HOOK }}"
 
@@ -32,7 +32,7 @@ jobs:
     if: ${{ needs.branch-checks.outputs.is-next-branch == 'true' || needs.branch-checks.outputs.is-release-branch == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: next
           path: next
@@ -54,7 +54,7 @@ jobs:
     if: ${{ needs.branch-checks.outputs.is-next-branch == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -88,7 +88,8 @@ jobs:
 
   request-create-frontpage-branch:
     if: ${{ always() }}
-    needs: [branch-checks, next-release-branch-check, create-next-release-branch]
+    needs:
+      [branch-checks, next-release-branch-check, create-next-release-branch]
     runs-on: ubuntu-latest
     steps:
       - if: ${{ needs.branch-checks.outputs.is-actionable-branch == 'true' && needs.branch-checks.outputs.is-latest-branch == 'false' && needs.next-release-branch-check.outputs.check == 'false' }}

.github/workflows/prepare-non-patch-release.yml

@@ -8,9 +8,9 @@ on:
   workflow_dispatch:
     inputs:
       release-type:
-        description: 'Which release type to use for bumping the version'
+        description: "Which release type to use for bumping the version"
         required: true
-        default: 'prerelease'
+        default: "prerelease"
         type: choice
         options:
           - prerelease
@@ -43,7 +43,7 @@ jobs:
         working-directory: scripts
     steps:
       - name: Checkout next
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: next
           # this needs to be set to a high enough number that it will contain the last version tag
@@ -52,12 +52,12 @@ jobs:
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.yarn/berry/cache
@@ -123,7 +123,7 @@ jobs:
         run: |
           yarn release:write-changelog ${{ steps.bump-version.outputs.next-version }} --verbose
 
-      - name: 'Commit changes to branch: version-non-patch-from-${{ steps.bump-version.outputs.current-version }}'
+      - name: "Commit changes to branch: version-non-patch-from-${{ steps.bump-version.outputs.current-version }}"
         working-directory: .
         run: |
           git config --global user.name 'storybook-bot'
@@ -180,4 +180,4 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_MONITORING_URL }}
         uses: Ilshidur/action-discord@master
         with:
-          args: 'The GitHub Action for preparing the release pull request bumping from v${{ steps.bump-version.outputs.current-version }} to v${{ steps.bump-version.outputs.next-version }} (triggered by ${{ github.triggering_actor }}) failed! See run at: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+          args: "The GitHub Action for preparing the release pull request bumping from v${{ steps.bump-version.outputs.current-version }} to v${{ steps.bump-version.outputs.next-version }} (triggered by ${{ github.triggering_actor }}) failed! See run at: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

.github/workflows/prepare-patch-release.yml

@@ -25,18 +25,18 @@ jobs:
         working-directory: scripts
     steps:
       - name: Checkout main
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: main
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.yarn/berry/cache

.github/workflows/publish.yml

@@ -37,18 +37,18 @@ jobs:
           gh run watch ${{ github.run_id }}
 
       - name: Checkout ${{ github.ref_name }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 100
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.yarn/berry/cache
@@ -197,4 +197,4 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_MONITORING_URL }}
         uses: Ilshidur/action-discord@master
         with:
-          args: 'The GitHub Action for publishing version ${{ steps.version.outputs.current-version }} (triggered by ${{ github.triggering_actor }}) failed! See run at: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+          args: "The GitHub Action for publishing version ${{ steps.version.outputs.current-version }} (triggered by ${{ github.triggering_actor }}) failed! See run at: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

.github/workflows/stale.yml

@@ -1,18 +1,18 @@
-name: 'Close stale issues that need reproduction or more info from OP'
+name: "Close stale issues that need reproduction or more info from OP"
 on:
   schedule:
-    - cron: '30 1 * * *'
+    - cron: "30 1 * * *"
 
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-issue-message: "Hi there! Thank you for opening this issue, but it has been marked as `stale` because we need more information to move forward. Could you please provide us with the requested reproduction or additional information that could help us better understand the problem? We'd love to resolve this issue, but we can't do it without your help!"
           close-issue-message: "I'm afraid we need to close this issue for now, since we can't take any action without the requested reproduction or additional information. But please don't hesitate to open a new issue if the problem persists – we're always happy to help. Thanks so much for your understanding."
-          any-of-labels: 'needs reproduction,needs more info'
-          exempt-issue-labels: 'needs triage'
-          labels-to-add-when-unstale: 'needs triage'
+          any-of-labels: "needs reproduction,needs more info"
+          exempt-issue-labels: "needs triage"
+          labels-to-add-when-unstale: "needs triage"
           days-before-stale: 21
           days-before-pr-stale: -1

.github/workflows/tests-unit.yml

@@ -16,11 +16,11 @@ jobs:
         os: [windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set node version
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
       - name: install and compile
         run: yarn task --task compile --start-from=auto --no-link
       - name: test

CHANGELOG.prerelease.md

@@ -1,3 +1,13 @@
+## 8.1.0-alpha.2
+
+- CLI: Automigrate improve upgrade storybook related packages - [#26497](https://github.com/storybookjs/storybook/pull/26497), thanks @ndelangen!
+- CLI: Improve `vite-config-file.ts` - [#26375](https://github.com/storybookjs/storybook/pull/26375), thanks @joevaugh4n!
+- Controls: Fix number controls do not reset - [#26372](https://github.com/storybookjs/storybook/pull/26372), thanks @jiyiru!
+- Core: Optimize clearNotification - [#26415](https://github.com/storybookjs/storybook/pull/26415), thanks @ndelangen!
+- Portable stories: Make setProjectAnnotations accept multiple types of imports - [#26316](https://github.com/storybookjs/storybook/pull/26316), thanks @yannbf!
+- UI: Add key property to list children in Highlight component - [#26471](https://github.com/storybookjs/storybook/pull/26471), thanks @valentinpalkovic!
+- UI: Fix search result color contrast - [#26287](https://github.com/storybookjs/storybook/pull/26287), thanks @winchesHe!
+
 ## 8.1.0-alpha.1
 
 - Maintenance: Fix performance regressions  - [#26411](https://github.com/storybookjs/storybook/pull/26411), thanks @kasperpeulen!

MIGRATION.md

@@ -510,8 +510,8 @@ For migrating to CSF, see: [`storyStoreV6` and `storiesOf` is deprecated](#story
 In Storybook 7, these packages existed for backwards compatibility, but were marked as deprecated:
 
 - `@storybook/addons` - this package has been split into 2 packages: `@storybook/preview-api` and `@storybook/manager-api`, see more here: [New Addons API](#new-addons-api).
-- `@storybook/channel-postmessage` - this package has been merged into `@storybook/channel`.
-- `@storybook/channel-websocket` - this package has been merged into `@storybook/channel`.
+- `@storybook/channel-postmessage` - this package has been merged into `@storybook/channels`.
+- `@storybook/channel-websocket` - this package has been merged into `@storybook/channels`.
 - `@storybook/client-api` - this package has been merged into `@storybook/preview-api`.
 - `@storybook/core-client` - this package has been merged into `@storybook/preview-api`.
 - `@storybook/preview-web` - this package has been merged into `@storybook/preview-api`.
@@ -554,7 +554,7 @@ export default defineConfig({
 
 ```ts
 import { defineConfig } from "vite";
-import svelte from "@sveltejs/vite-plugin-svelte";
+import { svelte } from "@sveltejs/vite-plugin-svelte";
 
 export default defineConfig({
   plugins: [svelte()],

code/addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",

code/addons/actions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",

code/addons/actions/src/runtime/action.ts

@@ -21,10 +21,9 @@ const isReactSyntheticEvent = (e: unknown): e is SyntheticEvent =>
       findProto(e, (proto) => /^Synthetic(?:Base)?Event$/.test(proto.constructor.name)) &&
       typeof (e as SyntheticEvent).persist === 'function'
   );
-const serializeArg = <T>(a: T) => {
+const serializeArg = <T extends object>(a: T) => {
   if (isReactSyntheticEvent(a)) {
     const e: SyntheticEvent = Object.create(
-      // @ts-expect-error (Converted from ts-ignore)
       a.constructor.prototype,
       Object.getOwnPropertyDescriptors(a)
     );

code/addons/backgrounds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",

code/addons/controls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",

code/addons/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",

code/addons/essentials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",

code/addons/gfm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-mdx-gfm",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "GitHub Flavored Markdown in Storybook",
   "keywords": [
     "addon",

code/addons/highlight/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-highlight",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Highlight DOM nodes within your stories",
   "keywords": [
     "storybook-addons",

code/addons/interactions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-interactions",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Automate, test and debug user interactions",
   "keywords": [
     "storybook-addons",

code/addons/jest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",

code/addons/links/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Link stories together to build demos and prototypes with your UI components",
   "keywords": [
     "addon",

code/addons/links/src/utils.ts

@@ -37,9 +37,7 @@ export const hrefTo = (title: ComponentTitle, name: StoryName): Promise<string>
   return new Promise((resolve) => {
     const { location } = document;
     const query = parseQuery(location.search);
-    // @ts-expect-error (Converted from ts-ignore)
-    const existingId = [].concat(query.id)[0];
-    // @ts-expect-error (Converted from ts-ignore)
+    const existingId = query.id;
     const titleToLink = title || existingId.split('--', 2)[0];
     const id = toId(titleToLink, name);
     const path = `/story/${id}`;

code/addons/measure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-measure",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Inspect layouts by visualizing the box model",
   "keywords": [
     "storybook-addons",

code/addons/onboarding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-onboarding",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook Addon Onboarding - Introduces a new onboarding experience",
   "keywords": [
     "storybook-addons",

code/addons/outline/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-outline",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Outline all elements with CSS to help with layout placement and alignment",
   "keywords": [
     "storybook-addons",

code/addons/storysource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "View a story’s source code to see how it works and paste into your app",
   "keywords": [
     "addon",

code/addons/themes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-themes",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Switch between multiple themes for you components in Storybook",
   "keywords": [
     "css",

code/addons/toolbars/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-toolbars",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Create your own toolbar items that control story rendering",
   "keywords": [
     "addon",

code/addons/viewport/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Build responsive components by adjusting Storybook’s viewport size and orientation",
   "keywords": [
     "addon",

code/builders/builder-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-manager",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook manager builder",
   "keywords": [
     "storybook"

code/builders/builder-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-vite",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "A plugin to run and build Storybooks with Vite",
   "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme",
   "bugs": {

code/builders/builder-webpack5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-webpack5",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"

code/frameworks/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.",
   "keywords": [
     "storybook",

code/frameworks/ember/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ember",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybookjs/storybook/tree/next/code/frameworks/ember",
   "bugs": {

code/frameworks/html-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html-vite",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/html-webpack5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html-webpack5",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/nextjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/nextjs",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Next.js",
   "keywords": [
     "storybook",

code/frameworks/preact-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact-vite",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Preact and Vite: Develop Preact components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/preact-webpack5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact-webpack5",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Preact: Develop Preact Component in isolation.",
   "keywords": [
     "storybook"

code/frameworks/react-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-vite",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for React and Vite: Develop React components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/react-webpack5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-webpack5",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/server-webpack5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server-webpack5",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/svelte-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte-vite",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Svelte and Vite: Develop Svelte components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/svelte-webpack5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte-webpack5",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/sveltekit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/sveltekit",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for SvelteKit",
   "keywords": [
     "storybook",

code/frameworks/vue3-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue3-vite",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Vue3 and Vite: Develop Vue3 components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/vue3-webpack5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue3-webpack5",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/web-components-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components-vite",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for web-components and Vite: Develop Web Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/frameworks/web-components-webpack5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components-webpack5",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.",
   "keywords": [
     "lit",

code/lib/channels/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channels",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "",
   "keywords": [
     "storybook"

code/lib/cli-sb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"

code/lib/cli-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"

code/lib/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook's CLI - install, dev, build, upgrade, and more",
   "keywords": [
     "cli",

code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts

@@ -52,7 +52,7 @@ describe('upgrade-storybook-related-dependencies fix', () => {
       {
         packageName: 'storybook',
         packageVersion: '8.0.0',
-        availableUpgrade: undefined,
+        availableUpgrade: '8.0.0',
         hasIncompatibleDependencies: true,
       },
     ];
@@ -60,14 +60,18 @@ describe('upgrade-storybook-related-dependencies fix', () => {
     await expect(
       check({
         packageManager: {
-          getAllDependencies: async () => ({
-            '@chromatic-com/storybook': '1.2.9',
-            '@storybook/jest': '0.2.3',
-            '@storybook/preset-create-react-app': '3.2.0',
-            storybook: '8.0.0',
-          }),
+          getAllDependencies: async () =>
+            analyzedPackages.reduce(
+              (acc, { packageName, packageVersion }) => {
+                acc[packageName] = packageVersion;
+                return acc;
+              },
+              {} as Record<string, string>
+            ),
           latestVersion: async (pkgName) =>
             analyzedPackages.find((pkg) => pkg.packageName === pkgName)?.availableUpgrade || '',
+          getInstalledVersion: async (pkgName) =>
+            analyzedPackages.find((pkg) => pkg.packageName === pkgName)?.packageVersion || null,
         },
       })
     ).resolves.toMatchInlineSnapshot(`

code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts

@@ -1,6 +1,6 @@
 import { dedent } from 'ts-dedent';
 import { cyan, yellow } from 'chalk';
-import { valid, coerce } from 'semver';
+import { gt } from 'semver';
 import type { JsPackageManager } from '@storybook/core-common';
 import { isCorePackage } from '@storybook/core-common';
 import type { Fix } from '../types';
@@ -21,24 +21,14 @@ async function getLatestVersions(
   packages: [string, string][]
 ): Promise<PackageMetadata[]> {
   return Promise.all(
-    packages.map(async ([packageName, beforeVersion]) => ({
+    packages.map(async ([packageName]) => ({
       packageName,
-      beforeVersion: coerce(beforeVersion)?.toString() || null,
+      beforeVersion: await packageManager.getInstalledVersion(packageName).catch(() => null),
       afterVersion: await packageManager.latestVersion(packageName).catch(() => null),
     }))
   );
 }
 
-function isPackageUpgradable(
-  afterVersion: string,
-  packageName: string,
-  allDependencies: Record<string, string>
-) {
-  const installedVersion = coerce(allDependencies[packageName])?.toString();
-
-  return valid(afterVersion) && afterVersion !== installedVersion;
-}
-
 /**
  * Is the user upgrading to the `latest` version of Storybook?
  * Let's try to pull along some of the storybook related dependencies to `latest` as well!
@@ -75,15 +65,13 @@ export const upgradeStorybookRelatedDependencies = {
 
     const packageVersions = await getLatestVersions(packageManager, uniquePackages);
 
-    const upgradablePackages = packageVersions.filter(
-      ({ packageName, afterVersion, beforeVersion }) => {
-        if (beforeVersion === null || afterVersion === null) {
-          return false;
-        }
-
-        return isPackageUpgradable(afterVersion, packageName, allDependencies);
+    const upgradablePackages = packageVersions.filter(({ afterVersion, beforeVersion }) => {
+      if (beforeVersion === null || afterVersion === null) {
+        return false;
       }
-    );
+
+      return gt(afterVersion, beforeVersion);
+    });
 
     return upgradablePackages.length > 0 ? { upgradable: upgradablePackages } : null;
   },

code/lib/cli/src/generate.ts

@@ -59,7 +59,7 @@ command('init')
   .option('-b --builder <webpack5 | vite>', 'Builder library')
   .option('-l --linkable', 'Prepare installation for link (contributor helper)')
   .action((options: CommandOptions) => {
-    initiate(options, pkg).catch(() => process.exit(1));
+    initiate(options).catch(() => process.exit(1));
   });
 
 command('add <addon>')
@@ -155,7 +155,7 @@ command('sandbox [filterValue]')
   .option('-o --output <outDir>', 'Define an output directory')
   .option('--no-init', 'Whether to download a template without an initialized Storybook', false)
   .action((filterValue, options) =>
-    sandbox({ filterValue, ...options }, pkg).catch((e) => {
+    sandbox({ filterValue, ...options }).catch((e) => {
       logger.error(e);
       process.exit(1);
     })

code/lib/cli/src/initiate.ts

@@ -1,5 +1,4 @@
 import { appendFile, readFile } from 'fs/promises';
-import type { PackageJson } from 'read-pkg-up';
 import findUp from 'find-up';
 import chalk from 'chalk';
 import prompts from 'prompts';
@@ -228,10 +227,7 @@ const projectTypeInquirer = async (
   process.exit(0);
 };
 
-export async function doInitiate(
-  options: CommandOptions,
-  pkg: PackageJson
-): Promise<
+export async function doInitiate(options: CommandOptions): Promise<
   | {
       shouldRunDev: true;
       projectType: ProjectType;
@@ -242,7 +238,7 @@ export async function doInitiate(
 > {
   const { packageManager: pkgMgr } = options;
 
-  const packageManager = JsPackageManagerFactory.getPackageManager({
+  let packageManager = JsPackageManagerFactory.getPackageManager({
     force: pkgMgr,
   });
 
@@ -276,6 +272,13 @@ export async function doInitiate(
 
   // Check if the current directory is empty.
   if (options.force !== true && currentDirectoryIsEmpty(packageManager.type)) {
+    // Initializing Storybook in an empty directory with yarn1
+    // will very likely fail due to different kind of hoisting issues
+    // which doesn't get fixed anymore in yarn1.
+    // We will fallback to npm in this case.
+    if (packageManager.type === 'yarn1') {
+      packageManager = JsPackageManagerFactory.getPackageManager({ force: 'npm' });
+    }
     // Prompt the user to create a new project from our list.
     await scaffoldNewProject(packageManager.type, options);
 
@@ -409,14 +412,14 @@ export async function doInitiate(
   };
 }
 
-export async function initiate(options: CommandOptions, pkg: PackageJson): Promise<void> {
+export async function initiate(options: CommandOptions): Promise<void> {
   const initiateResult = await withTelemetry(
     'init',
     {
       cliOptions: options,
       printError: (err) => !err.handled && logger.error(err),
     },
-    () => doInitiate(options, pkg)
+    () => doInitiate(options)
   );
 
   if (initiateResult?.shouldRunDev) {

code/lib/cli/src/sandbox.ts

@@ -10,7 +10,7 @@ import invariant from 'tiny-invariant';
 import { lt, prerelease } from 'semver';
 import type { Template, TemplateKey } from './sandbox-templates';
 import { allTemplates as TEMPLATES } from './sandbox-templates';
-import type { PackageJson, PackageManagerName } from '@storybook/core-common';
+import type { PackageManagerName } from '@storybook/core-common';
 import { JsPackageManagerFactory } from '@storybook/core-common';
 import { versions } from '@storybook/core-common';
 import { doInitiate } from './initiate';
@@ -28,10 +28,12 @@ type Choice = keyof typeof TEMPLATES;
 
 const toChoices = (c: Choice): prompts.Choice => ({ title: TEMPLATES[c].name, value: c });
 
-export const sandbox = async (
-  { output: outputDirectory, filterValue, init, ...options }: SandboxOptions,
-  pkg: PackageJson
-) => {
+export const sandbox = async ({
+  output: outputDirectory,
+  filterValue,
+  init,
+  ...options
+}: SandboxOptions) => {
   // Either get a direct match when users pass a template id, or filter through all templates
   let selectedConfig: Template | undefined = TEMPLATES[filterValue as TemplateKey];
   let templateId: Choice | null = selectedConfig ? (filterValue as TemplateKey) : null;
@@ -222,12 +224,9 @@ export const sandbox = async (
         const before = process.cwd();
         process.chdir(templateDestination);
         // we run doInitiate, instead of initiate, to avoid sending this init event to telemetry, because it's not a real world project
-        await doInitiate(
-          {
-            ...options,
-          },
-          pkg
-        );
+        await doInitiate({
+          ...options,
+        });
         process.chdir(before);
       }
     } catch (err) {

code/lib/client-logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-logger",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "",
   "keywords": [
     "storybook"

code/lib/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/codemod",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "A collection of codemod scripts written with JSCodeshift",
   "keywords": [
     "storybook"

code/lib/core-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-common",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"

code/lib/core-common/src/js-package-manager/JsPackageManager.ts

@@ -17,6 +17,8 @@ const logger = console;
 
 export type PackageManagerName = 'npm' | 'yarn1' | 'yarn2' | 'pnpm';
 
+type StorybookPackage = keyof typeof storybookPackagesVersions;
+
 /**
  * Extract package name and version from input
  *
@@ -381,9 +383,8 @@ export abstract class JsPackageManager {
   public async getVersion(packageName: string, constraint?: string): Promise<string> {
     let current: string | undefined;
 
-    if (/(@storybook|^sb$|^storybook$)/.test(packageName)) {
-      // @ts-expect-error (Converted from ts-ignore)
-      current = storybookPackagesVersions[packageName];
+    if (packageName in storybookPackagesVersions) {
+      current = storybookPackagesVersions[packageName as StorybookPackage];
     }
 
     let latest;
@@ -535,6 +536,18 @@ export abstract class JsPackageManager {
     }
   }
 
+  /**
+   * Returns the installed (within node_modules or pnp zip) version of a specified package
+   */
+  public async getInstalledVersion(packageName: string): Promise<string | null> {
+    const installations = await this.findInstallations([packageName]);
+    if (!installations) {
+      return null;
+    }
+
+    return Object.entries(installations.dependencies)[0]?.[1]?.[0].version || null;
+  }
+
   public async executeCommand({
     command,
     args = [],

code/lib/core-common/src/versions.ts

@@ -1,83 +1,83 @@
 // auto generated file, do not edit
 export default {
-  '@storybook/addon-a11y': '8.1.0-alpha.1',
-  '@storybook/addon-actions': '8.1.0-alpha.1',
-  '@storybook/addon-backgrounds': '8.1.0-alpha.1',
-  '@storybook/addon-controls': '8.1.0-alpha.1',
-  '@storybook/addon-docs': '8.1.0-alpha.1',
-  '@storybook/addon-essentials': '8.1.0-alpha.1',
-  '@storybook/addon-highlight': '8.1.0-alpha.1',
-  '@storybook/addon-interactions': '8.1.0-alpha.1',
-  '@storybook/addon-jest': '8.1.0-alpha.1',
-  '@storybook/addon-links': '8.1.0-alpha.1',
-  '@storybook/addon-mdx-gfm': '8.1.0-alpha.1',
-  '@storybook/addon-measure': '8.1.0-alpha.1',
-  '@storybook/addon-onboarding': '8.1.0-alpha.1',
-  '@storybook/addon-outline': '8.1.0-alpha.1',
-  '@storybook/addon-storysource': '8.1.0-alpha.1',
-  '@storybook/addon-themes': '8.1.0-alpha.1',
-  '@storybook/addon-toolbars': '8.1.0-alpha.1',
-  '@storybook/addon-viewport': '8.1.0-alpha.1',
-  '@storybook/angular': '8.1.0-alpha.1',
-  '@storybook/blocks': '8.1.0-alpha.1',
-  '@storybook/builder-manager': '8.1.0-alpha.1',
-  '@storybook/builder-vite': '8.1.0-alpha.1',
-  '@storybook/builder-webpack5': '8.1.0-alpha.1',
-  '@storybook/channels': '8.1.0-alpha.1',
-  '@storybook/cli': '8.1.0-alpha.1',
-  '@storybook/client-logger': '8.1.0-alpha.1',
-  '@storybook/codemod': '8.1.0-alpha.1',
-  '@storybook/components': '8.1.0-alpha.1',
-  '@storybook/core-common': '8.1.0-alpha.1',
-  '@storybook/core-events': '8.1.0-alpha.1',
-  '@storybook/core-server': '8.1.0-alpha.1',
-  '@storybook/core-webpack': '8.1.0-alpha.1',
-  '@storybook/csf-plugin': '8.1.0-alpha.1',
-  '@storybook/csf-tools': '8.1.0-alpha.1',
-  '@storybook/docs-tools': '8.1.0-alpha.1',
-  '@storybook/ember': '8.1.0-alpha.1',
-  '@storybook/html': '8.1.0-alpha.1',
-  '@storybook/html-vite': '8.1.0-alpha.1',
-  '@storybook/html-webpack5': '8.1.0-alpha.1',
-  '@storybook/instrumenter': '8.1.0-alpha.1',
-  '@storybook/manager': '8.1.0-alpha.1',
-  '@storybook/manager-api': '8.1.0-alpha.1',
-  '@storybook/nextjs': '8.1.0-alpha.1',
-  '@storybook/node-logger': '8.1.0-alpha.1',
-  '@storybook/preact': '8.1.0-alpha.1',
-  '@storybook/preact-vite': '8.1.0-alpha.1',
-  '@storybook/preact-webpack5': '8.1.0-alpha.1',
-  '@storybook/preset-create-react-app': '8.1.0-alpha.1',
-  '@storybook/preset-html-webpack': '8.1.0-alpha.1',
-  '@storybook/preset-preact-webpack': '8.1.0-alpha.1',
-  '@storybook/preset-react-webpack': '8.1.0-alpha.1',
-  '@storybook/preset-server-webpack': '8.1.0-alpha.1',
-  '@storybook/preset-svelte-webpack': '8.1.0-alpha.1',
-  '@storybook/preset-vue3-webpack': '8.1.0-alpha.1',
-  '@storybook/preview': '8.1.0-alpha.1',
-  '@storybook/preview-api': '8.1.0-alpha.1',
-  '@storybook/react': '8.1.0-alpha.1',
-  '@storybook/react-dom-shim': '8.1.0-alpha.1',
-  '@storybook/react-vite': '8.1.0-alpha.1',
-  '@storybook/react-webpack5': '8.1.0-alpha.1',
-  '@storybook/router': '8.1.0-alpha.1',
-  '@storybook/server': '8.1.0-alpha.1',
-  '@storybook/server-webpack5': '8.1.0-alpha.1',
-  '@storybook/source-loader': '8.1.0-alpha.1',
-  '@storybook/svelte': '8.1.0-alpha.1',
-  '@storybook/svelte-vite': '8.1.0-alpha.1',
-  '@storybook/svelte-webpack5': '8.1.0-alpha.1',
-  '@storybook/sveltekit': '8.1.0-alpha.1',
-  '@storybook/telemetry': '8.1.0-alpha.1',
-  '@storybook/test': '8.1.0-alpha.1',
-  '@storybook/theming': '8.1.0-alpha.1',
-  '@storybook/types': '8.1.0-alpha.1',
-  '@storybook/vue3': '8.1.0-alpha.1',
-  '@storybook/vue3-vite': '8.1.0-alpha.1',
-  '@storybook/vue3-webpack5': '8.1.0-alpha.1',
-  '@storybook/web-components': '8.1.0-alpha.1',
-  '@storybook/web-components-vite': '8.1.0-alpha.1',
-  '@storybook/web-components-webpack5': '8.1.0-alpha.1',
-  sb: '8.1.0-alpha.1',
-  storybook: '8.1.0-alpha.1',
+  '@storybook/addon-a11y': '8.1.0-alpha.2',
+  '@storybook/addon-actions': '8.1.0-alpha.2',
+  '@storybook/addon-backgrounds': '8.1.0-alpha.2',
+  '@storybook/addon-controls': '8.1.0-alpha.2',
+  '@storybook/addon-docs': '8.1.0-alpha.2',
+  '@storybook/addon-essentials': '8.1.0-alpha.2',
+  '@storybook/addon-highlight': '8.1.0-alpha.2',
+  '@storybook/addon-interactions': '8.1.0-alpha.2',
+  '@storybook/addon-jest': '8.1.0-alpha.2',
+  '@storybook/addon-links': '8.1.0-alpha.2',
+  '@storybook/addon-mdx-gfm': '8.1.0-alpha.2',
+  '@storybook/addon-measure': '8.1.0-alpha.2',
+  '@storybook/addon-onboarding': '8.1.0-alpha.2',
+  '@storybook/addon-outline': '8.1.0-alpha.2',
+  '@storybook/addon-storysource': '8.1.0-alpha.2',
+  '@storybook/addon-themes': '8.1.0-alpha.2',
+  '@storybook/addon-toolbars': '8.1.0-alpha.2',
+  '@storybook/addon-viewport': '8.1.0-alpha.2',
+  '@storybook/angular': '8.1.0-alpha.2',
+  '@storybook/blocks': '8.1.0-alpha.2',
+  '@storybook/builder-manager': '8.1.0-alpha.2',
+  '@storybook/builder-vite': '8.1.0-alpha.2',
+  '@storybook/builder-webpack5': '8.1.0-alpha.2',
+  '@storybook/channels': '8.1.0-alpha.2',
+  '@storybook/cli': '8.1.0-alpha.2',
+  '@storybook/client-logger': '8.1.0-alpha.2',
+  '@storybook/codemod': '8.1.0-alpha.2',
+  '@storybook/components': '8.1.0-alpha.2',
+  '@storybook/core-common': '8.1.0-alpha.2',
+  '@storybook/core-events': '8.1.0-alpha.2',
+  '@storybook/core-server': '8.1.0-alpha.2',
+  '@storybook/core-webpack': '8.1.0-alpha.2',
+  '@storybook/csf-plugin': '8.1.0-alpha.2',
+  '@storybook/csf-tools': '8.1.0-alpha.2',
+  '@storybook/docs-tools': '8.1.0-alpha.2',
+  '@storybook/ember': '8.1.0-alpha.2',
+  '@storybook/html': '8.1.0-alpha.2',
+  '@storybook/html-vite': '8.1.0-alpha.2',
+  '@storybook/html-webpack5': '8.1.0-alpha.2',
+  '@storybook/instrumenter': '8.1.0-alpha.2',
+  '@storybook/manager': '8.1.0-alpha.2',
+  '@storybook/manager-api': '8.1.0-alpha.2',
+  '@storybook/nextjs': '8.1.0-alpha.2',
+  '@storybook/node-logger': '8.1.0-alpha.2',
+  '@storybook/preact': '8.1.0-alpha.2',
+  '@storybook/preact-vite': '8.1.0-alpha.2',
+  '@storybook/preact-webpack5': '8.1.0-alpha.2',
+  '@storybook/preset-create-react-app': '8.1.0-alpha.2',
+  '@storybook/preset-html-webpack': '8.1.0-alpha.2',
+  '@storybook/preset-preact-webpack': '8.1.0-alpha.2',
+  '@storybook/preset-react-webpack': '8.1.0-alpha.2',
+  '@storybook/preset-server-webpack': '8.1.0-alpha.2',
+  '@storybook/preset-svelte-webpack': '8.1.0-alpha.2',
+  '@storybook/preset-vue3-webpack': '8.1.0-alpha.2',
+  '@storybook/preview': '8.1.0-alpha.2',
+  '@storybook/preview-api': '8.1.0-alpha.2',
+  '@storybook/react': '8.1.0-alpha.2',
+  '@storybook/react-dom-shim': '8.1.0-alpha.2',
+  '@storybook/react-vite': '8.1.0-alpha.2',
+  '@storybook/react-webpack5': '8.1.0-alpha.2',
+  '@storybook/router': '8.1.0-alpha.2',
+  '@storybook/server': '8.1.0-alpha.2',
+  '@storybook/server-webpack5': '8.1.0-alpha.2',
+  '@storybook/source-loader': '8.1.0-alpha.2',
+  '@storybook/svelte': '8.1.0-alpha.2',
+  '@storybook/svelte-vite': '8.1.0-alpha.2',
+  '@storybook/svelte-webpack5': '8.1.0-alpha.2',
+  '@storybook/sveltekit': '8.1.0-alpha.2',
+  '@storybook/telemetry': '8.1.0-alpha.2',
+  '@storybook/test': '8.1.0-alpha.2',
+  '@storybook/theming': '8.1.0-alpha.2',
+  '@storybook/types': '8.1.0-alpha.2',
+  '@storybook/vue3': '8.1.0-alpha.2',
+  '@storybook/vue3-vite': '8.1.0-alpha.2',
+  '@storybook/vue3-webpack5': '8.1.0-alpha.2',
+  '@storybook/web-components': '8.1.0-alpha.2',
+  '@storybook/web-components-vite': '8.1.0-alpha.2',
+  '@storybook/web-components-webpack5': '8.1.0-alpha.2',
+  sb: '8.1.0-alpha.2',
+  storybook: '8.1.0-alpha.2',
 };

code/lib/core-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-events",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Event names used in storybook core",
   "keywords": [
     "storybook"

code/lib/core-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"

code/lib/core-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-webpack",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"

code/lib/csf-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/csf-plugin",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Enrich CSF files via static analysis",
   "keywords": [
     "storybook"

code/lib/csf-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/csf-tools",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Parse and manipulate CSF and Storybook config files",
   "keywords": [
     "storybook"

code/lib/docs-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/docs-tools",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Shared utility functions for frameworks to implement docs",
   "keywords": [
     "storybook"

code/lib/instrumenter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/instrumenter",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "",
   "keywords": [
     "storybook"

code/lib/manager-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/manager-api",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Core Storybook Manager API & Context",
   "keywords": [
     "storybook"

code/lib/manager-api/src/version.ts

@@ -1 +1 @@
-export const version = '8.1.0-alpha.1';
+export const version = '8.1.0-alpha.2';

code/lib/node-logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/node-logger",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "",
   "keywords": [
     "storybook"

code/lib/preview-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preview-api",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "",
   "keywords": [
     "storybook"

code/lib/preview-api/src/modules/preview-web/Preview.tsx

@@ -100,9 +100,7 @@ export class Preview<TRenderer extends Renderer> {
         get: (_, method) => {
           if (this.storyStoreValue) {
             deprecate('Accessing the Story Store is deprecated and will be removed in 9.0');
-
-            // @ts-expect-error I'm not sure if there's a way to keep TS happy here
-            return this.storyStoreValue[method];
+            return this.storyStoreValue[method as keyof StoryStore<TRenderer>];
           }
 
           throw new StoryStoreAccessedBeforeInitializationError();

code/lib/preview-api/src/modules/store/csf/composeConfigs.test.ts

@@ -176,6 +176,34 @@ describe('composeConfigs', () => {
     });
   });
 
+  it('allows single array to be written without array', () => {
+    expect(
+      composeConfigs([
+        {
+          argsEnhancers: ['1', '2'],
+          argTypesEnhancers: ['1', '2'],
+          loaders: '1',
+        },
+        {
+          argsEnhancers: '3',
+          argTypesEnhancers: '3',
+          loaders: ['2', '3'],
+        },
+      ])
+    ).toEqual({
+      parameters: {},
+      decorators: [],
+      args: {},
+      argsEnhancers: ['1', '2', '3'],
+      argTypes: {},
+      argTypesEnhancers: ['1', '2', '3'],
+      globals: {},
+      globalTypes: {},
+      loaders: ['1', '2', '3'],
+      runStep: expect.any(Function),
+    });
+  });
+
   it('combines decorators in reverse file order', () => {
     expect(
       composeConfigs([

code/lib/preview-api/src/modules/store/csf/composeConfigs.ts

@@ -3,6 +3,7 @@ import { global } from '@storybook/global';
 
 import { combineParameters } from '../parameters';
 import { composeStepRunners } from './stepRunners';
+import { normalizeArrays } from './normalizeArrays';
 
 export function getField<TFieldType = any>(
   moduleExportList: ModuleExports[],
@@ -16,10 +17,10 @@ export function getArrayField<TFieldType = any>(
   field: string,
   options: { reverseFileOrder?: boolean } = {}
 ): TFieldType[] {
-  return getField(moduleExportList, field).reduce(
-    (a: any, b: any) => (options.reverseFileOrder ? [...b, ...a] : [...a, ...b]),
-    []
-  );
+  return getField(moduleExportList, field).reduce((prev: any, cur: any) => {
+    const normalized = normalizeArrays(cur);
+    return options.reverseFileOrder ? [...normalized, ...prev] : [...prev, ...normalized];
+  }, []);
 }
 
 export function getObjectField<TFieldType = Record<string, any>>(

code/lib/preview/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preview",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "",
   "keywords": [
     "storybook"

code/lib/react-dom-shim/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-dom-shim",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "",
   "keywords": [
     "storybook"

code/lib/router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/router",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Core Storybook Router",
   "keywords": [
     "storybook"

code/lib/source-loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/source-loader",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Source loader",
   "keywords": [
     "lib",

code/lib/telemetry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/telemetry",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Telemetry logging for crash reports and usage statistics",
   "keywords": [
     "storybook"

code/lib/test/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/test",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "",
   "keywords": [
     "storybook"

code/lib/test/src/index.ts

@@ -36,6 +36,6 @@ const resetAllMocksLoader: LoaderFunction = ({ parameters }) => {
   }
 };
 
-// @ts-expect-error We are using this as a default Storybook loader, when the test package is used. This avoids the need for optional peer dependency workarounds.
+// We are using this as a default Storybook loader, when the test package is used. This avoids the need for optional peer dependency workarounds.
 // eslint-disable-next-line no-underscore-dangle
-global.__STORYBOOK_TEST_LOADERS__ = [resetAllMocksLoader];
+(global as any).__STORYBOOK_TEST_LOADERS__ = [resetAllMocksLoader];

code/lib/theming/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/theming",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"

code/lib/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/types",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Core Storybook TS Types",
   "keywords": [
     "storybook"

code/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/root",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "private": true,
   "description": "Storybook root",
   "homepage": "https://storybook.js.org/",

code/presets/create-react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-create-react-app",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Create React App preset",
   "keywords": [
     "storybook"

code/presets/html-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-html-webpack",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/presets/preact-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-preact-webpack",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Preact: Develop Preact Component in isolation.",
   "keywords": [
     "storybook"

code/presets/react-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-react-webpack",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading",
   "keywords": [
     "storybook"

code/presets/server-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-server-webpack",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/presets/svelte-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-svelte-webpack",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/presets/vue3-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-vue3-webpack",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"

code/renderers/html/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook HTML renderer",
   "keywords": [
     "storybook"

code/renderers/preact/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook Preact renderer",
   "keywords": [
     "storybook"

code/renderers/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "8.1.0-alpha.1",
+  "version": "8.1.0-alpha.2",
   "description": "Storybook React renderer",
   "keywords": [
     "storybook"