[wrangler] fix: propagate zone from unstable_getMiniflareWorkerOptions so vite dev outbound CF-Worker reflects dev.host#13919
Merged
petebacondarwin merged 6 commits intoMay 19, 2026
Conversation
🦋 Changeset detectedLatest commit: 6bcea69 The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
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 |
workers-devprod
requested review from
a team and
emily-shen
and removed request for
a team
Contributor
|
Codeowners approval required for this PR:
Show detailed file reviewers |
Contributor
|
✅ All changesets look good |
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
Contributor
|
Good — I've completed a thorough review. Let me summarize my findings: The fix is correct and well-tested. The There are no logic bugs, security issues, backward compatibility violations, or incorrect API behavior. LGTM |
create-cloudflare
@cloudflare/kv-asset-handler
miniflare
@cloudflare/pages-shared
@cloudflare/unenv-preset
@cloudflare/vite-plugin
@cloudflare/vitest-pool-workers
@cloudflare/workers-editor-shared
@cloudflare/workers-utils
wrangler
commit: |
jamesopstad
requested changes
May 14, 2026
Contributor
There was a problem hiding this comment.
We shouldn't be using the dev options from the Wrangler config in the Vite plugin. Can we reduce the scope of this PR so that it handles the inference from the routes without providing a way to override? We can then follow up with new options in the plugin config to handle the override.
petebacondarwin
requested review from
jamesopstad
and removed request for
emily-shen
jamesopstad
approved these changes
May 15, 2026
jamesopstad
left a comment
jamesopstad
left a comment
Contributor
There was a problem hiding this comment.
Looks good. Just a question over naming (zone vs hostname). The PR title and description also need updating.
workers-devprod
approved these changes
May 15, 2026
workers-devprod
left a comment
workers-devprod
left a comment
Contributor
There was a problem hiding this comment.
Codeowners reviews satisfied
…ions` so `vite dev` outbound `CF-Worker` reflects `dev.host` Under `vite dev` and `vitest-pool-workers`, outbound subrequests sent the `CF-Worker` header as `<worker-name>.example.com` even when `dev.host` or `routes` were configured, because the worker options returned by `unstable_getMiniflareWorkerOptions` (and the equivalent `getPlatformProxy` path) never set `zone`. Miniflare then fell back to its default. `wrangler dev --local` was unaffected because it builds worker options through a separate path that already sets `zone`. Derive `zone` from the normalized config the same way `wrangler dev` does — prefer `dev.host`, otherwise fall back to the hostname of the first configured route via `getHostFromRoute`. Downstream consumers pick this up automatically with no API changes. Fixes #13791.
The dev config block is intended for wrangler dev. Drop the dev.host branch from getZoneFromConfig so getPlatformProxy and unstable_getMiniflareWorkerOptions only derive the outbound CF-Worker zone from configured routes. Update tests, playground fixture, and the changeset to match the reduced scope.
Co-authored-by: James Opstad <13586373+jamesopstad@users.noreply.github.com>
…orker zone Per https://developers.cloudflare.com/fundamentals/reference/http-headers/#cf-worker, production sets the outbound `CF-Worker` header to the *zone name* that owns the Worker — for a route on `foo.example.com/*` from zone `example.com`, the header is `example.com`, not `foo.example.com`. Previously, both `wrangler dev --local` and the new `unstable_getMiniflareWorkerOptions` / `getPlatformProxy` paths derived the zone via `getHostFromRoute`, which returns the pattern hostname. That's correct when the pattern hostname is the zone apex, but wrong when the user has explicitly configured a route with `zone_name: "example.com"` for a subdomain pattern. Introduce a shared `getZoneFromRoute` helper that prefers the route's `zone_name` field when present and falls back to `getHostFromRoute` otherwise (still a best-effort approximation when only `zone_id`, a string pattern, or a `custom_domain` route is configured — resolving the parent zone would require an API lookup). Use it in both the new `getZoneFromConfig` (vite-plugin / vitest-pool-workers / getPlatformProxy) and `wrangler dev`'s `resolveDev`, wiring the latter through a new `StartDevWorkerOptions["dev"].zone` field so the controller no longer aliases the CF-Worker zone to `origin.hostname` (which legitimately remains the pattern hostname for `request.url` purposes).
petebacondarwin
force-pushed
the
fix/13791-zone-on-unstable-get-miniflare-worker-options
branch
from
b606848 to
1bfd0c4
Compare
Compute the outbound `CF-Worker` zone inline in `LocalRuntimeController.convertToConfigBundle` rather than threading a new `dev.zone` field through `StartDevWorkerOptions`. The rule: prefer the first route's explicit `zone_name` (the user's unambiguous declaration of the parent zone, matching production), and otherwise fall back to `dev.origin.hostname` (which already collapses `dev.host` and the inferred-from-route-pattern fallback). This avoids adding a new public-ish API surface while still applying the zone_name fix to `wrangler dev --local` for consistency with the new `unstable_getMiniflareWorkerOptions` / `getPlatformProxy` behaviour.
…comment to JSDoc Adds a getZoneFromRoute test case covering when the route pattern can't be parsed as a hostname AND there's no zone_name to fall back on — the helper returns undefined, leaving Miniflare to apply its default <worker-name>.example.com header. Also moves the explanatory comment from the getZoneForCfWorkerHeader call site into a JSDoc on the function itself.
Contributor
Author
|
@jamesopstad - please can you take another look? |
jamesopstad
reviewed
May 19, 2026
jamesopstad
approved these changes
May 19, 2026
petebacondarwin
deleted the
fix/13791-zone-on-unstable-get-miniflare-worker-options
branch
Merged
Merged
5 tasks
penalosa
pushed a commit
that referenced
this pull request
May 28, 2026
…ions` so `vite dev` outbound `CF-Worker` reflects `dev.host` (#13919) Co-authored-by: James Opstad <13586373+jamesopstad@users.noreply.github.com>
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
3 participants
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.
Fixes #13791.
Under
vite devand@cloudflare/vitest-pool-workers, outbound subrequests sent theCF-Workerheader as<worker-name>.example.comeven whendev.hostorrouteswere configured. This broke local development against services that reject unknownCF-Workerhosts — the issue reporter hit it against Apple WeatherKit (403 Forbidden).wrangler dev --localwas unaffected because it builds Miniflare worker options through a separate path that already setszone.The root cause was that
unstable_getMiniflareWorkerOptions(and the equivalentgetPlatformProxyworker-options path inpackages/wrangler/src/api/integrations/platform/index.ts) never propagatedzone, so Miniflare fell back to its${workerName}.example.comdefault when constructing theCF-Workerheader on outbound fetches.The fix derives
zonefrom the normalized config the same waywrangler devdoes — preferdev.host, otherwise fall back to the hostname of the first configured route viagetHostFromRoute— and sets it on both worker options paths.@cloudflare/vite-pluginand@cloudflare/vitest-pool-workerspick this up automatically with no API changes.Tests added at two layers:
packages/wrangler/src/__tests__/unstable-get-miniflare-worker-options.test.ts) covering the derivation cases:dev.hostset, singleroutestring,routesarray, unparseable*/*falling back tozone_name, both set (dev.hostwins), and neither set (undefined).cron-triggersplayground that runs a side Node HTTP echo server, hits a new/cf-worker-headerendpoint in the Worker, and asserts the outboundCF-Workerheader matches the configureddev.host. Verified to fail with the exact pre-fix symptom (cron-trigger-worker.example.com) when the fix is reverted.wrangler dev --local, which already matches the production behaviour that is documented elsewhere.