diff --git a/.changeset/dirty-teachers-know.md b/.changeset/dirty-teachers-know.md deleted file mode 100644 index 951117ffff1a..000000000000 --- a/.changeset/dirty-teachers-know.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes a potential null access in the clientside router diff --git a/.changeset/five-dolls-smash.md b/.changeset/five-dolls-smash.md deleted file mode 100644 index ad5e83fd9a84..000000000000 --- a/.changeset/five-dolls-smash.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -'@astrojs/svelte': major ---- - -Adds support for Svelte 5. Svelte 3 and 4 are no longer supported. - -The integration will now also no longer add `vitePreprocess()` by default if a preprocessor is not set up in `svelte.config.js`. It is recommended to set up the Svelte config manually so that features like IDE completion and syntax highlighting work properly. - -If you're using SCSS, Stylus, etc in your Svelte component style tags, make sure that the preprocessor is also set up in `svelte.config.js`. For example: - -```js -// svelte.config.js -import { vitePreprocess } from '@astrojs/svelte'; - -export default { - preprocess: vitePreprocess(), -}; -``` - -Refer to the [Svelte 5 migration guide](https://svelte.dev/docs/svelte/v5-migration-guide) and [`@sveltejs/vite-plugin-svelte` changelog](https://github.com/sveltejs/vite-plugin-svelte/blob/main/packages/vite-plugin-svelte/CHANGELOG.md#400) for details of their respective breaking changes. diff --git a/.changeset/slimy-pets-lick.md b/.changeset/slimy-pets-lick.md deleted file mode 100644 index 31065a6b6d7e..000000000000 --- a/.changeset/slimy-pets-lick.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes an issue where scripts were not correctly injected during the build. The issue was triggered when there were injected routes with the same `entrypoint` and different `pattern` diff --git a/.changeset/tasty-coats-repair.md b/.changeset/tasty-coats-repair.md deleted file mode 100644 index 10b97e1c3d45..000000000000 --- a/.changeset/tasty-coats-repair.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/solid-js': patch ---- - -Handles checking Svelte 5 component functions to avoid processing them as Solid components diff --git a/examples/basics/package.json b/examples/basics/package.json index bb6ca0e5dbfa..932cb1c6c980 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.16.12" + "astro": "^4.16.13" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index d7e3755bfb21..9983953cda52 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^3.1.9", "@astrojs/rss": "^4.0.9", "@astrojs/sitemap": "^3.2.1", - "astro": "^4.16.12" + "astro": "^4.16.13" } } diff --git a/examples/component/package.json b/examples/component/package.json index bef28130fe32..9226413bf9c3 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.16.12" + "astro": "^4.16.13" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json index a67eefdad308..0ab9720ad254 100644 --- a/examples/container-with-vitest/package.json +++ b/examples/container-with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest run" }, "dependencies": { - "astro": "^4.16.12", + "astro": "^4.16.13", "@astrojs/react": "^3.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index f9d0bf2340e6..9c201175bbf0 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.4.0", "@types/alpinejs": "^3.13.10", "alpinejs": "^3.14.3", - "astro": "^4.16.12" + "astro": "^4.16.13" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 66730f1ad759..9da0a1332ed5 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^4.3.0", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^4.16.12", + "astro": "^4.16.13", "lit": "^3.2.1" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index fa0af0805e23..e9c92a4a89e9 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -13,12 +13,12 @@ "dependencies": { "@astrojs/preact": "^3.5.3", "@astrojs/react": "^3.6.2", - "@astrojs/solid-js": "^4.4.2", - "@astrojs/svelte": "^5.7.3", + "@astrojs/solid-js": "^4.4.3", + "@astrojs/svelte": "^6.0.0", "@astrojs/vue": "^4.5.2", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "astro": "^4.16.12", + "astro": "^4.16.13", "preact": "^10.24.3", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 075f2287c9d8..7293b436cb5c 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.5.3", "@preact/signals": "^1.3.0", - "astro": "^4.16.12", + "astro": "^4.16.13", "preact": "^10.24.3" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 607ffdf2e64a..1b7870164a72 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.6.2", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "astro": "^4.16.12", + "astro": "^4.16.13", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 4445b4a102d7..14037fd84488 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/solid-js": "^4.4.2", - "astro": "^4.16.12", + "@astrojs/solid-js": "^4.4.3", + "astro": "^4.16.13", "solid-js": "^1.9.3" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 779267dd64ba..87530dfc52bc 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/svelte": "^5.7.3", - "astro": "^4.16.12", + "@astrojs/svelte": "^6.0.0", + "astro": "^4.16.13", "svelte": "^5.1.16" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 6f958985a460..153cd6a3cc1b 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^4.5.2", - "astro": "^4.16.12", + "astro": "^4.16.13", "vue": "^3.5.12" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index da868174d01c..e9c4d08ef9f2 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^8.3.4", - "astro": "^4.16.12" + "astro": "^4.16.13" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 86bfeaa8decd..394c38db51c2 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.16.12" + "astro": "^4.16.13" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 3af139efdc3c..577c43e9c4dd 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.16.12" + "astro": "^4.16.13" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 02c2c8384e2e..a9412fd04724 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.16.12" + "astro": "^4.16.13" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index acc59c15340c..f3fd53b2a5f4 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,8 +13,8 @@ }, "dependencies": { "@astrojs/node": "^8.3.4", - "@astrojs/svelte": "^5.7.3", - "astro": "^4.16.12", + "@astrojs/svelte": "^6.0.0", + "astro": "^4.16.13", "svelte": "^5.1.16" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index cf9aee8bad53..5bb986033e90 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.16.12", + "astro": "^4.16.13", "sass": "^1.80.6", "sharp": "^0.33.3" } diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index e8a23892ec5e..d64980b3b2b7 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -15,6 +15,6 @@ "./app": "./dist/app.js" }, "devDependencies": { - "astro": "^4.16.12" + "astro": "^4.16.13" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index bca2443b1c2c..4b5321bbddc0 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.11.5", - "astro": "^4.16.12" + "astro": "^4.16.13" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 70ba88b2fbb1..d372044bd47a 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^3.1.9", "@astrojs/preact": "^3.5.3", - "astro": "^4.16.12", + "astro": "^4.16.13", "preact": "^10.24.3" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 557adbaf1445..0069ff91aaf5 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.5.3", "@nanostores/preact": "^0.5.2", - "astro": "^4.16.12", + "astro": "^4.16.13", "nanostores": "^0.11.3", "preact": "^10.24.3" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 901f494c6546..feb9995419e3 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^3.1.9", "@astrojs/tailwind": "^5.1.2", "@types/canvas-confetti": "^1.6.4", - "astro": "^4.16.12", + "astro": "^4.16.13", "autoprefixer": "^10.4.20", "canvas-confetti": "^1.9.3", "postcss": "^8.4.47", diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 21ca1eac0a06..602430de6474 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^4.16.12", + "astro": "^4.16.13", "vitest": "^2.1.4" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 87d6178e1b2e..9e919f2e1b79 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 4.16.13 + +### Patch Changes + +- [#12436](https://github.com/withastro/astro/pull/12436) [`453ec6b`](https://github.com/withastro/astro/commit/453ec6b12f8c021e0bd0fd0ea9f71c8fc280f4b1) Thanks [@martrapp](https://github.com/martrapp)! - Fixes a potential null access in the clientside router + +- [#12392](https://github.com/withastro/astro/pull/12392) [`0462219`](https://github.com/withastro/astro/commit/0462219612183b65867aaaef9fa538d89f201999) Thanks [@apatel369](https://github.com/apatel369)! - Fixes an issue where scripts were not correctly injected during the build. The issue was triggered when there were injected routes with the same `entrypoint` and different `pattern` + ## 4.16.12 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index e7ddcb616e6e..70b89aa19a3a 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "4.16.12", + "version": "4.16.13", "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/solid/CHANGELOG.md b/packages/integrations/solid/CHANGELOG.md index 9f69e7e2f859..2ded2af1eeef 100644 --- a/packages/integrations/solid/CHANGELOG.md +++ b/packages/integrations/solid/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/solid-js +## 4.4.3 + +### Patch Changes + +- [#12364](https://github.com/withastro/astro/pull/12364) [`9fc2ab8`](https://github.com/withastro/astro/commit/9fc2ab8cc848739a21bfa3f754e9bec4926dc034) Thanks [@jdtjenkins](https://github.com/jdtjenkins)! - Handles checking Svelte 5 component functions to avoid processing them as Solid components + ## 4.4.2 ### Patch Changes diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index 228c3af1898f..103d7dae071a 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/solid-js", - "version": "4.4.2", + "version": "4.4.3", "description": "Use Solid components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/packages/integrations/svelte/CHANGELOG.md b/packages/integrations/svelte/CHANGELOG.md index 5e996c7160f5..4199a0dd698c 100644 --- a/packages/integrations/svelte/CHANGELOG.md +++ b/packages/integrations/svelte/CHANGELOG.md @@ -1,5 +1,26 @@ # @astrojs/svelte +## 6.0.0 + +### Major Changes + +- [#12364](https://github.com/withastro/astro/pull/12364) [`9fc2ab8`](https://github.com/withastro/astro/commit/9fc2ab8cc848739a21bfa3f754e9bec4926dc034) Thanks [@jdtjenkins](https://github.com/jdtjenkins)! - Adds support for Svelte 5. Svelte 3 and 4 are no longer supported. + + The integration will now also no longer add `vitePreprocess()` by default if a preprocessor is not set up in `svelte.config.js`. It is recommended to set up the Svelte config manually so that features like IDE completion and syntax highlighting work properly. + + If you're using SCSS, Stylus, etc in your Svelte component style tags, make sure that the preprocessor is also set up in `svelte.config.js`. For example: + + ```js + // svelte.config.js + import { vitePreprocess } from '@astrojs/svelte'; + + export default { + preprocess: vitePreprocess(), + }; + ``` + + Refer to the [Svelte 5 migration guide](https://svelte.dev/docs/svelte/v5-migration-guide) and [`@sveltejs/vite-plugin-svelte` changelog](https://github.com/sveltejs/vite-plugin-svelte/blob/main/packages/vite-plugin-svelte/CHANGELOG.md#400) for details of their respective breaking changes. + ## 5.7.3 ### Patch Changes diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 7c38648d1744..017e9e2ea8b3 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/svelte", - "version": "5.7.3", + "version": "6.0.0", "description": "Use Svelte components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e3066152ca04..84f5b46758f6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -139,7 +139,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/blog: @@ -154,13 +154,13 @@ importers: specifier: ^3.2.1 version: link:../../packages/integrations/sitemap astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/container-with-vitest: @@ -169,7 +169,7 @@ importers: specifier: ^3.6.2 version: link:../../packages/integrations/react astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -200,7 +200,7 @@ importers: specifier: ^3.14.3 version: 3.14.3 astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/framework-lit: @@ -212,7 +212,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro lit: specifier: ^3.2.1 @@ -227,10 +227,10 @@ importers: specifier: ^3.6.2 version: link:../../packages/integrations/react '@astrojs/solid-js': - specifier: ^4.4.2 + specifier: ^4.4.3 version: link:../../packages/integrations/solid '@astrojs/svelte': - specifier: ^5.7.3 + specifier: ^6.0.0 version: link:../../packages/integrations/svelte '@astrojs/vue': specifier: ^4.5.2 @@ -242,7 +242,7 @@ importers: specifier: ^18.3.1 version: 18.3.1 astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -272,7 +272,7 @@ importers: specifier: ^1.3.0 version: 1.3.0(preact@10.24.3) astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -290,7 +290,7 @@ importers: specifier: ^18.3.1 version: 18.3.1 astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -302,10 +302,10 @@ importers: examples/framework-solid: dependencies: '@astrojs/solid-js': - specifier: ^4.4.2 + specifier: ^4.4.3 version: link:../../packages/integrations/solid astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro solid-js: specifier: ^1.9.3 @@ -314,10 +314,10 @@ importers: examples/framework-svelte: dependencies: '@astrojs/svelte': - specifier: ^5.7.3 + specifier: ^6.0.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro svelte: specifier: ^5.1.16 @@ -329,7 +329,7 @@ importers: specifier: ^4.5.2 version: link:../../packages/integrations/vue astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro vue: specifier: ^3.5.12 @@ -341,25 +341,25 @@ importers: specifier: ^8.3.4 version: 8.3.4(astro@packages+astro) astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/minimal: dependencies: astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/ssr: @@ -368,10 +368,10 @@ importers: specifier: ^8.3.4 version: 8.3.4(astro@packages+astro) '@astrojs/svelte': - specifier: ^5.7.3 + specifier: ^6.0.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro svelte: specifier: ^5.1.16 @@ -380,7 +380,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro sass: specifier: ^1.80.6 @@ -392,7 +392,7 @@ importers: examples/toolbar-app: devDependencies: astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/with-markdoc: @@ -401,7 +401,7 @@ importers: specifier: ^0.11.5 version: link:../../packages/integrations/markdoc astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro examples/with-mdx: @@ -413,7 +413,7 @@ importers: specifier: ^3.5.3 version: link:../../packages/integrations/preact astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -428,7 +428,7 @@ importers: specifier: ^0.5.2 version: 0.5.2(nanostores@0.11.3)(preact@10.24.3) astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro nanostores: specifier: ^0.11.3 @@ -449,7 +449,7 @@ importers: specifier: ^1.6.4 version: 1.6.4 astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro autoprefixer: specifier: ^10.4.20 @@ -467,7 +467,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^4.16.12 + specifier: ^4.16.13 version: link:../../packages/astro vitest: specifier: ^2.1.4