next-bun-compile 0.6.8 → 0.6.9

package/dist/cli.js

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

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

@@ -113,9 +113,17 @@ function generateStubs(standaloneDir) {
 }
 function findTurbopackAliases(standaloneNextDir) {
   const seen = new Map;
+  const ensure = (alias) => {
+    let e = seen.get(alias);
+    if (!e) {
+      e = { target: alias.replace(/-[0-9a-f]{16}$/, ""), subpaths: new Set };
+      seen.set(alias, e);
+    }
+    return e;
+  };
   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;
@@ -127,10 +135,9 @@ function findTurbopackAliases(standaloneNextDir) {
       }
       let m;
       while (m = re.exec(content)) {
-        const alias = m[1];
-        if (seen.has(alias))
-          continue;
-        seen.set(alias, alias.replace(/-[0-9a-f]{16}$/, ""));
+        const entry = ensure(m[1]);
+        if (m[2])
+          entry.subpaths.add(m[2]);
       }
     }
   }
@@ -145,23 +152,94 @@ function findTurbopackAliases(standaloneNextDir) {
       try {
         if (!lstatSync(aliasPath).isSymbolicLink())
           continue;
-        seen.set(name, basename(realpathSync(aliasPath)));
+        seen.set(name, {
+          target: basename(realpathSync(aliasPath)),
+          subpaths: new Set
+        });
       } catch {
         continue;
       }
     }
   }
-  return Array.from(seen, ([alias, target]) => ({ alias, target }));
+  return Array.from(seen, ([alias, { target, subpaths }]) => ({
+    alias,
+    target,
+    subpaths: Array.from(subpaths)
+  }));
+}
+function buildCanonicalResolutions(externalRoot, aliases) {
+  const out = new Map;
+  const findFile = (dir, candidates) => {
+    for (const c of candidates) {
+      if (!c)
+        continue;
+      const p = join(dir, c);
+      if (existsSync(p) && statSync(p).isFile())
+        return c.replace(/\\/g, "/");
+    }
+    return null;
+  };
+  const resolveMain = (canonicalDir) => {
+    const pkgPath = join(canonicalDir, "package.json");
+    let main = "index.js";
+    if (existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+        if (typeof pkg.main === "string")
+          main = pkg.main;
+      } catch {}
+    }
+    return findFile(canonicalDir, [
+      main,
+      main + ".js",
+      main + ".cjs",
+      main + ".mjs",
+      join(main, "index.js"),
+      join(main, "index.cjs"),
+      join(main, "index.mjs"),
+      "index.js",
+      "index.cjs",
+      "index.mjs"
+    ]);
+  };
+  const resolveSub = (canonicalDir, sub) => {
+    const stripped = sub.replace(/\.(?:js|cjs|mjs|json)$/, "");
+    return findFile(canonicalDir, [
+      sub,
+      stripped + ".js",
+      stripped + ".mjs",
+      stripped + ".cjs",
+      stripped + ".json",
+      join(stripped, "index.js"),
+      join(stripped, "index.mjs"),
+      join(stripped, "index.cjs")
+    ]);
+  };
+  for (const { alias, target, subpaths } of aliases) {
+    const canonicalDir = join(externalRoot, target);
+    if (!existsSync(canonicalDir))
+      continue;
+    const main = resolveMain(canonicalDir);
+    if (main) {
+      out.set(alias, `.next/node_modules/${target}/${main}`);
+    }
+    for (const sub of subpaths) {
+      const file = resolveSub(canonicalDir, sub);
+      if (file) {
+        out.set(`${alias}/${sub}`, `.next/node_modules/${target}/${file}`);
+      }
+    }
+  }
+  return out;
 }
-function rewriteTurbopackAliases(standaloneNextDir, aliases) {
-  if (aliases.length === 0)
+function rewriteTurbopackAliases(standaloneNextDir, aliases, resolutions) {
+  if (aliases.length === 0 || resolutions.size === 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]));
+  const pattern = new RegExp(`(["'])((?:` + aliases.map((a) => escape(a.alias)).join("|") + `)(?:/[^"']+)?)\\1`, "g");
   let rewritten = 0;
   for (const f of walkDir(serverDir)) {
     if (!f.absolutePath.endsWith(".js"))
@@ -172,7 +250,12 @@ function rewriteTurbopackAliases(standaloneNextDir, aliases) {
     } catch {
       continue;
     }
-    const next = content.replace(pattern, (_m, q, alias) => q + targetByAlias.get(alias));
+    const next = content.replace(pattern, (match, quote, spec) => {
+      const rel = resolutions.get(spec);
+      if (!rel)
+        return match;
+      return `${quote}__NBC_BASE__/${rel}${quote}`;
+    });
     if (next !== content) {
       writeFileSync(f.absolutePath, next);
       rewritten++;
@@ -343,7 +426,6 @@ 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\/([^/]+)/);
@@ -369,6 +451,8 @@ function generateEntryPoint(options) {
   if (externalModules.length > 0) {
     console.log(`next-bun-compile: Embedding ${externalModules.length} external modules for SSR`);
   }
+  const canonicalResolutions = buildCanonicalResolutions(externalDir, turbopackAliases);
+  rewriteTurbopackAliases(standaloneNextDir, turbopackAliases, canonicalResolutions);
   const ctx = JSON.parse(readFileSync(join(distDir, "bun-compile-ctx.json"), "utf-8"));
   const { assetPrefix } = ctx;
   const assetsToEmbed = assetPrefix ? [...publicFiles, ...runtimeFiles] : [...staticFiles, ...publicFiles, ...runtimeFiles];
@@ -433,7 +517,20 @@ async function extractAssets() {
     if (fs.existsSync(fullPath)) continue;
     fs.mkdirSync(path.dirname(fullPath), { recursive: true });
     const embedded = assetMap.get(urlPath);
-    if (embedded) { await Bun.write(fullPath, Bun.file(embedded)); n++; }
+    if (!embedded) continue;
+    // Server chunks may contain __NBC_BASE__ placeholders injected at
+    // build time by rewriteTurbopackAliases. Substitute the real baseDir
+    // before writing so bun resolves the absolute paths at chunk load.
+    if (diskPath.startsWith(".next/server/")) {
+      const text = await Bun.file(embedded).text();
+      if (text.indexOf("__NBC_BASE__") !== -1) {
+        await Bun.write(fullPath, text.split("__NBC_BASE__").join(baseDir));
+        n++;
+        continue;
+      }
+    }
+    await Bun.write(fullPath, Bun.file(embedded));
+    n++;
   }
   if (n > 0) console.log(\`Extracted \${n} assets\`);
 }

package/dist/index.js

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

package/package.json

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