diff --git a/code/lib/builder-manager/src/index.ts b/code/lib/builder-manager/src/index.ts
index 32252d385f7..e25938c5cac 100644
--- a/code/lib/builder-manager/src/index.ts
+++ b/code/lib/builder-manager/src/index.ts
@@ -50,7 +50,7 @@ export const getConfig: ManagerBuilder['getConfig'] = async (options) => {
     write: false,
     ignoreAnnotations: true,
     resolveExtensions: ['.ts', '.tsx', '.mjs', '.js', '.jsx'],
-    outExtension: { '.js': '.mjs' },
+    outExtension: { '.js': '.js' },
     loader: {
       '.js': 'jsx',
       '.png': 'dataurl',
@@ -235,7 +235,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
     filter: (src) => {
       const { ext } = parse(src);
       if (ext) {
-        return ext === '.mjs';
+        return ext === '.js';
       }
       return true;
     },
diff --git a/code/lib/builder-manager/src/utils/files.test.ts b/code/lib/builder-manager/src/utils/files.test.ts
index 2cdb1f0d4c5..c3f1157b11d 100644
--- a/code/lib/builder-manager/src/utils/files.test.ts
+++ b/code/lib/builder-manager/src/utils/files.test.ts
@@ -11,8 +11,8 @@ test('sanitizePath', () => {
   const text = 'demo text';
   const file = {
     path: isWindows
-      ? 'C:\\Users\\username\\Projects\\projectname\\storybook\\node_modules\\@storybook\\addon-x+y\\dist\\manager.mjs'
-      : '/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.mjs',
+      ? 'C:\\Users\\username\\Projects\\projectname\\storybook\\node_modules\\@storybook\\addon-x+y\\dist\\manager.js'
+      : '/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.js',
     contents: Uint8Array.from(Array.from(text).map((letter) => letter.charCodeAt(0))),
     text,
   };
@@ -20,10 +20,10 @@ test('sanitizePath', () => {
 
   expect(location).toEqual(
     isWindows
-      ? 'C:\\Users\\username\\Projects\\projectname\\storybook\\node_modules\\@storybook\\addon-x+y\\dist\\manager.mjs'
-      : '/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.mjs'
+      ? 'C:\\Users\\username\\Projects\\projectname\\storybook\\node_modules\\@storybook\\addon-x+y\\dist\\manager.js'
+      : '/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.js'
   );
   expect(url).toMatchInlineSnapshot(
-    `"./sb-addons/node_modules/%40storybook/addon-x%2By/dist/manager.mjs"`
+    `"./sb-addons/node_modules/%40storybook/addon-x%2By/dist/manager.js"`
   );
 });
diff --git a/code/lib/builder-manager/src/utils/files.ts b/code/lib/builder-manager/src/utils/files.ts
index bca197dcda9..1532fa700c6 100644
--- a/code/lib/builder-manager/src/utils/files.ts
+++ b/code/lib/builder-manager/src/utils/files.ts
@@ -19,7 +19,7 @@ export async function readOrderedFiles(
     }) || []
   );
 
-  const jsFiles = files.filter((file) => file.endsWith('.mjs'));
+  const jsFiles = files.filter((file) => file.endsWith('.js'));
   const cssFiles = files.filter((file) => file.endsWith('.css'));
   return { cssFiles, jsFiles };
 }
diff --git a/code/lib/builder-manager/src/utils/managerEntries.ts b/code/lib/builder-manager/src/utils/managerEntries.ts
index 264aa81366f..c6ac46a0a24 100644
--- a/code/lib/builder-manager/src/utils/managerEntries.ts
+++ b/code/lib/builder-manager/src/utils/managerEntries.ts
@@ -42,7 +42,7 @@ export async function wrapManagerEntries(entrypoints: string[]) {
       const base = relative(process.cwd(), dir);
       const location = join(
         cacheLocation,
-        sanitizeFinal(join(`${sanitizeBase(base)}-${i}`, `${sanitizeBase(name)}-bundle.mjs`))
+        sanitizeFinal(join(`${sanitizeBase(base)}-${i}`, `${sanitizeBase(name)}-bundle.js`))
       );
 
       await fs.ensureFile(location);
diff --git a/code/lib/builder-manager/templates/template.ejs b/code/lib/builder-manager/templates/template.ejs
index 5e51830c97e..462a83649e9 100644
--- a/code/lib/builder-manager/templates/template.ejs
+++ b/code/lib/builder-manager/templates/template.ejs
@@ -27,7 +27,7 @@
     />
     <link rel="stylesheet" href="./sb-common-assets/fonts.css" />
 
-    <link href="./sb-manager/runtime.mjs" rel="modulepreload" />
+    <link href="./sb-manager/runtime.js" rel="modulepreload" />
 
     <% files.js.forEach(file => { %>
     <link href="<%= file %>" rel="modulepreload" />
@@ -57,13 +57,13 @@
     <% } %>
 
     <script type="module">
-      import './sb-manager/runtime.mjs';
+      import './sb-manager/runtime.js';
 
       <% files.js.forEach(file => { %>
       import '<%= file %>';
       <% }); %>
     </script>
 
-    <link href="./sb-preview/runtime.mjs" rel="prefetch" as="script" />
+    <link href="./sb-preview/runtime.js" rel="prefetch" as="script" />
   </body>
 </html>
diff --git a/code/lib/builder-vite/input/iframe.html b/code/lib/builder-vite/input/iframe.html
index 1bca427428b..436864580ab 100644
--- a/code/lib/builder-vite/input/iframe.html
+++ b/code/lib/builder-vite/input/iframe.html
@@ -34,7 +34,7 @@
   <!-- [BODY HTML SNIPPET HERE] -->
   <div id="storybook-root"></div>
   <div id="storybook-docs"></div>
-  <script type="module" src="./sb-preview/runtime.mjs"></script>
+  <script type="module" src="./sb-preview/runtime.js"></script>
   <script type="module" src="/virtual:/@storybook/builder-vite/vite-app.js"></script>
 </body>
 
diff --git a/code/lib/builder-vite/src/build.ts b/code/lib/builder-vite/src/build.ts
index 0de0a0fd528..0a75cc71b3a 100644
--- a/code/lib/builder-vite/src/build.ts
+++ b/code/lib/builder-vite/src/build.ts
@@ -15,7 +15,7 @@ export async function build(options: Options) {
       sourcemap: true,
       rollupOptions: {
         // Do not try to bundle the storybook runtime, it is copied into the output dir after the build.
-        external: ['./sb-preview/runtime.mjs'],
+        external: ['./sb-preview/runtime.js'],
       },
     },
   }).build;
diff --git a/code/lib/builder-vite/src/index.ts b/code/lib/builder-vite/src/index.ts
index 36393ec3c19..614dc87bc56 100644
--- a/code/lib/builder-vite/src/index.ts
+++ b/code/lib/builder-vite/src/index.ts
@@ -92,7 +92,7 @@ export const build: ViteBuilder['build'] = async ({ options }) => {
     filter: (src) => {
       const { ext } = parse(src);
       if (ext) {
-        return ext === '.mjs';
+        return ext === '.js';
       }
       return true;
     },
diff --git a/code/lib/builder-vite/src/plugins/external-globals-plugin.ts b/code/lib/builder-vite/src/plugins/external-globals-plugin.ts
index 60841e22bc9..fe5efe1bce4 100644
--- a/code/lib/builder-vite/src/plugins/external-globals-plugin.ts
+++ b/code/lib/builder-vite/src/plugins/external-globals-plugin.ts
@@ -17,8 +17,8 @@ const replacementMap = new Map([
 ]);
 
 /**
- * This plugin swaps out imports of pre-bundled storybook preview modules for destructures from global
- * variables that are added in runtime.mjs.
+ * This plugin swaps out imports of pre-bundled storybook preview modules for destructured from global
+ * variables that are added in runtime.js.
  *
  * For instance:
  *
diff --git a/code/lib/builder-webpack5/src/index.ts b/code/lib/builder-webpack5/src/index.ts
index 64b13697232..3ae9c53e9a9 100644
--- a/code/lib/builder-webpack5/src/index.ts
+++ b/code/lib/builder-webpack5/src/index.ts
@@ -296,7 +296,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
     filter: (src) => {
       const { ext } = parse(src);
       if (ext) {
-        return ext === '.mjs';
+        return ext === '.js';
       }
       return true;
     },
diff --git a/code/lib/builder-webpack5/templates/preview.ejs b/code/lib/builder-webpack5/templates/preview.ejs
index b394765c541..007f769a3eb 100644
--- a/code/lib/builder-webpack5/templates/preview.ejs
+++ b/code/lib/builder-webpack5/templates/preview.ejs
@@ -44,7 +44,7 @@
     </script>
     <% } %>
     <script type="module">
-      import './sb-preview/runtime.mjs';
+      import './sb-preview/runtime.js';
 
       <% htmlWebpackPlugin.files.js.forEach(file => { %>
       import './<%= file %>';
diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json
index 50d3cf25aa4..3fb73bf8761 100644
--- a/code/lib/preview/package.json
+++ b/code/lib/preview/package.json
@@ -22,19 +22,17 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./dist/runtime.mjs",
-      "require": "./dist/runtime.js",
+      "import": "./dist/runtime.js",
       "types": "./dist/runtime.d.ts"
     },
     "./globals": {
-      "import": "./dist/globals.mjs",
       "require": "./dist/globals.js",
       "types": "./dist/globals.d.ts"
     },
     "./package.json": "./package.json"
   },
   "main": "dist/runtime.js",
-  "module": "dist/runtime.mjs",
+  "module": "dist/runtime.js",
   "types": "dist/runtime.d.ts",
   "typesVersions": {
     "*": {
@@ -54,7 +52,7 @@
   ],
   "scripts": {
     "check": "../../../scripts/node_modules/.bin/tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prep": "../../../scripts/prepare/esm-bundle.ts"
   },
   "devDependencies": {
     "@storybook/channel-postmessage": "7.1.0-alpha.8",
@@ -69,8 +67,10 @@
     "access": "public"
   },
   "bundler": {
-    "entries": [
-      "./src/runtime.ts",
+    "browserEntries": [
+      "./src/runtime.ts"
+    ],
+    "nodeEntries": [
       "./src/globals.ts"
     ]
   },
diff --git a/code/package.json b/code/package.json
index 8340651bb0e..f83da925d84 100644
--- a/code/package.json
+++ b/code/package.json
@@ -259,8 +259,7 @@
     "util": "^0.12.4",
     "vite": "^4.0.0",
     "vite-plugin-turbosnap": "^1.0.1",
-    "wait-on": "^5.2.1",
-    "zx": "^7.0.3"
+    "wait-on": "^5.2.1"
   },
   "dependenciesMeta": {
     "ejs": {
diff --git a/code/ui/components/src/ErrorFormatter/ErrorFormatter.stories.tsx b/code/ui/components/src/ErrorFormatter/ErrorFormatter.stories.tsx
index 4093ea8bb62..f406b790683 100644
--- a/code/ui/components/src/ErrorFormatter/ErrorFormatter.stories.tsx
+++ b/code/ui/components/src/ErrorFormatter/ErrorFormatter.stories.tsx
@@ -22,15 +22,15 @@ type Story = StoryObj<typeof meta>;
 const chromeError = new Error('Rendering Problem');
 chromeError.stack = `Error: Rendering problem
   at render (http://localhost:6006/blocks/src/examples/Button.stories.tsx?t=1677124831161:147:11)
-  at undecoratedStoryFn (http://localhost:6006/sb-preview/runtime.mjs:8255:38)
-  at http://localhost:6006/sb-preview/runtime.mjs:7286:21
-  at http://localhost:6006/sb-preview/runtime.mjs:8225:12
+  at undecoratedStoryFn (http://localhost:6006/sb-preview/runtime.js:8255:38)
+  at http://localhost:6006/sb-preview/runtime.js:7286:21
+  at http://localhost:6006/sb-preview/runtime.js:8225:12
   at jsxDecorator (http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_react_preview.js?v=0fc15c2d:1892:17)
-  at http://localhost:6006/sb-preview/runtime.mjs:7286:21
-  at http://localhost:6006/sb-preview/runtime.mjs:8200:23
-  at http://localhost:6006/sb-preview/runtime.mjs:8225:12
+  at http://localhost:6006/sb-preview/runtime.js:7286:21
+  at http://localhost:6006/sb-preview/runtime.js:8200:23
+  at http://localhost:6006/sb-preview/runtime.js:8225:12
   at wrapper (http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_addon-links_preview.js?v=0fc15c2d:66:12)
-  at http://localhost:6006/sb-preview/runtime.mjs:11942:12`;
+  at http://localhost:6006/sb-preview/runtime.js:11942:12`;
 export const Chrome: Story = {
   args: {
     error: chromeError,
@@ -39,14 +39,14 @@ export const Chrome: Story = {
 
 const safariError = new Error('Rendering Problem');
 safariError.stack = dedent`render@http://localhost:6006/blocks/src/examples/Button.stories.tsx?t=1677211545729:147:26
-  @http://localhost:6006/sb-preview/runtime.mjs:7:17017
+  @http://localhost:6006/sb-preview/runtime.js:7:17017
   jsxDecorator@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_react_preview.js?v=0fc15c2d:1469:22
-  @http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  @http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  @http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  @http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  @http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  @http://localhost:6006/sb-preview/runtime.mjs:7:17017
+  @http://localhost:6006/sb-preview/runtime.js:7:17017
+  @http://localhost:6006/sb-preview/runtime.js:7:17017
+  @http://localhost:6006/sb-preview/runtime.js:7:17017
+  @http://localhost:6006/sb-preview/runtime.js:7:17017
+  @http://localhost:6006/sb-preview/runtime.js:7:17017
+  @http://localhost:6006/sb-preview/runtime.js:7:17017
   renderWithHooks@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/chunk-DEJXHLHT.js?v=0fc15c2d:11346:35
   mountIndeterminateComponent@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/chunk-DEJXHLHT.js?v=0fc15c2d:13419:36
   callCallback2@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/chunk-DEJXHLHT.js?v=0fc15c2d:1079:27
@@ -77,35 +77,35 @@ export const Safari: Story = {
 
 const firefoxError = new Error('Rendering Problem');
 firefoxError.stack = dedent`render@http://localhost:6006/blocks/src/examples/Button.stories.tsx?t=1677211545729:147:17
-  undecoratedStoryFn@http://localhost:6006/sb-preview/runtime.mjs:34:2794
-  hookify/<@http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.mjs:34:1915
+  undecoratedStoryFn@http://localhost:6006/sb-preview/runtime.js:34:2794
+  hookify/<@http://localhost:6006/sb-preview/runtime.js:7:17017
+  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.js:34:1915
   jsxDecorator@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_react_preview.js?v=0fc15c2d:1469:15
-  hookify/<@http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  decorateStory/<@http://localhost:6006/sb-preview/runtime.mjs:34:1463
-  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.mjs:34:1915
+  hookify/<@http://localhost:6006/sb-preview/runtime.js:7:17017
+  decorateStory/<@http://localhost:6006/sb-preview/runtime.js:34:1463
+  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.js:34:1915
   wrapper@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_addon-links_preview.js?v=0fc15c2d:43:225
-  makeDecorator/decorator/<@http://localhost:6006/sb-preview/runtime.mjs:93:3440
-  makeDecorator/<@http://localhost:6006/sb-preview/runtime.mjs:93:3553
-  hookify/<@http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  decorateStory/<@http://localhost:6006/sb-preview/runtime.mjs:34:1463
-  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.mjs:34:1915
+  makeDecorator/decorator/<@http://localhost:6006/sb-preview/runtime.js:93:3440
+  makeDecorator/<@http://localhost:6006/sb-preview/runtime.js:93:3553
+  hookify/<@http://localhost:6006/sb-preview/runtime.js:7:17017
+  decorateStory/<@http://localhost:6006/sb-preview/runtime.js:34:1463
+  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.js:34:1915
   withGrid@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_addon-essentials_backgrounds_preview.js?v=0fc15c2d:116:40
-  hookify/<@http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  decorateStory/<@http://localhost:6006/sb-preview/runtime.mjs:34:1463
-  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.mjs:34:1915
+  hookify/<@http://localhost:6006/sb-preview/runtime.js:7:17017
+  decorateStory/<@http://localhost:6006/sb-preview/runtime.js:34:1463
+  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.js:34:1915
   withBackground@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_addon-essentials_backgrounds_preview.js?v=0fc15c2d:91:46
-  hookify/<@http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  decorateStory/<@http://localhost:6006/sb-preview/runtime.mjs:34:1463
-  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.mjs:34:1915
+  hookify/<@http://localhost:6006/sb-preview/runtime.js:7:17017
+  decorateStory/<@http://localhost:6006/sb-preview/runtime.js:34:1463
+  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.js:34:1915
   withMeasure@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_addon-essentials_measure_preview.js?v=0fc15c2d:201:25
-  hookify/<@http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  decorateStory/<@http://localhost:6006/sb-preview/runtime.mjs:34:1463
-  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.mjs:34:1915
+  hookify/<@http://localhost:6006/sb-preview/runtime.js:7:17017
+  decorateStory/<@http://localhost:6006/sb-preview/runtime.js:34:1463
+  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.js:34:1915
   withOutline@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/@storybook_addon-essentials_outline_preview.js?v=0fc15c2d:443:43
-  hookify/<@http://localhost:6006/sb-preview/runtime.mjs:7:17017
-  decorateStory/<@http://localhost:6006/sb-preview/runtime.mjs:34:1463
-  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.mjs:34:1915
+  hookify/<@http://localhost:6006/sb-preview/runtime.js:7:17017
+  decorateStory/<@http://localhost:6006/sb-preview/runtime.js:34:1463
+  defaultDecorateStory/bindWithContext/<@http://localhost:6006/sb-preview/runtime.js:34:1915
   renderWithHooks@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/chunk-DEJXHLHT.js?v=0fc15c2d:11346:35
   mountIndeterminateComponent@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/chunk-DEJXHLHT.js?v=0fc15c2d:13419:21
   beginWork@http://localhost:6006/node_modules/.cache/.vite-storybook/deps/chunk-DEJXHLHT.js?v=0fc15c2d:14153:22
diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json
index 940c889f89b..5b09a8b288f 100644
--- a/code/ui/manager/package.json
+++ b/code/ui/manager/package.json
@@ -21,26 +21,22 @@
   "license": "MIT",
   "exports": {
     ".": {
-      "node": "./dist/index.js",
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
+      "import": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
     "./dist/runtime": {
-      "require": "./dist/runtime.js",
-      "import": "./dist/runtime.mjs",
+      "import": "./dist/runtime.js",
       "types": "./dist/runtime.d.ts"
     },
     "./dist/globals": {
       "require": "./dist/globals.js",
-      "import": "./dist/globals.mjs",
       "types": "./dist/globals.d.ts"
     },
     "./paths": "./paths.js",
     "./package.json": "./package.json"
   },
   "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
@@ -51,7 +47,7 @@
   ],
   "scripts": {
     "check": "../../../scripts/node_modules/.bin/tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prep": "../../../scripts/prepare/esm-bundle.ts"
   },
   "devDependencies": {
     "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
@@ -95,10 +91,12 @@
   },
   "bundler": {
     "pre": "./scripts/generate-exports-file.ts",
-    "entries": [
+    "browserEntries": [
       "./src/index.tsx",
-      "./src/globals.ts",
       "./src/runtime.ts"
+    ],
+    "nodeEntries": [
+      "./src/globals.ts"
     ]
   },
   "gitHead": "ae73d1c8065f7d614cfe6f3462ae7ca55a0c4e6b"
diff --git a/code/yarn.lock b/code/yarn.lock
index 4ea6cc816ad..926fe358518 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -7141,7 +7141,6 @@ __metadata:
     vite: ^4.0.0
     vite-plugin-turbosnap: ^1.0.1
     wait-on: ^5.2.1
-    zx: ^7.0.3
   dependenciesMeta:
     ejs:
       built: false
@@ -8396,7 +8395,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/minimist@npm:^1.2.0, @types/minimist@npm:^1.2.2":
+"@types/minimist@npm:^1.2.0":
   version: 1.2.2
   resolution: "@types/minimist@npm:1.2.2"
   checksum: f220f57f682bbc3793dab4518f8e2180faa79d8e2589c79614fd777d7182be203ba399020c3a056a115064f5d57a065004a32b522b2737246407621681b24137
@@ -8429,7 +8428,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:>= 8, @types/node@npm:^18.14.2":
+"@types/node@npm:*, @types/node@npm:>= 8":
   version: 18.15.11
   resolution: "@types/node@npm:18.15.11"
   checksum: 670deb1a9daa812dc86b1e8964c0c6b0bef7c32672833c10578c1e5dd2682f2bd99b86d814fde86a5dd4a3da48ea039f41db30a835b245aa7c34c62fa1f23f0d
@@ -8525,13 +8524,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ps-tree@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@types/ps-tree@npm:1.1.2"
-  checksum: d43d5ac375886c37b11f54254578925ff07093b07326898d34eec744bf5721b61b7f3f743b2337e7157a368bb39166e679f26d464620371a0d232509f7f9ac99
-  languageName: node
-  linkType: hard
-
 "@types/pug@npm:^2.0.4":
   version: 2.0.6
   resolution: "@types/pug@npm:2.0.6"
@@ -8878,13 +8870,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/which@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@types/which@npm:2.0.2"
-  checksum: c9a2ca5f1d4ca26381cd8adc7415f9e203fa5bfa2f7855c68bc5b676dc402f9c31bd8c83766bfa73d7aa70a0f4b979e7eb139ceec41a17ac2e1fc08a5bca6ba8
-  languageName: node
-  linkType: hard
-
 "@types/ws@npm:^8, @types/ws@npm:^8.5.1":
   version: 8.5.4
   resolution: "@types/ws@npm:8.5.4"
@@ -12985,13 +12970,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-uri-to-buffer@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "data-uri-to-buffer@npm:4.0.1"
-  checksum: 20a6b93107597530d71d4cb285acee17f66bcdfc03fd81040921a81252f19db27588d87fc8fc69e1950c55cfb0bf8ae40d0e5e21d907230813eb5d5a7f9eb45b
-  languageName: node
-  linkType: hard
-
 "data-urls@npm:^3.0.1, data-urls@npm:^3.0.2":
   version: 3.0.2
   resolution: "data-urls@npm:3.0.2"
@@ -13682,7 +13660,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexer@npm:^0.1.1, duplexer@npm:~0.1.1":
+"duplexer@npm:^0.1.1":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"
   checksum: c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2
@@ -14994,21 +14972,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"event-stream@npm:=3.3.4":
-  version: 3.3.4
-  resolution: "event-stream@npm:3.3.4"
-  dependencies:
-    duplexer: ~0.1.1
-    from: ~0
-    map-stream: ~0.1.0
-    pause-stream: 0.0.11
-    split: 0.3
-    stream-combiner: ~0.0.4
-    through: ~2.3.1
-  checksum: c3ec4e1efc27ab3e73a98923f0a2fa9a19051b87068fea2f3d53d2e4e8c5cfdadf8c8a115b17f3d90b16a46432d396bad91b6e8d0cceb3e449be717a03b75209
-  languageName: node
-  linkType: hard
-
 "event-target-shim@npm:^5.0.0":
   version: 5.0.1
   resolution: "event-target-shim@npm:5.0.1"
@@ -15472,16 +15435,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4":
-  version: 3.2.0
-  resolution: "fetch-blob@npm:3.2.0"
-  dependencies:
-    node-domexception: ^1.0.0
-    web-streams-polyfill: ^3.0.3
-  checksum: 60054bf47bfa10fb0ba6cb7742acec2f37c1f56344f79a70bb8b1c48d77675927c720ff3191fa546410a0442c998d27ab05e9144c32d530d8a52fbe68f843b69
-  languageName: node
-  linkType: hard
-
 "fetch-retry@npm:^5.0.2":
   version: 5.0.4
   resolution: "fetch-retry@npm:5.0.4"
@@ -15851,15 +15804,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"formdata-polyfill@npm:^4.0.10":
-  version: 4.0.10
-  resolution: "formdata-polyfill@npm:4.0.10"
-  dependencies:
-    fetch-blob: ^3.1.2
-  checksum: 5392ec484f9ce0d5e0d52fb5a78e7486637d516179b0eb84d81389d7eccf9ca2f663079da56f761355c0a65792810e3b345dc24db9a8bbbcf24ef3c8c88570c6
-  languageName: node
-  linkType: hard
-
 "formik@npm:^2.2.9":
   version: 2.2.9
   resolution: "formik@npm:2.2.9"
@@ -15907,13 +15851,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"from@npm:~0":
-  version: 0.1.7
-  resolution: "from@npm:0.1.7"
-  checksum: 3aab5aea8fe8e1f12a5dee7f390d46a93431ce691b6222dcd5701c5d34378e51ca59b44967da1105a0f90fcdf5d7629d963d51e7ccd79827d19693bdcfb688d4
-  languageName: node
-  linkType: hard
-
 "fs-constants@npm:^1.0.0":
   version: 1.0.0
   resolution: "fs-constants@npm:1.0.0"
@@ -20894,13 +20831,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"map-stream@npm:~0.1.0":
-  version: 0.1.0
-  resolution: "map-stream@npm:0.1.0"
-  checksum: 7dd6debe511c1b55d9da75e1efa65a28b1252a2d8357938d2e49b412713c478efbaefb0cdf0ee0533540c3bf733e8f9f71e1a15aa0fe74bf71b64e75bf1576bd
-  languageName: node
-  linkType: hard
-
 "map-visit@npm:^1.0.0":
   version: 1.0.0
   resolution: "map-visit@npm:1.0.0"
@@ -21935,7 +21865,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8":
+"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
   checksum: 19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6
@@ -22446,13 +22376,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-domexception@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "node-domexception@npm:1.0.0"
-  checksum: 5e5d63cda29856402df9472335af4bb13875e1927ad3be861dc5ebde38917aecbf9ae337923777af52a48c426b70148815e890a5d72760f1b4d758cc671b1a2b
-  languageName: node
-  linkType: hard
-
 "node-fetch-native@npm:^1.0.2":
   version: 1.0.2
   resolution: "node-fetch-native@npm:1.0.2"
@@ -22474,17 +22397,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:3.2.10":
-  version: 3.2.10
-  resolution: "node-fetch@npm:3.2.10"
-  dependencies:
-    data-uri-to-buffer: ^4.0.0
-    fetch-blob: ^3.1.4
-    formdata-polyfill: ^4.0.10
-  checksum: b9b754517df2dd55d16eaa6be681d277fe772ea0ac61e67ca4aef8f5154baf8581e2fd32c03cb8c5fdefa07dc24cafdb327b2033715edd9e4abc6883e20650c0
-  languageName: node
-  linkType: hard
-
 "node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7":
   version: 2.6.9
   resolution: "node-fetch@npm:2.6.9"
@@ -23945,15 +23857,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pause-stream@npm:0.0.11":
-  version: 0.0.11
-  resolution: "pause-stream@npm:0.0.11"
-  dependencies:
-    through: ~2.3
-  checksum: 86f12c64cdaaa8e45ebaca4e39a478e1442db8b4beabc280b545bfaf79c0e2f33c51efb554aace5c069cc441c7b924ba484837b345eaa4ba6fc940d62f826802
-  languageName: node
-  linkType: hard
-
 "peek-stream@npm:^1.1.0":
   version: 1.1.3
   resolution: "peek-stream@npm:1.1.3"
@@ -24752,17 +24655,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ps-tree@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "ps-tree@npm:1.2.0"
-  dependencies:
-    event-stream: =3.3.4
-  bin:
-    ps-tree: ./bin/ps-tree.js
-  checksum: 9d1c159e0890db5aa05f84d125193c2190a6c4ecd457596fd25e7611f8f747292a846459dcc0244e27d45529d4cea6d1010c3a2a087fad02624d12fdb7d97c22
-  languageName: node
-  linkType: hard
-
 "pseudomap@npm:^1.0.2":
   version: 1.0.2
   resolution: "pseudomap@npm:1.0.2"
@@ -27545,15 +27437,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split@npm:0.3":
-  version: 0.3.3
-  resolution: "split@npm:0.3.3"
-  dependencies:
-    through: 2
-  checksum: 88c09b1b4de84953bf5d6c153123a1fbb20addfea9381f70d27b4eb6b2bfbadf25d313f8f5d3fd727d5679b97bfe54da04766b91010f131635bf49e51d5db3fc
-  languageName: node
-  linkType: hard
-
 "split@npm:^1.0.0":
   version: 1.0.1
   resolution: "split@npm:1.0.1"
@@ -27678,15 +27561,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"stream-combiner@npm:~0.0.4":
-  version: 0.0.4
-  resolution: "stream-combiner@npm:0.0.4"
-  dependencies:
-    duplexer: ~0.1.1
-  checksum: 8075a94c0eb0f20450a8236cb99d4ce3ea6e6a4b36d8baa7440b1a08cde6ffd227debadffaecd80993bd334282875d0e927ab5b88484625e01970dd251004ff5
-  languageName: node
-  linkType: hard
-
 "stream-events@npm:^1.0.5":
   version: 1.0.5
   resolution: "stream-events@npm:1.0.5"
@@ -28452,7 +28326,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8, through@npm:~2.3, through@npm:~2.3.1":
+"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8":
   version: 2.3.8
   resolution: "through@npm:2.3.8"
   checksum: 4b09f3774099de0d4df26d95c5821a62faee32c7e96fb1f4ebd54a2d7c11c57fe88b0a0d49cf375de5fee5ae6bf4eb56dbbf29d07366864e2ee805349970d3cc
@@ -30380,13 +30254,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-streams-polyfill@npm:^3.0.3":
-  version: 3.2.1
-  resolution: "web-streams-polyfill@npm:3.2.1"
-  checksum: 70ed6b5708e14afa2ab699221ea197d7c68ec0c8274bbe0181aecc5ba636ca27cbd383d2049f0eb9d529e738f5c088825502b317f3df24d18a278e4cc9a10e8b
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^3.0.0":
   version: 3.0.1
   resolution: "webidl-conversions@npm:3.0.1"
@@ -30634,15 +30501,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpod@npm:^0":
-  version: 0.0.2
-  resolution: "webpod@npm:0.0.2"
-  bin:
-    webpod: dist/index.js
-  checksum: 92b5920be7a8a080839221ce70e5d18f5cac86455af9ee20a54e77ee5c577746981c6d70afc2510df15061d3e3ea8c47f9fc36c2be01f47fd7630db1c9e5cba0
-  languageName: node
-  linkType: hard
-
 "websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4":
   version: 0.7.4
   resolution: "websocket-driver@npm:0.7.4"
@@ -31130,7 +30988,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.0.0, yaml@npm:^2.2.1":
+"yaml@npm:^2.0.0":
   version: 2.2.1
   resolution: "yaml@npm:2.2.1"
   checksum: 12f3a73f2d28970d146184b1425d32a63f65e9f4840eeab09155a4d23a15be8401ac7a3a09b6626895ccf853c1b9069450957c0ad82cfe591369aaa58d1593d6
@@ -31306,27 +31164,3 @@ __metadata:
   checksum: 3c7830cdd3378667e058ffdb4cf2bb78ac5711214e2725900873accb23f3dfe5f9e7e5a06dcdc5f29605da976fc45c26d9a13ca334d6eea2245a15e77b8fc06e
   languageName: node
   linkType: hard
-
-"zx@npm:^7.0.3":
-  version: 7.2.1
-  resolution: "zx@npm:7.2.1"
-  dependencies:
-    "@types/fs-extra": ^11.0.1
-    "@types/minimist": ^1.2.2
-    "@types/node": ^18.14.2
-    "@types/ps-tree": ^1.1.2
-    "@types/which": ^2.0.2
-    chalk: ^5.2.0
-    fs-extra: ^11.1.0
-    globby: ^13.1.3
-    minimist: ^1.2.8
-    node-fetch: 3.2.10
-    ps-tree: ^1.2.0
-    webpod: ^0
-    which: ^3.0.0
-    yaml: ^2.2.1
-  bin:
-    zx: build/cli.js
-  checksum: 8a4b32b65b6f8b4113f3470d55337d522133c30aed395d1784d7f81e9d9f9ea62fcbc30f0d4b5e7fd7f7c8b60a848cb9458378b51c9d8a576a77fa1871bcfc82
-  languageName: node
-  linkType: hard
diff --git a/scripts/prepare/bundle.ts b/scripts/prepare/bundle.ts
index eebb57b50d2..4874075b6ff 100755
--- a/scripts/prepare/bundle.ts
+++ b/scripts/prepare/bundle.ts
@@ -64,6 +64,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
     ...Object.keys(dependencies || {}),
     ...Object.keys(peerDependencies || {}),
   ];
+
   const allEntries = entries.map((e: string) => slash(join(cwd, e)));
 
   const { dtsBuild, dtsConfig, tsConfigExists } = await getDTSConfigs({
@@ -81,7 +82,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
         outDir,
         format: ['esm'],
         target: 'chrome100',
-        clean: !watch,
+        clean: false,
         ...(dtsBuild === 'esm' ? dtsConfig : {}),
         platform: platform || 'browser',
         esbuildPlugins: [
@@ -114,7 +115,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
         target: 'node16',
         ...(dtsBuild === 'cjs' ? dtsConfig : {}),
         platform: 'node',
-        clean: !watch,
+        clean: false,
         external: externals,
 
         esbuildOptions: (c) => {
@@ -127,12 +128,12 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
     );
   }
 
-  await Promise.all(tasks);
-
   if (tsConfigExists && !optimized) {
-    await Promise.all(entries.map(generateDTSMapperFile));
+    tasks.push(...entries.map(generateDTSMapperFile));
   }
 
+  await Promise.all(tasks);
+
   if (post) {
     await exec(
       `node -r ${__dirname}/../node_modules/esbuild-register/register.js ${post}`,
diff --git a/scripts/prepare/esm-bundle.ts b/scripts/prepare/esm-bundle.ts
new file mode 100755
index 00000000000..0f6afc4f1ce
--- /dev/null
+++ b/scripts/prepare/esm-bundle.ts
@@ -0,0 +1,223 @@
+#!/usr/bin/env ../../node_modules/.bin/ts-node
+
+import * as fs from 'fs-extra';
+import path, { dirname, join, relative } from 'path';
+import type { Options } from 'tsup';
+import type { PackageJson } from 'type-fest';
+import { build } from 'tsup';
+import aliasPlugin from 'esbuild-plugin-alias';
+import dedent from 'ts-dedent';
+import slash from 'slash';
+import { exec } from '../utils/exec';
+
+/* TYPES */
+
+type BundlerConfig = {
+  entries: string[];
+  externals: string[];
+  pre: string;
+  post: string;
+};
+type PackageJsonWithBundlerConfig = PackageJson & {
+  bundler: BundlerConfig;
+};
+type DtsConfigSection = Pick<Options, 'dts' | 'tsconfig'>;
+
+/* MAIN */
+
+const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
+  const {
+    name,
+    dependencies,
+    peerDependencies,
+    bundler: { browserEntries = [], nodeEntries = [], externals: extraExternals = [], pre, post },
+  } = (await fs.readJson(join(cwd, 'package.json'))) as PackageJsonWithBundlerConfig;
+
+  if (pre) {
+    await exec(`node -r ${__dirname}/../node_modules/esbuild-register/register.js ${pre}`, { cwd });
+  }
+
+  const reset = hasFlag(flags, 'reset');
+  const watch = hasFlag(flags, 'watch');
+  const optimized = hasFlag(flags, 'optimized');
+
+  if (reset) {
+    await fs.emptyDir(join(process.cwd(), 'dist'));
+  }
+
+  const tasks: Promise<any>[] = [];
+
+  const outDir = join(process.cwd(), 'dist');
+  const externals = [
+    name,
+    ...extraExternals,
+    ...Object.keys(dependencies || {}),
+    ...Object.keys(peerDependencies || {}),
+  ];
+
+  const { tsConfigExists } = await getDTSConfigs({
+    entries: [],
+    optimized,
+  });
+
+  if (browserEntries.length > 0) {
+    const allEntries = browserEntries.map((e: string) => slash(join(cwd, e)));
+
+    const { dtsBuild, dtsConfig } = await getDTSConfigs({
+      entries: allEntries,
+      optimized,
+    });
+
+    tasks.push(
+      build({
+        silent: true,
+        entry: allEntries,
+        watch,
+        outDir,
+        format: ['esm'],
+        outExtension: () => ({
+          js: '.js',
+        }),
+        target: 'chrome100',
+        clean: false,
+        ...(dtsBuild ? dtsConfig : {}),
+        platform: 'browser',
+        esbuildPlugins: [
+          aliasPlugin({
+            process: path.resolve('../node_modules/process/browser.js'),
+            util: path.resolve('../node_modules/util/util.js'),
+          }),
+        ],
+        external: externals,
+
+        esbuildOptions: (c) => {
+          /* eslint-disable no-param-reassign */
+          c.conditions = ['module'];
+          c.platform = 'browser';
+          Object.assign(c, getESBuildOptions(optimized));
+          /* eslint-enable no-param-reassign */
+        },
+      })
+    );
+  }
+
+  if (nodeEntries.length > 0) {
+    const allEntries = nodeEntries.map((e: string) => slash(join(cwd, e)));
+
+    const { dtsBuild, dtsConfig } = await getDTSConfigs({
+      entries: allEntries,
+      optimized,
+    });
+
+    tasks.push(
+      build({
+        silent: true,
+        entry: allEntries,
+        watch,
+        outDir,
+        format: ['cjs'],
+        outExtension: () => ({
+          js: '.js',
+        }),
+        target: 'node16',
+        clean: false,
+        ...(dtsBuild ? dtsConfig : {}),
+        platform: 'node',
+        esbuildPlugins: [
+          aliasPlugin({
+            process: path.resolve('../node_modules/process/browser.js'),
+            util: path.resolve('../node_modules/util/util.js'),
+          }),
+        ],
+        external: externals,
+
+        esbuildOptions: (c) => {
+          /* eslint-disable no-param-reassign */
+          c.platform = 'node';
+          Object.assign(c, getESBuildOptions(optimized));
+          /* eslint-enable no-param-reassign */
+        },
+      })
+    );
+  }
+
+  if (tsConfigExists && !optimized) {
+    tasks.push(...[...browserEntries, ...nodeEntries].map(generateDTSMapperFile));
+  }
+
+  await Promise.all(tasks);
+
+  if (post) {
+    await exec(
+      `node -r ${__dirname}/../node_modules/esbuild-register/register.js ${post}`,
+      { cwd },
+      { debug: true }
+    );
+  }
+
+  console.log('done');
+};
+
+/* UTILS */
+
+async function getDTSConfigs({ entries, optimized }: { entries: string[]; optimized: boolean }) {
+  const tsConfigPath = join(cwd, 'tsconfig.json');
+  const tsConfigExists = await fs.pathExists(tsConfigPath);
+
+  const dtsBuild = optimized && tsConfigExists;
+
+  const dtsConfig: DtsConfigSection = {
+    tsconfig: tsConfigPath,
+    dts: {
+      entry: entries,
+      resolve: true,
+    },
+  };
+
+  return { dtsBuild, dtsConfig, tsConfigExists };
+}
+
+function getESBuildOptions(optimized: boolean) {
+  return {
+    logLevel: 'error',
+    legalComments: 'none',
+    minifyWhitespace: optimized,
+    minifyIdentifiers: false,
+    minifySyntax: optimized,
+  };
+}
+
+async function generateDTSMapperFile(file: string) {
+  const { name: entryName, dir } = path.parse(file);
+
+  const pathName = join(process.cwd(), dir.replace('./src', 'dist'), `${entryName}.d.ts`);
+  const srcName = join(process.cwd(), file);
+  const rel = relative(dirname(pathName), dirname(srcName)).split(path.sep).join(path.posix.sep);
+
+  await fs.ensureFile(pathName);
+  await fs.writeFile(
+    pathName,
+    dedent`
+      // dev-mode
+      export * from '${rel}/${entryName}';
+    `,
+    { encoding: 'utf-8' }
+  );
+}
+
+const hasFlag = (flags: string[], name: string) => !!flags.find((s) => s.startsWith(`--${name}`));
+
+/* SELF EXECUTION */
+
+const flags = process.argv.slice(2);
+const cwd = process.cwd();
+
+run({ cwd, flags }).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.stack);
+  }
+  process.exit(1);
+});