next-bun-compile 0.5.1 → 0.6.0

package/README.md

@@ -26,14 +26,24 @@ Add the adapter to your `next.config.ts`:
 ```ts
 import type { NextConfig } from "next";
 
+const nextConfig: NextConfig = {
+  adapterPath: require.resolve("next-bun-compile"),
+};
+
+export default nextConfig;
+```
+
+<details>
+<summary>Using Next.js 16.1? Use the experimental config instead</summary>
+
+```ts
 const nextConfig: NextConfig = {
   experimental: {
     adapterPath: require.resolve("next-bun-compile"),
   },
 };
-
-export default nextConfig;
 ```
+</details>
 
 Update your build script in `package.json`:
 
@@ -81,9 +91,7 @@ If you configure `assetPrefix` in your `next.config.ts`, static assets (`/_next/
 ```ts
 const nextConfig: NextConfig = {
   assetPrefix: "https://cdn.example.com",
-  experimental: {
-    adapterPath: require.resolve("next-bun-compile"),
-  },
+  adapterPath: require.resolve("next-bun-compile"),
 };
 ```
 
@@ -133,9 +141,7 @@ Failed to load external module pino-142500b1eb3f4baf: Cannot find package ...
 ```ts
 const nextConfig: NextConfig = {
   transpilePackages: ["pino", "pino-pretty"],
-  experimental: {
-    adapterPath: require.resolve("next-bun-compile"),
-  },
+  adapterPath: require.resolve("next-bun-compile"),
 };
 ```
 

package/dist/cli.js

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

package/dist/{index-81394x5f.js → index-5m65k8kw.js}

@@ -36,13 +36,15 @@ function findPackageDirs(nodeModulesDir, pkg) {
   const direct = join(nodeModulesDir, pkg);
   if (existsSync(direct))
     dirs.push(direct);
-  const bunDir = join(nodeModulesDir, ".bun");
-  if (existsSync(bunDir)) {
-    const scope = pkg.startsWith("@") ? pkg.split("/")[0] + "+" + pkg.split("/")[1] : pkg;
-    for (const entry of readdirSync(bunDir)) {
-      if (!entry.startsWith(scope + "@"))
+  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 + "@"))
         continue;
-      const hoisted = join(bunDir, entry, "node_modules", pkg);
+      const hoisted = join(storeDir, entry, "node_modules", pkg);
       if (existsSync(hoisted))
         dirs.push(hoisted);
     }
@@ -145,61 +147,100 @@ let resolve = (id) => { try { return _resolve(id); } catch { return ''; } };`;
     console.log("next-bun-compile: Patched require-hook.js for compiled binary compatibility");
   }
 }
-function collectExternalModules(standaloneDir, serverDir) {
-  const chunksDir = join(serverDir, ".next/server/chunks");
-  if (!existsSync(chunksDir))
+function collectExternalModules(standaloneDir) {
+  const nodeModulesDir = join(standaloneDir, "node_modules");
+  if (!existsSync(nodeModulesDir))
     return [];
-  const seeds = new Set;
-  for (const { absolutePath } of walkDir(chunksDir)) {
-    if (!absolutePath.endsWith(".js"))
-      continue;
-    const content = readFileSync(absolutePath, "utf-8");
-    for (const match of content.matchAll(/require\("(next\/dist\/[^"]+)"\)/g)) {
-      seeds.add(match[1]);
-    }
+  const pkgRoots = new Map;
+  function addPkg(name, path) {
+    if (!pkgRoots.has(name))
+      pkgRoots.set(name, path);
   }
-  const deps = new Set;
-  function trace(file) {
-    if (deps.has(file))
+  function scanDir(dir) {
+    if (!existsSync(dir))
       return;
-    let fullPath = join(standaloneDir, "node_modules", file);
-    if (existsSync(fullPath) && statSync(fullPath).isDirectory()) {
-      const pkgJson = join(fullPath, "package.json");
-      if (existsSync(pkgJson)) {
-        deps.add(file + "/package.json");
+    for (const entry of readdirSync(dir)) {
+      if (entry.startsWith(".") || entry === "next-bun-compile")
+        continue;
+      const entryPath = join(dir, entry);
+      if (!statSync(entryPath).isDirectory())
+        continue;
+      if (entry.startsWith("@")) {
+        for (const sub of readdirSync(entryPath)) {
+          const subPath = join(entryPath, sub);
+          if (statSync(subPath).isDirectory())
+            addPkg(`${entry}/${sub}`, subPath);
+        }
+      } else {
+        addPkg(entry, entryPath);
       }
-      file = file + "/index.js";
-      fullPath = join(standaloneDir, "node_modules", file);
     }
-    if (!existsSync(fullPath))
-      return;
-    deps.add(file);
-    const content = readFileSync(fullPath, "utf-8");
-    for (const match of content.matchAll(/require\("([^"]+)"\)/g)) {
-      const req = match[1];
-      let resolved;
-      if (req.startsWith(".")) {
-        resolved = join(file, "..", req).replace(/\\/g, "/");
-        if (!resolved.endsWith(".js"))
-          resolved += ".js";
-      } else if (req.startsWith("next/")) {
-        resolved = req;
-        if (!resolved.endsWith(".js"))
-          resolved += ".js";
+  }
+  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);
+    }
+  }
+  const results = [];
+  for (const [name, pkgPath] of pkgRoots) {
+    for (const f of walkDir(pkgPath)) {
+      results.push({
+        mod: `${name}/${f.relativePath.replace(/\\/g, "/")}`,
+        src: f.absolutePath
+      });
+    }
+  }
+  return results;
+}
+function fixModuleResolution(standaloneDir) {
+  const nodeModulesDir = join(standaloneDir, "node_modules");
+  for (const pkgDir of findPackageDirs(nodeModulesDir, "next")) {
+    const compiledDir = join(pkgDir, "dist/compiled");
+    if (!existsSync(compiledDir))
+      continue;
+    for (const entry of readdirSync(compiledDir)) {
+      const dir = join(compiledDir, entry);
+      if (!statSync(dir).isDirectory())
+        continue;
+      const pkgJsonPath = join(dir, "package.json");
+      const indexPath = join(dir, "index.js");
+      if (!existsSync(pkgJsonPath) || existsSync(indexPath))
+        continue;
+      const pkg = JSON.parse(readFileSync(pkgJsonPath, "utf-8"));
+      if (pkg.main && pkg.main !== "index.js") {
+        writeFileSync(indexPath, `module.exports = require("./${pkg.main}");`);
       }
-      if (resolved)
-        trace(resolved);
     }
   }
-  for (const seed of seeds)
-    trace(seed);
-  return [...deps];
+  for (const helpersDir of findPackageDirs(nodeModulesDir, "@swc/helpers")) {
+    const cjsDir = join(helpersDir, "cjs");
+    if (!existsSync(cjsDir))
+      continue;
+    for (const file of readdirSync(cjsDir)) {
+      if (!file.endsWith(".cjs"))
+        continue;
+      const name = file.slice(0, -4);
+      const shimDir = join(helpersDir, "_", name);
+      const shimFile = join(shimDir, "index.js");
+      if (existsSync(shimFile))
+        continue;
+      mkdirSync(shimDir, { recursive: true });
+      writeFileSync(shimFile, `module.exports = require("../../cjs/${file}");`);
+    }
+  }
 }
 function generateEntryPoint(options) {
   const { standaloneDir, distDir, projectDir } = options;
   const serverDir = findServerDir(standaloneDir);
   generateStubs(standaloneDir);
   patchRequireHook(standaloneDir);
+  fixModuleResolution(standaloneDir);
   const staticDir = join(distDir, "static");
   const staticFiles = walkDir(staticDir).map((f) => ({
     ...f,
@@ -215,11 +256,9 @@ function generateEntryPoint(options) {
     ...f,
     urlPath: `__runtime/.next/${f.relativePath.replace(/\\/g, "/")}`
   }));
-  const externalModules = collectExternalModules(standaloneDir, serverDir);
-  const externalPaths = ["next/package.json", ...externalModules];
+  const externalModules = collectExternalModules(standaloneDir);
   const externalDir = join(serverDir, ".next/__external");
-  for (const mod of externalPaths) {
-    const src = join(standaloneDir, "node_modules", mod);
+  for (const { mod, src } of externalModules) {
     if (!existsSync(src))
       continue;
     const dest = join(externalDir, mod);

package/dist/index.js

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

package/package.json

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