graduate hello world workers assets templates

Author: emily-shen

packages/create-cloudflare/e2e-tests/workers.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"],

packages/create-cloudflare/src/helpers/cli.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,

packages/create-cloudflare/src/templates.ts

@@ -21,9 +21,6 @@ import {
 import angularTemplateExperimental from "templates-experimental/angular/c3";
 import astroTemplateExperimental from "templates-experimental/astro/c3";
 import gatsbyTemplateExperimental from "templates-experimental/gatsby/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 nuxtTemplateExperimental from "templates-experimental/nuxt/c3";
@@ -38,8 +35,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";
@@ -214,19 +214,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>;
@@ -374,9 +373,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/templates-experimental/hello-world-assets-only/c3.ts renamed to packages/create-cloudflare/templates/hello-world-assets-only/c3.ts

@@ -3,8 +3,8 @@ 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",
+	path: "templates/hello-world-assets-only",
+	displayName: "Static Assets only",
 	description: "Get started with a basic Worker that only serves static assets",
 	platform: "workers",
 	copyFiles: {

packages/create-cloudflare/templates-experimental/hello-world-assets-only/templates/package.json renamed to packages/create-cloudflare/templates/hello-world-assets-only/templates/package.json

@@ -3,8 +3,8 @@ import type { TemplateConfig } from "../../src/templates";
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-durable-object-with-assets",
-	path: "templates-experimental/hello-world-durable-object-with-assets",
-	displayName: "Hello World - Worker Using Durable Objects with Assets",
+	path: "templates/hello-world-durable-object-with-assets",
+	displayName: "Worker + Static Assets + Durable Object",
 	description:
 		"Get started with a basic stateful app to build projects like real-time chats, collaborative apps, and multiplayer games, which hosts assets",
 	platform: "workers",