create-cloudflare 0.0.0-4e33f2cdc → 0.0.0-4e571fd00

package/templates-experimental/hello-world-with-assets/ts/wrangler.toml

@@ -3,4 +3,10 @@ name = "<TBD>"
 main = "src/index.ts"
 compatibility_date = "<TBD>"
 compatibility_flags = ["nodejs_compat"]
-experimental_assets = { directory = "./public", binding = "ASSETS" }
+assets = { directory = "./public", binding = "ASSETS" }
+
+# Workers Logs
+# Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/
+# Configuration: https://developers.cloudflare.com/workers/observability/logs/workers-logs/#enable-workers-logs
+[observability]
+enabled = true

package/templates-experimental/hono/c3.ts

@@ -0,0 +1,43 @@
+import { logRaw } from "@cloudflare/cli";
+import { runFrameworkGenerator } from "frameworks/index";
+import { detectPackageManager } from "helpers/packageManagers";
+import type { TemplateConfig } from "../../src/templates";
+import type { C3Context } from "types";
+
+const generate = async (ctx: C3Context) => {
+	const { name: pm } = detectPackageManager();
+
+	await runFrameworkGenerator(ctx, [
+		ctx.project.name,
+		"--template",
+		"cloudflare-workers",
+		"--install",
+		"--pm",
+		pm,
+	]);
+
+	logRaw(""); // newline
+};
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "hono",
+	frameworkCli: "create-hono",
+	displayName: "Hono",
+	copyFiles: {
+		path: "./templates",
+	},
+	platform: "workers",
+	path: "templates-experimental/hono",
+	generate,
+	transformPackageJson: async () => ({
+		scripts: {
+			dev: "wrangler dev",
+			deploy: "wrangler deploy --minify",
+			"cf-typegen": "wrangler types --env-interface CloudflareBindings",
+		},
+	}),
+	devScript: "dev",
+	deployScript: "deploy",
+};
+export default config;

package/templates-experimental/hono/templates/public/index.html

@@ -0,0 +1,19 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>Hello, World!</title>
+	</head>
+	<body>
+		<h1 id="heading"></h1>
+		<script>
+			fetch('/message')
+				.then((resp) => resp.text())
+				.then((text) => {
+					const h1 = document.getElementById('heading');
+					h1.textContent = text;
+				});
+		</script>
+	</body>
+</html>

package/templates-experimental/hono/templates/src/index.ts

@@ -0,0 +1,9 @@
+import { Hono } from "hono";
+
+const app = new Hono<{ Bindings: CloudflareBindings }>();
+
+app.get("/message", (c) => {
+  return c.text("Hello Hono!");
+});
+
+export default app;

package/templates-experimental/hono/templates/worker-configuration.d.ts

@@ -0,0 +1,4 @@
+// Generated by Wrangler
+// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
+interface CloudflareBindings {
+}

package/templates-experimental/hono/templates/wrangler.toml

@@ -0,0 +1,5 @@
+#:schema node_modules/wrangler/config-schema.json
+name = "<TBD>"
+main = "src/index.ts"
+compatibility_date = "<TBD>"
+assets = { directory = "./public", binding = "ASSETS" }

package/templates-experimental/next/c3.ts

@@ -0,0 +1,52 @@
+import { brandColor, dim } from "@cloudflare/cli/colors";
+import { runFrameworkGenerator } from "frameworks/index";
+import { installPackages } from "helpers/packages";
+import type { TemplateConfig } from "../../src/templates";
+import type { C3Context } from "types";
+
+const generate = async (ctx: C3Context) => {
+	await runFrameworkGenerator(ctx, [
+		ctx.project.name,
+		"--ts",
+		"--tailwind",
+		"--eslint",
+		"--app",
+		"--import-alias",
+		"@/*",
+		"--src-dir",
+	]);
+};
+
+const configure = async () => {
+	const packages = ["@opennextjs/cloudflare", "@cloudflare/workers-types"];
+	await installPackages(packages, {
+		dev: true,
+		startText: "Adding the Cloudflare adapter",
+		doneText: `${brandColor(`installed`)} ${dim(packages.join(", "))}`,
+	});
+};
+
+export default {
+	configVersion: 1,
+	id: "next",
+	frameworkCli: "create-next-app",
+	platform: "workers",
+	displayName: "Next (using Node.js compat + Workers Assets)",
+	path: "templates-experimental/next",
+	copyFiles: {
+		path: "./templates",
+	},
+	generate,
+	configure,
+	transformPackageJson: async () => ({
+		scripts: {
+			deploy: `cloudflare && wrangler deploy`,
+			preview: `cloudflare && wrangler dev`,
+			"cf-typegen": `wrangler types --env-interface CloudflareEnv env.d.ts`,
+		},
+	}),
+	devScript: "dev",
+	previewScript: "preview",
+	deployScript: "deploy",
+	compatibilityFlags: ["nodejs_compat"],
+} as TemplateConfig;

package/templates-experimental/next/templates/__dot__gitignore

@@ -0,0 +1,42 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+
+# Cloudflare related
+/.save.next
+/.worker-next
+/.wrangler

package/templates-experimental/next/templates/env.d.ts

@@ -0,0 +1,5 @@
+// Generated by Wrangler
+// by running `wrangler types --env-interface CloudflareEnv env.d.ts`
+
+interface CloudflareEnv {
+}

package/templates-experimental/next/templates/wrangler.toml

@@ -0,0 +1,12 @@
+#:schema node_modules/wrangler/config-schema.json
+name = "<app-name>"
+main = ".worker-next/index.mjs"
+
+compatibility_date = "2024-09-26"
+compatibility_flags = ["nodejs_compat"]
+
+# Minification helps to keep the Worker bundle size down and improve start up time.
+minify = true
+
+# Use the new Workers + Assets to host the static frontend files
+assets = { directory = ".worker-next/assets", binding = "ASSETS" }

package/templates-experimental/nuxt/c3.ts

@@ -82,7 +82,7 @@ const updateNuxtConfig = () => {
 		b.objectExpression([
 			b.objectProperty(
 				b.identifier("preset"),
-				b.stringLiteral("./cloudflare-preset"),
+				b.stringLiteral("cloudflare_module"),
 			),
 		]),
 	);

package/templates-experimental/nuxt/templates/wrangler.toml

@@ -1,5 +1,11 @@
 #:schema node_modules/wrangler/config-schema.json
 name = "<TBD>"
 compatibility_date = "<TBD>"
-main = "./dist/worker/index.js"
-experimental_assets = { directory = "./dist/public", binding = "ASSETS" }
+main = "./.output/server/index.mjs"
+assets = { directory = "./.output/public/", binding = "ASSETS" }
+
+# Workers Logs
+# Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/
+# Configuration: https://developers.cloudflare.com/workers/observability/logs/workers-logs/#enable-workers-logs
+[observability]
+enabled = true

package/templates-experimental/qwik/templates/wrangler.toml

@@ -3,4 +3,10 @@ name = "<TBD>"
 compatibility_date = "<TBD>"
 compatibility_flags = ["nodejs_compat"]
 main = "./dist/_worker.js"
-experimental_assets = { directory = "./dist", binding = "ASSET" }
+assets = { directory = "./dist", binding = "ASSET" }
+
+# Workers Logs
+# Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/
+# Configuration: https://developers.cloudflare.com/workers/observability/logs/workers-logs/#enable-workers-logs
+[observability]
+enabled = true

package/templates-experimental/remix/c3.ts

@@ -1,8 +1,6 @@
 import { logRaw } from "@cloudflare/cli";
 import { brandColor, dim } from "@cloudflare/cli/colors";
-import { spinner } from "@cloudflare/cli/interactive";
 import { runFrameworkGenerator } from "frameworks/index";
-import { transformFile } from "helpers/codemod";
 import { detectPackageManager } from "helpers/packageManagers";
 import { installPackages } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
@@ -14,7 +12,7 @@ const generate = async (ctx: C3Context) => {
 	await runFrameworkGenerator(ctx, [
 		ctx.project.name,
 		"--template",
-		"https://github.com/remix-run/remix/tree/main/templates/cloudflare",
+		"https://github.com/remix-run/remix/tree/main/templates/cloudflare-workers",
 	]);
 
 	logRaw(""); // newline
@@ -24,29 +22,8 @@ const configure = async () => {
 	await installPackages(["wrangler@latest"], {
 		dev: true,
 		startText: "Updating the Wrangler version",
-		doneText: `${brandColor(`updateed`)} ${dim("wrangler@latest")}`,
+		doneText: `${brandColor(`updated`)} ${dim("wrangler@latest")}`,
 	});
-
-	const typeDefsPath = "load-context.ts";
-
-	const s = spinner();
-	s.start(`Updating \`${typeDefsPath}\``);
-
-	// Remove the empty Env declaration from the template to allow the type from
-	// worker-configuration.d.ts to take over
-	transformFile(typeDefsPath, {
-		visitTSInterfaceDeclaration(n) {
-			if (n.node.id.type === "Identifier" && n.node.id.name !== "Env") {
-				return this.traverse(n);
-			}
-
-			// Removes the node
-			n.replace();
-			return false;
-		},
-	});
-
-	s.stop(`${brandColor("updated")} \`${dim(typeDefsPath)}\``);
 };
 
 const config: TemplateConfig = {
@@ -63,8 +40,6 @@ const config: TemplateConfig = {
 	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			build:
-				"remix vite:build && wrangler pages functions build --outdir build/worker",
 			deploy: `${npm} run build && wrangler deploy`,
 			preview: `${npm} run build && wrangler dev`,
 			"cf-typegen": `wrangler types`,

package/templates-experimental/remix/templates/public/.assetsignore

@@ -1,4 +0,0 @@
-_worker.js
-_routes.json
-_headers
-_redirects

package/templates-experimental/remix/templates/wrangler.toml

@@ -1,5 +1,11 @@
 #:schema node_modules/wrangler/config-schema.json
 name = "<TBD>"
 compatibility_date = "<TBD>"
-main = "./build/worker/index.js"
-experimental_assets = { directory = "./build/client" }
+main = "./server.ts"
+assets = { directory = "./build/client" }
+
+# Workers Logs
+# Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/
+# Configuration: https://developers.cloudflare.com/workers/observability/logs/workers-logs/#enable-workers-logs
+[observability]
+enabled = true

package/templates-experimental/solid/c3.ts

@@ -2,6 +2,7 @@ import { logRaw, updateStatus } from "@cloudflare/cli";
 import { blue, brandColor, dim } from "@cloudflare/cli/colors";
 import { runFrameworkGenerator } from "frameworks/index";
 import { mergeObjectProperties, transformFile } from "helpers/codemod";
+import { getWorkerdCompatibilityDate } from "helpers/compatDate";
 import { usesTypescript } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
 import { installPackages } from "helpers/packages";
@@ -30,6 +31,8 @@ const configure = async (ctx: C3Context) => {
 	usesTypescript(ctx);
 	const filePath = `app.config.${usesTypescript(ctx) ? "ts" : "js"}`;
 
+	const compatDate = await getWorkerdCompatibilityDate();
+
 	updateStatus(`Updating configuration in ${blue(filePath)}`);
 
 	transformFile(filePath, {
@@ -46,60 +49,14 @@ const configure = async (ctx: C3Context) => {
 					b.objectProperty(
 						b.identifier("server"),
 						b.objectExpression([
-							// preset: "cloudflare-pages"
+							// preset: "cloudflare_module"
 							b.objectProperty(
 								b.identifier("preset"),
-								b.stringLiteral("./cloudflare-pages"),
-							),
-							// output: {
-							// 	dir: "{{ rootDir }}/dist",
-							// 	publicDir: "{{ output.dir }}/public",
-							// 	serverDir: "{{ output.dir }}/worker",
-							// },
-							b.objectProperty(
-								b.identifier("output"),
-								b.objectExpression([
-									b.objectProperty(
-										b.identifier("dir"),
-										b.stringLiteral("{{ rootDir }}/dist"),
-									),
-									b.objectProperty(
-										b.identifier("publicDir"),
-										b.stringLiteral("{{ output.dir }}/public"),
-									),
-									b.objectProperty(
-										b.identifier("serverDir"),
-										b.stringLiteral("{{ output.dir }}/worker"),
-									),
-								]),
-							),
-							// rollupConfig: {
-							// 	external: ["node:async_hooks"],
-							// },
-							b.objectProperty(
-								b.identifier("rollupConfig"),
-								b.objectExpression([
-									b.objectProperty(
-										b.identifier("external"),
-										b.arrayExpression([b.stringLiteral("node:async_hooks")]),
-									),
-								]),
+								b.stringLiteral("cloudflare_module"),
 							),
-							// hooks: {
-							// 	// Prevent the Pages preset from writing the _routes.json etc.
-							// 	compiled() {},
-							// },
 							b.objectProperty(
-								b.identifier("hooks"),
-								b.objectExpression([
-									b.objectMethod(
-										"method",
-										b.identifier("compiled"),
-										[],
-										b.blockStatement([]),
-										false,
-									),
-								]),
+								b.identifier("compatibilityDate"),
+								b.stringLiteral(compatDate),
 							),
 						]),
 					),

package/templates-experimental/solid/templates/wrangler.toml

@@ -2,5 +2,11 @@
 name = "<TBD>"
 compatibility_date = "<TBD>"
 compatibility_flags = ["nodejs_compat"]
-main = "./dist/worker/index.js"
-experimental_assets = { directory = "./dist/public", binding = "ASSETS" }
+main = "./.output/server/index.mjs"
+assets = { directory = "./.output/public", binding = "ASSETS" }
+
+# Workers Logs
+# Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/
+# Configuration: https://developers.cloudflare.com/workers/observability/logs/workers-logs/#enable-workers-logs
+[observability]
+enabled = true

package/templates-experimental/svelte/c3.ts

@@ -13,7 +13,7 @@ import type { C3Context, PackageJson } from "types";
 const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name]);
+	await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
 
 	logRaw("");
 };
@@ -97,8 +97,8 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
-	frameworkCli: "create-svelte",
-	displayName: "Svelte",
+	frameworkCli: "sv",
+	displayName: "SvelteKit",
 	platform: "workers",
 	copyFiles: {
 		variants: {

package/templates-experimental/svelte/js/wrangler.toml

@@ -2,4 +2,10 @@
 name = "<TBD>"
 compatibility_date = "<TBD>"
 main = ".svelte-kit/cloudflare/_worker.js"
-experimental_assets = { directory = ".svelte-kit/cloudflare", binding = "ASSETS" }
+assets = { directory = ".svelte-kit/cloudflare", binding = "ASSETS" }
+
+# Workers Logs
+# Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/
+# Configuration: https://developers.cloudflare.com/workers/observability/logs/workers-logs/#enable-workers-logs
+[observability]
+enabled = true

package/templates-experimental/svelte/ts/wrangler.toml

@@ -2,4 +2,10 @@
 name = "<TBD>"
 compatibility_date = "<TBD>"
 main = ".svelte-kit/cloudflare/_worker.js"
-experimental_assets = { directory = ".svelte-kit/cloudflare", binding = "ASSETS" }
+assets = { directory = ".svelte-kit/cloudflare", binding = "ASSETS" }
+
+# Workers Logs
+# Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/
+# Configuration: https://developers.cloudflare.com/workers/observability/logs/workers-logs/#enable-workers-logs
+[observability]
+enabled = true

package/templates/angular/templates/server.ts

@@ -1,34 +0,0 @@
-import { renderApplication } from "@angular/platform-server";
-import bootstrap from "./src/main.server";
-
-interface Env {
-	ASSETS: { fetch: typeof fetch };
-}
-
-// We attach the Cloudflare `fetch()` handler to the global scope
-// so that we can export it when we process the Angular output.
-// See tools/bundle.mjs
-async function workerFetchHandler(request: Request, env: Env) {
-	const url = new URL(request.url);
-	console.log("render SSR", url.href);
-
-	// Get the root `index.html` content.
-	const indexUrl = new URL("/", url);
-	const indexResponse = await env.ASSETS.fetch(new Request(indexUrl));
-	const document = await indexResponse.text();
-
-	const content = await renderApplication(bootstrap, {
-		document,
-		url: url.pathname,
-	});
-
-	// console.log("rendered SSR", content);
-	return new Response(content, indexResponse);
-}
-
-export default {
-	fetch: (request: Request, env: Env) =>
-		(globalThis as any)["__zone_symbol__Promise"].resolve(
-			workerFetchHandler(request, env)
-		),
-};

package/templates/angular/templates/tools/alter-polyfills.mjs

@@ -1,27 +0,0 @@
-import fs from "node:fs";
-import { EOL } from "node:os";
-import { join } from "node:path";
-import { worker } from "./paths.mjs";
-
-/**
- * Split by lines and comment the banner
- * ```
- * import { createRequire } from 'node:module';
- * globalThis['require'] ??= createRequire(import.meta.url);
- * ```
- */
-const serverPolyfillsFile = join(worker, "polyfills.server.mjs");
-const serverPolyfillsData = fs
-	.readFileSync(serverPolyfillsFile, "utf8")
-	.split(/\r?\n/);
-
-for (let index = 0; index < 2; index++) {
-	if (serverPolyfillsData[index].includes("createRequire")) {
-		serverPolyfillsData[index] = "// " + serverPolyfillsData[index];
-	}
-}
-
-// Add needed polyfills
-serverPolyfillsData.unshift(`globalThis['process'] = {};`);
-
-fs.writeFileSync(serverPolyfillsFile, serverPolyfillsData.join(EOL));

package/templates/angular/templates/tools/paths.mjs

@@ -1,9 +0,0 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-export const root = path.resolve(dirname, "..");
-export const client = path.resolve(root, "dist/browser");
-export const ssr = path.resolve(root, "dist/server");
-export const cloudflare = path.resolve(root, "dist/cloudflare");
-export const worker = path.resolve(cloudflare, "_worker.js");

package/templates-experimental/angular/templates/server.ts

@@ -1,34 +0,0 @@
-import { renderApplication } from "@angular/platform-server";
-import bootstrap from "./src/main.server";
-
-interface Env {
-	ASSETS: { fetch: typeof fetch };
-}
-
-// We attach the Cloudflare `fetch()` handler to the global scope
-// so that we can export it when we process the Angular output.
-// See tools/bundle.mjs
-async function workerFetchHandler(request: Request, env: Env) {
-	const url = new URL(request.url);
-	console.log("render SSR", url.href);
-
-	// Get the root `index.html` content.
-	const indexUrl = new URL("/index.html", url);
-	const indexResponse = await env.ASSETS.fetch(new Request(indexUrl));
-	const document = await indexResponse.text();
-
-	const content = await renderApplication(bootstrap, {
-		document,
-		url: url.pathname,
-	});
-
-	// console.log("rendered SSR", content);
-	return new Response(content, indexResponse);
-}
-
-export default {
-	fetch: (request: Request, env: Env) =>
-		(globalThis as any)["__zone_symbol__Promise"].resolve(
-			workerFetchHandler(request, env),
-		),
-};

package/templates-experimental/angular/templates/src/.assetsignore

@@ -1,4 +0,0 @@
-_worker.js
-_routes.json
-_headers
-_redirects

package/templates-experimental/angular/templates/tools/alter-polyfills.mjs

@@ -1,27 +0,0 @@
-import fs from "node:fs";
-import { EOL } from "node:os";
-import { join } from "node:path";
-import { worker } from "./paths.mjs";
-
-/**
- * Split by lines and comment the banner
- * ```
- * import { createRequire } from 'node:module';
- * globalThis['require'] ??= createRequire(import.meta.url);
- * ```
- */
-const serverPolyfillsFile = join(worker, "polyfills.server.mjs");
-const serverPolyfillsData = fs
-	.readFileSync(serverPolyfillsFile, "utf8")
-	.split(/\r?\n/);
-
-for (let index = 0; index < 2; index++) {
-	if (serverPolyfillsData[index].includes("createRequire")) {
-		serverPolyfillsData[index] = "// " + serverPolyfillsData[index];
-	}
-}
-
-// Add needed polyfills
-serverPolyfillsData.unshift(`globalThis['process'] = {};`);
-
-fs.writeFileSync(serverPolyfillsFile, serverPolyfillsData.join(EOL));

package/templates-experimental/angular/templates/tools/copy-files.mjs

@@ -1,9 +0,0 @@
-// Copy the files over so that they can be uploaded by the pages publish command.
-import fs from "node:fs";
-import { join } from "node:path";
-import { client, cloudflare, ssr, worker } from "./paths.mjs";
-
-fs.cpSync(client, cloudflare, { recursive: true });
-fs.cpSync(ssr, worker, { recursive: true });
-
-fs.renameSync(join(worker, "server.mjs"), join(worker, "index.js"));

package/templates-experimental/angular/templates/tools/paths.mjs

@@ -1,9 +0,0 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-export const root = path.resolve(dirname, "..");
-export const client = path.resolve(root, "dist/browser");
-export const ssr = path.resolve(root, "dist/server");
-export const cloudflare = path.resolve(root, "dist/cloudflare");
-export const worker = path.resolve(cloudflare, "_worker.js");