add @cloudflare/ scope to all private packages and rename root package (#10685)

dario-piotrowicz · web-flow · commit 98a86171786b · 2025-09-22T15:14:04.000+01:00
* add `@cloudflare/` scope to all private packages and rename root package

* move `::group::` inside then

* update blob and fixtures ignoring

* revert incorrect `::group::` change

* use `@cloudflare/vite-plugin-e2e-` as suggested in PR

* update import-example fixture package name
diff --git a/fixtures/import-npm/packages/import-example/package.json b/fixtures/import-npm/packages/import-example/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "import-example",
+	"name": "@cloudflare/import-npm-fixture-import-example",
 	"private": true,
 	"description": "",
 	"author": "",
diff --git a/lint-turbo.mjs b/lint-turbo.mjs
@@ -8,7 +8,7 @@ function readJson(filePath) {
 }
 
 const listResult = execSync(
-	"pnpm --filter=!wrangler-root list --recursive --depth -1 --parseable"
+	"pnpm --filter=!@cloudflare/workers-sdk list --recursive --depth -1 --parseable"
 );
 const paths = listResult.toString().trim().split("\n");
 for (const p of paths) {
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "wrangler-root",
+	"name": "@cloudflare/workers-sdk",
 	"version": "0.0.0",
 	"private": true,
 	"description": "Monorepo for wrangler and associated packages",
@@ -11,11 +11,12 @@
 	"author": "wrangler@cloudflare.com",
 	"scripts": {
 		"build": "dotenv -- turbo build",
-		"check": "pnpm check:fixtures && pnpm check:deployments && node lint-turbo.mjs && dotenv -- turbo check:lint check:type check:format type:tests",
+		"check": "pnpm check:fixtures && pnpm check:private-packages && pnpm check:deployments && node lint-turbo.mjs && dotenv -- turbo check:lint check:type check:format type:tests",
 		"check:deployments": "node -r esbuild-register tools/deployments/deploy-non-npm-packages.ts check",
 		"check:fixtures": "node -r esbuild-register tools/deployments/validate-fixtures.ts",
 		"check:format": "prettier . --check --ignore-unknown",
 		"check:lint": "dotenv -- turbo check:lint",
+		"check:private-packages": "node -r esbuild-register tools/deployments/validate-private-packages.ts",
 		"check:type": "dotenv -- turbo check:type type:tests",
 		"dev": "dotenv -- turbo dev",
 		"fix": "dotenv -- turbo check:lint -- --fix && pnpm run prettify",
diff --git a/packages/devprod-status-bot/package.json b/packages/devprod-status-bot/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "devprod-status-bot",
+	"name": "@cloudflare/devprod-status-bot",
 	"version": "1.2.1",
 	"private": true,
 	"scripts": {
diff --git a/packages/edge-preview-authenticated-proxy/package.json b/packages/edge-preview-authenticated-proxy/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "edge-preview-authenticated-proxy",
+	"name": "@cloudflare/edge-preview-authenticated-proxy",
 	"version": "0.2.4",
 	"private": true,
 	"scripts": {
diff --git a/packages/format-errors/package.json b/packages/format-errors/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "format-errors",
+	"name": "@cloudflare/format-errors",
 	"version": "0.0.5",
 	"private": true,
 	"scripts": {
diff --git a/packages/playground-preview-worker/package.json b/packages/playground-preview-worker/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "playground-preview-worker",
+	"name": "@cloudflare/playground-preview-worker",
 	"version": "0.1.6",
 	"private": true,
 	"scripts": {
diff --git a/packages/quick-edit-extension/package.json b/packages/quick-edit-extension/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "quick-edit-extension",
+	"name": "@cloudflare/quick-edit-extension",
 	"displayName": "Cloudflare Logic",
 	"version": "0.0.1",
 	"private": true,
diff --git a/packages/turbo-r2-archive/package.json b/packages/turbo-r2-archive/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "turbo-r2-archive",
+	"name": "@cloudflare/turbo-r2-archive",
 	"version": "0.0.4",
 	"private": true,
 	"description": "TurboRepo API Compliant Remote Caching w/ Cloudflare Workers using R2",
diff --git a/packages/vite-plugin-cloudflare/e2e/fixtures/basic/package.json b/packages/vite-plugin-cloudflare/e2e/fixtures/basic/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "cloudflare-vite-e2e-basic",
+	"name": "@cloudflare/vite-plugin-e2e-basic",
 	"version": "0.0.0",
 	"private": true,
 	"type": "module",
diff --git a/packages/vite-plugin-cloudflare/e2e/fixtures/dynamic/package.json b/packages/vite-plugin-cloudflare/e2e/fixtures/dynamic/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "cloudflare-vite-e2e-dynamic",
+	"name": "@cloudflare/vite-plugin-e2e-dynamic",
 	"version": "0.0.0",
 	"private": true,
 	"type": "module",
diff --git a/packages/vite-plugin-cloudflare/e2e/fixtures/invalid-worker-environment-options/package.json b/packages/vite-plugin-cloudflare/e2e/fixtures/invalid-worker-environment-options/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@vite-plugin-cloudflare-e2e/invalid-worker-environment-options",
+	"name": "@cloudflare/vite-plugin-e2e-invalid-worker-environment-options",
 	"private": true,
 	"type": "module",
 	"scripts": {
diff --git a/packages/vite-plugin-cloudflare/e2e/fixtures/no-wrangler-config-for-auxiliary-worker/package.json b/packages/vite-plugin-cloudflare/e2e/fixtures/no-wrangler-config-for-auxiliary-worker/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@vite-plugin-cloudflare-e2e/no-wrangler-config-for-auxiliary-worker",
+	"name": "@cloudflare/vite-plugin-e2e-no-wrangler-config-for-auxiliary-worker",
 	"version": "0.0.0",
 	"private": true,
 	"type": "module",
diff --git a/packages/vite-plugin-cloudflare/e2e/fixtures/no-wrangler-config/package.json b/packages/vite-plugin-cloudflare/e2e/fixtures/no-wrangler-config/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@vite-plugin-cloudflare-e2e/no-wrangler-config",
+	"name": "@cloudflare/vite-plugin-e2e-no-wrangler-config",
 	"version": "0.0.0",
 	"private": true,
 	"type": "module",
diff --git a/packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings/package.json b/packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "cloudflare-vite-e2e-remote-bindings",
+	"name": "@cloudflare/vite-plugin-e2e-remote-bindings",
 	"version": "0.0.0",
 	"private": true,
 	"type": "module",
diff --git a/packages/workers-playground/package.json b/packages/workers-playground/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "workers-playground",
+	"name": "@cloudflare/workers-playground",
 	"version": "0.2.5",
 	"private": true,
 	"type": "module",
diff --git a/tools/deployments/__tests__/deploy-non-npm-packages.test.ts b/tools/deployments/__tests__/deploy-non-npm-packages.test.ts
@@ -98,13 +98,13 @@ describe("findDeployablePackageNames()", () => {
 		expect(findDeployablePackageNames()).toMatchInlineSnapshot(`
 			Set {
 			  "@cloudflare/chrome-devtools-patches",
-			  "devprod-status-bot",
-			  "edge-preview-authenticated-proxy",
-			  "format-errors",
-			  "playground-preview-worker",
+			  "@cloudflare/devprod-status-bot",
+			  "@cloudflare/edge-preview-authenticated-proxy",
+			  "@cloudflare/format-errors",
+			  "@cloudflare/playground-preview-worker",
 			  "@cloudflare/quick-edit",
-			  "turbo-r2-archive",
-			  "workers-playground",
+			  "@cloudflare/turbo-r2-archive",
+			  "@cloudflare/workers-playground",
 			  "@cloudflare/workers-shared",
 			  "@cloudflare/workflows-shared",
 			}
diff --git a/tools/deployments/__tests__/validate-changesets.test.ts b/tools/deployments/__tests__/validate-changesets.test.ts
@@ -34,14 +34,14 @@ describe("findPackageNames()", () => {
 				"@cloudflare/containers-shared",
 				"@cloudflare/vite-plugin",
 				"create-cloudflare",
-				"devprod-status-bot",
-				"edge-preview-authenticated-proxy",
-				"format-errors",
+				"@cloudflare/devprod-status-bot",
+				"@cloudflare/edge-preview-authenticated-proxy",
+				"@cloudflare/format-errors",
 				"miniflare",
-				"playground-preview-worker",
+				"@cloudflare/playground-preview-worker",
 				"solarflare-theme",
-				"turbo-r2-archive",
-				"workers-playground",
+				"@cloudflare/turbo-r2-archive",
+				"@cloudflare/workers-playground",
 				"wrangler",
 			])
 		);
diff --git a/tools/deployments/validate-private-packages.ts b/tools/deployments/validate-private-packages.ts
@@ -0,0 +1,73 @@
+import { readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { glob } from "glob";
+import type { PackageJSON } from "./validate-fixtures";
+
+if (require.main === module) {
+	console.log("::group::Checking package names");
+	checkPrivatePackageScopes()
+		.then((errors) => {
+			if (errors.length > 0) {
+				console.error(
+					"::error::Package names checks:" + errors.map((e) => `\n- ${e}`)
+				);
+			}
+			console.log("::endgroup::");
+			process.exit(errors.length > 0 ? 1 : 0);
+		})
+		.catch((error) => {
+			console.log("::endgroup::");
+			console.error("An unexpected error occurred", error);
+			process.exit(1);
+		});
+}
+
+async function getPrivatePackageJsons() {
+	const packageJsonPaths = await glob("**/package.json", {
+		cwd: resolve(__dirname, "../../"),
+		ignore: [
+			// We are not interested in dependencies
+			"**/node_modules/**",
+			// The package.jsons in the fixtures directory use the `@fixture/` scope
+			// TODO: consider if we should use the `@cloudflare/` scope instead
+			"fixtures/**",
+			// C3 template package.jsons have <TBD> names that are populated by C3 during the app creation
+			"packages/create-cloudflare/templates/**",
+			// The package.jsons in the vite-plugin playground use the `@playground/` scope
+			// TODO: consider if we should use the `@cloudflare/` scope instead
+			"packages/vite-plugin-cloudflare/playground/**",
+		],
+	});
+	return (
+		packageJsonPaths
+			.map((packageJson) => {
+				const resolved = resolve(packageJson);
+				return {
+					dir: dirname(resolved),
+					packageJson: JSON.parse(
+						readFileSync(packageJson, "utf-8")
+					) as PackageJSON,
+				};
+			})
+			// We are only interested in private packages
+			.filter(({ packageJson }) => packageJson.private)
+	);
+}
+
+/**
+ * Ensures that private packages are all scoped to `@cloudflare/`.
+ */
+async function checkPrivatePackageScopes(): Promise<string[]> {
+	const relevantPackageJsons = await getPrivatePackageJsons();
+	const errors: string[] = [];
+	for (const { dir, packageJson } of relevantPackageJsons) {
+		console.log(`- ${dir}`);
+
+		if (!packageJson.name.startsWith("@cloudflare/")) {
+			errors.push(
+				`Private package in directory "${dir}" has a name that does not start with "@cloudflare/". Please rename it to start with "@cloudflare/".`
+			);
+		}
+	}
+	return errors;
+}
diff --git a/tools/package.json b/tools/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "tools",
+	"name": "@cloudflare/tools",
 	"private": true,
 	"description": "Tooling for this monorepo CI",
 	"scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "import-example",`
	`2`	`+ "name": "@cloudflare/import-npm-fixture-import-example",`
`3`	`3`	`"private": true,`
`4`	`4`	`"description": "",`
`5`	`5`	`"author": "",`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function readJson(filePath) {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`const listResult = execSync(`
`11`		`- "pnpm --filter=!wrangler-root list --recursive --depth -1 --parseable"`
	`11`	`+ "pnpm --filter=!@cloudflare/workers-sdk list --recursive --depth -1 --parseable"`
`12`	`12`	`);`
`13`	`13`	`const paths = listResult.toString().trim().split("\n");`
`14`	`14`	`for (const p of paths) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "devprod-status-bot",`
	`2`	`+ "name": "@cloudflare/devprod-status-bot",`
`3`	`3`	`"version": "1.2.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "edge-preview-authenticated-proxy",`
	`2`	`+ "name": "@cloudflare/edge-preview-authenticated-proxy",`
`3`	`3`	`"version": "0.2.4",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "format-errors",`
	`2`	`+ "name": "@cloudflare/format-errors",`
`3`	`3`	`"version": "0.0.5",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "playground-preview-worker",`
	`2`	`+ "name": "@cloudflare/playground-preview-worker",`
`3`	`3`	`"version": "0.1.6",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "quick-edit-extension",`
	`2`	`+ "name": "@cloudflare/quick-edit-extension",`
`3`	`3`	`"displayName": "Cloudflare Logic",`
`4`	`4`	`"version": "0.0.1",`
`5`	`5`	`"private": true,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "turbo-r2-archive",`
	`2`	`+ "name": "@cloudflare/turbo-r2-archive",`
`3`	`3`	`"version": "0.0.4",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "TurboRepo API Compliant Remote Caching w/ Cloudflare Workers using R2",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "cloudflare-vite-e2e-basic",`
	`2`	`+ "name": "@cloudflare/vite-plugin-e2e-basic",`
`3`	`3`	`"version": "0.0.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"type": "module",`