create-cloudflare 2.70.4 → 2.70.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.70.4",
+  "version": "2.70.6",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -31,7 +31,7 @@
     "@babel/parser": "^7.21.3",
     "@babel/types": "^7.21.4",
     "@clack/prompts": "^1.2.0",
-    "@cloudflare/workers-types": "^4.20260617.1",
+    "@cloudflare/workers-types": "^4.20260623.1",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/deepmerge": "^2.2.0",
@@ -72,13 +72,13 @@
     "wrap-ansi": "^9.0.0",
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
-    "@cloudflare/cli-shared-helpers": "0.1.9",
+    "@cloudflare/cli-shared-helpers": "0.1.10",
     "@cloudflare/codemod": "1.1.0",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/vite-plugin": "1.42.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/workers-utils": "0.23.2",
-    "wrangler": "4.102.0"
+    "@cloudflare/vite-plugin": "1.42.2",
+    "@cloudflare/workers-utils": "0.24.0",
+    "wrangler": "4.104.0"
   },
   "engines": {
     "node": ">=22.0.0"

package/templates/waku/c3.ts

@@ -1,17 +1,54 @@
+import { resolve } from "node:path";
+import { logRaw } from "@cloudflare/cli-shared-helpers";
+import { brandColor, dim } from "@cloudflare/cli-shared-helpers/colors";
+import { spinner } from "@cloudflare/cli-shared-helpers/interactive";
 import { runFrameworkGenerator } from "frameworks/index";
+import { removeFile } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
+import { installPackages } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
 
 const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
+	// We use the default `create-waku` template and overlay our Cloudflare-specific
+	// files via `copyFiles`. This avoids depending on an external example repository
+	// for the scaffolded project content (which could be renamed, moved, or deleted).
 	await runFrameworkGenerator(ctx, [
 		"--project-name",
 		ctx.project.name,
-		"--template",
-		"07_cloudflare",
+		// c3 installs dependencies itself once the template files have been copied over
+		"--skip-install",
 	]);
+
+	logRaw(""); // newline
+};
+
+const configure = async (ctx: C3Context) => {
+	// `npmInstall` has already run with the default Waku template's `package.json`,
+	// which doesn't include the Cloudflare build dependencies that our overlaid
+	// `waku.config.ts` and Workers setup need. Install them now (this also adds them
+	// to `package.json`). `wrangler` is installed separately by `installWrangler()`
+	// in the main configure flow before this runs.
+	await installPackages(
+		["@cloudflare/vite-plugin", "miniflare", "@types/node"],
+		{
+			dev: true,
+			startText: "Installing Cloudflare build dependencies",
+			doneText: `${brandColor("installed")} ${dim(
+				"@cloudflare/vite-plugin, miniflare, @types/node"
+			)}`,
+		}
+	);
+
+	// The default Waku template ships a Hono trailing-slash dev middleware. On
+	// Cloudflare this is handled by `html_handling: "drop-trailing-slash"` in
+	// `wrangler.jsonc` (and `public/_headers`), so remove the redundant middleware.
+	const s = spinner();
+	s.start("Removing non-Cloudflare artifacts from template");
+	removeFile(resolve(ctx.project.path, "src/middleware/no-trailing-slash.ts"));
+	s.stop(`${brandColor("removed")} ${dim("trailing-slash dev middleware")}`);
 };
 
 const config: TemplateConfig = {
@@ -20,12 +57,18 @@ const config: TemplateConfig = {
 	frameworkCli: "create-waku",
 	platform: "workers",
 	displayName: "Waku",
+	copyFiles: {
+		path: "./templates",
+	},
 	path: "templates/waku",
 	generate,
+	configure,
 	transformPackageJson: async () => ({
 		scripts: {
 			deploy: `${npm} run build && wrangler deploy`,
 			preview: `NODE_ENV=production ${npm} run build && wrangler dev`,
+			start: `wrangler dev`,
+			"cf-typegen": `wrangler types`,
 		},
 	}),
 	devScript: "dev",

package/templates/waku/templates/public/404.html

@@ -0,0 +1 @@
+<h1>Not Found</h1>

package/templates/waku/templates/public/_headers

@@ -0,0 +1,4 @@
+/RSC/*
+  X-Robots-Tag: noindex
+/assets/*
+  Cache-Control: public, max-age=31536000, immutable

package/templates/waku/templates/src/waku.server.tsx

@@ -0,0 +1,18 @@
+import { fsRouter } from 'waku';
+import adapter from 'waku/adapters/cloudflare';
+
+export default adapter(fsRouter(import.meta.glob('./pages/**/*.{tsx,ts}')), {
+  handlers: {
+    // Define additional Cloudflare Workers handlers here
+    // https://developers.cloudflare.com/workers/runtime-apis/handlers/
+    // async queue(
+    //   batch: MessageBatch,
+    //   _env: Env,
+    //   _ctx: ExecutionContext,
+    // ): Promise<void> {
+    //   for (const message of batch.messages) {
+    //     console.log('Received', message);
+    //   }
+    // },
+  } satisfies ExportedHandler<Env>,
+});

package/templates/waku/templates/waku.config.ts

@@ -0,0 +1,41 @@
+import { cloudflare } from '@cloudflare/vite-plugin';
+import babel from '@rolldown/plugin-babel';
+import tailwindcss from '@tailwindcss/vite';
+import react, { reactCompilerPreset } from '@vitejs/plugin-react';
+import { defineConfig } from 'waku/config';
+
+export default defineConfig({
+  vite: {
+    environments: {
+      rsc: {
+        optimizeDeps: {
+          include: ['hono/tiny'],
+        },
+        build: {
+          rolldownOptions: {
+            platform: 'neutral',
+          },
+        },
+      },
+      ssr: {
+        optimizeDeps: {
+          include: ['waku > rsc-html-stream/server'],
+        },
+        build: {
+          rolldownOptions: {
+            platform: 'neutral',
+          },
+        },
+      },
+    },
+    plugins: [
+      tailwindcss(),
+      react(),
+      babel({ presets: [reactCompilerPreset()] }),
+      cloudflare({
+        viteEnvironment: { name: 'rsc', childEnvironments: ['ssr'] },
+        inspectorPort: false,
+      }),
+    ],
+  },
+});

package/templates/waku/templates/wrangler.jsonc

@@ -0,0 +1,26 @@
+{
+  "$schema": "node_modules/wrangler/config-schema.json",
+  "name": "<WORKER_NAME>",
+  "main": "./src/waku.server",
+  // nodejs_als is required for Waku server-side request context
+  // It can be removed if only building static pages
+  "compatibility_flags": ["nodejs_als"],
+  // https://developers.cloudflare.com/workers/platform/compatibility-dates
+  "compatibility_date": "<COMPATIBILITY_DATE>",
+  "assets": {
+    // https://developers.cloudflare.com/workers/static-assets/binding/
+    "binding": "ASSETS",
+    "directory": "./dist/public",
+    "html_handling": "drop-trailing-slash"
+  },
+  "vars": {
+    "MAX_ITEMS": 10
+  },
+  "rules": [
+    {
+      "type": "ESModule",
+      "globs": ["**/*.js", "**/*.mjs"]
+    }
+  ],
+  "no_bundle": true
+}

package/templates/waku/wrangler.jsonc

@@ -1,18 +0,0 @@
-{
-	"name": "<WORKER_NAME>",
-	"main": "./dist/server/serve-cloudflare.js",
-	// nodejs_als is required for Waku server-side request context
-	// It can be removed if only building static pages
-	"compatibility_flags": ["nodejs_als"],
-	// https://developers.cloudflare.com/workers/platform/compatibility-dates
-	"compatibility_date": "<COMPATIBILITY_DATE>",
-	"assets": {
-		// https://developers.cloudflare.com/workers/static-assets/binding/
-		"binding": "ASSETS",
-		"directory": "./dist/public",
-		"html_handling": "drop-trailing-slash"
-	},
-	"vars": {
-		"MAX_ITEMS": 10
-	}
-}