Skip to content

Commit 1a8010b

Browse files
authored
Merge branch 'main' into push-pvxzxmsqszsk
2 parents 0cf6456 + 28ecf85 commit 1a8010b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+492
-257
lines changed

.changeset/shaggy-frogs-tap.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
Cap the number of errors and warnings for bulk KV put to avoid consuming too much memory

.changeset/tangy-ghosts-rule.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@cloudflare/workers-shared": patch
3+
---
4+
5+
Handle next apps hosted at a path other than the root when blocking vulnerable non-image requests

.changeset/thin-grapes-rescue.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
Better messaging for account owned tokens in `wrangler whoami`

.github/pr-labeler.config.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/README.md

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,21 @@ See below for a summary of this repo's Actions
1010

1111
- Triggers
1212
- Updates to PRs.
13+
- PRs in the merge queue.
1314
- Actions
1415
- Builds all the packages.
1516
- Runs formatting, linting and type checks.
1617
- Runs fixture tests, Wrangler unit tests, C3 unit tests, Miniflare unit tests, and ESLint + Prettier checks.
1718
- Adds the PR to a GitHub project
19+
- Makes sure that Wrangler's warning for old Node.js versions works.
1820

1921
### E2E tests (e2e.yml)
2022

2123
- Triggers
22-
- Commits merged to the `changeset-release/main` branch (i.e. on "Version Packages" PRs).
23-
- Updates to PRs, on the Cloudflare fork, with the `e2e` label applied.
24-
- Actions
25-
- Runs the E2E tests for Wrangler.
26-
- **If you're making a change that feels particularly risky, make sure you add the `e2e` label to get early warning of E2E test failures.**
27-
28-
## Test old Node.js version (test-old-node-error.yml)
29-
30-
- Triggers
31-
- Commits merged to the `changeset-release/main` branch.
24+
- Updates to PRs on the Cloudflare fork.
25+
- PRs in the merge queue.
3226
- Actions
33-
- Makes sure that Wrangler's warning for old Node.js versions works.
27+
- Runs the E2E tests for Wrangler & Vite.
3428

3529
## Deploy Pages Previews (deploy-pages-preview.yml)
3630

@@ -47,7 +41,7 @@ See below for a summary of this repo's Actions
4741
- Actions
4842
- Runs integrations tests to ensure the behaviour of the Worker powering the Workers Playground.
4943

50-
## Create Pull Request Prerelease (create-pullrequest-prerelease.yml)
44+
## Create Pull Request Prerelease (prerelease.yml)
5145

5246
- Triggers
5347
- Updates to PRs.
@@ -92,35 +86,11 @@ See below for a summary of this repo's Actions
9286
- Public packages are deployed to npm
9387
- Private packages will run their `deploy` script, if they have one.
9488

95-
## Product-specific branch actions
96-
97-
### D1 (d1.yml)
98-
99-
- Triggers
100-
- Commits merged to the `d1` branch, on the Cloudflare fork.
101-
- Actions
102-
- Publishes the `wrangler` package to npm under the `d1` dist-tag.
103-
10489
## C3 related actions
10590

10691
### C3 E2E Tests (c3-e2e.yml)
10792

10893
- Triggers
109-
- Commits merged to the `changeset-release/main` branch (i.e. on "Version Packages" PRs).
110-
- Updates to PRs, on the Cloudflare fork, with the `c3-e2e` label applied.
94+
- Updates to PRs.
11195
- Actions
11296
- Runs the E2E tests for C3.
113-
114-
### C3 E2E (Quarantine) (c3-e2e-quarantine.yml) ⚠️
115-
116-
- Triggers
117-
- 3AM every day
118-
- Actions
119-
- Runs the _quarantined_ E2E tests for C3. It is expected to sometimes fail.
120-
121-
### C3 E2E Tests (Dependabot) (c3-e2e-dependabot.yml)
122-
123-
- Triggers
124-
- Updates to PRs, by the dependabot user, which touch c3-frameworks-update changesets.
125-
- Actions
126-
- Runs the all the C3 E2E (including quarantined) tests for the framework that was updated.

.github/workflows/c3-dependabot-versioning-prs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ on:
44
paths:
55
- "packages/create-cloudflare/src/frameworks/package.json"
66

7+
permissions:
8+
# content:write permission needed to update add changesets to dependabot PRs
9+
# (see tools/dependabot/generate-dependabot-pr-changesets.ts)
10+
contents: write
11+
712
jobs:
813
generate-changeset:
914
runs-on: ubuntu-22.04

.github/workflows/c3-e2e.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ on:
33
merge_group:
44
pull_request:
55

6+
permissions:
7+
contents: read
8+
69
env:
710
# TODO: switch back to 20.x onces [email protected] includes a fix for https://github.com/nodejs/node/issues/57869
811
NODE_VERSION: 22

.github/workflows/changesets.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
branches:
66
- main
77

8+
permissions:
9+
contents: read
10+
# note: no write permissions are needed since the workflow uses GH_ACCESS_TOKEN instead of GITHUB_TOKEN
11+
812
jobs:
913
release:
1014
if: ${{ github.repository_owner == 'cloudflare' }}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ on:
2020
pull_request:
2121
types: [synchronize, opened, reopened, labeled, unlabeled]
2222

23+
permissions:
24+
contents: read
25+
# pull-request:write permission needed so that the workflow can comment on PRs
26+
pull-requests: write
27+
2328
jobs:
2429
deploy-pages-projects:
2530
# Only run this on PRs that are for the "cloudflare" org and not "from" `main`

.github/workflows/e2e-project-cleanup.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
# This workflow cleans up any leftover projects created by e2e runs.
22

33
name: E2E Project Cleanup
4+
45
on:
56
workflow_dispatch:
67
schedule:
78
- cron: "0 3 * * *" # Run at 3am each day
9+
10+
permissions:
11+
contents: read
12+
813
jobs:
914
cleanup:
1015
timeout-minutes: 30

0 commit comments

Comments
 (0)