Skip to content

Commit

Permalink
Merge main into next (#12493)
Browse files Browse the repository at this point in the history
* [ci] release (#12490)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Update solid version

* update lockfile

* fix vue changelog

---------

Co-authored-by: Houston (Bot) <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 21, 2024
1 parent dc3d842 commit 23dc937
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 31 deletions.
9 changes: 0 additions & 9 deletions .changeset/strong-stingrays-provide.md

This file was deleted.

2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/integrations/preact/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @astrojs/preact

## 3.5.4-beta.0
## 3.5.4

### Patch Changes

Expand Down
2 changes: 1 addition & 1 deletion packages/integrations/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @astrojs/react

## 3.6.3-beta.0
## 3.6.3

### Patch Changes

Expand Down
2 changes: 1 addition & 1 deletion packages/integrations/solid/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @astrojs/solid-js

## 4.4.4-beta.0
## 4.4.4

### Patch Changes

Expand Down
2 changes: 1 addition & 1 deletion packages/integrations/svelte/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @astrojs/svelte

## 6.0.2-beta.0
## 6.0.2

### Patch Changes

Expand Down
12 changes: 6 additions & 6 deletions packages/integrations/vue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)]:
- [email protected]

## 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
Expand Down
13 changes: 2 additions & 11 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 23dc937

Please sign in to comment.