Merge branch 'main' into arpan-withastro#12506-ref

.changeset/bright-toes-wink.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Removes encryption of empty props to allow server island cacheability

.changeset/curvy-pans-share.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/solid-js': patch
+---
+
+Adds the client entrypoint to `optimizeDeps.include`

.changeset/happy-pianos-report.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix Astro.currentLocale returning the incorrect locale when using fallback rewrites in SSR mode

.changeset/happy-radios-drive.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/upgrade': patch
+---
+
+Updates displayed data to show both source and target versions

.changeset/light-meals-press.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Skips updating content layer files if content is unchanged

.changeset/smart-ties-hear.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/react': patch
+---
+
+Removes react-specific entrypoints in `optimizeDeps.include` and rely on `@vitejs/plugin-react` to add

.changeset/tame-hats-kiss.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Improves the session error messages

.changeset/tiny-papayas-develop.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Ensures old content collection entry is deleted if a markdown frontmatter slug is changed in dev

.github/workflows/sync-examples.yml

@@ -3,6 +3,9 @@ name: Sync examples
 on:
   workflow_dispatch:
     inputs:
+      checkout-ref:
+        type: string
+        required: false
       skip-unchanged-check:
         type: boolean
         default: false
@@ -31,16 +34,25 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2 # fetch 2 to compare with previous commit for changes
+          ref: ${{ inputs.checkout-ref }}
 
       - name: Detect changesets
         uses: bluwy/detect-changesets-action@v1
         id: detect
 
+      - name: Get pre mode of changesets
+        id: pre
+        run: |
+          if [ -f ./.changeset/pre.json ]; then
+            pre_value=$(jq -r '.tag' ./.changeset/pre.json)
+            echo "value=$pre_value" >> $GITHUB_OUTPUT
+          fi
+
       # We only do sync if there are no changesets, so we don't accidentally allow users
       # to clone examples that may rely on unreleased code
 
-      - name: Sync from main branch to latest and examples/* branches
-        if: steps.detect.outputs.has-changesets == 'false' && github.ref == 'refs/heads/main'
+      - name: Sync stable to latest and examples/* branches
+        if: steps.detect.outputs.has-changesets == 'false' && github.ref == 'refs/heads/main' && steps.pre.outputs.value == ''
         uses: bluwy/auto-branch-sync-action@v1
         with:
           map: |
@@ -49,38 +61,24 @@ jobs:
           skip-unchanged-check: ${{ inputs.skip-unchanged-check == true }}
           dry-run: ${{ inputs.dry-run == true }}
 
-      - name: Check .changeset/pre.json for matching tag
-        if: steps.detect.outputs.has-changesets == 'false' && github.ref == 'refs/heads/next'
-        id: check-pre-mode
-        run: |
-          if [ -f ./.changeset/pre.json ]; then
-            if grep -q '"tag": "alpha"' ./.changeset/pre.json; then
-              echo "alpha=true" >> $GITHUB_OUTPUT
-            elif grep -q '"tag": "beta"' ./.changeset/pre.json; then
-              echo "beta=true" >> $GITHUB_OUTPUT
-            elif grep -q '"tag": "rc"' ./.changeset/pre.json; then
-              echo "rc=true" >> $GITHUB_OUTPUT
-            fi
-          fi
-
-      - name: Sync from next branch to alpha branch
-        if: steps.detect.outputs.has-changesets == 'false' && steps.check-pre-mode.outputs.alpha == 'true'
+      - name: Sync prerelease to alpha branch
+        if: steps.detect.outputs.has-changesets == 'false' && steps.pre.outputs.value == 'alpha'
         uses: bluwy/auto-branch-sync-action@v1
         with:
           map: / -> alpha
           skip-unchanged-check: ${{ inputs.skip-unchanged-check == true }}
           dry-run: ${{ inputs.dry-run == true }}
 
-      - name: Sync from next branch to beta branch
-        if: steps.detect.outputs.has-changesets == 'false' && steps.check-pre-mode.outputs.beta == 'true'
+      - name: Sync prerelease to beta branch
+        if: steps.detect.outputs.has-changesets == 'false' && steps.pre.outputs.value == 'beta'
         uses: bluwy/auto-branch-sync-action@v1
         with:
           map: / -> beta
           skip-unchanged-check: ${{ inputs.skip-unchanged-check == true }}
           dry-run: ${{ inputs.dry-run == true }}
 
-      - name: Sync from next branch to rc branch
-        if: steps.detect.outputs.has-changesets == 'false' && steps.check-pre-mode.outputs.rc == 'true'
+      - name: Sync prerelease to rc branch
+        if: steps.detect.outputs.has-changesets == 'false' && steps.pre.outputs.value == 'rc'
         uses: bluwy/auto-branch-sync-action@v1
         with:
           map: / -> rc

.gitignore

@@ -5,6 +5,7 @@ dist/
 .vercel
 .netlify
 _site/
+.astro/
 scripts/smoke/*-main/
 scripts/memory/project/src/pages/
 benchmark/projects/

benchmark/index.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { pathToFileURL } from 'node:url';
 import mri from 'mri';
 import { makeProject } from './bench/_util.js';
 

benchmark/make-project/_template.js

@@ -3,4 +3,6 @@
  * previous artifacts here before generating files.
  * @param {URL} projectDir
  */
+// biome-ignore lint/correctness/noUnusedVariables: parameters here are template placeholders
+// biome-ignore lint/correctness/noUnusedFunctionParameters: (same as above)
 export async function run(projectDir) {}

benchmark/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/mdx": "workspace:*",
-    "@astrojs/node": "^8.3.4",
+    "@astrojs/node": "^9.0.0",
     "@benchmark/timer": "workspace:*",
     "@benchmark/adapter": "workspace:*",
     "astro": "workspace:*",
@@ -24,7 +24,7 @@
     "tinyexec": "^0.3.1"
   },
   "devDependencies": {
-    "@codspeed/vitest-plugin": "3.1.1",
-    "vitest": "2.1.8"
+    "@codspeed/vitest-plugin": "4.0.0",
+    "vitest": "^3.0.0-beta.3"
   }
 }

benchmark/packages/adapter/src/index.ts

@@ -1,4 +1,4 @@
-import type { AstroAdapter, AstroIntegration } from 'astro';
+import type { AstroIntegration } from 'astro';
 
 export default function createIntegration(): AstroIntegration {
 	return {

biome.jsonc

@@ -34,6 +34,7 @@
 			"correctness": {
 				"noUnusedVariables": "info",
 				"noUnusedFunctionParameters": "info",
+				"noUnusedImports": "warn",
 			},
 		},
 	},
@@ -87,11 +88,12 @@
 			},
 		},
 		{
-			"include": ["*.astro", "client.d.ts"],
+			"include": ["*.astro", "client.d.ts", "jsx-runtime.d.ts"],
 			"linter": {
 				"rules": {
 					"correctness": {
 						"noUnusedVariables": "off",
+						"noUnusedImports": "off",
 					},
 				},
 			},

examples/basics/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.0.3"
+    "astro": "^5.1.5"
   }
 }

examples/blog/package.json

@@ -10,9 +10,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.0.1",
-    "@astrojs/rss": "^4.0.10",
+    "@astrojs/mdx": "^4.0.5",
+    "@astrojs/rss": "^4.0.11",
     "@astrojs/sitemap": "^3.2.1",
-    "astro": "^5.0.3"
+    "astro": "^5.1.5"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.0.3"
+    "astro": "^5.1.5"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

examples/container-with-vitest/package.json

@@ -11,11 +11,11 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@astrojs/react": "^4.0.0",
-    "astro": "^5.0.3",
+    "@astrojs/react": "^4.1.3",
+    "astro": "^5.1.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "vitest": "^2.1.6"
+    "vitest": "^3.0.0-beta.3"
   },
   "devDependencies": {
     "@types/react": "^18.3.12",

examples/framework-alpine/package.json

@@ -10,9 +10,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/alpinejs": "^0.4.0",
+    "@astrojs/alpinejs": "^0.4.1",
     "@types/alpinejs": "^3.13.10",
     "alpinejs": "^3.14.3",
-    "astro": "^5.0.3"
+    "astro": "^5.1.5"
   }
 }

examples/framework-multiple/package.json

@@ -10,14 +10,14 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^4.0.0",
-    "@astrojs/react": "^4.0.0",
-    "@astrojs/solid-js": "^5.0.0",
-    "@astrojs/svelte": "^7.0.1",
-    "@astrojs/vue": "^5.0.1",
+    "@astrojs/preact": "^4.0.1",
+    "@astrojs/react": "^4.1.3",
+    "@astrojs/solid-js": "^5.0.1",
+    "@astrojs/svelte": "^7.0.3",
+    "@astrojs/vue": "^5.0.4",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "astro": "^5.0.3",
+    "astro": "^5.1.5",
     "preact": "^10.24.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

examples/framework-preact/package.json

@@ -10,9 +10,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^4.0.0",
-    "@preact/signals": "^1.3.0",
-    "astro": "^5.0.3",
+    "@astrojs/preact": "^4.0.1",
+    "@preact/signals": "^2.0.0",
+    "astro": "^5.1.5",
     "preact": "^10.24.3"
   }
 }

examples/framework-react/package.json

@@ -10,10 +10,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^4.0.0",
+    "@astrojs/react": "^4.1.3",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "astro": "^5.0.3",
+    "astro": "^5.1.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

examples/framework-solid/package.json

@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/solid-js": "^5.0.0",
-    "astro": "^5.0.3",
+    "@astrojs/solid-js": "^5.0.1",
+    "astro": "^5.1.5",
     "solid-js": "^1.9.3"
   }
 }

examples/framework-svelte/package.json

@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/svelte": "^7.0.1",
-    "astro": "^5.0.3",
+    "@astrojs/svelte": "^7.0.3",
+    "astro": "^5.1.5",
     "svelte": "^5.1.16"
   }
 }

examples/framework-vue/package.json

@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^5.0.1",
-    "astro": "^5.0.3",
+    "@astrojs/vue": "^5.0.4",
+    "astro": "^5.1.5",
     "vue": "^3.5.12"
   }
 }

examples/hackernews/package.json

@@ -11,6 +11,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^9.0.0",
-    "astro": "^5.0.3"
+    "astro": "^5.1.5"
   }
 }

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.0.3"
+    "astro": "^5.1.5"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/minimal/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.0.3"
+    "astro": "^5.1.5"
   }
 }

examples/portfolio/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.0.3"
+    "astro": "^5.1.5"
   }
 }