Skip to content

fix(assets): allow 304 Not Modified status to bypass redirect check while revalidating cached assets#15935

Merged
Princesseuh merged 6 commits intowithastro:mainfrom
oliverlynch:main
Mar 25, 2026
Merged

fix(assets): allow 304 Not Modified status to bypass redirect check while revalidating cached assets#15935
Princesseuh merged 6 commits intowithastro:mainfrom
oliverlynch:main

Conversation

@oliverlynch
Copy link
Copy Markdown
Contributor

Changes

Fix bug #15920 introduced in 35bc814 by skipping the redirect check for Not Modified status 304

A few other small improvements

  • replace double awaits with Promise.all
  • explicitly return null data from revalidateRemoteImage when there is no change - before this relied on the response body for unchanged assets being empty, and it was confusing.
  • explicitly write cache file in utf-8, as we are reading it in utf-8
  • reword a few comments

Testing

I ran pnpm run test:match "assets" with 0 errors, however the full pnpm run test fails on my machine.

I don't believe there is any test coverage of the revalidation feature as it depends on remote servers, however I quickly tested the fix by loading a remote image and editing the cache file and it seems to work as expected.

Docs

No user facing changes - no docs changes required.

- replace double awaits with Promise.all
- explicitly return null data from revalidateRemoteImage when there is
no change
- explicitly write cache file in utf-8, as we are reading it in utf-8
@github-actions github-actions bot added the pkg: astro Related to the core `astro` package (scope) label Mar 16, 2026
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Mar 16, 2026

🦋 Changeset detected

Latest commit: c2046e6

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

@codspeed-hq
Copy link
Copy Markdown

codspeed-hq bot commented Mar 16, 2026

Merging this PR will not alter performance

✅ 18 untouched benchmarks


Comparing oliverlynch:main (c2046e6) with main (ccecb8f)1

Open in CodSpeed

Footnotes

  1. No successful run was found on main (1130a97) during the generation of this report, so ccecb8f was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

Co-authored-by: Erika <3019731+Princesseuh@users.noreply.github.com>
@Princesseuh Princesseuh merged commit 278828c into withastro:main Mar 25, 2026
7 checks passed
@astrobot-houston astrobot-houston mentioned this pull request Mar 25, 2026
dadezzz pushed a commit to dadezzz/ice-notes that referenced this pull request Mar 30, 2026
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [astro](https://astro.build) ([source](https://github.com/withastro/astro/tree/HEAD/packages/astro)) | [`6.0.8` → `6.1.1`](https://renovatebot.com/diffs/npm/astro/6.0.8/6.1.1) | ![age](https://developer.mend.io/api/mc/badges/age/npm/astro/6.1.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/astro/6.0.8/6.1.1?slim=true) |

---

### Release Notes

<details>
<summary>withastro/astro (astro)</summary>

### [`v6.1.1`](https://github.com/withastro/astro/blob/HEAD/packages/astro/CHANGELOG.md#611)

[Compare Source](https://github.com/withastro/astro/compare/astro@6.1.0...astro@6.1.1)

##### Patch Changes

- [#&#8203;16105](withastro/astro#16105) [`23d60de`](withastro/astro@23d60de) Thanks [@&#8203;matthewp](https://github.com/matthewp)! - Fix dev toolbar audit crash when encountering the `image` ARIA role

- [#&#8203;16089](withastro/astro#16089) [`999c875`](withastro/astro@999c875) Thanks [@&#8203;martrapp](https://github.com/martrapp)! - Fixes an issue with the client router where Vue's `:deep()` notation was ignored in dev mode.

### [`v6.1.0`](https://github.com/withastro/astro/blob/HEAD/packages/astro/CHANGELOG.md#610)

[Compare Source](https://github.com/withastro/astro/compare/astro@6.0.8...astro@6.1.0)

##### Minor Changes

- [#&#8203;15804](withastro/astro#15804) [`a5e7232`](withastro/astro@a5e7232) Thanks [@&#8203;merlinnot](https://github.com/merlinnot)! - Allows setting codec-specific defaults for Astro's built-in Sharp image service via `image.service.config`.

  You can now configure encoder-level options such as `jpeg.mozjpeg`, `webp.effort`, `webp.alphaQuality`, `avif.effort`, `avif.chromaSubsampling`, and `png.compressionLevel` when using `astro/assets/services/sharp` for compile-time image generation.

  These settings apply as defaults for the built-in Sharp pipeline, while per-image `quality` still takes precedence when set on `<Image />`, `<Picture />`, or `getImage()`.

- [#&#8203;15455](withastro/astro#15455) [`babf57f`](withastro/astro@babf57f) Thanks [@&#8203;AhmadYasser1](https://github.com/AhmadYasser1)! - Adds `fallbackRoutes` to the `IntegrationResolvedRoute` type, exposing i18n fallback routes to integrations via the `astro:routes:resolved` hook for projects using `fallbackType: 'rewrite'`.

  This allows integrations such as the sitemap integration to properly include generated fallback routes in their output.

  ```js
  {
    'astro:routes:resolved': ({ routes }) => {
      for (const route of routes) {
        for (const fallback of route.fallbackRoutes) {
          console.log(fallback.pathname) // e.g. /fr/about/
        }
      }
    }
  }
  ```

- [#&#8203;15340](withastro/astro#15340) [`10a1a5a`](withastro/astro@10a1a5a) Thanks [@&#8203;trueberryless](https://github.com/trueberryless)! - Adds support for advanced configuration of SmartyPants in Markdown.

  You can now pass an options object to `markdown.smartypants` in your Astro configuration to fine-tune how punctuation, dashes, and quotes are transformed.

  This is helpful for projects that require specific typographic standards, such as "oldschool" dash handling or localized quotation marks.

  ```js
  // astro.config.mjs
  export default defineConfig({
    markdown: {
      smartypants: {
        backticks: 'all',
        dashes: 'oldschool',
        ellipses: 'unspaced',
        openingQuotes: { double: '«', single: '‹' },
        closingQuotes: { double: '»', single: '›' },
        quotes: false,
      },
    },
  });
  ```

  See [the `retext-smartypants` options](https://github.com/retextjs/retext-smartypants?tab=readme-ov-file#fields) for more information.

##### Patch Changes

- [#&#8203;16025](withastro/astro#16025) [`a09f319`](withastro/astro@a09f319) Thanks [@&#8203;koji-1009](https://github.com/koji-1009)! - Instructs the client router to skip view transition animations when the browser is already providing its own visual transition, such as a swipe gesture.

- [#&#8203;16055](withastro/astro#16055) [`ccecb8f`](withastro/astro@ccecb8f) Thanks [@&#8203;Gautam-Bharadwaj](https://github.com/Gautam-Bharadwaj)! - Fixes an issue where `client:only` components could have duplicate `client:component-path` attributes added in MDX in rare cases

- [#&#8203;16081](withastro/astro#16081) [`44fc340`](withastro/astro@44fc340) Thanks [@&#8203;crazylogic03](https://github.com/crazylogic03)! - Fixes the `emitFile() is not supported in serve mode` warning that appears during `astro dev` when using integrations that inject before-hydration scripts (e.g. `@astrojs/react`)

- [#&#8203;16068](withastro/astro#16068) [`31d733b`](withastro/astro@31d733b) Thanks [@&#8203;Karthikeya1500](https://github.com/Karthikeya1500)! - Fixes the dev toolbar a11y audit incorrectly classifying `menuitemradio` as a non-interactive ARIA role.

- [#&#8203;16080](withastro/astro#16080) [`e80ac73`](withastro/astro@e80ac73) Thanks [@&#8203;ematipico](https://github.com/ematipico)! - Fixes `experimental.queuedRendering` incorrectly escaping the HTML output of `.html` page files, causing the page content to render as plain text instead of HTML in the browser.

- [#&#8203;16048](withastro/astro#16048) [`13b9d56`](withastro/astro@13b9d56) Thanks [@&#8203;matthewp](https://github.com/matthewp)! - Fixes a dev server crash (`serverIslandNameMap.get is not a function`) that occurred when navigating to a page with `server:defer` after first visiting a page without one, when using `@astrojs/cloudflare`

- [#&#8203;16093](withastro/astro#16093) [`336e086`](withastro/astro@336e086) Thanks [@&#8203;Snugug](https://github.com/Snugug)! - Fixes Zod meta not correctly being rendered on top-level schema when converted into JSON Schema

- [#&#8203;16043](withastro/astro#16043) [`d402485`](withastro/astro@d402485) Thanks [@&#8203;ematipico](https://github.com/ematipico)! - Fixes `checkOrigin` CSRF protection in `astro dev` behind a TLS-terminating reverse proxy. The dev server now reads `X-Forwarded-Proto` (gated on `security.allowedDomains`, matching production behaviour) so the constructed request origin matches the `https://` origin the browser sends. Also ensures `security.allowedDomains` and `security.checkOrigin` are respected in dev.

- [#&#8203;16064](withastro/astro#16064) [`ba58e0d`](withastro/astro@ba58e0d) Thanks [@&#8203;ematipico](https://github.com/ematipico)! - Updates the dependency `svgo` to the latest, to fix a security issue.

- [#&#8203;16007](withastro/astro#16007) [`2dcd8d5`](withastro/astro@2dcd8d5) Thanks [@&#8203;florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes a case where fonts files would unecessarily be copied several times during the build

- [#&#8203;16017](withastro/astro#16017) [`b089b90`](withastro/astro@b089b90) Thanks [@&#8203;felmonon](https://github.com/felmonon)! - Fix the `astro sync` error message when `getImage()` is called while loading content collections.

- [#&#8203;16014](withastro/astro#16014) [`fa73fbb`](withastro/astro@fa73fbb) Thanks [@&#8203;matthewp](https://github.com/matthewp)! - Fixes a build error where using `astro:config/client` inside a `<script>` tag would cause Rollup to fail with "failed to resolve import `virtual:astro:routes` from `virtual:astro:manifest`"

- [#&#8203;16054](withastro/astro#16054) [`f74465a`](withastro/astro@f74465a) Thanks [@&#8203;seroperson](https://github.com/seroperson)! - Fixes an issue with the development server, where changes to the middleware weren't picked, and it required a full restart of the server.

- [#&#8203;16033](withastro/astro#16033) [`198d31b`](withastro/astro@198d31b) Thanks [@&#8203;adampage](https://github.com/adampage)! - Fixes a bug where the the role `image` was incorrectly reported by audit tool bar.

- [#&#8203;15935](withastro/astro#15935) [`278828c`](withastro/astro@278828c) Thanks [@&#8203;oliverlynch](https://github.com/oliverlynch)! - Fixes cached assets failing to revalidate due to redirect check mishandling Not Modified responses.

- [#&#8203;16075](withastro/astro#16075) [`2c1ae85`](withastro/astro@2c1ae85) Thanks [@&#8203;florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes a case where invalid URLs would be generated in development when using font families with an oblique `style` and angles

- [#&#8203;16062](withastro/astro#16062) [`87fd6a4`](withastro/astro@87fd6a4) Thanks [@&#8203;matthewp](https://github.com/matthewp)! - Warns on dev server startup when Vite 8 is detected at the top level of the user's project, and automatically adds a `"overrides": { "vite": "^7" }` entry to `package.json` when running `astro add cloudflare`. This prevents a `require_dist is not a function` crash caused by a Vite version split between Astro (requires Vite 7) and packages like `@tailwindcss/vite` that hoist Vite 8.

- Updated dependencies \[[`10a1a5a`](withastro/astro@10a1a5a)]:
  - [@&#8203;astrojs/markdown-remark](https://github.com/astrojs/markdown-remark)@&#8203;7.1.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My44Ni4wIiwidXBkYXRlZEluVmVyIjoiNDMuODYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: Renovate Bot <renovate@zarantonello.dev>
Co-committed-by: Renovate Bot <renovate@zarantonello.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pkg: astro Related to the core `astro` package (scope)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants