next-bun-compile 0.6.7 → 0.6.8

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   compile,
   generateEntryPoint
-} from "./index-qhwqnqff.js";
+} from "./index-mx555e90.js";
 
 // src/cli.ts
 import { existsSync } from "node:fs";

package/dist/{index-qhwqnqff.js → index-mx555e90.js}

@@ -113,20 +113,9 @@ function generateStubs(standaloneDir) {
 }
 function findTurbopackAliases(standaloneNextDir) {
   const seen = new Map;
-  const ensure = (alias) => {
-    let entry = seen.get(alias);
-    if (!entry) {
-      entry = {
-        target: alias.replace(/-[0-9a-f]{16}$/, ""),
-        subpaths: new Set
-      };
-      seen.set(alias, entry);
-    }
-    return entry;
-  };
   const serverDir = join(standaloneNextDir, "server");
   if (existsSync(serverDir)) {
-    const re = /["']([^"'\s/]+-[0-9a-f]{16})(?:\/([^"'\s]+))?["']/g;
+    const re = /["']([^"'\s/]+-[0-9a-f]{16})(?:\/[^"'\s]+)?["']/g;
     for (const f of walkDir(serverDir)) {
       if (!f.absolutePath.endsWith(".js"))
         continue;
@@ -138,9 +127,10 @@ function findTurbopackAliases(standaloneNextDir) {
       }
       let m;
       while (m = re.exec(content)) {
-        const entry = ensure(m[1]);
-        if (m[2])
-          entry.subpaths.add(m[2]);
+        const alias = m[1];
+        if (seen.has(alias))
+          continue;
+        seen.set(alias, alias.replace(/-[0-9a-f]{16}$/, ""));
       }
     }
   }
@@ -155,20 +145,42 @@ function findTurbopackAliases(standaloneNextDir) {
       try {
         if (!lstatSync(aliasPath).isSymbolicLink())
           continue;
-        seen.set(name, {
-          target: basename(realpathSync(aliasPath)),
-          subpaths: new Set
-        });
+        seen.set(name, basename(realpathSync(aliasPath)));
       } catch {
         continue;
       }
     }
   }
-  return Array.from(seen, ([alias, { target, subpaths }]) => ({
-    alias,
-    target,
-    subpaths: Array.from(subpaths)
-  }));
+  return Array.from(seen, ([alias, target]) => ({ alias, target }));
+}
+function rewriteTurbopackAliases(standaloneNextDir, aliases) {
+  if (aliases.length === 0)
+    return;
+  const serverDir = join(standaloneNextDir, "server");
+  if (!existsSync(serverDir))
+    return;
+  const escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const pattern = new RegExp(`(["'])(` + aliases.map((a) => escape(a.alias)).join("|") + `)(?=[/"'])`, "g");
+  const targetByAlias = new Map(aliases.map((a) => [a.alias, a.target]));
+  let rewritten = 0;
+  for (const f of walkDir(serverDir)) {
+    if (!f.absolutePath.endsWith(".js"))
+      continue;
+    let content;
+    try {
+      content = readFileSync(f.absolutePath, "utf-8");
+    } catch {
+      continue;
+    }
+    const next = content.replace(pattern, (_m, q, alias) => q + targetByAlias.get(alias));
+    if (next !== content) {
+      writeFileSync(f.absolutePath, next);
+      rewritten++;
+    }
+  }
+  if (rewritten > 0) {
+    console.log(`next-bun-compile: Rewrote turbopack-mangled aliases in ${rewritten} server chunks`);
+  }
 }
 function findServerDir(standaloneDir) {
   if (existsSync(join(standaloneDir, "server.js"))) {
@@ -331,6 +343,7 @@ function generateEntryPoint(options) {
   }));
   const standaloneNextDir = join(serverDir, ".next");
   const turbopackAliases = findTurbopackAliases(standaloneNextDir);
+  rewriteTurbopackAliases(standaloneNextDir, turbopackAliases);
   const aliasNames = new Set(turbopackAliases.map((a) => a.alias));
   const runtimeFiles = walkDir(standaloneNextDir).filter((f) => {
     const m = f.relativePath.replace(/\\/g, "/").match(/^node_modules\/([^/]+)/);
@@ -413,7 +426,6 @@ if (Number.isNaN(keepAliveTimeout) || !Number.isFinite(keepAliveTimeout) || keep
 }
 
 const extractions = ${JSON.stringify(assetExtractions)};
-const turbopackAliases = ${JSON.stringify(turbopackAliases.map((a) => [a.alias, a.target, a.subpaths]))};
 async function extractAssets() {
   let n = 0;
   for (const [urlPath, diskPath] of extractions) {
@@ -423,34 +435,6 @@ async function extractAssets() {
     const embedded = assetMap.get(urlPath);
     if (embedded) { await Bun.write(fullPath, Bun.file(embedded)); n++; }
   }
-  for (const [alias, target, subpaths] of turbopackAliases) {
-    const aliasPath = path.join(baseDir, ".next/node_modules", alias);
-    if (!fs.existsSync(aliasPath)) {
-      fs.mkdirSync(aliasPath, { recursive: true });
-      fs.writeFileSync(
-        path.join(aliasPath, "package.json"),
-        JSON.stringify({ name: alias, main: "index.js" })
-      );
-      // Absolute path. bun's compiled-binary resolver won't traverse "."/".."
-      // segments out of a dynamically-written shim (presumably tied to the
-      // module's original compile-time location, not its on-disk path), so
-      // a literal absolute target is the only thing that resolves reliably.
-      fs.writeFileSync(
-        path.join(aliasPath, "index.js"),
-        "module.exports = require(" + JSON.stringify(path.join(baseDir, ".next/node_modules", target)) + ");"
-      );
-    }
-    for (const sub of subpaths) {
-      const subKey = sub.replace(/\\.js$/, "");
-      const shimFile = path.join(aliasPath, subKey + ".js");
-      if (fs.existsSync(shimFile)) continue;
-      fs.mkdirSync(path.dirname(shimFile), { recursive: true });
-      fs.writeFileSync(
-        shimFile,
-        "module.exports = require(" + JSON.stringify(path.join(baseDir, ".next/node_modules", target, subKey)) + ");"
-      );
-    }
-  }
   if (n > 0) console.log(\`Extracted \${n} assets\`);
 }
 

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   __require,
   compile,
   generateEntryPoint
-} from "./index-qhwqnqff.js";
+} from "./index-mx555e90.js";
 
 // src/index.ts
 import { join } from "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-bun-compile",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "Next.js Build Adapter that compiles your app into a Bun single-file executable",
   "type": "module",
   "main": "./dist/index.js",