next-bun-compile 0.6.7 → 0.6.9

package/dist/cli.js

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

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

@@ -114,15 +114,12 @@ 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);
+    let e = seen.get(alias);
+    if (!e) {
+      e = { target: alias.replace(/-[0-9a-f]{16}$/, ""), subpaths: new Set };
+      seen.set(alias, e);
     }
-    return entry;
+    return e;
   };
   const serverDir = join(standaloneNextDir, "server");
   if (existsSync(serverDir)) {
@@ -170,6 +167,104 @@ function findTurbopackAliases(standaloneNextDir) {
     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, 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("|") + `)(?:/[^"']+)?)\\1`, "g");
+  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, (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++;
+    }
+  }
+  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"))) {
     return standaloneDir;
@@ -356,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];
@@ -413,7 +510,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) {
@@ -421,35 +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++; }
-  }
-  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 (!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-qhwqnqff.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.7",
+  "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",