[pull] main from cloudflare:main

.changeset/cool-oranges-fail.md

@@ -0,0 +1,7 @@
+---
+"@cloudflare/vite-plugin": patch
+---
+
+Append Cloudflare defaults to existing `.assetsignore` files during build output
+
+When a project includes a `PUBLIC_DIR/.assetsignore`, the plugin now preserves those rules and appends the required `wrangler.json` and `.dev.vars` entries instead of replacing the file content.

.changeset/fix-angular-localhost-ssr.md

@@ -0,0 +1,10 @@
+---
+"create-cloudflare": patch
+"wrangler": patch
+---
+
+Fix Angular scaffolding to allow localhost SSR in development mode
+
+Recent versions of Angular's `AngularAppEngine` block serving SSR on `localhost` by default. This caused `wrangler dev` / `wrangler pages dev` to fail with `URL with hostname "localhost" is not allowed.`
+
+The fix passes `allowedHosts: ["localhost"]` to the `AngularAppEngine` constructor in `server.ts`, which is safe to do even in production since Cloudflare will already restrict which host is allowed.

.changeset/keen-fish-melt.md

@@ -0,0 +1,10 @@
+---
+"@cloudflare/workers-utils": patch
+---
+
+Add `removeDir` and `removeDirSync` helpers with automatic retry logic for Windows EBUSY errors
+
+These new helpers wrap `fs.rm`/`fs.rmSync` with `maxRetries: 5` and `retryDelay: 100` to handle cases where file handles aren't immediately released (common on Windows with workerd).
+The async helper also has a `fireAndForget` option to silently swallow errors and not await removal.
+
+This improves reliability of cleanup operations across the codebase.

.changeset/light-clocks-enter.md

@@ -0,0 +1,9 @@
+---
+"@cloudflare/local-explorer-ui": minor
+---
+
+Adds the tab definition for the table explorer.
+
+This serves as another stepping stone for adding the complete data studio to the local explorer.
+
+This is a WIP experimental feature.

fixtures/additional-modules/package.json

@@ -14,6 +14,7 @@
 		"@cloudflare/eslint-config-shared": "workspace:*",
 		"@cloudflare/workers-tsconfig": "workspace:*",
 		"@cloudflare/workers-types": "catalog:default",
+		"@fixture/shared": "workspace:*",
 		"typescript": "catalog:default",
 		"undici": "catalog:default",
 		"vitest": "catalog:default",

fixtures/additional-modules/test/index.test.ts

@@ -3,6 +3,7 @@ import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { removeDir } from "@fixture/shared/src/fs-helpers";
 import { afterAll, assert, beforeAll, describe, test, vi } from "vitest";
 import { unstable_startWorker } from "wrangler";
 import { wranglerEntryPath } from "../../shared/src/run-wrangler-long-lived";
@@ -41,21 +42,7 @@ describe("find_additional_modules dev", () => {
 	});
 	afterAll(async () => {
 		await worker.dispose();
-		try {
-			await fs.rm(tmpDir, { recursive: true, force: true });
-		} catch (e) {
-			// It seems that Windows doesn't let us delete this, with errors like:
-			//
-			// Error: EBUSY: resource busy or locked, rmdir 'C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ'
-			// ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
-			// Serialized Error: {
-			// 	"code": "EBUSY",
-			// 	"errno": -4082,
-			// 	"path": "C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ",
-			// 	"syscall": "rmdir",
-			// }
-			console.error(e);
-		}
+		removeDir(tmpDir, { fireAndForget: true });
 	});
 
 	test("supports bundled modules", async ({ expect }) => {
@@ -141,9 +128,7 @@ describe("find_additional_modules deploy", () => {
 	beforeAll(async () => {
 		tmpDir = await getTmpDir();
 	});
-	afterAll(async () => {
-		await fs.rm(tmpDir, { recursive: true, force: true });
-	});
+	afterAll(async () => await removeDir(tmpDir, { fireAndForget: true }));
 
 	test("doesn't bundle additional modules", async ({ expect }) => {
 		const outDir = path.join(tmpDir, "out");

fixtures/interactive-dev-tests/tests/index.test.ts

@@ -6,6 +6,7 @@ import rl from "node:readline";
 import stream from "node:stream";
 import { setTimeout } from "node:timers/promises";
 import { stripVTControlCharacters } from "node:util";
+import { removeDir } from "@fixture/shared/src/fs-helpers";
 import { fetch } from "undici";
 /* eslint-disable workers-sdk/no-vitest-import-expect -- complex test with .each patterns */
 import {
@@ -380,22 +381,8 @@ if (process.platform === "win32") {
 					});
 				}
 			});
-			afterAll(async () => {
-				try {
-					fs.rmSync(tmpDir, { recursive: true, force: true });
-				} catch (e) {
-					// It seems that Windows doesn't let us delete this, with errors like:
-					//
-					// Error: EBUSY: resource busy or locked, rmdir 'C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ'
-					// ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
-					// Serialized Error: {
-					// 	"code": "EBUSY",
-					// 	"errno": -4082,
-					// 	"path": "C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ",
-					// 	"syscall": "rmdir",
-					// }
-					console.error(e);
-				}
+			afterAll(() => {
+				removeDir(tmpDir, { fireAndForget: true });
 			});
 
 			it("should print rebuild containers hotkey", async () => {
@@ -560,22 +547,8 @@ if (process.platform === "win32") {
 					}
 				});
 
-				afterAll(async () => {
-					try {
-						fs.rmSync(tmpDir, { recursive: true, force: true });
-					} catch (e) {
-						// It seems that Windows doesn't let us delete this, with errors like:
-						//
-						// Error: EBUSY: resource busy or locked, rmdir 'C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ'
-						// ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
-						// Serialized Error: {
-						// 	"code": "EBUSY",
-						// 	"errno": -4082,
-						// 	"path": "C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ",
-						// 	"syscall": "rmdir",
-						// }
-						console.error(e);
-					}
+				afterAll(() => {
+					removeDir(tmpDir, { fireAndForget: true });
 				});
 
 				it("should allow quitting while the image is building", async () => {
@@ -675,22 +648,8 @@ if (process.platform === "win32") {
 					});
 				}
 			});
-			afterAll(async () => {
-				try {
-					fs.rmSync(tmpDir, { recursive: true, force: true });
-				} catch (e) {
-					// It seems that Windows doesn't let us delete this, with errors like:
-					//
-					// Error: EBUSY: resource busy or locked, rmdir 'C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ'
-					// ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
-					// Serialized Error: {
-					// 	"code": "EBUSY",
-					// 	"errno": -4082,
-					// 	"path": "C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ",
-					// 	"syscall": "rmdir",
-					// }
-					console.error(e);
-				}
+			afterAll(() => {
+				removeDir(tmpDir, { fireAndForget: true });
 			});
 
 			it("should print build logs for all the containers", async () => {
@@ -837,22 +796,8 @@ if (process.platform === "win32") {
 						});
 					}
 				});
-				afterAll(async () => {
-					try {
-						fs.rmSync(tmpDir, { recursive: true, force: true });
-					} catch (e) {
-						// It seems that Windows doesn't let us delete this, with errors like:
-						//
-						// Error: EBUSY: resource busy or locked, rmdir 'C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ'
-						// ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
-						// Serialized Error: {
-						// 	"code": "EBUSY",
-						// 	"errno": -4082,
-						// 	"path": "C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ",
-						// 	"syscall": "rmdir",
-						// }
-						console.error(e);
-					}
+				afterAll(() => {
+					removeDir(tmpDir, { fireAndForget: true });
 				});
 
 				it("should be able to interact with both workers, rebuild the containers with the hotkey and all containers should be cleaned up at the end", async () => {

fixtures/shared/package.json

@@ -3,6 +3,7 @@
 	"private": true,
 	"description": "Shared fixtures for testing",
 	"devDependencies": {
+		"@cloudflare/workers-utils": "workspace:*",
 		"wrangler": "workspace:*"
 	},
 	"volta": {

fixtures/shared/src/fs-helpers.ts

@@ -0,0 +1,3 @@
+// Re-exported so that fixtures can import from `@fixture/shared/src/fs-helpers`
+// without each fixture needing a direct dependency on `@cloudflare/workers-utils`.
+export { removeDir, removeDirSync } from "@cloudflare/workers-utils";

fixtures/wildcard-modules/package.json

@@ -14,6 +14,7 @@
 		"@cloudflare/eslint-config-shared": "workspace:*",
 		"@cloudflare/workers-tsconfig": "workspace:*",
 		"@cloudflare/workers-types": "catalog:default",
+		"@fixture/shared": "workspace:*",
 		"undici": "catalog:default",
 		"wrangler": "workspace:*"
 	},

fixtures/wildcard-modules/test/index.test.ts

@@ -4,6 +4,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { setTimeout } from "node:timers/promises";
+import { removeDir } from "@fixture/shared/src/fs-helpers";
 import { fetch } from "undici";
 import { afterAll, assert, beforeAll, describe, test } from "vitest";
 import {
@@ -55,21 +56,7 @@ describe("wildcard imports: dev", () => {
 	});
 	afterAll(async () => {
 		await worker.stop();
-		try {
-			await fs.rm(tmpDir, { recursive: true, force: true });
-		} catch (e) {
-			// It seems that Windows doesn't let us delete this, with errors like:
-			//
-			// Error: EBUSY: resource busy or locked, rmdir 'C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ'
-			// ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
-			// Serialized Error: {
-			// 	"code": "EBUSY",
-			// 	"errno": -4082,
-			// 	"path": "C:\Users\RUNNER~1\AppData\Local\Temp\wrangler-modules-pKJ7OQ",
-			// 	"syscall": "rmdir",
-			// }
-			console.error(e);
-		}
+		removeDir(tmpDir, { fireAndForget: true });
 	});
 
 	test("supports bundled modules", async ({ expect }) => {
@@ -152,8 +139,8 @@ describe("wildcard imports: deploy", () => {
 	beforeAll(async () => {
 		tmpDir = await getTmpDir();
 	});
-	afterAll(async () => {
-		await fs.rm(tmpDir, { recursive: true, force: true });
+	afterAll(() => {
+		removeDir(tmpDir, { fireAndForget: true });
 	});
 
 	test("bundles wildcard modules", async ({ expect }) => {

packages/create-cloudflare/e2e/helpers/index.ts

@@ -48,10 +48,11 @@ const testProjectDir = (suite: string, test: string) => {
 
 			realpathSync(mkdtempSync(nodePath.join(tmpdir(), `c3-tests-${suite}`)));
 			const filepath = getPath();
+			// eslint-disable-next-line workers-sdk/no-direct-recursive-rm -- see log-stream.ts for rationale
 			rmSync(filepath, {
 				recursive: true,
 				force: true,
-				maxRetries: 10,
+				maxRetries: 5,
 				retryDelay: 100,
 			});
 		} catch (e) {

packages/create-cloudflare/e2e/helpers/log-stream.ts

@@ -20,9 +20,19 @@ export function createTestLogStream(task: RunnerTask) {
 
 export function recreateLogFolder(suite: RunnerTestSuite) {
 	// Clean the old folder if exists (useful for dev)
+	//
+	// Note: this is intentionally inlined rather than importing `removeDirSync`
+	// from `@cloudflare/workers-utils`. That package's barrel export pulls in CJS
+	// dependencies (e.g. `xdg-app-paths`) that break when Vite bundles the vitest
+	// config (which imports this file) into ESM — the shimmed `require()` calls
+	// throw "Dynamic require of 'path' is not supported".
+	// Keep aligned with `removeDirSync()` in `packages/workers-utils/src/fs-helpers.ts`.
+	// eslint-disable-next-line workers-sdk/no-direct-recursive-rm
 	rmSync(getLogPath(suite), {
 		recursive: true,
 		force: true,
+		maxRetries: 5,
+		retryDelay: 100,
 	});
 
 	mkdirSync(getLogPath(suite), { recursive: true });

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

@@ -1,5 +1,5 @@
 import { execSync } from "node:child_process";
-import fs, { readFileSync } from "node:fs";
+import fs from "node:fs";
 import { basename, join, resolve } from "node:path";
 import { detectPackageManager } from "helpers/packageManagers";
 // eslint-disable-next-line workers-sdk/no-vitest-import-expect -- e2e test with complex patterns
@@ -188,10 +188,11 @@ describe("Create Cloudflare CLI", () => {
 					expect(output).toContain(`lang TypeScript`);
 					expect(output).toContain(`no deploy`);
 				} finally {
+					// eslint-disable-next-line workers-sdk/no-direct-recursive-rm -- see e2e/helpers/log-stream.ts for rationale
 					fs.rmSync(existingFilePath, {
 						recursive: true,
 						force: true,
-						maxRetries: 10,
+						maxRetries: 5,
 						retryDelay: 100,
 					});
 				}
@@ -257,7 +258,7 @@ describe("Create Cloudflare CLI", () => {
 				// underlying issue appears to be with the packages pinned in
 				// the template - not whether or not the settings.json file is
 				// created
-				expect(readFileSync(`${project.path}/.vscode/settings.json`, "utf8"))
+				expect(fs.readFileSync(`${project.path}/.vscode/settings.json`, "utf8"))
 					.toMatchInlineSnapshot(`
 					"{
 						"files.associations": {

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

@@ -167,9 +167,6 @@ function getFrameworkTestConfig(pm: string): NamedFrameworkTestConfig[] {
 			},
 			nodeCompat: false,
 			flags: ["--style", "sass"],
-			// TODO: currently the Angular tests are failing with `URL with hostname "localhost" is not allowed.`
-			//       we need to investigate this so that we can un-quarantine the Angular tests
-			quarantine: true,
 		},
 		{
 			name: "angular:workers",
@@ -189,9 +186,6 @@ function getFrameworkTestConfig(pm: string): NamedFrameworkTestConfig[] {
 			},
 			nodeCompat: false,
 			flags: ["--style", "sass"],
-			// TODO: currently the Angular tests are failing with `URL with hostname "localhost" is not allowed.`
-			//       we need to investigate this so that we can un-quarantine the Angular tests
-			quarantine: true,
 		},
 		{
 			name: "gatsby:pages",
@@ -790,9 +784,6 @@ function getExperimentalFrameworkTestConfig(
 			nodeCompat: false,
 			flags: ["--style", "sass"],
 			verifyTypes: false,
-			// TODO: currently the Angular tests are failing with `URL with hostname "localhost" is not allowed.`
-			//       we need to investigate this so that we can un-quarantine the Angular tests
-			quarantine: true,
 		},
 		{
 			name: "nuxt:workers",

packages/create-cloudflare/src/helpers/packageManagers.ts

@@ -105,7 +105,20 @@ export const rectifyPmMismatch = async (ctx: C3Context) => {
 
 	const nodeModulesPath = nodePath.join(ctx.project.path, "node_modules");
 	if (existsSync(nodeModulesPath)) {
-		rmSync(nodeModulesPath, { recursive: true });
+		// Note: this is intentionally inlined rather than importing `removeDirSync`
+		// from `@cloudflare/workers-utils`. That package's barrel export pulls in CJS
+		// dependencies (e.g. `xdg-app-paths`) that break when Vite bundles code into
+		// ESM — the shimmed `require()` calls throw "Dynamic require of 'path' is not
+		// supported". While the production build (esbuild → CJS) would handle this
+		// fine, the e2e tests import this file through Vitest which uses Vite's bundler.
+		// Keep aligned with `removeDirSync()` in `packages/workers-utils/src/fs-helpers.ts`.
+		// eslint-disable-next-line workers-sdk/no-direct-recursive-rm
+		rmSync(nodeModulesPath, {
+			recursive: true,
+			force: true,
+			maxRetries: 5,
+			retryDelay: 100,
+		});
 	}
 
 	const lockfilePath = nodePath.join(ctx.project.path, "package-lock.json");

packages/create-cloudflare/templates/angular/pages/templates/src/server.ts

@@ -1,6 +1,10 @@
 import { AngularAppEngine, createRequestHandler } from '@angular/ssr';
 
-const angularApp = new AngularAppEngine();
+const angularApp = new AngularAppEngine({
+	// It is safe to set allow `localhost`, so that SSR can run in local development,
+	// as, in production, Cloudflare will ensure that `localhost` is not the host.
+	allowedHosts: ['localhost'],
+});
 
 /**
  * This is a request handler used by the Angular CLI (dev-server and during build).

packages/create-cloudflare/templates/angular/workers/templates/src/server.ts

@@ -1,6 +1,10 @@
 import { AngularAppEngine, createRequestHandler } from '@angular/ssr';
 
-const angularApp = new AngularAppEngine();
+const angularApp = new AngularAppEngine({
+	// It is safe to set allow `localhost`, so that SSR can run in local development,
+	// as, in production, Cloudflare will ensure that `localhost` is not the host.
+	allowedHosts: ['localhost'],
+});
 
 /**
  * This is a request handler used by the Angular CLI (dev-server and during build).