@opennextjs/cloudflare 1.19.2 → 1.19.3

package/dist/cli/build/patches/plugins/load-manifest.d.ts

@@ -6,3 +6,40 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
 export declare function inlineLoadManifest(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;
+/**
+ * Factor out large manifest values into separate variables.
+ *
+ * @param manifest The manifest code.
+ * @param key The key to factor out.
+ * @param values A map to store the factored values (indexed by variable name).
+ * @param prefixMap Map of short hash prefix → full hash, updated in place for
+ *   collision resolution across calls.
+ * @returns The manifest code with large values factored out.
+ */
+export declare function factorManifestValue(manifest: string, key: string, values: Map<string, string>, prefixMap: Map<string, string>): string;
+/**
+ * Factor out large object values into separate variables.
+ *
+ * @param valueText The JS source text of the module mapping object.
+ * @param sharedVars Map to accumulate shared variable declarations.
+ * @param prefixMap Map of short hash prefix → full hash, updated in place for
+ *   collision resolution across calls.
+ * @returns The rewritten value text with chunks arrays replaced by variable refs.
+ */
+export declare function factorObjectValues(valueText: string, sharedVars: Map<string, string>, prefixMap: Map<string, string>): string;
+/**
+ * Get or create a short variable name for a value, resolving collisions.
+ *
+ * Computes a SHA1 hash of the value, then finds the shortest unique prefix
+ * (minimum {@link MIN_PREFIX_LENGTH} hex chars). When a new hash collides with
+ * an existing prefix, the new entry is given a longer prefix — existing entries
+ * are never renamed.
+ *
+ * This allows saving space in the generated code (A full SHA1 is 40 hex chars) because
+ * identifiers are not minimized by the Open Next build process.
+ *
+ * @param value The value to hash.
+ * @param prefixMap Map of short prefix → full hash, updated in place.
+ * @returns The variable name (`v<shortPrefix>`).
+ */
+export declare function getOrCreateVarName(value: string, prefixMap: Map<string, string>): string;

package/dist/cli/build/patches/plugins/load-manifest.js

@@ -3,10 +3,12 @@
  *
  * They rely on `readFileSync` that is not supported by workerd.
  */
+import crypto from "node:crypto";
 import { readFile } from "node:fs/promises";
 import { join, posix, relative, sep } from "node:path";
+import { Lang, parse } from "@ast-grep/napi";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+import { applyRule, patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { glob } from "glob";
 import { normalizePath } from "../../../utils/normalize-path.js";
@@ -75,19 +77,62 @@ async function getEvalManifestRule(buildOpts) {
     const { outputDir } = buildOpts;
     const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
     const appDir = join(baseDir, "server/app");
-    const manifests = await glob(join(baseDir, "**/*_client-reference-manifest.js"), {
+    const manifestPaths = await glob(join(baseDir, "**/*_client-reference-manifest.js"), {
         windowsPathsNoEscape: true,
     });
-    // Sort by path length descending so longer (more specific) paths match first,
-    // preventing suffix collisions in the `.endsWith()` chain (see #1156).
-    const sortedManifests = [...manifests].sort((a, b) => b.length - a.length);
-    const returnManifests = sortedManifests
-        .map((manifest) => {
-        const endsWith = normalizePath(relative(baseDir, manifest));
-        const key = normalizePath("/" + relative(appDir, manifest)).replace("_client-reference-manifest.js", "");
+    // Map of factored large objects (variable name -> {...})
+    const factoredObjects = new Map();
+    // Map of manifest path -> factored manifest content
+    const factoredManifest = new Map();
+    // Shared map of short hash prefix -> full SHA1 hash, used for collision resolution.
+    const prefixMap = new Map();
+    for (const path of manifestPaths) {
+        if (path.endsWith("page_client-reference-manifest.js")) {
+            // `page_client-reference-manifest.js` files could contain large repeated values.
+            // Factor out large values into separate variables to reduce the overall size of the generated code.
+            let manifest = await readFile(path, "utf-8");
+            for (const key of [
+                "clientModules",
+                "ssrModuleMapping",
+                "edgeSSRModuleMapping",
+                "rscModuleMapping",
+                "entryCSSFiles",
+                "entryJSFiles",
+            ]) {
+                manifest = factorManifestValue(manifest, key, factoredObjects, prefixMap);
+            }
+            factoredManifest.set(path, manifest);
+        }
+    }
+    // Map of factored values in an object
+    const factoredValues = new Map();
+    for (const [varName, value] of factoredObjects) {
+        factoredObjects.set(varName, factorObjectValues(value, factoredValues, prefixMap));
+    }
+    // Prepend chunks variable declarations before the factored values
+    const factoredValueCode = [...factoredValues.entries()]
+        .map(([name, val]) => `const ${name} = ${val};`)
+        .join("\n");
+    const factoredObjectCode = [...factoredObjects.entries()]
+        .map(([varName, value]) => `const ${varName} = ${value};`)
+        .join("\n");
+    const returnManifests = manifestPaths
+        // Sort by path length descending so longer (more specific) paths match first,
+        // preventing suffix collisions in the `.endsWith()` chain (see #1156).
+        .toSorted((a, b) => b.length - a.length)
+        .map((path) => {
+        let manifest;
+        if (factoredManifest.has(path)) {
+            manifest = factoredManifest.get(path);
+        }
+        else {
+            manifest = `require(${JSON.stringify(path)});`;
+        }
+        const endsWith = normalizePath(relative(baseDir, path));
+        const key = normalizePath("/" + relative(appDir, path)).replace("_client-reference-manifest.js", "");
         return `
 if ($PATH.endsWith("${endsWith}")) {
-  require(${JSON.stringify(manifest)});
+  ${manifest}
   return {
     __RSC_MANIFEST: {
     "${key}": globalThis.__RSC_MANIFEST["${key}"],
@@ -104,6 +149,9 @@ function evalManifest($PATH, $$$ARGS) {
 }`,
         },
         fix: `
+${factoredValueCode}
+${factoredObjectCode}
+
 function evalManifest($PATH, $$$ARGS) {
   $PATH = $PATH.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)});
   ${returnManifests}
@@ -116,3 +164,130 @@ function evalManifest($PATH, $$$ARGS) {
 }`,
     };
 }
+/**
+ * Factor out large manifest values into separate variables.
+ *
+ * @param manifest The manifest code.
+ * @param key The key to factor out.
+ * @param values A map to store the factored values (indexed by variable name).
+ * @param prefixMap Map of short hash prefix → full hash, updated in place for
+ *   collision resolution across calls.
+ * @returns The manifest code with large values factored out.
+ */
+export function factorManifestValue(manifest, key, values, prefixMap) {
+    const valueName = "VALUE";
+    // ASTGrep rule to extract the value of a specific key from the manifest object in the evalManifest function.
+    //
+    // globalThis.__RSC_MANIFEST["/path/to/page"] = {
+    //  // ...
+    //  key: $VALUE
+    //  // ...
+    // }
+    const extractValueRule = `
+rule:
+  kind: pair
+  all:
+    - has:
+        field: key
+        pattern: '"${key}"'
+    - has:
+        field: value
+        pattern: $${valueName}
+inside:
+  pattern: globalThis.__RSC_MANIFEST[$$$_] = { $$$ };
+  stopBy: end
+`;
+    const rootNode = parse(Lang.JavaScript, manifest).root();
+    const { matches } = applyRule(extractValueRule, rootNode, { once: true });
+    if (matches.length === 1 && matches[0]?.getMatch(valueName)) {
+        const match = matches[0];
+        const value = match.getMatch(valueName).text();
+        if (value.length > 30) {
+            // Factor out large values into separate variables.
+            const varName = getOrCreateVarName(value, prefixMap);
+            values.set(varName, value);
+            // Replace the value in the manifest with the variable reference.
+            return rootNode.commitEdits([match.replace(`"${key}": ${varName}`)]);
+        }
+    }
+    // Return the original manifest if the value is not found or is small enough to not warrant factoring out.
+    return manifest;
+}
+/**
+ * Factor out large object values into separate variables.
+ *
+ * @param valueText The JS source text of the module mapping object.
+ * @param sharedVars Map to accumulate shared variable declarations.
+ * @param prefixMap Map of short hash prefix → full hash, updated in place for
+ *   collision resolution across calls.
+ * @returns The rewritten value text with chunks arrays replaced by variable refs.
+ */
+export function factorObjectValues(valueText, sharedVars, prefixMap) {
+    const rootNode = parse(Lang.JavaScript, valueText).root();
+    // Find all "chunks": [...] pairs
+    const chunksRule = `
+rule:
+  kind: pair
+  all:
+    - has:
+        field: key
+        pattern: '"chunks"'
+    - has:
+        field: value
+        kind: array
+        pattern: $CHUNKS
+`;
+    const { matches } = applyRule(chunksRule, rootNode, { once: false });
+    const edits = [];
+    for (const match of matches) {
+        const chunksNode = match.getMatch("CHUNKS");
+        if (!chunksNode)
+            continue;
+        const chunksText = chunksNode.text();
+        if (chunksText.length <= 30)
+            continue; // Skip small arrays
+        const varName = getOrCreateVarName(chunksText, prefixMap);
+        sharedVars.set(varName, chunksText);
+        edits.push({ match, replacement: `"chunks": ${varName}` });
+    }
+    return edits.length === 0
+        ? valueText
+        : rootNode.commitEdits(edits.map((e) => e.match.replace(e.replacement)));
+}
+/** Minimum number of hex characters used for short hash prefixes. */
+const MIN_PREFIX_LENGTH = 3;
+/**
+ * Get or create a short variable name for a value, resolving collisions.
+ *
+ * Computes a SHA1 hash of the value, then finds the shortest unique prefix
+ * (minimum {@link MIN_PREFIX_LENGTH} hex chars). When a new hash collides with
+ * an existing prefix, the new entry is given a longer prefix — existing entries
+ * are never renamed.
+ *
+ * This allows saving space in the generated code (A full SHA1 is 40 hex chars) because
+ * identifiers are not minimized by the Open Next build process.
+ *
+ * @param value The value to hash.
+ * @param prefixMap Map of short prefix → full hash, updated in place.
+ * @returns The variable name (`v<shortPrefix>`).
+ */
+export function getOrCreateVarName(value, prefixMap) {
+    const sha1 = crypto.createHash("sha1").update(value).digest("hex");
+    // Find the shortest prefix (>= MIN_PREFIX_LENGTH) that doesn't collide
+    // with any existing prefix. Only the new entry is lengthened.
+    for (let len = MIN_PREFIX_LENGTH; len <= sha1.length; len++) {
+        const candidate = sha1.slice(0, len);
+        const existing = prefixMap.get(candidate);
+        if (existing === undefined) {
+            prefixMap.set(candidate, sha1);
+            return `v${candidate}`;
+        }
+        if (existing === sha1) {
+            // Same content seen again — reuse the existing variable.
+            return `v${candidate}`;
+        }
+        // A different hash occupies this exact prefix — lengthen and retry.
+    }
+    // Unreachable: two different SHA1 hashes always diverge before 40 chars.
+    throw new Error("Failed to find a unique prefix");
+}

package/dist/cli/commands/build.js

@@ -2,6 +2,7 @@ import logger from "@opennextjs/aws/logger.js";
 import { build as buildImpl } from "../build/build.js";
 import { askConfirmation } from "../utils/ask-confirmation.js";
 import { createWranglerConfigFile, findWranglerConfig } from "../utils/create-wrangler-config.js";
+import { isNonInteractiveOrCI } from "../utils/is-interactive.js";
 import { compileConfig, getNormalizedOptions, nextAppDir, printHeaders, readWranglerConfig, withWranglerOptions, withWranglerPassthroughArgs, } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare build` command.
@@ -18,6 +19,12 @@ export async function buildCommand(args) {
     //       nor when `--skipWranglerConfigCheck` is used.
     if (!projectOpts.wranglerConfigPath && !args.skipWranglerConfigCheck) {
         if (!findWranglerConfig(projectOpts.sourceDir)) {
+            // In non-interactive environments (CI, Cloudflare Workers Builds,
+            // Docker, etc.) the prompt would hang or crash. Fail fast with a
+            // clear message pointing at the existing escape hatch.
+            if (isNonInteractiveOrCI()) {
+                throw new Error("No `wrangler.(toml|json|jsonc)` config file found.\n\nCreate one at the project root before running the build, or skip this check with `--skipWranglerConfigCheck` or `SKIP_WRANGLER_CONFIG_CHECK=yes`.");
+            }
             const confirmCreate = "No `wrangler.(toml|json|jsonc)` config file found, do you want to create one?";
             if (await askConfirmation(confirmCreate)) {
                 await createWranglerConfigFile(projectOpts.sourceDir);

package/dist/cli/commands/utils/utils.js

@@ -9,7 +9,8 @@ import logger from "@opennextjs/aws/logger.js";
 import { unstable_readConfig } from "wrangler";
 import { ensureCloudflareConfig } from "../../build/utils/ensure-cf-config.js";
 import { askConfirmation } from "../../utils/ask-confirmation.js";
-import { createOpenNextConfigFile, findOpenNextConfig } from "../../utils/create-open-next-config.js";
+import { createOpenNextConfigFile, findOpenNextConfig, OPEN_NEXT_CONFIG_FILE_NAME, } from "../../utils/create-open-next-config.js";
+import { isNonInteractiveOrCI } from "../../utils/is-interactive.js";
 export const nextAppDir = process.cwd();
 /**
  * Print headers and warnings for the CLI.
@@ -41,9 +42,15 @@ export async function compileConfig(configPath) {
     }
     configPath ??= findOpenNextConfig(nextAppDir);
     if (!configPath) {
-        const answer = await askConfirmation("Missing required `open-next.config.ts` file, do you want to create one?");
+        // In non-interactive environments (CI, Cloudflare Workers Builds,
+        // Docker, etc.) there is no TTY to answer a prompt — the build would
+        // hang or crash. Fail fast with an actionable message instead.
+        if (isNonInteractiveOrCI()) {
+            throw new Error(`No \`${OPEN_NEXT_CONFIG_FILE_NAME}\` file was found in the project root.\n\nThis file is required for OpenNext Cloudflare builds.\nRun \`opennextjs-cloudflare migrate\` to create it, or see https://opennext.js.org/cloudflare/get-started for setup guidance.\nCommit it and re-run the build.`);
+        }
+        const answer = await askConfirmation(`Missing required \`${OPEN_NEXT_CONFIG_FILE_NAME}\` file, do you want to create one?`);
         if (!answer) {
-            throw new Error("The `open-next.config.ts` file is required, aborting!");
+            throw new Error(`The \`${OPEN_NEXT_CONFIG_FILE_NAME}\` file is required, aborting!`);
         }
         configPath = createOpenNextConfigFile(nextAppDir, { cache: false });
     }

package/dist/cli/templates/init.js

@@ -37,11 +37,6 @@ function init(request, env) {
     populateProcessEnv(url, env);
 }
 function initRuntime() {
-    // Some packages rely on `process.version` and `process.versions.node` (i.e. Jose@4)
-    // TODO: Remove when https://github.com/unjs/unenv/pull/493 is merged
-    Object.assign(process, { version: process.version || "v22.14.0" });
-    // @ts-expect-error Node type does not match workerd
-    Object.assign(process.versions, { node: "22.14.0", ...process.versions });
     globalThis.__dirname ??= "";
     globalThis.__filename ??= "";
     // Some packages rely on `import.meta.url` but it is undefined in workerd

package/dist/cli/utils/create-open-next-config.d.ts

@@ -1,3 +1,4 @@
+export declare const OPEN_NEXT_CONFIG_FILE_NAME = "open-next.config.ts";
 /**
  * Finds the path to the OpenNext configuration file if it exists.
  *

package/dist/cli/utils/create-open-next-config.js

@@ -2,6 +2,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getPackageTemplatesDirPath } from "../../utils/get-package-templates-dir-path.js";
+export const OPEN_NEXT_CONFIG_FILE_NAME = "open-next.config.ts";
 /**
  * Finds the path to the OpenNext configuration file if it exists.
  *
@@ -9,7 +10,7 @@ import { getPackageTemplatesDirPath } from "../../utils/get-package-templates-di
  * @returns The full path to open-next.config.ts if it exists, undefined otherwise
  */
 export function findOpenNextConfig(appDir) {
-    const openNextConfigPath = join(appDir, "open-next.config.ts");
+    const openNextConfigPath = join(appDir, OPEN_NEXT_CONFIG_FILE_NAME);
     if (existsSync(openNextConfigPath)) {
         return openNextConfigPath;
     }
@@ -23,8 +24,8 @@ export function findOpenNextConfig(appDir) {
  * @returns The path to the created configuration file
  */
 export function createOpenNextConfigFile(appDir, options) {
-    const openNextConfigPath = join(appDir, "open-next.config.ts");
-    let content = readFileSync(join(getPackageTemplatesDirPath(), "open-next.config.ts"), "utf8");
+    const openNextConfigPath = join(appDir, OPEN_NEXT_CONFIG_FILE_NAME);
+    let content = readFileSync(join(getPackageTemplatesDirPath(), OPEN_NEXT_CONFIG_FILE_NAME), "utf8");
     if (!options.cache) {
         content = patchCode(content, commentOutR2ImportRule);
         content = patchCode(content, commentOutIncrementalCacheRule);

package/dist/cli/utils/is-interactive.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Whether the current process is running in an interactive terminal.
+ */
+export declare function isInteractive(): boolean;
+/**
+ * Whether prompts should be suppressed.
+ */
+export declare function isNonInteractiveOrCI(): boolean;

package/dist/cli/utils/is-interactive.js

@@ -0,0 +1,13 @@
+import ci from "ci-info";
+/**
+ * Whether the current process is running in an interactive terminal.
+ */
+export function isInteractive() {
+    return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+/**
+ * Whether prompts should be suppressed.
+ */
+export function isNonInteractiveOrCI() {
+    return !isInteractive() || ci.isCI;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -45,6 +45,7 @@
     "@ast-grep/napi": "^0.40.5",
     "@dotenvx/dotenvx": "1.31.0",
     "@opennextjs/aws": "3.10.2",
+    "ci-info": "^4.2.0",
     "cloudflare": "^4.4.1",
     "comment-json": "^4.5.1",
     "enquirer": "^2.4.1",