Backport #8478 to Wrangler v3

.changeset/green-shrimps-grab.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Add `wrangler types` support for importable env and `process.env`

packages/wrangler/e2e/types.test.ts

@@ -73,10 +73,13 @@ describe("types", () => {
 			"utf8"
 		);
 		expect(file).toMatchInlineSnapshot(`
-			"// Generated by Wrangler by running \`wrangler types --include-runtime=false\` (hash: 7fbca0b39560512499078acfe5f450c0)
-			interface Env {
-				MY_VAR: "my-var-value";
+			"// Generated by Wrangler by running \`wrangler types --include-runtime=false\` (hash: 7915eccca244b8d5c107e358ee5929e8)
+			declare namespace Cloudflare {
+				interface Env {
+					MY_VAR: "my-var-value";
+				}
 			}
+			interface Env extends Cloudflare.Env {}
 			"
 		`);
 	});
@@ -92,7 +95,7 @@ describe("types", () => {
 		).split("\n");
 
 		expect(lines[0]).toMatchInlineSnapshot(
-			`"// Generated by Wrangler by running \`wrangler types ./types.d.ts\` (hash: 7fbca0b39560512499078acfe5f450c0)"`
+			`"// Generated by Wrangler by running \`wrangler types ./types.d.ts\` (hash: 7915eccca244b8d5c107e358ee5929e8)"`
 		);
 		expect(lines[1]).match(
 			/\/\/ Runtime types generated with workerd@1\.\d{8}\.\d \d{4}-\d{2}-\d{2} ([a-z_]+,?)*/
@@ -119,7 +122,7 @@ describe("types", () => {
 		).split("\n");
 
 		expect(lines[0]).toMatchInlineSnapshot(
-			`"// Generated by Wrangler by running \`wrangler types -c wranglerA.toml --env-interface MyCloudflareEnv ./cflare-env.d.ts\` (hash: 8fcf1ed67a52a2d34d6d34c3068e89b8)"`
+			`"// Generated by Wrangler by running \`wrangler types -c wranglerA.toml --env-interface MyCloudflareEnv ./cflare-env.d.ts\` (hash: 2f74a5a99f09ae4d994228b5bb959d24)"`
 		);
 		expect(lines[1]).match(
 			/\/\/ Runtime types generated with workerd@1\.\d{8}\.\d \d{4}-\d{2}-\d{2} ([a-z_]+,?)*/

packages/wrangler/src/__tests__/process-env-populated.test.ts

@@ -0,0 +1,82 @@
+import assert from "node:assert";
+import { isProcessEnvPopulated } from "../process-env";
+
+describe("isProcessEnvPopulated", () => {
+	test("default", () => {
+		expect(isProcessEnvPopulated(undefined, ["nodejs_compat"])).toBe(false);
+	});
+
+	test("future date", () => {
+		expect(isProcessEnvPopulated("2026-01-01", ["nodejs_compat"])).toBe(true);
+	});
+
+	test("old date", () => {
+		expect(isProcessEnvPopulated("2000-01-01", ["nodejs_compat"])).toBe(false);
+	});
+
+	test("switch date", () => {
+		expect(isProcessEnvPopulated("2025-04-01", ["nodejs_compat"])).toBe(true);
+	});
+
+	test("old date, but with flag", () => {
+		expect(
+			isProcessEnvPopulated("2000-01-01", [
+				"nodejs_compat",
+				"nodejs_compat_populate_process_env",
+			])
+		).toBe(true);
+	});
+
+	test("old date, with disable flag", () => {
+		expect(
+			isProcessEnvPopulated("2000-01-01", [
+				"nodejs_compat",
+				"nodejs_compat_do_not_populate_process_env",
+			])
+		).toBe(false);
+	});
+
+	test("future date, but with disable flag", () => {
+		expect(
+			isProcessEnvPopulated("2026-01-01", [
+				"nodejs_compat",
+				"nodejs_compat_do_not_populate_process_env",
+			])
+		).toBe(false);
+	});
+
+	test("future date, with enable flag", () => {
+		expect(
+			isProcessEnvPopulated("2026-01-01", [
+				"nodejs_compat",
+				"nodejs_compat_populate_process_env",
+			])
+		).toBe(true);
+	});
+
+	test("future date without nodejs_compat", () => {
+		expect(isProcessEnvPopulated("2026-01-01")).toBe(false);
+	});
+
+	test("future date, with enable flag but without nodejs_compat", () => {
+		expect(
+			isProcessEnvPopulated("2026-01-01", [
+				"nodejs_compat_populate_process_env",
+			])
+		).toBe(false);
+	});
+
+	test("errors with disable and enable flags specified", () => {
+		try {
+			isProcessEnvPopulated("2024-01-01", [
+				"nodejs_compat_populate_process_env",
+				"nodejs_compat_do_not_populate_process_env",
+			]);
+			assert(false, "Unreachable");
+		} catch (e) {
+			expect(e).toMatchInlineSnapshot(
+				`[Error: Can't both enable and disable a flag]`
+			);
+		}
+	});
+});