cloudflare · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024 · Feb 14, 2024 · Feb 14, 2024
diff --git a/.prettierignore b/.prettierignore
@@ -38,6 +38,10 @@ fixtures/**/dist/**
 # Miniflare shouldn't be formatted with the root `prettier` version
 packages/miniflare
 
+# Generated Cap'n Proto files shouldn't be formatted
+*.capnp.js
+*.capnp.d.ts
+
 # 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

diff --git a/fixtures/dev-env/package.json b/fixtures/dev-env/package.json
@@ -16,7 +16,7 @@
 		"@types/ws": "^8.5.7",
 		"@cloudflare/workers-tsconfig": "workspace:^",
 		"get-port": "^7.0.0",
-		"miniflare": "3.20240129.2",
+		"miniflare": "3.20240129.3",
 		"undici": "^5.28.2",
 		"wrangler": "workspace:*",
 		"ws": "^8.14.2"

diff --git a/fixtures/get-platform-proxy/tests/get-platform-proxy.caches.test.ts b/fixtures/get-platform-proxy/tests/get-platform-proxy.caches.test.ts
@@ -17,6 +17,44 @@ describe("getPlatformProxy - caches", () => {
 			}
 		})
 	);
+
+	it("should match the production runtime caches object", async () => {
+		const { caches: platformProxyCaches, dispose } = await getPlatformProxy();
+		const caches = platformProxyCaches as any;
+		try {
+			expect(Object.keys(caches)).toEqual(["default"]);
+
+			expect(() => {
+				caches.has("my-cache");
+			}).toThrowError(
+				"Failed to execute 'has' on 'CacheStorage': the method is not implemented."
+			);
+
+			expect(() => {
+				caches.delete("my-cache");
+			}).toThrowError(
+				"Failed to execute 'delete' on 'CacheStorage': the method is not implemented."
+			);
+
+			expect(() => {
+				caches.keys();
+			}).toThrowError(
+				"Failed to execute 'keys' on 'CacheStorage': the method is not implemented."
+			);
+
+			expect(() => {
+				caches.match(new URL("https://localhost"));
+			}).toThrowError(
+				"Failed to execute 'match' on 'CacheStorage': the method is not implemented."
+			);
+
+			expect(() => {
+				caches.nonExistentMethod();
+			}).toThrowError("caches.nonExistentMethod is not a function");
+		} finally {
+			await dispose();
+		}
+	});
 });
 
 async function testNoOpCache(

diff --git a/package.json b/package.json
@@ -11,15 +11,15 @@
 	"author": "wrangler@cloudflare.com",
 	"scripts": {
 		"build": "dotenv -- turbo build",
-		"check": "dotenv -- turbo check:lint check:type check:format type:tests",
+		"check": "node ensure-turbo-build-output.mjs && dotenv -- turbo check:lint check:type check:format type:tests",
 		"check:format": "prettier . --check --ignore-unknown",
-		"check:lint": "node ensure-turbo-build-output.mjs && dotenv -- turbo check:lint",
+		"check:lint": "dotenv -- turbo check:lint",
 		"check:type": "dotenv -- turbo check:type type:tests",
 		"dev": "dotenv -- turbo dev",
 		"fix": "pnpm run prettify && dotenv -- turbo check:lint -- --fix",
 		"prettify": "prettier . --write --ignore-unknown",
 		"test": "dotenv -- turbo test",
-		"test:ci": "vitest run && dotenv -- turbo test:ci --filter=wrangler --filter=miniflare --filter=kv-asset-handler",
+		"test:ci": "vitest run && dotenv -- turbo test:ci --filter=wrangler --filter=miniflare --filter=kv-asset-handler --filter=@cloudflare/vitest-pool-workers",
 		"test:watch": "turbo test:watch",
 		"type:tests": "dotenv -- turbo type:tests",
 		"gen:package": "turbo gen package"

diff --git a/packages/create-cloudflare/CHANGELOG.md b/packages/create-cloudflare/CHANGELOG.md
@@ -1,5 +1,49 @@
 # create-cloudflare
 
+## 2.12.0
+
+### Minor Changes
+
+- [#4996](https://github.com/cloudflare/workers-sdk/pull/4996) [`246512c8`](https://github.com/cloudflare/workers-sdk/commit/246512c8e34fa218b1d52d3a52cd6aa348fdf563) Thanks [@jculvey](https://github.com/jculvey)! - feature: Add `getBindingsProxy` support to `nuxt` template via `nitro-cloudflare-dev` module.
+
+  The `nuxt` template now uses the default dev command from `create-nuxt` instead of using `wrangler pages dev` on build output in order to improve the developer workflow. `nitro-cloudflare-dev` is a nitro module that leverages `getBindingsProxy` and allows bindings to work in nitro commands.
+
+* [#5027](https://github.com/cloudflare/workers-sdk/pull/5027) [`a751489f`](https://github.com/cloudflare/workers-sdk/commit/a751489f2530bc7a7adec1167319cd145f080812) Thanks [@jculvey](https://github.com/jculvey)! - feature: Improve bindings support in Svelte template.
+
+  C3 will now create Svelte projects with a hook that uses `getPlatformProxy` to proxy bindings in development mode. A `wrangler.toml` file will also be added where bindings can be added to be used in conjunction with `getPlatformProxy`.
+
+  Along with this change, projects will use the default vite-based dev command from `create-svelte` instead of using `wrangler pages dev` on build output.
+
+  When Typescript is used, the `app.d.ts` will be updated to add type definitions for `cf` and `ctx` to the `Platform` interface from the `@cloudflare/workers-types` package. Types for bindings on `platform.env` can be re-generated with a newly added `build-cf-types` script.
+
+### Patch Changes
+
+- [#5001](https://github.com/cloudflare/workers-sdk/pull/5001) [`efe8b444`](https://github.com/cloudflare/workers-sdk/commit/efe8b444e4220cfb23c443dc172582ee58119bc5) Thanks [@dependabot](https://github.com/apps/dependabot)! - chore: Bumped `create-hono` from `0.3.2` to `0.4.0`
+
+* [#5011](https://github.com/cloudflare/workers-sdk/pull/5011) [`89482d44`](https://github.com/cloudflare/workers-sdk/commit/89482d4475780c3cd3efbbd004c6b4f85c8daf53) Thanks [@dependabot](https://github.com/apps/dependabot)! - chore: Bumped `create-qwik` from `1.4.4` to `1.4.5`
+
+- [#5019](https://github.com/cloudflare/workers-sdk/pull/5019) [`f939ed73`](https://github.com/cloudflare/workers-sdk/commit/f939ed739a89de174099f128530a29bd51b04899) Thanks [@dependabot](https://github.com/apps/dependabot)! - chore: Bumped `@angular/create` from `17.1.3` to `17.2.0`
+
+* [#5020](https://github.com/cloudflare/workers-sdk/pull/5020) [`0e74c743`](https://github.com/cloudflare/workers-sdk/commit/0e74c743236d2a9055648eac9397d566ac90d83b) Thanks [@dependabot](https://github.com/apps/dependabot)! - chore: Bumped `nuxi` from `3.10.0` to `3.10.1`
+
+- [#5021](https://github.com/cloudflare/workers-sdk/pull/5021) [`ae1ef47c`](https://github.com/cloudflare/workers-sdk/commit/ae1ef47c8981a1059b5c8a2adaf7edeb38c1c49d) Thanks [@dependabot](https://github.com/apps/dependabot)! - chore: Bumped `create-astro` from `4.7.2` to `4.7.3`
+
+* [#5009](https://github.com/cloudflare/workers-sdk/pull/5009) [`1e263694`](https://github.com/cloudflare/workers-sdk/commit/1e2636940cc05b06475cce6d96a882f03216ff78) Thanks [@dario-piotrowicz](https://github.com/dario-piotrowicz)! - chore: update Next.js template
+
+  Update the C3 Next.js template so that it uses the latest `@cloudflare/next-on-pages` tooling (i.e. `setupDevPlatform` and `getRequestContext`)
+
+- [#4996](https://github.com/cloudflare/workers-sdk/pull/4996) [`246512c8`](https://github.com/cloudflare/workers-sdk/commit/246512c8e34fa218b1d52d3a52cd6aa348fdf563) Thanks [@jculvey](https://github.com/jculvey)! - feature: Add an empty `wrangler.toml` file to qwik and nuxt templates.
+
+* [#4999](https://github.com/cloudflare/workers-sdk/pull/4999) [`ce6d4bc4`](https://github.com/cloudflare/workers-sdk/commit/ce6d4bc4753625d2aaf1b832bbb47fc50b24a98b) Thanks [@dario-piotrowicz](https://github.com/dario-piotrowicz)! - fix: make sure not to wrongly ask users if they want to use typescript
+
+  currently if a CLI invoked by C3 asks the user if they want to use
+  typescript and the user opted out of it, C3 could actually again offer
+  typescript to the user afterwords, make sure that this does not happen
+
+- [#5010](https://github.com/cloudflare/workers-sdk/pull/5010) [`9f787042`](https://github.com/cloudflare/workers-sdk/commit/9f787042fc6894f5f1ebdc99e0ae10afbe6bdae6) Thanks [@dario-piotrowicz](https://github.com/dario-piotrowicz)! - chore: update qwik template to use `getPlatformProxy`
+
+  update the C3 Qwik template to use the `getPlatformProxy` utility instead of the deprecated `getBindingsProxy` one
+
 ## 2.11.3
 
 ### Patch Changes

diff --git a/packages/create-cloudflare/e2e-tests/fixtures/nuxt/server/routes/test.ts b/packages/create-cloudflare/e2e-tests/fixtures/nuxt/server/routes/test.ts
@@ -0,0 +1,8 @@
+export default eventHandler(async (event) => {
+	if (!event.context.cloudflare) {
+		return { success: false };
+	}
+	const { TEST } = event.context.cloudflare.env;
+
+	return { value: TEST, success: true };
+});
diff --git a/packages/create-cloudflare/e2e-tests/fixtures/nuxt/wrangler.toml b/packages/create-cloudflare/e2e-tests/fixtures/nuxt/wrangler.toml
@@ -0,0 +1,2 @@
+[vars]
+TEST = "C3_TEST"
diff --git a/packages/create-cloudflare/e2e-tests/fixtures/qwik/src/routes/test/index.ts b/packages/create-cloudflare/e2e-tests/fixtures/qwik/src/routes/test/index.ts
@@ -6,5 +6,5 @@ export const onGet: RequestHandler = async ({ platform, json }) => {
 		return;
 	}
 
-	json(200, { value: platform.env["TEST"], version: 1 });
+	json(200, { value: platform.env["TEST"], success: true });
 };
diff --git a/packages/create-cloudflare/e2e-tests/fixtures/svelte/src/routes/test/+server.ts b/packages/create-cloudflare/e2e-tests/fixtures/svelte/src/routes/test/+server.ts
@@ -0,0 +1,9 @@
+export async function GET({ platform }) {
+	const test = platform?.env.TEST;
+
+	return new Response(JSON.stringify({ test }), {
+		headers: {
+			"Content-Type": "application/json",
+		},
+	});
+}
diff --git a/packages/create-cloudflare/e2e-tests/fixtures/svelte/wrangler.toml b/packages/create-cloudflare/e2e-tests/fixtures/svelte/wrangler.toml
@@ -0,0 +1,2 @@
+[vars]
+TEST = "C3_TEST"
diff --git a/packages/create-cloudflare/e2e-tests/frameworks.test.ts b/packages/create-cloudflare/e2e-tests/frameworks.test.ts
@@ -152,10 +152,21 @@ const frameworkTests: Record<string, FrameworkTestConfig> = {
 	nuxt: {
 		testCommitMessage: true,
 		timeout: LONG_TIMEOUT,
+		unsupportedOSs: ["win32"],
 		verifyDeploy: {
 			route: "/",
 			expectedText: "Welcome to Nuxt!",
 		},
+		verifyDev: {
+			route: "/test",
+			expectedText: "C3_TEST",
+		},
+		verifyBuild: {
+			outputDir: "./dist",
+			script: "build",
+			route: "/test",
+			expectedText: "C3_TEST",
+		},
 	},
 	react: {
 		testCommitMessage: true,
@@ -211,6 +222,16 @@ const frameworkTests: Record<string, FrameworkTestConfig> = {
 			route: "/",
 			expectedText: "SvelteKit app",
 		},
+		verifyDev: {
+			route: "/test",
+			expectedText: "C3_TEST",
+		},
+		verifyBuild: {
+			outputDir: ".svelte-kit/cloudflare",
+			script: "build",
+			route: "/test",
+			expectedText: "C3_TEST",
+		},
 	},
 	vue: {
 		testCommitMessage: true,
@@ -421,8 +442,8 @@ const verifyDevScript = async (
 		logStream
 	);
 
-	// Wait a few seconds for dev server to spin up
-	await sleep(4000);
+	// Wait an eternity for the dev server to spin up
+	await sleep(12000);
 
 	// Make a request to the specified test route
 	const res = await fetch(`http://localhost:${TEST_PORT}${verifyDev.route}`);
@@ -457,6 +478,9 @@ const verifyBuildScript = async (
 		[pm, "run", script],
 		{
 			cwd: projectPath,
+			env: {
+				NODE_ENV: "production",
+			},
 		},
 		logStream
 	);
@@ -474,7 +498,7 @@ const verifyBuildScript = async (
 	);
 
 	// Wait a few seconds for dev server to spin up
-	await sleep(4000);
+	await sleep(7000);
 
 	// Make a request to the specified test route
 	const res = await fetch(`http://localhost:${TEST_PORT}${route}`);

diff --git a/packages/create-cloudflare/e2e-tests/helpers.ts b/packages/create-cloudflare/e2e-tests/helpers.ts
@@ -115,6 +115,8 @@ export const spawnWithLogging = (
 ) => {
 	const [cmd, ...argv] = args;
 
+	logStream.write(`\nRunning command: ${[cmd, ...argv].join(" ")}\n\n`);
+
 	const proc = spawn(cmd, argv, {
 		...opts,
 		env: {
@@ -123,8 +125,6 @@ export const spawnWithLogging = (
 		},
 	});
 
-	logStream.write(`\nRunning command: ${[cmd, ...argv].join(" ")}\n\n`);
-
 	proc.stdout.on("data", (data) => {
 		const lines: string[] = data.toString().split("\n");
 

diff --git a/packages/create-cloudflare/package.json b/packages/create-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "create-cloudflare",
-	"version": "2.11.3",
+	"version": "2.12.0",
 	"description": "A CLI for creating and deploying new applications to Cloudflare.",
 	"keywords": [
 		"cloudflare",

diff --git a/packages/create-cloudflare/scripts/build.ts b/packages/create-cloudflare/scripts/build.ts
@@ -11,6 +11,8 @@ const run = async () => {
 		bundle: true,
 		outdir: "./dist",
 		platform: "node",
+		// This is required to support jsonc-parser. See https://github.com/microsoft/node-jsonc-parser/issues/57
+		mainFields: ["module", "main"],
 		format: "cjs",
 	};
 

diff --git a/packages/create-cloudflare/src/__tests__/workers.test.ts b/packages/create-cloudflare/src/__tests__/workers.test.ts
@@ -90,7 +90,7 @@ describe("addWorkersTypesToTsConfig", () => {
 
 		// Mock the read of tsconfig.json
 		vi.mocked(readFile).mockImplementation(
-			() => `{types: ["@cloudflare/workers-types"]}`
+			() => `{ "compilerOptions": { "types": ["@cloudflare/workers-types"]} }`
 		);
 	});
 
@@ -101,8 +101,10 @@ describe("addWorkersTypesToTsConfig", () => {
 	test("happy path", async () => {
 		await addWorkersTypesToTsConfig(ctx);
 
-		expect(vi.mocked(writeFile).mock.calls[0][1]).toEqual(
-			`{types: ["@cloudflare/workers-types/2023-07-01"]}`
+		expect(writeFile).toHaveBeenCalled();
+
+		expect(vi.mocked(writeFile).mock.calls[0][1]).toContain(
+			`"@cloudflare/workers-types/2023-07-01"`
 		);
 	});
 
@@ -123,12 +125,13 @@ describe("addWorkersTypesToTsConfig", () => {
 
 	test("don't clobber existing entrypoints", async () => {
 		vi.mocked(readFile).mockImplementation(
-			() => `{types: ["@cloudflare/workers-types/2021-03-20"]}`
+			() =>
+				`{ "compilerOptions": { "types" : ["@cloudflare/workers-types/2021-03-20"]} }`
 		);
 		await addWorkersTypesToTsConfig(ctx);
 
-		expect(vi.mocked(writeFile).mock.calls[0][1]).toEqual(
-			`{types: ["@cloudflare/workers-types/2021-03-20"]}`
+		expect(vi.mocked(writeFile).mock.calls[0][1]).toContain(
+			`"@cloudflare/workers-types/2021-03-20"`
 		);
 	});
 });

diff --git a/packages/create-cloudflare/src/cli.ts b/packages/create-cloudflare/src/cli.ts
@@ -138,6 +138,8 @@ const configure = async (ctx: C3Context) => {
 	await installWrangler();
 	await installWorkersTypes(ctx);
 
+	// Note: updateWranglerToml _must_ be called before the configure phase since
+	//       pre-existing workers assume its presence in their configure phase
 	await updateWranglerToml(ctx);
 
 	const { template } = ctx;

diff --git a/packages/create-cloudflare/src/frameworks/package.json b/packages/create-cloudflare/src/frameworks/package.json
@@ -6,19 +6,19 @@
 		"additionally it also contains a map that maps frameworks to their respective clis"
 	],
 	"dependencies": {
-		"create-astro": "4.7.2",
-		"@angular/create": "17.1.3",
+		"create-astro": "4.7.3",
+		"@angular/create": "17.2.0",
 		"create-docusaurus": "3.1.1",
-		"create-hono": "0.3.2",
+		"create-hono": "0.4.0",
 		"create-next-app": "14.1.0",
-		"create-qwik": "1.4.4",
+		"create-qwik": "1.4.5",
 		"create-react-app": "5.0.1",
 		"create-remix": "2.6.0",
 		"create-solid": "0.4.10",
 		"create-svelte": "6.0.8",
 		"create-vue": "3.9.2",
 		"gatsby": "5.13.3",
-		"nuxi": "3.10.0"
+		"nuxi": "3.10.1"
 	},
 	"frameworkCliMap": {
 		"angular": "@angular/create",

diff --git a/packages/create-cloudflare/src/helpers/files.ts b/packages/create-cloudflare/src/helpers/files.ts
@@ -5,6 +5,14 @@ import TOML from "@iarna/toml";
 import { getWorkerdCompatibilityDate } from "./command";
 import type { C3Context } from "types";
 
+export const copyFile = (path: string, dest: string) => {
+	try {
+		fs.copyFileSync(path, dest);
+	} catch (error) {
+		crash(error as string);
+	}
+};
+
 export const writeFile = (path: string, content: string) => {
 	try {
 		fs.writeFileSync(path, content);