Merge branch 'main' into james/fix-unstable_canFetch

.changeset/clean-tigers-breathe.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Avoid an unnecessary GET request during `wrangler deploy`.

.changeset/new-adults-float.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+fix console output for `wrangler d1 migrations create`

.changeset/nice-chefs-hang.md

@@ -0,0 +1,7 @@
+---
+"wrangler": minor
+---
+
+feat: Tail Consumers are now supported for Workers with assets.
+
+You can now configure `tail_consumers` in conjunction with `assets` in your `wrangler.toml` file. Read more about [Static Assets](https://developers.cloudflare.com/workers/static-assets/) and [Tail Consumers](https://developers.cloudflare.com/workers/observability/logs/tail-workers/) in the documentation.

.changeset/stale-phones-bathe.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+chore: upgrade chokidar to v4

.changeset/tame-bobcats-suffer.md

@@ -0,0 +1,5 @@
+---
+"wrangler": minor
+---
+
+Added r2 bucket info command to Wrangler. Improved formatting of r2 bucket list output

.github/actions/run-c3-e2e/action.yml

@@ -54,11 +54,12 @@ runs:
         CI_OS: ${{ runner.os }}
 
     - name: Upload Logs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: e2e-logs${{inputs.experimental && '-experimental' || ''}}-${{matrix.os}}
+        name: e2e-logs${{inputs.quarantine && '-quarantine' || ''}}${{inputs.experimental && '-experimental' || ''}}-${{runner.os}}-${{inputs.packageManager}}
         path: packages/create-cloudflare/.e2e-logs${{inputs.experimental && '-experimental' || ''}}
+        include-hidden-files: true
 
     - name: Fail if errors detected
       shell: bash

.github/pull_request_template.md

@@ -4,6 +4,10 @@ _Describe your change..._
 
 ---
 
+<!--
+The following selections do not need to be completed if this PR only contains changes to .md files
+-->
+
 - Tests
   - [ ] TODO (before merge)
   - [ ] Tests included

.github/workflows/c3-e2e-experimental.yml

@@ -3,8 +3,6 @@
 name: C3 E2E Tests (experimental)
 on:
   pull_request:
-    paths:
-      - packages/create-cloudflare/**
 
 jobs:
   e2e:
@@ -15,7 +13,6 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.pm.name }}-${{ matrix.pm.version }}
       cancel-in-progress: true
     name: ${{ format('Run experimental tests for {0}@{1} on {2}', matrix.pm.name, matrix.pm.version, matrix.os) }}
-    if: github.event.pull_request.head.repo.owner.login == 'cloudflare' && github.event.pull_request.user.login != 'dependabot[bot]'
     strategy:
       fail-fast: false
       matrix:

.github/workflows/c3-e2e.yml

@@ -3,8 +3,6 @@
 name: C3 E2E Tests
 on:
   pull_request:
-    paths:
-      - packages/create-cloudflare/**
 
 jobs:
   e2e:
@@ -15,7 +13,6 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.pm.name }}-${{ matrix.pm.version }}
       cancel-in-progress: true
     name: ${{ format('Run tests for {0}@{1} on {2}', matrix.pm.name, matrix.pm.version, matrix.os) }}
-    if: github.event.pull_request.head.repo.owner.login == 'cloudflare' && github.event.pull_request.user.login != 'dependabot[bot]'
     strategy:
       fail-fast: false
       matrix:

.github/workflows/deploy-pages-previews.yml

@@ -79,11 +79,34 @@ jobs:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           VITE_DEVTOOLS_PREVIEW_URL: ${{ env.VITE_DEVTOOLS_PREVIEW_URL }}
 
+      - name: "Comment on PR with Devtools Link"
+        if: contains(github.event.*.labels.*.name, 'preview:wrangler-devtools')
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: ${{ steps.finder.outputs.pr }}
+          message: |
+            The Wrangler DevTools preview is now live. You can access it directly at: ${{ env.VITE_DEVTOOLS_PREVIEW_URL }}/js_app
+
+            In order to test the DevTools preview in `wrangler`:
+
+            1. `npx wrangler dev`.
+            2. Hit `d` to open the DevTools in a fresh browser window.
+            3. Paste the DevTools preview URL into the address bar (keeping all existing query parameters), e.g:
+
+            ```
+            - https://devtools.devprod.cloudflare.dev/js_app?theme=systemPreferred&ws=127.0.0.1%3A9229%2Fws&domain=tester&debugger=true
+            + https://8afc7d3d.cloudflare-devtools.pages.dev/js_app?theme=systemPreferred&ws=127.0.0.1%3A9229%2Fws&domain=tester&debugger=true
+            ```
+
       - name: "Comment on PR with Workers Playground Link"
         if: contains(github.event.*.labels.*.name, 'preview:wrangler-devtools') && contains(github.event.*.labels.*.name, 'preview:workers-playground')
         uses: marocchino/sticky-pull-request-comment@v2
         with:
-          number: ${{ steps.finder.outputs.pr }}
+          header: ${{ steps.finder.outputs.pr }}
+          append: true
           message: |
-            The Wrangler DevTools and Workers Playground previews are now live. The Playground preview embeds the DevTools preview, so you can see them working together at:
+
+            ---
+
+            The Workers Playground preview is also now live. The Playground preview embeds the above DevTools preview, so you can see them working together at:
             ${{ env.PLAYGROUND_URL }}/playground

.github/workflows/issues.yml

@@ -2,7 +2,7 @@ name: Add issues to DevProd project
 
 on:
   issues:
-    types: [opened, labeled, unlabeled, transferred]
+    types: [opened, transferred]
 
 jobs:
   add-to-project:

fixtures/additional-modules/package.json

@@ -5,7 +5,7 @@
 		"build": "wrangler deploy --dry-run --outdir=dist",
 		"check:type": "tsc",
 		"deploy": "wrangler deploy",
-		"start": "wrangler dev --x-dev-env",
+		"start": "wrangler dev",
 		"test:ci": "vitest run",
 		"test:watch": "vitest",
 		"type:tests": "tsc -p ./test/tsconfig.json"

fixtures/d1-worker-app/package.json

@@ -9,7 +9,7 @@
 		"db:query": "wrangler d1 execute UPDATE_THIS_FOR_REMOTE_USE --local --command='SELECT * FROM Customers'",
 		"db:query-json": "wrangler d1 execute UPDATE_THIS_FOR_REMOTE_USE --local --command='SELECT * FROM Customers' --json",
 		"db:reset": "wrangler d1 execute UPDATE_THIS_FOR_REMOTE_USE --local --file=./schema.sql",
-		"start": "wrangler dev --x-dev-env --local"
+		"start": "wrangler dev --local"
 	},
 	"devDependencies": {
 		"wrangler": "workspace:*"

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

@@ -197,8 +197,7 @@ function getStartedWorkerdProcesses(): Process[] {
 }
 
 const devScripts = [
-	{ args: ["dev", "--x-dev-env"], expectedBody: "body" },
-	{ args: ["dev", "--no-x-dev-env"], expectedBody: "body" },
+	{ args: ["dev"], expectedBody: "body" },
 	{ args: ["pages", "dev", "public"], expectedBody: "<p>body</p>" },
 ];
 const exitKeys = [
@@ -234,7 +233,7 @@ it.runIf(RUN_IF && nodePtySupported)(
 	"hotkeys should be unregistered when the initial build fails",
 	async () => {
 		const wrangler = await startWranglerDev(
-			["dev", "--x-dev-env", "src/startup-error.ts"],
+			["dev", "src/startup-error.ts"],
 			true
 		);
 

fixtures/no-bundle-import/package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"scripts": {
 		"deploy": "wrangler deploy",
-		"start": "wrangler dev --x-dev-env",
+		"start": "wrangler dev",
 		"test:ci": "vitest run",
 		"test:watch": "vitest"
 	},

fixtures/nodejs-als-app/package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"scripts": {
 		"build": "wrangler deploy --dry-run --outdir=./dist",
-		"dev": "wrangler dev --x-dev-env",
+		"dev": "wrangler dev",
 		"test:ci": "vitest run",
 		"test:watch": "vitest"
 	},

fixtures/nodejs-hybrid-app/package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"scripts": {
 		"build": "wrangler deploy --dry-run --outdir=./dist",
-		"dev": "wrangler dev --x-dev-env",
+		"dev": "wrangler dev",
 		"test:ci": "vitest run",
 		"test:watch": "vitest"
 	},