Turn on --x-registry for Pages by default (#7381)

cloudflare · Nov 28, 2024 · 22a4055 · 22a4055
1 parent a3f56d1
commit 22a4055
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 3 deletions.
diff --git a/.changeset/seven-eels-reflect.md b/.changeset/seven-eels-reflect.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Turn on `--x-registry` for Pages by default
diff --git a/packages/wrangler/e2e/dev-registry.test.ts b/packages/wrangler/e2e/dev-registry.test.ts
@@ -1,4 +1,5 @@
 import { execSync } from "child_process";
+import getPort from "get-port";
 import dedent from "ts-dedent";
 import { fetch } from "undici";
 import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -140,7 +141,7 @@ describe("unstable_dev()", () => {
 });
 
 describe.each([
-	{ cmd: "wrangler dev --x-registry" },
+	{ cmd: "wrangler dev" },
 	{ cmd: "wrangler dev --no-x-registry" },
 ])("dev registry $cmd", ({ cmd }) => {
 	let workerName: string;
@@ -450,4 +451,121 @@ describe.each([
 			);
 		});
 	});
+
+	describe("pages dev", () => {
+		beforeEach(async () => {
+			await baseSeed(a, {
+				"wrangler.toml": dedent`
+						name = "${workerName}"
+						pages_build_output_dir = "dist"
+						compatibility_date = "2023-01-01"
+
+						[[services]]
+						binding = "BEE"
+						service = '${workerName2}'
+				`,
+				"dist/_worker.js": dedent/* javascript */ `export default {
+					fetch(req, env) {
+                        const url = new URL(req.url)
+                        if (url.pathname === "/service") {
+                            return env.BEE.fetch(req);
+                        }
+						return new Response("Hello from Pages")
+					},
+				};`,
+			});
+		});
+		it("can fetch b", async () => {
+			const worker = helper.runLongLived(cmd, { cwd: b });
+
+			const { url } = await worker.waitForReady(5_000);
+
+			await expect(fetch(url).then((r) => r.text())).resolves.toBe(
+				"hello world"
+			);
+		});
+
+		it("can fetch a (pages project)", async () => {
+			const port = await getPort();
+			const worker = helper.runLongLived(
+				`${cmd.replace("wrangler dev", "wrangler pages dev")} --port ${port}`,
+				{ cwd: a }
+			);
+
+			const { url } = await worker.waitForReady(5_000);
+
+			await expect(fetch(url).then((r) => r.text())).resolves.toBe(
+				"Hello from Pages"
+			);
+		});
+
+		it("can fetch b through a (start b, start a)", async () => {
+			const workerB = helper.runLongLived(cmd, { cwd: b });
+			// We don't need b's URL, but ensure that b starts up before a
+			await workerB.waitForReady(5_000);
+
+			const port = await getPort();
+			const workerA = helper.runLongLived(
+				`${cmd.replace("wrangler dev", "wrangler pages dev")} --port ${port}`,
+				{ cwd: a }
+			);
+			const { url } = await workerA.waitForReady(5_000);
+
+			await vi.waitFor(
+				async () =>
+					await expect(fetchText(`${url}/service`)).resolves.toBe(
+						"hello world"
+					),
+				{ interval: 1000, timeout: 10_000 }
+			);
+
+			expect(normalizeOutput(workerA.currentOutput)).toContain(
+				"bindings connect to other `wrangler dev` processes running locally"
+			);
+		});
+
+		it("can fetch b through a (start a, start b)", async () => {
+			const port = await getPort();
+			const workerA = helper.runLongLived(
+				`${cmd.replace("wrangler dev", "wrangler pages dev")} --port ${port}`,
+				{ cwd: a }
+			);
+			const { url } = await workerA.waitForReady(5_000);
+
+			const workerB = helper.runLongLived(cmd, { cwd: b });
+			await workerB.waitForReady(5_000);
+
+			await vi.waitFor(
+				async () =>
+					await expect(fetchText(`${url}/service`)).resolves.toBe(
+						"hello world"
+					),
+				{ interval: 1000, timeout: 10_000 }
+			);
+		});
+
+		it("can fetch b through a (start a, start b) w/o config file", async () => {
+			await baseSeed(a, {
+				"wrangler.toml": dedent`
+				`,
+			});
+			const port = await getPort();
+			const workerA = helper.runLongLived(
+				`${cmd.replace("wrangler dev", "wrangler pages dev")} dist --service BEE=${workerName2} --port ${port}`,
+				{ cwd: a }
+			);
+			const { url } = await workerA.waitForReady(5_000);
+
+			const workerB = helper.runLongLived(cmd, { cwd: b });
+			await workerB.waitForReady(5_000);
+
+			await vi.waitFor(
+				async () =>
+					await expect(fetchText(`${url}/service`)).resolves.toBe(
+						"hello world"
+					),
+				{ interval: 1000, timeout: 10_000 }
+			);
+		});
+	});
 });
diff --git a/packages/wrangler/src/__tests__/pages/pages.test.ts b/packages/wrangler/src/__tests__/pages/pages.test.ts
@@ -77,7 +77,7 @@ describe("pages", () => {
 			      --persist-to                                 Specify directory to use for local persistence (defaults to .wrangler/state)  [string]
 			      --log-level                                  Specify logging level  [choices: \\"debug\\", \\"info\\", \\"log\\", \\"warn\\", \\"error\\", \\"none\\"]
 			      --show-interactive-dev-session               Show interactive dev session (defaults to true if the terminal supports interactivity)  [boolean]
-			      --experimental-registry, --x-registry        Use the experimental file based dev registry for multi-worker development  [boolean] [default: false]
+			      --experimental-registry, --x-registry        Use the experimental file based dev registry for multi-worker development  [boolean] [default: true]
 			      --experimental-vectorize-bind-to-prod        Bind to production Vectorize indexes in local development mode  [boolean] [default: false]"
 		`);
 	});

diff --git a/packages/wrangler/src/pages/dev.ts b/packages/wrangler/src/pages/dev.ts
@@ -249,7 +249,7 @@ export function Options(yargs: CommonYargsArgv) {
 				type: "boolean",
 				describe:
 					"Use the experimental file based dev registry for multi-worker development",
-				default: false,
+				default: true,
 			},
 			"experimental-vectorize-bind-to-prod": {
 				type: "boolean",