Skip to content

Commit

Permalink
Merge branch 'next' into astro-dot-session
Browse files Browse the repository at this point in the history
  • Loading branch information
ascorbic committed Nov 27, 2024
2 parents dd3d990 + 9f44019 commit b7b1125
Show file tree
Hide file tree
Showing 64 changed files with 280 additions and 134 deletions.
5 changes: 5 additions & 0 deletions .changeset/breezy-brooms-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': major
---

Bumps Vite to ^6.0.1 and handles its breaking changes
5 changes: 5 additions & 0 deletions .changeset/eight-seahorses-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Handle multiple root nodes on SVG files
5 changes: 5 additions & 0 deletions .changeset/eighty-crabs-cross.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/solid-js': patch
---

Updates vite-plugin-solid to handle Vite 6
5 changes: 5 additions & 0 deletions .changeset/lemon-frogs-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/svelte': major
---

Updates `@sveltejs/vite-plugin-svelte` to v5 to handle Vite 6
8 changes: 7 additions & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"blue-socks-doubt",
"brave-elephants-fly",
"breezy-colts-promise",
"bright-keys-sell",
"brown-bulldogs-share",
"chatty-teachers-sit",
"chilly-terms-know",
Expand All @@ -52,6 +53,7 @@
"dry-worms-knock",
"dull-moles-talk",
"eight-days-sort",
"eight-seahorses-attend",
"eighty-bags-cross",
"eighty-boxes-applaud",
"eighty-donkeys-fly",
Expand Down Expand Up @@ -102,12 +104,14 @@
"proud-terms-swim",
"quick-ads-exercise",
"quick-onions-leave",
"red-paws-juggle",
"rotten-dodos-judge",
"rotten-phones-scream",
"selfish-cats-crash",
"selfish-impalas-grin",
"sharp-worms-sniff",
"sixty-coins-worry",
"sixty-fishes-flow",
"sixty-oranges-walk",
"slimy-mice-dance",
"slimy-queens-hang",
Expand All @@ -129,8 +133,10 @@
"twelve-comics-march",
"twenty-cobras-push",
"unlucky-bobcats-sit",
"unlucky-kids-compete",
"violet-goats-grab",
"wet-foxes-walk",
"wise-carrots-float"
"wise-carrots-float",
"young-terms-hammer"
]
}
9 changes: 9 additions & 0 deletions .changeset/slimy-jeans-train.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@astrojs/preact': major
'@astrojs/svelte': major
'@astrojs/react': major
'@astrojs/solid-js': major
'@astrojs/vue': major
---

Updates Vite dependency to v6 to match Astro v5
5 changes: 0 additions & 5 deletions .changeset/unlucky-kids-compete.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/young-terms-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/mdx': patch
---

Fixes a case where the MDX renderer couldn't be loaded when used as a direct dependency of an Astro integration.
2 changes: 1 addition & 1 deletion examples/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
}
}
4 changes: 2 additions & 2 deletions examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^4.0.0-beta.3",
"@astrojs/mdx": "^4.0.0-beta.4",
"@astrojs/rss": "^4.0.9",
"@astrojs/sitemap": "^3.2.1",
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
}
}
2 changes: 1 addition & 1 deletion examples/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
},
"peerDependencies": {
"astro": "^4.0.0 || ^5.0.0"
Expand Down
6 changes: 3 additions & 3 deletions examples/container-with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"test": "vitest run"
},
"dependencies": {
"astro": "^5.0.0-beta.10",
"@astrojs/react": "^3.6.3-beta.0",
"@astrojs/react": "^3.7.0-beta.1",
"astro": "^5.0.0-beta.11",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "^2.1.4"
"vitest": "^2.1.6"
},
"devDependencies": {
"@types/react": "^18.3.12",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"@astrojs/alpinejs": "^0.4.0",
"@types/alpinejs": "^3.13.10",
"alpinejs": "^3.14.3",
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
}
}
4 changes: 2 additions & 2 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
},
"dependencies": {
"@astrojs/preact": "^3.5.4-beta.0",
"@astrojs/react": "^3.6.3-beta.0",
"@astrojs/react": "^3.7.0-beta.1",
"@astrojs/solid-js": "^4.4.4-beta.0",
"@astrojs/svelte": "^6.0.2-beta.0",
"@astrojs/vue": "^5.0.0-beta.2",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"preact": "^10.24.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/preact": "^3.5.4-beta.0",
"@preact/signals": "^1.3.0",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"preact": "^10.24.3"
}
}
4 changes: 2 additions & 2 deletions examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/react": "^3.6.3-beta.0",
"@astrojs/react": "^3.7.0-beta.1",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@astrojs/solid-js": "^4.4.4-beta.0",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"solid-js": "^1.9.3"
}
}
2 changes: 1 addition & 1 deletion examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@astrojs/svelte": "^6.0.2-beta.0",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"svelte": "^5.1.16"
}
}
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@astrojs/vue": "^5.0.0-beta.2",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"vue": "^3.5.12"
}
}
2 changes: 1 addition & 1 deletion examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
},
"dependencies": {
"@astrojs/node": "^9.0.0-alpha.1",
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
}
}
2 changes: 1 addition & 1 deletion examples/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
}
}
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
}
}
2 changes: 1 addition & 1 deletion examples/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/node": "^9.0.0-alpha.1",
"@astrojs/svelte": "^6.0.2-beta.0",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"svelte": "^5.1.16"
}
}
2 changes: 1 addition & 1 deletion examples/starlog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"sass": "^1.80.6",
"sharp": "^0.33.3"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/toolbar-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"./app": "./dist/app.js"
},
"devDependencies": {
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
}
}
2 changes: 1 addition & 1 deletion examples/with-markdoc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
},
"dependencies": {
"@astrojs/markdoc": "^0.12.0-beta.0",
"astro": "^5.0.0-beta.10"
"astro": "^5.0.0-beta.11"
}
}
4 changes: 2 additions & 2 deletions examples/with-mdx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^4.0.0-beta.3",
"@astrojs/mdx": "^4.0.0-beta.4",
"@astrojs/preact": "^3.5.4-beta.0",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"preact": "^10.24.3"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/preact": "^3.5.4-beta.0",
"@nanostores/preact": "^0.5.2",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"nanostores": "^0.11.3",
"preact": "^10.24.3"
}
Expand Down
6 changes: 3 additions & 3 deletions examples/with-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^4.0.0-beta.3",
"@astrojs/mdx": "^4.0.0-beta.4",
"@astrojs/tailwind": "^5.1.2",
"@types/canvas-confetti": "^1.6.4",
"astro": "^5.0.0-beta.10",
"astro": "^5.0.0-beta.11",
"autoprefixer": "^10.4.20",
"canvas-confetti": "^1.9.3",
"postcss": "^8.4.47",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.14"
}
}
4 changes: 2 additions & 2 deletions examples/with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "vitest"
},
"dependencies": {
"astro": "^5.0.0-beta.10",
"vitest": "^2.1.4"
"astro": "^5.0.0-beta.11",
"vitest": "^2.1.6"
}
}
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@
"typescript-eslint": "^8.13.0"
},
"pnpm": {
"overrides": {
"vitest>vite": "6.0.0-beta.6",
"vite-node>vite": "6.0.0-beta.6"
},
"peerDependencyRules": {
"allowAny": [
"astro",
Expand Down
22 changes: 22 additions & 0 deletions packages/astro/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# astro

## 5.0.0-beta.11

### Minor Changes

- [#12510](https://github.com/withastro/astro/pull/12510) [`14feaf3`](https://github.com/withastro/astro/commit/14feaf30e1a4266b8422865722a4478d39202404) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Changes the generated URL query param from `_astroAction` to `_action` when submitting a form using Actions. This avoids leaking the framework name into the URL bar, which may be considered a security issue.

### Patch Changes

- [#12522](https://github.com/withastro/astro/pull/12522) [`33b0e30`](https://github.com/withastro/astro/commit/33b0e305fe4ecabc30ffa823454395c973f92454) Thanks [@ascorbic](https://github.com/ascorbic)! - Fixes a bug where content config was ignored if it was outside of content dir and has a parent dir with an underscore

- [#12516](https://github.com/withastro/astro/pull/12516) [`cb9322c`](https://github.com/withastro/astro/commit/cb9322c763b5cd8e43afe77d30e86a0b7d72f894) Thanks [@stramel](https://github.com/stramel)! - Handle multiple root nodes on SVG files

- [#12511](https://github.com/withastro/astro/pull/12511) [`d023682`](https://github.com/withastro/astro/commit/d023682d6c6d8797f15f3c0f65893a4aa62e3b5b) Thanks [@stramel](https://github.com/stramel)! - Fix SVG Component sprite references

- [#12498](https://github.com/withastro/astro/pull/12498) [`b140a3f`](https://github.com/withastro/astro/commit/b140a3f6d821127f927b7cb938294549e41c5168) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a regression where Astro was trying to access `Request.headers`

## 5.0.0-beta.10

### Patch Changes
Expand Down Expand Up @@ -1391,6 +1407,12 @@
- Updated dependencies [[`83a2a64`](https://github.com/withastro/astro/commit/83a2a648418ad30f4eb781d1c1b5f2d8a8ac846e)]:
- @astrojs/[email protected]

## 4.16.15

### Patch Changes

- [#12498](https://github.com/withastro/astro/pull/12498) [`b140a3f`](https://github.com/withastro/astro/commit/b140a3f6d821127f927b7cb938294549e41c5168) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a regression where Astro was trying to access `Request.headers`

## 4.16.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@astrojs/tailwind": "workspace:*",
"astro": "workspace:*",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.47",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.14"
}
}
Loading

0 comments on commit b7b1125

Please sign in to comment.