diff --git a/.changeset/clean-tools-promise.md b/.changeset/clean-tools-promise.md deleted file mode 100644 index 1ce31a65498f..000000000000 --- a/.changeset/clean-tools-promise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Ensures consistent behaviour of `Astro.rewrite`/`ctx.rewrite` when using `base` and `trailingSlash` options. diff --git a/.changeset/itchy-buckets-dream.md b/.changeset/itchy-buckets-dream.md deleted file mode 100644 index 3c26324bf2ce..000000000000 --- a/.changeset/itchy-buckets-dream.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/vue': patch ---- - -Fixes a case where the compiler could not be resolved automatically diff --git a/.changeset/modern-seals-sell.md b/.changeset/modern-seals-sell.md deleted file mode 100644 index 40e14b0edeca..000000000000 --- a/.changeset/modern-seals-sell.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -'astro': patch ---- - -Ensures that `Astro.url`/`ctx.url` is correctly updated with the `base` path after rewrites. - -This change fixes an issue where `Astro.url`/`ctx.url` did not include the configured base path after Astro.rewrite was called. Now, the base path is correctly reflected in Astro.url. - -Previously, any rewrites performed through `Astro.rewrite`/`ctx.rewrite` failed to append the base path to `Astro.url`/`ctx.rewrite`, which could lead to incorrect URL handling in downstream logic. By fixing this, we ensure that all routes remain consistent and predictable after a rewrite. - -If you were relying on the work around of including the base path in astro.rewrite you can now remove it from the path. diff --git a/examples/basics/package.json b/examples/basics/package.json index ddc72560a8e0..e8e25f82b06b 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.3.0" + "astro": "^5.3.1" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 80a9232a8150..24354aa6f8b3 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -13,6 +13,6 @@ "@astrojs/mdx": "^4.0.8", "@astrojs/rss": "^4.0.11", "@astrojs/sitemap": "^3.2.1", - "astro": "^5.3.0" + "astro": "^5.3.1" } } diff --git a/examples/component/package.json b/examples/component/package.json index a17451176206..f962d0dd3cdf 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^5.3.0" + "astro": "^5.3.1" }, "peerDependencies": { "astro": "^4.0.0 || ^5.0.0" diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json index 7210301bb784..1df03f11b68b 100644 --- a/examples/container-with-vitest/package.json +++ b/examples/container-with-vitest/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/react": "^4.2.0", - "astro": "^5.3.0", + "astro": "^5.3.1", "react": "^18.3.1", "react-dom": "^18.3.1", "vitest": "^3.0.5" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 422f927296ad..82415dad51fe 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -13,6 +13,6 @@ "@astrojs/alpinejs": "^0.4.3", "@types/alpinejs": "^3.13.11", "alpinejs": "^3.14.8", - "astro": "^5.3.0" + "astro": "^5.3.1" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 571b47b2e5f8..f429275bf086 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -14,10 +14,10 @@ "@astrojs/react": "^4.2.0", "@astrojs/solid-js": "^5.0.4", "@astrojs/svelte": "^7.0.4", - "@astrojs/vue": "^5.0.6", + "@astrojs/vue": "^5.0.7", "@types/react": "^18.3.18", "@types/react-dom": "^18.3.5", - "astro": "^5.3.0", + "astro": "^5.3.1", "preact": "^10.25.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 67a41c78b4aa..b76a1c2d5e47 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/preact": "^4.0.4", "@preact/signals": "^2.0.1", - "astro": "^5.3.0", + "astro": "^5.3.1", "preact": "^10.25.4" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 871759c7513e..e34457936a55 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -13,7 +13,7 @@ "@astrojs/react": "^4.2.0", "@types/react": "^18.3.18", "@types/react-dom": "^18.3.5", - "astro": "^5.3.0", + "astro": "^5.3.1", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index f95733029528..fcdb79b83df0 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@astrojs/solid-js": "^5.0.4", - "astro": "^5.3.0", + "astro": "^5.3.1", "solid-js": "^1.9.4" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 3ce9e94bfbc9..a9646a800ccc 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@astrojs/svelte": "^7.0.4", - "astro": "^5.3.0", + "astro": "^5.3.1", "svelte": "^5.19.7" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 279712ecbe19..9643a3426b95 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/vue": "^5.0.6", - "astro": "^5.3.0", + "@astrojs/vue": "^5.0.7", + "astro": "^5.3.1", "vue": "^3.5.13" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index c4c628ea15c0..bff2289cc82d 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -11,6 +11,6 @@ }, "dependencies": { "@astrojs/node": "^9.1.0", - "astro": "^5.3.0" + "astro": "^5.3.1" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 5737dd024935..0b147de0276e 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^5.3.0" + "astro": "^5.3.1" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index ad1145f2e103..ee25b518e8cb 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.3.0" + "astro": "^5.3.1" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 95bff2c55982..794692032f46 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.3.0" + "astro": "^5.3.1" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 554cbbc3202a..1b1dc03cd8ef 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/node": "^9.1.0", "@astrojs/svelte": "^7.0.4", - "astro": "^5.3.0", + "astro": "^5.3.1", "svelte": "^5.19.7" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index edb201ac2734..addd00814e78 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -9,7 +9,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.3.0", + "astro": "^5.3.1", "sass": "^1.83.4", "sharp": "^0.33.3" } diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index 3edec99c13dc..463af0292ef4 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -16,6 +16,6 @@ }, "devDependencies": { "@types/node": "^18.17.8", - "astro": "^5.3.0" + "astro": "^5.3.1" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index b27aaadc6761..b0e190fad14b 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -11,6 +11,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.12.9", - "astro": "^5.3.0" + "astro": "^5.3.1" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index c2e6bb8783cf..ce69e6d5cdbb 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/mdx": "^4.0.8", "@astrojs/preact": "^4.0.4", - "astro": "^5.3.0", + "astro": "^5.3.1", "preact": "^10.25.4" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 0f8c3687a77c..c4ab506bf0a1 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/preact": "^4.0.4", "@nanostores/preact": "^0.5.2", - "astro": "^5.3.0", + "astro": "^5.3.1", "nanostores": "^0.11.3", "preact": "^10.25.4" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 7eca55315fef..978532602c57 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -13,7 +13,7 @@ "@astrojs/mdx": "^4.0.8", "@tailwindcss/vite": "^4.0.3", "@types/canvas-confetti": "^1.9.0", - "astro": "^5.3.0", + "astro": "^5.3.1", "canvas-confetti": "^1.9.3", "tailwindcss": "^4.0.3" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 684eedb304d3..e586f54698a7 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -11,7 +11,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^5.3.0", + "astro": "^5.3.1", "vitest": "^3.0.5" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 0b4eadbc8cea..873735935364 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,19 @@ # astro +## 5.3.1 + +### Patch Changes + +- [#13233](https://github.com/withastro/astro/pull/13233) [`32fafeb`](https://github.com/withastro/astro/commit/32fafeb874cc4b6312eb50d54d9f0ca6b83aedbc) Thanks [@joshmkennedy](https://github.com/joshmkennedy)! - Ensures consistent behaviour of `Astro.rewrite`/`ctx.rewrite` when using `base` and `trailingSlash` options. + +- [#13233](https://github.com/withastro/astro/pull/13233) [`32fafeb`](https://github.com/withastro/astro/commit/32fafeb874cc4b6312eb50d54d9f0ca6b83aedbc) Thanks [@joshmkennedy](https://github.com/joshmkennedy)! - Ensures that `Astro.url`/`ctx.url` is correctly updated with the `base` path after rewrites. + + This change fixes an issue where `Astro.url`/`ctx.url` did not include the configured base path after Astro.rewrite was called. Now, the base path is correctly reflected in Astro.url. + + Previously, any rewrites performed through `Astro.rewrite`/`ctx.rewrite` failed to append the base path to `Astro.url`/`ctx.rewrite`, which could lead to incorrect URL handling in downstream logic. By fixing this, we ensure that all routes remain consistent and predictable after a rewrite. + + If you were relying on the work around of including the base path in astro.rewrite you can now remove it from the path. + ## 5.3.0 ### Minor Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 752a2073513e..0ae081641828 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "5.3.0", + "version": "5.3.1", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/integrations/vue/CHANGELOG.md b/packages/integrations/vue/CHANGELOG.md index 5281434384e0..e01cb1d0ec05 100644 --- a/packages/integrations/vue/CHANGELOG.md +++ b/packages/integrations/vue/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/vue +## 5.0.7 + +### Patch Changes + +- [#13251](https://github.com/withastro/astro/pull/13251) [`3842ce5`](https://github.com/withastro/astro/commit/3842ce5ec9471d358042b3d9ef697cf06c7a91f6) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes a case where the compiler could not be resolved automatically + ## 5.0.6 ### Patch Changes diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index de3a93e5140e..406cf18ed616 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/vue", - "version": "5.0.6", + "version": "5.0.7", "description": "Use Vue components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7fa78dd7712..c8da4cd2cbb9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -142,7 +142,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/blog: @@ -157,13 +157,13 @@ importers: specifier: ^3.2.1 version: link:../../packages/integrations/sitemap astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/container-with-vitest: @@ -172,7 +172,7 @@ importers: specifier: ^4.2.0 version: link:../../packages/integrations/react astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -203,7 +203,7 @@ importers: specifier: ^3.14.8 version: 3.14.8 astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/framework-multiple: @@ -221,7 +221,7 @@ importers: specifier: ^7.0.4 version: link:../../packages/integrations/svelte '@astrojs/vue': - specifier: ^5.0.6 + specifier: ^5.0.7 version: link:../../packages/integrations/vue '@types/react': specifier: ^18.3.18 @@ -230,7 +230,7 @@ importers: specifier: ^18.3.5 version: 18.3.5(@types/react@18.3.18) astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro preact: specifier: ^10.25.4 @@ -260,7 +260,7 @@ importers: specifier: ^2.0.1 version: 2.0.1(preact@10.25.4) astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro preact: specifier: ^10.25.4 @@ -278,7 +278,7 @@ importers: specifier: ^18.3.5 version: 18.3.5(@types/react@18.3.18) astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -293,7 +293,7 @@ importers: specifier: ^5.0.4 version: link:../../packages/integrations/solid astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro solid-js: specifier: ^1.9.4 @@ -305,7 +305,7 @@ importers: specifier: ^7.0.4 version: link:../../packages/integrations/svelte astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro svelte: specifier: ^5.19.7 @@ -314,10 +314,10 @@ importers: examples/framework-vue: dependencies: '@astrojs/vue': - specifier: ^5.0.6 + specifier: ^5.0.7 version: link:../../packages/integrations/vue astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro vue: specifier: ^3.5.13 @@ -329,25 +329,25 @@ importers: specifier: ^9.1.0 version: link:../../packages/integrations/node astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/minimal: dependencies: astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/ssr: @@ -359,7 +359,7 @@ importers: specifier: ^7.0.4 version: link:../../packages/integrations/svelte astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro svelte: specifier: ^5.19.7 @@ -368,7 +368,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro sass: specifier: ^1.83.4 @@ -383,7 +383,7 @@ importers: specifier: ^18.17.8 version: 18.19.50 astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/with-markdoc: @@ -392,7 +392,7 @@ importers: specifier: ^0.12.9 version: link:../../packages/integrations/markdoc astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro examples/with-mdx: @@ -404,7 +404,7 @@ importers: specifier: ^4.0.4 version: link:../../packages/integrations/preact astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro preact: specifier: ^10.25.4 @@ -419,7 +419,7 @@ importers: specifier: ^0.5.2 version: 0.5.2(nanostores@0.11.3)(preact@10.25.4) astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro nanostores: specifier: ^0.11.3 @@ -440,7 +440,7 @@ importers: specifier: ^1.9.0 version: 1.9.0 astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro canvas-confetti: specifier: ^1.9.3 @@ -452,7 +452,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^5.3.0 + specifier: ^5.3.1 version: link:../../packages/astro vitest: specifier: ^3.0.5