Merge branch 'main' into arpan-withastro#12252-mdx-islands

.changeset/blue-gorillas-accept.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a bug where content types were not generated when first running astro dev unless src/content exists

.changeset/breezy-brooms-count.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Bumps Vite to ^6.0.1 and handles its breaking changes

.changeset/eighty-crabs-cross.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/solid-js': patch
+---
+
+Updates vite-plugin-solid to handle Vite 6

.changeset/fair-ears-compare.md

@@ -0,0 +1,16 @@
+---
+'@astrojs/markdoc': minor
+'@astrojs/preact': minor
+'@astrojs/svelte': minor
+'@astrojs/react': minor
+'@astrojs/solid-js': minor
+'@astrojs/mdx': minor
+'@astrojs/vue': minor
+'create-astro': minor
+'@astrojs/prism': minor
+'@astrojs/telemetry': minor
+'@astrojs/upgrade': minor
+'astro': minor
+---
+
+Drops node 21 support

.changeset/lemon-frogs-wait.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/svelte': major
+---
+
+Updates `@sveltejs/vite-plugin-svelte` to v5 to handle Vite 6

.changeset/pre.json

@@ -36,6 +36,7 @@
     "blue-sloths-stare",
     "blue-socks-doubt",
     "brave-elephants-fly",
+    "breezy-brooms-count",
     "breezy-colts-promise",
     "bright-keys-sell",
     "brown-bulldogs-share",
@@ -56,9 +57,11 @@
     "eight-seahorses-attend",
     "eighty-bags-cross",
     "eighty-boxes-applaud",
+    "eighty-crabs-cross",
     "eighty-donkeys-fly",
     "eighty-ligers-punch",
     "empty-houses-melt",
+    "fair-ears-compare",
     "five-jars-hear",
     "fluffy-jars-live",
     "forty-trains-notice",
@@ -78,6 +81,7 @@
     "hungry-jokes-try",
     "itchy-toys-march",
     "large-zebras-sniff",
+    "lemon-frogs-wait",
     "light-pears-accept",
     "long-lions-do",
     "long-months-rule",
@@ -113,6 +117,7 @@
     "sixty-coins-worry",
     "sixty-fishes-flow",
     "sixty-oranges-walk",
+    "slimy-jeans-train",
     "slimy-mice-dance",
     "slimy-queens-hang",
     "small-ties-sort",
@@ -133,7 +138,6 @@
     "twelve-comics-march",
     "twenty-cobras-push",
     "unlucky-bobcats-sit",
-    "unlucky-kids-compete",
     "violet-goats-grab",
     "wet-foxes-walk",
     "wise-carrots-float",

.changeset/slimy-jeans-train.md

@@ -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

.github/renovate.json5

@@ -16,6 +16,7 @@
     "@biomejs/biome",
     "@types/node",
     "@preact/preset-vite", // v2.8.3 starts to use Vite's esbuild for perf, but this conflicts with the react plugin
+    "astro-embed", // TODO: investigate upgrade (zod import issues with atproto)
     "drizzle-orm", // TODO: investigate upgrade (has type issues)
     "sharp",
 

.github/scripts/announce.mjs

@@ -6,7 +6,7 @@ import { setOutput } from './utils.mjs';
 const { GITHUB_REF = 'main' } = process.env;
 const baseUrl = new URL(`https://github.com/withastro/astro/blob/${GITHUB_REF}/`);
 
-const emojis = ['🎉', '🥳', '🚀', '🧑‍🚀', '🎊', '🏆', '✅', '🤩', '🤖', '🙌'];
+const emojis = ['🎉', '🥳', '🚀', '🧑', '🎊', '🏆', '✅', '🤩', '🤖', '🙌'];
 const descriptors = [
 	'new releases',
 	'hot and fresh updates',
@@ -141,7 +141,7 @@ async function generateMessage() {
 		message += `\nAlso ${item(extraVerbs)}:`;
 
 		const remainingPackages = packages.filter((p) => p.name !== name);
-		for (const { name, version, url } of remainingPackages) {
+		for (const { name, version, _url } of remainingPackages) {
 			message += `\n• \`${name}@${version}\``;
 		}
 
@@ -159,7 +159,7 @@ async function generateMessage() {
 
 async function run() {
 	const content = await generateMessage();
-	console.log(content);
+	console.info(content);
 	setOutput('DISCORD_MESSAGE', content);
 }
 

.github/workflows/benchmark.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/check.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/ci.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - main
-      - next
   merge_group:
   pull_request:
     paths-ignore:
@@ -39,7 +38,7 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest, windows-latest]
-        NODE_VERSION: [18]
+        NODE_VERSION: [22]
       fail-fast: true
     steps:
       # Disable crlf so all OS can share the same Turbo cache
@@ -86,7 +85,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
 
       - name: Install dependencies
@@ -109,12 +108,12 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest]
-        NODE_VERSION: [18, 20]
+        NODE_VERSION: [18, 20, 22]
         include:
           - os: macos-14
-            NODE_VERSION: 18
+            NODE_VERSION: 22
           - os: windows-latest
-            NODE_VERSION: 18
+            NODE_VERSION: 22
       fail-fast: false
     env:
       NODE_VERSION: ${{ matrix.NODE_VERSION }}
@@ -151,7 +150,7 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest, windows-latest]
-        NODE_VERSION: [18]
+        NODE_VERSION: [22]
       fail-fast: false
     env:
       NODE_VERSION: ${{ matrix.NODE_VERSION }}
@@ -188,7 +187,7 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest, windows-latest]
-        NODE_VERSION: [18]
+        NODE_VERSION: [22]
     env:
       NODE_VERSION: ${{ matrix.NODE_VERSION }}
     steps:

.github/workflows/continuous_benchmark.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
 
       - name: Install dependencies
@@ -47,7 +47,7 @@ jobs:
         run: pnpm run build
 
       - name: Run the benchmarks
-        uses: CodSpeedHQ/action@fa1dcde8d58f2ab0b407a6a24d6cc5a8c1444a8c # v3.1.0
+        uses: CodSpeedHQ/action@513a19673a831f139e8717bf45ead67e47f00044 # v3.2.0
         timeout-minutes: 30
         with:
           run: pnpm benchmark codspeed

.github/workflows/examples-deploy.yml

@@ -0,0 +1,22 @@
+# This workflow runs when changes to examples are pushed to main.
+# It calls a build hook on Netlify that will redeploy preview.astro.new with the latest changes.
+
+name: Redeploy preview.astro.new
+
+on:
+  push:
+    branches: 
+      - main
+    paths: 
+      - 'examples/**'
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Send a POST request to Netlify to rebuild preview.astro.new
+        run: 'curl -X POST -d {} ${{ env.BUILD_HOOK }}'
+        env:
+          BUILD_HOOK: ${{ secrets.NETLIFY_PREVIEWS_BUILD_HOOK }}

.github/workflows/preview-release.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
       - "1-legacy"
       - "2-legacy"
       - "3-legacy"
-      - next
+      - "4-legacy"
 
 defaults:
   run:
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/scripts.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
 
       - name: Install dependencies

.github/workflows/snapshot-release.yml

@@ -63,15 +63,21 @@ jobs:
           ref: ${{ steps.refs.outputs.head_ref }}
           fetch-depth: 0
 
-      - run: git fetch origin main:main
+      - name: Extract base branch from .changeset/config.json
+        id: getBaseBranch
+        run: |
+          baseBranch=$(jq -r '.baseBranch' .changeset/config.json)
+          echo "baseBranch=${baseBranch}" >> $GITHUB_OUTPUT
+
+      - run: git fetch origin ${{ steps.getBaseBranch.outputs.baseBranch }}:${{ steps.getBaseBranch.outputs.baseBranch }}
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v3
 
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           registry-url: "https://registry.npmjs.org"
           cache: "pnpm"
 

.github/workflows/sync-examples.yml

@@ -12,7 +12,6 @@ on:
   push:
     branches:
       - main
-      - next
 
 # Automatically cancel in-progress actions on the same branch
 concurrency:

.github/workflows/test-hosts.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install dependencies

benchmark/bench/_template.js

@@ -6,7 +6,7 @@ export const defaultProject = 'project-name';
  * Use `console.log` to report the results too. Logs that start with 10 `=`
  * and end with 10 `=` will be extracted by CI to display in the PR comment.
  * Usually after the first 10 `=` you'll want to add a title like `#### Test`.
- * @param {URL} projectDir
- * @param {URL} outputFile
+ * @param {URL} _projectDir
+ * @param {URL} _outputFile
  */
-export async function run(projectDir, outputFile) {}
+export async function run(_projectDir, _outputFile) {}

examples/basics/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.0.0-beta.11"
+    "astro": "^4.16.16"
   }
 }

examples/blog/package.json

@@ -10,9 +10,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.0.0-beta.4",
+    "@astrojs/mdx": "^3.1.9",
     "@astrojs/rss": "^4.0.9",
     "@astrojs/sitemap": "^3.2.1",
-    "astro": "^5.0.0-beta.11"
+    "astro": "^4.16.16"
   }
 }

examples/blog/src/components/HeaderLink.astro

@@ -4,10 +4,9 @@ import type { HTMLAttributes } from 'astro/types';
 type Props = HTMLAttributes<'a'>;
 
 const { href, class: className, ...props } = Astro.props;
-
-const { pathname } = Astro.url;
+const pathname = Astro.url.pathname.replace(import.meta.env.BASE_URL, '');
 const subpath = pathname.match(/[^\/]+/g);
-const isActive = href === pathname || href === '/' + subpath?.[0];
+const isActive = href === pathname || href === '/' + (subpath?.[0] || '');
 ---
 
 <a href={href} class:list={[className, { active: isActive }]} {...props}>

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.0.0-beta.11"
+    "astro": "^4.16.16"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

examples/container-with-vitest/package.json

@@ -11,11 +11,11 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "astro": "^5.0.0-beta.11",
-    "@astrojs/react": "^3.7.0-beta.1",
+    "@astrojs/react": "^4.0.0-beta.2",
+    "astro": "^5.0.0-beta.12",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "vitest": "^2.1.4"
+    "vitest": "^2.1.6"
   },
   "devDependencies": {
     "@types/react": "^18.3.12",