next-bun-compile 0.6.12 → 0.7.0

package/README.md

@@ -8,6 +8,8 @@ One command. One binary. No runtime dependencies.
 next build  # → ./server (single executable with embedded assets)
 ```
 
+**📖 Docs: [ramonmalcolm10.github.io/next-bun-compile](https://ramonmalcolm10.github.io/next-bun-compile/)**
+
 ## Requirements
 
 - [Bun](https://bun.sh) >= 1.3

package/dist/cli.js

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

package/dist/{index-7dvf3g60.js → index-np1qb2b3.js}

@@ -46,24 +46,56 @@ function toVarName(filePath) {
   const safe = filePath.replace(/[^a-zA-Z0-9]/g, "_").slice(0, 40);
   return `asset_${safe}_${hash}`;
 }
-function findPackageDirs(nodeModulesDir, pkg) {
+function findPackageDirs(standaloneDir, pkg) {
   const dirs = [];
-  const direct = join(nodeModulesDir, pkg);
-  if (existsSync(direct))
-    dirs.push(direct);
   const prefix = pkg.startsWith("@") ? pkg.split("/")[0] + "+" + pkg.split("/")[1] : pkg;
-  for (const store of [".bun", ".pnpm"]) {
-    const storeDir = join(nodeModulesDir, store);
-    if (!existsSync(storeDir))
-      continue;
-    for (const entry of readdirSync(storeDir)) {
-      if (!entry.startsWith(prefix + "@"))
+  const seen = new Set;
+  const checkNodeModules = (nodeModulesDir) => {
+    const direct = join(nodeModulesDir, pkg);
+    if (existsSync(direct) && !seen.has(direct)) {
+      seen.add(direct);
+      dirs.push(direct);
+    }
+    for (const store of [".bun", ".pnpm"]) {
+      const storeDir = join(nodeModulesDir, store);
+      if (!existsSync(storeDir))
+        continue;
+      let entries;
+      try {
+        entries = readdirSync(storeDir);
+      } catch {
         continue;
-      const hoisted = join(storeDir, entry, "node_modules", pkg);
-      if (existsSync(hoisted))
-        dirs.push(hoisted);
+      }
+      for (const entry of entries) {
+        if (!entry.startsWith(prefix + "@"))
+          continue;
+        const hoisted = join(storeDir, entry, "node_modules", pkg);
+        if (existsSync(hoisted) && !seen.has(hoisted)) {
+          seen.add(hoisted);
+          dirs.push(hoisted);
+        }
+      }
     }
-  }
+  };
+  const walk = (dir) => {
+    let entries;
+    try {
+      entries = readdirSync(dir);
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      const full = join(dir, entry);
+      if (entry === "node_modules") {
+        checkNodeModules(full);
+        continue;
+      }
+      const stat = tryStat(full);
+      if (stat && stat.isDirectory())
+        walk(full);
+    }
+  };
+  walk(standaloneDir);
   return dirs;
 }
 function generateStubs(standaloneDir) {
@@ -92,7 +124,7 @@ function generateStubs(standaloneDir) {
   const nodeModulesDir = join(standaloneDir, "node_modules");
   let count = 0;
   for (const stub of stubs) {
-    const pkgDirs = findPackageDirs(nodeModulesDir, stub.pkg);
+    const pkgDirs = findPackageDirs(standaloneDir, stub.pkg);
     if (pkgDirs.length === 0)
       pkgDirs.push(join(nodeModulesDir, stub.pkg));
     for (const pkgDir of pkgDirs) {
@@ -167,15 +199,112 @@ function findTurbopackAliases(standaloneNextDir) {
     subpaths: Array.from(subpaths)
   }));
 }
-function rewriteTurbopackAliases(standaloneNextDir, aliases) {
-  if (aliases.length === 0)
+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 + ".mjs",
+      stripped + ".js",
+      stripped + ".cjs",
+      stripped + ".json",
+      join(stripped, "index.mjs"),
+      join(stripped, "index.js"),
+      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 validateAliasResolutions(aliases, resolutions) {
+  const verbose = process.env.NEXT_BUN_COMPILE_VERBOSE === "1";
+  const all = [];
+  for (const { alias, target, subpaths } of aliases) {
+    all.push({ ref: alias, canonical: target, file: resolutions.get(alias) ?? null });
+    for (const sub of subpaths) {
+      const ref = `${alias}/${sub}`;
+      all.push({
+        ref,
+        canonical: `${target}/${sub}`,
+        file: resolutions.get(ref) ?? null
+      });
+    }
+  }
+  const unresolved = all.filter((e) => !e.file).map(({ ref, canonical }) => ({ ref, canonical }));
+  if (verbose && all.length > 0) {
+    console.log(`next-bun-compile: Validating ${all.length} turbopack alias reference(s):`);
+    for (const { ref, canonical, file } of all) {
+      if (file) {
+        const display = file.replace(/^\.next\/node_modules\//, "");
+        console.log(`  ✓ ${ref} → ${canonical} (${display})`);
+      } else {
+        console.log(`  ✗ ${ref} → ${canonical} (NOT FOUND)`);
+      }
+    }
+  }
+  if (unresolved.length > 0) {
+    console.warn(`next-bun-compile: ⚠ ${unresolved.length} of ${all.length} turbopack alias reference(s) won't resolve at runtime:`);
+    for (const { ref, canonical } of unresolved) {
+      console.warn(`  ✗ ${ref} → ${canonical}`);
+    }
+    console.warn(`next-bun-compile: These chunks will throw at runtime when the reference is hit. ` + `Either the package is missing from dependencies, or it's hidden behind a path the ` + `standalone trace didn't include. Try adding to transpilePackages in next.config.`);
+  }
+  return unresolved;
+}
+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"))
@@ -186,7 +315,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++;
@@ -227,8 +361,7 @@ function findServerDir(standaloneDir) {
   return found;
 }
 function patchRequireHook(standaloneDir) {
-  const nodeModulesDir = join(standaloneDir, "node_modules");
-  const nextDirs = findPackageDirs(nodeModulesDir, "next");
+  const nextDirs = findPackageDirs(standaloneDir, "next");
   const target = "let resolve = process.env.NEXT_MINIMAL ? __non_webpack_require__.resolve : require.resolve;";
   const replacement = `let _resolve = process.env.NEXT_MINIMAL ? __non_webpack_require__.resolve : require.resolve;
 let resolve = (id) => { try { return _resolve(id); } catch { return ''; } };`;
@@ -249,9 +382,6 @@ let resolve = (id) => { try { return _resolve(id); } catch { return ''; } };`;
   }
 }
 function collectExternalModules(standaloneDir) {
-  const nodeModulesDir = join(standaloneDir, "node_modules");
-  if (!existsSync(nodeModulesDir))
-    return [];
   const pkgRoots = new Map;
   function addPkg(name, path) {
     if (!pkgRoots.has(name))
@@ -279,17 +409,37 @@ function collectExternalModules(standaloneDir) {
       }
     }
   }
-  scanDir(nodeModulesDir);
-  for (const store of [".bun", ".pnpm"]) {
-    const storeDir = join(nodeModulesDir, store);
-    if (!existsSync(storeDir))
-      continue;
-    for (const storeEntry of readdirSync(storeDir)) {
-      const nested = join(storeDir, storeEntry, "node_modules");
-      if (existsSync(nested))
-        scanDir(nested);
+  function walkForNodeModules(dir) {
+    let entries;
+    try {
+      entries = readdirSync(dir);
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      const full = join(dir, entry);
+      if (entry === "node_modules") {
+        scanDir(full);
+        for (const store of [".bun", ".pnpm"]) {
+          const storeDir = join(full, store);
+          if (!existsSync(storeDir))
+            continue;
+          for (const storeEntry of readdirSync(storeDir)) {
+            const nested = join(storeDir, storeEntry, "node_modules");
+            if (existsSync(nested))
+              scanDir(nested);
+          }
+        }
+        continue;
+      }
+      const stat = tryStat(full);
+      if (stat && stat.isDirectory())
+        walkForNodeModules(full);
     }
   }
+  walkForNodeModules(standaloneDir);
+  if (pkgRoots.size === 0)
+    return [];
   const results = [];
   for (const [name, pkgPath] of pkgRoots) {
     for (const f of walkDir(pkgPath)) {
@@ -302,8 +452,7 @@ function collectExternalModules(standaloneDir) {
   return results;
 }
 function fixModuleResolution(standaloneDir) {
-  const nodeModulesDir = join(standaloneDir, "node_modules");
-  for (const pkgDir of findPackageDirs(nodeModulesDir, "next")) {
+  for (const pkgDir of findPackageDirs(standaloneDir, "next")) {
     const compiledDir = join(pkgDir, "dist/compiled");
     if (!existsSync(compiledDir))
       continue;
@@ -322,7 +471,7 @@ function fixModuleResolution(standaloneDir) {
       }
     }
   }
-  for (const helpersDir of findPackageDirs(nodeModulesDir, "@swc/helpers")) {
+  for (const helpersDir of findPackageDirs(standaloneDir, "@swc/helpers")) {
     const cjsDir = join(helpersDir, "cjs");
     if (!existsSync(cjsDir))
       continue;
@@ -357,7 +506,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\/([^/]+)/);
@@ -383,6 +531,9 @@ function generateEntryPoint(options) {
   if (externalModules.length > 0) {
     console.log(`next-bun-compile: Embedding ${externalModules.length} external modules for SSR`);
   }
+  const canonicalResolutions = buildCanonicalResolutions(externalDir, turbopackAliases);
+  validateAliasResolutions(turbopackAliases, canonicalResolutions);
+  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];
@@ -443,6 +594,20 @@ process.env.NODE_ENV = "production";
 // honor exports maps. Generic: every externalized package's internal deps
 // get resolved without per-package patching.
 const __nbcAliases = ${JSON.stringify(Object.fromEntries(turbopackAliases.map((a) => [a.alias, a.target])))};
+// Debug mode: set NEXT_BUN_COMPILE_DEBUG=1 to log every resolver-hook
+// decision (alias redirects, fallback walks, fallback failures). Off by
+// default so production logs stay clean; turn it on when reproducing a
+// resolution bug — that one log line is usually enough to know which
+// package was missing and where the walk gave up.
+const __nbcDebug = process.env.NEXT_BUN_COMPILE_DEBUG === "1";
+function __nbcLog(msg) { console.log("next-bun-compile [debug]:", msg); }
+if (__nbcDebug) {
+  const n = Object.keys(__nbcAliases).length;
+  __nbcLog(\`resolver hook installed; \${n} alias mapping(s):\`);
+  for (const [k, v] of Object.entries(__nbcAliases)) {
+    __nbcLog(\`  \${k} → \${v}\`);
+  }
+}
 const __nbcOrigResolveFilename = Module._resolveFilename;
 function __nbcStatFile(p) {
   try { return fs.statSync(p).isFile() ? p : null; } catch { return null; }
@@ -472,12 +637,34 @@ function __nbcResolveSubpath(pkgDir, pkgJson, sub) {
       }
     }
   }
-  return __nbcStatFile(path.join(pkgDir, sub))
+  // Direct file forms
+  const direct = __nbcStatFile(path.join(pkgDir, sub))
     || __nbcStatFile(path.join(pkgDir, sub + ".js"))
     || __nbcStatFile(path.join(pkgDir, sub + ".cjs"))
     || __nbcStatFile(path.join(pkgDir, sub + ".mjs"))
-    || __nbcStatFile(path.join(pkgDir, sub + ".json"))
-    || __nbcStatFile(path.join(pkgDir, sub, "index.js"))
+    || __nbcStatFile(path.join(pkgDir, sub + ".json"));
+  if (direct) return direct;
+  // Subpath is a directory: read its own package.json + main (e.g.
+  // next/dist/compiled/source-map has main: "source-map.js"). Falls
+  // back to index.js / index.cjs lookup if no package.json.
+  const subDir = path.join(pkgDir, sub);
+  try {
+    if (fs.statSync(subDir).isDirectory()) {
+      const subPkgPath = path.join(subDir, "package.json");
+      if (fs.existsSync(subPkgPath)) {
+        try {
+          const subPkg = JSON.parse(fs.readFileSync(subPkgPath, "utf-8"));
+          const main = typeof subPkg.main === "string" ? subPkg.main : null;
+          if (main) {
+            const f = __nbcStatFile(path.join(subDir, main))
+              || __nbcStatFile(path.join(subDir, main + ".js"));
+            if (f) return f;
+          }
+        } catch {}
+      }
+    }
+  } catch {}
+  return __nbcStatFile(path.join(pkgDir, sub, "index.js"))
     || __nbcStatFile(path.join(pkgDir, sub, "index.cjs"));
 }
 function __nbcResolvePackage(request, fromDir) {
@@ -528,6 +715,10 @@ function __nbcRedirectAlias(request) {
 }
 Module._resolveFilename = function(request, parent, isMain, options) {
   const redirected = __nbcRedirectAlias(request);
+  if (__nbcDebug && redirected !== request) {
+    const from = parent && parent.filename ? parent.filename : "<unknown>";
+    __nbcLog(\`redirected "\${request}" → "\${redirected}" (from \${from})\`);
+  }
   try {
     return __nbcOrigResolveFilename.call(this, redirected, parent, isMain, options);
   } catch (err) {
@@ -537,7 +728,15 @@ Module._resolveFilename = function(request, parent, isMain, options) {
     }
     const fromDir = parent && parent.filename ? path.dirname(parent.filename) : process.cwd();
     const resolved = __nbcResolvePackage(redirected, fromDir);
-    if (resolved) return resolved;
+    if (resolved) {
+      if (__nbcDebug) {
+        __nbcLog(\`fallback resolved "\${redirected}" → \${resolved} (from \${fromDir})\`);
+      }
+      return resolved;
+    }
+    if (__nbcDebug) {
+      __nbcLog(\`fallback FAILED for "\${redirected}" (from \${fromDir}); throwing original ResolveMessage\`);
+    }
     throw err;
   }
 };
@@ -560,7 +759,21 @@ 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
+    // (works for both CJS require and ESM import).
+    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-7dvf3g60.js";
+} from "./index-np1qb2b3.js";
 
 // src/index.ts
 import { join } from "node:path";

package/package.json

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