@opennextjs/cloudflare 0.0.0-88fe982 → 0.0.0-e2c4535

package/README.md

@@ -1,8 +1,10 @@
 # Next.js builder for Cloudflare
 
+How to update a Next.js application to run on Cloudflare.
+
 ## Configure your app
 
-- add the following `devDependency` to the `package.json`:
+- add the following `devDependencies` to the `package.json`:
 
   ```bash
   pnpm add -D wrangler@latest @opennextjs/cloudflare

package/dist/index.mjs

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -24,9 +25,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js
+// ../../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js
 var require_balanced_match = __commonJS({
-  "../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js"(exports, module) {
+  "../../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js"(exports, module) {
     "use strict";
     module.exports = balanced;
     function balanced(a, b, str) {
@@ -82,9 +83,9 @@ var require_balanced_match = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js
+// ../../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js
 var require_brace_expansion = __commonJS({
-  "../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js"(exports, module) {
+  "../../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js"(exports, module) {
     "use strict";
     var balanced = require_balanced_match();
     module.exports = expandTop;
@@ -283,7 +284,7 @@ function assertDirArg(path6, argName, make) {
 }
 
 // src/index.ts
-import { existsSync as existsSync3 } from "node:fs";
+import { existsSync as existsSync4 } from "node:fs";
 
 // src/build/build.ts
 import { rm } from "node:fs/promises";
@@ -309,7 +310,7 @@ function runNextBuildCommand(packager, nextAppDir2) {
 
 // src/build/build-worker.ts
 import { build } from "esbuild";
-import { readFileSync as readFileSync4 } from "node:fs";
+import { existsSync as existsSync3, readFileSync as readFileSync4 } from "node:fs";
 import { cp, readFile, writeFile } from "node:fs/promises";
 
 // src/build/patches/investigated/patch-require.ts
@@ -331,10 +332,10 @@ function copyTemplates(srcDir, nextjsAppPaths) {
 // src/build/patches/to-investigate/patch-read-file.ts
 import { readFileSync } from "node:fs";
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
 var import_brace_expansion = __toESM(require_brace_expansion(), 1);
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/assert-valid-pattern.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/assert-valid-pattern.js
 var MAX_PATTERN_LENGTH = 1024 * 64;
 var assertValidPattern = (pattern) => {
   if (typeof pattern !== "string") {
@@ -345,7 +346,7 @@ var assertValidPattern = (pattern) => {
   }
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/brace-expressions.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/brace-expressions.js
 var posixClasses = {
   "[:alnum:]": ["\\p{L}\\p{Nl}\\p{Nd}", true],
   "[:alpha:]": ["\\p{L}\\p{Nl}", true],
@@ -454,12 +455,12 @@ var parseClass = (glob2, position) => {
   return [comb, uflag, endPos - pos, true];
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/unescape.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/unescape.js
 var unescape = (s, { windowsPathsNoEscape = false } = {}) => {
   return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/ast.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/ast.js
 var types = /* @__PURE__ */ new Set(["!", "?", "+", "*", "@"]);
 var isExtglobType = (c) => types.has(c);
 var startNoTraversal = "(?!(?:^|/)\\.\\.?(?:$|/))";
@@ -938,12 +939,12 @@ var AST = class _AST {
   }
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/escape.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/escape.js
 var escape = (s, { windowsPathsNoEscape = false } = {}) => {
   return windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, "[$&]") : s.replace(/[?*()[\]\\]/g, "\\$&");
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
 var minimatch = (p, pattern, options = {}) => {
   assertValidPattern(pattern);
   if (!options.nocomment && pattern.charAt(0) === "#") {
@@ -1661,10 +1662,10 @@ minimatch.Minimatch = Minimatch;
 minimatch.escape = escape;
 minimatch.unescape = unescape;
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/glob.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/glob.js
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
-// ../node_modules/.pnpm/lru-cache@11.0.0/node_modules/lru-cache/dist/esm/index.js
+// ../../node_modules/.pnpm/lru-cache@11.0.0/node_modules/lru-cache/dist/esm/index.js
 var perf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
 var warned = /* @__PURE__ */ new Set();
 var PROCESS = typeof process === "object" && !!process ? process : {};
@@ -3033,14 +3034,14 @@ var LRUCache = class _LRUCache {
   }
 };
 
-// ../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
+// ../../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 * as actualFS from "node:fs";
 import { lstat, readdir, readlink, realpath } from "node:fs/promises";
 
-// ../node_modules/.pnpm/minipass@7.1.2/node_modules/minipass/dist/esm/index.js
+// ../../node_modules/.pnpm/minipass@7.1.2/node_modules/minipass/dist/esm/index.js
 import { EventEmitter } from "node:events";
 import Stream from "node:stream";
 import { StringDecoder } from "node:string_decoder";
@@ -3918,7 +3919,7 @@ var Minipass = class extends EventEmitter {
   }
 };
 
-// ../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
+// ../../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
 var realpathSync = rps.native;
 var defaultFS = {
   lstatSync,
@@ -5644,7 +5645,7 @@ var PathScurryDarwin = class extends PathScurryPosix {
 var Path = process.platform === "win32" ? PathWin32 : PathPosix;
 var PathScurry = process.platform === "win32" ? PathScurryWin32 : process.platform === "darwin" ? PathScurryDarwin : PathScurryPosix;
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/pattern.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/pattern.js
 var isPatternList = (pl) => pl.length >= 1;
 var isGlobList = (gl) => gl.length >= 1;
 var Pattern = class _Pattern {
@@ -5809,7 +5810,7 @@ var Pattern = class _Pattern {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/ignore.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/ignore.js
 var defaultPlatform2 = typeof process === "object" && process && typeof process.platform === "string" ? process.platform : "linux";
 var Ignore = class {
   relative;
@@ -5896,7 +5897,7 @@ var Ignore = class {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/processor.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/processor.js
 var HasWalkedCache = class _HasWalkedCache {
   store;
   constructor(store = /* @__PURE__ */ new Map()) {
@@ -6117,7 +6118,7 @@ var Processor = class _Processor {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/walker.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/walker.js
 var makeIgnore = (ignore, opts) => typeof ignore === "string" ? new Ignore([ignore], opts) : Array.isArray(ignore) ? new Ignore(ignore, opts) : ignore;
 var GlobUtil = class {
   path;
@@ -6444,7 +6445,7 @@ var GlobStream = class extends GlobUtil {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/glob.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/glob.js
 var defaultPlatform3 = typeof process === "object" && process && typeof process.platform === "string" ? process.platform : "linux";
 var Glob = class {
   absolute;
@@ -6644,7 +6645,7 @@ var Glob = class {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/has-magic.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/has-magic.js
 var hasMagic = (pattern, options = {}) => {
   if (!Array.isArray(pattern)) {
     pattern = [pattern];
@@ -6656,7 +6657,7 @@ var hasMagic = (pattern, options = {}) => {
   return false;
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/index.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/index.js
 function globStreamSync(pattern, options = {}) {
   return new Glob(pattern, options).streamSync();
 }
@@ -6969,7 +6970,7 @@ async function updateWebpackChunksFile(nextjsAppPaths) {
 }
 
 // src/build/build-worker.ts
-async function buildWorker(outputDir2, nextjsAppPaths, templateSrcDir) {
+async function buildWorker(inputNextAppDir, outputDir2, nextjsAppPaths, templateSrcDir) {
   const templateDir = copyTemplates(templateSrcDir, nextjsAppPaths);
   const workerEntrypoint = `${templateDir}/worker.ts`;
   const workerOutputFile = `${outputDir2}/index.mjs`;
@@ -7067,6 +7068,11 @@ Request = globalThis.Request;
   await cp(`${nextjsAppPaths.dotNextDir}/static`, `${outputDir2}/assets/_next/static`, {
     recursive: true
   });
+  if (existsSync3(`${inputNextAppDir}/public`)) {
+    await cp(`${inputNextAppDir}/public`, `${outputDir2}/assets`, {
+      recursive: true
+    });
+  }
   console.log(`\x1B[35mWorker saved in \`${workerOutputFile}\` \u{1F680}
 \x1B[0m`);
 }
@@ -7169,7 +7175,7 @@ async function build2(inputNextAppDir, opts) {
   await cleanDirectory(outputDir2);
   const nextjsAppPaths = getNextjsAppPaths(inputNextAppDir);
   const templateDir = path5.join(path5.dirname(fileURLToPath3(import.meta.url)), "templates");
-  await buildWorker(outputDir2, nextjsAppPaths, templateDir);
+  await buildWorker(inputNextAppDir, outputDir2, nextjsAppPaths, templateDir);
 }
 async function cleanDirectory(path6) {
   return await rm(path6, { recursive: true, force: true });
@@ -7178,7 +7184,7 @@ async function cleanDirectory(path6) {
 // src/index.ts
 var nextAppDir = resolve2(".");
 console.log(`Building the Next.js app in the current folder (${nextAppDir})`);
-if (!["js", "cjs", "mjs", "ts"].some((ext2) => existsSync3(`./next.config.${ext2}`))) {
+if (!["js", "cjs", "mjs", "ts"].some((ext2) => existsSync4(`./next.config.${ext2}`))) {
   throw new Error("Error: Not in a Next.js app project");
 }
 var { skipBuild, outputDir } = getArgs();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.0.0-88fe982",
+  "version": "0.0.0-e2c4535",
   "bin": "dist/index.mjs",
   "files": [
     "README.md",
@@ -9,8 +9,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/flarelabs-net/poc-next.git",
-    "directory": "builder"
+    "url": "https://github.com/opennextjs/opennextjs-cloudflare.git",
+    "directory": "packages/cloudflare"
   },
   "keywords": [
     "cloudflare",
@@ -19,9 +19,9 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/flarelabs-net/poc-next/issues"
+    "url": "https://github.com/opennextjs/opennextjs-cloudflare/issues"
   },
-  "homepage": "https://github.com/flarelabs-net/poc-next",
+  "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "devDependencies": {
     "@types/node": "^22.2.0",
     "esbuild": "^0.23.0",