diff --git a/.changeset/fix-legacy-markdown-plugins-iterable.md b/.changeset/fix-legacy-markdown-plugins-iterable.md deleted file mode 100644 index 98b536fe428f..000000000000 --- a/.changeset/fix-legacy-markdown-plugins-iterable.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes a `plugins is not iterable` crash when using a pre-6.0 `@astrojs/mdx` alongside integrations (e.g. Starlight) that set `markdown.remarkPlugins`, `markdown.rehypePlugins`, or `markdown.remarkRehype`. diff --git a/.changeset/fix-prerender-dynamic-route-fallthrough.md b/.changeset/fix-prerender-dynamic-route-fallthrough.md deleted file mode 100644 index c25c2d4be53d..000000000000 --- a/.changeset/fix-prerender-dynamic-route-fallthrough.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes an issue where on-demand (SSR) dynamic routes would return 404 when a prerendered dynamic route with the same URL pattern was sorted first alphabetically. In production builds with `@astrojs/node` adapter, if `[a_prebuild].astro` (prerender=true) came before `[b_ssr].astro` alphabetically, requests to URLs not in the prerendered route's static paths would 404 instead of falling through to the SSR route. The fix adds fallthrough logic so that when a prerendered dynamic route matches but can't serve the request, Astro tries subsequent matching routes. diff --git a/examples/advanced-routing/package.json b/examples/advanced-routing/package.json index 50d466542326..f64acc986a83 100644 --- a/examples/advanced-routing/package.json +++ b/examples/advanced-routing/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@astrojs/node": "^10.1.2", - "astro": "^6.4.1", + "astro": "^6.4.2", "hono": "^4.12.14" } } diff --git a/examples/basics/package.json b/examples/basics/package.json index 18928b8ab108..cb08f47d4c67 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -13,6 +13,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^6.4.1" + "astro": "^6.4.2" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 5fb6ebc3a909..8deaba1db381 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -16,7 +16,7 @@ "@astrojs/mdx": "^6.0.1", "@astrojs/rss": "^4.0.18", "@astrojs/sitemap": "^3.7.3", - "astro": "^6.4.1", + "astro": "^6.4.2", "sharp": "^0.34.3" } } diff --git a/examples/component/package.json b/examples/component/package.json index dbda240d89ec..2a05f5803795 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -18,7 +18,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^6.4.1" + "astro": "^6.4.2" }, "peerDependencies": { "astro": "^5.0.0 || ^6.0.0" diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json index 89c2a4a22e9f..6ba832281aad 100644 --- a/examples/container-with-vitest/package.json +++ b/examples/container-with-vitest/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@astrojs/react": "^5.0.6", - "astro": "^6.4.1", + "astro": "^6.4.2", "react": "^18.3.1", "react-dom": "^18.3.1", "vitest": "^4.1.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 47ebadb66a32..e29b643af81a 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -16,6 +16,6 @@ "@astrojs/alpinejs": "^0.5.0", "@types/alpinejs": "^3.13.11", "alpinejs": "^3.15.8", - "astro": "^6.4.1" + "astro": "^6.4.2" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 64f9dc04ae9c..acfa396e0101 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -20,7 +20,7 @@ "@astrojs/vue": "^6.0.1", "@types/react": "^18.3.28", "@types/react-dom": "^18.3.7", - "astro": "^6.4.1", + "astro": "^6.4.2", "preact": "^10.28.4", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 4c7296392d14..7741372638a2 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -15,7 +15,7 @@ "dependencies": { "@astrojs/preact": "^5.1.4", "@preact/signals": "^2.8.1", - "astro": "^6.4.1", + "astro": "^6.4.2", "preact": "^10.28.4" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index a7baca6b7cbf..0b3c7485ef3a 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -16,7 +16,7 @@ "@astrojs/react": "^5.0.6", "@types/react": "^18.3.28", "@types/react-dom": "^18.3.7", - "astro": "^6.4.1", + "astro": "^6.4.2", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 26b0c85e07ce..b1ced5c90aed 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@astrojs/solid-js": "^6.0.1", - "astro": "^6.4.1", + "astro": "^6.4.2", "solid-js": "^1.9.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 3dad19881c7f..653ec36a9685 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@astrojs/svelte": "^8.1.2", - "astro": "^6.4.1", + "astro": "^6.4.2", "svelte": "^5.53.5" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 76e494be629e..382d9aa1063b 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@astrojs/vue": "^6.0.1", - "astro": "^6.4.1", + "astro": "^6.4.2", "vue": "^3.5.29" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 1c6a133a2f61..1d4080683ae8 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -14,6 +14,6 @@ }, "dependencies": { "@astrojs/node": "^10.1.2", - "astro": "^6.4.1" + "astro": "^6.4.2" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 716a7f800f2e..342c86c32b99 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -18,7 +18,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^6.4.1" + "astro": "^6.4.2" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 33ff8eaedae9..bc62438e81a3 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -13,6 +13,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^6.4.1" + "astro": "^6.4.2" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index ba98d02e1129..f383dc0b6710 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -13,6 +13,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^6.4.1" + "astro": "^6.4.2" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 8d5c2b008927..30fa4683a126 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -16,7 +16,7 @@ "dependencies": { "@astrojs/node": "^10.1.2", "@astrojs/svelte": "^8.1.2", - "astro": "^6.4.1", + "astro": "^6.4.2", "svelte": "^5.53.5" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index eb9b4666be8d..f8dc36aa6e74 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -9,7 +9,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^6.4.1", + "astro": "^6.4.2", "sass": "^1.97.3", "sharp": "^0.34.3" }, diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index e70cb2efb096..c3b10908ea3e 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@types/node": "^22.10.6", - "astro": "^6.4.1" + "astro": "^6.4.2" }, "engines": { "node": ">=22.12.0" diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 63e416fdd540..4052c12de294 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -14,6 +14,6 @@ }, "dependencies": { "@astrojs/markdoc": "^1.0.6", - "astro": "^6.4.1" + "astro": "^6.4.2" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index e484eb1bd916..b0d5e201a02f 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -15,7 +15,7 @@ "dependencies": { "@astrojs/mdx": "^6.0.1", "@astrojs/preact": "^5.1.4", - "astro": "^6.4.1", + "astro": "^6.4.2", "preact": "^10.28.4" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index d83ad941803f..370a85ec2cb3 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -15,7 +15,7 @@ "dependencies": { "@astrojs/preact": "^5.1.4", "@nanostores/preact": "^1.0.0", - "astro": "^6.4.1", + "astro": "^6.4.2", "nanostores": "^1.1.1", "preact": "^10.28.4" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 8fc4d62497f6..9347117dcd75 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -16,7 +16,7 @@ "@astrojs/mdx": "^6.0.1", "@tailwindcss/vite": "^4.2.1", "@types/canvas-confetti": "^1.9.0", - "astro": "^6.4.1", + "astro": "^6.4.2", "canvas-confetti": "^1.9.4", "tailwindcss": "^4.2.1" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index c89371ba7ab1..caabf32ef35c 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -14,7 +14,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^6.4.1", + "astro": "^6.4.2", "vitest": "^4.1.0" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 2aebb647377c..eeaf2d4b895e 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 6.4.2 + +### Patch Changes + +- [#16889](https://github.com/withastro/astro/pull/16889) [`b94bcfd`](https://github.com/withastro/astro/commit/b94bcfd8da64a3f2862a20572e7a9847aebdbc70) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes a `plugins is not iterable` crash when using a pre-6.0 `@astrojs/mdx` alongside integrations (e.g. Starlight) that set `markdown.remarkPlugins`, `markdown.rehypePlugins`, or `markdown.remarkRehype`. + +- [#16878](https://github.com/withastro/astro/pull/16878) [`b9f6bb9`](https://github.com/withastro/astro/commit/b9f6bb9a238b909d491ca4a7a99620908faf58a8) Thanks [@fkatsuhiro](https://github.com/fkatsuhiro)! - Fixes an issue where on-demand (SSR) dynamic routes would return 404 when a prerendered dynamic route with the same URL pattern was sorted first alphabetically. In production builds with `@astrojs/node` adapter, if `[a_prebuild].astro` (prerender=true) came before `[b_ssr].astro` alphabetically, requests to URLs not in the prerendered route's static paths would 404 instead of falling through to the SSR route. The fix adds fallthrough logic so that when a prerendered dynamic route matches but can't serve the request, Astro tries subsequent matching routes. + ## 6.4.1 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 7595ad7f5bd4..55ea2d9085c5 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "6.4.1", + "version": "6.4.2", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53c47f4b6947..b31bc199c265 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -197,7 +197,7 @@ importers: specifier: ^10.1.2 version: link:../../packages/integrations/node astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro hono: specifier: ^4.12.14 @@ -206,7 +206,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/blog: @@ -221,7 +221,7 @@ importers: specifier: ^3.7.3 version: link:../../packages/integrations/sitemap astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro sharp: specifier: ^0.34.3 @@ -230,7 +230,7 @@ importers: examples/component: devDependencies: astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/container-with-vitest: @@ -239,7 +239,7 @@ importers: specifier: ^5.0.6 version: link:../../packages/integrations/react astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -270,7 +270,7 @@ importers: specifier: ^3.15.8 version: 3.15.8 astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/framework-multiple: @@ -297,7 +297,7 @@ importers: specifier: ^18.3.7 version: 18.3.7(@types/react@18.3.28) astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro preact: specifier: ^10.28.4 @@ -327,7 +327,7 @@ importers: specifier: ^2.8.1 version: 2.8.2(preact@10.29.0) astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro preact: specifier: ^10.28.4 @@ -345,7 +345,7 @@ importers: specifier: ^18.3.7 version: 18.3.7(@types/react@18.3.28) astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -360,7 +360,7 @@ importers: specifier: ^6.0.1 version: link:../../packages/integrations/solid astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro solid-js: specifier: ^1.9.11 @@ -372,7 +372,7 @@ importers: specifier: ^8.1.2 version: link:../../packages/integrations/svelte astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro svelte: specifier: ^5.53.5 @@ -384,7 +384,7 @@ importers: specifier: ^6.0.1 version: link:../../packages/integrations/vue astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro vue: specifier: ^3.5.29 @@ -396,25 +396,25 @@ importers: specifier: ^10.1.2 version: link:../../packages/integrations/node astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/minimal: dependencies: astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/ssr: @@ -426,7 +426,7 @@ importers: specifier: ^8.1.2 version: link:../../packages/integrations/svelte astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro svelte: specifier: ^5.53.5 @@ -435,7 +435,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro sass: specifier: ^1.97.3 @@ -450,7 +450,7 @@ importers: specifier: ^22.19.0 version: 22.19.19 astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/with-markdoc: @@ -459,7 +459,7 @@ importers: specifier: ^1.0.6 version: link:../../packages/integrations/markdoc astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro examples/with-mdx: @@ -471,7 +471,7 @@ importers: specifier: ^5.1.4 version: link:../../packages/integrations/preact astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro preact: specifier: ^10.28.4 @@ -486,7 +486,7 @@ importers: specifier: ^1.0.0 version: 1.0.0(nanostores@1.1.1)(preact@10.29.0) astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro nanostores: specifier: ^1.1.1 @@ -507,7 +507,7 @@ importers: specifier: ^1.9.0 version: 1.9.0 astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro canvas-confetti: specifier: ^1.9.4 @@ -519,7 +519,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^6.4.1 + specifier: ^6.4.2 version: link:../../packages/astro vitest: specifier: ^4.1.0