Skip to content

fix: avoid overriding existing _headers rules - #16183

Merged
teemingc merged 2 commits into
version-3from
cloudflare-existing-headers
Jun 27, 2026
Merged

fix: avoid overriding existing _headers rules#16183
teemingc merged 2 commits into
version-3from
cloudflare-existing-headers

Conversation

@teemingc

@teemingc teemingc commented Jun 26, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

closes #15862

A lighter alternative to #16171 , where we just add the rules under the URL if the URL already exists.

According to the Cloudflare docs, multiple headers will just be joined with a comma https://developers.cloudflare.com/workers/static-assets/headers/#attach-a-header and we shouldn't worry about someone also declaring new cache header values for those URLs since they're framework related. The original issue is mostly concerned about adding new headers for CORS

Please don't delete this checklist! Before submitting the PR, please make sure you do the following:

  • It's really useful if your PR references an issue where it is discussed ahead of time. In many cases, features are absent for a reason. For large changes, please create an RFC: https://github.com/sveltejs/rfcs
  • This message body should clearly illustrate what problems it solves.
  • Ideally, include a test that fails without this PR but passes with it.

Tests

  • Run the tests with pnpm test and lint the project with pnpm lint and pnpm check

Changesets

  • If your PR makes a change that should be noted in one or more packages' changelogs, generate a changeset by running pnpm changeset and following the prompts. Changesets that add features should be minor and those that fix bugs should be patch. Please prefix changeset messages with feat:, fix:, or chore:.

Edits

  • Please ensure that 'Allow edits from maintainers' is checked. PRs without this option may be closed.

@changeset-bot

changeset-bot Bot commented Jun 26, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 652310f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@sveltejs/adapter-cloudflare Patch

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

@svelte-docs-bot

svelte-docs-bot Bot commented Jun 26, 2026

Copy link
Copy Markdown

Preview: https://svelte-dev-git-preview-kit-16183-svelte.vercel.app/

@teemingc teemingc linked an issue Jun 26, 2026 that may be closed by this pull request
@sveltejs/adapter-cloudflare doesn't handle _headers collisions #15862
Closed
@teemingc
teemingc merged commit 821b510 into version-3 Jun 27, 2026
18 checks passed
@teemingc
teemingc deleted the cloudflare-existing-headers branch June 27, 2026 00:13
This was referenced Jun 27, 2026
Closed
Closed
@github-actions github-actions Bot mentioned this pull request Jun 27, 2026
Merged
Rich-Harris pushed a commit that referenced this pull request Jul 2, 2026
@github-actions
Version Packages (next) (#16174)
fa0966c 
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to version-3, this PR
will be updated.

⚠️⚠️⚠️⚠️⚠️⚠️

`version-3` is currently in **pre mode** so this branch has prereleases
rather than normal releases. If you want to exit prereleases, run
`changeset pre exit` on `version-3`.

⚠️⚠️⚠️⚠️⚠️⚠️

# Releases
## @sveltejs/adapter-node@6.0.0-next.2

### Major Changes


- breaking: add `kit.paths.origin` config option, remove
`kit.prerender.origin` and the `adapter-node` `ORIGIN` environment
variable ([#16161](#16161))


### Patch Changes

- Updated dependencies
[[`3c434fb`](3c434fb),
[`a9284e8`](a9284e8),
[`3726a7a`](3726a7a),
[`f9d2240`](f9d2240),
[`a9284e8`](a9284e8),
[`7c040ba`](7c040ba),
[`223eaad`](223eaad),
[`223eaad`](223eaad),
[`3b907d4`](3b907d4),
[`fd628a5`](fd628a5),
[`223eaad`](223eaad),
[`6c1d035`](6c1d035),
[`178eac0`](178eac0),
[`c6562a9`](c6562a9),
[`8eca2ab`](8eca2ab),
[`61cf188`](61cf188)]:
  - @sveltejs/kit@3.0.0-next.6
## @sveltejs/kit@3.0.0-next.6

### Major Changes


- breaking: return no content for 204 responses
([#16200](#16200))


- breaking: form action responses now use the HTTP status code returned
from `fail` ([#16200](#16200))


- breaking: nested server-only directories
([#15685](#15685))


- breaking: add `kit.paths.origin` config option, remove
`kit.prerender.origin` and the `adapter-node` `ORIGIN` environment
variable ([#16161](#16161))


- breaking: don't abort navigation when calling `invalidate(All)` during
navigation ([#16188](#16188))


- breaking: allow `handleError` to influence status code
([#16162](#16162))


- breaking: forbid external redirects by default
([#16198](#16198))


### Minor Changes


- feat: use `type: 'module'` for service worker registrations
([#16169](#16169))


- feat: add `dirty()` property to form fields
([#16208](#16208))


- feat: add `cookies.parse` method
([#16203](#16203))


### Patch Changes


- fix: drain unconsumed request bodies so keep-alive connections don't
hang ([#16170](#16170))


- fix: properly handle Date objects in form.fields.set
([#16168](#16168))


- fix: skip clean fields when programmatically validating forms
([#16208](#16208))


- breaking: experimental remote form `validate({ includeUntouched })`
option is now `all`
([#16208](#16208))


- fix: return `undefined` from `fields.branch.issues()` when only
`fields.branch.leaf` has issues
([#16187](#16187))


- feat: add field.touched() helper to remote form fields
([#14692](#14692))
## @sveltejs/adapter-cloudflare@8.0.0-next.1

### Patch Changes


- fix: avoid overriding user's existing `_headers` rules
([#16183](#16183))

- Updated dependencies
[[`3c434fb`](3c434fb),
[`a9284e8`](a9284e8),
[`3726a7a`](3726a7a),
[`f9d2240`](f9d2240),
[`a9284e8`](a9284e8),
[`7c040ba`](7c040ba),
[`223eaad`](223eaad),
[`223eaad`](223eaad),
[`3b907d4`](3b907d4),
[`fd628a5`](fd628a5),
[`223eaad`](223eaad),
[`6c1d035`](6c1d035),
[`178eac0`](178eac0),
[`c6562a9`](c6562a9),
[`8eca2ab`](8eca2ab),
[`61cf188`](61cf188)]:
  - @sveltejs/kit@3.0.0-next.6

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
LNSR added a commit to LNSR/wplokerbjm that referenced this pull request Jul 24, 2026
@LNSR
drop appendCloudflareHeaders plugin because PR issue finally merged.
a02f3f1 
ref sveltejs/kit#16171
ref sveltejs/kit#16183
LNSR added a commit to LNSR/wplokerbjm that referenced this pull request Jul 24, 2026
@LNSR
drop appendCloudflareHeaders plugin because PR issue finally merged.
bce5c62 
ref sveltejs/kit#16171
ref sveltejs/kit#16183
LNSR added a commit to LNSR/wplokerbjm that referenced this pull request Jul 24, 2026
@LNSR
- Drop appendCloudflareHeaders plugin because PR issue finally merged.
b6217ee 
ref sveltejs/kit#16171
ref sveltejs/kit#16183

- Refactor URQL
LNSR added a commit to LNSR/wplokerbjm that referenced this pull request Jul 24, 2026
@LNSR
- Drop appendCloudflareHeaders plugin because PR issue finally merged.
18ca206 
ref sveltejs/kit#16171
ref sveltejs/kit#16183

- Refactor URQL
LNSR added a commit to LNSR/wplokerbjm that referenced this pull request Jul 24, 2026
@LNSR
- Drop appendCloudflareHeaders plugin because PR issue finally merged.
204f8a3 
ref sveltejs/kit#16171
ref sveltejs/kit#16183

- Refactor URQL
LNSR added a commit to LNSR/wplokerbjm that referenced this pull request Jul 24, 2026
@LNSR
- Drop appendCloudflareHeaders plugin because PR issue finally merged.
a69a78b 
ref sveltejs/kit#16171
ref sveltejs/kit#16183

- Refactor URQL
LNSR added a commit to LNSR/wplokerbjm that referenced this pull request Jul 24, 2026
@LNSR
- Drop appendCloudflareHeaders plugin because PR issue finally merged.
d129132 
ref sveltejs/kit#16171
ref sveltejs/kit#16183

- Refactor URQL
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Rich-Harris Rich-Harris Rich-Harris approved these changes

Assignees

No one assigned

Labels

pkg:adapter-cloudflare

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

@sveltejs/adapter-cloudflare doesn't handle _headers collisions

2 participants

@teemingc @Rich-Harris