Skip to content

[pull] main from withastro:main #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 8 commits into from
Aug 19, 2026
Merged

[pull] main from withastro:main #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70b449d
fix(routing): keep the trailing slash when stripping an injected .htm…
Kjubikstronk Aug 19, 2026
bc171af
feat(satteri): update to Sätteri 0.10.x (#17731)
Princesseuh Aug 19, 2026
0a22ff5
fix(vercel): run edge middleware when isr is enabled (#17687)
asmyshlyaev177 Aug 19, 2026
cd233f8
[ci] format
ematipico Aug 19, 2026
05763a0
Respect path-segment boundaries when stripping the configured base (#…
matthewp Aug 19, 2026
a90ff66
fix(assets): harden vendored image-size box and entry checks (#17747)
Princesseuh Aug 19, 2026
aeda810
[ci] format
Princesseuh Aug 19, 2026
8a31cba
[ci] release (#17739)
astrobot-houston Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/social-paws-throw.md
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions examples/advanced-routing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/node": "^11.1.3",
"astro": "^7.2.3",
"@astrojs/node": "^11.1.4",
"astro": "^7.2.4",
"hono": "^4.12.14"
}
}
2 changes: 1 addition & 1 deletion examples/basics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^7.2.3"
"astro": "^7.2.4"
}
}
4 changes: 2 additions & 2 deletions examples/blog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^7.0.6",
"@astrojs/mdx": "^7.0.7",
"@astrojs/rss": "^4.0.19",
"@astrojs/sitemap": "^3.7.3",
"astro": "^7.2.3",
"astro": "^7.2.4",
"sharp": "^0.35.0"
}
}
2 changes: 1 addition & 1 deletion examples/component/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^7.2.3"
"astro": "^7.2.4"
},
"peerDependencies": {
"astro": "^5.0.0 || ^6.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/container-with-vitest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"test": "vitest run"
},
"dependencies": {
"@astrojs/react": "^6.0.3",
"astro": "^7.2.3",
"@astrojs/react": "^6.0.4",
"astro": "^7.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "^4.1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"@astrojs/alpinejs": "^1.0.0",
"@types/alpinejs": "^3.13.11",
"alpinejs": "^3.15.8",
"astro": "^7.2.3"
"astro": "^7.2.4"
}
}
6 changes: 3 additions & 3 deletions examples/framework-multiple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^6.0.3",
"@astrojs/react": "^6.0.3",
"@astrojs/preact": "^6.0.4",
"@astrojs/react": "^6.0.4",
"@astrojs/solid-js": "^7.0.2",
"@astrojs/svelte": "^9.0.1",
"@astrojs/vue": "^7.0.2",
"@types/react": "^18.3.28",
"@types/react-dom": "^18.3.7",
"astro": "^7.2.3",
"astro": "^7.2.4",
"preact": "^10.28.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-preact/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^6.0.3",
"@astrojs/preact": "^6.0.4",
"@preact/signals": "^2.8.1",
"astro": "^7.2.3",
"astro": "^7.2.4",
"preact": "^10.28.4"
}
}
4 changes: 2 additions & 2 deletions examples/framework-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/react": "^6.0.3",
"@astrojs/react": "^6.0.4",
"@types/react": "^18.3.28",
"@types/react-dom": "^18.3.7",
"astro": "^7.2.3",
"astro": "^7.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"dependencies": {
"@astrojs/solid-js": "^7.0.2",
"astro": "^7.2.3",
"astro": "^7.2.4",
"solid-js": "^1.9.11"
}
}
2 changes: 1 addition & 1 deletion examples/framework-svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"dependencies": {
"@astrojs/svelte": "^9.0.1",
"astro": "^7.2.3",
"astro": "^7.2.4",
"svelte": "^5.53.5"
}
}
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"dependencies": {
"@astrojs/vue": "^7.0.2",
"astro": "^7.2.3",
"astro": "^7.2.4",
"vue": "^3.5.29"
}
}
4 changes: 2 additions & 2 deletions examples/hackernews/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/node": "^11.1.3",
"astro": "^7.2.3"
"@astrojs/node": "^11.1.4",
"astro": "^7.2.4"
}
}
2 changes: 1 addition & 1 deletion examples/integration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^7.2.3"
"astro": "^7.2.4"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^7.2.3"
"astro": "^7.2.4"
}
}
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^7.2.3"
"astro": "^7.2.4"
}
}
4 changes: 2 additions & 2 deletions examples/ssr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"server": "node dist/server/entry.mjs"
},
"dependencies": {
"@astrojs/node": "^11.1.3",
"@astrojs/node": "^11.1.4",
"@astrojs/svelte": "^9.0.1",
"astro": "^7.2.3",
"astro": "^7.2.4",
"svelte": "^5.53.5"
}
}
2 changes: 1 addition & 1 deletion examples/starlog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^7.2.3",
"astro": "^7.2.4",
"sass": "^1.97.3",
"sharp": "^0.35.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/toolbar-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"devDependencies": {
"@types/node": "^22.10.6",
"astro": "^7.2.3"
"astro": "^7.2.4"
},
"engines": {
"node": ">=22.12.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/with-markdoc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/markdoc": "^2.0.7",
"astro": "^7.2.3"
"@astrojs/markdoc": "^2.0.8",
"astro": "^7.2.4"
}
}
6 changes: 3 additions & 3 deletions examples/with-mdx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^7.0.6",
"@astrojs/preact": "^6.0.3",
"astro": "^7.2.3",
"@astrojs/mdx": "^7.0.7",
"@astrojs/preact": "^6.0.4",
"astro": "^7.2.4",
"preact": "^10.28.4"
}
}
4 changes: 2 additions & 2 deletions examples/with-nanostores/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^6.0.3",
"@astrojs/preact": "^6.0.4",
"@nanostores/preact": "^1.0.0",
"astro": "^7.2.3",
"astro": "^7.2.4",
"nanostores": "^1.1.1",
"preact": "^10.28.4"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/with-tailwindcss/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^7.0.6",
"@astrojs/mdx": "^7.0.7",
"@tailwindcss/vite": "^4.2.1",
"@types/canvas-confetti": "^1.9.0",
"astro": "^7.2.3",
"astro": "^7.2.4",
"canvas-confetti": "^1.9.4",
"tailwindcss": "^4.2.1",
"vite": "^8.0.13"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-vitest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test": "vitest"
},
"dependencies": {
"astro": "^7.2.3",
"astro": "^7.2.4",
"vitest": "^5.0.0-beta.2"
}
}
17 changes: 17 additions & 0 deletions packages/astro/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# astro

## 7.2.4

### Patch Changes

- [#17747](https://github.com/withastro/astro/pull/17747) [`a90ff66`](https://github.com/withastro/astro/commit/a90ff6650fc244bf6ec86844a82dd13b88a4fd41) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes builds hanging when an image file is malformed

- [#17701](https://github.com/withastro/astro/pull/17701) [`05763a0`](https://github.com/withastro/astro/commit/05763a0884aabb1da78a2749d5bb9d41ae620527) Thanks [@matthewp](https://github.com/matthewp)! - Fixes base path stripping to respect path-segment boundaries. With a configured `base` such as `/docs`, a request like `/docs-archive/page` is no longer treated as being under the base, so routing and `context.url.pathname` now agree on the same pathname.

- [#17742](https://github.com/withastro/astro/pull/17742) [`70b449d`](https://github.com/withastro/astro/commit/70b449ddbae465348aa9337ff7d1d62ad8286e1a) Thanks [@Kjubikstronk](https://github.com/Kjubikstronk)! - Fixes `astro build` throwing `TypeError: Missing parameter` for dynamic routes when `build.format: 'preserve'` and `trailingSlash: 'always'` are used together. Stripping the framework-injected `.html` suffix dropped the trailing slash that the compiled route pattern requires, so the route no longer matched itself and its params resolved as empty.

- [#17703](https://github.com/withastro/astro/pull/17703) [`771b0a9`](https://github.com/withastro/astro/commit/771b0a9a04ca4b4bcdd098b2062a5903cc988112) Thanks [@astrobot-houston](https://github.com/astrobot-houston)! - Fixes `Astro.site` always being `undefined` when rendering components via the Container API, even when `site` is set in `astroConfig`

- Updated dependencies [[`05763a0`](https://github.com/withastro/astro/commit/05763a0884aabb1da78a2749d5bb9d41ae620527), [`bc171af`](https://github.com/withastro/astro/commit/bc171af0e29a1bb4ca56beffde1c4c03e1bb227f)]:
- @astrojs/internal-helpers@0.10.4
- @astrojs/markdown-satteri@0.3.7
- @astrojs/markdown-remark@7.2.4

## 7.2.3

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "astro",
"version": "7.2.3",
"version": "7.2.4",
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
"type": "module",
"author": "withastro",
Expand Down
1 change: 1 addition & 0 deletions packages/astro/src/assets/utils/vendor/image-size/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
The MIT License (MIT)

Copyright © 2013-Present Aditya Yadav, http://netroy.in
Copyright © 2026 lcf2212dev

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
11 changes: 8 additions & 3 deletions packages/astro/src/assets/utils/vendor/image-size/types/heif.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ export const HEIF: IImage = {

const images: ISize[] = []
let currentOffset = ipcoBox.offset + 8
const ipcoEnd = ipcoBox.offset + ipcoBox.size

// Find all ispe and clap boxes
while (currentOffset < ipcoBox.offset + ipcoBox.size) {
while (currentOffset < ipcoEnd) {
const ispeBox = findBox(input, 'ispe', currentOffset)
if (!ispeBox) break
if (ispeBox.size < 8) break
if (ispeBox.offset + ispeBox.size > ipcoEnd) break

const rawWidth = readUInt32BE(input, ispeBox.offset + 12)
const rawHeight = readUInt32BE(input, ispeBox.offset + 16)
Expand All @@ -69,14 +72,16 @@ export const HEIF: IImage = {
const clapBox = findBox(input, 'clap', currentOffset)
let width = rawWidth
let height = rawHeight
if (clapBox && clapBox.offset < ipcoBox.offset + ipcoBox.size) {
if (clapBox && clapBox.offset < ipcoEnd && clapBox.size >= 8) {
const cropRight = readUInt32BE(input, clapBox.offset + 12)
width = rawWidth - cropRight
}

images.push({ height, width })

currentOffset = ispeBox.offset + ispeBox.size
const nextOffset = ispeBox.offset + ispeBox.size
if (nextOffset <= currentOffset) break
currentOffset = nextOffset
}

if (images.length === 0) {
Expand Down
15 changes: 13 additions & 2 deletions packages/astro/src/assets/utils/vendor/image-size/types/icns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { readUInt32BE, toUTF8String } from './utils.js'
*/
const SIZE_HEADER = 4 + 4 // 8
const FILE_LENGTH_OFFSET = 4 // MSB => BIG ENDIAN
const MIN_ENTRY_LENGTH = 8

/**
* Image Entry
Expand Down Expand Up @@ -92,10 +93,20 @@ export const ICNS: IImage = {
const images: ISize[] = []

while (imageOffset < fileLength && imageOffset < inputLength) {
if (inputLength - imageOffset < MIN_ENTRY_LENGTH) break

const imageHeader = readImageHeader(input, imageOffset)
const entryLength = imageHeader[1]
if (entryLength < MIN_ENTRY_LENGTH) break

const imageSize = getImageSize(imageHeader[0])
images.push(imageSize)
imageOffset += imageHeader[1]
if (imageSize.width && imageSize.height) {
images.push(imageSize)
}

const nextOffset = imageOffset + entryLength
if (nextOffset <= imageOffset) break
imageOffset = nextOffset
}

if (images.length === 0) {
Expand Down
5 changes: 3 additions & 2 deletions packages/astro/src/assets/utils/vendor/image-size/types/jp2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ export const JP2: IImage = {

calculate(input) {
const jp2hBox = findBox(input, 'jp2h', 0)
const ihdrBox = jp2hBox && findBox(input, 'ihdr', jp2hBox.offset + 8)
if (ihdrBox) {
const ihdrBox =
jp2hBox && jp2hBox.size >= 8 && findBox(input, 'ihdr', jp2hBox.offset + 8)
if (ihdrBox && ihdrBox.size >= 8) {
return {
height: readUInt32BE(input, ihdrBox.offset + 8),
width: readUInt32BE(input, ihdrBox.offset + 12),
Expand Down
7 changes: 5 additions & 2 deletions packages/astro/src/assets/utils/vendor/image-size/types/jxl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { findBox, toUTF8String } from './utils.js'
/** Extracts the codestream from a containerized JPEG XL image */
function extractCodestream(input: Uint8Array): Uint8Array | undefined {
const jxlcBox = findBox(input, 'jxlc', 0)
if (jxlcBox) {
if (jxlcBox && jxlcBox.size >= 8) {
return input.slice(jxlcBox.offset + 8, jxlcBox.offset + jxlcBox.size)
}

Expand All @@ -24,10 +24,13 @@ function extractPartialStreams(input: Uint8Array): Uint8Array[] {
while (offset < input.length) {
const jxlpBox = findBox(input, 'jxlp', offset)
if (!jxlpBox) break
if (jxlpBox.size < 12) break
partialStreams.push(
input.slice(jxlpBox.offset + 12, jxlpBox.offset + jxlpBox.size),
)
offset = jxlpBox.offset + jxlpBox.size
const nextOffset = jxlpBox.offset + jxlpBox.size
if (nextOffset <= offset) break
offset = nextOffset
}
return partialStreams
}
Expand Down
Loading
Loading