next-bun-compile 0.6.10 → 0.6.12

package/dist/cli.js

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

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

@@ -167,79 +167,15 @@ 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)
+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("|") + `)(?:/[^"']+)?)\\1`, "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"))
@@ -250,12 +186,7 @@ function rewriteTurbopackAliases(standaloneNextDir, aliases, resolutions) {
     } 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}`;
-    });
+    const next = content.replace(pattern, (_m, q, alias) => q + targetByAlias.get(alias));
     if (next !== content) {
       writeFileSync(f.absolutePath, next);
       rewritten++;
@@ -426,6 +357,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\/([^/]+)/);
@@ -451,8 +383,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];
@@ -503,11 +433,16 @@ 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. This
-// hook runs ONLY when bun's resolver throws and reimplements Node-compatible
+// 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; }
@@ -576,16 +511,32 @@ function __nbcResolvePackage(request, fromDir) {
   }
   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, request, parent, isMain, options);
+    return __nbcOrigResolveFilename.call(this, redirected, parent, isMain, options);
   } catch (err) {
     // Only attempt fallback for bare package specifiers
-    if (typeof request !== "string" || request[0] === "." || request[0] === "/" || /^[a-z]+:/.test(request)) {
+    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(request, fromDir);
+    const resolved = __nbcResolvePackage(redirected, fromDir);
     if (resolved) return resolved;
     throw err;
   }
@@ -609,20 +560,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-rx8tn52q.js";
+} from "./index-7dvf3g60.js";
 
 // src/index.ts
 import { join } from "node:path";

package/package.json

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