chore: graduate hello world workers + assets templates (#8379)

* graduate hello world workers assets templates

* changeset

* fix tests

* maybe fix tests

* update labels

* fix test

* update c3-integration test

Author: emily-shen

.changeset/angry-parents-post.md

@@ -82,10 +82,9 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())(
 				);
 
 				expect(project.path).toExist();
-				expect(output).toContain(`category Hello World example`);
-				expect(output).toContain(`type Hello World Worker`);
+				expect(output).toContain(`category Hello World Starter`);
+				expect(output).toContain(`type Worker + Assets`);
 				expect(output).toContain(`lang TypeScript`);
-				expect(output).toContain(`no git`);
 				expect(output).toContain(`no deploy`);
 			},
 		);
@@ -128,7 +127,6 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())(
 				expect(project.path).toExist();
 				expect(output).toContain(`type Scheduled Worker (Cron Trigger)`);
 				expect(output).toContain(`lang JavaScript`);
-				expect(output).toContain(`no git`);
 				expect(output).toContain(`no deploy`);
 			},
 		);
@@ -179,9 +177,8 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())(
 					);
 
 					expect(project.path).toExist();
-					expect(output).toContain(`type Hello World Worker`);
+					expect(output).toContain(`type Worker + Assets`);
 					expect(output).toContain(`lang TypeScript`);
-					expect(output).toContain(`no git`);
 					expect(output).toContain(`no deploy`);
 				} finally {
 					fs.rmSync(existingFilePath, {
@@ -272,8 +269,8 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())(
 				);
 
 				expect(project.path).toExist();
-				expect(output).toContain(`category Hello World example`);
-				expect(output).toContain(`type Hello World Worker`);
+				expect(output).toContain(`category Hello World Starter`);
+				expect(output).toContain(`type Worker only`);
 				expect(output).toContain(`lang Python`);
 			},
 		);
@@ -379,15 +376,15 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())(
 							matcher: /What would you like to start with\?/,
 							input: {
 								type: "select",
-								target: "Hello World example",
+								target: "Hello World Starter",
 								assertDefaultSelection: "Framework Starter",
 							},
 						},
 						{
 							matcher: /Which template would you like to use\?/,
 							input: {
 								type: "select",
-								target: "Hello World Worker Using Durable Objects",
+								target: "Worker + Durable Objects",
 							},
 						},
 						{
@@ -401,9 +398,8 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())(
 							matcher: /Which template would you like to use\?/,
 							input: {
 								type: "select",
-								target: "Hello World Worker",
-								assertDefaultSelection:
-									"Hello World Worker Using Durable Objects",
+								target: "Worker only",
+								assertDefaultSelection: "Worker + Durable Objects",
 							},
 						},
 						{
@@ -418,7 +414,7 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())(
 				);
 
 				expect(project.path).toExist();
-				expect(output).toContain(`type Hello World Worker`);
+				expect(output).toContain(`type Worker only`);
 				expect(output).toContain(`lang JavaScript`);
 			},
 		);

packages/create-cloudflare/e2e-tests/cli.test.ts

@@ -32,7 +32,35 @@ type WorkerTestConfig = RunnerConfig & {
 
 function getWorkerTests(opts: { experimental: boolean }): WorkerTestConfig[] {
 	if (opts.experimental) {
+		// none currently
+		return [];
+	} else {
 		return [
+			{
+				template: "hello-world",
+				variants: ["ts", "js"],
+				verifyDeploy: {
+					route: "/",
+					expectedText: "Hello World!",
+				},
+				verifyPreview: {
+					route: "/",
+					expectedText: "Hello World!",
+				},
+				verifyTest: true,
+			},
+			{
+				template: "hello-world",
+				variants: ["python"],
+				verifyDeploy: {
+					route: "/",
+					expectedText: "Hello World!",
+				},
+				verifyPreview: {
+					route: "/",
+					expectedText: "Hello World!",
+				},
+			},
 			{
 				template: "hello-world-with-assets",
 				variants: ["ts", "js"],
@@ -78,34 +106,6 @@ function getWorkerTests(opts: { experimental: boolean }): WorkerTestConfig[] {
 				verifyPreview: null,
 				argv: ["--category", "hello-world"],
 			},
-		];
-	} else {
-		return [
-			{
-				template: "hello-world",
-				variants: ["ts", "js"],
-				verifyDeploy: {
-					route: "/",
-					expectedText: "Hello World!",
-				},
-				verifyPreview: {
-					route: "/",
-					expectedText: "Hello World!",
-				},
-				verifyTest: true,
-			},
-			{
-				template: "hello-world",
-				variants: ["python"],
-				verifyDeploy: {
-					route: "/",
-					expectedText: "Hello World!",
-				},
-				verifyPreview: {
-					route: "/",
-					expectedText: "Hello World!",
-				},
-			},
 			{
 				template: "common",
 				variants: ["ts", "js"],
@@ -155,6 +155,7 @@ describe
 	.skipIf(
 		getFrameworkToTest({ experimental }) ||
 			isQuarantineMode() ||
+			workerTests.length === 0 ||
 			process.platform === "win32",
 	)
 	.concurrent(`E2E: Workers templates`, () => {

packages/create-cloudflare/e2e-tests/workers.test.ts

@@ -70,12 +70,12 @@ export const cliDefinition: ArgumentsDefinition = {
 				const experimental = Boolean(args?.["experimental"]);
 				if (experimental) {
 					return [
-						{ name: "hello-world", description: "Hello World example" },
+						{ name: "hello-world", description: "Hello World Starter" },
 						{ name: "web-framework", description: "Framework Starter" },
 					];
 				} else {
 					return [
-						{ name: "hello-world", description: "Hello World example" },
+						{ name: "hello-world", description: "Hello World Starter" },
 						{ name: "web-framework", description: "Framework Starter" },
 						{ name: "demo", description: "Application Starter" },
 						{

packages/create-cloudflare/src/helpers/args.ts

@@ -48,7 +48,7 @@ export const isUpdateAvailable = async () => {
 export const C3_DEFAULTS: C3Args = {
 	projectName: new Haikunator().haikunate({ tokenHex: true }),
 	category: "hello-world",
-	type: "hello-world",
+	type: "hello-world-with-assets",
 	framework: "analog",
 	experimental: false,
 	autoUpdate: true,
@@ -57,11 +57,11 @@ export const C3_DEFAULTS: C3Args = {
 	open: true,
 	lang: "ts",
 	template:
-		"cloudflare/workers-sdk/packages/create-cloudflare/templates/hello-world",
+		"cloudflare/workers-sdk/packages/create-cloudflare/templates/hello-world-with-assets",
 };
 
 export const WRANGLER_DEFAULTS = {
 	...C3_DEFAULTS,
-	type: "hello-world",
+	type: "hello-world-with-assets",
 	deploy: false,
 };

packages/create-cloudflare/src/helpers/cli.ts

@@ -19,9 +19,6 @@ import {
 	writeJSON,
 } from "helpers/files";
 import astroTemplateExperimental from "templates-experimental/astro/c3";
-import assetsOnlyTemplateExperimental from "templates-experimental/hello-world-assets-only/c3";
-import helloWorldWithDurableObjectAssetsTemplateExperimental from "templates-experimental/hello-world-durable-object-with-assets/c3";
-import helloWorldWithAssetsTemplateExperimental from "templates-experimental/hello-world-with-assets/c3";
 import honoTemplateExperimental from "templates-experimental/hono/c3";
 import nextTemplateExperimental from "templates-experimental/next/c3";
 import qwikTemplateExperimental from "templates-experimental/qwik/c3";
@@ -34,8 +31,11 @@ import astroTemplate from "templates/astro/c3";
 import commonTemplate from "templates/common/c3";
 import docusaurusTemplate from "templates/docusaurus/c3";
 import gatsbyTemplate from "templates/gatsby/c3";
+import assetsOnlyTemplate from "templates/hello-world-assets-only/c3";
+import helloWorldWithDurableObjectAssetsTemplate from "templates/hello-world-durable-object-with-assets/c3";
 import helloWorldDurableObjectTemplate from "templates/hello-world-durable-object/c3";
-import helloWorldTemplate from "templates/hello-world/c3";
+import helloWorldWithAssetsTemplate from "templates/hello-world-with-assets/c3";
+import helloWorldWorkerTemplate from "templates/hello-world/c3";
 import honoTemplate from "templates/hono/c3";
 import nextTemplate from "templates/next/c3";
 import nuxtTemplate from "templates/nuxt/c3";
@@ -206,19 +206,18 @@ export function getFrameworkMap({ experimental = false }): TemplateMap {
 
 export function getTemplateMap({ experimental = false }) {
 	if (experimental) {
-		return {
-			"hello-world-assets-only": assetsOnlyTemplateExperimental,
-			"hello-world-with-assets": helloWorldWithAssetsTemplateExperimental,
-			"hello-world-durable-object-with-assets":
-				helloWorldWithDurableObjectAssetsTemplateExperimental,
-		} as Record<string, TemplateConfig>;
+		return {} as Record<string, TemplateConfig>;
 	} else {
 		return {
-			"hello-world": helloWorldTemplate,
+			"hello-world": helloWorldWorkerTemplate,
+			"hello-world-assets-only": assetsOnlyTemplate,
+			"hello-world-with-assets": helloWorldWithAssetsTemplate,
+			"hello-world-durable-object": helloWorldDurableObjectTemplate,
+			"hello-world-durable-object-with-assets":
+				helloWorldWithDurableObjectAssetsTemplate,
 			common: commonTemplate,
 			scheduled: scheduledTemplate,
 			queues: queuesTemplate,
-			"hello-world-durable-object": helloWorldDurableObjectTemplate,
 			openapi: openapiTemplate,
 			"pre-existing": preExistingTemplate,
 		} as Record<string, TemplateConfig>;
@@ -366,9 +365,10 @@ export const createContext = async (
 
 	const categoryOptions = [
 		{
-			label: "Hello World example",
+			label: "Hello World Starter",
 			value: "hello-world",
-			description: "Select from barebones examples to get started with Workers",
+			description:
+				"Select from basic scaffolds to get started with Workers, Assets and Durable Objects",
 		},
 		{
 			label: "Framework Starter",

packages/create-cloudflare/src/templates.ts

@@ -3,9 +3,10 @@ import type { TemplateConfig } from "../../src/templates";
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-assets-only",
-	path: "templates-experimental/hello-world-assets-only",
-	displayName: "Hello World - Assets-only",
-	description: "Get started with a basic Worker that only serves static assets",
+	path: "templates/hello-world-assets-only",
+	displayName: "Assets only",
+	description:
+		"For static sites (including SPAs) or when using your own backend",
 	platform: "workers",
 	copyFiles: {
 		path: "./templates",