@opennextjs/cloudflare 1.14.10 → 1.15.0

package/dist/cli/build/build.js

@@ -79,9 +79,6 @@ async function ensureNextjsVersionSupported({ nextVersion }) {
         logger.error("Next.js version unsupported, please upgrade to version 14.2 or greater.");
         process.exit(1);
     }
-    if (buildHelper.compareSemver(nextVersion, ">=", "16")) {
-        logger.warn("Next.js 16 is not fully supported yet! Some features may not work as expected.");
-    }
     const { default: { version: wranglerVersion }, } = await import("wrangler/package.json", { with: { type: "json" } });
     // We need a version of workerd that has a fix for setImmediate for Next.js 16.1+
     // See:

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

@@ -3,6 +3,7 @@ import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { ContentUpdater } from "@opennextjs/aws/plugins/content-updater.js";
 import { build } from "esbuild";
 import { getOpenNextConfig } from "../../api/config.js";
@@ -20,6 +21,7 @@ import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.js";
 import { patchRouteModules } from "./patches/plugins/route-module.js";
+import { shimReact } from "./patches/plugins/shim-react.js";
 import { setWranglerExternal } from "./patches/plugins/wrangler-external.js";
 import { copyPackageCliFiles, needsExperimentalReact, normalizePath } from "./utils/index.js";
 /** The dist directory of the Cloudflare adapter package */
@@ -46,10 +48,10 @@ export async function bundleServer(buildOpts, projectOpts) {
     const dotNextPath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
     const serverFiles = path.join(dotNextPath, "required-server-files.json");
     const nextConfig = JSON.parse(fs.readFileSync(serverFiles, "utf-8")).config;
-    const useTurbopack = fs.existsSync(path.join(dotNextPath, "server/chunks/[turbopack]_runtime.js"));
+    const useTurbopack = buildHelper.getBundlerRuntime(buildOpts) === "turbopack";
     console.log(`\x1b[35m⚙️ Bundling the OpenNext server...\n\x1b[0m`);
     await patchWebpackRuntime(buildOpts);
-    patchVercelOgLibrary(buildOpts);
+    const useOg = patchVercelOgLibrary(buildOpts);
     const outputPath = path.join(outputDir, "server-functions", "default");
     const packagePath = getPackagePath(buildOpts);
     const openNextServer = path.join(outputPath, packagePath, `index.mjs`);
@@ -79,6 +81,7 @@ export async function bundleServer(buildOpts, projectOpts) {
         conditions: getOpenNextConfig(buildOpts).cloudflare?.useWorkerdCondition === false ? [] : ["workerd"],
         plugins: [
             shimRequireHook(buildOpts),
+            shimReact(buildOpts),
             inlineDynamicRequires(updater, buildOpts),
             setWranglerExternal(),
             fixRequire(updater),
@@ -95,7 +98,11 @@ export async function bundleServer(buildOpts, projectOpts) {
             // Apply updater updates, must be the last plugin
             updater.plugin,
         ],
-        external: ["./middleware/handler.mjs"],
+        external: [
+            "./middleware/handler.mjs",
+            // Do not bundle og when it is not used
+            ...(useOg ? [] : ["next/dist/compiled/@vercel/og/index.edge.js"]),
+        ],
         alias: {
             // Workers have `fetch` so the `node-fetch` polyfill is not needed
             "next/dist/compiled/node-fetch": path.join(buildOpts.outputDir, "cloudflare-templates/shims/fetch.js"),

package/dist/cli/build/open-next/createServerBundle.js

@@ -137,7 +137,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
         awsPatches.patchUnstableCacheForISR,
         awsPatches.patchUseCacheForISR,
         awsPatches.patchNextServer,
-        awsPatches.patchEnvVars,
+        awsPatches.getEnvVarsPatch(options),
         awsPatches.patchBackgroundRevalidation,
         awsPatches.patchNodeEnvironment,
         // Cloudflare specific patches

package/dist/cli/build/patches/ast/patch-vercel-og-library.d.ts

@@ -3,5 +3,6 @@ import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
  * Patches the usage of @vercel/og to be compatible with Cloudflare Workers.
  *
  * @param buildOpts Build options.
+ * @returns Whether the @vercel/og library is used.
  */
-export declare function patchVercelOgLibrary(buildOpts: BuildOptions): void;
+export declare function patchVercelOgLibrary(buildOpts: BuildOptions): boolean;

package/dist/cli/build/patches/ast/patch-vercel-og-library.js

@@ -8,19 +8,24 @@ import { patchVercelOgFallbackFont, patchVercelOgImport } from "./vercel-og.js";
  * Patches the usage of @vercel/og to be compatible with Cloudflare Workers.
  *
  * @param buildOpts Build options.
+ * @returns Whether the @vercel/og library is used.
  */
 export function patchVercelOgLibrary(buildOpts) {
     const { appBuildOutputPath, outputDir } = buildOpts;
     const functionsPath = path.join(outputDir, "server-functions/default");
     const packagePath = path.join(functionsPath, getPackagePath(buildOpts));
+    let useOg = false;
     for (const traceInfoPath of globSync(path.join(appBuildOutputPath, ".next/server/**/*.nft.json"), {
         windowsPathsNoEscape: true,
     })) {
-        let edgeFilePatched = false;
+        // Look for the Node version of the traced @vercel/og files
         const traceInfo = JSON.parse(readFileSync(traceInfoPath, { encoding: "utf8" }));
         const tracedNodePath = traceInfo.files.find((p) => p.endsWith("@vercel/og/index.node.js"));
         if (!tracedNodePath)
             continue;
+        // If we are here, it means the application is using the @vercel/og library
+        // and there is an `index.edge.js` colocated file that we need to copy and patch.
+        useOg = true;
         const outputDir = getOutputDir({ functionsPath, packagePath });
         const outputEdgePath = path.join(outputDir, "index.edge.js");
         // Ensure the edge version is available in the OpenNext node_modules.
@@ -28,12 +33,11 @@ export function patchVercelOgLibrary(buildOpts) {
             const tracedEdgePath = path.join(path.dirname(traceInfoPath), tracedNodePath.replace("index.node.js", "index.edge.js"));
             copyFileSync(tracedEdgePath, outputEdgePath);
         }
-        if (!edgeFilePatched) {
-            edgeFilePatched = true;
-            // Change font fetches in the library to use imports.
-            const node = parseFile(outputEdgePath);
-            const { edits, matches } = patchVercelOgFallbackFont(node);
-            writeFileSync(outputEdgePath, node.commitEdits(edits));
+        // Change font fetches in the library to use imports.
+        {
+            const ast = parseFile(outputEdgePath);
+            const { edits, matches } = patchVercelOgFallbackFont(ast);
+            writeFileSync(outputEdgePath, ast.commitEdits(edits));
             if (matches.length > 0) {
                 const fontFileName = matches[0].getMatch("PATH").text();
                 renameSync(path.join(outputDir, fontFileName), path.join(outputDir, `${fontFileName}.bin`));
@@ -41,11 +45,14 @@ export function patchVercelOgLibrary(buildOpts) {
         }
         // Change node imports for the library to edge imports.
         // This is only useful when turbopack is not used to bundle the function.
-        const routeFilePath = traceInfoPath.replace(appBuildOutputPath, packagePath).replace(".nft.json", "");
-        const node = parseFile(routeFilePath);
-        const { edits } = patchVercelOgImport(node);
-        writeFileSync(routeFilePath, node.commitEdits(edits));
+        {
+            const routeFilePath = traceInfoPath.replace(appBuildOutputPath, packagePath).replace(".nft.json", "");
+            const ast = parseFile(routeFilePath);
+            const { edits } = patchVercelOgImport(ast);
+            writeFileSync(routeFilePath, ast.commitEdits(edits));
+        }
     }
+    return useOg;
 }
 function getOutputDir(opts) {
     const vercelOgNodeModulePath = "node_modules/next/dist/compiled/@vercel/og";

package/dist/cli/build/patches/ast/vercel-og.d.ts

@@ -14,6 +14,9 @@ export declare const vercelOgFallbackFontRule = "\nrule:\n  kind: variable_decla
 /**
  * Patches the default font fetching to use a .bin import.
  *
+ * We use `.bin` extension as they are added as modules in the wrangler bundler.
+ * We would need to add a rule to handle `.ttf` otherwise.
+ *
  * @param root Root node.
  * @returns Results of applying the rule.
  */

package/dist/cli/build/patches/ast/vercel-og.js

@@ -50,6 +50,9 @@ fix: |-
 /**
  * Patches the default font fetching to use a .bin import.
  *
+ * We use `.bin` extension as they are added as modules in the wrangler bundler.
+ * We would need to add a rule to handle `.ttf` otherwise.
+ *
  * @param root Root node.
  * @returns Results of applying the rule.
  */

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

@@ -3,9 +3,9 @@ import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 export function shimRequireHook(options) {
     const emptyShimPath = join(options.outputDir, "cloudflare-templates/shims/empty.js");
     return {
-        name: "replaceRelative",
+        name: "require-hook-shim",
         setup(build) {
-            // Note: we (empty) shim require-hook modules as they generate problematic code that uses requires
+            // We (empty) shim require-hook modules as they generate problematic code that uses requires
             build.onResolve({ filter: getCrossPlatformPathRegex(String.raw `^\./require-hook$`, { escape: false }) }, () => ({
                 path: emptyShimPath,
             }));

package/dist/cli/build/patches/plugins/shim-react.d.ts

@@ -0,0 +1,15 @@
+import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import type { Plugin } from "esbuild";
+/**
+ * `react-dom/server.edge` requires:
+ * - `react-dom-server.edge.production.js`
+ * - `react-dom-server.browser.production.js`
+ * - `react-dom-server-legacy.browser.production.js`
+ *
+ * However only the first one is needed in the Cloudflare Workers environment.
+ * The other two can be shimmed to an empty module to reduce the bundle size.
+ *
+ * @param options Build options
+ * @returns An ESBuild plugin that shims unnecessary React modules
+ */
+export declare function shimReact(options: BuildOptions): Plugin;

package/dist/cli/build/patches/plugins/shim-react.js

@@ -0,0 +1,27 @@
+import { join } from "node:path";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+/**
+ * `react-dom/server.edge` requires:
+ * - `react-dom-server.edge.production.js`
+ * - `react-dom-server.browser.production.js`
+ * - `react-dom-server-legacy.browser.production.js`
+ *
+ * However only the first one is needed in the Cloudflare Workers environment.
+ * The other two can be shimmed to an empty module to reduce the bundle size.
+ *
+ * @param options Build options
+ * @returns An ESBuild plugin that shims unnecessary React modules
+ */
+export function shimReact(options) {
+    const emptyShimPath = join(options.outputDir, "cloudflare-templates/shims/empty.js");
+    return {
+        name: "react-shim",
+        setup(build) {
+            build.onResolve({
+                filter: getCrossPlatformPathRegex(String.raw `(react-dom-server\.browser\.production\.js|react-dom-server-legacy\.browser\.production\.js)$`, { escape: false }),
+            }, () => ({
+                path: emptyShimPath,
+            }));
+        },
+    };
+}

package/dist/cli/commands/utils.d.ts

@@ -56,7 +56,7 @@ export declare function getNormalizedOptions(config: OpenNextConfig, buildDir?:
     openNextVersion: string;
     openNextDistDir: string;
     outputDir: string;
-    packager: "bun" | "npm" | "yarn" | "pnpm";
+    packager: "npm" | "pnpm" | "yarn" | "bun";
     tempBuildDir: string;
 };
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.14.10",
+  "version": "1.15.0",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -44,7 +44,7 @@
   "dependencies": {
     "@ast-grep/napi": "0.40.0",
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "3.9.10",
+    "@opennextjs/aws": "3.9.11",
     "cloudflare": "^4.4.1",
     "enquirer": "^2.4.1",
     "glob": "^12.0.0",