don't conflate installing workers-types and generating types

Author: emily-shen

packages/create-cloudflare/src/__tests__/workers.test.ts

@@ -25,6 +25,7 @@ describe("updateTsConfig", () => {
 		ctx = createTestContext();
 		ctx.args.ts = true;
 		ctx.template.installWorkersTypes = false;
+		ctx.template.skipWranglerTypegen = false;
 
 		vi.mocked(existsSync).mockImplementation(() => true);
 		vi.mocked(getLatestTypesEntrypoint).mockReturnValue(mockCompatDate);

packages/create-cloudflare/src/cli.ts

@@ -170,7 +170,9 @@ const configure = async (ctx: C3Context) => {
 	if (ctx.template.installWorkersTypes) {
 		await installWorkersTypes(ctx);
 	}
-	await generateWorkersTypes(ctx);
+	if (ctx.template.skipWranglerTypegen) {
+		await generateWorkersTypes(ctx);
+	}
 
 	await offerGit(ctx);
 	await gitCommit(ctx);

packages/create-cloudflare/src/templates.ts

@@ -150,8 +150,11 @@ export type TemplateConfig = {
 
 	bindings?: Record<string, unknown>;
 
-	/** Don't generate types, use @cloudflare/workers-types instead. Usually because the framework is pinned to Wrangler 3. Default false. */
+	/** Default false. For frameworks that are pinned to Wrangler 3. */
 	installWorkersTypes?: boolean;
+
+	/** Default false. To accomodate SSG frameworks etc. */
+	skipWranglerTypegen?: boolean;
 };
 
 type CopyFiles = (StaticFileMap | VariantInfo) & {

packages/create-cloudflare/src/workers.ts

@@ -120,6 +120,7 @@ export async function updateTsConfig(ctx: C3Context) {
 }
 
 /**
+ * TODO: delete if/when qwik and remix move to wrangler v4
  * Installs the latest version of the `@cloudflare/workers-types` package
  * and updates the .tsconfig file to use the latest entrypoint version.
  */

packages/create-cloudflare/templates/docusaurus/pages/c3.ts

@@ -27,6 +27,6 @@ const config: TemplateConfig = {
 	devScript: "preview",
 	deployScript: "deploy",
 	previewScript: "preview",
-	installWorkersTypes: true,
+	skipWranglerTypegen: false,
 };
 export default config;

packages/create-cloudflare/templates/docusaurus/workers/c3.ts

@@ -29,6 +29,6 @@ const config: TemplateConfig = {
 	devScript: "start",
 	deployScript: "deploy",
 	previewScript: "preview",
-	installWorkersTypes: true,
+	skipWranglerTypegen: true,
 };
 export default config;

packages/create-cloudflare/templates/gatsby/pages/c3.ts

@@ -47,6 +47,6 @@ const config: TemplateConfig = {
 	devScript: "develop",
 	deployScript: "deploy",
 	previewScript: "preview",
-	installWorkersTypes: true,
+	skipWranglerTypegen: true,
 };
 export default config;

packages/create-cloudflare/templates/gatsby/workers/c3.ts

@@ -49,6 +49,6 @@ const config: TemplateConfig = {
 	devScript: "develop",
 	deployScript: "deploy",
 	previewScript: "preview",
-	installWorkersTypes: true,
+	skipWranglerTypegen: true,
 };
 export default config;