next-bun-compile 0.6.9 → 0.6.11

package/dist/cli.js

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

package/dist/{index-h8ak29p2.js → index-8jf4ty06.js}

@@ -167,104 +167,6 @@ 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;
@@ -451,8 +353,6 @@ 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];
@@ -494,11 +394,124 @@ ${mapEntries.join(`
   const serverEntry = `import { assetMap } from "./assets.generated.js";
 const path = require("path");
 const fs = require("fs");
+const Module = require("module");
 
 const baseDir = path.dirname(process.execPath);
 process.chdir(baseDir);
 process.env.NODE_ENV = "production";
 
+// Install a fallback Module._resolveFilename hook. bun's compiled-binary
+// resolver doesn't walk node_modules from inside a node_modules entry, so
+// once execution enters an extracted package (sharp/lib/index.js → require
+// of detect-libc, @img/sharp-linux-x64/sharp.node, etc.) bun gives up. The
+// hook also redirects turbopack-mangled aliases ("sharp-457ea9eae1af1a9c"
+// → "sharp") so the chunks' externalized require/import calls land on the
+// canonical packages that collectExternalModules extracted.
+//
+// Runs ONLY when bun's resolver throws and reimplements Node-compatible
+// resolution from scratch — walk node_modules, read package.json main,
+// 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])))};
+const __nbcOrigResolveFilename = Module._resolveFilename;
+function __nbcStatFile(p) {
+  try { return fs.statSync(p).isFile() ? p : null; } catch { return null; }
+}
+function __nbcResolveMain(pkgDir, pkgJson) {
+  const main = pkgJson && typeof pkgJson.main === "string" ? pkgJson.main : "index.js";
+  return __nbcStatFile(path.join(pkgDir, main))
+    || __nbcStatFile(path.join(pkgDir, main + ".js"))
+    || __nbcStatFile(path.join(pkgDir, main + ".cjs"))
+    || __nbcStatFile(path.join(pkgDir, main + ".mjs"))
+    || __nbcStatFile(path.join(pkgDir, main, "index.js"))
+    || __nbcStatFile(path.join(pkgDir, "index.js"))
+    || __nbcStatFile(path.join(pkgDir, "index.cjs"));
+}
+function __nbcResolveSubpath(pkgDir, pkgJson, sub) {
+  // Honor exports map (CJS-relevant conditions only)
+  if (pkgJson && pkgJson.exports && typeof pkgJson.exports === "object") {
+    const key = "./" + sub;
+    const entry = pkgJson.exports[key];
+    if (entry) {
+      let target = typeof entry === "string"
+        ? entry
+        : entry.require || entry.node || entry.default;
+      if (typeof target === "string" && target.startsWith("./")) {
+        const f = __nbcStatFile(path.join(pkgDir, target.slice(2)));
+        if (f) return f;
+      }
+    }
+  }
+  return __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, "index.cjs"));
+}
+function __nbcResolvePackage(request, fromDir) {
+  let pkgName, sub = "";
+  if (request[0] === "@") {
+    const m = request.match(/^(@[^/]+\\/[^/]+)(?:\\/(.+))?$/);
+    if (!m) return null;
+    pkgName = m[1]; sub = m[2] || "";
+  } else {
+    const idx = request.indexOf("/");
+    if (idx === -1) { pkgName = request; }
+    else { pkgName = request.slice(0, idx); sub = request.slice(idx + 1); }
+  }
+  let dir = fromDir;
+  while (dir.length > 1) {
+    const pkgDir = path.join(dir, "node_modules", pkgName);
+    if (fs.existsSync(pkgDir)) {
+      let pkgJson = null;
+      const pkgJsonPath = path.join(pkgDir, "package.json");
+      if (fs.existsSync(pkgJsonPath)) {
+        try { pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8")); } catch {}
+      }
+      const resolved = sub
+        ? __nbcResolveSubpath(pkgDir, pkgJson, sub)
+        : __nbcResolveMain(pkgDir, pkgJson);
+      if (resolved) return resolved;
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
+}
+function __nbcRedirectAlias(request) {
+  if (typeof request !== "string" || request.length === 0) return request;
+  // Direct alias match
+  if (Object.prototype.hasOwnProperty.call(__nbcAliases, request)) {
+    return __nbcAliases[request];
+  }
+  // Alias-with-subpath match
+  const slash = request.indexOf("/", request[0] === "@" ? request.indexOf("/") + 1 : 0);
+  if (slash === -1) return request;
+  const head = request.slice(0, slash);
+  if (Object.prototype.hasOwnProperty.call(__nbcAliases, head)) {
+    return __nbcAliases[head] + request.slice(slash);
+  }
+  return request;
+}
+Module._resolveFilename = function(request, parent, isMain, options) {
+  const redirected = __nbcRedirectAlias(request);
+  try {
+    return __nbcOrigResolveFilename.call(this, redirected, parent, isMain, options);
+  } catch (err) {
+    // Only attempt fallback for bare package specifiers
+    if (typeof redirected !== "string" || redirected[0] === "." || redirected[0] === "/" || /^[a-z]+:/.test(redirected)) {
+      throw err;
+    }
+    const fromDir = parent && parent.filename ? path.dirname(parent.filename) : process.cwd();
+    const resolved = __nbcResolvePackage(redirected, fromDir);
+    if (resolved) return resolved;
+    throw err;
+  }
+};
+
 const nextConfig = ${configMatch[1]};
 process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(nextConfig);
 
@@ -517,20 +530,7 @@ async function extractAssets() {
     if (fs.existsSync(fullPath)) continue;
     fs.mkdirSync(path.dirname(fullPath), { recursive: true });
     const embedded = assetMap.get(urlPath);
-    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 (embedded) { 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-h8ak29p2.js";
+} from "./index-8jf4ty06.js";
 
 // src/index.ts
 import { join } from "node:path";

package/package.json

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