From 8c499577baa4255c585b25e0d8b545f3fbbb70fe Mon Sep 17 00:00:00 2001
From: John Hunter <johnhunter@users.noreply.github.com>
Date: Fri, 11 Aug 2023 09:16:51 +0100
Subject: [PATCH 01/20] Add a disable actions note for forked repos

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 77e1f6fc0955..0f1c68b1c5e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,6 +7,10 @@ Storybook is developed against a specific node version. We recommend using [Volt
 
 The `yarn start` script will generate a React Vite TypeScript sandbox with a set of test stories inside it, as well as taking all steps required to get it running (building the various packages we need etc). There is no need to run `yarn` or `yarn install` as `yarn start` will do this for you.
 
+## Forked repos
+
+If you have forked the repo you should disable the Github actions to avoid failing runs (e.g. pushing to sandbox). In your Github repo go to **settings** > **actions** and set the **Disable actions** setting.
+
 # Running against different sandbox templates
 
 You can also pick a specific template to use as your sandbox by running `yarn task`, which will prompt you to make further choices about which template you want and which task you want to run.

From 615e0abee1078c8d00e8bea75e438eb179b2d64b Mon Sep 17 00:00:00 2001
From: John Hunter <johnhunter@users.noreply.github.com>
Date: Fri, 11 Aug 2023 18:25:28 +0100
Subject: [PATCH 02/20] Add an issues section for getting started

See discord issue https://discord.com/channels/486522875931656193/1139544040375857314
---
 CONTRIBUTING.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0f1c68b1c5e5..9bda11b7b0aa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,6 +7,13 @@ Storybook is developed against a specific node version. We recommend using [Volt
 
 The `yarn start` script will generate a React Vite TypeScript sandbox with a set of test stories inside it, as well as taking all steps required to get it running (building the various packages we need etc). There is no need to run `yarn` or `yarn install` as `yarn start` will do this for you.
 
+## Issues
+
+On `yarn start` you encounter the following error, try rerunning `yarn start` a second time:
+```
+>  NX   ENOENT: no such file or directory, open 'storybook/code/node_modules/nx/package.json'
+```
+
 ## Forked repos
 
 If you have forked the repo you should disable the Github actions to avoid failing runs (e.g. pushing to sandbox). In your Github repo go to **settings** > **actions** and set the **Disable actions** setting.

From 79170a9a6f242862839d641601421fec70716d81 Mon Sep 17 00:00:00 2001
From: John Hunter <johnhunter@users.noreply.github.com>
Date: Tue, 15 Aug 2023 08:52:39 +0100
Subject: [PATCH 03/20] Apply suggestions from code review

Co-authored-by: Kyle Gach <kyle.gach@gmail.com>
---
 CONTRIBUTING.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9bda11b7b0aa..3df1de0ecbf1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,14 +9,13 @@ The `yarn start` script will generate a React Vite TypeScript sandbox with a set
 
 ## Issues
 
-On `yarn start` you encounter the following error, try rerunning `yarn start` a second time:
-```
+If you run `yarn start` and encounter the following error, try rerunning `yarn start` a second time:
+```sh
 >  NX   ENOENT: no such file or directory, open 'storybook/code/node_modules/nx/package.json'
-```
 
 ## Forked repos
 
-If you have forked the repo you should disable the Github actions to avoid failing runs (e.g. pushing to sandbox). In your Github repo go to **settings** > **actions** and set the **Disable actions** setting.
+If you have forked the repository, you should [disable Github Actions for your repo](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository) as many of them (e.g. pushing to sandbox) will fail without proper authorization. In your Github repo, go to Settings > Actions > General > set the Actions Permissions to **Disable actions**.
 
 # Running against different sandbox templates
 

From c6be00e18322c9d1f6428a85cf625b1e68d8850b Mon Sep 17 00:00:00 2001
From: Yann Braga <yannbf@gmail.com>
Date: Tue, 15 Aug 2023 15:07:19 +0200
Subject: [PATCH 04/20] add parallelism count check

---
 .circleci/config.yml    | 15 ++++---
 scripts/get-template.ts | 89 +++++++++++++++++++++++++++++------------
 scripts/package.json    |  1 +
 scripts/yarn.lock       |  3 +-
 4 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d383fc19de3c..7d187778889f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -183,7 +183,7 @@ jobs:
             git diff --exit-code
       - report-workflow-on-failure
       - cancel-workflow-on-failure
-  script-unit-tests:
+  script-checks:
     executor: sb_node_16_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
@@ -191,7 +191,12 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: Test
+          name: Check parallelism count
+          command: |
+            cd scripts
+            yarn get-template --check
+      - run:
+          name: Run tests
           command: |
             cd scripts
             yarn test --coverage --ci
@@ -479,7 +484,7 @@ workflows:
       - unit-tests:
           requires:
             - build
-      - script-unit-tests:
+      - script-checks:
           requires:
             - build
       - chromatic-internal-storybooks:
@@ -535,7 +540,7 @@ workflows:
       - unit-tests:
           requires:
             - build
-      - script-unit-tests:
+      - script-checks:
           requires:
             - build
       - chromatic-internal-storybooks:
@@ -592,7 +597,7 @@ workflows:
       - unit-tests:
           requires:
             - build
-      - script-unit-tests:
+      - script-checks:
           requires:
             - build
       - chromatic-internal-storybooks:
diff --git a/scripts/get-template.ts b/scripts/get-template.ts
index 2968d8a9c6ce..e6e6b8b22e08 100644
--- a/scripts/get-template.ts
+++ b/scripts/get-template.ts
@@ -1,7 +1,9 @@
 import { readdir } from 'fs/promises';
-import { pathExists } from 'fs-extra';
+import { pathExists, readFile } from 'fs-extra';
 import { program } from 'commander';
 import dedent from 'ts-dedent';
+import chalk from 'chalk';
+import yaml from 'yaml';
 import {
   allTemplates,
   templatesByCadence,
@@ -70,23 +72,31 @@ export async function getTemplate(
   return potentialTemplateKeys[index];
 }
 
-const tasks = [
-  'sandbox',
-  'build',
-  'chromatic',
-  'e2e-tests',
-  'e2e-tests-dev',
-  'test-runner',
+const tasksMap = {
+  sandbox: 'create-sandboxes',
+  build: 'build-sandboxes',
+  chromatic: 'chromatic-sandboxes',
+  'e2e-tests': 'e2e-production',
+  'e2e-tests-dev': 'e2e-dev',
+  'test-runner': 'test-runner-production',
   // 'test-runner-dev', TODO: bring this back when the task is enabled again
-  'bench',
-];
+  bench: 'bench',
+};
+
+const tasks = Object.keys(tasksMap);
+
+const CONFIG_YML_FILE = '../.circleci/config.yml';
+
+async function checkParallelism(cadence?: Cadence, scriptName?: string) {
+  const configYml = await readFile(CONFIG_YML_FILE, 'utf-8');
+  const data = yaml.parse(configYml);
 
-async function getParallelismSummary(cadence?: Cadence, scriptName?: string) {
   let potentialTemplateKeys: TemplateKey[] = [];
   const cadences = cadence ? [cadence] : (Object.keys(templatesByCadence) as Cadence[]);
   const scripts = scriptName ? [scriptName] : tasks;
   const summary = [];
-  summary.push('These are the values you should have in .circleci/config.yml:');
+  let isIncorrect = false;
+
   cadences.forEach((cad) => {
     summary.push(`\n${cad}`);
     const cadenceTemplates = Object.entries(allTemplates).filter(([key]) =>
@@ -94,7 +104,7 @@ async function getParallelismSummary(cadence?: Cadence, scriptName?: string) {
     );
     potentialTemplateKeys = cadenceTemplates.map(([k]) => k) as TemplateKey[];
 
-    scripts.forEach((script) => {
+    scripts.forEach((script: keyof typeof tasksMap) => {
       const templateKeysPerScript = potentialTemplateKeys.filter((t) => {
         const currentTemplate = allTemplates[t] as Template;
         return (
@@ -102,31 +112,56 @@ async function getParallelismSummary(cadence?: Cadence, scriptName?: string) {
           !currentTemplate.skipTasks?.includes(script as SkippableTask)
         );
       });
-      if (templateKeysPerScript.length > 0) {
-        summary.push(
-          `-- ${script} - parallelism: ${templateKeysPerScript.length}${
-            templateKeysPerScript.length === 2 ? ' (default)' : ''
-          }`
-        );
+      const workflowJobsRaw: (string | { [key: string]: any })[] = data.workflows[cad].jobs;
+      const workflowJobs = workflowJobsRaw
+        .filter((item) => typeof item === 'object' && item !== null)
+        .reduce((result, item) => Object.assign(result, item), {}) as Record<string, any>;
+
+      if (templateKeysPerScript.length > 0 && workflowJobs[tasksMap[script]]) {
+        const currentParallelism = workflowJobs[tasksMap[script]].parallelism || 2;
+        const newParallelism = templateKeysPerScript.length;
+
+        if (newParallelism !== currentParallelism) {
+          summary.push(
+            `-- ❌ ${tasksMap[script]} - parallelism: ${currentParallelism} ${chalk.bgRed(
+              `(should be ${newParallelism})`
+            )}`
+          );
+          isIncorrect = true;
+        } else {
+          summary.push(
+            `-- ✅ ${tasksMap[script]} - parallelism: ${templateKeysPerScript.length}${
+              templateKeysPerScript.length === 2 ? ' (default)' : ''
+            }`
+          );
+        }
       } else {
         summary.push(`-- ${script} - this script is fully skipped for this cadence.`);
       }
     });
   });
 
-  return summary.concat('\n').join('\n');
+  if (isIncorrect) {
+    summary.unshift(
+      'The parellism count is incorrect for some jobs in .circleci/config.yml, you have to update them:'
+    );
+    throw new Error(summary.concat('\n').join('\n'));
+  } else {
+    summary.unshift('✅  The parallelism count is correct for all jobs in .circleci/config.yml:');
+    console.log(summary.concat('\n').join('\n'));
+  }
 }
 
-type RunOptions = { cadence?: Cadence; task?: string; debug: boolean };
-async function run({ cadence, task, debug }: RunOptions) {
-  if (debug) {
+type RunOptions = { cadence?: Cadence; task?: string; check: boolean };
+async function run({ cadence, task, check }: RunOptions) {
+  if (check) {
     if (task && !tasks.includes(task)) {
       throw new Error(
         dedent`The "${task}" task you provided is not valid. Valid tasks (found in .circleci/config.yml) are: 
         ${tasks.map((v) => `- ${v}`).join('\n')}`
       );
     }
-    console.log(await getParallelismSummary(cadence as Cadence, task));
+    await checkParallelism(cadence as Cadence, task);
     return;
   }
 
@@ -147,7 +182,11 @@ if (require.main === module) {
     .description('Retrieve the template to run for a given cadence and task')
     .option('--cadence <cadence>', 'Which cadence you want to run the script for')
     .option('--task <task>', 'Which task you want to run the script for')
-    .option('--debug', 'Whether to list the parallelism counts for tasks by cadence', false);
+    .option(
+      '--check',
+      'Throws an error when the parallelism counts for tasks are incorrect',
+      false
+    );
 
   program.parse(process.argv);
 
diff --git a/scripts/package.json b/scripts/package.json
index d551f204baef..6b7d18750111 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -185,6 +185,7 @@
     "uuid": "^9.0.0",
     "wait-on": "^7.0.1",
     "window-size": "^1.1.1",
+    "yaml": "^2.3.1",
     "zod": "^3.21.4"
   },
   "optionalDependencies": {
diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 21dc69364812..6fe301173b5d 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -3046,6 +3046,7 @@ __metadata:
     verdaccio-auth-memory: ^10.2.0
     wait-on: ^7.0.1
     window-size: ^1.1.1
+    yaml: ^2.3.1
     zod: ^3.21.4
   dependenciesMeta:
     "@verdaccio/types":
@@ -17359,7 +17360,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.0.0":
+"yaml@npm:^2.0.0, yaml@npm:^2.3.1":
   version: 2.3.1
   resolution: "yaml@npm:2.3.1"
   checksum: ed4c21a907fb1cd60a25177612fa46d95064a144623d269199817908475fe85bef20fb17406e3bdc175351b6488056a6f84beb7836e8c262646546a0220188e3

From 6ac295b735ba570825c472321532506ae7804a68 Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@users.noreply.github.com>
Date: Wed, 16 Aug 2023 15:34:26 +0800
Subject: [PATCH 05/20] Core: Fix `*.story.*` CSF indexing

---
 .../core-server/src/presets/common-preset.ts  |  2 +-
 .../src/utils/StoryIndexGenerator.test.ts     | 30 +++++++++++++++++++
 .../src/utils/__mockdata__/src/F.story.ts     |  7 +++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 code/lib/core-server/src/utils/__mockdata__/src/F.story.ts

diff --git a/code/lib/core-server/src/presets/common-preset.ts b/code/lib/core-server/src/presets/common-preset.ts
index fcb4b5681571..7e13ade9ddf0 100644
--- a/code/lib/core-server/src/presets/common-preset.ts
+++ b/code/lib/core-server/src/presets/common-preset.ts
@@ -195,7 +195,7 @@ export const features = async (
 });
 
 export const csfIndexer: Indexer = {
-  test: /\.stories\.(m?js|ts)x?$/,
+  test: /\.(stories|story)\.(m?js|ts)x?$/,
   index: async (fileName, options) => (await readCsf(fileName, options)).parse().indexInputs,
 };
 
diff --git a/code/lib/core-server/src/utils/StoryIndexGenerator.test.ts b/code/lib/core-server/src/utils/StoryIndexGenerator.test.ts
index 7110743b7003..b1097c168a86 100644
--- a/code/lib/core-server/src/utils/StoryIndexGenerator.test.ts
+++ b/code/lib/core-server/src/utils/StoryIndexGenerator.test.ts
@@ -99,6 +99,36 @@ describe('StoryIndexGenerator', () => {
         `);
       });
     });
+    describe('single file .story specifier', () => {
+      it('extracts stories from the right files', async () => {
+        const specifier: NormalizedStoriesSpecifier = normalizeStoriesEntry(
+          './src/F.story.ts',
+          options
+        );
+
+        const generator = new StoryIndexGenerator([specifier], options);
+        await generator.initialize();
+
+        expect(await generator.getIndex()).toMatchInlineSnapshot(`
+          Object {
+            "entries": Object {
+              "f--story-one": Object {
+                "id": "f--story-one",
+                "importPath": "./src/F.story.ts",
+                "name": "Story One",
+                "tags": Array [
+                  "autodocs",
+                  "story",
+                ],
+                "title": "F",
+                "type": "story",
+              },
+            },
+            "v": 4,
+          }
+        `);
+      });
+    });
     describe('non-recursive specifier', () => {
       it('extracts stories from the right files', async () => {
         const specifier: NormalizedStoriesSpecifier = normalizeStoriesEntry(
diff --git a/code/lib/core-server/src/utils/__mockdata__/src/F.story.ts b/code/lib/core-server/src/utils/__mockdata__/src/F.story.ts
new file mode 100644
index 000000000000..bb14d42c7112
--- /dev/null
+++ b/code/lib/core-server/src/utils/__mockdata__/src/F.story.ts
@@ -0,0 +1,7 @@
+const component = {};
+export default {
+  component,
+  tags: ['autodocs'],
+};
+
+export const StoryOne = {};

From 4b7f31781f9c1ea14c87c466d11a1f2e9fe6450c Mon Sep 17 00:00:00 2001
From: storybook-bot <32066757+storybook-bot@users.noreply.github.com>
Date: Wed, 16 Aug 2023 09:40:04 +0000
Subject: [PATCH 06/20] Update CHANGELOG.md for v7.3.1 [skip ci]

---
 CHANGELOG.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68964e7fa381..076226ae9e77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
+## 7.3.1
+
+- Index: Fix `*.story.*` CSF indexing - [#23852](https://github.com/storybookjs/storybook/pull/23852), thanks [@shilman](https://github.com/shilman)!
+
 ## 7.3.0
 
-- ✨ Indexer: Introduce new experimental `indexer` API - [#23691](https://github.com/storybookjs/storybook/pull/23691), thanks [@JReinhold](https://github.com/jreinhold)!
+- ✨ Indexer: Introduce new experimental `indexer` API - #23691, thanks [@JReinhold](https://github.com/jreinhold)!
 - ✨ CLI: Update postinstall to look for addon script - [#23791](https://github.com/storybookjs/storybook/pull/23791), thanks [@Integrayshaun](https://github.com/Integrayshaun)!
-- ✨ Server: Add support for tags - [#23660](https://github.com/storybookjs/storybook/pull/23660), thanks [@JReinhold](https://github.com/jreinhold)!
+- ✨ Server: Add support for tags - #23660, thanks [@JReinhold](https://github.com/jreinhold)!
 - 🐛 CSF-Tools: Remove prettier from printConfig - [#23766](https://github.com/storybookjs/storybook/pull/23766), thanks [@kasperpeulen](https://github.com/kasperpeulen)!
 - 🐛 Build: Support Chrome 100, Safari 15 and Firefox 91 - [#23800](https://github.com/storybookjs/storybook/pull/23800), thanks [@kasperpeulen](https://github.com/kasperpeulen)!
 - 🐛 Vue3: Don't automatically assign values to all slots - [#23697](https://github.com/storybookjs/storybook/pull/23697), thanks [@kasperpeulen](https://github.com/kasperpeulen)!

From 2604b4b776a583b4224d7545d59abbb8ad3b60ee Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Sat, 12 Aug 2023 03:31:35 -0400
Subject: [PATCH 07/20] turn on strict typechecking for @storybook/scripts

---
 scripts/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
index 591055d2ab92..c82e14a95108 100644
--- a/scripts/tsconfig.json
+++ b/scripts/tsconfig.json
@@ -8,14 +8,14 @@
     "moduleResolution": "Node",
     "target": "ES2020",
     "module": "CommonJS",
-    "skipLibCheck": false,
+    "skipLibCheck": true,
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "isolatedModules": true,
     "strictBindCallApply": true,
     "lib": ["dom", "esnext"],
     "types": ["node", "jest"],
-    "strict": false,
+    "strict": true,
     "strictNullChecks": false,
     "forceConsistentCasingInFileNames": true,
     "noUnusedLocals": true,

From b412fc87e3562f1dbae1705cdfb8087a2b20deee Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Sat, 12 Aug 2023 03:36:11 -0400
Subject: [PATCH 08/20] add typechecking script to @storybook/scripts

---
 scripts/package.json             |  1 +
 scripts/prepare/check-scripts.ts | 75 ++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100755 scripts/prepare/check-scripts.ts

diff --git a/scripts/package.json b/scripts/package.json
index 6b7d18750111..e24144a4a7b0 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -3,6 +3,7 @@
   "version": "7.0.0-alpha.16",
   "private": true,
   "scripts": {
+    "check": "./prepare/check-scripts.ts",
     "docs:prettier:check": "cd ../docs && prettier --check ./snippets",
     "docs:prettier:write": "cd ../docs && prettier --write ./snippets",
     "get-report-message": "ts-node --swc ./get-report-message.ts",
diff --git a/scripts/prepare/check-scripts.ts b/scripts/prepare/check-scripts.ts
new file mode 100755
index 000000000000..86418acd93ba
--- /dev/null
+++ b/scripts/prepare/check-scripts.ts
@@ -0,0 +1,75 @@
+#!/usr/bin/env ./node_modules/.bin/ts-node-script
+
+import { join } from 'path';
+import * as 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: {
+      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,
+    }
+  );
+}

From 211c1360c5ca49b0eae9a866328acad0921aecff Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Sat, 12 Aug 2023 04:08:34 -0400
Subject: [PATCH 09/20] fix type errors surfaced by strict typechecking

---
 scripts/event-log-collector.ts           |  2 +-
 scripts/prepare/esm-bundle.ts            |  3 ++-
 scripts/release/pick-patches.ts          |  5 +++--
 scripts/release/utils/get-github-info.ts |  2 +-
 scripts/release/version.ts               |  4 +---
 scripts/sandbox/utils/git.ts             | 15 ++++++++-----
 scripts/sandbox/utils/template.ts        | 27 +++++++++++-------------
 scripts/task.ts                          | 13 +++++++++---
 scripts/ts-to-ts49.ts                    |  3 ++-
 scripts/type-utils/stringifyError.ts     |  5 +++++
 scripts/utils/exec.ts                    |  2 +-
 scripts/utils/options.test.ts            | 13 ------------
 12 files changed, 48 insertions(+), 46 deletions(-)
 create mode 100644 scripts/type-utils/stringifyError.ts

diff --git a/scripts/event-log-collector.ts b/scripts/event-log-collector.ts
index 160120428553..f3ad10700887 100644
--- a/scripts/event-log-collector.ts
+++ b/scripts/event-log-collector.ts
@@ -12,7 +12,7 @@ server.post('/event-log', (req, res) => {
   res.end('OK');
 });
 
-server.get('/event-log', (req, res) => {
+server.get('/event-log', (_req, res) => {
   console.log(`Sending ${events.length} events`);
   res.json(events);
 });
diff --git a/scripts/prepare/esm-bundle.ts b/scripts/prepare/esm-bundle.ts
index 33a7c8314bae..08e039ad6dd2 100755
--- a/scripts/prepare/esm-bundle.ts
+++ b/scripts/prepare/esm-bundle.ts
@@ -13,7 +13,8 @@ import { exec } from '../utils/exec';
 /* TYPES */
 
 type BundlerConfig = {
-  entries: string[];
+  browserEntries: string[];
+  nodeEntries: string[];
   externals: string[];
   pre: string;
   post: string;
diff --git a/scripts/release/pick-patches.ts b/scripts/release/pick-patches.ts
index bbd90fb415e5..973cca40f427 100644
--- a/scripts/release/pick-patches.ts
+++ b/scripts/release/pick-patches.ts
@@ -6,6 +6,7 @@ import ora from 'ora';
 import { setOutput } from '@actions/core';
 import { git } from './utils/git-client';
 import { getUnpickedPRs } from './utils/github-client';
+import { stringifyError } from '../type-utils/stringifyError';
 
 program.name('pick-patches').description('Cherry pick patch PRs back to main');
 
@@ -58,14 +59,14 @@ export const run = async (_: unknown) => {
       prSpinner.succeed(`Picked: ${formatPR(pr)}`);
     } catch (pickError) {
       prSpinner.fail(`Failed to automatically pick: ${formatPR(pr)}`);
-      logger.error(pickError.message);
+      logger.error(stringifyError(pickError));
       const abort = ora(`Aborting cherry pick for merge commit: ${pr.mergeCommit}`).start();
       try {
         await git.raw(['cherry-pick', '--abort']);
         abort.stop();
       } catch (abortError) {
         abort.warn(`Failed to abort cherry pick (${pr.mergeCommit})`);
-        logger.error(pickError.message);
+        logger.error(stringifyError(pickError));
       }
       failedCherryPicks.push(pr.mergeCommit);
       prSpinner.info(
diff --git a/scripts/release/utils/get-github-info.ts b/scripts/release/utils/get-github-info.ts
index 65508bcc05ae..6bd7126aec04 100644
--- a/scripts/release/utils/get-github-info.ts
+++ b/scripts/release/utils/get-github-info.ts
@@ -97,7 +97,7 @@ function makeQuery(repos: ReposWithCommitsAndPRsToFetch) {
 // getReleaseLine will be called a large number of times but it'll be called at the same time
 // so instead of doing a bunch of network requests, we can do a single one.
 const GHDataLoader = new DataLoader(
-  async (requests: RequestData[]) => {
+  async (requests: readonly RequestData[]) => {
     if (!process.env.GH_TOKEN) {
       throw new Error(
         'Please create a GitHub personal access token at https://github.com/settings/tokens/new with `read:user` and `repo:status` permissions and add it as the GH_TOKEN environment variable'
diff --git a/scripts/release/version.ts b/scripts/release/version.ts
index 1636b248b454..3b34d288a8c7 100644
--- a/scripts/release/version.ts
+++ b/scripts/release/version.ts
@@ -141,12 +141,10 @@ const bumpVersionSources = async (currentVersion: string, nextVersion: string) =
 
 const bumpAllPackageJsons = async ({
   packages,
-  currentVersion,
   nextVersion,
   verbose,
 }: {
   packages: Workspace[];
-  currentVersion: string;
   nextVersion: string;
   verbose?: boolean;
 }) => {
@@ -279,7 +277,7 @@ export const run = async (options: unknown) => {
 
     await bumpCodeVersion(nextVersion);
     await bumpVersionSources(currentVersion, nextVersion);
-    await bumpAllPackageJsons({ packages, currentVersion, nextVersion, verbose });
+    await bumpAllPackageJsons({ packages, nextVersion, verbose });
 
     console.log(`⬆️ Updating lock file with ${chalk.blue('yarn install --mode=update-lockfile')}`);
     await execaCommand(`yarn install --mode=update-lockfile`, {
diff --git a/scripts/sandbox/utils/git.ts b/scripts/sandbox/utils/git.ts
index e4261083c9a5..e2fff4438364 100644
--- a/scripts/sandbox/utils/git.ts
+++ b/scripts/sandbox/utils/git.ts
@@ -2,6 +2,7 @@ import fetch from 'node-fetch';
 import { execaCommand } from '../../utils/exec';
 // eslint-disable-next-line import/no-cycle
 import { logger } from '../publish';
+import { stringifyError } from '../../type-utils/stringifyError';
 
 const { version: storybookVersion } = require('../../../code/package.json');
 
@@ -30,9 +31,11 @@ const getTheLastCommitHashThatUpdatedTheSandboxRepo = async (branch: string) =>
 
     return lastCommitHash;
   } catch (error) {
-    if (!error.message.includes('Did someone manually push to the sandboxes repo')) {
+    if (!(error as Error).message?.includes('Did someone manually push to the sandboxes repo')) {
       logger.error(
-        `⚠️  Error getting latest commit message of ${owner}/${repo} on branch ${branch}: ${error.message}`
+        `⚠️  Error getting latest commit message of ${owner}/${repo} on branch ${branch}: ${stringifyError(
+          error
+        )}`
       );
     }
 
@@ -85,7 +88,9 @@ export async function commitAllToGit({ cwd, branch }: { cwd: string; branch: str
       gitCommitCommand = `git commit -m "${commitTitle}" -m "${commitBody}"`;
     } catch (err) {
       logger.log(
-        `⚠️  Falling back to a simpler commit message because of an error while trying to get the previous commit hash: ${err.message}`
+        `⚠️  Falling back to a simpler commit message because of an error while trying to get the previous commit hash: ${stringifyError(
+          err
+        )}`
       );
       gitCommitCommand = `git commit -m "${storybookVersion} - ${new Date().toDateString()} - ${currentCommitHash}"`;
     }
@@ -95,12 +100,12 @@ export async function commitAllToGit({ cwd, branch }: { cwd: string; branch: str
       cwd,
     });
   } catch (e) {
-    if (e.message.includes('nothing to commit')) {
+    if ((e as Error)?.message?.includes('nothing to commit')) {
       logger.log(
         `🤷 Git found no changes between previous versions so there is nothing to commit. Skipping publish!`
       );
     } else {
-      logger.error(`🤯 Something went wrong while committing to git: ${e.message}`);
+      logger.error(`🤯 Something went wrong while committing to git: ${stringifyError(e)}`);
     }
   }
 }
diff --git a/scripts/sandbox/utils/template.ts b/scripts/sandbox/utils/template.ts
index 4cc3723827f0..10fdef474eb1 100644
--- a/scripts/sandbox/utils/template.ts
+++ b/scripts/sandbox/utils/template.ts
@@ -33,20 +33,17 @@ export async function getTemplatesData(branch: string) {
     >
   >;
 
-  const templatesData = Object.keys(sandboxTemplates).reduce<TemplatesData>(
-    (acc, curr: keyof typeof sandboxTemplates) => {
-      const [dirName, templateName] = curr.split('/');
-      const groupName =
-        dirName === 'cra' ? 'CRA' : dirName.slice(0, 1).toUpperCase() + dirName.slice(1);
-      const generatorData = sandboxTemplates[curr];
-      acc[groupName] = acc[groupName] || {};
-      acc[groupName][templateName] = {
-        ...generatorData,
-        stackblitzUrl: getStackblitzUrl(curr, branch),
-      };
-      return acc;
-    },
-    {}
-  );
+  const templatesData = Object.keys(sandboxTemplates).reduce<TemplatesData>((acc, curr) => {
+    const [dirName, templateName] = curr.split('/');
+    const groupName =
+      dirName === 'cra' ? 'CRA' : dirName.slice(0, 1).toUpperCase() + dirName.slice(1);
+    const generatorData = sandboxTemplates[curr as keyof typeof sandboxTemplates];
+    acc[groupName] = acc[groupName] || {};
+    acc[groupName][templateName] = {
+      ...generatorData,
+      stackblitzUrl: getStackblitzUrl(curr, branch),
+    };
+    return acc;
+  }, {});
   return templatesData;
 }
diff --git a/scripts/task.ts b/scripts/task.ts
index 67a70ae30a86..fb518454063a 100644
--- a/scripts/task.ts
+++ b/scripts/task.ts
@@ -6,6 +6,7 @@ import { join, resolve } from 'path';
 import { prompt } from 'prompts';
 import { dedent } from 'ts-dedent';
 
+import { stringifyError } from './type-utils/stringifyError';
 import { CODE_DIRECTORY, JUNIT_DIRECTORY, SANDBOX_DIRECTORY } from './utils/constants';
 import type { OptionValues } from './utils/options';
 import { createOptions, getCommand, getOptionsOrPrompt } from './utils/options';
@@ -73,7 +74,7 @@ export type Task = {
   /**
    * Is this task already "ready", and potentially not required?
    */
-  ready: (details: TemplateDetails, options: PassedOptionValues) => MaybePromise<boolean>;
+  ready: (details: TemplateDetails, options?: PassedOptionValues) => MaybePromise<boolean>;
   /**
    * Run the task
    */
@@ -323,7 +324,13 @@ async function runTask(task: Task, details: TemplateDetails, optionValues: Passe
     const hasJunitFile = await pathExists(junitFilename);
     // If there's a non-test related error (junit report has not been reported already), we report the general failure in a junit report
     if (junitFilename && !hasJunitFile) {
-      await writeJunitXml(getTaskKey(task), details.key, startTime, err, true);
+      await writeJunitXml(
+        getTaskKey(task),
+        details.key,
+        startTime,
+        err instanceof Error ? err : new Error(String(err)),
+        true
+      );
     }
 
     throw err;
@@ -469,7 +476,7 @@ async function run() {
         logger.error(`Error running task ${getTaskKey(task)}:`);
         // If it is the last task, we don't need to log the full trace
         if (task === finalTask) {
-          logger.error(err.message);
+          logger.error(stringifyError(err));
         } else {
           logger.error(err);
         }
diff --git a/scripts/ts-to-ts49.ts b/scripts/ts-to-ts49.ts
index a73eaabbd2be..e6e64f994663 100644
--- a/scripts/ts-to-ts49.ts
+++ b/scripts/ts-to-ts49.ts
@@ -7,6 +7,7 @@ import * as recast from 'recast';
 import type Babel from '@babel/core';
 import type { File } from '@babel/types';
 import * as t from '@babel/types';
+import { stringifyError } from './type-utils/stringifyError';
 
 const files = glob.sync('**/*.ts.mdx', {
   absolute: true,
@@ -74,7 +75,7 @@ for (const [, file] of files.entries()) {
       console.log('changed', file);
     }
   } catch (e) {
-    console.error(e.message);
+    console.error(stringifyError(e));
   }
 }
 
diff --git a/scripts/type-utils/stringifyError.ts b/scripts/type-utils/stringifyError.ts
new file mode 100644
index 000000000000..bdbac770dc6f
--- /dev/null
+++ b/scripts/type-utils/stringifyError.ts
@@ -0,0 +1,5 @@
+/**
+ * Makes typescript error handling a little less ugly
+ */
+export const stringifyError = (error: unknown) =>
+  error instanceof Error ? error.message : String(error);
diff --git a/scripts/utils/exec.ts b/scripts/utils/exec.ts
index 6280f65ff9cf..fd340322ebb1 100644
--- a/scripts/utils/exec.ts
+++ b/scripts/utils/exec.ts
@@ -67,7 +67,7 @@ export const exec = async (
       }
     }
   } catch (err) {
-    if (!err.killed) {
+    if (!(err as any)?.killed) {
       logger.error(chalk.red(`An error occurred while executing: \`${command}\``));
       logger.log(`${errorMessage}\n`);
     }
diff --git a/scripts/utils/options.test.ts b/scripts/utils/options.test.ts
index ccbc6a058ec3..c183db207f2c 100644
--- a/scripts/utils/options.test.ts
+++ b/scripts/utils/options.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from '@jest/globals';
 import { createCommand } from 'commander';
 
-import type { MaybeOptionValues, OptionValues } from './options';
 import { areOptionsSatisfied, createOptions, getCommand, getOptions } from './options';
 
 const allOptions = createOptions({
@@ -35,17 +34,6 @@ const allOptions = createOptions({
   },
 });
 
-// TS "tests"
-// deepscan-disable-next-line
-function test(mv: MaybeOptionValues<typeof allOptions>, v: OptionValues<typeof allOptions>) {
-  console.log(mv.first, mv.second, mv.third, mv.fourth, mv.fifth, mv.sixth);
-  // @ts-expect-error as it's not allowed
-  console.log(mv.seventh);
-  console.log(v.first, v.second, v.third, v.fourth, v.fifth, v.sixth);
-  // @ts-expect-error as it's not allowed
-  console.log(v.seventh);
-}
-
 describe('getOptions', () => {
   it('deals with boolean options', () => {
     expect(getOptions(createCommand(), allOptions, ['command', 'name', '--first'])).toMatchObject({
@@ -71,7 +59,6 @@ describe('getOptions', () => {
   });
 
   it('deals with string options', () => {
-    const r = getOptions(createCommand(), allOptions, ['command', 'name', '--third', 'one']);
     expect(
       getOptions(createCommand(), allOptions, ['command', 'name', '--third', 'one'])
     ).toMatchObject({

From 855554428a5fa439ed70316891f0ff45c2db3d14 Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Mon, 14 Aug 2023 00:25:03 -0400
Subject: [PATCH 10/20] modify stringifyError to make it more general

---
 scripts/type-utils/stringifyError.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/type-utils/stringifyError.ts b/scripts/type-utils/stringifyError.ts
index bdbac770dc6f..ea43d6844e37 100644
--- a/scripts/type-utils/stringifyError.ts
+++ b/scripts/type-utils/stringifyError.ts
@@ -1,5 +1,4 @@
 /**
  * Makes typescript error handling a little less ugly
  */
-export const stringifyError = (error: unknown) =>
-  error instanceof Error ? error.message : String(error);
+export const stringifyError = (error: unknown) => (error as any)?.message ?? String(error);

From 660789e2e33c6145c58e050c4eae55bdbf181355 Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Tue, 15 Aug 2023 02:45:33 -0400
Subject: [PATCH 11/20] add scripts to check task

---
 code/package.json      | 2 ++
 scripts/tasks/check.ts | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/package.json b/code/package.json
index df1c2df8d920..c929341889a0 100644
--- a/code/package.json
+++ b/code/package.json
@@ -30,6 +30,7 @@
     "changelog": "pr-log --sloppy --cherry-pick",
     "changelog:next": "pr-log --sloppy --since-prerelease",
     "check": "NODE_ENV=production node ../scripts/check-package.js",
+    "check:scripts": "cd ../scripts && ./prepare/check-scripts.ts",
     "ci-tests": "yarn task --task check --no-link --start-from=install && yarn lint && yarn test && cd ../scripts && yarn test",
     "danger": "danger",
     "generate-sandboxes": "ts-node --swc ../scripts/sandbox/generate.ts",
@@ -292,6 +293,7 @@
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
   },
+  "nx": {},
   "pr-log": {
     "skipLabels": [
       "cleanup"
diff --git a/scripts/tasks/check.ts b/scripts/tasks/check.ts
index 8514d453dde4..bae3ff8d9f6e 100644
--- a/scripts/tasks/check.ts
+++ b/scripts/tasks/check.ts
@@ -4,8 +4,8 @@ import { maxConcurrentTasks } from '../utils/maxConcurrentTasks';
 
 const parallel = process.env.CI ? 8 : maxConcurrentTasks;
 
-const linkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,@storybook/vue,@storybook/svelte,@storybook/vue3,@storybook/angular`;
-const nolinkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer`;
+const linkCommand = `nx run-many --target="check","check:scripts" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,@storybook/vue,@storybook/svelte,@storybook/vue3,@storybook/angular,root && nx run root:check:scripts`;
+const nolinkCommand = `nx run-many --target="check","check:scripts" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,root && nx run root:check:scripts`;
 
 export const check: Task = {
   description: 'Typecheck the source code of the monorepo',

From 4e985979cd2d8872b0fd31320fa51add9d0b0546 Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Tue, 15 Aug 2023 03:00:36 -0400
Subject: [PATCH 12/20] remove unnecessary check:scripts target from run-many
 command

---
 scripts/tasks/check.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/tasks/check.ts b/scripts/tasks/check.ts
index bae3ff8d9f6e..a421023ddb12 100644
--- a/scripts/tasks/check.ts
+++ b/scripts/tasks/check.ts
@@ -4,8 +4,8 @@ import { maxConcurrentTasks } from '../utils/maxConcurrentTasks';
 
 const parallel = process.env.CI ? 8 : maxConcurrentTasks;
 
-const linkCommand = `nx run-many --target="check","check:scripts" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,@storybook/vue,@storybook/svelte,@storybook/vue3,@storybook/angular,root && nx run root:check:scripts`;
-const nolinkCommand = `nx run-many --target="check","check:scripts" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,root && nx run root:check:scripts`;
+const linkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,@storybook/vue,@storybook/svelte,@storybook/vue3,@storybook/angular,root && nx run root:check:scripts`;
+const nolinkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,root && nx run root:check:scripts`;
 
 export const check: Task = {
   description: 'Typecheck the source code of the monorepo',

From 44e4a136d6b5d356b646f2e73047ee7397cf23b5 Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Tue, 15 Aug 2023 03:28:37 -0400
Subject: [PATCH 13/20] fix type error in sandbox-parts.ts

---
 scripts/tasks/sandbox-parts.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts
index fadbdf41c901..f0aaa39d825d 100644
--- a/scripts/tasks/sandbox-parts.ts
+++ b/scripts/tasks/sandbox-parts.ts
@@ -390,8 +390,7 @@ export const addStories: Task['run'] = async (
   // Ensure that we match the right stories in the stories directory
   updateStoriesField(
     mainConfig,
-    (await detectLanguage(packageManager)) === SupportedLanguage.JAVASCRIPT,
-    disableDocs
+    (await detectLanguage(packageManager)) === SupportedLanguage.JAVASCRIPT
   );
 
   const isCoreRenderer =

From ad80654a5fbfa749569e8c98417854fc659e3263 Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Tue, 15 Aug 2023 03:38:33 -0400
Subject: [PATCH 14/20] add scripts typecheck to circle ci config

---
 .circleci/config.yml   | 5 +++++
 code/package.json      | 2 --
 scripts/tasks/check.ts | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7d187778889f..5e7cc4a22d24 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -195,6 +195,11 @@ jobs:
           command: |
             cd scripts
             yarn get-template --check
+      - run:
+          name: Type check
+          command: |
+            cd scripts
+            yarn check
       - run:
           name: Run tests
           command: |
diff --git a/code/package.json b/code/package.json
index c929341889a0..df1c2df8d920 100644
--- a/code/package.json
+++ b/code/package.json
@@ -30,7 +30,6 @@
     "changelog": "pr-log --sloppy --cherry-pick",
     "changelog:next": "pr-log --sloppy --since-prerelease",
     "check": "NODE_ENV=production node ../scripts/check-package.js",
-    "check:scripts": "cd ../scripts && ./prepare/check-scripts.ts",
     "ci-tests": "yarn task --task check --no-link --start-from=install && yarn lint && yarn test && cd ../scripts && yarn test",
     "danger": "danger",
     "generate-sandboxes": "ts-node --swc ../scripts/sandbox/generate.ts",
@@ -293,7 +292,6 @@
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
   },
-  "nx": {},
   "pr-log": {
     "skipLabels": [
       "cleanup"
diff --git a/scripts/tasks/check.ts b/scripts/tasks/check.ts
index a421023ddb12..8514d453dde4 100644
--- a/scripts/tasks/check.ts
+++ b/scripts/tasks/check.ts
@@ -4,8 +4,8 @@ import { maxConcurrentTasks } from '../utils/maxConcurrentTasks';
 
 const parallel = process.env.CI ? 8 : maxConcurrentTasks;
 
-const linkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,@storybook/vue,@storybook/svelte,@storybook/vue3,@storybook/angular,root && nx run root:check:scripts`;
-const nolinkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,root && nx run root:check:scripts`;
+const linkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer,@storybook/vue,@storybook/svelte,@storybook/vue3,@storybook/angular`;
+const nolinkCommand = `nx run-many --target="check" --all --parallel=${parallel} --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer`;
 
 export const check: Task = {
   description: 'Typecheck the source code of the monorepo',

From 8a970e91ad3f460ef0d3baf76dc526b19d325c54 Mon Sep 17 00:00:00 2001
From: stilt0n <mattias.leino@arts.cornish.edu>
Date: Tue, 15 Aug 2023 21:56:32 -0400
Subject: [PATCH 15/20] rename stringifyError to getErrorMessage and use it
 more places

---
 scripts/release/pick-patches.ts      |  6 +++---
 scripts/sandbox/utils/git.ts         | 12 ++++++------
 scripts/task.ts                      |  4 ++--
 scripts/ts-to-ts49.ts                |  4 ++--
 scripts/type-utils/errorHandling.ts  |  5 +++++
 scripts/type-utils/stringifyError.ts |  4 ----
 6 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 scripts/type-utils/errorHandling.ts
 delete mode 100644 scripts/type-utils/stringifyError.ts

diff --git a/scripts/release/pick-patches.ts b/scripts/release/pick-patches.ts
index 973cca40f427..4142453c1747 100644
--- a/scripts/release/pick-patches.ts
+++ b/scripts/release/pick-patches.ts
@@ -6,7 +6,7 @@ import ora from 'ora';
 import { setOutput } from '@actions/core';
 import { git } from './utils/git-client';
 import { getUnpickedPRs } from './utils/github-client';
-import { stringifyError } from '../type-utils/stringifyError';
+import { getErrorMessage } from '../type-utils/errorHandling';
 
 program.name('pick-patches').description('Cherry pick patch PRs back to main');
 
@@ -59,14 +59,14 @@ export const run = async (_: unknown) => {
       prSpinner.succeed(`Picked: ${formatPR(pr)}`);
     } catch (pickError) {
       prSpinner.fail(`Failed to automatically pick: ${formatPR(pr)}`);
-      logger.error(stringifyError(pickError));
+      logger.error(getErrorMessage(pickError));
       const abort = ora(`Aborting cherry pick for merge commit: ${pr.mergeCommit}`).start();
       try {
         await git.raw(['cherry-pick', '--abort']);
         abort.stop();
       } catch (abortError) {
         abort.warn(`Failed to abort cherry pick (${pr.mergeCommit})`);
-        logger.error(stringifyError(pickError));
+        logger.error(getErrorMessage(pickError));
       }
       failedCherryPicks.push(pr.mergeCommit);
       prSpinner.info(
diff --git a/scripts/sandbox/utils/git.ts b/scripts/sandbox/utils/git.ts
index e2fff4438364..8eeb91a795ec 100644
--- a/scripts/sandbox/utils/git.ts
+++ b/scripts/sandbox/utils/git.ts
@@ -2,7 +2,7 @@ import fetch from 'node-fetch';
 import { execaCommand } from '../../utils/exec';
 // eslint-disable-next-line import/no-cycle
 import { logger } from '../publish';
-import { stringifyError } from '../../type-utils/stringifyError';
+import { getErrorMessage } from '../../type-utils/errorHandling';
 
 const { version: storybookVersion } = require('../../../code/package.json');
 
@@ -31,9 +31,9 @@ const getTheLastCommitHashThatUpdatedTheSandboxRepo = async (branch: string) =>
 
     return lastCommitHash;
   } catch (error) {
-    if (!(error as Error).message?.includes('Did someone manually push to the sandboxes repo')) {
+    if (!getErrorMessage(error).includes('Did someone manually push to the sandboxes repo')) {
       logger.error(
-        `⚠️  Error getting latest commit message of ${owner}/${repo} on branch ${branch}: ${stringifyError(
+        `⚠️  Error getting latest commit message of ${owner}/${repo} on branch ${branch}: ${getErrorMessage(
           error
         )}`
       );
@@ -88,7 +88,7 @@ export async function commitAllToGit({ cwd, branch }: { cwd: string; branch: str
       gitCommitCommand = `git commit -m "${commitTitle}" -m "${commitBody}"`;
     } catch (err) {
       logger.log(
-        `⚠️  Falling back to a simpler commit message because of an error while trying to get the previous commit hash: ${stringifyError(
+        `⚠️  Falling back to a simpler commit message because of an error while trying to get the previous commit hash: ${getErrorMessage(
           err
         )}`
       );
@@ -100,12 +100,12 @@ export async function commitAllToGit({ cwd, branch }: { cwd: string; branch: str
       cwd,
     });
   } catch (e) {
-    if ((e as Error)?.message?.includes('nothing to commit')) {
+    if (!getErrorMessage(e).includes('nothing to commit')) {
       logger.log(
         `🤷 Git found no changes between previous versions so there is nothing to commit. Skipping publish!`
       );
     } else {
-      logger.error(`🤯 Something went wrong while committing to git: ${stringifyError(e)}`);
+      logger.error(`🤯 Something went wrong while committing to git: ${getErrorMessage(e)}`);
     }
   }
 }
diff --git a/scripts/task.ts b/scripts/task.ts
index fb518454063a..f45879ae4d61 100644
--- a/scripts/task.ts
+++ b/scripts/task.ts
@@ -6,7 +6,7 @@ import { join, resolve } from 'path';
 import { prompt } from 'prompts';
 import { dedent } from 'ts-dedent';
 
-import { stringifyError } from './type-utils/stringifyError';
+import { getErrorMessage } from './type-utils/errorHandling';
 import { CODE_DIRECTORY, JUNIT_DIRECTORY, SANDBOX_DIRECTORY } from './utils/constants';
 import type { OptionValues } from './utils/options';
 import { createOptions, getCommand, getOptionsOrPrompt } from './utils/options';
@@ -476,7 +476,7 @@ async function run() {
         logger.error(`Error running task ${getTaskKey(task)}:`);
         // If it is the last task, we don't need to log the full trace
         if (task === finalTask) {
-          logger.error(stringifyError(err));
+          logger.error(getErrorMessage(err));
         } else {
           logger.error(err);
         }
diff --git a/scripts/ts-to-ts49.ts b/scripts/ts-to-ts49.ts
index e6e64f994663..c8b27463b0de 100644
--- a/scripts/ts-to-ts49.ts
+++ b/scripts/ts-to-ts49.ts
@@ -7,7 +7,7 @@ import * as recast from 'recast';
 import type Babel from '@babel/core';
 import type { File } from '@babel/types';
 import * as t from '@babel/types';
-import { stringifyError } from './type-utils/stringifyError';
+import { getErrorMessage } from './type-utils/errorHandling';
 
 const files = glob.sync('**/*.ts.mdx', {
   absolute: true,
@@ -75,7 +75,7 @@ for (const [, file] of files.entries()) {
       console.log('changed', file);
     }
   } catch (e) {
-    console.error(stringifyError(e));
+    console.error(getErrorMessage(e));
   }
 }
 
diff --git a/scripts/type-utils/errorHandling.ts b/scripts/type-utils/errorHandling.ts
new file mode 100644
index 000000000000..b673cb10e661
--- /dev/null
+++ b/scripts/type-utils/errorHandling.ts
@@ -0,0 +1,5 @@
+/**
+ * Helps make typescript error handling a little less ugly
+ * @returns error.message when possible, stringifies the error as a fallback
+ */
+export const getErrorMessage = (error: unknown): string => (error as any)?.message ?? String(error);
diff --git a/scripts/type-utils/stringifyError.ts b/scripts/type-utils/stringifyError.ts
deleted file mode 100644
index ea43d6844e37..000000000000
--- a/scripts/type-utils/stringifyError.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Makes typescript error handling a little less ugly
- */
-export const stringifyError = (error: unknown) => (error as any)?.message ?? String(error);

From 56da460c11c37a9fd6226ec1ed1f8196bf66e128 Mon Sep 17 00:00:00 2001
From: Kasper Peulen <kasperpeulen@gmail.com>
Date: Wed, 16 Aug 2023 11:31:49 +0200
Subject: [PATCH 16/20] Use invariant for error handling instead

---
 scripts/package.json                |  1 +
 scripts/release/pick-patches.ts     |  8 +++++---
 scripts/sandbox/utils/git.ts        | 21 ++++++++++-----------
 scripts/task.ts                     | 14 +++++---------
 scripts/ts-to-ts49.ts               |  5 +++--
 scripts/type-utils/errorHandling.ts |  5 -----
 scripts/utils/exec.ts               |  2 +-
 scripts/yarn.lock                   |  8 ++++++++
 8 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 100644 scripts/type-utils/errorHandling.ts

diff --git a/scripts/package.json b/scripts/package.json
index e24144a4a7b0..eff165cd7f76 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -176,6 +176,7 @@
     "slash": "^3.0.0",
     "sort-package-json": "^2.0.0",
     "tempy": "^1.0.0",
+    "tiny-invariant": "^1.3.1",
     "trash": "^7.0.0",
     "ts-dedent": "^2.0.0",
     "ts-node": "^10.9.1",
diff --git a/scripts/release/pick-patches.ts b/scripts/release/pick-patches.ts
index 4142453c1747..82f1fe2b4a1a 100644
--- a/scripts/release/pick-patches.ts
+++ b/scripts/release/pick-patches.ts
@@ -6,7 +6,7 @@ import ora from 'ora';
 import { setOutput } from '@actions/core';
 import { git } from './utils/git-client';
 import { getUnpickedPRs } from './utils/github-client';
-import { getErrorMessage } from '../type-utils/errorHandling';
+import invariant from 'tiny-invariant';
 
 program.name('pick-patches').description('Cherry pick patch PRs back to main');
 
@@ -58,15 +58,17 @@ export const run = async (_: unknown) => {
       await git.raw(['cherry-pick', '-m', '1', '--keep-redundant-commits', '-x', pr.mergeCommit]);
       prSpinner.succeed(`Picked: ${formatPR(pr)}`);
     } catch (pickError) {
+      invariant(pickError instanceof Error);
       prSpinner.fail(`Failed to automatically pick: ${formatPR(pr)}`);
-      logger.error(getErrorMessage(pickError));
+      logger.error(pickError.message);
       const abort = ora(`Aborting cherry pick for merge commit: ${pr.mergeCommit}`).start();
       try {
         await git.raw(['cherry-pick', '--abort']);
         abort.stop();
       } catch (abortError) {
+        invariant(abortError instanceof Error);
         abort.warn(`Failed to abort cherry pick (${pr.mergeCommit})`);
-        logger.error(getErrorMessage(pickError));
+        logger.error(abortError.message);
       }
       failedCherryPicks.push(pr.mergeCommit);
       prSpinner.info(
diff --git a/scripts/sandbox/utils/git.ts b/scripts/sandbox/utils/git.ts
index 8eeb91a795ec..84fe02f25cdb 100644
--- a/scripts/sandbox/utils/git.ts
+++ b/scripts/sandbox/utils/git.ts
@@ -1,8 +1,9 @@
 import fetch from 'node-fetch';
+import invariant from 'tiny-invariant';
+
 import { execaCommand } from '../../utils/exec';
 // eslint-disable-next-line import/no-cycle
 import { logger } from '../publish';
-import { getErrorMessage } from '../../type-utils/errorHandling';
 
 const { version: storybookVersion } = require('../../../code/package.json');
 
@@ -28,14 +29,12 @@ const getTheLastCommitHashThatUpdatedTheSandboxRepo = async (branch: string) =>
         `Could not find the last commit hash in the following commit message: "${latestCommitMessage}".\nDid someone manually push to the sandboxes repo?`
       );
     }
-
     return lastCommitHash;
   } catch (error) {
-    if (!getErrorMessage(error).includes('Did someone manually push to the sandboxes repo')) {
+    invariant(error instanceof Error);
+    if (!error.message.includes('Did someone manually push to the sandboxes repo')) {
       logger.error(
-        `⚠️  Error getting latest commit message of ${owner}/${repo} on branch ${branch}: ${getErrorMessage(
-          error
-        )}`
+        `⚠️  Error getting latest commit message of ${owner}/${repo} on branch ${branch}: ${error.message}`
       );
     }
 
@@ -87,10 +86,9 @@ export async function commitAllToGit({ cwd, branch }: { cwd: string; branch: str
       ].join('\n');
       gitCommitCommand = `git commit -m "${commitTitle}" -m "${commitBody}"`;
     } catch (err) {
+      invariant(err instanceof Error);
       logger.log(
-        `⚠️  Falling back to a simpler commit message because of an error while trying to get the previous commit hash: ${getErrorMessage(
-          err
-        )}`
+        `⚠️  Falling back to a simpler commit message because of an error while trying to get the previous commit hash: ${err.message}`
       );
       gitCommitCommand = `git commit -m "${storybookVersion} - ${new Date().toDateString()} - ${currentCommitHash}"`;
     }
@@ -100,12 +98,13 @@ export async function commitAllToGit({ cwd, branch }: { cwd: string; branch: str
       cwd,
     });
   } catch (e) {
-    if (!getErrorMessage(e).includes('nothing to commit')) {
+    invariant(e instanceof Error);
+    if (e.message.includes('nothing to commit')) {
       logger.log(
         `🤷 Git found no changes between previous versions so there is nothing to commit. Skipping publish!`
       );
     } else {
-      logger.error(`🤯 Something went wrong while committing to git: ${getErrorMessage(e)}`);
+      logger.error(`🤯 Something went wrong while committing to git: ${e.message}`);
     }
   }
 }
diff --git a/scripts/task.ts b/scripts/task.ts
index f45879ae4d61..9e18d1f618c2 100644
--- a/scripts/task.ts
+++ b/scripts/task.ts
@@ -6,7 +6,6 @@ import { join, resolve } from 'path';
 import { prompt } from 'prompts';
 import { dedent } from 'ts-dedent';
 
-import { getErrorMessage } from './type-utils/errorHandling';
 import { CODE_DIRECTORY, JUNIT_DIRECTORY, SANDBOX_DIRECTORY } from './utils/constants';
 import type { OptionValues } from './utils/options';
 import { createOptions, getCommand, getOptionsOrPrompt } from './utils/options';
@@ -36,6 +35,7 @@ import {
 } from '../code/lib/cli/src/sandbox-templates';
 
 import { version } from '../code/package.json';
+import invariant from 'tiny-invariant';
 
 const sandboxDir = process.env.SANDBOX_ROOT || SANDBOX_DIRECTORY;
 
@@ -321,16 +321,11 @@ async function runTask(task: Task, details: TemplateDetails, optionValues: Passe
 
     return controller;
   } catch (err) {
+    invariant(err instanceof Error);
     const hasJunitFile = await pathExists(junitFilename);
     // If there's a non-test related error (junit report has not been reported already), we report the general failure in a junit report
     if (junitFilename && !hasJunitFile) {
-      await writeJunitXml(
-        getTaskKey(task),
-        details.key,
-        startTime,
-        err instanceof Error ? err : new Error(String(err)),
-        true
-      );
+      await writeJunitXml(getTaskKey(task), details.key, startTime, err, true);
     }
 
     throw err;
@@ -473,10 +468,11 @@ async function run() {
         });
         if (controller) controllers.push(controller);
       } catch (err) {
+        invariant(err instanceof Error);
         logger.error(`Error running task ${getTaskKey(task)}:`);
         // If it is the last task, we don't need to log the full trace
         if (task === finalTask) {
-          logger.error(getErrorMessage(err));
+          logger.error(err.message);
         } else {
           logger.error(err);
         }
diff --git a/scripts/ts-to-ts49.ts b/scripts/ts-to-ts49.ts
index c8b27463b0de..869d71bfb9a2 100644
--- a/scripts/ts-to-ts49.ts
+++ b/scripts/ts-to-ts49.ts
@@ -7,7 +7,7 @@ import * as recast from 'recast';
 import type Babel from '@babel/core';
 import type { File } from '@babel/types';
 import * as t from '@babel/types';
-import { getErrorMessage } from './type-utils/errorHandling';
+import invariant from 'tiny-invariant';
 
 const files = glob.sync('**/*.ts.mdx', {
   absolute: true,
@@ -75,7 +75,8 @@ for (const [, file] of files.entries()) {
       console.log('changed', file);
     }
   } catch (e) {
-    console.error(getErrorMessage(e));
+    invariant(e instanceof Error);
+    console.error(e.message);
   }
 }
 
diff --git a/scripts/type-utils/errorHandling.ts b/scripts/type-utils/errorHandling.ts
deleted file mode 100644
index b673cb10e661..000000000000
--- a/scripts/type-utils/errorHandling.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Helps make typescript error handling a little less ugly
- * @returns error.message when possible, stringifies the error as a fallback
- */
-export const getErrorMessage = (error: unknown): string => (error as any)?.message ?? String(error);
diff --git a/scripts/utils/exec.ts b/scripts/utils/exec.ts
index fd340322ebb1..74a886189420 100644
--- a/scripts/utils/exec.ts
+++ b/scripts/utils/exec.ts
@@ -67,7 +67,7 @@ export const exec = async (
       }
     }
   } catch (err) {
-    if (!(err as any)?.killed) {
+    if (!(typeof err === 'object' && 'killed' in err && err.killed)) {
       logger.error(chalk.red(`An error occurred while executing: \`${command}\``));
       logger.log(`${errorMessage}\n`);
     }
diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 6fe301173b5d..be6fe9587929 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -3033,6 +3033,7 @@ __metadata:
     slash: ^3.0.0
     sort-package-json: ^2.0.0
     tempy: ^1.0.0
+    tiny-invariant: ^1.3.1
     trash: ^7.0.0
     ts-dedent: ^2.0.0
     ts-loader: ^9.4.2
@@ -15618,6 +15619,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tiny-invariant@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "tiny-invariant@npm:1.3.1"
+  checksum: 5b87c1d52847d9452b60d0dcb77011b459044e0361ca8253bfe7b43d6288106e12af926adb709a6fc28900e3864349b91dad9a4ac93c39aa15f360b26c2ff4db
+  languageName: node
+  linkType: hard
+
 "tmp@npm:~0.2.1":
   version: 0.2.1
   resolution: "tmp@npm:0.2.1"

From 25480c229b3b569849b883dd6f8b70d7920c3544 Mon Sep 17 00:00:00 2001
From: Kasper Peulen <kasperpeulen@gmail.com>
Date: Wed, 16 Aug 2023 12:25:32 +0200
Subject: [PATCH 17/20] Fix TS errors

---
 scripts/get-template.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/get-template.ts b/scripts/get-template.ts
index e6e6b8b22e08..c56418f7a0b4 100644
--- a/scripts/get-template.ts
+++ b/scripts/get-template.ts
@@ -65,7 +65,7 @@ export async function getTemplate(
     } templates to run for the "${scriptName}" task:
       ${potentialTemplateKeys.map((v) => `- ${v}`).join('\n')}
     
-      ${await getParallelismSummary(cadence)}
+      ${await checkParallelism(cadence)}
     `);
   }
 
@@ -81,13 +81,15 @@ const tasksMap = {
   'test-runner': 'test-runner-production',
   // 'test-runner-dev', TODO: bring this back when the task is enabled again
   bench: 'bench',
-};
+} as const;
 
-const tasks = Object.keys(tasksMap);
+type TaskKey = keyof typeof tasksMap;
+
+const tasks = Object.keys(tasksMap) as TaskKey[];
 
 const CONFIG_YML_FILE = '../.circleci/config.yml';
 
-async function checkParallelism(cadence?: Cadence, scriptName?: string) {
+async function checkParallelism(cadence?: Cadence, scriptName?: TaskKey) {
   const configYml = await readFile(CONFIG_YML_FILE, 'utf-8');
   const data = yaml.parse(configYml);
 
@@ -104,7 +106,7 @@ async function checkParallelism(cadence?: Cadence, scriptName?: string) {
     );
     potentialTemplateKeys = cadenceTemplates.map(([k]) => k) as TemplateKey[];
 
-    scripts.forEach((script: keyof typeof tasksMap) => {
+    scripts.forEach((script) => {
       const templateKeysPerScript = potentialTemplateKeys.filter((t) => {
         const currentTemplate = allTemplates[t] as Template;
         return (
@@ -152,7 +154,7 @@ async function checkParallelism(cadence?: Cadence, scriptName?: string) {
   }
 }
 
-type RunOptions = { cadence?: Cadence; task?: string; check: boolean };
+type RunOptions = { cadence?: Cadence; task?: TaskKey; check: boolean };
 async function run({ cadence, task, check }: RunOptions) {
   if (check) {
     if (task && !tasks.includes(task)) {

From 4bb6e27c21d0a6ffc4d89a142319b172aff8091a Mon Sep 17 00:00:00 2001
From: storybook-bot <32066757+storybook-bot@users.noreply.github.com>
Date: Wed, 16 Aug 2023 10:32:36 +0000
Subject: [PATCH 18/20] Write changelog for 7.4.0-alpha.0

---
 CHANGELOG.prerelease.md | 4 ++++
 code/package.json       | 3 ++-
 docs/versions/next.json | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
index 1ccadcfa2d1a..071fd1a3d01a 100644
--- a/CHANGELOG.prerelease.md
+++ b/CHANGELOG.prerelease.md
@@ -1,3 +1,7 @@
+## 7.4.0-alpha.0
+
+- Index: Fix `*.story.*` CSF indexing - [#23852](https://github.com/storybookjs/storybook/pull/23852), thanks [@shilman](https://github.com/shilman)!
+
 ## 7.3.0-alpha.0
 
 - Addons: Deprecate key in addon render function as it is not available anymore - [#23792](https://github.com/storybookjs/storybook/pull/23792), thanks [@kasperpeulen](https://github.com/kasperpeulen)!
diff --git a/code/package.json b/code/package.json
index df1c2df8d920..6a41eaba45b7 100644
--- a/code/package.json
+++ b/code/package.json
@@ -326,5 +326,6 @@
         "Dependency Upgrades"
       ]
     ]
-  }
+  },
+  "deferredNextVersion": "7.4.0-alpha.0"
 }
diff --git a/docs/versions/next.json b/docs/versions/next.json
index ff2e45d46476..13e20888799b 100644
--- a/docs/versions/next.json
+++ b/docs/versions/next.json
@@ -1 +1 @@
-{"version":"7.3.0-alpha.0","info":{"plain":"- Addons: Deprecate key in addon render function as it is not available anymore - [#23792](https://github.com/storybookjs/storybook/pull/23792), thanks [@kasperpeulen](https://github.com/kasperpeulen)!\n- Build: Support Chrome 100, Safari 15 and Firefox 91 - [#23800](https://github.com/storybookjs/storybook/pull/23800), thanks [@kasperpeulen](https://github.com/kasperpeulen)!\n- CLI: Update postinstall to look for addon script - [#23791](https://github.com/storybookjs/storybook/pull/23791), thanks [@Integrayshaun](https://github.com/Integrayshaun)!\n- UI: Update IconButton and add new Toolbar component - [#23795](https://github.com/storybookjs/storybook/pull/23795), thanks [@cdedreuille](https://github.com/cdedreuille)!\n- UI: Upgrade Addon Design - [#23806](https://github.com/storybookjs/storybook/pull/23806), thanks [@cdedreuille](https://github.com/cdedreuille)!\n- Vue3: Don't assign values to all slots (rollback to v7.0.27) - [#23697](https://github.com/storybookjs/storybook/pull/23697), thanks [@kasperpeulen](https://github.com/kasperpeulen)!"}}
+{"version":"7.4.0-alpha.0","info":{"plain":"- Index: Fix `*.story.*` CSF indexing - [#23852](https://github.com/storybookjs/storybook/pull/23852), thanks [@shilman](https://github.com/shilman)!"}}

From d6105ce4dc3408f16002145f2d11d9683557629d Mon Sep 17 00:00:00 2001
From: storybook-bot <32066757+storybook-bot@users.noreply.github.com>
Date: Wed, 16 Aug 2023 10:45:21 +0000
Subject: [PATCH 19/20] Bump version from "7.3.0" to "7.4.0-alpha.0" [skip ci]

---
 code/addons/a11y/package.json                 |   2 +-
 code/addons/actions/package.json              |   2 +-
 code/addons/backgrounds/package.json          |   2 +-
 code/addons/controls/package.json             |   2 +-
 code/addons/docs/package.json                 |   2 +-
 code/addons/essentials/package.json           |   2 +-
 code/addons/gfm/package.json                  |   2 +-
 code/addons/highlight/package.json            |   2 +-
 code/addons/interactions/package.json         |   2 +-
 code/addons/jest/package.json                 |   2 +-
 code/addons/links/package.json                |   2 +-
 code/addons/measure/package.json              |   2 +-
 code/addons/outline/package.json              |   2 +-
 code/addons/storyshots-core/package.json      |   2 +-
 code/addons/storyshots-puppeteer/package.json |   2 +-
 code/addons/storysource/package.json          |   2 +-
 code/addons/themes/package.json               |   2 +-
 code/addons/toolbars/package.json             |   2 +-
 code/addons/viewport/package.json             |   2 +-
 code/builders/builder-manager/package.json    |   2 +-
 code/builders/builder-vite/package.json       |   2 +-
 code/builders/builder-webpack5/package.json   |   2 +-
 code/deprecated/addons/package.json           |   2 +-
 .../channel-postmessage/package.json          |   2 +-
 .../deprecated/channel-websocket/package.json |   2 +-
 code/deprecated/client-api/package.json       |   2 +-
 code/deprecated/core-client/package.json      |   2 +-
 code/deprecated/manager-api-shim/package.json |   2 +-
 code/deprecated/preview-web/package.json      |   2 +-
 code/deprecated/store/package.json            |   2 +-
 code/frameworks/angular/package.json          |   2 +-
 code/frameworks/ember/package.json            |   2 +-
 code/frameworks/html-vite/package.json        |   2 +-
 code/frameworks/html-webpack5/package.json    |   2 +-
 code/frameworks/nextjs/package.json           |   2 +-
 code/frameworks/preact-vite/package.json      |   2 +-
 code/frameworks/preact-webpack5/package.json  |   2 +-
 code/frameworks/react-vite/package.json       |   2 +-
 code/frameworks/react-webpack5/package.json   |   2 +-
 code/frameworks/server-webpack5/package.json  |   2 +-
 code/frameworks/svelte-vite/package.json      |   2 +-
 code/frameworks/svelte-webpack5/package.json  |   2 +-
 code/frameworks/sveltekit/package.json        |   2 +-
 code/frameworks/vue-vite/package.json         |   2 +-
 code/frameworks/vue-webpack5/package.json     |   2 +-
 code/frameworks/vue3-vite/package.json        |   2 +-
 code/frameworks/vue3-webpack5/package.json    |   2 +-
 .../web-components-vite/package.json          |   2 +-
 .../web-components-webpack5/package.json      |   2 +-
 code/lib/channels/package.json                |   2 +-
 code/lib/cli-sb/package.json                  |   2 +-
 code/lib/cli-storybook/package.json           |   2 +-
 code/lib/cli/package.json                     |   2 +-
 code/lib/cli/src/versions.ts                  | 188 +++++++++---------
 code/lib/client-logger/package.json           |   2 +-
 code/lib/codemod/package.json                 |   2 +-
 code/lib/core-common/package.json             |   2 +-
 code/lib/core-events/package.json             |   2 +-
 code/lib/core-server/package.json             |   2 +-
 code/lib/core-webpack/package.json            |   2 +-
 code/lib/csf-plugin/package.json              |   2 +-
 code/lib/csf-tools/package.json               |   2 +-
 code/lib/docs-tools/package.json              |   2 +-
 code/lib/instrumenter/package.json            |   2 +-
 code/lib/manager-api/package.json             |   2 +-
 code/lib/manager-api/src/version.ts           |   2 +-
 code/lib/node-logger/package.json             |   2 +-
 code/lib/postinstall/package.json             |   2 +-
 code/lib/preview-api/package.json             |   2 +-
 code/lib/preview/package.json                 |   2 +-
 code/lib/react-dom-shim/package.json          |   2 +-
 code/lib/router/package.json                  |   2 +-
 code/lib/source-loader/package.json           |   2 +-
 code/lib/telemetry/package.json               |   2 +-
 code/lib/theming/package.json                 |   2 +-
 code/lib/types/package.json                   |   2 +-
 code/package.json                             |   5 +-
 code/presets/create-react-app/package.json    |   2 +-
 code/presets/html-webpack/package.json        |   2 +-
 code/presets/preact-webpack/package.json      |   2 +-
 code/presets/react-webpack/package.json       |   2 +-
 code/presets/server-webpack/package.json      |   2 +-
 code/presets/svelte-webpack/package.json      |   2 +-
 code/presets/vue-webpack/package.json         |   2 +-
 code/presets/vue3-webpack/package.json        |   2 +-
 .../web-components-webpack/package.json       |   2 +-
 code/renderers/html/package.json              |   2 +-
 code/renderers/preact/package.json            |   2 +-
 code/renderers/react/package.json             |   2 +-
 code/renderers/server/package.json            |   2 +-
 code/renderers/svelte/package.json            |   2 +-
 code/renderers/vue/package.json               |   2 +-
 code/renderers/vue3/package.json              |   2 +-
 code/renderers/web-components/package.json    |   2 +-
 code/ui/blocks/package.json                   |   2 +-
 code/ui/components/package.json               |   2 +-
 code/ui/manager/package.json                  |   2 +-
 97 files changed, 191 insertions(+), 192 deletions(-)

diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
index 76c2879662be..bd440e70d2de 100644
--- a/code/addons/a11y/package.json
+++ b/code/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json
index 599324390f73..4e3cbc75e602 100644
--- a/code/addons/actions/package.json
+++ b/code/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",
diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json
index 5cd29033cb26..10444bf1d704 100644
--- a/code/addons/backgrounds/package.json
+++ b/code/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",
diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json
index 74db14cbb69b..1a4e105893f7 100644
--- a/code/addons/controls/package.json
+++ b/code/addons/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
index 08cd404d7cce..2538a9305e4b 100644
--- a/code/addons/docs/package.json
+++ b/code/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json
index 4ff2d5fbac2e..9b9ae7be0b3a 100644
--- a/code/addons/essentials/package.json
+++ b/code/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
diff --git a/code/addons/gfm/package.json b/code/addons/gfm/package.json
index c1ead65d3fff..78cc94ef9fee 100644
--- a/code/addons/gfm/package.json
+++ b/code/addons/gfm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-mdx-gfm",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "GitHub Flavored Markdown in Storybook",
   "keywords": [
     "addon",
diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json
index 9af71e1f7ac8..bb13a1c982b0 100644
--- a/code/addons/highlight/package.json
+++ b/code/addons/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-highlight",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Highlight DOM nodes within your stories",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
index 976799311f75..204138c7be06 100644
--- a/code/addons/interactions/package.json
+++ b/code/addons/interactions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-interactions",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Automate, test and debug user interactions",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json
index 23efeab7cf04..268bd58ea4fa 100644
--- a/code/addons/jest/package.json
+++ b/code/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
diff --git a/code/addons/links/package.json b/code/addons/links/package.json
index 517f0f22b717..197cb689d3ed 100644
--- a/code/addons/links/package.json
+++ b/code/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Link stories together to build demos and prototypes with your UI components",
   "keywords": [
     "addon",
diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json
index 7a0fc23b4d50..7fdc6873ceaa 100644
--- a/code/addons/measure/package.json
+++ b/code/addons/measure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-measure",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Inspect layouts by visualizing the box model",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json
index f793d6a2faf7..d2771ebda9a4 100644
--- a/code/addons/outline/package.json
+++ b/code/addons/outline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-outline",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Outline all elements with CSS to help with layout placement and alignment",
   "keywords": [
     "storybook-addons",
diff --git a/code/addons/storyshots-core/package.json b/code/addons/storyshots-core/package.json
index 8c614e6c8798..095dfb081256 100644
--- a/code/addons/storyshots-core/package.json
+++ b/code/addons/storyshots-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Take a code snapshot of every story automatically with Jest",
   "keywords": [
     "addon",
diff --git a/code/addons/storyshots-puppeteer/package.json b/code/addons/storyshots-puppeteer/package.json
index 13f25f712338..3a4f6f729505 100644
--- a/code/addons/storyshots-puppeteer/package.json
+++ b/code/addons/storyshots-puppeteer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots-puppeteer",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Image snapshots addition to StoryShots based on puppeteer",
   "keywords": [
     "addon",
diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json
index 4395240f6df9..9630f77e0839 100644
--- a/code/addons/storysource/package.json
+++ b/code/addons/storysource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "View a story’s source code to see how it works and paste into your app",
   "keywords": [
     "addon",
diff --git a/code/addons/themes/package.json b/code/addons/themes/package.json
index 24a4e0949118..81e7e322dc61 100644
--- a/code/addons/themes/package.json
+++ b/code/addons/themes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-themes",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Switch between multiple themes for you components in Storybook",
   "keywords": [
     "css",
diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json
index 9f0b44e59328..a6ae4e537ea0 100644
--- a/code/addons/toolbars/package.json
+++ b/code/addons/toolbars/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-toolbars",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Create your own toolbar items that control story rendering",
   "keywords": [
     "addon",
diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json
index 07d2294ab569..063ec8d4c584 100644
--- a/code/addons/viewport/package.json
+++ b/code/addons/viewport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Build responsive components by adjusting Storybook’s viewport size and orientation",
   "keywords": [
     "addon",
diff --git a/code/builders/builder-manager/package.json b/code/builders/builder-manager/package.json
index 704f08fea244..2f3f95ceca0a 100644
--- a/code/builders/builder-manager/package.json
+++ b/code/builders/builder-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-manager",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook manager builder",
   "keywords": [
     "storybook"
diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json
index a35a53364315..3c79b3437d37 100644
--- a/code/builders/builder-vite/package.json
+++ b/code/builders/builder-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-vite",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "A plugin to run and build Storybooks with Vite",
   "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme",
   "bugs": {
diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json
index 66dd30c9ef9a..e557fa0c15fc 100644
--- a/code/builders/builder-webpack5/package.json
+++ b/code/builders/builder-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/builder-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/addons/package.json b/code/deprecated/addons/package.json
index 124fb2622c46..029f64e0f76e 100644
--- a/code/deprecated/addons/package.json
+++ b/code/deprecated/addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addons",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook addons store",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/channel-postmessage/package.json b/code/deprecated/channel-postmessage/package.json
index 2a33d33ba82f..b04f5a7dc3ce 100644
--- a/code/deprecated/channel-postmessage/package.json
+++ b/code/deprecated/channel-postmessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-postmessage",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/channel-websocket/package.json b/code/deprecated/channel-websocket/package.json
index 5f513bdc70ff..6efafe0664e8 100644
--- a/code/deprecated/channel-websocket/package.json
+++ b/code/deprecated/channel-websocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-websocket",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/client-api/package.json b/code/deprecated/client-api/package.json
index a2ab95fb4252..0ff8ba72e988 100644
--- a/code/deprecated/client-api/package.json
+++ b/code/deprecated/client-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-api",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook Client API",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/core-client/package.json b/code/deprecated/core-client/package.json
index 96ee7201f468..616241039520 100644
--- a/code/deprecated/core-client/package.json
+++ b/code/deprecated/core-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-client",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/manager-api-shim/package.json b/code/deprecated/manager-api-shim/package.json
index a9f367cba0c7..69f8e71c402d 100644
--- a/code/deprecated/manager-api-shim/package.json
+++ b/code/deprecated/manager-api-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/api",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook Manager API (facade)",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/preview-web/package.json b/code/deprecated/preview-web/package.json
index fce9fa4f51d6..819c2d8a9c44 100644
--- a/code/deprecated/preview-web/package.json
+++ b/code/deprecated/preview-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preview-web",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/deprecated/store/package.json b/code/deprecated/store/package.json
index b21441db3872..5c774caa8e5e 100644
--- a/code/deprecated/store/package.json
+++ b/code/deprecated/store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/store",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json
index 33eeb0499291..766b16a60549 100644
--- a/code/frameworks/angular/package.json
+++ b/code/frameworks/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.",
   "keywords": [
     "storybook",
diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json
index 8285c171522a..6f59e3182835 100644
--- a/code/frameworks/ember/package.json
+++ b/code/frameworks/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ember",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybookjs/storybook/tree/next/code/frameworks/ember",
   "bugs": {
diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json
index 56570ae8edc1..7c1ad72005ea 100644
--- a/code/frameworks/html-vite/package.json
+++ b/code/frameworks/html-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html-vite",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json
index 828e969b1471..c7bac10b107e 100644
--- a/code/frameworks/html-webpack5/package.json
+++ b/code/frameworks/html-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json
index 912da54f2c89..91a9d71cc053 100644
--- a/code/frameworks/nextjs/package.json
+++ b/code/frameworks/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/nextjs",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Next.js",
   "keywords": [
     "storybook",
diff --git a/code/frameworks/preact-vite/package.json b/code/frameworks/preact-vite/package.json
index 8a467536bca8..e29f546064e6 100644
--- a/code/frameworks/preact-vite/package.json
+++ b/code/frameworks/preact-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact-vite",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Preact and Vite: Develop Preact components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json
index 1284590682ad..7527750e5a2d 100644
--- a/code/frameworks/preact-webpack5/package.json
+++ b/code/frameworks/preact-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Preact: Develop Preact Component in isolation.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json
index f8095686dda1..096f282a7e2f 100644
--- a/code/frameworks/react-vite/package.json
+++ b/code/frameworks/react-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-vite",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for React and Vite: Develop React components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json
index aa22fd8cf3b3..35ad281680b7 100644
--- a/code/frameworks/react-webpack5/package.json
+++ b/code/frameworks/react-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json
index 233761d6cc09..549653a022d1 100644
--- a/code/frameworks/server-webpack5/package.json
+++ b/code/frameworks/server-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
index 8c17ef8a4961..8ff0407f6e4e 100644
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte-vite",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Svelte and Vite: Develop Svelte components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json
index f9a25939c4d3..8b2bef6a0d5e 100644
--- a/code/frameworks/svelte-webpack5/package.json
+++ b/code/frameworks/svelte-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
index 0cc308123d04..60f338e47a41 100644
--- a/code/frameworks/sveltekit/package.json
+++ b/code/frameworks/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/sveltekit",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for SvelteKit",
   "keywords": [
     "storybook",
diff --git a/code/frameworks/vue-vite/package.json b/code/frameworks/vue-vite/package.json
index 70d6f0441e8d..824b75a845d2 100644
--- a/code/frameworks/vue-vite/package.json
+++ b/code/frameworks/vue-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue-vite",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Vue2 and Vite: Develop Vue2 Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/vue-webpack5/package.json b/code/frameworks/vue-webpack5/package.json
index 08245dcbd057..d8567278a331 100644
--- a/code/frameworks/vue-webpack5/package.json
+++ b/code/frameworks/vue-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json
index 8d5665dd5eb0..daf22b53678c 100644
--- a/code/frameworks/vue3-vite/package.json
+++ b/code/frameworks/vue3-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue3-vite",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Vue3 and Vite: Develop Vue3 components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json
index 5f9d00fd3a0e..0c37ea401c5f 100644
--- a/code/frameworks/vue3-webpack5/package.json
+++ b/code/frameworks/vue3-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue3-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json
index fa1035d9edce..5ed614ae340f 100644
--- a/code/frameworks/web-components-vite/package.json
+++ b/code/frameworks/web-components-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components-vite",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for web-components and Vite: Develop Web Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json
index b0769e92ece7..c3d48784d5d8 100644
--- a/code/frameworks/web-components-webpack5/package.json
+++ b/code/frameworks/web-components-webpack5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components-webpack5",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.",
   "keywords": [
     "lit",
diff --git a/code/lib/channels/package.json b/code/lib/channels/package.json
index d57aa997ea4a..380837620aec 100644
--- a/code/lib/channels/package.json
+++ b/code/lib/channels/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channels",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json
index e73d0e6b3014..7af2c0760424 100644
--- a/code/lib/cli-sb/package.json
+++ b/code/lib/cli-sb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sb",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json
index a6f6a2f2205a..ef12a9829dae 100644
--- a/code/lib/cli-storybook/package.json
+++ b/code/lib/cli-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "storybook",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json
index 163f03125d1a..83df1fd56a00 100644
--- a/code/lib/cli/package.json
+++ b/code/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
diff --git a/code/lib/cli/src/versions.ts b/code/lib/cli/src/versions.ts
index a9388238b9c2..097d7a86bd5e 100644
--- a/code/lib/cli/src/versions.ts
+++ b/code/lib/cli/src/versions.ts
@@ -1,97 +1,97 @@
 // auto generated file, do not edit
 export default {
-  '@storybook/addon-a11y': '7.3.0',
-  '@storybook/addon-actions': '7.3.0',
-  '@storybook/addon-backgrounds': '7.3.0',
-  '@storybook/addon-controls': '7.3.0',
-  '@storybook/addon-docs': '7.3.0',
-  '@storybook/addon-essentials': '7.3.0',
-  '@storybook/addon-highlight': '7.3.0',
-  '@storybook/addon-interactions': '7.3.0',
-  '@storybook/addon-jest': '7.3.0',
-  '@storybook/addon-links': '7.3.0',
-  '@storybook/addon-mdx-gfm': '7.3.0',
-  '@storybook/addon-measure': '7.3.0',
-  '@storybook/addon-outline': '7.3.0',
-  '@storybook/addon-themes': '7.3.0',
-  '@storybook/addon-storyshots': '7.3.0',
-  '@storybook/addon-storyshots-puppeteer': '7.3.0',
-  '@storybook/addon-storysource': '7.3.0',
-  '@storybook/addon-toolbars': '7.3.0',
-  '@storybook/addon-viewport': '7.3.0',
-  '@storybook/addons': '7.3.0',
-  '@storybook/angular': '7.3.0',
-  '@storybook/api': '7.3.0',
-  '@storybook/blocks': '7.3.0',
-  '@storybook/builder-manager': '7.3.0',
-  '@storybook/builder-vite': '7.3.0',
-  '@storybook/builder-webpack5': '7.3.0',
-  '@storybook/channel-postmessage': '7.3.0',
-  '@storybook/channel-websocket': '7.3.0',
-  '@storybook/channels': '7.3.0',
-  '@storybook/cli': '7.3.0',
-  '@storybook/client-api': '7.3.0',
-  '@storybook/client-logger': '7.3.0',
-  '@storybook/codemod': '7.3.0',
-  '@storybook/components': '7.3.0',
-  '@storybook/core-client': '7.3.0',
-  '@storybook/core-common': '7.3.0',
-  '@storybook/core-events': '7.3.0',
-  '@storybook/core-server': '7.3.0',
-  '@storybook/core-webpack': '7.3.0',
-  '@storybook/csf-plugin': '7.3.0',
-  '@storybook/csf-tools': '7.3.0',
-  '@storybook/docs-tools': '7.3.0',
-  '@storybook/ember': '7.3.0',
-  '@storybook/html': '7.3.0',
-  '@storybook/html-vite': '7.3.0',
-  '@storybook/html-webpack5': '7.3.0',
-  '@storybook/instrumenter': '7.3.0',
-  '@storybook/manager': '7.3.0',
-  '@storybook/manager-api': '7.3.0',
-  '@storybook/nextjs': '7.3.0',
-  '@storybook/node-logger': '7.3.0',
-  '@storybook/postinstall': '7.3.0',
-  '@storybook/preact': '7.3.0',
-  '@storybook/preact-vite': '7.3.0',
-  '@storybook/preact-webpack5': '7.3.0',
-  '@storybook/preset-create-react-app': '7.3.0',
-  '@storybook/preset-html-webpack': '7.3.0',
-  '@storybook/preset-preact-webpack': '7.3.0',
-  '@storybook/preset-react-webpack': '7.3.0',
-  '@storybook/preset-server-webpack': '7.3.0',
-  '@storybook/preset-svelte-webpack': '7.3.0',
-  '@storybook/preset-vue-webpack': '7.3.0',
-  '@storybook/preset-vue3-webpack': '7.3.0',
-  '@storybook/preset-web-components-webpack': '7.3.0',
-  '@storybook/preview': '7.3.0',
-  '@storybook/preview-api': '7.3.0',
-  '@storybook/preview-web': '7.3.0',
-  '@storybook/react': '7.3.0',
-  '@storybook/react-dom-shim': '7.3.0',
-  '@storybook/react-vite': '7.3.0',
-  '@storybook/react-webpack5': '7.3.0',
-  '@storybook/router': '7.3.0',
-  '@storybook/server': '7.3.0',
-  '@storybook/server-webpack5': '7.3.0',
-  '@storybook/source-loader': '7.3.0',
-  '@storybook/store': '7.3.0',
-  '@storybook/svelte': '7.3.0',
-  '@storybook/svelte-vite': '7.3.0',
-  '@storybook/svelte-webpack5': '7.3.0',
-  '@storybook/sveltekit': '7.3.0',
-  '@storybook/telemetry': '7.3.0',
-  '@storybook/theming': '7.3.0',
-  '@storybook/types': '7.3.0',
-  '@storybook/vue': '7.3.0',
-  '@storybook/vue-vite': '7.3.0',
-  '@storybook/vue-webpack5': '7.3.0',
-  '@storybook/vue3': '7.3.0',
-  '@storybook/vue3-vite': '7.3.0',
-  '@storybook/vue3-webpack5': '7.3.0',
-  '@storybook/web-components': '7.3.0',
-  '@storybook/web-components-vite': '7.3.0',
-  '@storybook/web-components-webpack5': '7.3.0',
-  sb: '7.3.0',
-  storybook: '7.3.0',
+  '@storybook/addon-a11y': '7.4.0-alpha.0',
+  '@storybook/addon-actions': '7.4.0-alpha.0',
+  '@storybook/addon-backgrounds': '7.4.0-alpha.0',
+  '@storybook/addon-controls': '7.4.0-alpha.0',
+  '@storybook/addon-docs': '7.4.0-alpha.0',
+  '@storybook/addon-essentials': '7.4.0-alpha.0',
+  '@storybook/addon-highlight': '7.4.0-alpha.0',
+  '@storybook/addon-interactions': '7.4.0-alpha.0',
+  '@storybook/addon-jest': '7.4.0-alpha.0',
+  '@storybook/addon-links': '7.4.0-alpha.0',
+  '@storybook/addon-mdx-gfm': '7.4.0-alpha.0',
+  '@storybook/addon-measure': '7.4.0-alpha.0',
+  '@storybook/addon-outline': '7.4.0-alpha.0',
+  '@storybook/addon-themes': '7.4.0-alpha.0',
+  '@storybook/addon-storyshots': '7.4.0-alpha.0',
+  '@storybook/addon-storyshots-puppeteer': '7.4.0-alpha.0',
+  '@storybook/addon-storysource': '7.4.0-alpha.0',
+  '@storybook/addon-toolbars': '7.4.0-alpha.0',
+  '@storybook/addon-viewport': '7.4.0-alpha.0',
+  '@storybook/addons': '7.4.0-alpha.0',
+  '@storybook/angular': '7.4.0-alpha.0',
+  '@storybook/api': '7.4.0-alpha.0',
+  '@storybook/blocks': '7.4.0-alpha.0',
+  '@storybook/builder-manager': '7.4.0-alpha.0',
+  '@storybook/builder-vite': '7.4.0-alpha.0',
+  '@storybook/builder-webpack5': '7.4.0-alpha.0',
+  '@storybook/channel-postmessage': '7.4.0-alpha.0',
+  '@storybook/channel-websocket': '7.4.0-alpha.0',
+  '@storybook/channels': '7.4.0-alpha.0',
+  '@storybook/cli': '7.4.0-alpha.0',
+  '@storybook/client-api': '7.4.0-alpha.0',
+  '@storybook/client-logger': '7.4.0-alpha.0',
+  '@storybook/codemod': '7.4.0-alpha.0',
+  '@storybook/components': '7.4.0-alpha.0',
+  '@storybook/core-client': '7.4.0-alpha.0',
+  '@storybook/core-common': '7.4.0-alpha.0',
+  '@storybook/core-events': '7.4.0-alpha.0',
+  '@storybook/core-server': '7.4.0-alpha.0',
+  '@storybook/core-webpack': '7.4.0-alpha.0',
+  '@storybook/csf-plugin': '7.4.0-alpha.0',
+  '@storybook/csf-tools': '7.4.0-alpha.0',
+  '@storybook/docs-tools': '7.4.0-alpha.0',
+  '@storybook/ember': '7.4.0-alpha.0',
+  '@storybook/html': '7.4.0-alpha.0',
+  '@storybook/html-vite': '7.4.0-alpha.0',
+  '@storybook/html-webpack5': '7.4.0-alpha.0',
+  '@storybook/instrumenter': '7.4.0-alpha.0',
+  '@storybook/manager': '7.4.0-alpha.0',
+  '@storybook/manager-api': '7.4.0-alpha.0',
+  '@storybook/nextjs': '7.4.0-alpha.0',
+  '@storybook/node-logger': '7.4.0-alpha.0',
+  '@storybook/postinstall': '7.4.0-alpha.0',
+  '@storybook/preact': '7.4.0-alpha.0',
+  '@storybook/preact-vite': '7.4.0-alpha.0',
+  '@storybook/preact-webpack5': '7.4.0-alpha.0',
+  '@storybook/preset-create-react-app': '7.4.0-alpha.0',
+  '@storybook/preset-html-webpack': '7.4.0-alpha.0',
+  '@storybook/preset-preact-webpack': '7.4.0-alpha.0',
+  '@storybook/preset-react-webpack': '7.4.0-alpha.0',
+  '@storybook/preset-server-webpack': '7.4.0-alpha.0',
+  '@storybook/preset-svelte-webpack': '7.4.0-alpha.0',
+  '@storybook/preset-vue-webpack': '7.4.0-alpha.0',
+  '@storybook/preset-vue3-webpack': '7.4.0-alpha.0',
+  '@storybook/preset-web-components-webpack': '7.4.0-alpha.0',
+  '@storybook/preview': '7.4.0-alpha.0',
+  '@storybook/preview-api': '7.4.0-alpha.0',
+  '@storybook/preview-web': '7.4.0-alpha.0',
+  '@storybook/react': '7.4.0-alpha.0',
+  '@storybook/react-dom-shim': '7.4.0-alpha.0',
+  '@storybook/react-vite': '7.4.0-alpha.0',
+  '@storybook/react-webpack5': '7.4.0-alpha.0',
+  '@storybook/router': '7.4.0-alpha.0',
+  '@storybook/server': '7.4.0-alpha.0',
+  '@storybook/server-webpack5': '7.4.0-alpha.0',
+  '@storybook/source-loader': '7.4.0-alpha.0',
+  '@storybook/store': '7.4.0-alpha.0',
+  '@storybook/svelte': '7.4.0-alpha.0',
+  '@storybook/svelte-vite': '7.4.0-alpha.0',
+  '@storybook/svelte-webpack5': '7.4.0-alpha.0',
+  '@storybook/sveltekit': '7.4.0-alpha.0',
+  '@storybook/telemetry': '7.4.0-alpha.0',
+  '@storybook/theming': '7.4.0-alpha.0',
+  '@storybook/types': '7.4.0-alpha.0',
+  '@storybook/vue': '7.4.0-alpha.0',
+  '@storybook/vue-vite': '7.4.0-alpha.0',
+  '@storybook/vue-webpack5': '7.4.0-alpha.0',
+  '@storybook/vue3': '7.4.0-alpha.0',
+  '@storybook/vue3-vite': '7.4.0-alpha.0',
+  '@storybook/vue3-webpack5': '7.4.0-alpha.0',
+  '@storybook/web-components': '7.4.0-alpha.0',
+  '@storybook/web-components-vite': '7.4.0-alpha.0',
+  '@storybook/web-components-webpack5': '7.4.0-alpha.0',
+  sb: '7.4.0-alpha.0',
+  storybook: '7.4.0-alpha.0',
 };
diff --git a/code/lib/client-logger/package.json b/code/lib/client-logger/package.json
index fadc0e639a30..5639e61de441 100644
--- a/code/lib/client-logger/package.json
+++ b/code/lib/client-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-logger",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json
index b293788964f2..32b03cb05093 100644
--- a/code/lib/codemod/package.json
+++ b/code/lib/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/codemod",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "A collection of codemod scripts written with JSCodeshift",
   "keywords": [
     "storybook"
diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json
index 405f19502739..2adc5188412f 100644
--- a/code/lib/core-common/package.json
+++ b/code/lib/core-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-common",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/lib/core-events/package.json b/code/lib/core-events/package.json
index 26e2ca96b734..286439311dd2 100644
--- a/code/lib/core-events/package.json
+++ b/code/lib/core-events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-events",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Event names used in storybook core",
   "keywords": [
     "storybook"
diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json
index a01154f12c2a..11c591f9fd70 100644
--- a/code/lib/core-server/package.json
+++ b/code/lib/core-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json
index 21acc09bf888..7758519e1414 100644
--- a/code/lib/core-webpack/package.json
+++ b/code/lib/core-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json
index f034ce0a71bb..e4eb2f02a99a 100644
--- a/code/lib/csf-plugin/package.json
+++ b/code/lib/csf-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/csf-plugin",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Enrich CSF files via static analysis",
   "keywords": [
     "storybook"
diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json
index 30a526b9be9f..ba697fb1c766 100644
--- a/code/lib/csf-tools/package.json
+++ b/code/lib/csf-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/csf-tools",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Parse and manipulate CSF and Storybook config files",
   "keywords": [
     "storybook"
diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json
index cb24a06c9f3c..16f98bb651fa 100644
--- a/code/lib/docs-tools/package.json
+++ b/code/lib/docs-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/docs-tools",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Shared utility functions for frameworks to implement docs",
   "keywords": [
     "storybook"
diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json
index c1f1560ec42f..52e4a1cde104 100644
--- a/code/lib/instrumenter/package.json
+++ b/code/lib/instrumenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/instrumenter",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/manager-api/package.json b/code/lib/manager-api/package.json
index fb0f6736b956..cd5660f56075 100644
--- a/code/lib/manager-api/package.json
+++ b/code/lib/manager-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/manager-api",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Core Storybook Manager API & Context",
   "keywords": [
     "storybook"
diff --git a/code/lib/manager-api/src/version.ts b/code/lib/manager-api/src/version.ts
index ca51139550fa..70107dd59789 100644
--- a/code/lib/manager-api/src/version.ts
+++ b/code/lib/manager-api/src/version.ts
@@ -1 +1 @@
-export const version = '7.3.0';
+export const version = '7.4.0-alpha.0';
diff --git a/code/lib/node-logger/package.json b/code/lib/node-logger/package.json
index ef1378e1b6c6..91d9bd320f57 100644
--- a/code/lib/node-logger/package.json
+++ b/code/lib/node-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/node-logger",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/postinstall/package.json b/code/lib/postinstall/package.json
index 7542b3e8a9e2..b99ab6d71c52 100644
--- a/code/lib/postinstall/package.json
+++ b/code/lib/postinstall/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/postinstall",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook addons postinstall utilities",
   "keywords": [
     "api",
diff --git a/code/lib/preview-api/package.json b/code/lib/preview-api/package.json
index b68ebf5e2628..d3b2eb8f8733 100644
--- a/code/lib/preview-api/package.json
+++ b/code/lib/preview-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preview-api",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json
index 9a4f8654f213..436af73290fb 100644
--- a/code/lib/preview/package.json
+++ b/code/lib/preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preview",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/react-dom-shim/package.json b/code/lib/react-dom-shim/package.json
index 01f7e0405f7b..5eb83c154d23 100644
--- a/code/lib/react-dom-shim/package.json
+++ b/code/lib/react-dom-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-dom-shim",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/code/lib/router/package.json b/code/lib/router/package.json
index a535467e630f..22de4497fbcd 100644
--- a/code/lib/router/package.json
+++ b/code/lib/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/router",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Core Storybook Router",
   "keywords": [
     "storybook"
diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json
index 27db17126d76..69696ba896f9 100644
--- a/code/lib/source-loader/package.json
+++ b/code/lib/source-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/source-loader",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Source loader",
   "keywords": [
     "lib",
diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json
index ba2a37473248..2d217c439ffe 100644
--- a/code/lib/telemetry/package.json
+++ b/code/lib/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/telemetry",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Telemetry logging for crash reports and usage statistics",
   "keywords": [
     "storybook"
diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json
index 6ad548dd4dec..0353a3fb2762 100644
--- a/code/lib/theming/package.json
+++ b/code/lib/theming/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/theming",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
diff --git a/code/lib/types/package.json b/code/lib/types/package.json
index 57e0430e4b28..68b73cf8419b 100644
--- a/code/lib/types/package.json
+++ b/code/lib/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/types",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Core Storybook TS Types",
   "keywords": [
     "storybook"
diff --git a/code/package.json b/code/package.json
index 6a41eaba45b7..fea83a390a7d 100644
--- a/code/package.json
+++ b/code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/root",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "private": true,
   "description": "Storybook root",
   "homepage": "https://storybook.js.org/",
@@ -326,6 +326,5 @@
         "Dependency Upgrades"
       ]
     ]
-  },
-  "deferredNextVersion": "7.4.0-alpha.0"
+  }
 }
diff --git a/code/presets/create-react-app/package.json b/code/presets/create-react-app/package.json
index 7cfb70bbbc8d..3cf55e5f42cc 100644
--- a/code/presets/create-react-app/package.json
+++ b/code/presets/create-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-create-react-app",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Create React App preset",
   "keywords": [
     "storybook"
diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json
index 7f55a312452c..3081c900af9e 100644
--- a/code/presets/html-webpack/package.json
+++ b/code/presets/html-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-html-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json
index 6b154449c90e..9a7138652934 100644
--- a/code/presets/preact-webpack/package.json
+++ b/code/presets/preact-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-preact-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Preact: Develop Preact Component in isolation.",
   "keywords": [
     "storybook"
diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json
index 0bdfa1778dc9..bc54d05d5f2c 100644
--- a/code/presets/react-webpack/package.json
+++ b/code/presets/react-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-react-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading",
   "keywords": [
     "storybook"
diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json
index 5e1fe8b38a0c..928f3f034e7c 100644
--- a/code/presets/server-webpack/package.json
+++ b/code/presets/server-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-server-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json
index 2595e56dba71..b3ce5cffea9a 100644
--- a/code/presets/svelte-webpack/package.json
+++ b/code/presets/svelte-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-svelte-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/presets/vue-webpack/package.json b/code/presets/vue-webpack/package.json
index 8bfaf38af9e0..61cb5b8df5ac 100644
--- a/code/presets/vue-webpack/package.json
+++ b/code/presets/vue-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-vue-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json
index 4f2de86f77f1..cb8ccb055bed 100644
--- a/code/presets/vue3-webpack/package.json
+++ b/code/presets/vue3-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-vue3-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
diff --git a/code/presets/web-components-webpack/package.json b/code/presets/web-components-webpack/package.json
index f62b3a6ad1f3..ab4328602caa 100644
--- a/code/presets/web-components-webpack/package.json
+++ b/code/presets/web-components-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preset-web-components-webpack",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.",
   "keywords": [
     "lit",
diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json
index a3a5801e093a..1bff3b40d439 100644
--- a/code/renderers/html/package.json
+++ b/code/renderers/html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook HTML renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json
index adce500b1e92..815a7ef6cc11 100644
--- a/code/renderers/preact/package.json
+++ b/code/renderers/preact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook Preact renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json
index adf57c5716ff..69cb4117ff77 100644
--- a/code/renderers/react/package.json
+++ b/code/renderers/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook React renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json
index d3ab547ddfac..f53a45fac8f9 100644
--- a/code/renderers/server/package.json
+++ b/code/renderers/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook Server renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
index 9c9dde9359ae..d0017068e9cc 100644
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook Svelte renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/vue/package.json b/code/renderers/vue/package.json
index dd97f8355ffd..178410ddfb9a 100644
--- a/code/renderers/vue/package.json
+++ b/code/renderers/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook Vue renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json
index 25287daf4f0e..3fd73ead43eb 100644
--- a/code/renderers/vue3/package.json
+++ b/code/renderers/vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue3",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook Vue 3 renderer",
   "keywords": [
     "storybook"
diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json
index c1557493295c..300e25d46f33 100644
--- a/code/renderers/web-components/package.json
+++ b/code/renderers/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook web-components renderer",
   "keywords": [
     "lit",
diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json
index 949ce897e27a..51c2d5855531 100644
--- a/code/ui/blocks/package.json
+++ b/code/ui/blocks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/blocks",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Storybook Doc Blocks",
   "keywords": [
     "storybook"
diff --git a/code/ui/components/package.json b/code/ui/components/package.json
index ca96517c2435..91bbad237c50 100644
--- a/code/ui/components/package.json
+++ b/code/ui/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/components",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json
index b0be5348605c..ee84f2036237 100644
--- a/code/ui/manager/package.json
+++ b/code/ui/manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/manager",
-  "version": "7.3.0",
+  "version": "7.4.0-alpha.0",
   "description": "Core Storybook UI",
   "keywords": [
     "storybook"

From 7a5ae78a590e6dff55682414a9d4dbfb359ca840 Mon Sep 17 00:00:00 2001
From: John Hunter <john@johnhunter.info>
Date: Wed, 16 Aug 2023 13:53:59 +0100
Subject: [PATCH 20/20] Fix missing closing block

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3df1de0ecbf1..cc26a6bff211 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,8 +10,10 @@ The `yarn start` script will generate a React Vite TypeScript sandbox with a set
 ## Issues
 
 If you run `yarn start` and encounter the following error, try rerunning `yarn start` a second time:
+
 ```sh
 >  NX   ENOENT: no such file or directory, open 'storybook/code/node_modules/nx/package.json'
+```
 
 ## Forked repos