@opennextjs/cloudflare 0.0.0-5454280 → 0.0.0-698638

package/README.md

@@ -1,31 +1,22 @@
 # Next.js builder for Cloudflare
 
-## Build your app
+How to update a Next.js application to run on Cloudflare.
 
-- update the `next.config.mjs` as follows
+## Configure your app
 
-  ```typescript
-  /** @type {import('next').NextConfig} */
-  const nextConfig = {
-    output: "standalone",
-    experimental: {
-      serverMinification: false,
-    },
-  };
+- add the following `devDependencies` to the `package.json`:
 
-  export default nextConfig;
+  ```bash
+  pnpm add -D wrangler@latest @opennextjs/cloudflare
   ```
 
-- add the following `devDependency` to the `package.json`:
-
-  ```json
-  "node-url": "npm:url@^0.11.4",
-  "wrangler": "^3.77.0"
-  ```
+## Serve your app
 
-- Execute `npx @flarelabs-net/builder@latest` in your app folder
+- build the app and adapt it for Cloudflare
 
-## Serve your app
+  ```bash
+  pnpx cloudflare
+  ```
 
 - add a `wrangler.toml` at the root of your project
 
@@ -36,11 +27,13 @@
 
   compatibility_date = "2024-08-29"
   compatibility_flags = ["nodejs_compat_v2"]
-  workers_dev = true
-  minify = false
 
   # Use the new Workers + Assets to host the static frontend files
   experimental_assets = { directory = ".worker-next/assets", binding = "ASSETS" }
   ```
 
-- Use `wrangler dev`
+- Preview the app in Wrangler
+
+  ```bash
+  pnpm wrangler dev
+  ```

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 { readdirSync as readdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } 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();
 }
@@ -6842,12 +6843,138 @@ function patchWranglerDeps(paths) {
   writeFileSync(tracerFile, pacthedTracer);
 }
 
+// src/build/patches/investigated/update-webpack-chunks-file/index.ts
+import { readdirSync as readdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
+
+// src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
+import * as ts from "ts-morph";
+async function getChunkInstallationIdentifiers(sourceFile) {
+  const installChunkDeclaration = getInstallChunkDeclaration(sourceFile);
+  const installedChunksDeclaration = getInstalledChunksDeclaration(sourceFile, installChunkDeclaration);
+  return {
+    installChunk: installChunkDeclaration.getName(),
+    installedChunks: installedChunksDeclaration.getName()
+  };
+}
+function getInstallChunkDeclaration(sourceFile) {
+  const installChunkDeclaration = sourceFile.getDescendantsOfKind(ts.SyntaxKind.VariableDeclaration).find((declaration) => {
+    const arrowFunction = declaration.getInitializerIfKind(ts.SyntaxKind.ArrowFunction);
+    if (!arrowFunction) return false;
+    const functionParameters = arrowFunction.getParameters();
+    if (functionParameters.length !== 1) return false;
+    const arrowFunctionBodyBlock = arrowFunction.getFirstChildByKind(ts.SyntaxKind.Block);
+    if (!arrowFunctionBodyBlock) return false;
+    const statementKinds = arrowFunctionBodyBlock.getStatements().map((statement) => statement.getKind());
+    const forInStatements = statementKinds.filter((s) => s === ts.SyntaxKind.ForInStatement);
+    const forStatements = statementKinds.filter((s) => s === ts.SyntaxKind.ForStatement);
+    if (forInStatements.length !== 1 || forStatements.length !== 1) return false;
+    const parameterName = functionParameters[0].getText();
+    const functionParameterAccessedProperties = arrowFunctionBodyBlock.getDescendantsOfKind(ts.SyntaxKind.PropertyAccessExpression).filter(
+      (propertyAccessExpression) => propertyAccessExpression.getExpression().getText() === parameterName
+    ).map((propertyAccessExpression) => propertyAccessExpression.getName());
+    if (functionParameterAccessedProperties.join(", ") !== "modules, ids, runtime") return false;
+    return true;
+  });
+  if (!installChunkDeclaration) {
+    throw new Error("ERROR: unable to find the installChunk function declaration");
+  }
+  return installChunkDeclaration;
+}
+function getInstalledChunksDeclaration(sourceFile, installChunkDeclaration) {
+  const allVariableDeclarations = sourceFile.getDescendantsOfKind(ts.SyntaxKind.VariableDeclaration);
+  const installChunkDeclarationIdx = allVariableDeclarations.findIndex(
+    (declaration) => declaration === installChunkDeclaration
+  );
+  const installedChunksDeclaration = allVariableDeclarations[installChunkDeclarationIdx - 1];
+  if (!installedChunksDeclaration?.getInitializer()?.isKind(ts.SyntaxKind.ObjectLiteralExpression)) {
+    throw new Error("ERROR: unable to find the installedChunks declaration");
+  }
+  return installedChunksDeclaration;
+}
+
+// src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
+import * as ts2 from "ts-morph";
+async function getFileContentWithUpdatedWebpackFRequireCode(sourceFile, { installedChunks, installChunk }, chunks) {
+  const webpackFRequireFunction = sourceFile.getDescendantsOfKind(ts2.SyntaxKind.ArrowFunction).find((arrowFunction) => {
+    const binaryExpression = arrowFunction.getFirstAncestorByKind(ts2.SyntaxKind.BinaryExpression);
+    if (!binaryExpression) return false;
+    const binaryExpressionLeft = binaryExpression.getLeft();
+    if (!binaryExpressionLeft.getText().endsWith(".f.require")) return false;
+    const binaryExpressionOperator = binaryExpression.getOperatorToken();
+    if (binaryExpressionOperator.getText() !== "=") return false;
+    const binaryExpressionRight = binaryExpression.getRight();
+    if (binaryExpressionRight !== arrowFunction) return false;
+    const arrowFunctionBody = arrowFunction.getBody();
+    if (!arrowFunctionBody.isKind(ts2.SyntaxKind.Block)) return false;
+    const arrowFunctionBodyText = arrowFunctionBody.getText();
+    const functionUsesChunkInstallationVariables = arrowFunctionBodyText.includes(installChunk) && arrowFunctionBodyText.includes(installedChunks);
+    if (!functionUsesChunkInstallationVariables) return false;
+    const functionParameters = arrowFunction.getParameters();
+    if (functionParameters.length !== 2) return false;
+    const callsInstallChunk = arrowFunctionBody.getDescendantsOfKind(ts2.SyntaxKind.CallExpression).some((callExpression) => callExpression.getExpression().getText() === installChunk);
+    if (!callsInstallChunk) return false;
+    const functionFirstParameterName = functionParameters[0]?.getName();
+    const accessesInstalledChunksUsingItsFirstParameter = arrowFunctionBody.getDescendantsOfKind(ts2.SyntaxKind.ElementAccessExpression).some((elementAccess) => {
+      return elementAccess.getExpression().getText() === installedChunks && elementAccess.getArgumentExpression()?.getText() === functionFirstParameterName;
+    });
+    if (!accessesInstalledChunksUsingItsFirstParameter) return false;
+    return true;
+  });
+  if (!webpackFRequireFunction) {
+    throw new Error("ERROR: unable to find the webpack f require function declaration");
+  }
+  const functionParameterNames = webpackFRequireFunction.getParameters().map((parameter) => parameter.getName());
+  const chunkId = functionParameterNames[0];
+  const functionBody = webpackFRequireFunction.getBody();
+  functionBody.insertStatements(0, [
+    `if (${installedChunks}[${chunkId}]) return;`,
+    ...chunks.map(
+      (chunk) => `
+if(${chunkId} === ${chunk}) return ${installChunk}(require("./chunks/${chunk}.js"));`
+    )
+  ]);
+  return sourceFile.print();
+}
+
+// src/build/utils/ts-parse-file.ts
+import * as ts3 from "ts-morph";
+function tsParseFile(fileContent) {
+  const project = new ts3.Project();
+  const sourceFile = project.createSourceFile("file.js", fileContent);
+  return sourceFile;
+}
+
+// src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts
+async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
+  const tsSourceFile = tsParseFile(fileContent);
+  const chunkInstallationIdentifiers = await getChunkInstallationIdentifiers(tsSourceFile);
+  const updatedFileContent = getFileContentWithUpdatedWebpackFRequireCode(
+    tsSourceFile,
+    chunkInstallationIdentifiers,
+    chunks
+  );
+  return updatedFileContent;
+}
+
+// src/build/patches/investigated/update-webpack-chunks-file/index.ts
+async function updateWebpackChunksFile(nextjsAppPaths) {
+  console.log("# updateWebpackChunksFile");
+  const webpackRuntimeFile = `${nextjsAppPaths.standaloneAppServerDir}/webpack-runtime.js`;
+  const fileContent = readFileSync3(webpackRuntimeFile, "utf-8");
+  const chunks = readdirSync2(`${nextjsAppPaths.standaloneAppServerDir}/chunks`).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
+    console.log(` - chunk ${chunk}`);
+    return chunk.replace(/\.js$/, "");
+  });
+  const updatedFileContent = await getUpdatedWebpackChunksFileContent(fileContent, chunks);
+  writeFileSync2(webpackRuntimeFile, updatedFileContent);
+}
+
 // 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`;
-  const nextConfigStr = readFileSync3(nextjsAppPaths.standaloneAppDir + "/server.js", "utf8")?.match(
+  const nextConfigStr = readFileSync4(nextjsAppPaths.standaloneAppDir + "/server.js", "utf8")?.match(
     /const nextConfig = ({.+?})\n/
   )?.[1] ?? {};
   console.log(`\x1B[35m\u2699\uFE0F Bundling the worker file...
@@ -6941,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`);
 }
@@ -6954,31 +7086,6 @@ async function updateWorkerBundledCode(workerOutputFile, nextjsAppPaths) {
   patchedCode = inlineEvalManifest(patchedCode, nextjsAppPaths);
   await writeFile(workerOutputFile, patchedCode);
 }
-async function updateWebpackChunksFile(nextjsAppPaths) {
-  console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = `${nextjsAppPaths.standaloneAppServerDir}/webpack-runtime.js`;
-  console.log({ webpackRuntimeFile });
-  const fileContent = readFileSync3(webpackRuntimeFile, "utf-8");
-  const chunks = readdirSync2(`${nextjsAppPaths.standaloneAppServerDir}/chunks`).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
-    console.log(` - chunk ${chunk}`);
-    return chunk.replace(/\.js$/, "");
-  });
-  const updatedFileContent = fileContent.replace(
-    "__webpack_require__.f.require = (chunkId, promises) => {",
-    `__webpack_require__.f.require = (chunkId, promises) => {
-	if (installedChunks[chunkId]) return;
-	${chunks.map(
-      (chunk) => `
-	  if (chunkId === ${chunk}) {
-		installChunk(require("./chunks/${chunk}.js"));
-		return;
-	  }
-	`
-    ).join("\n")}
-  `
-  );
-  writeFileSync2(webpackRuntimeFile, updatedFileContent);
-}
 function createFixRequiresESBuildPlugin(templateDir) {
   return {
     name: "replaceRelative",
@@ -7068,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 });
@@ -7077,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-5454280",
+  "version": "0.0.0-0698638",
   "bin": "dist/index.mjs",
   "files": [
     "README.md",
@@ -10,7 +10,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/flarelabs-net/poc-next.git",
-    "directory": "builder"
+    "directory": "packages/cloudflare"
   },
   "keywords": [
     "cloudflare",
@@ -23,16 +23,20 @@
   },
   "homepage": "https://github.com/flarelabs-net/poc-next",
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240909.0",
     "@types/node": "^22.2.0",
     "esbuild": "^0.23.0",
     "glob": "^11.0.0",
-    "next": "14.2.5",
     "tsup": "^8.2.4",
-    "typescript": "^5.5.4"
+    "typescript": "^5.5.4",
+    "vitest": "^2.1.1"
+  },
+  "dependencies": {
+    "ts-morph": "^23.0.0"
   },
   "scripts": {
     "build": "tsup",
-    "build:watch": "tsup --watch src"
+    "build:watch": "tsup --watch src",
+    "test": "vitest --run",
+    "test:watch": "vitest"
   }
 }