diff --git a/packages/socket.io-client/support/rollup.config.umd.js b/packages/socket.io-client/support/rollup.config.umd.js
index 604ef388da..8d05dca810 100644
--- a/packages/socket.io-client/support/rollup.config.umd.js
+++ b/packages/socket.io-client/support/rollup.config.umd.js
@@ -10,25 +10,15 @@ const banner = `/*!
  * Released under the MIT License.
  */`;
 
-module.exports = {
-  input: "./build/esm/browser-entrypoint.js",
-  output: [
-    {
-      file: "./dist/socket.io.js",
-      format: "umd",
-      name: "io",
-      sourcemap: true,
-      banner,
-    },
-    {
-      file: "./dist/socket.io.min.js",
-      format: "umd",
-      name: "io",
-      sourcemap: true,
-      plugins: [terser()],
-      banner,
-    },
-  ],
+const devBundle = {
+  input: "./build/esm-debug/browser-entrypoint.js",
+  output: {
+    file: "./dist/socket.io.js",
+    format: "umd",
+    name: "io",
+    sourcemap: true,
+    banner,
+  },
   plugins: [
     nodeResolve({
       browser: true,
@@ -41,3 +31,27 @@ module.exports = {
     }),
   ],
 };
+
+const prodBundle = {
+  input: "./build/esm/browser-entrypoint.js",
+  output: {
+    file: "./dist/socket.io.min.js",
+    format: "umd",
+    name: "io",
+    sourcemap: true,
+    plugins: [terser()],
+    banner,
+  },
+  plugins: [
+    nodeResolve({
+      browser: true,
+    }),
+    babel({
+      babelHelpers: "bundled",
+      presets: [["@babel/env"]],
+      plugins: ["@babel/plugin-transform-object-assign"],
+    }),
+  ],
+};
+
+module.exports = [devBundle, prodBundle];
diff --git a/packages/socket.io-client/support/rollup.config.umd.msgpack.js b/packages/socket.io-client/support/rollup.config.umd.msgpack.js
index 48b01dba4d..8fb81a22ea 100644
--- a/packages/socket.io-client/support/rollup.config.umd.msgpack.js
+++ b/packages/socket.io-client/support/rollup.config.umd.msgpack.js
@@ -1,13 +1,15 @@
-const base = require("./rollup.config.umd.js");
+const base = require("./rollup.config.umd.js")[1];
 const alias = require("@rollup/plugin-alias");
+const commonjs = require("@rollup/plugin-commonjs");
 
 module.exports = {
   ...base,
   output: {
-    ...base.output[1],
+    ...base.output,
     file: "./dist/socket.io.msgpack.min.js",
   },
   plugins: [
+    commonjs(),
     alias({
       entries: [
         {