@opennextjs/cloudflare 0.4.0 → 0.4.2

package/dist/api/cloudflare-context.js

@@ -41,10 +41,28 @@ export function getCloudflareContext() {
  * Note: this function should only be called inside the Next.js config file, and although async it doesn't need to be `await`ed
  */
 export async function initOpenNextCloudflareForDev() {
+    const shouldInitializationRun = shouldContextInitializationRun();
+    if (!shouldInitializationRun)
+        return;
     const context = await getCloudflareContextFromWrangler();
     addCloudflareContextToNodejsGlobal(context);
     await monkeyPatchVmModuleEdgeContext(context);
 }
+/**
+ * Next dev server imports the config file twice (in two different processes, making it hard to track),
+ * this causes the initialization to run twice as well, to keep things clean, not allocate extra
+ * resources (i.e. instantiate two miniflare instances) and avoid extra potential logs, it would be best
+ * to run the initialization only once, this function is used to try to make it so that it does, it returns
+ * a flag which indicates if the initialization should run in the current process or not.
+ *
+ * @returns boolean indicating if the initialization should run
+ */
+function shouldContextInitializationRun() {
+    // via debugging we've seen that AsyncLocalStorage is only set in one of the
+    // two processes so we're using it as the differentiator between the two
+    const AsyncLocalStorage = globalThis["AsyncLocalStorage"];
+    return !!AsyncLocalStorage;
+}
 /**
  * Adds the cloudflare context to the global scope in which the Next.js dev node.js process runs in, enabling
  * future calls to `getCloudflareContext` to retrieve and return such context

package/dist/cli/build/bundle-server.d.ts

@@ -3,6 +3,10 @@ import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
  * Bundle the Open Next server.
  */
 export declare function bundleServer(buildOpts: BuildOptions): Promise<void>;
+/**
+ * This function applies patches required for the code to run on workers.
+ */
+export declare function updateWorkerBundledCode(workerOutputFile: string, buildOpts: BuildOptions): Promise<void>;
 /**
  * Gets the path of the worker.js file generated by the build process
  *

package/dist/cli/build/bundle-server.js

@@ -7,10 +7,27 @@ import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { build } from "esbuild";
 import { patchOptionalDependencies } from "./patches/ast/optional-deps.js";
+import { patchVercelOgLibrary } from "./patches/ast/patch-vercel-og-library.js";
 import * as patches from "./patches/index.js";
+import fixRequire from "./patches/plugins/require.js";
+import inlineRequirePagePlugin from "./patches/plugins/require-page.js";
+import setWranglerExternal from "./patches/plugins/wrangler-external.js";
 import { normalizePath, patchCodeWithValidations } from "./utils/index.js";
 /** The dist directory of the Cloudflare adapter package */
 const packageDistDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "../..");
+/**
+ * List of optional Next.js dependencies.
+ * They are not required for Next.js to run but only needed to enabled specific features.
+ * When one of those dependency is required, it should be installed by the application.
+ */
+const optionalDependencies = [
+    "caniuse-lite",
+    "critters",
+    "jimp",
+    "probe-image-size",
+    // `server.edge` is not available in react-dom@18
+    "react-dom/server.edge",
+];
 /**
  * Bundle the Open Next server.
  */
@@ -20,22 +37,27 @@ export async function bundleServer(buildOpts) {
     const serverFiles = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/required-server-files.json");
     const nextConfig = JSON.parse(fs.readFileSync(serverFiles, "utf-8")).config;
     console.log(`\x1b[35m⚙️ Bundling the OpenNext server...\n\x1b[0m`);
-    patches.patchWranglerDeps(buildOpts);
     await patches.updateWebpackChunksFile(buildOpts);
-    patches.patchVercelOgLibrary(buildOpts);
+    patchVercelOgLibrary(buildOpts);
     const outputPath = path.join(outputDir, "server-functions", "default");
     const packagePath = getPackagePath(buildOpts);
     const openNextServer = path.join(outputPath, packagePath, `index.mjs`);
     const openNextServerBundle = path.join(outputPath, packagePath, `handler.mjs`);
-    await build({
+    const result = await build({
         entryPoints: [openNextServer],
         bundle: true,
         outfile: openNextServerBundle,
         format: "esm",
         target: "esnext",
         minify: false,
-        plugins: [createFixRequiresESBuildPlugin(buildOpts)],
-        external: ["./middleware/handler.mjs", "caniuse-lite"],
+        metafile: true,
+        plugins: [
+            createFixRequiresESBuildPlugin(buildOpts),
+            inlineRequirePagePlugin(buildOpts),
+            setWranglerExternal(),
+            fixRequire(),
+        ],
+        external: ["./middleware/handler.mjs", ...optionalDependencies],
         alias: {
             // Note: we apply an empty shim to next/dist/compiled/ws because it generates two `eval`s:
             //   eval("require")("bufferutil");
@@ -63,7 +85,6 @@ export async function bundleServer(buildOpts) {
             "process.env.NODE_ENV": '"production"',
             "process.env.NEXT_MINIMAL": "true",
         },
-        // We need to set platform to node so that esbuild doesn't complain about the node imports
         platform: "node",
         banner: {
             js: `
@@ -91,7 +112,7 @@ const CustomRequest = class extends globalThis.Request {
       // https://github.com/cloudflare/workerd/issues/2746
       // https://github.com/cloudflare/workerd/issues/3245
       Object.defineProperty(init, "body", {
-        value: init.body instanceof __cf_stream.Readable ? ReadableStream.from(init.body) : init.body;
+        value: init.body instanceof __cf_stream.Readable ? ReadableStream.from(init.body) : init.body
       });
     }
     super(input, init);
@@ -105,6 +126,11 @@ globalThis.__BUILD_TIMESTAMP_MS__ = ${Date.now()};
 `,
         },
     });
+    if (result.errors.length > 0) {
+        result.errors.forEach((error) => console.error(error));
+        throw new Error(`There was a problem bundling the server.`);
+    }
+    fs.writeFileSync(openNextServerBundle + ".meta.json", JSON.stringify(result.metafile, null, 2));
     await updateWorkerBundledCode(openNextServerBundle, buildOpts);
     const isMonorepo = monorepoRoot !== appPath;
     if (isMonorepo) {
@@ -115,13 +141,12 @@ globalThis.__BUILD_TIMESTAMP_MS__ = ${Date.now()};
 /**
  * This function applies patches required for the code to run on workers.
  */
-async function updateWorkerBundledCode(workerOutputFile, buildOpts) {
+export async function updateWorkerBundledCode(workerOutputFile, buildOpts) {
     const code = await readFile(workerOutputFile, "utf8");
     const patchedCode = await patchCodeWithValidations(code, [
         ["require", patches.patchRequire],
         ["`buildId` function", (code) => patches.patchBuildId(code, buildOpts)],
         ["`loadManifest` function", (code) => patches.patchLoadManifest(code, buildOpts)],
-        ["next's require", (code) => patches.inlineNextRequire(code, buildOpts)],
         ["`findDir` function", (code) => patches.patchFindDir(code, buildOpts)],
         ["`evalManifest` function", (code) => patches.inlineEvalManifest(code, buildOpts)],
         ["cacheHandler", (code) => patches.patchCache(code, buildOpts)],
@@ -137,11 +162,6 @@ async function updateWorkerBundledCode(workerOutputFile, buildOpts) {
                 // TODO: implement for cf (possibly in @opennextjs/aws)
                 .replace("patchAsyncStorage();", "//patchAsyncStorage();"),
         ],
-        [
-            '`eval("require")` calls',
-            (code) => code.replaceAll('eval("require")', "require"),
-            { isOptional: true },
-        ],
         [
             "`require.resolve` call",
             // workers do not support dynamic require nor require.resolve
@@ -149,7 +169,7 @@ async function updateWorkerBundledCode(workerOutputFile, buildOpts) {
         ],
     ]);
     const bundle = parse(Lang.TypeScript, patchedCode).root();
-    const { edits } = patchOptionalDependencies(bundle);
+    const { edits } = patchOptionalDependencies(bundle, optionalDependencies);
     await writeFile(workerOutputFile, bundle.commitEdits(edits));
 }
 function createFixRequiresESBuildPlugin(options) {

package/dist/cli/build/patches/ast/optional-deps.d.ts

@@ -1,13 +1,20 @@
 import { type SgNode } from "@ast-grep/napi";
 /**
- * Handle optional dependencies.
+ * Handles optional dependencies.
  *
  * A top level `require(optionalDep)` would throw when the dep is not installed.
  *
  * So we wrap `require(optionalDep)` in a try/catch (if not already present).
  */
-export declare const optionalDepRule = "\nrule:\n  pattern: $$$LHS = require($$$REQ)\n  has:\n    pattern: $MOD\n    kind: string_fragment\n    stopBy: end\n    regex: ^caniuse-lite(/|$)\n  not:\n    inside:\n      kind: try_statement\n      stopBy: end\n\nfix: |-\n  try {\n    $$$LHS = require($$$REQ);\n  } catch {\n    throw new Error('The optional dependency \"$MOD\" is not installed');\n  }\n";
-export declare function patchOptionalDependencies(root: SgNode): {
+export declare function buildOptionalDepRule(dependencies: string[]): string;
+/**
+ * Wraps requires for passed dependencies in a `try ... catch`.
+ *
+ * @param root AST root node
+ * @param dependencies List of dependencies to wrap
+ * @returns matches and edits, see `applyRule`
+ */
+export declare function patchOptionalDependencies(root: SgNode, dependencies: string[]): {
     edits: import("@ast-grep/napi").Edit[];
     matches: SgNode<import("@ast-grep/napi/types/staticTypes.js").TypesMap, import("@ast-grep/napi/types/staticTypes.js").Kinds<import("@ast-grep/napi/types/staticTypes.js").TypesMap>>[];
 };

package/dist/cli/build/patches/ast/optional-deps.js

@@ -1,31 +1,44 @@
 import { applyRule } from "./util.js";
 /**
- * Handle optional dependencies.
+ * Handles optional dependencies.
  *
  * A top level `require(optionalDep)` would throw when the dep is not installed.
  *
  * So we wrap `require(optionalDep)` in a try/catch (if not already present).
  */
-export const optionalDepRule = `
-rule:
-  pattern: $$$LHS = require($$$REQ)
-  has:
-    pattern: $MOD
-    kind: string_fragment
-    stopBy: end
-    regex: ^caniuse-lite(/|$)
-  not:
-    inside:
-      kind: try_statement
+export function buildOptionalDepRule(dependencies) {
+    // Build a regexp matching either
+    // - the full packages names, i.e. `package`
+    // - subpaths in the package, i.e. `package/...`
+    const regex = `^(${dependencies.join("|")})(/|$)`;
+    return `
+  rule:
+    pattern: $$$LHS = require($$$REQ)
+    has:
+      pattern: $MOD
+      kind: string_fragment
       stopBy: end
+      regex: ${regex}
+    not:
+      inside:
+        kind: try_statement
+        stopBy: end
 
-fix: |-
-  try {
-    $$$LHS = require($$$REQ);
-  } catch {
-    throw new Error('The optional dependency "$MOD" is not installed');
-  }
-`;
-export function patchOptionalDependencies(root) {
-    return applyRule(optionalDepRule, root);
+  fix: |-
+    try {
+      $$$LHS = require($$$REQ);
+    } catch {
+      throw new Error('The optional dependency "$MOD" is not installed');
+    }
+  `;
+}
+/**
+ * Wraps requires for passed dependencies in a `try ... catch`.
+ *
+ * @param root AST root node
+ * @param dependencies List of dependencies to wrap
+ * @returns matches and edits, see `applyRule`
+ */
+export function patchOptionalDependencies(root, dependencies) {
+    return applyRule(buildOptionalDepRule(dependencies), root);
 }

package/dist/cli/build/patches/ast/optional-deps.spec.js

@@ -1,10 +1,10 @@
 import { describe, expect, it } from "vitest";
-import { optionalDepRule } from "./optional-deps.js";
+import { buildOptionalDepRule } from "./optional-deps.js";
 import { patchCode } from "./util.js";
 describe("optional dependecy", () => {
     it('should wrap a top-level require("caniuse-lite") in a try-catch', () => {
         const code = `t = require("caniuse-lite");`;
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`
       "try {
         t = require("caniuse-lite");
       } catch {
@@ -14,7 +14,7 @@ describe("optional dependecy", () => {
     });
     it('should wrap a top-level require("caniuse-lite/data") in a try-catch', () => {
         const code = `t = require("caniuse-lite/data");`;
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`
       "try {
         t = require("caniuse-lite/data");
       } catch {
@@ -24,7 +24,7 @@ describe("optional dependecy", () => {
     });
     it('should wrap e.exports = require("caniuse-lite") in a try-catch', () => {
         const code = 'e.exports = require("caniuse-lite");';
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`
       "try {
         e.exports = require("caniuse-lite");
       } catch {
@@ -34,7 +34,7 @@ describe("optional dependecy", () => {
     });
     it('should wrap module.exports = require("caniuse-lite") in a try-catch', () => {
         const code = 'module.exports = require("caniuse-lite");';
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`
       "try {
         module.exports = require("caniuse-lite");
       } catch {
@@ -44,7 +44,7 @@ describe("optional dependecy", () => {
     });
     it('should wrap exports.foo = require("caniuse-lite") in a try-catch', () => {
         const code = 'exports.foo = require("caniuse-lite");';
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`
       "try {
         exports.foo = require("caniuse-lite");
       } catch {
@@ -54,21 +54,21 @@ describe("optional dependecy", () => {
     });
     it('should not wrap require("lodash") in a try-catch', () => {
         const code = 't = require("lodash");';
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`"t = require("lodash");"`);
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`"t = require("lodash");"`);
     });
     it('should not wrap require("other-module") if it does not match caniuse-lite regex', () => {
         const code = 't = require("other-module");';
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`"t = require("other-module");"`);
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`"t = require("other-module");"`);
     });
     it("should not wrap a require() call already inside a try-catch", () => {
         const code = `
 try {
-  const t = require("caniuse-lite");
+  t = require("caniuse-lite");
 } catch {}
 `;
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`
       "try {
-        const t = require("caniuse-lite");
+        t = require("caniuse-lite");
       } catch {}
       "
     `);
@@ -76,14 +76,60 @@ try {
     it("should handle require with subpath and not wrap if already in try-catch", () => {
         const code = `
 try {
-  const t = require("caniuse-lite/path");
+   t = require("caniuse-lite/path");
 } catch {}
 `;
-        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`
       "try {
-        const t = require("caniuse-lite/path");
+         t = require("caniuse-lite/path");
       } catch {}
       "
     `);
     });
+    it("should handle multiple dependencies", () => {
+        const code = `
+t1 = require("caniuse-lite");
+t2 = require("caniuse-lite/path");
+t3 = require("jimp");
+t4 = require("jimp/path");
+`;
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite", "jimp"]))).toMatchInlineSnapshot(`
+      "try {
+        t1 = require("caniuse-lite");
+      } catch {
+        throw new Error('The optional dependency "caniuse-lite" is not installed');
+      };
+      try {
+        t2 = require("caniuse-lite/path");
+      } catch {
+        throw new Error('The optional dependency "caniuse-lite/path" is not installed');
+      };
+      try {
+        t3 = require("jimp");
+      } catch {
+        throw new Error('The optional dependency "jimp" is not installed');
+      };
+      try {
+        t4 = require("jimp/path");
+      } catch {
+        throw new Error('The optional dependency "jimp/path" is not installed');
+      };
+      "
+    `);
+    });
+    it("should not update partial matches", () => {
+        const code = `
+t1 = require("before-caniuse-lite");
+t2 = require("before-caniuse-lite/path");
+t3 = require("caniuse-lite-after");
+t4 = require("caniuse-lite-after/path");
+`;
+        expect(patchCode(code, buildOptionalDepRule(["caniuse-lite"]))).toMatchInlineSnapshot(`
+      "t1 = require("before-caniuse-lite");
+      t2 = require("before-caniuse-lite/path");
+      t3 = require("caniuse-lite-after");
+      t4 = require("caniuse-lite-after/path");
+      "
+    `);
+    });
 });

package/dist/cli/build/patches/{investigated → ast}/patch-vercel-og-library.js

@@ -2,8 +2,8 @@ import { copyFileSync, existsSync, readFileSync, renameSync, writeFileSync } fro
 import path from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { globSync } from "glob";
-import { parseFile } from "../ast/util.js";
-import { patchVercelOgFallbackFont, patchVercelOgImport } from "../ast/vercel-og.js";
+import { parseFile } from "./util.js";
+import { patchVercelOgFallbackFont, patchVercelOgImport } from "./vercel-og.js";
 /**
  * Patches the usage of @vercel/og to be compatible with Cloudflare Workers.
  *

package/dist/cli/build/patches/investigated/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./copy-package-cli-files.js";
 export * from "./patch-cache.js";
 export * from "./patch-require.js";
-export * from "./patch-vercel-og-library.js";
 export * from "./update-webpack-chunks-file/index.js";

package/dist/cli/build/patches/investigated/index.js

@@ -1,5 +1,4 @@
 export * from "./copy-package-cli-files.js";
 export * from "./patch-cache.js";
 export * from "./patch-require.js";
-export * from "./patch-vercel-og-library.js";
 export * from "./update-webpack-chunks-file/index.js";

package/dist/cli/build/patches/plugins/require-page.d.ts

@@ -0,0 +1,6 @@
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
+import type { PluginBuild } from "esbuild";
+export default function inlineRequirePagePlugin(buildOpts: BuildOptions): {
+    name: string;
+    setup: (build: PluginBuild) => Promise<void>;
+};

package/dist/cli/build/patches/plugins/require-page.js

@@ -0,0 +1,70 @@
+import { existsSync, readFileSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+import { patchCode } from "../ast/util.js";
+export default function inlineRequirePagePlugin(buildOpts) {
+    return {
+        name: "inline-require-page",
+        setup: async (build) => {
+            build.onLoad({
+                filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/require\.js$`, { escape: false }),
+            }, async ({ path }) => {
+                const jsCode = await readFile(path, "utf8");
+                if (/function requirePage\(/.test(jsCode)) {
+                    return { contents: patchCode(jsCode, getRule(buildOpts)) };
+                }
+            });
+        },
+    };
+}
+function getRule(buildOpts) {
+    const { outputDir } = buildOpts;
+    const serverDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
+    const pagesManifestFile = join(serverDir, "pages-manifest.json");
+    const appPathsManifestFile = join(serverDir, "app-paths-manifest.json");
+    const pagesManifests = existsSync(pagesManifestFile)
+        ? Object.values(JSON.parse(readFileSync(pagesManifestFile, "utf-8")))
+        : [];
+    const appPathsManifests = existsSync(appPathsManifestFile)
+        ? Object.values(JSON.parse(readFileSync(appPathsManifestFile, "utf-8")))
+        : [];
+    const manifests = pagesManifests.concat(appPathsManifests);
+    const htmlFiles = manifests.filter((file) => file.endsWith(".html"));
+    const jsFiles = manifests.filter((file) => file.endsWith(".js"));
+    // Inline fs access and dynamic require that are not supported by workerd.
+    const fnBody = `
+// html
+${htmlFiles
+        .map((file) => `if (pagePath.endsWith("${file}")) {
+        return ${JSON.stringify(readFileSync(join(serverDir, file), "utf-8"))};
+      }`)
+        .join("\n")}
+// js
+process.env.__NEXT_PRIVATE_RUNTIME_TYPE = isAppPath ? 'app' : 'pages';
+try {
+  ${jsFiles
+        .map((file) => `if (pagePath.endsWith("${file}")) {
+        return require(${JSON.stringify(join(serverDir, file))});
+      }`)
+        .join("\n")}
+} finally {
+  process.env.__NEXT_PRIVATE_RUNTIME_TYPE = '';
+}
+`;
+    return {
+        rule: {
+            pattern: `
+function requirePage($PAGE, $DIST_DIR, $IS_APPP_ATH) {
+  const $_ = getPagePath($$$ARGS);
+  $$$_BODY
+}`,
+        },
+        fix: `
+function requirePage($PAGE, $DIST_DIR, $IS_APPP_ATH) {
+  const pagePath = getPagePath($$$ARGS);
+  ${fnBody}
+}`,
+    };
+}

package/dist/cli/build/patches/plugins/require.d.ts

@@ -0,0 +1,5 @@
+import type { PluginBuild } from "esbuild";
+export default function fixRequire(): {
+    name: string;
+    setup: (build: PluginBuild) => Promise<void>;
+};

package/dist/cli/build/patches/plugins/require.js

@@ -0,0 +1,44 @@
+import fs from "node:fs/promises";
+export default function fixRequire() {
+    return {
+        name: "fix-require",
+        setup: async (build) => {
+            build.onLoad({ filter: /.*/ }, async ({ path }) => {
+                let contents = await fs.readFile(path, "utf-8");
+                // `eval(...)` is not supported by workerd.
+                contents = contents.replaceAll(`eval("require")`, "require");
+                // `@opentelemetry` has a few issues.
+                //
+                // Next.js has the following code in `next/dist/server/lib/trace/tracer.js`:
+                //
+                //     try {
+                //       api = require('@opentelemetry/api');
+                //     } catch (err) {
+                //       api = require('next/dist/compiled/@opentelemetry/api');
+                //     }
+                //
+                // The intent is to allow users to install their own version of `@opentelemetry/api`.
+                //
+                // The problem is that even when users do not explicitely install `@opentelemetry/api`,
+                // `require('@opentelemetry/api')` resolves to the package which is a dependency
+                // of Next.
+                //
+                // The second problem is that when Next traces files, it would not copy the `api/build/esm`
+                // folder (used by the `module` conditions in package.json) it would only copy `api/build/src`.
+                // This could be solved by updating the next config:
+                //
+                //     const nextConfig: NextConfig = {
+                //       // ...
+                //       outputFileTracingIncludes: {
+                //         "*": ["./node_modules/@opentelemetry/api/build/**/*"],
+                //       },
+                //     };
+                //
+                // We can consider doing that when we want to enable users to install their own version
+                // of `@opentelemetry/api`. For now we simply use the pre-compiled version.
+                contents = contents.replace(/require\(.@opentelemetry\/api.\)/g, `require("next/dist/compiled/@opentelemetry/api")`);
+                return { contents };
+            });
+        },
+    };
+}

package/dist/cli/build/patches/plugins/wrangler-external.d.ts

@@ -0,0 +1,20 @@
+/**
+ * ESBuild plugin to mark files bundled by wrangler as external.
+ *
+ * `.wasm` and `.bin` will ultimately be bundled by wrangler.
+ * We should only mark them as external in the adapter.
+ *
+ * However simply marking them as external would copy the import path to the bundle,
+ * i.e. `import("./file.wasm?module")` and given than the bundle is generated in a
+ * different location than the input files, the relative path would not be valid.
+ *
+ * This ESBuild plugin convert relative paths to absolute paths so that they are
+ * still valid from inside the bundle.
+ *
+ * ref: https://developers.cloudflare.com/workers/wrangler/bundling/
+ */
+import type { PluginBuild } from "esbuild";
+export default function setWranglerExternal(): {
+    name: string;
+    setup: (build: PluginBuild) => Promise<void>;
+};

package/dist/cli/build/patches/plugins/wrangler-external.js

@@ -0,0 +1,36 @@
+/**
+ * ESBuild plugin to mark files bundled by wrangler as external.
+ *
+ * `.wasm` and `.bin` will ultimately be bundled by wrangler.
+ * We should only mark them as external in the adapter.
+ *
+ * However simply marking them as external would copy the import path to the bundle,
+ * i.e. `import("./file.wasm?module")` and given than the bundle is generated in a
+ * different location than the input files, the relative path would not be valid.
+ *
+ * This ESBuild plugin convert relative paths to absolute paths so that they are
+ * still valid from inside the bundle.
+ *
+ * ref: https://developers.cloudflare.com/workers/wrangler/bundling/
+ */
+import { dirname, resolve } from "node:path";
+export default function setWranglerExternal() {
+    return {
+        name: "wrangler-externals",
+        setup: async (build) => {
+            const namespace = "wrangler-externals-plugin";
+            build.onResolve({ filter: /(\.bin|\.wasm\?module)$/ }, ({ path, importer }) => {
+                return {
+                    path: resolve(dirname(importer), path),
+                    namespace,
+                    external: true,
+                };
+            });
+            build.onLoad({ filter: /.*/, namespace }, async ({ path }) => {
+                return {
+                    contents: `export * from '${path}';`,
+                };
+            });
+        },
+    };
+}

package/dist/cli/build/patches/to-investigate/index.d.ts

@@ -1,8 +1,6 @@
 export * from "./inline-eval-manifest.js";
 export * from "./inline-middleware-manifest-require.js";
-export * from "./inline-next-require.js";
 export * from "./patch-exception-bubbling.js";
 export * from "./patch-find-dir.js";
 export * from "./patch-load-instrumentation-module.js";
 export * from "./patch-read-file.js";
-export * from "./wrangler-deps.js";

package/dist/cli/build/patches/to-investigate/index.js

@@ -1,8 +1,6 @@
 export * from "./inline-eval-manifest.js";
 export * from "./inline-middleware-manifest-require.js";
-export * from "./inline-next-require.js";
 export * from "./patch-exception-bubbling.js";
 export * from "./patch-find-dir.js";
 export * from "./patch-load-instrumentation-module.js";
 export * from "./patch-read-file.js";
-export * from "./wrangler-deps.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -47,7 +47,7 @@
     "@tsconfig/strictest": "^2.0.5",
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^22.2.0",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.24.2",
     "eslint": "^9.11.1",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
@@ -63,14 +63,14 @@
   "dependencies": {
     "@ast-grep/napi": "^0.34.1",
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@712",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@715",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "ts-morph": "^23.0.0",
     "yaml": "^2.7.0"
   },
   "peerDependencies": {
-    "wrangler": "^3.105.0"
+    "wrangler": "^3.106.0"
   },
   "scripts": {
     "clean": "rimraf dist",

package/dist/cli/build/patches/to-investigate/inline-next-require.d.ts

@@ -1,6 +0,0 @@
-import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-/**
- * The following avoid various Next.js specific files `require`d at runtime since we can just read
- * and inline their content during build time
- */
-export declare function inlineNextRequire(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/inline-next-require.js

@@ -1,40 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-/**
- * The following avoid various Next.js specific files `require`d at runtime since we can just read
- * and inline their content during build time
- */
-// TODO(vicb): __NEXT_PRIVATE_RUNTIME_TYPE is not handled by this patch
-export function inlineNextRequire(code, buildOpts) {
-    const { outputDir } = buildOpts;
-    const serverDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
-    const pagesManifestFile = join(serverDir, "pages-manifest.json");
-    const appPathsManifestFile = join(serverDir, "app-paths-manifest.json");
-    const pagesManifests = existsSync(pagesManifestFile)
-        ? Object.values(JSON.parse(readFileSync(pagesManifestFile, "utf-8")))
-        : [];
-    const appPathsManifests = existsSync(appPathsManifestFile)
-        ? Object.values(JSON.parse(readFileSync(appPathsManifestFile, "utf-8")))
-        : [];
-    const manifests = pagesManifests.concat(appPathsManifests);
-    const htmlPages = manifests.filter((file) => file.endsWith(".html"));
-    const pageModules = manifests.filter((file) => file.endsWith(".js"));
-    return code.replace(/const pagePath = getPagePath\(.+?\);/, `$&
-    ${htmlPages
-        .map((htmlPage) => `
-          if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync(join(serverDir, htmlPage), "utf-8"))};
-          }
-        `)
-        .join("\n")}
-    ${pageModules
-        .map((module) => `
-          if (pagePath.endsWith("${module}")) {
-            return require(${JSON.stringify(join(serverDir, module))});
-          }
-        `)
-        .join("\n")}
-    throw new Error("Unknown pagePath: " + pagePath);
-    `);
-}

package/dist/cli/build/patches/to-investigate/wrangler-deps.d.ts

@@ -1,2 +0,0 @@
-import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-export declare function patchWranglerDeps(buildOpts: BuildOptions): void;

package/dist/cli/build/patches/to-investigate/wrangler-deps.js

@@ -1,115 +0,0 @@
-import { readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-import * as ts from "ts-morph";
-import { tsParseFile } from "../../utils/index.js";
-export function patchWranglerDeps(buildOpts) {
-    console.log("# patchWranglerDeps");
-    const { outputDir } = buildOpts;
-    const nextDistDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), "node_modules/next/dist");
-    const pagesRuntimeFile = join(nextDistDir, "compiled/next-server/pages.runtime.prod.js");
-    const patchedPagesRuntime = readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `
-try {
-  e.exports=require("critters");
-}
-catch {
-  console.error('critters is not installed');
-}
-`);
-    writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
-    patchRequireReactDomServerEdge(nextDistDir);
-    // we shim @opentelemetry/api to the throwing shim so that it will throw right away, this is so that we throw inside the
-    // try block here: https://github.com/vercel/next.js/blob/9e8266a7/packages/next/src/server/lib/trace/tracer.ts#L27-L31
-    // causing the code to require the 'next/dist/compiled/@opentelemetry/api' module instead (which properly works)
-    const tracerFile = join(nextDistDir, "server/lib/trace/tracer.js");
-    const patchedTracer = readFileSync(tracerFile, "utf-8").replaceAll(/\w+\s*=\s*require\([^/]*opentelemetry.*\)/g, `throw new Error("@opentelemetry/api")`);
-    writeFileSync(tracerFile, patchedTracer);
-}
-/**
- * `react-dom` v>=19 has a `server.edge` export: https://github.com/facebook/react/blob/a160102f3/packages/react-dom/package.json#L79
- * but version of `react-dom` <= 18 do not have this export but have a `server.browser` export instead: https://github.com/facebook/react/blob/8a015b68/packages/react-dom/package.json#L49
- *
- * Next.js also try-catches importing the `server.edge` export:
- *  https://github.com/vercel/next.js/blob/6784575/packages/next/src/server/ReactDOMServerPages.js
- *
- * The issue here is that in the `.next/standalone/node_modules/next/dist/compiled/next-server/pages.runtime.prod.js`
- * file for whatever reason there is a non `try-catch`ed require for the `server.edge` export
- *
- * This functions fixes this issue by wrapping the require in a try-catch block in the same way Next.js does it
- * (note: this will make the build succeed but doesn't guarantee that everything will necessarily work at runtime since
- * it's not clear what code and how might be rely on this require call)
- *
- */
-function patchRequireReactDomServerEdge(nextDistDir) {
-    // Patch .next/standalone/node_modules/next/dist/compiled/next-server/pages.runtime.prod.js
-    const pagesRuntimeFile = join(nextDistDir, "compiled/next-server/pages.runtime.prod.js");
-    const code = readFileSync(pagesRuntimeFile, "utf-8");
-    const file = tsParseFile(code);
-    // we need to update this function: `e=>{"use strict";e.exports=require("react-dom/server.edge")}`
-    file.getDescendantsOfKind(ts.SyntaxKind.ArrowFunction).forEach((arrowFunction) => {
-        // the function has a single parameter
-        const p = arrowFunction.getParameters();
-        if (p.length !== 1) {
-            return;
-        }
-        const parameterName = p[0].getName();
-        const bodyChildren = arrowFunction.getBody().getChildren();
-        if (!(bodyChildren.length === 3 &&
-            bodyChildren[0].getFullText() === "{" &&
-            bodyChildren[2].getFullText() === "}")) {
-            return;
-        }
-        const bodyStatements = bodyChildren[1]?.getChildren();
-        // the function has only two statements: "use strict" and e.exports=require("react-dom/server.edge")
-        if (!(bodyStatements?.length === 2 &&
-            bodyStatements.every((statement) => statement.isKind(ts.SyntaxKind.ExpressionStatement)))) {
-            return;
-        }
-        const bodyExpressionStatements = bodyStatements;
-        const stringLiteralExpression = bodyExpressionStatements[0].getExpressionIfKind(ts.SyntaxKind.StringLiteral);
-        // the first statement needs to be "use strict"
-        if (stringLiteralExpression?.getText() !== '"use strict"') {
-            return;
-        }
-        // the second statement (e.exports=require("react-dom/server.edge")) needs to be a binary expression
-        const binaryExpression = bodyExpressionStatements[1].getExpressionIfKind(ts.SyntaxKind.BinaryExpression);
-        if (!binaryExpression?.getOperatorToken().isKind(ts.SyntaxKind.EqualsToken)) {
-            return;
-        }
-        // on the left we have `${parameterName}.exports`
-        const binaryLeft = binaryExpression.getLeft();
-        if (!binaryLeft.isKind(ts.SyntaxKind.PropertyAccessExpression) ||
-            binaryLeft.getExpressionIfKind(ts.SyntaxKind.Identifier)?.getText() !== parameterName ||
-            binaryLeft.getName() !== "exports") {
-            return;
-        }
-        // on the right we have `require("react-dom/server.edge")`
-        const binaryRight = binaryExpression.getRight();
-        if (!binaryRight.isKind(ts.SyntaxKind.CallExpression) ||
-            binaryRight.getExpressionIfKind(ts.SyntaxKind.Identifier)?.getText() !== "require") {
-            return;
-        }
-        const requireArgs = binaryRight.getArguments();
-        if (requireArgs.length !== 1 || requireArgs[0].getText() !== '"react-dom/server.edge"') {
-            return;
-        }
-        arrowFunction.setBodyText(`
-// OpenNext patch
-let ReactDOMServer;
-try {
-  ReactDOMServer = require('react-dom/server.edge');
-} catch (error) {
-  if (
-    error.code !== 'MODULE_NOT_FOUND' &&
-    error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED'
-  ) {
-    throw error;
-  }
-  ReactDOMServer = require('react-dom/server.browser');
-}
-${parameterName}.exports = ReactDOMServer;
-`);
-    });
-    const updatedCode = file.print();
-    writeFileSync(pagesRuntimeFile, updatedCode);
-}