Merge branch 'main' into joshthoward/d1-export-default-local

.changeset/bright-keys-march.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+chore: removes --experimental-versions flag, as versions is now GA.

.changeset/healthy-bags-cry.md

@@ -0,0 +1,5 @@
+---
+"create-cloudflare": minor
+---
+
+chore: remove nodejs_compat flag from basic C3 templates

.changeset/hungry-llamas-repair.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+include the top level Worker name in the parsed config structure

.changeset/nervous-scissors-suffer.md

@@ -0,0 +1,7 @@
+---
+"@cloudflare/unenv-preset": minor
+---
+
+chore(unenv-preset): drop unused .cjs files
+
+Only .mjs files are used.

.changeset/polite-goats-behave.md

@@ -0,0 +1,5 @@
+---
+"@cloudflare/vitest-pool-workers": minor
+---
+
+chore: add nodejs_compat by default in Vitest Pool Workers

.changeset/thin-pots-camp.md

@@ -0,0 +1,84 @@
+---
+"wrangler": minor
+---
+
+feat: add support for redirecting Wrangler to a generated config when running deploy-related commands
+
+This new feature is designed for build tools and frameworks to provide a deploy-specific configuration,
+which Wrangler can use instead of user configuration when running deploy-related commands.
+It is not expected that developers of Workers will need to use this feature directly.
+
+### Affected commands
+
+The commands that use this feature are:
+
+- `wrangler deploy`
+- `wrangler dev`
+- `wrangler versions upload`
+- `wrangler versions deploy`
+- `wrangler pages deploy`
+- `wrangler pages build`
+- `wrangler pages build-env`
+
+### Config redirect file
+
+When running these commands, Wrangler will look up the directory tree from the current working directory for a file at the path `.wrangler/deploy/config.json`. This file must contain only a single JSON object of the form:
+
+```json
+{ "configPath": "../../path/to/wrangler.json" }
+```
+
+When this file exists Wrangler will follow the `configPath` (relative to the `.wrangler/deploy/config.json` file) to find an alternative Wrangler configuration file to load and use as part of this command.
+
+When this happens Wrangler will display a warning to the user to indicate that the configuration has been redirected to a different file than the user's configuration file.
+
+### Custom build tool example
+
+A common approach that a build tool might choose to implement.
+
+- The user writes code that uses Cloudflare Workers resources, configured via a user `wrangler.toml` file.
+
+  ```toml
+  name = "my-worker"
+  main = "src/index.ts"
+  [[kv_namespaces]]
+  binding = "<BINDING_NAME1>"
+  id = "<NAMESPACE_ID1>"
+  ```
+
+  Note that this configuration points `main` at user code entry-point.
+
+- The user runs a custom build, which might read the `wrangler.toml` to find the entry-point:
+
+  ```bash
+  > my-tool build
+  ```
+
+- This tool generates a `dist` directory that contains both compiled code and a new deployment configuration file, but also a `.wrangler/deploy/config.json` file that redirects Wrangler to this new deployment configuration file:
+
+  ```plain
+  - dist
+    - index.js
+  	- wrangler.json
+  - .wrangler
+    - deploy
+  	  - config.json
+  ```
+
+  The `dist/wrangler.json` will contain:
+
+  ```json
+  {
+  	"name": "my-worker",
+  	"main": "./index.js",
+  	"kv_namespaces": [{ "binding": "<BINDING_NAME1>", "id": "<NAMESPACE_ID1>" }]
+  }
+  ```
+
+  And the `.wrangler/deploy/config.json` will contain:
+
+  ```json
+  {
+  	"configPath": "../../dist/wrangler.json"
+  }
+  ```

.github/version-script.js

@@ -16,7 +16,7 @@ const { execSync } = require("child_process");
 try {
 	const packageName = getArgs()[0] ?? "wrangler";
 	const packageJsonPath = `./packages/${packageName}/package.json`;
-	const pkg = JSON.parse(readFileSync(packageJsonPath));
+	const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
 	const stdout = execSync("git rev-parse --short HEAD", { encoding: "utf8" });
 	pkg.version = "0.0.0-" + stdout.trim();
 	writeFileSync(packageJsonPath, JSON.stringify(pkg, null, "\t") + "\n");

.prettierignore

@@ -40,3 +40,7 @@ templates/*/dist
 
 # This file intentionally has a syntax error
 fixtures/interactive-dev-tests/src/startup-error.ts
+
+# These are generated by the build step
+fixtures/pages-redirected-config/build/*
+fixtures/redirected-config-worker/build/*

fixtures/import-npm/package.json

@@ -7,9 +7,10 @@
 		"packages/*"
 	],
 	"scripts": {
-		"check:type": "rm -rf node_modules && npm install && npm run check:type --workspaces",
-		"test:ci": "npm install && npm run test:ci --workspaces",
-		"test:watch": "npm install && npm run test:watch --workspaces",
-		"type:tests": "rm -rf node_modules && npm install && npm run type:tests --workspaces"
+		"_clean_install": "rm -rf node_modules && npm install --no-package-lock --workspaces",
+		"check:type": "npm run check:type --workspaces",
+		"test:ci": "npm run test:ci --workspaces",
+		"test:watch": "npm run test:watch --workspaces",
+		"type:tests": "npm run type:tests --workspaces"
 	}
 }

fixtures/import-npm/turbo.json

@@ -1,11 +1,20 @@
 {
 	"extends": ["//"],
 	"tasks": {
-		"test": {
-			"dependsOn": ["wrangler#build"]
+		"_clean_install": {
+			"outputs": ["node_modules"]
+		},
+		"check:type": {
+			"dependsOn": ["_clean_install"]
+		},
+		"test:watch": {
+			"dependsOn": ["_clean_install"]
+		},
+		"type:tests": {
+			"dependsOn": ["_clean_install"]
 		},
 		"test:ci": {
-			"dependsOn": ["wrangler#build"]
+			"dependsOn": ["_clean_install", "wrangler#build"]
 		}
 	}
 }

fixtures/pages-redirected-config/.gitignore

@@ -0,0 +1,2 @@
+dist
+build

fixtures/pages-redirected-config/package.json

@@ -0,0 +1,23 @@
+{
+	"name": "pages-redirected-config",
+	"private": true,
+	"description": "",
+	"license": "ISC",
+	"author": "",
+	"main": "src/index.js",
+	"scripts": {
+		"build": "node -r esbuild-register tools/build.ts",
+		"check:type": "tsc",
+		"dev": "pnpm run build && wrangler pages dev",
+		"test:ci": "pnpm run build && vitest run"
+	},
+	"devDependencies": {
+		"@cloudflare/workers-tsconfig": "workspace:^",
+		"undici": "catalog:default",
+		"vitest": "catalog:default",
+		"wrangler": "workspace:*"
+	},
+	"volta": {
+		"extends": "../../package.json"
+	}
+}

fixtures/pages-redirected-config/src/index.js

@@ -0,0 +1,5 @@
+export default {
+	async fetch(request, env) {
+		return new Response("Generated: " + env.generated ?? false);
+	},
+};