Update the migrate command to attempt to create an R2 bucket for caching as part of the migration process (#1133)

Author: dario-piotrowicz

.changeset/bright-colts-march.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": minor
+---
+
+Update the `migrate` command to attempt to create an R2 bucket for caching, if that is not possible an application without caching enabled will be generated instead.

create-cloudflare/next/package.json

@@ -28,6 +28,6 @@
 		"eslint-config-next": "15.4.6",
 		"tailwindcss": "^4",
 		"typescript": "^5.7.4",
-		"wrangler": "^4.59.3"
+		"wrangler": "^4.65.0"
 	}
 }

packages/cloudflare/package.json

@@ -58,6 +58,7 @@
 		"cloudflare": "^4.4.1",
 		"enquirer": "^2.4.1",
 		"glob": "catalog:",
+		"comment-json": "^4.5.1",
 		"ts-tqdm": "^0.8.6",
 		"yargs": "catalog:"
 	},

packages/cloudflare/src/cli/build/build.ts

@@ -9,8 +9,8 @@ import logger from "@opennextjs/aws/logger.js";
 import type { Unstable_Config } from "wrangler";
 
 import { OpenNextConfig } from "../../api/config.js";
-import { ensureNextjsVersionSupported } from "../commands/utils.js";
 import type { ProjectOptions } from "../project-options.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";

packages/cloudflare/src/cli/build/bundle-server.ts

@@ -10,6 +10,7 @@ import { build, type Plugin } from "esbuild";
 
 import { getOpenNextConfig } from "../../api/config.js";
 import type { ProjectOptions } from "../project-options.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";
@@ -26,7 +27,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)), "../..");

packages/cloudflare/src/cli/build/open-next/compile-env-files.ts

@@ -3,7 +3,7 @@ import path from "node:path";
 
 import { BuildOptions } from "@opennextjs/aws/build/helper.js";
 
-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.

packages/cloudflare/src/cli/build/open-next/createServerBundle.ts

@@ -26,10 +26,10 @@ import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import type { Plugin } from "esbuild";
 
 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";
 
 interface CodeCustomization {

packages/cloudflare/src/cli/build/patches/plugins/dynamic-requires.ts

@@ -6,7 +6,7 @@ import { patchCode, type RuleConfig } from "@opennextjs/aws/build/patch/astCodeP
 import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.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: string): Promise<string[]> {
 	try {

packages/cloudflare/src/cli/build/patches/plugins/instrumentation.ts

@@ -6,7 +6,7 @@ import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.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: ContentUpdater, buildOpts: BuildOptions): Plugin {
 	const builtInstrumentationPath = getBuiltInstrumentationPath(buildOpts);

packages/cloudflare/src/cli/build/patches/plugins/load-manifest.ts

@@ -13,7 +13,7 @@ import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-upd
 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: ContentUpdater, buildOpts: BuildOptions): Plugin {
 	return updater.updateContent("inline-load-manifest", [