fix: fix ESM build and types

remarkablemark · remarkablemark · commit 67f1ff5c8f35 · 2026-01-29T23:05:54.000-05:00
Fixes #1317
diff --git a/package.json b/package.json
@@ -29,9 +29,9 @@
   "scripts": {
     "build": "run-s build:*",
     "build:cjs": "tsc",
-    "build:esm": "rollup --config --failAfterWarnings --environment ESM:true",
+    "build:esm": "rollup --config --failAfterWarnings --environment ESM:true && scripts/fix-esm.sh",
     "build:umd": "rollup --config --failAfterWarnings --environment UMD:true",
-    "clean": "rm -rf .nyc_output coverage dist lib esm",
+    "clean": "rm -rf .nyc_output coverage dist esm lib",
     "lint": "eslint .",
     "lint:fix": "npm run lint -- --fix",
     "lint:package": "publint",
diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -20,10 +20,8 @@ const getPlugins = ({ browser = false, minify = false, outDir }) =>
         ],
       }),
     typescript({
-      declaration: false,
-      declarationMap: false,
-      module: 'esnext',
       compilerOptions: {
+        module: 'esnext',
         outDir,
       },
     }),
@@ -42,41 +40,49 @@ const getUMDConfig = (minify = false) => {
       name: 'HTMLDOMParser',
       sourcemap: true,
     },
-    plugins: getPlugins({ browser: true, minify, outDir: 'dist' }),
+    plugins: getPlugins({
+      browser: true,
+      minify,
+      outDir: 'dist',
+    }),
   };
 };
 
 const esmConfigs = [
+  // ESM server
   {
     input: 'src/index.ts',
     output: {
-      file: 'esm/index.mjs',
+      dir: 'esm',
+      entryFileNames: '[name].mjs',
       format: 'es',
+      preserveModules: true,
+      preserveModulesRoot: 'src',
       sourcemap: true,
     },
-    plugins: getPlugins({ browser: false, minify: false, outDir: 'esm' }),
+    plugins: getPlugins({
+      browser: false,
+      minify: false,
+      outDir: 'esm',
+    }),
   },
-  // Client build: use preserveModules for proper module structure
+
+  // ESM client
   {
     input: 'src/client/html-to-dom.ts',
     output: {
       dir: 'esm/client',
-      format: 'es',
       entryFileNames: '[name].mjs',
+      format: 'es',
       preserveModules: true,
       preserveModulesRoot: 'src/client',
       sourcemap: true,
     },
-    plugins: getPlugins({ browser: true, minify: false, outDir: 'esm/client' }),
-  },
-  {
-    input: 'src/server/html-to-dom.ts',
-    output: {
-      file: 'esm/server/html-to-dom.mjs',
-      format: 'es',
-      sourcemap: true,
-    },
-    plugins: getPlugins({ browser: false, minify: false, outDir: 'esm' }),
+    plugins: getPlugins({
+      browser: true,
+      minify: false,
+      outDir: 'esm/client',
+    }),
   },
 ];
 
diff --git a/scripts/fix-esm.sh b/scripts/fix-esm.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# replace `.d.ts` -> `.d.mts`
+find esm -type f -exec perl -i -pe 's/\.d\.ts/\.d\.mts/g' {} +
+
+# rename `.d.ts` -> `.d.mts`
+find esm -name '*.d.ts' -exec bash -c 'mv "$1" "${1%.d.ts}.d.mts"' _ {} \;
+
+# rename `.d.ts.map` -> `.d.mts.map`
+find esm -name '*.d.ts.map' -exec bash -c 'mv "$1" "${1%.d.ts.map}.d.mts.map"' _ {} \;
+
+# delete extraneous files
+rm -rf esm/client/{client,server,index.*,types.*}
