diff --git a/esbuild.config.js b/esbuild.config.js
index b2d33770cc..887e31e63e 100644
--- a/esbuild.config.js
+++ b/esbuild.config.js
@@ -75,6 +75,10 @@ const baseConfig = {
   write: true,
 };
 
+const commonAliases = {
+  punycode: 'punycode/',
+};
+
 const cliConfig = {
   ...baseConfig,
   banner: {
@@ -88,6 +92,7 @@ const cliConfig = {
   plugins: createWasmPlugins(),
   alias: {
     'is-in-ci': path.resolve(__dirname, 'packages/cli/src/patches/is-in-ci.ts'),
+    ...commonAliases,
   },
   metafile: true,
 };
@@ -103,6 +108,7 @@ const a2aServerConfig = {
     'process.env.CLI_VERSION': JSON.stringify(pkg.version),
   },
   plugins: createWasmPlugins(),
+  alias: commonAliases,
 };
 
 Promise.allSettled([
diff --git a/package-lock.json b/package-lock.json
index 6982e9f9f1..940d22dc03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
         "ink": "npm:@jrichman/ink@6.4.10",
         "latest-version": "^9.0.0",
         "proper-lockfile": "^4.1.2",
+        "punycode": "^2.3.1",
         "simple-git": "^3.28.0"
       },
       "bin": {
@@ -13547,7 +13548,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
diff --git a/package.json b/package.json
index c69537eecc..eb8f75edb3 100644
--- a/package.json
+++ b/package.json
@@ -129,6 +129,7 @@
     "ink": "npm:@jrichman/ink@6.4.10",
     "latest-version": "^9.0.0",
     "proper-lockfile": "^4.1.2",
+    "punycode": "^2.3.1",
     "simple-git": "^3.28.0"
   },
   "optionalDependencies": {
diff --git a/packages/vscode-ide-companion/esbuild.js b/packages/vscode-ide-companion/esbuild.js
index 468ba34825..228eb27cdf 100644
--- a/packages/vscode-ide-companion/esbuild.js
+++ b/packages/vscode-ide-companion/esbuild.js
@@ -49,6 +49,9 @@ async function main() {
     define: {
       'import.meta.url': 'import_meta.url',
     },
+    alias: {
+      punycode: 'punycode/',
+    },
     plugins: [
       /* add to the end of plugins array */
       esbuildProblemMatcherPlugin,