@opennextjs/cloudflare 0.0.0-11802c4 → 0.0.0-28d3ca1

package/README.md

@@ -13,7 +13,13 @@ You can use [`create-next-app`](https://nextjs.org/docs/pages/api-reference/cli/
 - add the following `devDependencies` to the `package.json`:
 
   ```bash
+  npm add -D wrangler@latest @opennextjs/cloudflare
+  # or
   pnpm add -D wrangler@latest @opennextjs/cloudflare
+  # or
+  yarn add -D wrangler@latest @opennextjs/cloudflare
+  # or
+  bun add -D wrangler@latest @opennextjs/cloudflare
   ```
 
 - add a `wrangler.toml` at the root of your project
@@ -36,6 +42,12 @@ You can enable Incremental Static Regeneration ([ISR](https://nextjs.org/docs/ap
 
   ```bash
   npx wrangler kv namespace create NEXT_CACHE_WORKERS_KV
+  # or
+  pnpm wrangler kv namespace create NEXT_CACHE_WORKERS_KV
+  # or
+  yarn wrangler kv namespace create NEXT_CACHE_WORKERS_KV
+  # or
+  bun wrangler kv namespace create NEXT_CACHE_WORKERS_KV
   ```
 
 - Paste the snippet to your `wrangler.toml`:
@@ -60,13 +72,25 @@ Run the following commands to preview the production build of your application l
 - build the app and adapt it for Cloudflare
 
   ```bash
-  pnpx cloudflare
+  npx cloudflare
+  # or
+  pnpm cloudflare
+  # or
+  yarn cloudflare
+  # or
+  bun cloudflare
   ```
 
 - Preview the app in Wrangler
 
   ```bash
+  npx wrangler dev
+  # or
   pnpm wrangler dev
+  # or
+  yarn wrangler dev
+  # or
+  bun wrangler dev
   ```
 
 ## Deploy your app
@@ -76,9 +100,11 @@ Deploy your application to production with the following:
 - build the app and adapt it for Cloudflare
 
   ```bash
-  pnpx cloudflare
-  ```
-
-  ```bash
-  pnpm wrangler deploy
+  npx cloudflare && npx wrangler deploy
+  # or
+  pnpm cloudflare && pnpm wrangler deploy
+  # or
+  yarn cloudflare && yarn wrangler deploy
+  # or
+  bun cloudflare && bun wrangler deploy
   ```

package/dist/cli/cache-handler.mjs

@@ -18,7 +18,7 @@ var CfWorkersKvCacheHandler = class _CfWorkersKvCacheHandler {
       return null;
     }
   }
-  async set(key, entry, ctx) {
+  async set(key, entry, _ctx) {
     if (_CfWorkersKvCacheHandler.maybeKVNamespace === void 0) {
       return;
     }

package/dist/cli/index.mjs

@@ -213,61 +213,72 @@ var require_brace_expansion = __commonJS({
   }
 });
 
-// src/cli/index.ts
-import { resolve as resolve2 } from "node:path";
-
-// src/cli/args.ts
-import { mkdirSync, statSync } from "node:fs";
-import { parseArgs } from "node:util";
-import { resolve } from "node:path";
-function getArgs() {
-  const {
-    values: { skipBuild: skipBuild2, output }
-  } = parseArgs({
-    options: {
-      skipBuild: {
-        type: "boolean",
-        short: "s",
-        default: false
-      },
-      output: {
-        type: "string",
-        short: "o"
-      }
-    },
-    allowPositionals: false
-  });
-  const outputDir2 = output ? resolve(output) : void 0;
-  if (outputDir2) {
-    assertDirArg(outputDir2, "output", true);
+// src/cli/config.ts
+import path, { relative } from "node:path";
+import { readdirSync, statSync } from "node:fs";
+var PACKAGE_NAME = "@opennextjs/cloudflare";
+var UserConfig = {
+  cache: {
+    bindingName: "NEXT_CACHE_WORKERS_KV"
   }
+};
+function getConfig(appDir, outputDir2) {
+  const dotNext = path.join(outputDir2, ".next");
+  const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
+  const standaloneApp = path.join(dotNext, "standalone", appPath);
+  const standaloneAppDotNext = path.join(standaloneApp, ".next");
+  const standaloneAppServer = path.join(standaloneAppDotNext, "server");
+  const nodeModules = path.join(standaloneApp, "node_modules");
+  const internalPackage = path.join(nodeModules, ...PACKAGE_NAME.split("/"));
   return {
-    outputDir: outputDir2,
-    skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
+    paths: {
+      nextApp: appDir,
+      builderOutput: outputDir2,
+      dotNext,
+      standaloneApp,
+      standaloneAppDotNext,
+      standaloneAppServer,
+      internalPackage
+    },
+    cache: {
+      kvBindingName: UserConfig.cache.bindingName
+    },
+    internalPackageName: PACKAGE_NAME
   };
 }
-function assertDirArg(path13, argName, make) {
-  let dirStats;
+function containsDotNextDir(folder) {
   try {
-    dirStats = statSync(path13);
+    return statSync(path.join(folder, ".next")).isDirectory();
   } catch {
-    if (!make) {
-      throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
+    return false;
+  }
+}
+function getNextjsApplicationPath(dotNextDir) {
+  const serverPath = findServerParentPath(dotNextDir);
+  if (!serverPath) {
+    throw new Error(`Unexpected Error: no \`.next/server\` folder could be found in \`${serverPath}\``);
+  }
+  return relative(path.join(dotNextDir, "standalone"), serverPath);
+}
+function findServerParentPath(parentPath) {
+  try {
+    if (statSync(path.join(parentPath, ".next", "server")).isDirectory()) {
+      return parentPath;
     }
-    mkdirSync(path13);
-    return;
+  } catch {
   }
-  if (!dirStats.isDirectory()) {
-    throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a directory`);
+  const folders = readdirSync(parentPath);
+  for (const folder of folders) {
+    const subFolder = path.join(parentPath, folder);
+    if (statSync(path.join(parentPath, folder)).isDirectory()) {
+      const dirServerPath = findServerParentPath(subFolder);
+      if (dirServerPath) {
+        return dirServerPath;
+      }
+    }
   }
 }
 
-// src/cli/index.ts
-import { existsSync as existsSync4 } from "node:fs";
-
-// src/cli/build/index.ts
-import { rm } from "node:fs/promises";
-
 // src/cli/build/build-next-app.ts
 import { execSync } from "node:child_process";
 function buildNextjsApp(nextAppDir2) {
@@ -289,29 +300,21 @@ function runNextBuildCommand(packager, nextAppDir2) {
 
 // src/cli/build/build-worker.ts
 import { build } from "esbuild";
-import { existsSync as existsSync3, readFileSync as readFileSync4 } from "node:fs";
 import { cp, readFile, writeFile } from "node:fs/promises";
-import path10 from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
-
-// src/cli/build/patches/investigated/patch-require.ts
-function patchRequire(code) {
-  console.log("# patchRequire");
-  return code.replace(/__require\d?\(/g, "require(").replace(/__require\d?\./g, "require.");
-}
+import { existsSync as existsSync3, readFileSync as readFileSync4 } from "node:fs";
 
 // src/cli/build/patches/investigated/copy-package-cli-files.ts
 import { cpSync } from "node:fs";
-import path from "node:path";
+import path2 from "node:path";
 function copyPackageCliFiles(packageDistDir2, config) {
   console.log("# copyPackageTemplateFiles");
-  const sourceDir = path.join(packageDistDir2, "cli");
-  const destinationDir = path.join(config.paths.internalPackage, "cli");
+  const sourceDir = path2.join(packageDistDir2, "cli");
+  const destinationDir = path2.join(config.paths.internalPackage, "cli");
   cpSync(sourceDir, destinationDir, { recursive: true });
 }
 
-// src/cli/build/patches/to-investigate/patch-read-file.ts
-import { readFileSync } from "node:fs";
+// src/cli/build/build-worker.ts
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
 var import_brace_expansion = __toESM(require_brace_expansion(), 1);
@@ -984,11 +987,11 @@ var qmarksTestNoExtDot = ([$0]) => {
   return (f) => f.length === len && f !== "." && f !== "..";
 };
 var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-var path2 = {
+var path3 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path2.win32.sep : path2.posix.sep;
+var sep = defaultPlatform === "win32" ? path3.win32.sep : path3.posix.sep;
 minimatch.sep = sep;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -3018,7 +3021,7 @@ var LRUCache = class _LRUCache {
 // ../../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
 import { posix, win32 } from "node:path";
 import { fileURLToPath } from "node:url";
-import { lstatSync, readdir as readdirCB, readdirSync, readlinkSync, realpathSync as rps } from "fs";
+import { lstatSync, readdir as readdirCB, readdirSync as readdirSync2, readlinkSync, realpathSync as rps } from "fs";
 import * as actualFS from "node:fs";
 import { lstat, readdir, readlink, realpath } from "node:fs/promises";
 
@@ -3905,7 +3908,7 @@ var realpathSync = rps.native;
 var defaultFS = {
   lstatSync,
   readdir: readdirCB,
-  readdirSync,
+  readdirSync: readdirSync2,
   readlinkSync,
   realpathSync,
   promises: {
@@ -6686,67 +6689,44 @@ var glob = Object.assign(glob_, {
 });
 glob.glob = glob;
 
-// src/cli/build/patches/to-investigate/patch-read-file.ts
-import path3 from "node:path";
-function patchReadFile(code, config) {
-  console.log("# patchReadFile");
-  code = code.replace(
-    "getBuildId() {",
-    `getBuildId() {
-      return ${JSON.stringify(readFileSync(path3.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
-    `
-  );
-  const manifestJsons = globSync(path3.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
-    (file) => file.replace(config.paths.standaloneApp + "/", "")
-  );
-  code = code.replace(
-    /function loadManifest\((.+?), .+?\) {/,
-    `$&
-    ${manifestJsons.map(
-      (manifestJson) => `
-          if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync(path3.join(config.paths.standaloneApp, manifestJson), "utf-8")};
-          }
-        `
-    ).join("\n")}
-    throw new Error("Unknown loadManifest: " + $1);
-    `
-  );
-  return code;
-}
-
-// src/cli/build/patches/to-investigate/patch-find-dir.ts
+// src/cli/build/patches/to-investigate/inline-eval-manifest.ts
 import path4 from "node:path";
-import { existsSync } from "node:fs";
-function patchFindDir(code, config) {
-  console.log("# patchFindDir");
+function inlineEvalManifest(code, config) {
+  console.log("# inlineEvalManifest");
+  const manifestJss = globSync(
+    path4.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
+  ).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
   return code.replace(
-    "function findDir(dir, name) {",
-    `function findDir(dir, name) {
-			if (dir.endsWith(".next/server")) {
-			if (name === "app") {
-			  return ${existsSync(`${path4.join(config.paths.standaloneAppServer, "app")}`)};
-	    }
-			if (name === "pages") {
-			  return ${existsSync(`${path4.join(config.paths.standaloneAppServer, "pages")}`)};
-	    }
-		}
-		throw new Error("Unknown findDir call: " + dir + " " + name);
+    /function evalManifest\((.+?), .+?\) {/,
+    `$&
+		${manifestJss.map(
+      (manifestJs) => `
+			  if ($1.endsWith("${manifestJs}")) {
+				require("${path4.join(config.paths.standaloneApp, manifestJs)}");
+				return {
+				  __RSC_MANIFEST: {
+					"${manifestJs.replace(".next/server/app", "").replace("_client-reference-manifest.js", "")}": globalThis.__RSC_MANIFEST["${manifestJs.replace(".next/server/app", "").replace("_client-reference-manifest.js", "")}"],
+				  },
+				};
+			  }
+			`
+    ).join("\n")}
+		throw new Error("Unknown evalManifest: " + $1);
 		`
   );
 }
 
 // src/cli/build/patches/to-investigate/inline-next-require.ts
-import { readFileSync as readFileSync2, existsSync as existsSync2 } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import path5 from "node:path";
 function inlineNextRequire(code, config) {
   console.log("# inlineNextRequire");
   const pagesManifestFile = path5.join(config.paths.standaloneAppServer, "pages-manifest.json");
   const appPathsManifestFile = path5.join(config.paths.standaloneAppServer, "app-paths-manifest.json");
-  const pagesManifestFiles = existsSync2(pagesManifestFile) ? Object.values(JSON.parse(readFileSync2(pagesManifestFile, "utf-8"))).map(
+  const pagesManifestFiles = existsSync(pagesManifestFile) ? Object.values(JSON.parse(readFileSync(pagesManifestFile, "utf-8"))).map(
     (file) => ".next/server/" + file
   ) : [];
-  const appPathsManifestFiles = existsSync2(appPathsManifestFile) ? Object.values(JSON.parse(readFileSync2(appPathsManifestFile, "utf-8"))).map(
+  const appPathsManifestFiles = existsSync(appPathsManifestFile) ? Object.values(JSON.parse(readFileSync(appPathsManifestFile, "utf-8"))).map(
     (file) => ".next/server/" + file
   ) : [];
   const allManifestFiles = pagesManifestFiles.concat(appPathsManifestFiles);
@@ -6758,7 +6738,7 @@ function inlineNextRequire(code, config) {
     ${htmlPages.map(
       (htmlPage) => `
           if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync2(path5.join(config.paths.standaloneApp, htmlPage), "utf-8"))};
+            return ${JSON.stringify(readFileSync(path5.join(config.paths.standaloneApp, htmlPage), "utf-8"))};
           }
         `
     ).join("\n")}
@@ -6774,39 +6754,87 @@ function inlineNextRequire(code, config) {
   );
 }
 
-// src/cli/build/patches/to-investigate/inline-eval-manifest.ts
+// src/cli/build/patches/investigated/patch-cache.ts
 import path6 from "node:path";
-function inlineEvalManifest(code, config) {
-  console.log("# inlineEvalManifest");
-  const manifestJss = globSync(
-    path6.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
-  ).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
+function patchCache(code, config) {
+  console.log("# patchCached");
+  const cacheHandler = path6.join(config.paths.internalPackage, "cli", "cache-handler.mjs");
+  const patchedCode = code.replace(
+    "const { cacheHandler } = this.nextConfig;",
+    `const cacheHandler = null;
+CacheHandler = (await import('${cacheHandler}')).default;
+CacheHandler.maybeKVNamespace = process.env["${config.cache.kvBindingName}"];
+`
+  );
+  if (patchedCode === code) {
+    throw new Error("Cache patch not applied");
+  }
+  return patchedCode;
+}
+
+// src/cli/build/patches/to-investigate/patch-find-dir.ts
+import { existsSync as existsSync2 } from "node:fs";
+import path7 from "node:path";
+function patchFindDir(code, config) {
+  console.log("# patchFindDir");
   return code.replace(
-    /function evalManifest\((.+?), .+?\) {/,
+    "function findDir(dir, name) {",
+    `function findDir(dir, name) {
+			if (dir.endsWith(".next/server")) {
+			if (name === "app") {
+			  return ${existsSync2(`${path7.join(config.paths.standaloneAppServer, "app")}`)};
+	    }
+			if (name === "pages") {
+			  return ${existsSync2(`${path7.join(config.paths.standaloneAppServer, "pages")}`)};
+	    }
+		}
+		throw new Error("Unknown findDir call: " + dir + " " + name);
+		`
+  );
+}
+
+// src/cli/build/patches/to-investigate/patch-read-file.ts
+import path8 from "node:path";
+import { readFileSync as readFileSync2 } from "node:fs";
+function patchReadFile(code, config) {
+  console.log("# patchReadFile");
+  code = code.replace(
+    "getBuildId() {",
+    `getBuildId() {
+      return ${JSON.stringify(readFileSync2(path8.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
+    `
+  );
+  const manifestJsons = globSync(path8.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
+    (file) => file.replace(config.paths.standaloneApp + "/", "")
+  );
+  code = code.replace(
+    /function loadManifest\((.+?), .+?\) {/,
     `$&
-		${manifestJss.map(
-      (manifestJs) => `
-			  if ($1.endsWith("${manifestJs}")) {
-				require("${path6.join(config.paths.standaloneApp, manifestJs)}");
-				return {
-				  __RSC_MANIFEST: {
-					"${manifestJs.replace(".next/server/app", "").replace("_client-reference-manifest.js", "")}": globalThis.__RSC_MANIFEST["${manifestJs.replace(".next/server/app", "").replace("_client-reference-manifest.js", "")}"],
-				  },
-				};
-			  }
-			`
+    ${manifestJsons.map(
+      (manifestJson) => `
+          if ($1.endsWith("${manifestJson}")) {
+            return ${readFileSync2(path8.join(config.paths.standaloneApp, manifestJson), "utf-8")};
+          }
+        `
     ).join("\n")}
-		throw new Error("Unknown evalManifest: " + $1);
-		`
+    throw new Error("Unknown loadManifest: " + $1);
+    `
   );
+  return code;
+}
+
+// src/cli/build/patches/investigated/patch-require.ts
+function patchRequire(code) {
+  console.log("# patchRequire");
+  return code.replace(/__require\d?\(/g, "require(").replace(/__require\d?\./g, "require.");
 }
 
 // src/cli/build/patches/to-investigate/wrangler-deps.ts
-import path7 from "node:path";
 import fs, { writeFileSync } from "node:fs";
+import path9 from "node:path";
 function patchWranglerDeps(config) {
   console.log("# patchWranglerDeps");
-  const pagesRuntimeFile = path7.join(
+  const pagesRuntimeFile = path9.join(
     config.paths.standaloneApp,
     "node_modules",
     "next",
@@ -6817,7 +6845,7 @@ function patchWranglerDeps(config) {
   );
   const patchedPagesRuntime = fs.readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `e.exports={}`);
   fs.writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
-  const tracerFile = path7.join(
+  const tracerFile = path9.join(
     config.paths.standaloneApp,
     "node_modules",
     "next",
@@ -6831,9 +6859,11 @@ function patchWranglerDeps(config) {
   writeFileSync(tracerFile, pacthedTracer);
 }
 
+// src/cli/build/build-worker.ts
+import path11 from "node:path";
+
 // src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
-import path8 from "node:path";
+import { readFileSync as readFileSync3, readdirSync as readdirSync3, writeFileSync as writeFileSync2 } from "node:fs";
 
 // src/cli/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
 import * as ts from "ts-morph";
@@ -6946,11 +6976,12 @@ async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
 }
 
 // src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
+import path10 from "node:path";
 async function updateWebpackChunksFile(config) {
   console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = path8.join(config.paths.standaloneAppServer, "webpack-runtime.js");
+  const webpackRuntimeFile = path10.join(config.paths.standaloneAppServer, "webpack-runtime.js");
   const fileContent = readFileSync3(webpackRuntimeFile, "utf-8");
-  const chunks = readdirSync2(path8.join(config.paths.standaloneAppServer, "chunks")).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
+  const chunks = readdirSync3(path10.join(config.paths.standaloneAppServer, "chunks")).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
     console.log(` - chunk ${chunk}`);
     return chunk.replace(/\.js$/, "");
   });
@@ -6958,47 +6989,29 @@ async function updateWebpackChunksFile(config) {
   writeFileSync2(webpackRuntimeFile, updatedFileContent);
 }
 
-// src/cli/build/patches/investigated/patch-cache.ts
-import path9 from "node:path";
-function patchCache(code, config) {
-  console.log("# patchCached");
-  const cacheHandler = path9.join(config.paths.internalPackage, "cli", "cache-handler.mjs");
-  const patchedCode = code.replace(
-    "const { cacheHandler } = this.nextConfig;",
-    `const cacheHandler = null;
-CacheHandler = (await import('${cacheHandler}')).default;
-CacheHandler.maybeKVNamespace = process.env["${config.cache.kvBindingName}"];
-`
-  );
-  if (patchedCode === code) {
-    throw new Error("Cache patch not applied");
-  }
-  return patchedCode;
-}
-
 // src/cli/build/build-worker.ts
-var packageDistDir = path10.join(path10.dirname(fileURLToPath3(import.meta.url)), "..");
+var packageDistDir = path11.join(path11.dirname(fileURLToPath3(import.meta.url)), "..");
 async function buildWorker(config) {
   console.log(`\x1B[35m\u2699\uFE0F Copying files...
 \x1B[0m`);
   await cp(
-    path10.join(config.paths.dotNext, "static"),
-    path10.join(config.paths.builderOutput, "assets", "_next", "static"),
+    path11.join(config.paths.dotNext, "static"),
+    path11.join(config.paths.builderOutput, "assets", "_next", "static"),
     {
       recursive: true
     }
   );
-  const publicDir = path10.join(config.paths.nextApp, "public");
+  const publicDir = path11.join(config.paths.nextApp, "public");
   if (existsSync3(publicDir)) {
-    await cp(publicDir, path10.join(config.paths.builderOutput, "assets"), {
+    await cp(publicDir, path11.join(config.paths.builderOutput, "assets"), {
       recursive: true
     });
   }
   copyPackageCliFiles(packageDistDir, config);
-  const templateDir = path10.join(config.paths.internalPackage, "cli", "templates");
-  const workerEntrypoint = path10.join(templateDir, "worker.ts");
-  const workerOutputFile = path10.join(config.paths.builderOutput, "index.mjs");
-  const nextConfigStr = readFileSync4(path10.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
+  const templateDir = path11.join(config.paths.internalPackage, "cli", "templates");
+  const workerEntrypoint = path11.join(templateDir, "worker.ts");
+  const workerOutputFile = path11.join(config.paths.builderOutput, "index.mjs");
+  const nextConfigStr = readFileSync4(path11.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
     /const nextConfig = ({.+?})\n/
   )?.[1] ?? {};
   console.log(`\x1B[35m\u2699\uFE0F Bundling the worker file...
@@ -7017,15 +7030,15 @@ async function buildWorker(config) {
       // Note: we apply an empty shim to next/dist/compiled/ws because it generates two `eval`s:
       //   eval("require")("bufferutil");
       //   eval("require")("utf-8-validate");
-      "next/dist/compiled/ws": path10.join(templateDir, "shims", "empty.ts"),
+      "next/dist/compiled/ws": path11.join(templateDir, "shims", "empty.ts"),
       // Note: we apply an empty shim to next/dist/compiled/edge-runtime since (amongst others) it generated the following `eval`:
       //   eval(getModuleCode)(module, module.exports, throwingRequire, params.context, ...Object.values(params.scopedContext));
       //   which comes from https://github.com/vercel/edge-runtime/blob/6e96b55f/packages/primitives/src/primitives/load.js#L57-L63
       // QUESTION: Why did I encountered this but mhart didn't?
-      "next/dist/compiled/edge-runtime": path10.join(templateDir, "shims", "empty.ts"),
+      "next/dist/compiled/edge-runtime": path11.join(templateDir, "shims", "empty.ts"),
       // `@next/env` is a library Next.js uses for loading dotenv files, for obvious reasons we need to stub it here
       // source: https://github.com/vercel/next.js/tree/0ac10d79720/packages/next-env
-      "@next/env": path10.join(templateDir, "shims", "env.ts")
+      "@next/env": path11.join(templateDir, "shims", "env.ts")
     },
     define: {
       // config file used by Next.js, see: https://github.com/vercel/next.js/blob/68a7128/packages/next/src/build/utils.ts#L2137-L2139
@@ -7104,85 +7117,20 @@ function createFixRequiresESBuildPlugin(templateDir) {
   return {
     name: "replaceRelative",
     setup(build3) {
-      build3.onResolve({ filter: /^\.\/require-hook$/ }, (args) => ({
-        path: path10.join(templateDir, "shims", "empty.ts")
+      build3.onResolve({ filter: /^\.\/require-hook$/ }, () => ({
+        path: path11.join(templateDir, "shims", "empty.ts")
       }));
-      build3.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, (args) => ({
-        path: path10.join(templateDir, "shims", "empty.ts")
+      build3.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, () => ({
+        path: path11.join(templateDir, "shims", "empty.ts")
       }));
     }
   };
 }
 
-// src/cli/config.ts
-import { readdirSync as readdirSync3, statSync as statSync2 } from "node:fs";
-import path11, { relative } from "node:path";
-var PACKAGE_NAME = "@opennextjs/cloudflare";
-var UserConfig = {
-  cache: {
-    bindingName: "NEXT_CACHE_WORKERS_KV"
-  }
-};
-function getConfig(appDir, outputDir2) {
-  const dotNext = path11.join(outputDir2, ".next");
-  const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
-  const standaloneApp = path11.join(dotNext, "standalone", appPath);
-  const standaloneAppDotNext = path11.join(standaloneApp, ".next");
-  const standaloneAppServer = path11.join(standaloneAppDotNext, "server");
-  const nodeModules = path11.join(standaloneApp, "node_modules");
-  const internalPackage = path11.join(nodeModules, ...PACKAGE_NAME.split("/"));
-  return {
-    paths: {
-      nextApp: appDir,
-      builderOutput: outputDir2,
-      dotNext,
-      standaloneApp,
-      standaloneAppDotNext,
-      standaloneAppServer,
-      internalPackage
-    },
-    cache: {
-      kvBindingName: UserConfig.cache.bindingName
-    },
-    internalPackageName: PACKAGE_NAME
-  };
-}
-function containsDotNextDir(folder) {
-  try {
-    return statSync2(path11.join(folder, ".next")).isDirectory();
-  } catch (e) {
-    return false;
-  }
-}
-function getNextjsApplicationPath(dotNextDir) {
-  const serverPath = findServerParentPath(dotNextDir);
-  if (!serverPath) {
-    throw new Error(`Unexpected Error: no \`.next/server\` folder could be found in \`${serverPath}\``);
-  }
-  return relative(path11.join(dotNextDir, "standalone"), serverPath);
-}
-function findServerParentPath(parentPath) {
-  try {
-    if (statSync2(path11.join(parentPath, ".next", "server")).isDirectory()) {
-      return parentPath;
-    }
-  } catch {
-  }
-  const folders = readdirSync3(parentPath);
-  for (const folder of folders) {
-    const subFolder = path11.join(parentPath, folder);
-    if (statSync2(path11.join(parentPath, folder)).isDirectory()) {
-      const dirServerPath = findServerParentPath(subFolder);
-      if (dirServerPath) {
-        return dirServerPath;
-      }
-    }
-  }
-}
-
 // src/cli/build/index.ts
 import { cpSync as cpSync2 } from "node:fs";
 import path12 from "node:path";
+import { rm } from "node:fs/promises";
 async function build2(appDir, opts) {
   if (!opts.skipBuild) {
     buildNextjsApp(appDir);
@@ -7201,6 +7149,56 @@ async function cleanDirectory(path13) {
 }
 
 // src/cli/index.ts
+import { existsSync as existsSync4 } from "node:fs";
+
+// src/cli/args.ts
+import { mkdirSync, statSync as statSync2 } from "node:fs";
+import { parseArgs } from "node:util";
+import { resolve } from "node:path";
+function getArgs() {
+  const {
+    values: { skipBuild: skipBuild2, output }
+  } = parseArgs({
+    options: {
+      skipBuild: {
+        type: "boolean",
+        short: "s",
+        default: false
+      },
+      output: {
+        type: "string",
+        short: "o"
+      }
+    },
+    allowPositionals: false
+  });
+  const outputDir2 = output ? resolve(output) : void 0;
+  if (outputDir2) {
+    assertDirArg(outputDir2, "output", true);
+  }
+  return {
+    outputDir: outputDir2,
+    skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
+  };
+}
+function assertDirArg(path13, argName, make) {
+  let dirStats;
+  try {
+    dirStats = statSync2(path13);
+  } catch {
+    if (!make) {
+      throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
+    }
+    mkdirSync(path13);
+    return;
+  }
+  if (!dirStats.isDirectory()) {
+    throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a directory`);
+  }
+}
+
+// src/cli/index.ts
+import { resolve as resolve2 } from "node:path";
 var nextAppDir = resolve2(".");
 console.log(`Building the Next.js app in the current folder (${nextAppDir})`);
 if (!["js", "cjs", "mjs", "ts"].some((ext2) => existsSync4(`./next.config.${ext2}`))) {

package/dist/cli/templates/shims/node-fs.ts

@@ -17,7 +17,7 @@ function existsSync(path: string) {
   return FILES.has(path);
 }
 
-async function readFile(path: string, options: unknown): Promise<any> {
+async function readFile(path: string, options: unknown): Promise<unknown> {
   console.log(
     "readFile",
     { path, options }

package/dist/cli/templates/worker.ts

@@ -1,17 +1,18 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-import Stream from "node:stream";
-import type { NextConfig } from "next";
-import { NodeNextRequest, NodeNextResponse } from "next/dist/server/base-http/node";
-import { MockedResponse } from "next/dist/server/lib/mock-request";
 import NextNodeServer, { NodeRequestHandler } from "next/dist/server/next-server";
-import type { IncomingMessage } from "node:http";
+import { NodeNextRequest, NodeNextResponse } from "next/dist/server/base-http/node";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { type CloudflareContext } from "../../api";
+import type { IncomingMessage } from "node:http";
+import { MockedResponse } from "next/dist/server/lib/mock-request";
+import type { NextConfig } from "next";
+import Stream from "node:stream";
 
 const NON_BODY_RESPONSES = new Set([101, 204, 205, 304]);
 
 const cloudflareContextALS = new AsyncLocalStorage<CloudflareContext>();
 
 // Note: this symbol needs to be kept in sync with the one defined in `src/api/get-cloudflare-context.ts`
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 (globalThis as any)[Symbol.for("__cloudflare-context__")] = new Proxy(
   {},
   {
@@ -29,6 +30,7 @@ const nextConfig: NextConfig = JSON.parse(process.env.__NEXT_PRIVATE_STANDALONE_
 let requestHandler: NodeRequestHandler | null = null;
 
 export default {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async fetch(request: Request & { cf: IncomingRequestCfProperties }, env: any, ctx: any) {
     return cloudflareContextALS.run({ env, ctx, cf: request.cf }, async () => {
       if (requestHandler == null) {
@@ -45,12 +47,13 @@ export default {
       const url = new URL(request.url);
 
       if (url.pathname === "/_next/image") {
-        let imageUrl =
+        const imageUrl =
           url.searchParams.get("url") ?? "https://developers.cloudflare.com/_astro/logo.BU9hiExz.svg";
         if (imageUrl.startsWith("/")) {
           return env.ASSETS.fetch(new URL(imageUrl, request.url));
         }
-        return fetch(imageUrl, { cf: { cacheEverything: true } } as any);
+        // @ts-ignore
+        return fetch(imageUrl, { cf: { cacheEverything: true } } as unknown);
       }
 
       const { req, res, webResponse } = getWrappedStreams(request, ctx);
@@ -62,12 +65,12 @@ export default {
   },
 };
 
-function getWrappedStreams(request: Request, ctx: any) {
+function getWrappedStreams(request: Request, ctx: ExecutionContext) {
   const url = new URL(request.url);
 
-  const req = (
-    request.body ? Stream.Readable.fromWeb(request.body as any) : Stream.Readable.from([])
-  ) as IncomingMessage;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const reqBody = request.body && Stream.Readable.fromWeb(request.body as any);
+  const req = (reqBody ?? Stream.Readable.from([])) as IncomingMessage;
   req.httpVersion = "1.0";
   req.httpVersionMajor = 1;
   req.httpVersionMinor = 0;
@@ -94,7 +97,7 @@ function getWrappedStreams(request: Request, ctx: any) {
 
   const res = new MockedResponse({
     resWriter: (chunk) => {
-      resBodyWriter.write(typeof chunk === "string" ? Buffer.from(chunk) : chunk).catch((err: any) => {
+      resBodyWriter.write(typeof chunk === "string" ? Buffer.from(chunk) : chunk).catch((err) => {
         if (
           err.message.includes("WritableStream has been closed") ||
           err.message.includes("Network connection lost")
@@ -110,6 +113,7 @@ function getWrappedStreams(request: Request, ctx: any) {
   });
 
   // It's implemented as a no-op, but really it should mark the headers as done
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   res.flushHeaders = () => (res as any).headPromiseResolve();
 
   // Only allow statusCode to be modified if not sent
@@ -127,6 +131,7 @@ function getWrappedStreams(request: Request, ctx: any) {
   });
 
   // Make sure the writer is eventually closed
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ctx.waitUntil((res as any).hasStreamed.finally(() => resBodyWriter.close().catch(() => {})));
 
   return {
@@ -138,6 +143,7 @@ function getWrappedStreams(request: Request, ctx: any) {
       res.setHeader("content-encoding", "identity");
       return new Response(NON_BODY_RESPONSES.has(res.statusCode) ? null : readable, {
         status: res.statusCode,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         headers: (res as any).headers,
       });
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.0.0-11802c4",
+  "version": "0.0.0-28d3ca1",
   "bin": "dist/cli/index.mjs",
   "main": "./dist/api/index.mjs",
   "types": "./dist/api/index.d.mts",
@@ -32,12 +32,17 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240925.0",
+    "@eslint/js": "^9.11.1",
     "@types/node": "^22.2.0",
     "esbuild": "^0.23.0",
+    "eslint": "^9.11.1",
+    "eslint-plugin-unicorn": "^55.0.0",
     "glob": "^11.0.0",
+    "globals": "^15.9.0",
     "next": "14.2.11",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
+    "typescript-eslint": "^8.7.0",
     "vitest": "^2.1.1"
   },
   "dependencies": {
@@ -49,6 +54,8 @@
   "scripts": {
     "build": "tsup",
     "build:watch": "tsup --watch src",
+    "lint:check": "eslint",
+    "lint:fix": "eslint --fix",
     "test": "vitest --run",
     "test:watch": "vitest"
   }