fix(miniflare): allow mixed r2Buckets records#12952
Merged
Merged
Conversation
🦋 Changeset detectedLatest commit: aaf5769 The changes in this PR will be included in the next version bump. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Contributor
|
Codeowners approval required for this PR:
Show detailed file reviewers |
Contributor
|
✅ All changesets look good |
4 tasks
create-cloudflare
@cloudflare/kv-asset-handler
miniflare
@cloudflare/pages-shared
@cloudflare/unenv-preset
@cloudflare/vite-plugin
@cloudflare/vitest-pool-workers
@cloudflare/workers-editor-shared
wrangler
commit: |
* fix(miniflare): allow mixed r2Buckets entries * test(miniflare): strengthen mixed r2Buckets test * test(miniflare): avoid double-fail in r2Buckets test --------- Co-authored-by: CharlieHelps <charlie@charlielabs.ai>
09c7112 to
e239b49
Compare
Previously, passing an `r2Buckets` config that mixed plain string values and object entries would cause Miniflare to throw an error. Both forms are now accepted and normalised correctly.
penalosa
approved these changes
Mar 20, 2026
Contributor
|
Do other binding types have the same problem? |
Contributor
Author
@penalosa - I am investigating |
Merged
Contributor
Author
These also need updating: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Supersedes #11789 (original PR by @shellscape via charlie-labs fork). Moved to an internal branch to apply necessary updates (rebase, vitest test migration, changeset).
The
R2OptionsSchemaZod validation previously required all values in anr2Bucketsrecord to be either all strings or all objects. This prevented mixed records like:The fix collapses the two separate
z.record()branches into a singlez.record(z.union([...]))so each value is validated independently. The runtime (namespaceEntries()) already supported mixed records — this brings the schema in line.