update createOrAppendToFile to conditionalAppendFileSync

Author: dario-piotrowicz

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

@@ -1,26 +1,22 @@
 import fs from "node:fs";
 
 /**
- * Creates a file with the given text, or appends to it if it already exists and the condition is met.
+ * Runs fs' `appendFileSync` on a target file, but only a specified condition is met in regards to the file's content.
  *
- * @param filepath The path to the file to create or append to.
- * @param text The text to write or append to the file.
- * @param condition A function that receives the current file content and returns `true` if the text should be appended.
+ * @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.
  */
-export function createOrAppendToFile(
+export function conditionalAppendFileSync(
 	filepath: string,
 	text: string,
 	condition: (fileContent: string) => boolean
 ): void {
 	const fileExists = fs.existsSync(filepath);
 
-	if (!fileExists) {
-		fs.writeFileSync(filepath, text);
-		return;
-	}
+	const fileContent = fileExists ? fs.readFileSync(filepath, "utf8") : undefined;
 
-	const fileContent = fs.readFileSync(filepath, "utf8");
-	if (condition(fileContent)) {
+	if (fileContent !== undefined && condition(fileContent)) {
 		fs.appendFileSync(filepath, `\n${text}\n`);
 	}
 }

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

@@ -6,7 +6,7 @@ import { findPackagerAndRoot } from "@opennextjs/aws/build/helper.js";
 import logger from "@opennextjs/aws/logger.js";
 import type yargs from "yargs";
 
-import { createOrAppendToFile } from "../build/utils/files.js";
+import { conditionalAppendFileSync } from "../build/utils/files.js";
 import { getNextConfigPath } from "../utils/next-config.js";
 import { createOpenNextConfigFile, getOpenNextConfigPath } from "../utils/open-next-config.js";
 import { createWranglerConfigFile, getWranglerConfigPath } from "../utils/wrangler-config.js";
@@ -71,15 +71,14 @@ async function migrateCommand(): Promise<void> {
 
 	const devVarsExists = fs.existsSync(".dev.vars");
 	printStepTitle(`${devVarsExists ? "Updating" : "Creating"} .dev.vars file`);
-	createOrAppendToFile(
+	conditionalAppendFileSync(
 		".dev.vars",
 		"NEXTJS_ENV=development",
 		(gitIgnoreContent) => !gitIgnoreContent.includes("NEXTJS_ENV=")
 	);
 
-
 	printStepTitle(`${fs.existsSync("public/_headers") ? "Updating" : "Creating"} public/_headers file`);
-	createOrAppendToFile(
+	conditionalAppendFileSync(
 		"public/_headers",
 		[
 			"",
@@ -127,14 +126,14 @@ async function migrateCommand(): Promise<void> {
 
 	const gitIgnoreExists = fs.existsSync(".gitignore");
 	printStepTitle(`${gitIgnoreExists ? "Updating" : "Creating"} .gitignore file`);
-	createOrAppendToFile(
+	conditionalAppendFileSync(
 		".gitignore",
 		"# OpenNext\n.open-next",
 		(gitIgnoreContent) => !gitIgnoreContent.includes(".open-next")
 	);
 
 	printStepTitle("Updating Next.js config");
-	createOrAppendToFile(
+	conditionalAppendFileSync(
 		nextConfigFilePath,
 		"\nimport('@opennextjs/cloudflare').then(m => m.initOpenNextCloudflareForDev());",
 		(nextConfigContent) => !nextConfigContent.includes("initOpenNextCloudflareForDev")