fix and update tests

Author: emily-shen

packages/wrangler/e2e/types.test.ts

@@ -96,29 +96,43 @@ describe("types", () => {
 				"FAKE RUNTIME",
 			].join("\n")
 		);
-		console.log(
-			[
-				file[0],
-				file[1],
-				"FAKE ENV",
-				"// Begin runtime types",
-				"FAKE RUNTIME",
-			].join("\n")
-		);
 
 		await helper.run(`wrangler types`);
 
 		const file2 = (await readFile(typesPath)).toString();
 
-		expect(file2).toMatchInlineSnapshot(`
-			"// Generated by Wrangler by running \`wrangler types\` (hash: e82ba4d7b995dd9ca6fb0332d81f889b)
-			// Runtime types generated with [email protected] 2023-01-01 no_global_navigator,nodejs_compat
-			// eslint-disable-next-line @typescript-eslint/no-empty-interface,@typescript-eslint/no-empty-object-type
-			interface Env {
-			}
+		// regenerates env types
+		expect(file2).toContain("interface Env {");
+		// uses cached runtime types
+		expect(file2).toContain("// Begin runtime types");
+		expect(file2).toContain("FAKE RUNTIME");
+	});
 
-			// Begin runtime types
-			FAKE RUNTIME"
-		`);
+	it("should prompt you to update types if they've been changed", async () => {
+		const helper = new WranglerE2ETestHelper();
+		await helper.seed(seed);
+		await helper.run(`wrangler types`);
+		seed["wrangler.toml"] = dedent`
+				name = "test-worker"
+				main = "src/index.ts"
+				compatibility_date = "2023-01-01"
+				compatibility_flags = ["nodejs_compat", "no_global_navigator"]
+				[vars]
+				BEEP = "BOOP"
+			`;
+		await helper.seed(seed);
+		const worker = helper.runLongLived("wrangler dev");
+		await worker.readUntil(/❓ It looks like your types might be out of date./);
+		seed["wrangler.toml"] = dedent`
+			name = "test-worker"
+			main = "src/index.ts"
+			compatibility_date = "2023-01-01"
+			compatibility_flags = ["nodejs_compat"]
+			[vars]
+			BEEP = "BOOP"
+			ASDf = "ADSfadsf"
+		`;
+		await helper.seed(seed);
+		await worker.readUntil(/❓ It looks like your types might be out of date./);
 	});
 });

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

@@ -11,6 +11,7 @@ export const checkTypesDiff = async (config: Config, entry: Entry) => {
 	}
 	let maybeExistingTypesFile: string[];
 	try {
+		// Note: this checks the default location only
 		maybeExistingTypesFile = readFileSync(
 			"./worker-configuration.d.ts",
 			"utf-8"
@@ -56,7 +57,8 @@ export const checkTypesDiff = async (config: Config, entry: Entry) => {
 	const envOutOfDate = existingEnvHeader && maybeExistingHash !== newHash;
 	const runtimeOutOfDate =
 		existingRuntimeHeader && existingRuntimeHeader !== newRuntimeHeader;
-	if (envOutOfDate && runtimeOutOfDate) {
+
+	if (envOutOfDate || runtimeOutOfDate) {
 		logger.log(
 			"❓ It looks like your types might be out of date. Have you updated your config file since last running `wrangler types`?"
 		);