From 23dc937435e0dc89dee5e74e8870464160efb17c Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Thu, 21 Nov 2024 10:51:47 -0500 Subject: [PATCH] Merge main into next (#12493) * [ci] release (#12490) Co-authored-by: github-actions[bot] * Update solid version * update lockfile * fix vue changelog --------- Co-authored-by: Houston (Bot) <108291165+astrobot-houston@users.noreply.github.com> Co-authored-by: github-actions[bot] --- .changeset/strong-stingrays-provide.md | 9 --------- examples/framework-solid/package.json | 2 +- packages/integrations/preact/CHANGELOG.md | 2 +- packages/integrations/react/CHANGELOG.md | 2 +- packages/integrations/solid/CHANGELOG.md | 2 +- packages/integrations/svelte/CHANGELOG.md | 2 +- packages/integrations/vue/CHANGELOG.md | 12 ++++++------ pnpm-lock.yaml | 13 ++----------- 8 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 .changeset/strong-stingrays-provide.md diff --git a/.changeset/strong-stingrays-provide.md b/.changeset/strong-stingrays-provide.md deleted file mode 100644 index a98fea0f8df3..000000000000 --- a/.changeset/strong-stingrays-provide.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -'@astrojs/solid-js': patch -'@astrojs/vue': patch -'@astrojs/svelte': patch -'@astrojs/react': patch -'@astrojs/preact': patch ---- - -Resolve `vite` peer dependency problem for strict package managers like **Yarn in PnP mode**. diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 6eef341613b5..c32d501659d8 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,6 +12,6 @@ "dependencies": { "@astrojs/solid-js": "^4.4.4-beta.0", "astro": "^5.0.0-beta.9", - "solid-js": "^1.9.2" + "solid-js": "^1.9.3" } } diff --git a/packages/integrations/preact/CHANGELOG.md b/packages/integrations/preact/CHANGELOG.md index 1673a8415773..e99ca01e380f 100644 --- a/packages/integrations/preact/CHANGELOG.md +++ b/packages/integrations/preact/CHANGELOG.md @@ -1,6 +1,6 @@ # @astrojs/preact -## 3.5.4-beta.0 +## 3.5.4 ### Patch Changes diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md index 777f6b75ba55..45f9ffaebe90 100644 --- a/packages/integrations/react/CHANGELOG.md +++ b/packages/integrations/react/CHANGELOG.md @@ -1,6 +1,6 @@ # @astrojs/react -## 3.6.3-beta.0 +## 3.6.3 ### Patch Changes diff --git a/packages/integrations/solid/CHANGELOG.md b/packages/integrations/solid/CHANGELOG.md index 845b016f1485..3cca25757107 100644 --- a/packages/integrations/solid/CHANGELOG.md +++ b/packages/integrations/solid/CHANGELOG.md @@ -1,6 +1,6 @@ # @astrojs/solid-js -## 4.4.4-beta.0 +## 4.4.4 ### Patch Changes diff --git a/packages/integrations/svelte/CHANGELOG.md b/packages/integrations/svelte/CHANGELOG.md index f609cdfe0524..76b1bbff51d0 100644 --- a/packages/integrations/svelte/CHANGELOG.md +++ b/packages/integrations/svelte/CHANGELOG.md @@ -1,6 +1,6 @@ # @astrojs/svelte -## 6.0.2-beta.0 +## 6.0.2 ### Patch Changes diff --git a/packages/integrations/vue/CHANGELOG.md b/packages/integrations/vue/CHANGELOG.md index 9763a370e660..71f28ed6c9f9 100644 --- a/packages/integrations/vue/CHANGELOG.md +++ b/packages/integrations/vue/CHANGELOG.md @@ -1,11 +1,5 @@ # @astrojs/vue -## 5.0.0-beta.2 - -### Patch Changes - -- [#12481](https://github.com/withastro/astro/pull/12481) [`8a46e80`](https://github.com/withastro/astro/commit/8a46e8074d6afb4a23badbd59ed239d526294e8c) Thanks [@marbrex](https://github.com/marbrex)! - Resolve `vite` peer dependency problem for strict package managers like **Yarn in PnP mode**. - ## 5.0.0-beta.1 ### Patch Changes @@ -25,6 +19,12 @@ - Updated dependencies [[`b6fbdaa`](https://github.com/withastro/astro/commit/b6fbdaa94a9ecec706a99e1938fbf5cd028c72e0), [`89bab1e`](https://github.com/withastro/astro/commit/89bab1e70786123fbe933a9d7a1b80c9334dcc5f), [`d74617c`](https://github.com/withastro/astro/commit/d74617cbd3278feba05909ec83db2d73d57a153e), [`e90f559`](https://github.com/withastro/astro/commit/e90f5593d23043579611452a84b9e18ad2407ef9), [`2df49a6`](https://github.com/withastro/astro/commit/2df49a6fb4f6d92fe45f7429430abe63defeacd6), [`8a53517`](https://github.com/withastro/astro/commit/8a5351737d6a14fc55f1dafad8f3b04079e81af6)]: - astro@5.0.0-alpha.0 +## 4.5.3 + +### Patch Changes + +- [#12481](https://github.com/withastro/astro/pull/12481) [`8a46e80`](https://github.com/withastro/astro/commit/8a46e8074d6afb4a23badbd59ed239d526294e8c) Thanks [@marbrex](https://github.com/marbrex)! - Resolve `vite` peer dependency problem for strict package managers like **Yarn in PnP mode**. + ## 4.5.2 ### Patch Changes diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 860008b24815..8aa11a36d260 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -300,8 +300,8 @@ importers: specifier: ^5.0.0-beta.9 version: link:../../packages/astro solid-js: - specifier: ^1.9.2 - version: 1.9.2 + specifier: ^1.9.3 + version: 1.9.3 examples/framework-svelte: dependencies: @@ -10433,9 +10433,6 @@ packages: resolution: {integrity: sha512-TzobUYoEft/xBtb2voRPryAUIvYguG0V7Tt3de79I1WfXgCwelqVsGuZSnu3GFGRZhXR90AeEYIM+icuB/S06Q==} hasBin: true - solid-js@1.9.2: - resolution: {integrity: sha512-fe/K03nV+kMFJYhAOE8AIQHcGxB4rMIEoEyrulbtmf217NffbbwBqJnJI4ovt16e+kaIt0czE2WA7mP/pYN9yg==} - solid-js@1.9.3: resolution: {integrity: sha512-5ba3taPoZGt9GY3YlsCB24kCg0Lv/rie/HTD4kG6h4daZZz7+yK02xn8Vx8dLYBc9i6Ps5JwAbEiqjmKaLB3Ag==} @@ -16964,12 +16961,6 @@ snapshots: smartypants@0.2.2: {} - solid-js@1.9.2: - dependencies: - csstype: 3.1.3 - seroval: 1.1.1 - seroval-plugins: 1.1.1(seroval@1.1.1) - solid-js@1.9.3: dependencies: csstype: 3.1.3