Remove express-based dev registry (#7706)

* Remove Server Registry * some more * Create ten-eyes-tease.md * fix * remove metafile * fix rebase * fix lockfile
cloudflare · Jan 10, 2025 · 724526e · 724526e
1 parent 94aa959
commit 724526e
Show file tree

Hide file tree

Showing 23 changed files with 359 additions and 2,311 deletions.
diff --git a/.changeset/ten-eyes-tease.md b/.changeset/ten-eyes-tease.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Remove the server-based dev registry in favour of the more stable file-based dev registry. There should be no user-facing impact.
diff --git a/.gitignore b/.gitignore
@@ -188,6 +188,7 @@ packages/quick-edit/vscode
 packages/quick-edit/web
 
 packages/wrangler/config-schema.json
+packages/wrangler/metafile.json
 packages/chrome-devtools-patches/built-devtools
 packages/chrome-devtools-patches/.cipd
 packages/chrome-devtools-patches/.gclient

diff --git a/fixtures/get-platform-proxy/tests/shared.ts b/fixtures/get-platform-proxy/tests/shared.ts
@@ -9,6 +9,5 @@ export function getPlatformProxy<T>(
 	return originalGetPlatformProxy({
 		...options,
 		persist: false,
-		experimentalRegistry: true,
 	});
 }
diff --git a/fixtures/shared/src/run-wrangler-long-lived.ts b/fixtures/shared/src/run-wrangler-long-lived.ts
@@ -25,20 +25,13 @@ export async function runWranglerPagesDev(
 ) {
 	if (publicPath) {
 		return runLongLivedWrangler(
-			[
-				"pages",
-				"dev",
-				publicPath,
-				"--x-registry",
-				"--ip=127.0.0.1",
-				...options,
-			],
+			["pages", "dev", publicPath, "--ip=127.0.0.1", ...options],
 			cwd,
 			env
 		);
 	} else {
 		return runLongLivedWrangler(
-			["pages", "dev", "--x-registry", "--ip=127.0.0.1", ...options],
+			["pages", "dev", "--ip=127.0.0.1", ...options],
 			cwd,
 			env
 		);
@@ -58,11 +51,7 @@ export async function runWranglerDev(
 	options: string[],
 	env?: NodeJS.ProcessEnv
 ) {
-	return runLongLivedWrangler(
-		["dev", "--x-registry", "--ip=127.0.0.1", ...options],
-		cwd,
-		env
-	);
+	return runLongLivedWrangler(["dev", "--ip=127.0.0.1", ...options], cwd, env);
 }
 
 async function runLongLivedWrangler(

diff --git a/packages/pages-shared/package.json b/packages/pages-shared/package.json
@@ -24,12 +24,12 @@
 	"devDependencies": {
 		"@cloudflare/workers-tsconfig": "workspace:*",
 		"@cloudflare/workers-types": "^4.20241230.0",
-		"@miniflare/cache": "^2.14.2",
-		"@miniflare/core": "^2.14.2",
-		"@miniflare/html-rewriter": "^2.14.2",
-		"@miniflare/storage-memory": "^2.14.2",
+		"@miniflare/cache": "^2.14.4",
+		"@miniflare/core": "^2.14.4",
+		"@miniflare/html-rewriter": "^2.14.4",
+		"@miniflare/storage-memory": "^2.14.4",
 		"concurrently": "^8.2.2",
-		"glob": "^10.3.3"
+		"glob": "^10.4.5"
 	},
 	"volta": {
 		"extends": "../../package.json"

diff --git a/packages/wrangler/e2e/dev-registry.test.ts b/packages/wrangler/e2e/dev-registry.test.ts
@@ -138,10 +138,7 @@ describe("unstable_dev()", () => {
 	});
 });
 
-describe.each([
-	{ cmd: "wrangler dev" },
-	{ cmd: "wrangler dev --no-x-registry" },
-])("dev registry $cmd", ({ cmd }) => {
+describe.each([{ cmd: "wrangler dev" }])("dev registry $cmd", ({ cmd }) => {
 	let workerName: string;
 	let workerName2: string;
 	let workerName3: string;

diff --git a/packages/wrangler/e2e/get-platform-proxy.test.ts b/packages/wrangler/e2e/get-platform-proxy.test.ts
@@ -120,7 +120,7 @@ describe("getPlatformProxy()", () => {
 		});
 
 		async function runInNode(code: string) {
-			const w = helper.runLongLived("wrangler dev --x-registry", {
+			const w = helper.runLongLived("wrangler dev", {
 				cwd: worker,
 			});
 
@@ -130,7 +130,7 @@ describe("getPlatformProxy()", () => {
 				"index.mjs": dedent/*javascript*/ `
 						import { getPlatformProxy } from "${WRANGLER_IMPORT}"
 
-						const { env } = await getPlatformProxy({ experimentalRegistry: true });
+						const { env } = await getPlatformProxy();
 
 						const resp = ${code}
 

diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json
@@ -102,9 +102,7 @@
 		"@sentry/node": "^7.86.0",
 		"@sentry/types": "^7.86.0",
 		"@sentry/utils": "^7.86.0",
-		"@types/body-parser": "^1.19.2",
 		"@types/command-exists": "^1.2.0",
-		"@types/express": "^4.17.13",
 		"@types/glob-to-regexp": "^0.4.1",
 		"@types/is-ci": "^3.0.0",
 		"@types/javascript-time-ago": "^2.0.3",
@@ -119,7 +117,6 @@
 		"@types/yargs": "^17.0.22",
 		"@vitest/ui": "catalog:default",
 		"@webcontainer/env": "^1.1.0",
-		"body-parser": "^1.20.0",
 		"chalk": "^5.2.0",
 		"cli-table3": "^0.6.3",
 		"cmd-shim": "^4.1.0",
@@ -128,11 +125,9 @@
 		"devtools-protocol": "^0.0.1182435",
 		"dotenv": "^16.3.1",
 		"execa": "^6.1.0",
-		"express": "^4.18.1",
 		"find-up": "^6.3.0",
 		"get-port": "^7.0.0",
 		"glob-to-regexp": "^0.4.1",
-		"http-terminator": "^3.2.0",
 		"https-proxy-agent": "7.0.2",
 		"ignore": "^5.2.0",
 		"is-ci": "^3.0.1",

diff --git a/packages/wrangler/scripts/bundle.ts b/packages/wrangler/scripts/bundle.ts
@@ -1,3 +1,4 @@
+import { writeFileSync } from "node:fs";
 import path from "node:path";
 import * as esbuild from "esbuild";
 import { EXTERNAL_DEPENDENCIES } from "./deps";
@@ -35,6 +36,7 @@ async function buildMain(flags: BuildFlags = {}) {
 		outdir,
 		platform: "node",
 		format: "cjs",
+		metafile: true,
 		external: EXTERNAL_DEPENDENCIES,
 		sourcemap: process.env.SOURCEMAPS !== "false",
 		inject: [path.join(__dirname, "../import_meta_url.js")],
@@ -64,7 +66,8 @@ async function buildMain(flags: BuildFlags = {}) {
 		const ctx = await esbuild.context(options);
 		await ctx.watch();
 	} else {
-		await esbuild.build(options);
+		const res = await esbuild.build(options);
+		writeFileSync("metafile.json", JSON.stringify(res.metafile));
 	}
 }
 

diff --git a/packages/wrangler/src/__tests__/config/configuration.test.ts b/packages/wrangler/src/__tests__/config/configuration.test.ts
@@ -2539,7 +2539,6 @@ describe("normalizeAndValidateConfig()", () => {
 				const { diagnostics } = run(
 					{
 						RESOURCES_PROVISION: true,
-						FILE_BASED_REGISTRY: false,
 						MULTIWORKER: false,
 					},
 					() =>
@@ -2695,7 +2694,6 @@ describe("normalizeAndValidateConfig()", () => {
 				const { diagnostics } = run(
 					{
 						RESOURCES_PROVISION: true,
-						FILE_BASED_REGISTRY: false,
 						MULTIWORKER: false,
 					},
 					() =>
@@ -3025,7 +3023,6 @@ describe("normalizeAndValidateConfig()", () => {
 				const { diagnostics } = run(
 					{
 						RESOURCES_PROVISION: true,
-						FILE_BASED_REGISTRY: false,
 						MULTIWORKER: false,
 					},
 					() =>

diff --git a/packages/wrangler/src/__tests__/dev.test.ts b/packages/wrangler/src/__tests__/dev.test.ts
@@ -1399,7 +1399,6 @@ describe.sequential("wrangler dev", () => {
 				      --test-scheduled                             Test scheduled events by visiting /__scheduled in browser  [boolean] [default: false]
 				      --log-level                                  Specify logging level  [choices: \\"debug\\", \\"info\\", \\"log\\", \\"warn\\", \\"error\\", \\"none\\"] [default: \\"log\\"]
 				      --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: true]
 				      --experimental-vectorize-bind-to-prod        Bind to production Vectorize indexes in local development mode  [boolean] [default: false]",
 				  "warn": "",
 				}

diff --git a/packages/wrangler/src/__tests__/pages/pages.test.ts b/packages/wrangler/src/__tests__/pages/pages.test.ts
@@ -77,7 +77,6 @@ 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: true]
 			      --experimental-vectorize-bind-to-prod        Bind to production Vectorize indexes in local development mode  [boolean] [default: false]"
 		`);
 	});

diff --git a/packages/wrangler/src/__tests__/unstableDev.test.ts b/packages/wrangler/src/__tests__/unstableDev.test.ts
diff --git a/packages/wrangler/src/api/dev.ts b/packages/wrangler/src/api/dev.ts
@@ -125,7 +125,6 @@ export async function unstable_dev(
 		showInteractiveDevSession,
 		testMode,
 		testScheduled,
-		fileBasedRegistry = true,
 		vectorizeBindToProd,
 		// 2. options for alpha/beta products/libs
 		d1Databases,
@@ -218,16 +217,13 @@ export async function unstable_dev(
 		logLevel: options?.logLevel ?? defaultLogLevel,
 		port: options?.port ?? 0,
 		experimentalProvision: undefined,
-		experimentalDevEnv: undefined,
-		experimentalRegistry: fileBasedRegistry,
 		experimentalVectorizeBindToProd: vectorizeBindToProd ?? false,
 		enableIpc: options?.experimental?.enableIpc,
 	};
 
 	//outside of test mode, rebuilds work fine, but only one instance of wrangler will work at a time
 	const devServer = await run(
 		{
-			FILE_BASED_REGISTRY: fileBasedRegistry,
 			// TODO: can we make this work?
 			MULTIWORKER: false,
 			RESOURCES_PROVISION: false,

diff --git a/packages/wrangler/src/api/integrations/platform/index.ts b/packages/wrangler/src/api/integrations/platform/index.ts
@@ -50,12 +50,6 @@ export type GetPlatformProxyOptions = {
 	 * If `false` is specified no data is persisted on the filesystem.
 	 */
 	persist?: boolean | { path: string };
-	/**
-	 * Use the experimental file-based dev registry for service discovery
-	 *
-	 * Note: this feature is experimental
-	 */
-	experimentalRegistry?: boolean;
 };
 
 /**
@@ -110,7 +104,6 @@ export async function getPlatformProxy<
 
 	const miniflareOptions = await run(
 		{
-			FILE_BASED_REGISTRY: Boolean(options.experimentalRegistry ?? true),
 			MULTIWORKER: false,
 			RESOURCES_PROVISION: false,
 		},

diff --git a/packages/wrangler/src/cli.ts b/packages/wrangler/src/cli.ts
@@ -38,7 +38,6 @@ export * from "./api/integrations";
 
 // Export internal APIs required by the Vitest integration as `unstable_`
 export { default as unstable_splitSqlQuery } from "./d1/splitter";
-export { startWorkerRegistryServer as unstable_startWorkerRegistryServer } from "./dev-registry";
 
 // `miniflare-cli/assets` dynamically imports`@cloudflare/pages-shared/environment-polyfills`.
 // `@cloudflare/pages-shared/environment-polyfills/types.ts` defines `global`

diff --git a/packages/wrangler/src/deploy/index.ts b/packages/wrangler/src/deploy/index.ts
@@ -245,7 +245,6 @@ export type DeployArgs = StrictYargsOptionsToInterface<typeof deployOptions>;
 export async function deployHandler(args: DeployArgs) {
 	await run(
 		{
-			FILE_BASED_REGISTRY: false,
 			RESOURCES_PROVISION: args.experimentalProvision ?? false,
 			MULTIWORKER: false,
 		},