C3-workers-assets-experimental-templates

.changeset/silly-taxis-sort.md

@@ -0,0 +1,5 @@
+---
+"create-cloudflare": patch
+---
+
+fix: do not crash if the chosen framework does not exist

.changeset/stale-students-crash.md

@@ -0,0 +1,5 @@
+---
+"create-cloudflare": minor
+---
+
+feat: add experimental mode and associated workers + assets templates

.prettierignore

@@ -16,14 +16,15 @@ CHANGELOG.md
 # In the C3 templates, in particular framework templates, we want to be able to
 # use any format that the framework authors prefer/use in their own templates,
 # so let's ignore all the c3 template files, exlcuding the c3.ts ones, and tests
-packages/create-cloudflare/templates/**/*.*
-!packages/create-cloudflare/templates/**/c3.ts
-!packages/create-cloudflare/templates/**/test/**/*.ts
-!packages/create-cloudflare/templates/**/test/**/*.js
+packages/create-cloudflare/templates*/**/*.*
+!packages/create-cloudflare/templates*/**/c3.ts
+!packages/create-cloudflare/templates*/**/test/**/*.ts
+!packages/create-cloudflare/templates*/**/test/**/*.js
 # Format the hello-world template (negate previous exclusion above) for best practices, since we control these
 # but still exclude the worker-configuration.d.ts file, since it's generated
-!packages/create-cloudflare/templates/hello-world/**/*.*
-packages/create-cloudflare/templates/hello-world/**/worker-configuration.d.ts
+!packages/create-cloudflare/templates*/hello-world/**/*.*
+packages/create-cloudflare/templates*/hello-world/**/worker-configuration.d.ts
+
 # dist-functions are generated in the fixtures/vitest-pool-workers-examples/pages-functions-unit-integration-self folder
 dist-functions
 

packages/cli/interactive.ts

@@ -246,7 +246,7 @@ type Renderer = (
 const renderSubmit = (config: PromptConfig, value: string) => {
 	const { question, label } = config;
 
-	if (config.type !== "confirm" && value.length === 0) {
+	if (config.type !== "confirm" && !value) {
 		return [`${leftT} ${question} ${dim("(skipped)")}`, `${grayBar}`];
 	}
 

packages/create-cloudflare/.eslintrc.js

@@ -5,8 +5,9 @@ module.exports = {
 		"dist",
 		"scripts",
 		"e2e-tests/fixtures/*",
+		"**/templates*/**/*.*",
 		// template files are ignored by the eslint-config-worker configuration
 		// we do however want the c3 files to be linted
-		"!**/templates/**/c3.ts",
+		"!**/templates*/**/c3.ts",
 	],
 };

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

@@ -10,7 +10,7 @@ import {
 	test,
 } from "vitest";
 import { version } from "../package.json";
-import { frameworkToTest } from "./frameworkToTest";
+import { getFrameworkToTest } from "./frameworkToTest";
 import {
 	createTestLogStream,
 	isQuarantineMode,
@@ -21,6 +21,8 @@ import {
 import type { WriteStream } from "fs";
 import type { Suite } from "vitest";
 
+const frameworkToTest = getFrameworkToTest({ experimental: false });
+
 // Note: skipIf(frameworkToTest) makes it so that all the basic C3 functionality
 //       tests are skipped in case we are testing a specific framework
 describe.skipIf(frameworkToTest || isQuarantineMode())(

packages/create-cloudflare/e2e-tests/frameworkToTest.ts

@@ -1,25 +1,22 @@
-import { frameworkCliMap } from "../src/frameworks/package.json";
+import { getFrameworkMap } from "../src/templates";
 
-let targetFramework = undefined;
-
-const envCliToTest = process.env.FRAMEWORK_CLI_TO_TEST;
+/**
+ * Get the name of the framework to test or undefined if not focussing on a single framework.
+ */
+export function getFrameworkToTest({ experimental = false }) {
+	const envCliToTest = process.env.FRAMEWORK_CLI_TO_TEST;
+	if (!envCliToTest) {
+		return undefined;
+	}
 
-if (envCliToTest) {
-	for (const [framework, cli] of Object.entries(frameworkCliMap)) {
-		if (cli === envCliToTest) {
-			targetFramework = framework;
+	const frameworks = getFrameworkMap({ experimental });
+	for (const [framework, { frameworkCli }] of Object.entries(frameworks)) {
+		if (frameworkCli === envCliToTest) {
+			return framework;
 		}
 	}
-	if (!targetFramework) {
-		throw new Error(
-			`Specified cli doesn't exist in framework map: ${envCliToTest}`,
-		);
-	}
-}
 
-/**
- * In case the e2e run is supposed to only test a single framework
- * the framework's name is set as the value of this variable, for standard
- * runs this variable's value is `undefined`
- */
-export const frameworkToTest = targetFramework;
+	throw new Error(
+		`Specified cli doesn't exist in framework map: ${envCliToTest}`,
+	);
+}

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

@@ -17,7 +17,7 @@ import {
 } from "vitest";
 import { deleteProject, deleteWorker } from "../scripts/common";
 import { getFrameworkMap } from "../src/templates";
-import { frameworkToTest } from "./frameworkToTest";
+import { getFrameworkToTest } from "./frameworkToTest";
 import {
 	createTestLogStream,
 	getDiffsPath,
@@ -31,7 +31,7 @@ import {
 	testProjectDir,
 	waitForExit,
 } from "./helpers";
-import type { FrameworkMap, FrameworkName } from "../src/templates";
+import type { TemplateMap } from "../src/templates";
 import type { RunnerConfig } from "./helpers";
 import type { WriteStream } from "fs";
 import type { Suite } from "vitest";
@@ -368,11 +368,11 @@ const frameworkTests: Record<string, FrameworkTestConfig> = {
 };
 
 describe.concurrent(`E2E: Web frameworks`, () => {
-	let frameworkMap: FrameworkMap;
+	let frameworkMap: TemplateMap;
 	let logStream: WriteStream;
 
 	beforeAll(async (ctx) => {
-		frameworkMap = await getFrameworkMap();
+		frameworkMap = getFrameworkMap({ experimental: false });
 		recreateLogFolder(ctx as Suite);
 		recreateDiffsFolder();
 	});
@@ -394,6 +394,7 @@ describe.concurrent(`E2E: Web frameworks`, () => {
 		// If the framework in question is being run in isolation, always run it.
 		// Otherwise, only run the test if it's configured `quarantine` value matches
 		// what is set in E2E_QUARANTINE
+		const frameworkToTest = getFrameworkToTest({ experimental: false });
 		let shouldRun = frameworkToTest
 			? frameworkToTest === framework
 			: quarantineModeMatch;
@@ -409,7 +410,7 @@ describe.concurrent(`E2E: Web frameworks`, () => {
 				const { getPath, getName, clean } = testProjectDir("pages");
 				const projectPath = getPath(framework);
 				const projectName = getName(framework);
-				const frameworkConfig = frameworkMap[framework as FrameworkName];
+				const frameworkConfig = frameworkMap[framework];
 
 				const { promptHandlers, verifyDeploy, flags } =
 					frameworkTests[framework];
@@ -575,8 +576,8 @@ const verifyDevScript = async (
 		return;
 	}
 
-	const frameworkMap = await getFrameworkMap();
-	const template = frameworkMap[framework as FrameworkName];
+	const frameworkMap = getFrameworkMap({ experimental: false });
+	const template = frameworkMap[framework];
 
 	// Run the devserver on a random port to avoid colliding with other tests
 	const TEST_PORT = Math.ceil(Math.random() * 1000) + 20000;

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

@@ -5,7 +5,7 @@ import { sleep } from "helpers/sleep";
 import { fetch } from "undici";
 import { beforeAll, beforeEach, describe, expect, test } from "vitest";
 import { deleteWorker } from "../scripts/common";
-import { frameworkToTest } from "./frameworkToTest";
+import { getFrameworkToTest } from "./frameworkToTest";
 import {
 	createTestLogStream,
 	isQuarantineMode,
@@ -63,7 +63,11 @@ const workerTemplates: WorkerTestConfig[] = [
 ];
 
 describe
-	.skipIf(frameworkToTest || isQuarantineMode() || process.platform === "win32")
+	.skipIf(
+		getFrameworkToTest({ experimental: false }) ||
+			isQuarantineMode() ||
+			process.platform === "win32",
+	)
 	.concurrent(`E2E: Workers templates`, () => {
 		let logStream: WriteStream;
 

packages/create-cloudflare/package.json

@@ -23,7 +23,8 @@
 	"bin": "./dist/cli.js",
 	"files": [
 		"dist",
-		"templates"
+		"templates",
+		"templates-experimental"
 	],
 	"scripts": {
 		"build": "node -r esbuild-register scripts/build.ts",

packages/create-cloudflare/scripts/build.ts

@@ -23,7 +23,7 @@ const run = async () => {
 		// The latter has been added to the project's .gitignore file
 		// This renaming will be reversed when each template is used
 		// We can continue to author ".gitignore" files in each template
-		for (const filepath of glob.sync("templates/**/.gitignore")) {
+		for (const filepath of glob.sync("templates*/**/.gitignore")) {
 			await cp(filepath, filepath.replace(".gitignore", "__dot__gitignore"));
 		}
 	};

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

@@ -49,7 +49,7 @@ describe("deploy helpers", async () => {
 			await expect(offerToDeploy(ctx)).resolves.toBe(true);
 		});
 
-		test("project is undeployable", async () => {
+		test("project is undeployable (simple binding)", async () => {
 			const ctx = createTestContext();
 			// Can't deploy things with bindings (yet!)
 			vi.mocked(readFile).mockReturnValue(`binding = "MY_QUEUE"`);
@@ -60,6 +60,39 @@ describe("deploy helpers", async () => {
 			expect(wranglerLogin).not.toHaveBeenCalled();
 		});
 
+		test("project is undeployable (complex binding)", async () => {
+			const ctx = createTestContext();
+			// Can't deploy things with bindings (yet!)
+			vi.mocked(readFile).mockReturnValue(`
+				experimental_assets = { directory = "./dist", binding = "ASSETS" }
+
+				[[durable_objects.bindings]]
+				name = "MY_DURABLE_OBJECT"
+				class_name = "MyDurableObject"
+			`);
+
+			await expect(offerToDeploy(ctx)).resolves.toBe(false);
+			expect(processArgument).toHaveBeenCalledOnce();
+			expect(ctx.args.deploy).toBe(false);
+			expect(wranglerLogin).not.toHaveBeenCalled();
+		});
+
+		test("assets project is deployable (no other bindings)", async () => {
+			const ctx = createTestContext();
+			vi.mocked(readFile).mockReturnValue(`
+				experimental_assets = { directory = "./dist", binding = "ASSETS" }
+			`);
+			// mock the user selecting yes when asked to deploy
+			vi.mocked(processArgument).mockResolvedValueOnce(true);
+			// mock a successful wrangler login
+			vi.mocked(wranglerLogin).mockResolvedValueOnce(true);
+
+			await expect(offerToDeploy(ctx)).resolves.toBe(true);
+			expect(processArgument).toHaveBeenCalledOnce();
+			expect(ctx.args.deploy).toBe(true);
+			expect(wranglerLogin).toHaveBeenCalled();
+		});
+
 		test("--no-deploy from command line", async () => {
 			const ctx = createTestContext();
 			ctx.args.deploy = false;

packages/create-cloudflare/src/deploy.ts

@@ -1,6 +1,7 @@
 import { crash, startSection, updateStatus } from "@cloudflare/cli";
 import { processArgument } from "@cloudflare/cli/args";
 import { blue, brandColor, dim } from "@cloudflare/cli/colors";
+import TOML from "@iarna/toml";
 import { C3_DEFAULTS, openInBrowser } from "helpers/cli";
 import { quoteShellArgs, runCommand } from "helpers/command";
 import { detectPackageManager } from "helpers/packageManagers";
@@ -67,12 +68,11 @@ const isDeployable = async (ctx: C3Context) => {
 		return true;
 	}
 
-	const wranglerToml = readWranglerToml(ctx);
-	if (wranglerToml.match(/(?<!#\s*)bindings?\s*=.*/m)) {
-		return false;
-	}
+	const wranglerTomlStr = readWranglerToml(ctx);
 
-	return true;
+	const wranglerToml = TOML.parse(wranglerTomlStr.replace(/\r\n/g, "\n"));
+
+	return !hasBinding(wranglerToml);
 };
 
 export const runDeploy = async (ctx: C3Context) => {
@@ -139,3 +139,23 @@ export const maybeOpenBrowser = async (ctx: C3Context) => {
 		}
 	}
 };
+
+/**
+ * Recursively search the properties of node for a binding.
+ */
+export const hasBinding = (node: unknown): boolean => {
+	if (typeof node !== "object" || node === null) {
+		return false;
+	}
+	for (const key of Object.keys(node)) {
+		if (key === "experimental_assets" || key === "assets") {
+			// Properties called "binding" within "assets" do not count as bindings.
+			continue;
+		}
+		if (key === "binding" || key === "bindings") {
+			return true;
+		}
+		return hasBinding(node[key as keyof typeof node]);
+	}
+	return false;
+};

packages/create-cloudflare/src/frameworks/index.ts

@@ -3,20 +3,17 @@ import { dim } from "@cloudflare/cli/colors";
 import { quoteShellArgs, runCommand } from "helpers/command";
 import { detectPackageManager } from "helpers/packageManagers";
 import { isInsideGitRepo } from "../git";
-import clisPackageJson from "./package.json";
+import frameworksPackageJson from "./package.json";
 import type { C3Context } from "types";
 
 export const getFrameworkCli = (ctx: C3Context, withVersion = true) => {
 	if (!ctx.template) {
 		return crash("Framework not specified.");
 	}
 
-	const framework = ctx.template
-		.id as keyof typeof clisPackageJson.frameworkCliMap;
-	const frameworkCli = clisPackageJson.frameworkCliMap[
-		framework
-	] as keyof typeof clisPackageJson.dependencies;
-	const version = clisPackageJson.dependencies[frameworkCli];
+	const frameworkCli = ctx.template
+		.frameworkCli as keyof typeof frameworksPackageJson.dependencies;
+	const version = frameworksPackageJson.dependencies[frameworkCli];
 	return withVersion ? `${frameworkCli}@${version}` : frameworkCli;
 };
 

packages/create-cloudflare/src/frameworks/package.json

@@ -1,9 +1,8 @@
 {
 	"name": "frameworks_clis_info",
-	"description": [
-		"this package.json is only used to keep track of the frameworks cli dependencies",
-		"so that we can use dependabot to update these dependencies automatically",
-		"additionally it also contains a map that maps frameworks to their respective clis"
+	"info": [
+		"This package.json is only used to keep track of the frameworks cli dependencies",
+		"so that we can use dependabot to update these dependencies automatically."
 	],
 	"dependencies": {
 		"create-astro": "4.8.0",
@@ -20,21 +19,5 @@
 		"create-vue": "3.10.4",
 		"gatsby": "5.13.7",
 		"nuxi": "3.12.0"
-	},
-	"frameworkCliMap": {
-		"analog": "create-analog",
-		"angular": "@angular/create",
-		"astro": "create-astro",
-		"docusaurus": "create-docusaurus",
-		"gatsby": "gatsby",
-		"hono": "create-hono",
-		"next": "create-next-app",
-		"nuxt": "nuxi",
-		"qwik": "create-qwik",
-		"react": "create-vite",
-		"remix": "create-remix",
-		"solid": "create-solid",
-		"svelte": "create-svelte",
-		"vue": "create-vue"
 	}
 }

packages/create-cloudflare/src/frameworks/tsconfig.json

@@ -0,0 +1,3 @@
+{
+	"extends": "../../tsconfig.json"
+}