tidy up

Author: emily-shen

packages/create-cloudflare/src/cli.ts

@@ -34,7 +34,7 @@ import {
 	updatePackageScripts,
 } from "./templates";
 import { validateProjectDirectory } from "./validators";
-import { generateWorkersTypes, installWorkersTypes } from "./workers";
+import { addTypes } from "./workers";
 import { updateWranglerConfig } from "./wrangler/config";
 import type { C3Args, C3Context } from "types";
 
@@ -167,11 +167,8 @@ const configure = async (ctx: C3Context) => {
 	addWranglerToGitIgnore(ctx);
 
 	await updatePackageScripts(ctx);
-	if (ctx.template.workersTypes === "installed") {
-		await installWorkersTypes(ctx);
-	} else if (ctx.template.workersTypes === "generated") {
-		await generateWorkersTypes(ctx);
-	}
+
+	await addTypes(ctx);
 
 	await offerGit(ctx);
 	await gitCommit(ctx);

packages/create-cloudflare/src/workers.ts

@@ -17,14 +17,26 @@ import {
 } from "./wrangler/config";
 import type { C3Context, PackageJson } from "types";
 
+export async function addTypes(ctx: C3Context) {
+	if (!usesTypescript(ctx) || ctx.template.workersTypes === "none") {
+		return;
+	}
+	const { npm } = detectPackageManager();
+
+	if (ctx.template.workersTypes === "installed") {
+		await installWorkersTypes(npm);
+	} else if (ctx.template.workersTypes === "generated") {
+		await generateWorkersTypes(ctx, npm);
+	}
+	const usesNodeCompat = await maybeInstallNodeTypes(ctx, npm);
+	await updateTsConfig(ctx, { usesNodeCompat });
+}
+
 /**
  * Generate types using the `cf-typegen` script and update tsconfig
  */
 
-export async function generateWorkersTypes(ctx: C3Context) {
-	if (!usesTypescript(ctx)) {
-		return;
-	}
+async function generateWorkersTypes(ctx: C3Context, npm: string) {
 	const packageJsonPath = join(ctx.project.path, "package.json");
 	if (!existsSync(packageJsonPath)) {
 		return;
@@ -34,8 +46,6 @@ export async function generateWorkersTypes(ctx: C3Context) {
 		return;
 	}
 
-	const { npm } = detectPackageManager();
-
 	const typesCmd = [npm, "run", "cf-typegen"];
 
 	await runCommand(typesCmd, {
@@ -45,12 +55,10 @@ export async function generateWorkersTypes(ctx: C3Context) {
 		doneText: `${brandColor("generated")} ${dim(`to \`${ctx.template.typesPath}\` via \`${typesCmd.join(" ")}\``)}`,
 	});
 
-	const usesNodeCompat = await maybeInstallNodeTypes(ctx, npm);
-
-	delete packageManifest["devDependencies"]?.["@cloudflare/workers-types"];
-
-	writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
-	await updateTsConfig(ctx, { usesNodeCompat });
+	if (packageManifest["devDependencies"]?.["@cloudflare/workers-types"]) {
+		delete packageManifest["devDependencies"]?.["@cloudflare/workers-types"];
+		writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
+	}
 }
 
 const maybeInstallNodeTypes = async (ctx: C3Context, npm: string) => {
@@ -169,17 +177,10 @@ export async function updateTsConfig(
  * Installs the latest version of the `@cloudflare/workers-types` package
  * and updates the .tsconfig file to use the latest entrypoint version.
  */
-export async function installWorkersTypes(ctx: C3Context) {
-	if (!usesTypescript(ctx)) {
-		return;
-	}
-	const { npm } = detectPackageManager();
-
+async function installWorkersTypes(npm: string) {
 	await installPackages(["@cloudflare/workers-types"], {
 		dev: true,
 		startText: "Installing @cloudflare/workers-types",
 		doneText: `${brandColor("installed")} ${dim(`via ${npm}`)}`,
 	});
-	const usesNodeCompat = await maybeInstallNodeTypes(ctx, npm);
-	await updateTsConfig(ctx, { usesNodeCompat });
 }