Skip to content

Commit c9b60f7

Browse files
committed
merge main
2 parents af2484f + beed72e commit c9b60f7

File tree

881 files changed

+31402
-20711
lines changed

Some content is hidden

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

881 files changed

+31402
-20711
lines changed

.changeset/big-dogs-whistle.md

-5
This file was deleted.

.changeset/gorgeous-eagles-matter.md

-5
This file was deleted.

.changeset/nervous-days-greet.md

-5
This file was deleted.

.changeset/nice-chefs-hang.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"wrangler": minor
3+
---
4+
5+
feat: Tail Consumers are now supported for Workers with assets.
6+
7+
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/perfect-pens-work.md

-5
This file was deleted.

.github/actions/create-c3-docs-pr/action.yml

-98
This file was deleted.

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
- name: Install pnpm
1919
uses: pnpm/action-setup@v4
2020
with:
21-
version: 9.10.0
21+
version: 9.12.0
2222

2323
- name: Install Node.js ${{ inputs.node-version }}
2424
uses: actions/setup-node@v4
@@ -36,6 +36,7 @@ runs:
3636
echo TURBO_TEAM=${{ inputs.turbo-team }} >> .env
3737
echo TURBO_TOKEN=${{ inputs.turbo-token }} >> .env
3838
echo TURBO_REMOTE_CACHE_SIGNATURE_KEY=${{ inputs.turbo-signature }} >> .env
39+
echo TURBO_ENV_MODE=loose >> .env
3940
4041
- name: Install NPM Dependencies
4142
shell: bash

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

+9-23
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ inputs:
1010
quarantine:
1111
description: "Whether to run the tests in quarantine mode"
1212
required: false
13+
experimental:
14+
description: "Whether to run the tests in experimental mode"
15+
required: false
1316
framework:
1417
description: "When specified, will only run tests for this framework"
1518
required: false
@@ -19,9 +22,6 @@ inputs:
1922
apiToken:
2023
description: "The api token of the test account"
2124
required: true
22-
saveDiffs:
23-
description: "Whether to retain diffs of framework templates during run"
24-
required: true
2525

2626
runs:
2727
using: "composite"
@@ -39,41 +39,27 @@ runs:
3939
git config --global user.email [email protected]
4040
git config --global user.name 'Wrangler automated PR updater'
4141
42-
- name: Build
43-
shell: bash
44-
run: pnpm run build
45-
env:
46-
NODE_ENV: "production"
47-
CI_OS: ${{ runner.os }}
48-
49-
- name: E2E Tests
42+
- name: E2E Tests ${{inputs.experimental && '(experimental)' || ''}}
5043
id: run-e2e
5144
shell: bash
5245
run: pnpm run test:e2e --filter create-cloudflare
5346
env:
5447
CLOUDFLARE_API_TOKEN: ${{ inputs.apiToken }}
5548
CLOUDFLARE_ACCOUNT_ID: ${{ inputs.accountId }}
5649
E2E_QUARANTINE: ${{ inputs.quarantine }}
50+
E2E_EXPERIMENTAL: ${{ inputs.experimental }}
5751
FRAMEWORK_CLI_TO_TEST: ${{ inputs.framework }}
5852
TEST_PM: ${{ inputs.packageManager }}
5953
TEST_PM_VERSION: ${{ inputs.packageManagerVersion }}
60-
SAVE_DIFFS: ${{ inputs.saveDiffs }}
6154
CI_OS: ${{ runner.os }}
6255

6356
- name: Upload Logs
64-
uses: actions/upload-artifact@v3
57+
uses: actions/upload-artifact@v4
6558
if: always()
6659
with:
67-
name: e2e-logs-${{matrix.os}}
68-
path: packages/create-cloudflare/.e2e-logs
69-
70-
- name: Upload Framework Diffs
71-
if: ${{ steps.run-e2e.outcome == 'success' && inputs.saveDiffs == 'true' }}
72-
uses: actions/upload-artifact@v3
73-
with:
74-
name: e2e-framework-diffs
75-
path: packages/create-cloudflare/.e2e-diffs
76-
overwrite: true
60+
name: e2e-logs${{inputs.quarantine && '-quarantine' || ''}}${{inputs.experimental && '-experimental' || ''}}-${{runner.os}}-${{inputs.packageManager}}
61+
path: packages/create-cloudflare/.e2e-logs${{inputs.experimental && '-experimental' || ''}}
62+
include-hidden-files: true
7763

7864
- name: Fail if errors detected
7965
shell: bash

.github/dependabot.yml

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ updates:
2222
labels:
2323
- "c3"
2424
- "dependencies"
25+
- "skip-pr-description-validation"
2526
# Check for workerd & workers-types updates for Miniflare
2627
- package-ecosystem: "npm"
2728
# If you restrict the update to a directory that is not the root
@@ -43,6 +44,7 @@ updates:
4344
labels:
4445
- "miniflare"
4546
- "dependencies"
47+
- "skip-pr-description-validation"
4648
allow:
4749
- dependency-name: "workerd"
4850
- dependency-name: "@cloudflare/workers-types"

.github/pr-add-e2e-label.config.yml renamed to .github/pr-labeler.config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@ e2e:
33
- all:
44
- changed-files:
55
- any-glob-to-any-file: "packages/wrangler/e2e/**/*"
6+
7+
# add 'skip-pr-description-validation' label to Version Packages PRs
8+
skip-pr-description-validation:
9+
- all:
10+
- head-branch: "changeset-release/main"

.github/pull_request_template.md

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
## What this PR solves / how to test
1+
Fixes #[insert GH or internal issue link(s)].
22

3-
Fixes #[insert GH or internal issue number(s)].
3+
_Describe your change..._
44

5-
## Author has addressed the following
5+
---
66

77
- Tests
88
- [ ] TODO (before merge)
@@ -12,10 +12,6 @@ Fixes #[insert GH or internal issue number(s)].
1212
- [ ] I don't know
1313
- [ ] Required
1414
- [ ] Not required because:
15-
- Changeset ([Changeset guidelines](https://github.com/cloudflare/workers-sdk/blob/main/CONTRIBUTING.md#changesets))
16-
- [ ] TODO (before merge)
17-
- [ ] Changeset included
18-
- [ ] Changeset not necessary because:
1915
- Public documentation
2016
- [ ] TODO (before merge)
2117
- [ ] Cloudflare docs PR(s): <!--e.g. <https://github.com/cloudflare/cloudflare-docs/pull/>...-->
@@ -25,9 +21,3 @@ Fixes #[insert GH or internal issue number(s)].
2521
Have you read our [Contributing guide](https://github.com/cloudflare/workers-sdk/blob/main/CONTRIBUTING.md)?
2622
In particular, for non-trivial changes, please always engage on the issue or create a discussion or feature request issue first before writing your code.
2723
-->
28-
29-
<!--
30-
**Note for PR author:**
31-
We want to celebrate and highlight awesome PR review!
32-
If you think this PR received a particularly high-caliber review, please assign it the label `highlight pr review` so future reviewers can take inspiration and learn from it.
33-
-->

.github/workflows/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Github Actions
1+
# GitHub Actions
22

33
See below for a summary of this repo's Actions
44

@@ -14,7 +14,7 @@ See below for a summary of this repo's Actions
1414
- Builds all the packages.
1515
- Runs formatting, linting and type checks.
1616
- Runs fixture tests, Wrangler unit tests, C3 unit tests, Miniflare unit tests, and ESLint + Prettier checks.
17-
- Adds the PR to a Github project
17+
- Adds the PR to a GitHub project
1818

1919
### E2E tests (e2e.yml)
2020

@@ -62,7 +62,7 @@ See below for a summary of this repo's Actions
6262
- Triggers
6363
- Updates to issues.
6464
- Actions
65-
- Add the issue to a Github project.
65+
- Add the issue to a GitHub project.
6666

6767
### Generate changesets for dependabot PRs (c3-dependabot-versioning-prs.yml and miniflare-dependabot-versioning-prs.yml)
6868

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
generate-changeset:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-22.04
1010
if: |
1111
github.event.pull_request.user.login == 'dependabot[bot]'
1212
steps:

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

-81
This file was deleted.

0 commit comments

Comments
 (0)