[pull] main from cloudflare:main

.changeset/fix-remote-proxy-error-propagation.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Fix remote proxy worker not catching errors thrown by bindings during `wrangler dev`

.changeset/vpc-networks-binding.md

@@ -0,0 +1,18 @@
+---
+"wrangler": minor
+"miniflare": minor
+"@cloudflare/workers-utils": minor
+---
+
+Add `vpc_networks` binding support for routing Worker traffic through a Cloudflare Tunnel or network.
+
+```jsonc
+{
+	"vpc_networks": [
+		// Route through a specific Cloudflare Tunnel
+		{ "binding": "MY_FIRST_VPC", "tunnel_id": "<tunnel-id>" },
+		// Route through the Cloudflare One mesh network
+		{ "binding": "MY_SECOND_VPC", "network_id": "cf1:network" },
+	],
+}
+```

.github/actions/install-dependencies/action.yml

@@ -18,8 +18,6 @@ runs:
   steps:
     - name: Install pnpm
       uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
-      with:
-        version: 9.12.0
 
     - name: Install Node.js ${{ inputs.node-version }}
       uses: actions/setup-node@v4

.github/workflows/auto-assign-issues.yml

@@ -23,8 +23,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
-        with:
-          version: 9.12.0
 
       - name: Install Dependencies
         run: pnpm i -F tools --frozen-lockfile

.github/workflows/c3-e2e.yml

@@ -22,15 +22,15 @@ jobs:
         filter: ["cli", "workers", "frameworks"]
         os: [{ name: ubuntu-latest, description: Linux }]
         pm:
-          - { name: pnpm, version: "9.12.0" }
+          - { name: pnpm, version: "10.33.0" }
           - { name: npm, version: "0.0.0" }
           # The yarn tests keep failing on Linux with out of space errors, with no clear reason why. Disabling for now.
           # - { name: yarn, version: "1.0.0" }
         include:
           - os: { name: windows-latest, description: Windows }
-            pm: { name: pnpm, version: "9.12.0" }
+            pm: { name: pnpm, version: "10.33.0" }
           - os: { name: ubuntu-latest, description: Linux }
-            pm: { name: pnpm, version: "9.12.0" }
+            pm: { name: pnpm, version: "10.33.0" }
             experimental: true
     runs-on: ${{ matrix.os.name }}
     steps:

.github/workflows/e2e-local-explorer-ui.yml

@@ -0,0 +1,68 @@
+name: Local Explorer UI E2E
+
+on:
+  merge_group:
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  # We run `playwright install` manually instead
+  PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
+
+jobs:
+  test:
+    name: Local Explorer UI E2E
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3
+        id: changes
+        with:
+          filters: |
+            relevant:
+              - 'packages/local-explorer-ui/**'
+              - 'packages/miniflare/src/workers/local-explorer/**'
+              - 'fixtures/worker-with-resources/**'
+              - 'fixtures/shared/**'
+
+      - name: Install Dependencies
+        if: steps.changes.outputs.relevant == 'true'
+        uses: ./.github/actions/install-dependencies
+        with:
+          turbo-api: ${{ secrets.TURBO_API }}
+          turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+          turbo-team: ${{ secrets.TURBO_TEAM }}
+          turbo-token: ${{ secrets.TURBO_TOKEN }}
+
+      - name: Install Playwright
+        if: steps.changes.outputs.relevant == 'true'
+        run: pnpm --filter @cloudflare/local-explorer-ui playwright:install
+
+      - name: Build wrangler
+        if: steps.changes.outputs.relevant == 'true'
+        run: pnpm turbo build --filter wrangler
+
+      - name: Run Local Explorer UI E2E tests
+        if: steps.changes.outputs.relevant == 'true'
+        run: pnpm test:e2e -F @cloudflare/local-explorer-ui --log-order=stream
+        timeout-minutes: 10
+        env:
+          CI_OS: Linux
+          NODE_OPTIONS: "--max_old_space_size=8192"
+
+      - name: Upload turbo logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: turbo-runs
+          path: .turbo/runs

.oxlintrc.jsonc

@@ -184,6 +184,14 @@
 				"workers-sdk/no-unsafe-command-execution": "off",
 			},
 		},
+		// Local Explorer UI e2e tests use Playwright helpers (waitForText, waitForTableRows, etc.)
+		// as assertions, which the vitest/expect-expect rule doesn't recognise.
+		{
+			"files": ["packages/local-explorer-ui/src/__e2e__/**"],
+			"rules": {
+				"vitest/expect-expect": "off",
+			},
+		},
 		// Make sure Wrangler's version checking logic in vite-plugin-cloudflare can run properly
 		{
 			"files": ["packages/vite-plugin-cloudflare/**"],

fixtures/shared/src/run-wrangler-long-lived.ts

@@ -1,6 +1,5 @@
 import assert from "node:assert";
 import { fork } from "node:child_process";
-import events from "node:events";
 import path from "node:path";
 import treeKill from "tree-kill";
 

package.json

@@ -54,39 +54,12 @@
 		"vitest": "catalog:default"
 	},
 	"engines": {
-		"node": ">=18.20.0",
-		"pnpm": "^9.12.0"
+		"node": ">=20.0.0",
+		"pnpm": "^10.33.0"
 	},
 	"volta": {
 		"node": "20.19.3",
-		"pnpm": "9.12.0"
+		"pnpm": "10.33.0"
 	},
-	"packageManager": "pnpm@9.12.0",
-	"pnpm": {
-		"peerDependencyRules": {
-			"allowedVersions": {
-				"react": "18",
-				"react-dom": "18",
-				"@types/react": "18",
-				"@types/react-dom": "18"
-			}
-		},
-		"overrides": {
-			"@types/react-dom@18>@types/react": "^18",
-			"@types/react-tabs>@types/react": "^18",
-			"@types/react-transition-group>@types/react": "^18",
-			"@cloudflare/elements>@types/react": "^18",
-			"@types/node": "$@types/node",
-			"@types/node>undici-types": "catalog:default"
-		},
-		"patchedDependencies": {
-			"@cloudflare/component-listbox@1.10.6": "patches/@cloudflare__component-listbox@1.10.6.patch",
-			"toucan-js@4.0.0": "patches/toucan-js@4.0.0.patch",
-			"postal-mime": "patches/postal-mime.patch",
-			"youch@4.1.0-beta.10": "patches/youch@4.1.0-beta.10.patch",
-			"@netlify/build-info": "patches/@netlify__build-info.patch",
-			"buffer-equal-constant-time@1.0.1": "patches/buffer-equal-constant-time@1.0.1.patch",
-			"undici@7.24.4": "patches/undici@7.24.4.patch"
-		}
-	}
+	"packageManager": "pnpm@10.33.0"
 }

packages/local-explorer-ui/package.json

@@ -11,9 +11,13 @@
 		"dev": "concurrently -n api,ui,worker -c green,blue,orange \"openapi-ts --watch\" \"vite\" \"pnpm --filter @fixture/worker-with-resources start\"",
 		"dev:ui": "concurrently -n api,ui -c green,blue \"openapi-ts --watch\" \"vite\"",
 		"postinstall": "openapi-ts",
+		"playwright:install": "pnpm playwright install chromium",
 		"preview": "vite preview",
 		"test": "vitest",
 		"test:ci": "vitest run",
+		"pretest:e2e": "pnpm playwright:install",
+		"test:e2e": "vitest run --config vitest.config.e2e.ts",
+		"test:e2e:watch": "vitest --config vitest.config.e2e.ts",
 		"test:watch": "vitest"
 	},
 	"dependencies": {
@@ -50,6 +54,7 @@
 		"@types/react-dom": "^19.2.0",
 		"@vitejs/plugin-react": "^5.2.0",
 		"concurrently": "^9.0.0",
+		"playwright-chromium": "catalog:default",
 		"typescript": "catalog:default",
 		"vite": "catalog:default",
 		"vite-plugin-svgr": "^4.3.0",