@opennextjs/cloudflare 1.11.0 → 1.12.0

package/dist/cli/build/build.js

@@ -13,6 +13,7 @@ import { compileInit } from "./open-next/compile-init.js";
 import { compileSkewProtection } from "./open-next/compile-skew-protection.js";
 import { compileDurableObjects } from "./open-next/compileDurableObjects.js";
 import { createServerBundle } from "./open-next/createServerBundle.js";
+import { useNodeMiddleware } from "./utils/middleware.js";
 import { getVersion } from "./utils/version.js";
 /**
  * Builds the application in a format that can be passed to workerd
@@ -45,13 +46,18 @@ export async function build(options, config, projectOpts, wranglerConfig) {
         setStandaloneBuildMode(options);
         buildNextjsApp(options);
     }
+    // Make sure no Node.js middleware is used
+    if (useNodeMiddleware(options)) {
+        logger.error("Node.js middleware is not currently supported. Consider switching to Edge Middleware.");
+        process.exit(1);
+    }
     // Generate deployable bundle
     printHeader("Generating bundle");
     compileCache(options);
     compileEnvFiles(options);
-    compileInit(options, wranglerConfig);
-    compileImages(options);
-    compileSkewProtection(options, config);
+    await compileInit(options, wranglerConfig);
+    await compileImages(options);
+    await compileSkewProtection(options, config);
     // Compile middleware
     await createMiddleware(options, { forceOnlyBuildOnce: true });
     createStaticAssets(options, { useBasePath: true });

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

@@ -43,9 +43,10 @@ const optionalDependencies = [
 export async function bundleServer(buildOpts, projectOpts) {
     copyPackageCliFiles(packageDistDir, buildOpts);
     const { appPath, outputDir, monorepoRoot, debug } = buildOpts;
-    const baseManifestPath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
-    const serverFiles = path.join(baseManifestPath, "required-server-files.json");
+    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"));
     console.log(`\x1b[35m⚙️ Bundling the OpenNext server...\n\x1b[0m`);
     await patchWebpackRuntime(buildOpts);
     patchVercelOgLibrary(buildOpts);
@@ -118,13 +119,12 @@ export async function bundleServer(buildOpts, projectOpts) {
             // Note: we need the __non_webpack_require__ variable declared as it is used by next-server:
             // https://github.com/vercel/next.js/blob/be0c3283/packages/next/src/server/next-server.ts#L116-L119
             __non_webpack_require__: "require",
+            // The 2 following defines are used to reduce the bundle size by removing unnecessary code
+            // Next uses different precompiled renderers (i.e. `app-page.runtime.prod.js`) based on if you use `TURBOPACK` or some experimental React features
+            ...(useTurbopack ? {} : { "process.env.TURBOPACK": "false" }),
             // We make sure that environment variables that Next.js expects are properly defined
             "process.env.NEXT_RUNTIME": '"nodejs"',
             "process.env.NODE_ENV": '"production"',
-            // The 2 following defines are used to reduce the bundle size by removing unnecessary code
-            // Next uses different precompiled renderers (i.e. `app-page.runtime.prod.js`) based on if you use `TURBOPACK` or some experimental React features
-            // Turbopack is not supported for build at the moment, so we disable it
-            "process.env.TURBOPACK": "false",
             // This define should be safe to use for Next 14.2+, earlier versions (13.5 and less) will cause trouble
             "process.env.__NEXT_EXPERIMENTAL_REACT": `${needsExperimentalReact(nextConfig)}`,
             // Fix `res.validate` in Next 15.4 (together with the `route-module` patch)

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

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import path from "node:path";
 import { loadBuildId, loadPrerenderManifest } from "@opennextjs/aws/adapters/config/util.js";
-import { esbuildSync, getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { esbuildSync } from "@opennextjs/aws/build/helper.js";
 export function compileDurableObjects(buildOpts) {
     const _require = createRequire(import.meta.url);
     const entryPoints = [
@@ -9,10 +9,10 @@ export function compileDurableObjects(buildOpts) {
         _require.resolve("@opennextjs/cloudflare/durable-objects/sharded-tag-cache"),
         _require.resolve("@opennextjs/cloudflare/durable-objects/bucket-cache-purge"),
     ];
-    const baseManifestPath = path.join(buildOpts.outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
-    const prerenderManifest = loadPrerenderManifest(baseManifestPath);
+    const buildOutputDotNextDir = path.join(buildOpts.appBuildOutputPath, ".next");
+    const prerenderManifest = loadPrerenderManifest(buildOutputDotNextDir);
     const previewModeId = prerenderManifest.preview.previewModeId;
-    const BUILD_ID = loadBuildId(baseManifestPath);
+    const BUILD_ID = loadBuildId(buildOutputDotNextDir);
     return esbuildSync({
         entryPoints,
         bundle: true,

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

@@ -20,6 +20,7 @@ import { openNextResolvePlugin } from "@opennextjs/aws/plugins/resolve.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { getOpenNextConfig } from "../../../api/config.js";
 import { patchResRevalidate } from "../patches/plugins/res-revalidate.js";
+import { patchTurbopackRuntime } from "../patches/plugins/turbopack.js";
 import { patchUseCacheIO } from "../patches/plugins/use-cache.js";
 import { normalizePath } from "../utils/index.js";
 import { copyWorkerdPackages } from "../utils/workerd.js";
@@ -142,6 +143,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
         // Cloudflare specific patches
         patchResRevalidate,
         patchUseCacheIO,
+        patchTurbopackRuntime,
         ...additionalCodePatches,
     ]);
     // Build Lambda code

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

@@ -16,6 +16,7 @@ export function patchVercelOgLibrary(buildOpts) {
     for (const traceInfoPath of globSync(path.join(appBuildOutputPath, ".next/server/**/*.nft.json"), {
         windowsPathsNoEscape: true,
     })) {
+        let edgeFilePatched = false;
         const traceInfo = JSON.parse(readFileSync(traceInfoPath, { encoding: "utf8" }));
         const tracedNodePath = traceInfo.files.find((p) => p.endsWith("@vercel/og/index.node.js"));
         if (!tracedNodePath)
@@ -26,14 +27,20 @@ export function patchVercelOgLibrary(buildOpts) {
         if (!existsSync(outputEdgePath)) {
             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));
-            const fontFileName = matches[0].getMatch("PATH").text();
-            renameSync(path.join(outputDir, fontFileName), path.join(outputDir, `${fontFileName}.bin`));
+            if (matches.length > 0) {
+                const fontFileName = matches[0].getMatch("PATH").text();
+                renameSync(path.join(outputDir, fontFileName), path.join(outputDir, `${fontFileName}.bin`));
+            }
         }
         // 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);

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

@@ -0,0 +1,2 @@
+import type { CodePatcher } from "@opennextjs/aws/build/patch/codePatcher.js";
+export declare const patchTurbopackRuntime: CodePatcher;

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

@@ -0,0 +1,78 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+const inlineChunksRule = `
+rule:
+  kind: call_expression
+  pattern: require(resolved)
+fix:
+  requireChunk(chunkPath)
+`;
+export const patchTurbopackRuntime = {
+    name: "inline-turbopack-chunks",
+    patches: [
+        {
+            versions: ">=15.0.0",
+            pathFilter: getCrossPlatformPathRegex(String.raw `\[turbopack\]_runtime\.js$`, {
+                escape: false,
+            }),
+            contentFilter: /loadRuntimeChunkPath/,
+            patchCode: async ({ code, tracedFiles }) => {
+                let patched = patchCode(code, inlineExternalImportRule);
+                patched = patchCode(patched, inlineChunksRule);
+                return `${patched}\n${inlineChunksFn(tracedFiles)}`;
+            },
+        },
+    ],
+};
+function getInlinableChunks(tracedFiles) {
+    const chunks = new Set();
+    for (const file of tracedFiles) {
+        if (file === "[turbopack]_runtime.js") {
+            continue;
+        }
+        if (file.includes(".next/server/chunks/")) {
+            chunks.add(file);
+        }
+    }
+    return Array.from(chunks);
+}
+function inlineChunksFn(tracedFiles) {
+    // From the outputs, we extract every chunks
+    const chunks = getInlinableChunks(tracedFiles);
+    return `
+  function requireChunk(chunkPath) {
+    switch(chunkPath) {
+${chunks
+        .map((chunk) => `      case "${
+    // we only want the path after /path/to/.next/
+    chunk.replace(/.*\/\.next\//, "")}": return require("${chunk}");`)
+        .join("\n")}
+      default:
+        throw new Error(\`Not found \${chunkPath}\`);
+    }
+  }
+`;
+}
+// Turbopack imports `og` via `externalImport`.
+// We patch it to:
+// - add the explicit path so that the file is inlined by wrangler
+// - use the edge version of the module instead of the node version.
+//
+// Modules that are not inlined (no added to the switch), would generate an error similar to:
+// Failed to load external module path/to/module: Error: No such module "path/to/module"
+const inlineExternalImportRule = `
+rule:
+  pattern: "$RAW = await import($ID)"
+  inside:
+    regex: "externalImport"
+    kind: function_declaration
+    stopBy: end
+fix: |-
+  switch ($ID) {
+    case "next/dist/compiled/@vercel/og/index.node.js":
+      $RAW = await import("next/dist/compiled/@vercel/og/index.edge.js");
+      break;
+    default:
+      $RAW = await import($ID);
+  }
+`;

package/dist/cli/build/utils/middleware.d.ts

@@ -0,0 +1,8 @@
+import * as buildHelper from "@opennextjs/aws/build/helper.js";
+/**
+ * Returns whether the project is using a Node.js middleware.
+ *
+ * @param options
+ * @returns Whether the project is using a Node.js middleware
+ */
+export declare function useNodeMiddleware(options: buildHelper.BuildOptions): boolean;

package/dist/cli/build/utils/middleware.js

@@ -0,0 +1,21 @@
+import path from "node:path";
+import { loadFunctionsConfigManifest, loadMiddlewareManifest } from "@opennextjs/aws/adapters/config/util.js";
+/**
+ * Returns whether the project is using a Node.js middleware.
+ *
+ * @param options
+ * @returns Whether the project is using a Node.js middleware
+ */
+export function useNodeMiddleware(options) {
+    const buildOutputDotNextDir = path.join(options.appBuildOutputPath, ".next");
+    // Look for the edge middleware
+    const middlewareManifest = loadMiddlewareManifest(buildOutputDotNextDir);
+    const edgeMiddleware = middlewareManifest.middleware["/"];
+    if (edgeMiddleware) {
+        // The app uses an edge middleware
+        return false;
+    }
+    // Look for the node middleware
+    const functionsConfigManifest = loadFunctionsConfigManifest(buildOutputDotNextDir);
+    return Boolean(functionsConfigManifest?.functions["/_middleware"]);
+}

package/dist/cli/commands/helpers.js

@@ -71,6 +71,18 @@ export async function getEnvFromPlatformProxy(options, buildOpts) {
  * @returns escaped arg
  */
 export function quoteShellMeta(arg) {
+    if (process.platform === "win32") {
+        if (arg.length === 0) {
+            return '""';
+        }
+        const needsEscaping = /[&|<>^()%!"]/;
+        const needsQuotes = /\s/.test(arg) || needsEscaping.test(arg);
+        let escaped = arg.replace(/"/g, '""');
+        if (/[&|<>^()%!]/.test(arg)) {
+            escaped = escaped.replace(/[&|<>^()%!]/g, "^$&");
+        }
+        return needsQuotes ? `"${escaped}"` : escaped;
+    }
     if (/["\s]/.test(arg) && !/'/.test(arg)) {
         return `'${arg.replace(/(['\\])/g, "\\$1")}'`;
     }

package/dist/cli/commands/utils.js

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
+import url from "node:url";
 import { compileOpenNextConfig } from "@opennextjs/aws/build/compileConfig.js";
 import { normalizeOptions } from "@opennextjs/aws/build/helper.js";
 import { printHeader, showWarningOnWindows } from "@opennextjs/aws/build/utils.js";
@@ -50,7 +51,7 @@ export async function retrieveCompiledConfig() {
         logger.error("Could not find compiled Open Next config, did you run the build command?");
         process.exit(1);
     }
-    const config = await import(configPath).then((mod) => mod.default);
+    const config = await import(url.pathToFileURL(configPath).href).then((mod) => mod.default);
     ensureCloudflareConfig(config);
     return { config };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"