diff --git a/scripts/build/bundler.mjs b/scripts/build/bundler.mjs
index 9968226f1a19..5681f791391f 100644
--- a/scripts/build/bundler.mjs
+++ b/scripts/build/bundler.mjs
@@ -178,7 +178,6 @@ function* getEsbuildOptions(bundle, buildOptions) {
     external: [...(bundle.external ?? [])],
     // Disable esbuild auto discover `tsconfig.json` file
     tsconfig: path.join(__dirname, "empty-tsconfig.json"),
-    mainFields: ["main"],
     target: [...(bundle.esbuildTarget ?? ["node10"])],
     logLevel: "error",
   };
diff --git a/scripts/build/config.mjs b/scripts/build/config.mjs
index 5eb3b417bee5..7b03ed0a467c 100644
--- a/scripts/build/config.mjs
+++ b/scripts/build/config.mjs
@@ -143,7 +143,8 @@ const parsers = [
       })),
     ],
     replaceModule: {
-      [require.resolve("debug")]: require.resolve("./shims/debug.cjs"),
+      [require.resolve("debug/src/browser.js")]:
+        require.resolve("./shims/debug.cjs"),
     },
   },
   {
@@ -197,10 +198,6 @@ const parsers = [
     replaceModule: {
       [require.resolve("parse-entities/decode-entity.browser.js")]:
         require.resolve("parse-entities/decode-entity.js"),
-      // Avoid `node:util` shim
-      [require.resolve("inherits")]: require.resolve(
-        "inherits/inherits_browser.js"
-      ),
     },
   },
   {