Merge pull request #22330 from storybookjs/norbert/fix-21316

Tech: do not generate ESM dist for preset files
storybookjs · May 2, 2023 · 5c3ec1f · 5c3ec1f
2 parents 7a461f3 + 7ad4309
commit 5c3ec1f
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 27 deletions.
diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
@@ -38,7 +38,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./blocks": {
@@ -53,7 +52,6 @@
     },
     "./dist/preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./dist/shims/mdx-react-shim": {

diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json
@@ -30,7 +30,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./manager": {

diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json
@@ -29,7 +29,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./preview.js": {

diff --git a/code/frameworks/preact-vite/package.json b/code/frameworks/preact-vite/package.json
@@ -27,7 +27,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
@@ -31,7 +31,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/vue-vite/package.json b/code/frameworks/vue-vite/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/vue-webpack5/package.json b/code/frameworks/vue-webpack5/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json
@@ -28,7 +28,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json
@@ -31,7 +31,6 @@
     },
     "./preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json
@@ -29,13 +29,11 @@
     "./presets/custom-webpack-preset": {
       "node": "./dist/presets/custom-webpack-preset.js",
       "require": "./dist/presets/custom-webpack-preset.js",
-      "import": "./dist/presets/custom-webpack-preset.mjs",
       "types": "./dist/presets/custom-webpack-preset.d.ts"
     },
     "./presets/preview-preset": {
       "node": "./dist/presets/preview-preset.js",
       "require": "./dist/presets/preview-preset.js",
-      "import": "./dist/presets/preview-preset.mjs",
       "types": "./dist/presets/preview-preset.d.ts"
     },
     "./templates/virtualModuleModernEntry.js.handlebars": "./templates/virtualModuleModernEntry.js.handlebars",

diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json
@@ -29,13 +29,11 @@
     "./dist/presets/babel-cache-preset": {
       "node": "./dist/presets/babel-cache-preset.js",
       "require": "./dist/presets/babel-cache-preset.js",
-      "import": "./dist/presets/babel-cache-preset.mjs",
       "types": "./dist/presets/babel-cache-preset.d.ts"
     },
     "./dist/presets/common-preset": {
       "node": "./dist/presets/common-preset.js",
       "require": "./dist/presets/common-preset.js",
-      "import": "./dist/presets/common-preset.mjs",
       "types": "./dist/presets/common-preset.d.ts"
     },
     "./public/favicon.svg": "./public/favicon.svg",

diff --git a/code/lib/react-dom-shim/package.json b/code/lib/react-dom-shim/package.json
@@ -35,7 +35,6 @@
     },
     "./dist/preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json
@@ -33,7 +33,6 @@
     },
     "./dist/preset": {
       "require": "./dist/preset.js",
-      "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/scripts/prepare/bundle.ts b/scripts/prepare/bundle.ts
@@ -73,11 +73,19 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
     optimized,
   });
 
+  /* preset files are always CJS only.
+   * Generating an ESM file for them anyway is problematic because they often have a reference to `require`.
+   * TSUP generated code will then have a `require` polyfill/guard in the ESM files, which causes issues for webpack.
+   */
+  const nonPresetEntries = allEntries.filter((f) => !path.parse(f).name.includes('preset'));
+
   if (formats.includes('esm')) {
     tasks.push(
       build({
         silent: true,
-        entry: allEntries,
+        treeshake: true,
+        entry: nonPresetEntries,
+        shims: false,
         watch,
         outDir,
         format: ['esm'],