fix caching

Author: emily-shen

packages/wrangler/src/type-generation/index.ts

@@ -179,7 +179,7 @@ export const typesCommand = createCommand({
 				outFile: outputPath || undefined,
 			});
 			header.push(runtimeHeader);
-			types.push(runtimeTypes);
+			types.push(`// Begin runtime types\n${runtimeTypes}`);
 		}
 
 		fs.writeFileSync(

packages/wrangler/src/type-generation/runtime/index.ts

@@ -49,12 +49,19 @@ export async function generateRuntimeTypes({
 	const header = `// Runtime types generated with workerd@${version} ${compatibility_date} ${compatibility_flags.join(",")}`;
 
 	try {
-		const existingTypes = await readFile(outFile, "utf8");
-		if (existingTypes.split("\n")[0] === header) {
+		const file = (await readFile(outFile, "utf8")).split("\n");
+		const existingHeader = file.find((line) =>
+			line.startsWith("// Runtime types generated with workerd@")
+		);
+		const existingTypesStart = file.findIndex(
+			(line) => line === "// Begin runtime types"
+		);
+		if (existingHeader === header && existingTypesStart !== -1) {
 			logger.debug("Using cached runtime types: ", header);
+
 			return {
 				runtimeHeader: header,
-				runtimeTypes: existingTypes.split("\n").slice(1).join("\n"),
+				runtimeTypes: file.slice(existingTypesStart).join("\n"),
 			};
 		}
 	} catch (e) {

packages/wrangler/src/type-generation/runtime/log-runtime-types-message.ts

@@ -51,7 +51,7 @@ export function logRuntimeTypesMessage(
 		logAction("Install types@node");
 		logger.log(
 			chalk.dim(
-				`Since you have the \`nodejs_compat\` flag, you should install Node.js types by running "npm i --save-dev @types/node${isWorkersTypesInstalled ? '@20.8.3". For more details: https://developers.cloudflare.com/workers/languages/typescript/#known-issues' : '".'}`
+				`Since you have the \`nodejs_compat\` flag, you should install Node.js types by running "npm i --save-dev @types/node${isWorkersTypesInstalled ? '@20.8.3".\nFor more details: https://developers.cloudflare.com/workers/languages/typescript/#known-issues' : '".'}`
 			)
 		);
 		logger.log("");