feat: extract subdomain deploy into its own function

Should make the logic easier to understand.

Author: danielrs

packages/wrangler/src/triggers/deploy.ts

@@ -60,9 +60,6 @@ export default async function triggersDeploy(
 		}
 	}
 
-	// deployToWorkersDev defaults to true only if there aren't any routes defined
-	const deployToWorkersDev = getResolvedWorkersDev(config.workers_dev, routes);
-
 	if (!scriptName) {
 		throw new UserError(
 			'You need to provide a name when uploading a Worker Version. Either pass it as a cli arg with `--name <name>` or in your config file as `name = "<name>"`',
@@ -79,14 +76,6 @@ export default async function triggersDeploy(
 		? `/accounts/${accountId}/workers/services/${scriptName}/environments/${envName}`
 		: `/accounts/${accountId}/workers/scripts/${scriptName}`;
 
-	const {
-		enabled: available_on_subdomain,
-		previews_enabled: previews_available_on_subdomain,
-	} = await fetchResult<{
-		enabled: boolean;
-		previews_enabled: boolean;
-	}>(config, `${workerUrl}/subdomain`);
-
 	if (!props.dryRun) {
 		await ensureQueuesExistByConfig(config);
 	}
@@ -103,55 +92,17 @@ export default async function triggersDeploy(
 	const uploadMs = Date.now() - start;
 	const deployments: Promise<string[]>[] = [];
 
-	const deploymentInSync = deployToWorkersDev === available_on_subdomain;
-	const previewsInSync =
-		config.preview_urls === previews_available_on_subdomain;
-
-	if (deployToWorkersDev) {
-		// Deploy to a subdomain of `workers.dev`
-		const userSubdomain = await getWorkersDevSubdomain(
-			config,
-			accountId,
-			config.configPath
-		);
-
-		const deploymentURL =
-			props.legacyEnv || !props.env
-				? `${scriptName}.${userSubdomain}`
-				: `${envName}.${scriptName}.${userSubdomain}`;
-
-		if (deploymentInSync && previewsInSync) {
-			deployments.push(Promise.resolve([deploymentURL]));
-		} else {
-			// Enable the `workers.dev` subdomain.
-			deployments.push(
-				fetchResult(config, `${workerUrl}/subdomain`, {
-					method: "POST",
-					body: JSON.stringify({
-						enabled: true,
-						previews_enabled: config.preview_urls,
-					}),
-					headers: {
-						"Content-Type": "application/json",
-					},
-				}).then(() => [deploymentURL])
-			);
-		}
-	}
-	if (!deployToWorkersDev && (!deploymentInSync || !previewsInSync)) {
-		// Disable the workers.dev deployment
-		await fetchResult(config, `${workerUrl}/subdomain`, {
-			method: "POST",
-			body: JSON.stringify({
-				enabled: false,
-				previews_enabled: config.preview_urls,
-			}),
-			headers: {
-				"Content-Type": "application/json",
-			},
-		});
-	}
-	if (!deployToWorkersDev && deploymentInSync && routes.length !== 0) {
+	const { wantWorkersDev, workersDevInSync } = await subdomainDeploy(
+		props,
+		accountId,
+		scriptName,
+		envName,
+		workerUrl,
+		routes,
+		deployments
+	);
+
+	if (!wantWorkersDev && workersDevInSync && routes.length !== 0) {
 		// TODO is this true? How does last subdomain status affect route confict??
 		// Why would we only need to validate route conflicts if didn't need to
 		// disable the subdomain deployment?
@@ -349,3 +300,73 @@ export default async function triggersDeploy(
 		logger.log("No deploy targets for", workerName, formatTime(deployMs));
 	}
 }
+
+async function subdomainDeploy(
+	props: Props,
+	accountId: string,
+	scriptName: string,
+	envName: string,
+	workerUrl: string,
+	routes: Route[],
+	deployments: Array<Promise<string[]>>
+) {
+	const { config } = props;
+
+	// Get desired subdomain enablement status.
+
+	const defaultWorkersDev = routes.length === 0;
+	const wantWorkersDev = config.workers_dev ?? defaultWorkersDev;
+	const wantPreviews = config.preview_urls ?? false;
+
+	// Get current subdomain enablement status.
+
+	const { enabled: currWorkersDev, previews_enabled: currPreviews } =
+		await fetchResult<{
+			enabled: boolean;
+			previews_enabled: boolean;
+		}>(config, `${workerUrl}/subdomain`);
+
+	const workersDevInSync = wantWorkersDev === currWorkersDev;
+	const previewsInSync = wantPreviews === currPreviews;
+	const allInSync = [workersDevInSync, previewsInSync].every((v) => v);
+
+	// workers.dev URL is only set if we want to deploy to workers.dev.
+
+	let workersDevURL: string | undefined;
+	if (wantWorkersDev) {
+		const userSubdomain = await getWorkersDevSubdomain(
+			config,
+			accountId,
+			config.configPath
+		);
+		workersDevURL =
+			props.legacyEnv || !props.env
+				? `${scriptName}.${userSubdomain}`
+				: `${envName}.${scriptName}.${userSubdomain}`;
+	}
+
+	// Update subdomain enablement status if needed.
+
+	if (!allInSync) {
+		await fetchResult(config, `${workerUrl}/subdomain`, {
+			method: "POST",
+			body: JSON.stringify({
+				enabled: wantWorkersDev,
+				previews_enabled: wantPreviews,
+			}),
+			headers: {
+				"Content-Type": "application/json",
+			},
+		});
+	}
+
+	if (workersDevURL) {
+		deployments.push(Promise.resolve([workersDevURL]));
+	}
+	return {
+		wantWorkersDev,
+		wantPreviews,
+		workersDevInSync,
+		previewsInSync,
+	};
+}