@opennextjs/cloudflare 1.16.5 → 1.17.0

package/dist/cli/build/build.js

@@ -6,7 +6,7 @@ import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { patchOriginalNextConfig } from "@opennextjs/aws/build/patch/patches/index.js";
 import { printHeader } from "@opennextjs/aws/build/utils.js";
 import logger from "@opennextjs/aws/logger.js";
-import { ensureNextjsVersionSupported } from "../commands/utils.js";
+import { ensureNextjsVersionSupported } from "../utils/nextjs-support.js";
 import { bundleServer } from "./bundle-server.js";
 import { compileCacheAssetsManifestSqlFile } from "./open-next/compile-cache-assets-manifest.js";
 import { compileEnvFiles } from "./open-next/compile-env-files.js";

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

@@ -7,6 +7,7 @@ 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";
+import { normalizePath } from "../utils/normalize-path.js";
 import { patchVercelOgLibrary } from "./patches/ast/patch-vercel-og-library.js";
 import { patchWebpackRuntime } from "./patches/ast/webpack-runtime.js";
 import { inlineDynamicRequires } from "./patches/plugins/dynamic-requires.js";
@@ -23,7 +24,8 @@ 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";
+import { copyPackageCliFiles } from "./utils/copy-package-cli-files.js";
+import { needsExperimentalReact } from "./utils/needs-experimental-react.js";
 /** The dist directory of the Cloudflare adapter package */
 const packageDistDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "../..");
 /**

package/dist/cli/build/open-next/compile-env-files.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { extractProjectEnvVars } from "../utils/index.js";
+import { extractProjectEnvVars } from "../../utils/extract-project-env-vars.js";
 /**
  * Compiles the values extracted from the project's env files to the output directory for use in the worker.
  */

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

@@ -19,10 +19,10 @@ import { openNextReplacementPlugin } from "@opennextjs/aws/plugins/replacement.j
 import { openNextResolvePlugin } from "@opennextjs/aws/plugins/resolve.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { getOpenNextConfig } from "../../../api/config.js";
+import { normalizePath } from "../../utils/normalize-path.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";
 export async function createServerBundle(options, codeCustomization) {
     const { config } = options;

package/dist/cli/build/patches/plugins/dynamic-requires.js

@@ -3,7 +3,7 @@ import { join, posix, sep } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-import { normalizePath } from "../../utils/normalize-path.js";
+import { normalizePath } from "../../../utils/normalize-path.js";
 async function getPagesManifests(serverDir) {
     try {
         return Object.values(JSON.parse(await readFile(join(serverDir, "pages-manifest.json"), "utf-8")));

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

@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-import { normalizePath } from "../../utils/normalize-path.js";
+import { normalizePath } from "../../../utils/normalize-path.js";
 export function patchInstrumentation(updater, buildOpts) {
     const builtInstrumentationPath = getBuiltInstrumentationPath(buildOpts);
     updater.updateContent("patch-instrumentation-next15-4", [

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

@@ -9,7 +9,7 @@ import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { 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";
+import { normalizePath } from "../../../utils/normalize-path.js";
 export function inlineLoadManifest(updater, buildOpts) {
     return updater.updateContent("inline-load-manifest", [
         {

package/dist/cli/build/patches/plugins/next-server.js

@@ -10,7 +10,7 @@ import path from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-import { normalizePath } from "../../utils/index.js";
+import { normalizePath } from "../../../utils/normalize-path.js";
 export function patchNextServer(updater, buildOpts) {
     return updater.updateContent("next-server", [
         {

package/dist/cli/build/patches/plugins/route-module.js

@@ -9,7 +9,7 @@ import path from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-import { normalizePath } from "../../utils/index.js";
+import { normalizePath } from "../../../utils/normalize-path.js";
 export function patchRouteModules(updater, buildOpts) {
     return updater.updateContent("route-module", [
         {

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

@@ -14,7 +14,7 @@
  * ref: https://developers.cloudflare.com/workers/wrangler/bundling/
  */
 import { dirname, resolve } from "node:path";
-import { normalizePath } from "../../utils/normalize-path.js";
+import { normalizePath } from "../../../utils/normalize-path.js";
 export function setWranglerExternal() {
     return {
         name: "wrangler-externals",

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

@@ -1,6 +0,0 @@
-export * from "./copy-package-cli-files.js";
-export * from "./create-config-files.js";
-export * from "./ensure-cf-config.js";
-export * from "./extract-project-env-vars.js";
-export * from "./needs-experimental-react.js";
-export * from "./normalize-path.js";

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

@@ -1,6 +1 @@
-export * from "./copy-package-cli-files.js";
-export * from "./create-config-files.js";
-export * from "./ensure-cf-config.js";
-export * from "./extract-project-env-vars.js";
-export * from "./needs-experimental-react.js";
-export * from "./normalize-path.js";
+"use strict";

package/dist/cli/commands/build.js

@@ -1,6 +1,6 @@
 import { build as buildImpl } from "../build/build.js";
-import { createWranglerConfigIfNonExistent } from "../build/utils/index.js";
-import { compileConfig, getNormalizedOptions, nextAppDir, printHeaders, readWranglerConfig, withWranglerOptions, withWranglerPassthroughArgs, } from "./utils.js";
+import { createWranglerConfigIfNonExistent } from "../utils/create-config-files.js";
+import { compileConfig, getNormalizedOptions, nextAppDir, printHeaders, readWranglerConfig, withWranglerOptions, withWranglerPassthroughArgs, } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare build` command.
  *

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

@@ -1,5 +1,5 @@
 import type yargs from "yargs";
-import type { WithWranglerArgs } from "./utils.js";
+import type { WithWranglerArgs } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare deploy` command.
  *

package/dist/cli/commands/deploy.js

@@ -1,9 +1,10 @@
+import logger from "@opennextjs/aws/logger.js";
 import { DEPLOYMENT_MAPPING_ENV_NAME } from "../templates/skew-protection.js";
-import { runWrangler } from "../utils/run-wrangler.js";
-import { getEnvFromPlatformProxy, quoteShellMeta } from "./helpers.js";
 import { populateCache, withPopulateCacheOptions } from "./populate-cache.js";
 import { getDeploymentMapping } from "./skew-protection.js";
-import { getNormalizedOptions, printHeaders, readWranglerConfig, retrieveCompiledConfig, withWranglerPassthroughArgs, } from "./utils.js";
+import { getEnvFromPlatformProxy, quoteShellMeta } from "./utils/helpers.js";
+import { runWrangler } from "./utils/run-wrangler.js";
+import { getNormalizedOptions, printHeaders, readWranglerConfig, retrieveCompiledConfig, withWranglerPassthroughArgs, } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare deploy` command.
  *
@@ -23,7 +24,7 @@ export async function deployCommand(args) {
         shouldUsePreviewId: false,
     }, envVars);
     const deploymentMapping = await getDeploymentMapping(buildOpts, config, envVars);
-    runWrangler(buildOpts, [
+    const result = runWrangler(buildOpts, [
         "deploy",
         ...args.wranglerArgs,
         ...(deploymentMapping
@@ -39,6 +40,10 @@ export async function deployCommand(args) {
             OPEN_NEXT_DEPLOY: "true",
         },
     });
+    if (!result.success) {
+        logger.error(`Wrangler deploy command failed${result.stderr ? `:\n${result.stderr}` : ""}`);
+        process.exit(1);
+    }
 }
 /**
  * Add the `deploy` command to yargs configuration.

package/dist/cli/commands/migrate.js

@@ -4,11 +4,12 @@ import fs from "node:fs";
 import path from "node:path";
 import { checkRunningInsideNextjsApp, findNextConfig, findPackagerAndRoot, getNextVersion, } from "@opennextjs/aws/build/helper.js";
 import logger from "@opennextjs/aws/logger.js";
-import { conditionalAppendFileSync } from "../build/utils/files.js";
 import { askConfirmation } from "../utils/ask-confirmation.js";
-import { createOpenNextConfigFile, findOpenNextConfig } from "../utils/open-next-config.js";
-import { createWranglerConfigFile, findWranglerConfig } from "../utils/wrangler-config.js";
-import { ensureNextjsVersionSupported, printHeaders } from "./utils.js";
+import { createOpenNextConfigFile, findOpenNextConfig } from "../utils/create-open-next-config.js";
+import { createWranglerConfigFile, findWranglerConfig } from "../utils/create-wrangler-config.js";
+import { ensureNextjsVersionSupported } from "../utils/nextjs-support.js";
+import { conditionalAppendFileSync } from "./utils/files.js";
+import { printHeaders } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare migrate` command.
  *
@@ -54,9 +55,13 @@ async function migrateCommand(args) {
         process.exit(1);
     }
     printStepTitle("Creating wrangler.jsonc");
-    await createWranglerConfigFile("./");
+    const { cachingEnabled } = await createWranglerConfigFile("./");
+    if (!cachingEnabled) {
+        logger.warn(`Failed to set up cache for your project.\n` +
+            `After the migration completes, please manually setup cache in  wrangler.jsonc and open-next.config.ts files (for more details see: https://opennext.js.org/cloudflare/caching).\n`);
+    }
     printStepTitle("Creating open-next.config.ts");
-    await createOpenNextConfigFile("./");
+    createOpenNextConfigFile("./", { cache: cachingEnabled });
     const devVarsExists = fs.existsSync(".dev.vars");
     printStepTitle(`${devVarsExists ? "Updating" : "Creating"} .dev.vars file`);
     conditionalAppendFileSync(".dev.vars", "NEXTJS_ENV=development\n", {
@@ -143,10 +148,13 @@ async function migrateCommand(args) {
     logger.info("🎉 OpenNext Cloudflare adapter complete!\n" +
         "\nNext steps:\n" +
         `- Run: "${packageManager.run} preview" to build and preview your Cloudflare application locally\n` +
-        `- Run: "${packageManager.run} deploy" to deploy your application to Cloudflare Workers\n`);
+        `- Run: "${packageManager.run} deploy" to deploy your application to Cloudflare Workers\n` +
+        (cachingEnabled
+            ? ""
+            : `- ⚠️  Setup cache, see https://opennext.js.org/cloudflare/caching for more details\n`));
 }
 const packageManagers = {
-    pnpm: { name: "pnpm", install: "pnpm add", installDev: "pnpm add -D", run: "pnpm" },
+    pnpm: { name: "pnpm", install: "pnpm add", installDev: "pnpm add -D", run: "pnpm run" },
     npm: { name: "npm", install: "npm install", installDev: "npm install --save-dev", run: "npm run" },
     bun: { name: "bun", install: "bun add", installDev: "bun add -D", run: "bun" },
     yarn: { name: "yarn", install: "yarn add", installDev: "yarn add -D", run: "yarn" },

package/dist/cli/commands/populate-cache.d.ts

@@ -2,8 +2,8 @@ import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
 import type { Unstable_Config as WranglerConfig } from "wrangler";
 import type yargs from "yargs";
-import type { WranglerTarget } from "../utils/run-wrangler.js";
-import { type WorkerEnvVar } from "./helpers.js";
+import { type WorkerEnvVar } from "./utils/helpers.js";
+import type { WranglerTarget } from "./utils/run-wrangler.js";
 export declare function populateCache(buildOpts: BuildOptions, config: OpenNextConfig, wranglerConfig: WranglerConfig, populateCacheOptions: PopulateCacheOptions, envVars: WorkerEnvVar): Promise<void>;
 export type CacheAsset = {
     isFetch: boolean;

package/dist/cli/commands/populate-cache.js

@@ -10,10 +10,10 @@ import { BINDING_NAME as R2_CACHE_BINDING_NAME, NAME as R2_CACHE_NAME, PREFIX_EN
 import { CACHE_DIR as STATIC_ASSETS_CACHE_DIR, NAME as STATIC_ASSETS_CACHE_NAME, } from "../../api/overrides/incremental-cache/static-assets-incremental-cache.js";
 import { computeCacheKey } from "../../api/overrides/internal.js";
 import { BINDING_NAME as D1_TAG_BINDING_NAME, NAME as D1_TAG_NAME, } from "../../api/overrides/tag-cache/d1-next-tag-cache.js";
-import { normalizePath } from "../build/utils/normalize-path.js";
-import { runWrangler } from "../utils/run-wrangler.js";
-import { getEnvFromPlatformProxy, quoteShellMeta } from "./helpers.js";
-import { getNormalizedOptions, printHeaders, readWranglerConfig, retrieveCompiledConfig, withWranglerOptions, withWranglerPassthroughArgs, } from "./utils.js";
+import { normalizePath } from "../utils/normalize-path.js";
+import { getEnvFromPlatformProxy, quoteShellMeta } from "./utils/helpers.js";
+import { runWrangler } from "./utils/run-wrangler.js";
+import { getNormalizedOptions, printHeaders, readWranglerConfig, retrieveCompiledConfig, withWranglerOptions, withWranglerPassthroughArgs, } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare populateCache` command.
  *
@@ -131,7 +131,7 @@ async function populateR2IncrementalCache(buildOpts, config, populateCacheOption
     fs.writeFileSync(listFile, JSON.stringify(objectList));
     const concurrency = Math.max(1, populateCacheOptions.cacheChunkSize ?? 50);
     const jurisdiction = binding.jurisdiction ? `--jurisdiction ${binding.jurisdiction}` : "";
-    runWrangler(buildOpts, [
+    const result = runWrangler(buildOpts, [
         "r2 bulk put",
         bucket,
         `--filename ${quoteShellMeta(listFile)}`,
@@ -146,6 +146,10 @@ async function populateR2IncrementalCache(buildOpts, config, populateCacheOption
         logging: "error",
     });
     fs.rmSync(listFile, { force: true });
+    if (!result.success) {
+        logger.error(`Wrangler r2 bulk put command failed${result.stderr ? `:\n${result.stderr}` : ""}`);
+        process.exit(1);
+    }
     logger.info(`Successfully populated cache with ${assets.length} assets`);
 }
 async function populateKVIncrementalCache(buildOpts, config, populateCacheOptions, envVars) {
@@ -173,7 +177,7 @@ async function populateKVIncrementalCache(buildOpts, config, populateCacheOption
             value: fs.readFileSync(fullPath, "utf8"),
         }));
         fs.writeFileSync(chunkPath, JSON.stringify(kvMapping));
-        runWrangler(buildOpts, [
+        const result = runWrangler(buildOpts, [
             "kv bulk put",
             quoteShellMeta(chunkPath),
             `--binding ${KV_CACHE_BINDING_NAME}`,
@@ -185,6 +189,10 @@ async function populateKVIncrementalCache(buildOpts, config, populateCacheOption
             logging: "error",
         });
         fs.rmSync(chunkPath, { force: true });
+        if (!result.success) {
+            logger.error(`Wrangler kv bulk put command failed${result.stderr ? `:\n${result.stderr}` : ""}`);
+            process.exit(1);
+        }
     }
     logger.info(`Successfully populated cache with ${assets.length} assets`);
 }
@@ -194,7 +202,7 @@ function populateD1TagCache(buildOpts, config, populateCacheOptions) {
     if (!binding) {
         throw new Error(`No D1 binding ${JSON.stringify(D1_TAG_BINDING_NAME)} found!`);
     }
-    runWrangler(buildOpts, [
+    const result = runWrangler(buildOpts, [
         "d1 execute",
         D1_TAG_BINDING_NAME,
         `--command "CREATE TABLE IF NOT EXISTS revalidations (tag TEXT NOT NULL, revalidatedAt INTEGER NOT NULL, UNIQUE(tag) ON CONFLICT REPLACE);"`,
@@ -205,6 +213,10 @@ function populateD1TagCache(buildOpts, config, populateCacheOptions) {
         configPath: populateCacheOptions.wranglerConfigPath,
         logging: "error",
     });
+    if (!result.success) {
+        logger.error(`Wrangler d1 execute command failed${result.stderr ? `:\n${result.stderr}` : ""}`);
+        process.exit(1);
+    }
     logger.info("\nSuccessfully created D1 table");
 }
 function populateStaticAssetsIncrementalCache(options) {

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

@@ -1,5 +1,5 @@
 import type yargs from "yargs";
-import type { WithWranglerArgs } from "./utils.js";
+import type { WithWranglerArgs } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare preview` command.
  *

package/dist/cli/commands/preview.js

@@ -1,7 +1,8 @@
-import { runWrangler } from "../utils/run-wrangler.js";
-import { getEnvFromPlatformProxy } from "./helpers.js";
+import logger from "@opennextjs/aws/logger.js";
 import { populateCache, withPopulateCacheOptions } from "./populate-cache.js";
-import { getNormalizedOptions, printHeaders, readWranglerConfig, retrieveCompiledConfig, withWranglerPassthroughArgs, } from "./utils.js";
+import { getEnvFromPlatformProxy } from "./utils/helpers.js";
+import { runWrangler } from "./utils/run-wrangler.js";
+import { getNormalizedOptions, printHeaders, readWranglerConfig, retrieveCompiledConfig, withWranglerPassthroughArgs, } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare preview` command.
  *
@@ -20,7 +21,11 @@ export async function previewCommand(args) {
         cacheChunkSize: args.cacheChunkSize,
         shouldUsePreviewId: args.remote,
     }, envVars);
-    runWrangler(buildOpts, ["dev", ...args.wranglerArgs], { logging: "all" });
+    const result = runWrangler(buildOpts, ["dev", ...args.wranglerArgs], { logging: "all" });
+    if (!result.success) {
+        logger.error(`Wrangler dev command failed${result.stderr ? `:\n${result.stderr}` : ""}`);
+        process.exit(1);
+    }
 }
 /**
  * Add the `preview` command to yargs configuration.

package/dist/cli/commands/skew-protection.d.ts

@@ -22,7 +22,7 @@
 import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import { Cloudflare } from "cloudflare";
 import type { OpenNextConfig } from "../../api/index.js";
-import type { WorkerEnvVar } from "./helpers.js";
+import type { WorkerEnvVar } from "./utils/helpers.js";
 /**
  * Compute the deployment mapping for a deployment.
  *

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

@@ -1,5 +1,5 @@
 import type yargs from "yargs";
-import type { WithWranglerArgs } from "./utils.js";
+import type { WithWranglerArgs } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare upload` command.
  *

package/dist/cli/commands/upload.js

@@ -1,9 +1,10 @@
+import logger from "@opennextjs/aws/logger.js";
 import { DEPLOYMENT_MAPPING_ENV_NAME } from "../templates/skew-protection.js";
-import { runWrangler } from "../utils/run-wrangler.js";
-import { getEnvFromPlatformProxy, quoteShellMeta } from "./helpers.js";
 import { populateCache, withPopulateCacheOptions } from "./populate-cache.js";
 import { getDeploymentMapping } from "./skew-protection.js";
-import { getNormalizedOptions, printHeaders, readWranglerConfig, retrieveCompiledConfig, withWranglerPassthroughArgs, } from "./utils.js";
+import { getEnvFromPlatformProxy, quoteShellMeta } from "./utils/helpers.js";
+import { runWrangler } from "./utils/run-wrangler.js";
+import { getNormalizedOptions, printHeaders, readWranglerConfig, retrieveCompiledConfig, withWranglerPassthroughArgs, } from "./utils/utils.js";
 /**
  * Implementation of the `opennextjs-cloudflare upload` command.
  *
@@ -26,13 +27,17 @@ export async function uploadCommand(args) {
         cacheChunkSize: args.cacheChunkSize,
         shouldUsePreviewId: false,
     }, envVars);
-    runWrangler(buildOpts, [
+    const result = runWrangler(buildOpts, [
         "versions upload",
         ...args.wranglerArgs,
         ...(deploymentMapping
             ? [`--var ${DEPLOYMENT_MAPPING_ENV_NAME}:${quoteShellMeta(JSON.stringify(deploymentMapping))}`]
             : []),
     ], { logging: "all" });
+    if (!result.success) {
+        logger.error(`Wrangler versions upload command failed${result.stderr ? `:\n${result.stderr}` : ""}`);
+        process.exit(1);
+    }
 }
 /**
  * Add the `upload` command to yargs configuration.

package/dist/cli/commands/{helpers.js → utils/helpers.js}

@@ -1,5 +1,5 @@
 import { getPlatformProxy } from "wrangler";
-import { extractProjectEnvVars } from "../build/utils/extract-project-env-vars.js";
+import { extractProjectEnvVars } from "../../utils/extract-project-env-vars.js";
 /**
  * Returns the env vars to use by the CLI.
  *

package/dist/cli/commands/utils/run-wrangler.d.ts

@@ -0,0 +1,44 @@
+export type PackagerDetails = {
+    /** The name of the package manager. */
+    packager: "npm" | "pnpm" | "yarn" | "bun";
+    /** The root directory of the monorepo, used to locate package.json. */
+    monorepoRoot: string;
+};
+export type WranglerTarget = "local" | "remote";
+export type WranglerCommandResult = {
+    success: boolean;
+    stdout: string;
+    stderr: string;
+};
+type WranglerOptions = {
+    target?: WranglerTarget;
+    environment?: string;
+    configPath?: string;
+    logging?: "all" | "error" | "none";
+    env?: Record<string, string>;
+};
+/**
+ * Runs a wrangler command using the project's package manager.
+ *
+ * Spawns a synchronous child process, appending the provided arguments and any flags derived
+ * from the wrangler options.
+ *
+ * The `.env` file loading by wrangler is disabled to let the adapter handle environment variables.
+ *
+ * @param options The package manager details used to invoke wrangler.
+ * @param args The CLI arguments to pass to wrangler
+ * @param wranglerOpts Optional configuration for the wrangler invocation.
+ * @param wranglerOpts.target Whether to run wrangler in `"local"` or `"remote"` mode
+ * @param wranglerOpts.environment The wrangler environment name
+ * @param wranglerOpts.configPath Path to a wrangler configuration file
+ * @param wranglerOpts.logging Controls stdio behavior:
+ *   - `"all"` inherits stdin/stdout for interactive use,
+ *   - `"error"` pipes all output and only displays it on failure,
+ *   - `"none"` suppresses all output.
+ *   When not specified, behaves the same as `"all"`.
+ * @param wranglerOpts.env Additional environment variables to pass to the spawned process.
+ * @returns The command result
+ */
+export declare function runWrangler(options: PackagerDetails, args: string[], wranglerOpts?: WranglerOptions): WranglerCommandResult;
+export declare function isWranglerTarget(v: string | undefined): v is WranglerTarget;
+export {};

package/dist/cli/{utils → commands/utils}/run-wrangler.js

@@ -2,15 +2,14 @@ import { spawnSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import path from "node:path";
 import { compareSemver } from "@opennextjs/aws/build/helper.js";
-import logger from "@opennextjs/aws/logger.js";
 /**
  * Checks the package.json `packageManager` field to determine whether yarn modern is used.
  *
  * @param options Build options.
  * @returns Whether yarn modern is used.
  */
-function isYarnModern(options) {
-    const packageJson = JSON.parse(readFileSync(path.join(options.monorepoRoot, "package.json"), "utf-8"));
+function isYarnModern(monorepoRoot) {
+    const packageJson = JSON.parse(readFileSync(path.join(monorepoRoot, "package.json"), "utf-8"));
     if (!packageJson.packageManager?.startsWith("yarn"))
         return false;
     const [, version] = packageJson.packageManager.split("@");
@@ -27,7 +26,7 @@ function isYarnModern(options) {
  * @returns Arguments with a passthrough flag injected when needed.
  */
 function injectPassthroughFlagForArgs(options, args) {
-    if (options.packager !== "npm" && (options.packager !== "yarn" || isYarnModern(options))) {
+    if (options.packager !== "npm" && (options.packager !== "yarn" || isYarnModern(options.monorepoRoot))) {
         return args;
     }
     const flagInArgsIndex = args.findIndex((v) => v.startsWith("--"));
@@ -36,7 +35,30 @@ function injectPassthroughFlagForArgs(options, args) {
     }
     return args;
 }
+/**
+ * Runs a wrangler command using the project's package manager.
+ *
+ * Spawns a synchronous child process, appending the provided arguments and any flags derived
+ * from the wrangler options.
+ *
+ * The `.env` file loading by wrangler is disabled to let the adapter handle environment variables.
+ *
+ * @param options The package manager details used to invoke wrangler.
+ * @param args The CLI arguments to pass to wrangler
+ * @param wranglerOpts Optional configuration for the wrangler invocation.
+ * @param wranglerOpts.target Whether to run wrangler in `"local"` or `"remote"` mode
+ * @param wranglerOpts.environment The wrangler environment name
+ * @param wranglerOpts.configPath Path to a wrangler configuration file
+ * @param wranglerOpts.logging Controls stdio behavior:
+ *   - `"all"` inherits stdin/stdout for interactive use,
+ *   - `"error"` pipes all output and only displays it on failure,
+ *   - `"none"` suppresses all output.
+ *   When not specified, behaves the same as `"all"`.
+ * @param wranglerOpts.env Additional environment variables to pass to the spawned process.
+ * @returns The command result
+ */
 export function runWrangler(options, args, wranglerOpts = {}) {
+    const noLogs = wranglerOpts.logging === "none";
     const shouldPipeLogs = wranglerOpts.logging === "error";
     const result = spawnSync(options.packager, [
         options.packager === "bun" ? "x" : "exec",
@@ -50,7 +72,10 @@ export function runWrangler(options, args, wranglerOpts = {}) {
         ].filter((v) => !!v)),
     ], {
         shell: true,
-        stdio: shouldPipeLogs ? ["ignore", "pipe", "pipe"] : "inherit",
+        // Always pipe stderr so that we can capture it for inspection.
+        // Keep stdin and stdout as "inherit" when not piping logs to maintain TTY detection
+        // (wrangler checks `process.stdin.isTTY && process.stdout.isTTY` for interactive mode).
+        stdio: shouldPipeLogs || noLogs ? ["ignore", "pipe", "pipe"] : ["inherit", "inherit", "pipe"],
         env: {
             ...process.env,
             ...wranglerOpts.env,
@@ -60,14 +85,24 @@ export function runWrangler(options, args, wranglerOpts = {}) {
             CLOUDFLARE_LOAD_DEV_VARS_FROM_DOT_ENV: "false",
         },
     });
-    if (result.status !== 0) {
-        if (shouldPipeLogs) {
-            process.stdout.write(result.stdout.toString());
-            process.stderr.write(result.stderr.toString());
+    const success = result.status === 0;
+    const stdout = result.stdout?.toString() ?? "";
+    const stderr = result.stderr?.toString() ?? "";
+    if (!noLogs) {
+        // When not piping logs, stderr is captured but should still be visible to the user
+        if (!shouldPipeLogs && stderr) {
+            process.stderr.write(stderr);
+        }
+        if (!success && shouldPipeLogs) {
+            process.stdout.write(stdout);
+            process.stderr.write(stderr);
         }
-        logger.error("Wrangler command failed");
-        process.exit(1);
     }
+    return {
+        success,
+        stdout,
+        stderr,
+    };
 }
 export function isWranglerTarget(v) {
     return !!v && ["local", "remote"].includes(v);

package/dist/cli/commands/{utils.d.ts → utils/utils.d.ts}

@@ -1,6 +1,5 @@
-import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import type yargs from "yargs";
-import type { OpenNextConfig } from "../../api/config.js";
+import type { OpenNextConfig } from "../../../api/config.js";
 export type WithWranglerArgs<T = unknown> = T & {
     wranglerArgs: string[];
     wranglerConfigPath: string | undefined;
@@ -13,15 +12,6 @@ export declare const nextAppDir: string;
  * @param command
  */
 export declare function printHeaders(command: string): void;
-/**
- * Validates that the Next.js version is supported and checks wrangler compatibility.
- *
- * Note: this function assumes that wrangler is installed.
- *
- * @param options.nextVersion The detected Next.js version string
- * @throws {Error} If the Next.js version is unsupported
- */
-export declare function ensureNextjsVersionSupported({ nextVersion, }: Pick<buildHelper.BuildOptions, "nextVersion">): Promise<void>;
 /**
  * Compile the OpenNext config.
  *

package/dist/cli/commands/{utils.js → utils/utils.js}

@@ -4,11 +4,11 @@ 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 * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { printHeader, showWarningOnWindows } from "@opennextjs/aws/build/utils.js";
 import logger from "@opennextjs/aws/logger.js";
 import { unstable_readConfig } from "wrangler";
-import { createOpenNextConfigIfNotExistent, ensureCloudflareConfig } from "../build/utils/index.js";
+import { ensureCloudflareConfig } from "../../build/utils/ensure-cf-config.js";
+import { createOpenNextConfigIfNotExistent } from "../../utils/create-config-files.js";
 export const nextAppDir = process.cwd();
 /**
  * Print headers and warnings for the CLI.
@@ -19,28 +19,6 @@ export function printHeaders(command) {
     printHeader(`Cloudflare ${command}`);
     showWarningOnWindows();
 }
-/**
- * Validates that the Next.js version is supported and checks wrangler compatibility.
- *
- * Note: this function assumes that wrangler is installed.
- *
- * @param options.nextVersion The detected Next.js version string
- * @throws {Error} If the Next.js version is unsupported
- */
-export async function ensureNextjsVersionSupported({ nextVersion, }) {
-    if (buildHelper.compareSemver(nextVersion, "<", "14.2.0")) {
-        throw new Error("Next.js version unsupported, please upgrade to version 14.2 or greater.");
-    }
-    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:
-    // - https://github.com/cloudflare/workerd/pull/5869
-    // - https://github.com/opennextjs/opennextjs-cloudflare/issues/1049
-    if (buildHelper.compareSemver(nextVersion, ">=", "16.1.0") &&
-        buildHelper.compareSemver(wranglerVersion, "<", "4.59.2")) {
-        logger.warn(`Next.js 16.1+ requires wrangler 4.59.2 or greater (${wranglerVersion} detected).`);
-    }
-}
 /**
  * Compile the OpenNext config.
  *

package/dist/cli/project-options.d.ts

@@ -1,4 +1,4 @@
-import type { WranglerTarget } from "./utils/run-wrangler.js";
+import type { WranglerTarget } from "./commands/utils/run-wrangler.js";
 export type ProjectOptions = {
     sourceDir: string;
     skipNextBuild: boolean;