Apply various bugfixes/improvements to the migrate command (#1122)

Author: dario-piotrowicz

.changeset/puny-coins-tease.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+In `migrate` command, avoid adding unnecessary newlines when creating files

.changeset/salty-spoons-agree.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+fix `migrate` command incorrectly erroring if the target application doesn't have a `public` directory

.changeset/upset-squids-deny.md

@@ -0,0 +1,10 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Bump `@opennextjs/aws` to 3.9.16
+
+- Fix `migrate` command not updating Next.js config files
+- Fixes [#1062](https://github.com/opennextjs/opennextjs-cloudflare/issues/1062), [#1115](https://github.com/opennextjs/opennextjs-cloudflare/issues/1115)
+
+See details at <https://github.com/opennextjs/opennextjs-aws/releases/tag/v3.9.16>

packages/cloudflare/package.json

@@ -54,7 +54,7 @@
 	"dependencies": {
 		"@ast-grep/napi": "^0.40.5",
 		"@dotenvx/dotenvx": "catalog:",
-		"@opennextjs/aws": "3.9.15",
+		"@opennextjs/aws": "3.9.16",
 		"cloudflare": "^4.4.1",
 		"enquirer": "^2.4.1",
 		"glob": "catalog:",

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

@@ -1,4 +1,5 @@
 import fs from "node:fs";
+import path from "node:path";
 
 /**
  * Appends text to a file
@@ -8,16 +9,29 @@ import fs from "node:fs";
  *
  * @param filepath The path to the file.
  * @param text The text to append to the file.
- * @param condition A function that receives the current file content and returns `true` if the text should be appended to it, the condition is skipped when the file is being created.
+ * @param opts.appendIf A function that receives the current file content and returns `true` if the text should be appended to it, the condition is skipped when the file is being created. Defaults to a function that always returns true.
+ * @param opts.appendPrefix A string that will be inserted between the pre-existing file's content and the new text in case the file already existed. Defaults to an empty string.
  */
 export function conditionalAppendFileSync(
 	filepath: string,
 	text: string,
-	condition: (fileContent: string) => boolean
+	{
+		appendIf = () => true,
+		appendPrefix = "",
+	}: {
+		appendIf?: (fileContent: string) => boolean;
+		appendPrefix?: string;
+	} = {}
 ): void {
 	const fileExists = fs.existsSync(filepath);
+	const maybeFileContent = fileExists ? fs.readFileSync(filepath, "utf8") : "";
 
-	if (!fileExists || condition(fs.readFileSync(filepath, "utf8"))) {
-		fs.appendFileSync(filepath, text);
+	if (!fileExists) {
+		const dir = path.dirname(filepath);
+		fs.mkdirSync(dir, { recursive: true });
+	}
+
+	if (!fileExists || appendIf(maybeFileContent)) {
+		fs.appendFileSync(filepath, `${maybeFileContent.length > 0 ? appendPrefix : ""}${text}`);
 	}
 }

packages/cloudflare/src/cli/commands/migrate.ts

@@ -70,20 +70,22 @@ async function migrateCommand(args: { forceInstall: boolean }): Promise<void> {
 
 	const devVarsExists = fs.existsSync(".dev.vars");
 	printStepTitle(`${devVarsExists ? "Updating" : "Creating"} .dev.vars file`);
-	conditionalAppendFileSync(
-		".dev.vars",
-		"\nNEXTJS_ENV=development\n",
-		(content) => !/\bNEXTJS_ENV\b/.test(content)
-	);
+	conditionalAppendFileSync(".dev.vars", "NEXTJS_ENV=development\n", {
+		appendIf: (content) => !/\bNEXTJS_ENV\b/.test(content),
+		appendPrefix: "\n",
+	});
 
 	printStepTitle(`${fs.existsSync("public/_headers") ? "Updating" : "Creating"} public/_headers file`);
 	conditionalAppendFileSync(
 		"public/_headers",
-		"\n\n# https://developers.cloudflare.com/workers/static-assets/headers\n" +
+		"# https://developers.cloudflare.com/workers/static-assets/headers\n" +
 			"# https://opennext.js.org/cloudflare/caching#static-assets-caching\n" +
 			"/_next/static/*\n" +
-			"  Cache-Control: public,max-age=31536000,immutable\n\n",
-		(content) => !/^\/_next\/static\/*\b/.test(content)
+			"  Cache-Control: public,max-age=31536000,immutable\n",
+		{
+			appendIf: (content) => !/^\/_next\/static\/*\b/.test(content),
+			appendPrefix: "\n\n",
+		}
 	);
 
 	printStepTitle("Updating package.json scripts");
@@ -121,18 +123,24 @@ async function migrateCommand(args: { forceInstall: boolean }): Promise<void> {
 
 	const gitIgnoreExists = fs.existsSync(".gitignore");
 	printStepTitle(`${gitIgnoreExists ? "Updating" : "Creating"} .gitignore file`);
-	conditionalAppendFileSync(
-		".gitignore",
-		"\n# OpenNext\n.open-next\n",
-		(content) => !content.includes(".open-next")
-	);
+	conditionalAppendFileSync(".gitignore", "# OpenNext\n.open-next\n", {
+		appendIf: (content) => !content.includes(".open-next"),
+		appendPrefix: "\n",
+	});
 
-	printStepTitle("Updating Next.js config");
-	conditionalAppendFileSync(
-		findNextConfig({ appPath: projectDir })!,
-		"\nimport('@opennextjs/cloudflare').then(m => m.initOpenNextCloudflareForDev());\n",
-		(content) => !content.includes("initOpenNextCloudflareForDev")
-	);
+	const nextConfig = findNextConfig({ appPath: projectDir });
+
+	if (nextConfig) {
+		printStepTitle("Updating Next.js config");
+		conditionalAppendFileSync(
+			nextConfig.path,
+			"import('@opennextjs/cloudflare').then(m => m.initOpenNextCloudflareForDev());\n",
+			{
+				appendIf: (content) => !content.includes("initOpenNextCloudflareForDev"),
+				appendPrefix: "\n",
+			}
+		);
+	}
 
 	printStepTitle("Checking for edge runtime usage");
 	try {