Merge branch 'main' into cole/pipe-160-pipelines-cors

cloudflare · Jan 28, 2025 · 92e74e8 · 92e74e8
2 parents 7669912 + 12675cc
commit 92e74e8
Show file tree

Hide file tree

Showing 148 changed files with 9,020 additions and 5,584 deletions.
diff --git a/.changeset/clean-sheep-promise.md b/.changeset/clean-sheep-promise.md
diff --git a/.changeset/cuddly-wombats-decide.md b/.changeset/cuddly-wombats-decide.md
@@ -0,0 +1,6 @@
+---
+"@cloudflare/workers-shared": minor
+"wrangler": minor
+---
+
+chore: provides `run_worker_first` for Worker-script-first configuration. Deprecates `experimental_serve_directly`.
diff --git a/.changeset/lucky-jeans-relax.md b/.changeset/lucky-jeans-relax.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+fix(wrangler): handling of `process.env.NODE_ENV` in bundling mode
diff --git a/.changeset/neat-foxes-cheer.md b/.changeset/neat-foxes-cheer.md
@@ -0,0 +1,5 @@
+---
+"miniflare": patch
+---
+
+Switch to `capnp-es` over `capnp-ts`
diff --git a/.changeset/neat-needles-brush.md b/.changeset/neat-needles-brush.md
diff --git a/.changeset/nervous-jeans-obey.md b/.changeset/nervous-jeans-obey.md
diff --git a/.changeset/old-bees-design.md b/.changeset/old-bees-design.md
diff --git a/.changeset/olive-tigers-raise.md b/.changeset/olive-tigers-raise.md
diff --git a/.changeset/orange-camels-hunt_vite-plugin.md b/.changeset/orange-camels-hunt_vite-plugin.md
@@ -0,0 +1,10 @@
+---
+"@cloudflare/vite-plugin": patch
+---
+
+Add full support for `.dev.vars` files.
+
+This change makes sure that `.dev.vars` files work when the environment is specified. It also
+copies the target `.dev.vars` file (which might be environment specific, e.g. `.dev.vars.prod`)
+to the worker's dist directory so that `vite preview` can pick it up.
+The copied file will always be named `.dev.vars`.
diff --git a/.changeset/orange-camels-hunt_wrangler.md b/.changeset/orange-camels-hunt_wrangler.md
@@ -0,0 +1,9 @@
+---
+"wrangler": minor
+---
+
+Update the `unstable_getMiniflareWorkerOptions` types to always include an `env` parameter.
+
+The `unstable_getMiniflareWorkerOptions` types, when accepting a config object as the first argument,
+didn't accept a second `env` argument. The changes here make sure they do, since the `env` is still
+relevant for picking up variables from `.dev.vars` files.
diff --git a/.changeset/poor-rabbits-compete.md b/.changeset/poor-rabbits-compete.md
@@ -0,0 +1,5 @@
+---
+"@cloudflare/unenv-preset": patch
+---
+
+Remove clearImmediate and setImmediate injects
diff --git a/.changeset/popular-pigs-glow.md b/.changeset/popular-pigs-glow.md
diff --git a/.changeset/thick-bikes-teach.md b/.changeset/thick-bikes-teach.md
diff --git a/.github/workflows/test-and-check.yml b/.github/workflows/test-and-check.yml
@@ -102,15 +102,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-13]
         filter:
-          [
-            "./packages/*",
-            "./fixtures/*",
-            "./packages/vite-plugin-cloudflare/playground",
-          ]
+          - '--filter="./packages/*" --filter="./fixtures/*" --filter="./packages/vite-plugin-cloudflare/playground"'
         # Things in the tools folder are for running in CI, and so only need to run on linux
         include:
           - os: ubuntu-latest
-            filter: "./tools"
+            filter: '--filter="./tools"'
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repo
@@ -136,7 +132,7 @@ jobs:
 
       - name: Run tests
         if: steps.changes.outputs.everything_but_markdown == 'true'
-        run: pnpm run test:ci --concurrency 1 --filter=${{ matrix.filter }}
+        run: pnpm run test:ci --concurrency 1 ${{ matrix.filter }}
         env:
           TMP_CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           TMP_CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}

diff --git a/.github/workflows/validate-pr-description.yml b/.github/workflows/validate-pr-description.yml
@@ -2,10 +2,21 @@ name: Validate PR Description
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled, edited]
+    types:
+      [
+        opened,
+        synchronize,
+        reopened,
+        labeled,
+        unlabeled,
+        edited,
+        ready_for_review,
+        converted_to_draft,
+      ]
 
 jobs:
   check:
+    # Don't check the Version Packages PR
     if: github.head_ref != 'changeset-release/main'
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-add-pr
@@ -47,3 +58,4 @@ jobs:
           BODY: ${{ github.event.pull_request.body }}
           LABELS: ${{ toJson(github.event.pull_request.labels.*.name) }}
           FILES: ${{ steps.files.outputs.all }}
+          DRAFT: ${{ github.event.pull_request.draft }}
diff --git a/.prettierignore b/.prettierignore
@@ -26,6 +26,8 @@ packages/create-cloudflare/templates*/**/*.*
 packages/create-cloudflare/templates*/hello-world/**/worker-configuration.d.ts
 packages/chrome-devtools-patches/devtools-frontend
 
+packages/vitest-pool-workers/scripts/rtti/rtti.js
+
 # dist-functions are generated in the fixtures/vitest-pool-workers-examples/pages-functions-unit-integration-self folder
 dist-functions
 
@@ -45,4 +47,4 @@ fixtures/interactive-dev-tests/src/startup-error.ts
 fixtures/pages-redirected-config/build/*
 fixtures/redirected-config-worker/build/*
 
-packages/vite-plugin-cloudflare/playground/**/*.d.ts
+packages/vite-plugin-cloudflare/playground/**/*.d.ts
diff --git a/fixtures/asset-config/html-handling.test.ts b/fixtures/asset-config/html-handling.test.ts
@@ -64,7 +64,8 @@ describe.each(testSuites)("$title", ({ title, suite }) => {
 				return {
 					html_handling,
 					not_found_handling: "none",
-					serve_directly: true,
+					run_worker_first: true,
+					serve_directly: false,
 				};
 			});
 		});

diff --git a/fixtures/asset-config/redirects.test.ts b/fixtures/asset-config/redirects.test.ts
@@ -41,7 +41,8 @@ describe("[Asset Worker] `test location rewrite`", () => {
 			return {
 				html_handling: "none",
 				not_found_handling: "none",
-				serve_directly: true,
+				run_worker_first: true,
+				serve_directly: false,
 			};
 		});
 	});

diff --git a/fixtures/asset-config/url-normalization.test.ts b/fixtures/asset-config/url-normalization.test.ts
@@ -41,7 +41,8 @@ describe("[Asset Worker] `test slash normalization`", () => {
 			return {
 				html_handling: "none",
 				not_found_handling: "none",
-				serve_directly: true,
+				run_worker_first: true,
+				serve_directly: false,
 			};
 		});
 	});

diff --git a/fixtures/workers-with-assets-run-worker-first/README.md b/fixtures/workers-with-assets-run-worker-first/README.md
@@ -0,0 +1,17 @@
+# workers-assets-with-user-worker"
+
+`workers-assets-with-user-worker-run-worker-first"` is a test fixture that showcases Workers with Assets using the run_worker_first option. This particular fixture forces a user Worker to be invoked, even if it otherwise would have matched an assets request.
+
+## dev
+
+To start a dev session you can run
+
+```
+wrangler dev
+```
+
+## Run tests
+
+```
+npm run test
+```
diff --git a/...s-with-assets-serve-directly/package.json → ...with-assets-run-worker-first/package.json b/...s-with-assets-serve-directly/package.json → ...with-assets-run-worker-first/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "workers-assets-with-user-worker-serve-directly",
+	"name": "workers-assets-with-user-worker-run-worker-first",
 	"private": true,
 	"scripts": {
 		"check:type": "tsc",

diff --git a/...h-assets-serve-directly/public/index.html → ...assets-run-worker-first/public/index.html b/...h-assets-serve-directly/public/index.html → ...assets-run-worker-first/public/index.html
diff --git a/...s-with-assets-serve-directly/src/index.ts → ...with-assets-run-worker-first/src/index.ts b/...s-with-assets-serve-directly/src/index.ts → ...with-assets-run-worker-first/src/index.ts
diff --git a/...assets-serve-directly/tests/index.test.ts → ...sets-run-worker-first/tests/index.test.ts b/...assets-serve-directly/tests/index.test.ts → ...sets-run-worker-first/tests/index.test.ts
@@ -3,7 +3,7 @@ import { fetch } from "undici";
 import { afterAll, beforeAll, describe, it } from "vitest";
 import { runWranglerDev } from "../../shared/src/run-wrangler-long-lived";
 
-describe("[Workers + Assets] serve_directly false", () => {
+describe("[Workers + Assets] run_worker_first true", () => {
 	let ip: string, port: number, stop: (() => Promise<unknown>) | undefined;
 
 	beforeAll(async () => {

diff --git a/...assets-serve-directly/tests/tsconfig.json → ...sets-run-worker-first/tests/tsconfig.json b/...assets-serve-directly/tests/tsconfig.json → ...sets-run-worker-first/tests/tsconfig.json
diff --git a/...-with-assets-serve-directly/tsconfig.json → ...ith-assets-run-worker-first/tsconfig.json b/...-with-assets-serve-directly/tsconfig.json → ...ith-assets-run-worker-first/tsconfig.json
diff --git a/...-with-assets-serve-directly/wrangler.toml → ...ith-assets-run-worker-first/wrangler.toml b/...-with-assets-serve-directly/wrangler.toml → ...ith-assets-run-worker-first/wrangler.toml
@@ -1,10 +1,10 @@
 #:schema node_modules/wrangler/config-schema.json
 
-name = "worker-with-assets-serve-directly"
+name = "worker-with-assets-run-worker-first"
 main = "src/index.ts"
 compatibility_date = "2024-01-01"
 
 [assets]
 directory = "./public"
 binding="ASSETS"
-experimental_serve_directly = false
+run_worker_first = true
diff --git a/fixtures/workers-with-assets-serve-directly/README.md b/fixtures/workers-with-assets-serve-directly/README.md
diff --git a/fixtures/workers-with-assets/wrangler.toml b/fixtures/workers-with-assets/wrangler.toml
@@ -5,3 +5,4 @@ compatibility_date = "2024-01-01"
 [assets]
 directory = "./public"
 binding="ASSETS"
+experimental_serve_directly = true
diff --git a/package.json b/package.json
@@ -80,7 +80,6 @@
 		},
 		"patchedDependencies": {
 			"@cloudflare/[email protected]": "patches/@[email protected]",
-			"[email protected]": "patches/[email protected]",
 			"[email protected]": "patches/[email protected]",
 			"[email protected]": "patches/[email protected]"
 		}

diff --git a/packages/create-cloudflare/package.json b/packages/create-cloudflare/package.json
@@ -31,7 +31,7 @@
 		"dev:codemod": "node -r esbuild-register scripts/codemodDev.ts",
 		"check:lint": "eslint . --max-warnings=0",
 		"check:type": "tsc",
-		"prepublishOnly": "pnpm -w run build",
+		"prepublishOnly": "pnpm exec turbo build -F create-cloudflare",
 		"test:e2e": "vitest run --config ./vitest-e2e.config.mts",
 		"test:e2e:npm": "pnpm run build && cross-env TEST_PM=npm vitest run --config ./vitest-e2e.config.mts",
 		"test:e2e:pnpm": "pnpm run build && cross-env TEST_PM=pnpm vitest run --config ./vitest-e2e.config.mts",

diff --git a/packages/edge-preview-authenticated-proxy/CHANGELOG.md b/packages/edge-preview-authenticated-proxy/CHANGELOG.md
@@ -1,5 +1,11 @@
 # edge-preview-authenticated-proxy
 
+## 0.2.3
+
+### Patch Changes
+
+- [#7793](https://github.com/cloudflare/workers-sdk/pull/7793) [`9941219`](https://github.com/cloudflare/workers-sdk/commit/994121908de7b0537c06ed4f6bae6cb35d32521d) Thanks [@edmundhung](https://github.com/edmundhung)! - fix: ensure no body is passed when constructing a GET or HEAD request to the preview worker
+
 ## 0.2.2
 
 ### Patch Changes

diff --git a/packages/edge-preview-authenticated-proxy/package.json b/packages/edge-preview-authenticated-proxy/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "edge-preview-authenticated-proxy",
-	"version": "0.2.2",
+	"version": "0.2.3",
 	"private": true,
 	"scripts": {
 		"check:lint": "eslint . --max-warnings=0",

diff --git a/packages/miniflare/package.json b/packages/miniflare/package.json
@@ -31,7 +31,7 @@
 	],
 	"scripts": {
 		"build": "node scripts/build.mjs && pnpm run types:build",
-		"capnp:workerd": "capnpc -o ts src/runtime/config/workerd.capnp",
+		"capnp:workerd": "node scripts/build-capnp.mjs",
 		"check:lint": "eslint --max-warnings=0 \"{src,test}/**/*.ts\" \"scripts/**/*.{js,mjs}\" \"types/**/*.ts\"",
 		"check:type": "tsc",
 		"clean": "rimraf ./dist ./dist-types",
@@ -45,7 +45,6 @@
 		"@cspotcode/source-map-support": "0.8.1",
 		"acorn": "^8.8.0",
 		"acorn-walk": "^8.2.0",
-		"capnp-ts": "^0.7.0",
 		"exit-hook": "^2.2.1",
 		"glob-to-regexp": "^0.4.1",
 		"stoppable": "^1.1.0",
@@ -61,7 +60,7 @@
 		"@cloudflare/workers-shared": "workspace:*",
 		"@cloudflare/workers-types": "^4.20250121.0",
 		"@cloudflare/workflows-shared": "workspace:*",
-		"@microsoft/api-extractor": "^7.47.0",
+		"@microsoft/api-extractor": "7.49.1",
 		"@types/debug": "^4.1.7",
 		"@types/estree": "^1.0.0",
 		"@types/glob-to-regexp": "^0.4.1",
@@ -74,7 +73,7 @@
 		"@typescript-eslint/eslint-plugin": "^6.9.0",
 		"@typescript-eslint/parser": "^6.9.0",
 		"ava": "^6.0.1",
-		"capnpc-ts": "^0.7.0",
+		"capnp-es": "^0.0.7",
 		"concurrently": "^8.2.2",
 		"devalue": "^4.3.0",
 		"devtools-protocol": "^0.0.1182435",
@@ -92,6 +91,7 @@
 		"pretty-bytes": "^6.0.0",
 		"rimraf": "catalog:default",
 		"source-map": "^0.6.1",
+		"typescript": "catalog:default",
 		"which": "^2.0.2"
 	},
 	"engines": {

diff --git a/packages/miniflare/scripts/build-capnp.mjs b/packages/miniflare/scripts/build-capnp.mjs
@@ -0,0 +1,9 @@
+import { execSync } from "node:child_process";
+import { copyFileSync } from "node:fs";
+
+execSync("capnp-es node_modules/workerd/workerd.capnp -ots");
+
+copyFileSync(
+	"node_modules/workerd/workerd.ts",
+	"src/runtime/config/generated.ts"
+);
diff --git a/packages/miniflare/scripts/types.mjs b/packages/miniflare/scripts/types.mjs
@@ -148,18 +148,6 @@ function bundleTypes() {
 
 	fs.copyFileSync(indexTsPath, indexDtsPath);
 	try {
-		fs.copyFileSync(
-			path.join(pkgRoot, "src", "runtime", "config", "workerd.capnp.d.ts"),
-			path.join(
-				pkgRoot,
-				"dist-types",
-				"src",
-				"runtime",
-				"config",
-				"workerd.capnp.d.ts"
-			)
-		);
-
 		const extractorCfg = ExtractorConfig.prepare({
 			projectFolderLookupToken: pkgRoot,
 			packageJsonFullPath: path.join(pkgRoot, "package.json"),