Skip to content

[pull] main from withastro:main #593

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 6 commits into from
Jun 15, 2026
Merged

[pull] main from withastro:main #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04547ec
fix(security): skip allowedDomains header check for prerendered route…
astrobot-houston Jun 15, 2026
6c6c974
[ci] format
matthewp Jun 15, 2026
74888e7
Update changeset baseBranch from next to main (#17085)
matthewp Jun 15, 2026
d426b67
Fix non-ASCII prerendered routes ignoring trailingSlash: never in @as…
astrobot-houston Jun 15, 2026
c188e85
[ci] format
matthewp Jun 15, 2026
0d862d5
[ci] release (beta) (#17082)
astrobot-houston Jun 15, 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
2 changes: 1 addition & 1 deletion .changeset/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"commit": false,
"linked": [],
"access": "public",
"baseBranch": "origin/next",
"baseBranch": "origin/main",
"updateInternalDependencies": "patch",
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
Expand Down
5 changes: 5 additions & 0 deletions .changeset/fix-prerender-allowed-domains-warning.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes a spurious `Astro.request.headers` warning on prerendered pages when `security.allowedDomains` is configured. The internal `allowedDomains` header validation now skips prerendered routes, since they use synthetic requests with no real headers.
5 changes: 5 additions & 0 deletions .changeset/odd-poems-dress.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/node': patch
---

Fixes an issue where Astro files with non-ASCII characters in their name weren't correctly served after the build.
3 changes: 3 additions & 0 deletions .changeset/pre.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,14 @@
"experimental-background-dev",
"expose-get-fetch-state",
"fix-dev-port-vite-restart",
"fix-prerender-allowed-domains-warning",
"font-data-subset-field",
"goofy-tigers-like",
"odd-poems-dress",
"plenty-meals-wonder",
"remove-db-cli-command",
"rusty-compilers-only",
"satteri-default-markdown-processor",
"seven-pots-begin",
"silly-spoons-write",
"social-paws-take",
Expand Down
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.0.0-beta.1",
"astro": "^7.0.0-beta.3",
"@astrojs/node": "^11.0.0-beta.2",
"astro": "^7.0.0-beta.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.0.0-beta.3"
"astro": "^7.0.0-beta.4"
}
}
2 changes: 1 addition & 1 deletion examples/blog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@astrojs/mdx": "^7.0.0-beta.2",
"@astrojs/rss": "^4.0.18",
"@astrojs/sitemap": "^3.7.3",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.4",
"sharp": "^0.34.3"
}
}
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.0.0-beta.3"
"astro": "^7.0.0-beta.4"
},
"peerDependencies": {
"astro": "^5.0.0 || ^6.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/container-with-vitest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {
"@astrojs/react": "^6.0.0-beta.1",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.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-beta.1",
"@types/alpinejs": "^3.13.11",
"alpinejs": "^3.15.8",
"astro": "^7.0.0-beta.3"
"astro": "^7.0.0-beta.4"
}
}
2 changes: 1 addition & 1 deletion examples/framework-multiple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@astrojs/vue": "^7.0.0-beta.1",
"@types/react": "^18.3.28",
"@types/react-dom": "^18.3.7",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.4",
"preact": "^10.28.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@astrojs/preact": "^6.0.0-beta.1",
"@preact/signals": "^2.8.1",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.4",
"preact": "^10.28.4"
}
}
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@astrojs/react": "^6.0.0-beta.1",
"@types/react": "^18.3.28",
"@types/react-dom": "^18.3.7",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.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.0-beta.1",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.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.0-beta.3",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.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.0-beta.1",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.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.0.0-beta.1",
"astro": "^7.0.0-beta.3"
"@astrojs/node": "^11.0.0-beta.2",
"astro": "^7.0.0-beta.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.0.0-beta.3"
"astro": "^7.0.0-beta.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.0.0-beta.3"
"astro": "^7.0.0-beta.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.0.0-beta.3"
"astro": "^7.0.0-beta.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.0.0-beta.1",
"@astrojs/node": "^11.0.0-beta.2",
"@astrojs/svelte": "^9.0.0-beta.3",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.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.0.0-beta.3",
"astro": "^7.0.0-beta.4",
"sass": "^1.97.3",
"sharp": "^0.34.3"
},
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.0.0-beta.3"
"astro": "^7.0.0-beta.4"
},
"engines": {
"node": ">=22.12.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-markdoc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
},
"dependencies": {
"@astrojs/markdoc": "^2.0.0-beta.1",
"astro": "^7.0.0-beta.3"
"astro": "^7.0.0-beta.4"
}
}
2 changes: 1 addition & 1 deletion examples/with-mdx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@astrojs/mdx": "^7.0.0-beta.2",
"@astrojs/preact": "^6.0.0-beta.1",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.4",
"preact": "^10.28.4"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@astrojs/preact": "^6.0.0-beta.1",
"@nanostores/preact": "^1.0.0",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.4",
"nanostores": "^1.1.1",
"preact": "^10.28.4"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/with-tailwindcss/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@astrojs/mdx": "^7.0.0-beta.2",
"@tailwindcss/vite": "^4.2.1",
"@types/canvas-confetti": "^1.9.0",
"astro": "^7.0.0-beta.3",
"astro": "^7.0.0-beta.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.0.0-beta.3",
"astro": "^7.0.0-beta.4",
"vitest": "^5.0.0-beta.2"
}
}
29 changes: 29 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,33 @@
# astro

## 7.0.0-beta.4

### Major Changes

- [#16966](https://github.com/withastro/astro/pull/16966) [`6650ec2`](https://github.com/withastro/astro/commit/6650ec24e81bb9fdf2fcec3dc07154b94d41cb61) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Makes Sätteri the default Markdown processor

Astro now renders `.md` files with `satteri()` from `@astrojs/markdown-satteri`, its native Markdown pipeline, instead of the remark/rehype pipeline. `@astrojs/markdown-remark` is no longer installed by default.

To keep using the remark/rehype pipeline, install `@astrojs/markdown-remark` and set it as your processor:

```js
// astro.config.mjs
import { defineConfig } from 'astro/config';
import { unified } from '@astrojs/markdown-remark';

export default defineConfig({
markdown: {
processor: unified(),
},
});
```

The deprecated `markdown.remarkPlugins`, `markdown.rehypePlugins`, and `markdown.remarkRehype` options still work, but now require `@astrojs/markdown-remark` to be used.

### Patch Changes

- [#17078](https://github.com/withastro/astro/pull/17078) [`04547ec`](https://github.com/withastro/astro/commit/04547eca5bc6b8c1b3b95398ccc49c870a68c34c) Thanks [@astrobot-houston](https://github.com/astrobot-houston)! - Fixes a spurious `Astro.request.headers` warning on prerendered pages when `security.allowedDomains` is configured. The internal `allowedDomains` header validation now skips prerendered routes, since they use synthetic requests with no real headers.

## 7.0.0-beta.3

### Major Changes
Expand Down Expand Up @@ -243,6 +271,7 @@
- [#15819](https://github.com/withastro/astro/pull/15819) [`cafec4e`](https://github.com/withastro/astro/commit/cafec4e23365061491103dfce2e889a15cf86f27) Thanks [@delucis](https://github.com/delucis)! - Fixes `--port` flag being ignored after a Vite-triggered server restart (e.g. when a `.env` file changes)

- [#16434](https://github.com/withastro/astro/pull/16434) [`ee079d4`](https://github.com/withastro/astro/commit/ee079d4c7f143076b84d663c832911009a077c7f) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where i18n domains would return 404 when `trailingSlash` is set to `never`.

## 6.4.7

### 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.0.0-beta.3",
"version": "7.0.0-beta.4",
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
"type": "module",
"author": "withastro",
Expand Down
6 changes: 5 additions & 1 deletion packages/astro/src/core/fetch/fetch-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,11 @@ export class FetchState implements AstroFetchState {
// allowedDomains — without it, forwarded headers are never trusted
// and the validation is a no-op. This avoids header lookups on the
// hot path for the vast majority of apps.
if (pipeline.manifest.allowedDomains && pipeline.manifest.allowedDomains.length > 0) {
if (
pipeline.manifest.allowedDomains &&
pipeline.manifest.allowedDomains.length > 0 &&
!this.routeData?.prerender
) {
this.#applyForwardedHeaders();
}

Expand Down
Loading
Loading