diff --git a/.agents/skills/merge/fix-tests.md b/.agents/skills/merge/fix-tests.md
index 150183227818..52f0d5813adc 100644
--- a/.agents/skills/merge/fix-tests.md
+++ b/.agents/skills/merge/fix-tests.md
@@ -17,7 +17,17 @@ This skill follows a "fix and push" approach. After pushing, CI will re-run auto
 
 ## Steps
 
-### Step 1: Get CI failure logs
+### Step 1: Build all packages
+
+Before analyzing test failures, ensure all packages are built:
+
+```bash
+pnpm build
+```
+
+Fix any build errors first — these may be the cause of test failures downstream.
+
+### Step 2: Get CI failure logs
 
 Use the GitHub CLI to find the failed CI run and download its logs:
 
@@ -35,7 +45,7 @@ Parse the output to identify:
 - The specific test names that failed
 - The error messages and assertion diffs
 
-### Step 2: Analyze failures
+### Step 3: Analyze failures
 
 For each failure, determine the cause:
 
@@ -47,7 +57,7 @@ For each failure, determine the cause:
 
 4. **Configuration mismatches** — Test fixtures using config options that changed on `next`. Fix by updating the fixture config.
 
-### Step 3: Fix the failures
+### Step 4: Fix the failures
 
 For each failure:
 
@@ -68,7 +78,7 @@ For each failure:
 - Smoke tests — these are allowed to fail
 - `astro check` failures — these are permitted to fail
 
-### Step 4: Verify fixes locally (targeted only)
+### Step 5: Verify fixes locally (targeted only)
 
 Only run the specific tests you fixed, not the full suite:
 
@@ -78,7 +88,7 @@ pnpm -C <package-directory> exec astro-scripts test "test/<specific-test>.test.j
 
 This is a quick sanity check, not a replacement for CI. CI will do the full validation after you push.
 
-### Step 5: Rebuild if source files were modified
+### Step 6: Rebuild if source files were modified
 
 If you modified any source files in `packages/` (not just test files), rebuild the affected package:
 
@@ -88,7 +98,7 @@ pnpm -C packages/<affected-package> build
 
 Then re-run the specific affected tests to confirm.
 
-### Step 6: Ensure dependencies are up to date
+### Step 7: Ensure dependencies are up to date
 
 If the merge introduced new dependencies or changed versions, run:
 
diff --git a/.agents/skills/merge/resolve-conflicts.md b/.agents/skills/merge/resolve-conflicts.md
index f891a609eb94..ac3f1f06b866 100644
--- a/.agents/skills/merge/resolve-conflicts.md
+++ b/.agents/skills/merge/resolve-conflicts.md
@@ -1,6 +1,6 @@
-# Resolve Merge Conflicts
+# Verify Merge Conflict Resolutions
 
-Resolve merge conflicts from merging `main` into the `next` branch.
+Verify that the automated conflict resolution (which kept the "ours"/next side for JSON and YAML files) was correct, and fix any issues.
 
 **SCOPE: Do not spawn tasks/sub-agents.**
 
@@ -8,50 +8,66 @@ Resolve merge conflicts from merging `main` into the `next` branch.
 
 - **`prNumber`** — The PR number for the merge PR.
 - **`branch`** — The branch name (e.g., `ci/merge-main-to-next`).
-- The working directory is the repo root, checked out on the merge branch with conflict markers present.
+- The working directory is the repo root, checked out on the merge branch.
+- Dependencies are installed and packages are built.
+- Conflict markers in JSON/YAML files have already been stripped by the GitHub Action, keeping the "ours" (next) side. Source code files (`.ts`, `.js`, `.md`, `.astro`) may still have conflict markers.
 
-## Strategy
+## Background
 
-When resolving conflicts, follow these rules based on file type:
+The GitHub Action strips conflict markers from JSON/YAML files before `pnpm install` can run, always keeping the `next` branch side. This is usually correct (next has pre-release versions that must be preserved), but it may discard important changes from `main` — like new dependencies, updated dependency versions, or config changes from bug fixes.
 
-### Changeset files (`.changeset/*.md`)
-
-- If a changeset file exists on `main` but not on `next`, it was likely already released. **Delete it.** The clean-changesets skill will handle this more thoroughly, but removing obvious ones here unblocks the merge.
-- If both branches modified the same changeset, prefer the `next` version since it's the one targeting the upcoming major.
-
-### `package.json` and version files
+## Steps
 
-- **Prefer `next` branch versions.** The `next` branch has the pre-release versions (alpha/beta) which should not be overwritten by `main`'s stable versions.
-- For dependency version updates from `main`, accept those — they are typically patches/minors that should be forward-ported.
+### Step 1: Resolve any remaining conflict markers
 
-### `pnpm-lock.yaml`
+Check for conflict markers in source code files:
 
-- Do not try to manually resolve lockfile conflicts. Instead:
-  1. Accept the `next` version: `git checkout --theirs pnpm-lock.yaml`
-  2. The lockfile will be regenerated after `pnpm install` later.
+```bash
+grep -r "<<<<<<< " --include="*.ts" --include="*.js" --include="*.mjs" --include="*.cjs" --include="*.md" --include="*.astro" . 2>/dev/null | grep -v node_modules
+```
 
-### Source code (`packages/**/*.ts`, `packages/**/*.js`)
+If any exist, resolve them following these rules:
 
 - **Prefer `main` for bug fixes.** If `main` fixed a bug, that fix should carry over to `next`.
-- **Prefer `next` for API changes.** If `next` changed an API (new major version features), keep the `next` version and adapt the `main` fix to work with it if needed.
+- **Prefer `next` for API changes.** If `next` changed an API, keep the `next` version and adapt the `main` fix if needed.
 - When in doubt, prefer `next` — it's the forward-looking branch.
 
-### Test files
+After resolving, `git add` each file.
 
-- If tests conflict, prefer `next` and adapt. Tests on `next` may test new major-version behavior.
+### Step 2: Review what was lost from main
 
-### Configuration files (`.changeset/config.json`, `tsconfig.json`, etc.)
+Compare what `main` had in the conflicted files against what we kept:
 
-- Prefer `next` unless `main` has a clear fix that should be forward-ported.
+```bash
+# List files that were modified on both branches (potential conflict sites)
+git diff --name-only origin/next...origin/main -- '*.json' '*.yaml' '*.yml'
+```
 
-## Steps
+For each file, compare the `main` version to the current version:
+
+```bash
+git diff origin/main -- <file>
+```
+
+Look for:
+
+- **New dependencies** added on `main` that are missing from `next` — these should be added
+- **Dependency version bumps** on `main` that are higher than what's on `next` — these should typically be accepted (they're patches/minors)
+- **New scripts or config entries** added on `main` — these should be forward-ported
+- **Version fields** (`"version":`) — keep `next`'s pre-release versions, do NOT use `main`'s stable versions
+
+### Step 3: Apply corrections
+
+If you find changes from `main` that should have been kept:
+
+1. Apply those specific changes to the current files
+2. Run `pnpm install --no-frozen-lockfile` if you modified any `package.json` files
+3. `git add` the modified files
+
+### Step 4: Do NOT commit
 
-1. Run `git diff --name-only --diff-filter=U` to list all conflicted files.
-2. For each conflicted file, read the file and resolve the conflict following the strategy above.
-3. After resolving each file, run `git add <file>` to mark it as resolved.
-4. After all files are resolved, verify no conflict markers remain: `grep -r "<<<<<<< " --include="*.ts" --include="*.js" --include="*.json" --include="*.yaml" --include="*.yml" --include="*.md" .`
-5. Do NOT commit — the orchestrator will handle committing.
+The orchestrator will handle committing.
 
 ## Output
 
-Return the list of files that were resolved and whether all conflicts were successfully handled.
+Return whether the conflict resolutions were correct and what files (if any) needed corrections.
diff --git a/.flue/workflows/merge-fix/WORKFLOW.ts b/.flue/workflows/merge-fix/WORKFLOW.ts
index eb77a3637974..754b49dea01b 100644
--- a/.flue/workflows/merge-fix/WORKFLOW.ts
+++ b/.flue/workflows/merge-fix/WORKFLOW.ts
@@ -26,30 +26,25 @@ export const args = v.object({
 export default async function mergeFix(flue: FlueClient, { prNumber }: v.InferOutput<typeof args>) {
 	const branch = 'ci/merge-main-to-next';
 
-	// Step 1: Check for merge conflicts (unresolved conflict markers in files)
-	const conflictCheck = await flue.shell(
-		'git diff --check HEAD 2>&1 || grep -r "<<<<<<< " --include="*.ts" --include="*.js" --include="*.json" --include="*.yaml" --include="*.yml" --include="*.md" --include="*.mjs" --include="*.cjs" . 2>/dev/null | head -20',
-	);
-	const hasConflicts = conflictCheck.stdout.includes('<<<<<<<');
-
-	// Step 2: Resolve conflicts if any
-	if (hasConflicts) {
-		await flue.skill('merge/resolve-conflicts.md', {
-			args: { prNumber, branch },
-			result: v.object({
-				resolved: v.pipe(
-					v.boolean(),
-					v.description('true if all merge conflicts were resolved successfully'),
-				),
-				filesResolved: v.pipe(
-					v.array(v.string()),
-					v.description('List of files where conflicts were resolved'),
-				),
-			}),
-		});
-	}
+	// Step 1: Verify conflict resolutions and resolve any remaining source code conflicts.
+	// JSON/YAML conflicts were pre-stripped by the GitHub Action (keeping next side).
+	// This skill checks that nothing important from main was lost, and resolves
+	// any remaining conflict markers in .ts/.js/.md/.astro files.
+	const verifyResult = await flue.skill('merge/resolve-conflicts.md', {
+		args: { prNumber, branch },
+		result: v.object({
+			correct: v.pipe(
+				v.boolean(),
+				v.description('true if all conflict resolutions were correct or have been fixed'),
+			),
+			correctedFiles: v.pipe(
+				v.array(v.string()),
+				v.description('List of files that needed corrections after verification'),
+			),
+		}),
+	});
 
-	// Step 3: Remove stale changesets that were already released on main
+	// Step 2: Remove stale changesets that were already released on main
 	await flue.skill('merge/clean-changesets.md', {
 		args: { prNumber },
 		result: v.object({
@@ -60,7 +55,7 @@ export default async function mergeFix(flue: FlueClient, { prNumber }: v.InferOu
 		}),
 	});
 
-	// Step 4: Run tests and fix failures
+	// Step 3: Run tests and fix failures
 	const fixResult = await flue.skill('merge/fix-tests.md', {
 		args: { prNumber },
 		result: v.object({
@@ -78,13 +73,13 @@ export default async function mergeFix(flue: FlueClient, { prNumber }: v.InferOu
 		}),
 	});
 
-	// Step 5: Commit and push all changes
+	// Step 4: Commit and push all changes
 	const status = await flue.shell('git status --porcelain');
 	if (status.stdout.trim()) {
 		await flue.shell('git add -A');
 
 		const commitParts = [];
-		if (hasConflicts) commitParts.push('resolve merge conflicts');
+		if (verifyResult.correctedFiles.length > 0) commitParts.push('fix merge conflict resolutions');
 		if (fixResult.fixedFiles.length > 0) commitParts.push('fix test failures');
 		const commitMsg =
 			commitParts.length > 0
@@ -100,9 +95,11 @@ export default async function mergeFix(flue: FlueClient, { prNumber }: v.InferOu
 		}
 	}
 
-	// Step 6: Post a summary comment on the PR
+	// Step 5: Post a summary comment on the PR
 	const summaryParts = [];
-	if (hasConflicts) summaryParts.push('- Resolved merge conflicts');
+	if (verifyResult.correctedFiles.length > 0) {
+		summaryParts.push(`- Fixed conflict resolutions in: ${verifyResult.correctedFiles.join(', ')}`);
+	}
 	if (fixResult.fixedFiles.length > 0) {
 		summaryParts.push(`- Fixed test failures in: ${fixResult.fixedFiles.join(', ')}`);
 	}
@@ -134,7 +131,7 @@ ${fixResult.testsPass ? 'All tests pass — this PR should be ready for review.'
 	return {
 		pushed: true,
 		testsPass: fixResult.testsPass,
-		hasConflicts,
+		correctedFiles: verifyResult.correctedFiles,
 		remainingFailures: fixResult.remainingFailures,
 	};
 }
diff --git a/.github/workflows/merge-fix.yml b/.github/workflows/merge-fix.yml
index 239235776aa7..e5840acc434c 100644
--- a/.github/workflows/merge-fix.yml
+++ b/.github/workflows/merge-fix.yml
@@ -16,7 +16,6 @@ on:
 
 env:
   IMAGE: ghcr.io/${{ github.repository }}/flue-sandbox
-  PNPM_STORE_DIR: .pnpm-store
 
 concurrency:
   group: merge-fix
@@ -91,6 +90,37 @@ jobs:
             echo "skip=false" >> "$GITHUB_OUTPUT"
           fi
 
+      - name: Strip conflict markers from JSON/YAML files
+        if: steps.pr.outputs.number != '' && steps.attempts.outputs.skip != 'true'
+        # Merge conflicts in package.json files make pnpm install impossible.
+        # Strip conflict markers (keeping "ours"/next side) so pnpm can parse
+        # the workspace. The Flue verify skill will check via git diff whether
+        # anything important from main was lost and patch it back in.
+        run: |
+          node -e '
+            const fs = require("fs");
+            const path = require("path");
+            let count = 0;
+            function fix(dir) {
+              for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+                const full = path.join(dir, entry.name);
+                if (entry.isDirectory() && entry.name !== "node_modules" && entry.name !== ".git") {
+                  fix(full);
+                } else if (/\.(json|yaml|yml)$/.test(entry.name)) {
+                  let c = fs.readFileSync(full, "utf8");
+                  if (c.includes("<<<<<<<")) {
+                    c = c.replace(/^<{7}.*\n([\s\S]*?)^={7}\n[\s\S]*?^>{7}.*\n/gm, "$1");
+                    fs.writeFileSync(full, c);
+                    console.log("Stripped conflicts:", full);
+                    count++;
+                  }
+                }
+              }
+            }
+            fix(".");
+            console.log(count + " file(s) fixed");
+          '
+
       - name: Setup PNPM
         if: steps.pr.outputs.number != '' && steps.attempts.outputs.skip != 'true'
         uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
@@ -104,8 +134,6 @@ jobs:
 
       - name: Install deps
         if: steps.pr.outputs.number != '' && steps.attempts.outputs.skip != 'true'
-        # Use --no-frozen-lockfile because the merge may have introduced
-        # lockfile conflicts or new dependencies that need resolving
         run: pnpm install --no-frozen-lockfile
 
       - name: Build
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 7c2f4882bcf3..0d3cff73e004 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -20,6 +20,42 @@
 
 - [#16434](https://github.com/withastro/astro/pull/16434) [`ee079d4`](https://github.com/withastro/astro/commit/ee079d4c7f143076b84d663c832911009a077c7f) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where i18n domains would return 404 when `trailingSlash` is set to `never`.
 
+## 6.2.2
+
+### Patch Changes
+
+- [#16292](https://github.com/withastro/astro/pull/16292) [`00f48ee`](https://github.com/withastro/astro/commit/00f48ee25fdc072df93210fa2d6d24ea649d4ab1) Thanks [@p-linnane](https://github.com/p-linnane)! - Fixes head metadata propagation in dev for adapters that load modules in the `prerender` Vite environment, such as `@astrojs/cloudflare`. The `astro:head-metadata` plugin previously only tracked the `ssr` environment, so `maybeRenderHead()` could fire inside an unrelated component's `<template>` element, trapping subsequent hoisted `<style>` blocks.
+
+- [#16451](https://github.com/withastro/astro/pull/16451) [`778865f`](https://github.com/withastro/astro/commit/778865f4abe29f7dfa4009624f39e350b7735acd) Thanks [@maximslo](https://github.com/maximslo)! - Fixes build crash when processing animated AVIF images. Sharp now gracefully passes through unsupported image formats instead of crashing during the build.
+
+- [#16548](https://github.com/withastro/astro/pull/16548) [`7214d3e`](https://github.com/withastro/astro/commit/7214d3e134766c7324e76a0ec4c91050cf4a2a18) Thanks [@senutpal](https://github.com/senutpal)! - Fixes scoped styles applying to the wrong element when `vite.css.transformer` is set to `'lightningcss'` and a selector uses a nested `&` inside `:where(...)`, such as Tailwind v4's `space-x-*`, `space-y-*`, and `divide-*` utilities.
+
+- [#16566](https://github.com/withastro/astro/pull/16566) [`9ac96b4`](https://github.com/withastro/astro/commit/9ac96b406653d2993d35cd83dc5fa538b7417545) Thanks [@web-dev0521](https://github.com/web-dev0521)! - Fixes `data-astro-prefetch="tap"` not triggering when clicking nested elements (e.g. `<span>`, `<img>`, `<svg>`) inside an anchor tag.
+
+- [#15994](https://github.com/withastro/astro/pull/15994) [`1e70d18`](https://github.com/withastro/astro/commit/1e70d18febca2319487c9acbd9c2e18cb961aef0) Thanks [@ossaidqadri](https://github.com/ossaidqadri)! - Fix `<style>` compilation failure when importing Astro components via tsconfig path aliases
+
+- [#16144](https://github.com/withastro/astro/pull/16144) [`1cd6650`](https://github.com/withastro/astro/commit/1cd66504a63055dcbe54b5d3ec52cc220d3a82e1) Thanks [@fkatsuhiro](https://github.com/fkatsuhiro)! - Fixed a regression where `.html` was unexpectedly stripped from dynamic route parameters on non-page routes (`.ts` endpoints and redirects). This caused endpoints like `/some/[...id].ts` returning `id: 'file.html'` on `getStaticPaths` to not serve that file because the generated route (`/some/file.html`) would get matched as `id: file` that is not part of the list returned by `getStaticPaths`.
+
+- [#16415](https://github.com/withastro/astro/pull/16415) [`559c0fd`](https://github.com/withastro/astro/commit/559c0fd63ac8c051ee3bb634e06aadf48e8d8495) Thanks [@0xbejaxer](https://github.com/0xbejaxer)! - Fix CSS traversal boundaries so pages with `export const partial = true` still contribute styles when imported as components by other pages.
+
+- [#16516](https://github.com/withastro/astro/pull/16516) [`17f1867`](https://github.com/withastro/astro/commit/17f1867c177d99bc5fff31aa12f6c9ab35ef4581) Thanks [@fkatsuhiro](https://github.com/fkatsuhiro)! - Fixes an issue where the index route would return a 404 error when using a custom `base` path combined with `trailingSlash: 'never'`. This ensures that the home page and internal rewrites are correctly matched under these configurations.
+
+- [#16515](https://github.com/withastro/astro/pull/16515) [`280ec88`](https://github.com/withastro/astro/commit/280ec88c0d9c75755b7616263ce516ff2122fb81) Thanks [@jp-knj](https://github.com/jp-knj)! - Fixes an issue where `i18n.fallback` pages with `fallbackType: 'rewrite'` were emitted with empty bodies during `astro build`.
+
+- [#16565](https://github.com/withastro/astro/pull/16565) [`7959798`](https://github.com/withastro/astro/commit/7959798c33c8c5e70183e1af3ab5d9b9d663e494) Thanks [@enjoyandlove](https://github.com/enjoyandlove)! - Fixes session persistence when `session.delete()` is the first mutation in a request (no prior `get`, `set`, `has`, or `keys`). The session was marked dirty in memory, but persistence skipped the save because `#data` stayed `undefined`, so the backing store could still return the deleted key on the next request.
+
+- [#16527](https://github.com/withastro/astro/pull/16527) [`86fd80d`](https://github.com/withastro/astro/commit/86fd80dd17cf896e5eaa185b70576d839d789978) Thanks [@enjoyandlove](https://github.com/enjoyandlove)! - Prevents script deduplication state from being consumed while rendering inert `<template>` contexts.
+
+- [#16540](https://github.com/withastro/astro/pull/16540) [`e59c637`](https://github.com/withastro/astro/commit/e59c637fb6c589fff5b56b737bab57d7513b0559) Thanks [@ascorbic](https://github.com/ascorbic)! - Skips session storage reads when no session cookie is present. Previously, calling `session.get()` on a request without a session cookie would initialize the storage driver and make a read that was guaranteed to miss. On network-backed drivers this added latency and resource usage to every anonymous request.
+
+- [#16517](https://github.com/withastro/astro/pull/16517) [`6ab0b3c`](https://github.com/withastro/astro/commit/6ab0b3c0266fe9c13638e22d40d46f2603e6031d) Thanks [@adamchal](https://github.com/adamchal)! - Removes inline CSS for prerendered routes from the SSR manifest. The static HTML on disk already inlines those styles, and the SSR worker never renders prerendered routes, so the data was dead weight. Builds with many prerendered routes and `build.inlineStylesheets: "always"` (or `"auto"` with small stylesheets) will see a smaller SSR entry chunk, which reduces cold-start parse time on platforms like Cloudflare Workers.
+
+- [#16509](https://github.com/withastro/astro/pull/16509) [`d3d3557`](https://github.com/withastro/astro/commit/d3d3557c77decc59fca6f0bfbdc36ba65e420564) Thanks [@cyphercodes](https://github.com/cyphercodes)! - Fix conditional named slot callbacks receiving arguments from `Astro.slots.render()`.
+
+- [#16236](https://github.com/withastro/astro/pull/16236) [`c6b068e`](https://github.com/withastro/astro/commit/c6b068e905a1a7b6e6a0b813c2368586b70a2214) Thanks [@fkatsuhiro](https://github.com/fkatsuhiro)! - Fixes the `position` prop on `<Image />` and `<Picture />` components to correctly apply `object-position` styles
+
+- [#16018](https://github.com/withastro/astro/pull/16018) [`d14f47c`](https://github.com/withastro/astro/commit/d14f47c46da2f50f79e9b8cfb87eaca9db8e898b) Thanks [@felmonon](https://github.com/felmonon)! - Fix `defineLiveCollection()` so `LiveLoader` data types declared as interfaces are accepted.
+
 ## 6.2.1
 
 ### Patch Changes
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite
new file mode 100644
index 000000000000..0b58f0dca7d6
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite differ
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-shm b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-shm
new file mode 100644
index 000000000000..f26ad4485c44
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-shm differ
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-wal b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-wal
new file mode 100644
index 000000000000..c82de36a07be
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-wal differ
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite
new file mode 100644
index 000000000000..0b58f0dca7d6
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite differ
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-shm b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-shm
new file mode 100644
index 000000000000..df8967935204
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-shm differ
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-wal b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-wal
new file mode 100644
index 000000000000..602befb866a0
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-wal differ
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite
new file mode 100644
index 000000000000..0b58f0dca7d6
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite differ
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-shm b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-shm
new file mode 100644
index 000000000000..216a8d241d42
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-shm differ
diff --git a/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-wal b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-wal
new file mode 100644
index 000000000000..d8403402b7d4
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare-node-prerender-hmr/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-wal differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite
new file mode 100644
index 000000000000..0b58f0dca7d6
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-shm b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-shm
new file mode 100644
index 000000000000..50c459bbd837
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-shm differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-wal b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-wal
new file mode 100644
index 000000000000..1818fd68bebb
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/cache/miniflare-CacheObject/metadata.sqlite-wal differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite
new file mode 100644
index 000000000000..0b58f0dca7d6
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-shm b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-shm
new file mode 100644
index 000000000000..f4d58e3bc55c
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-shm differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-wal b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-wal
new file mode 100644
index 000000000000..80620ea59036
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/images/miniflare-images-KVNamespaceObject/metadata.sqlite-wal differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite
new file mode 100644
index 000000000000..0b58f0dca7d6
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-shm b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-shm
new file mode 100644
index 000000000000..ee0a836a7c66
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-shm differ
diff --git a/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-wal b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-wal
new file mode 100644
index 000000000000..643beddf8c70
Binary files /dev/null and b/packages/astro/e2e/fixtures/cloudflare/.wrangler/state/v3/kv/miniflare-KVNamespaceObject/metadata.sqlite-wal differ
diff --git a/packages/astro/e2e/fixtures/prefetch/src/pages/index.astro b/packages/astro/e2e/fixtures/prefetch/src/pages/index.astro
index eb6cddf94e36..ace5458f4696 100644
--- a/packages/astro/e2e/fixtures/prefetch/src/pages/index.astro
+++ b/packages/astro/e2e/fixtures/prefetch/src/pages/index.astro
@@ -13,6 +13,10 @@
     <br>
     <a id="prefetch-tap" href="/prefetch-tap" data-astro-prefetch="tap">tap</a>
     <br>
+    <a id="prefetch-tap-nested" href="/prefetch-tap-nested" data-astro-prefetch="tap"><span>tap nested</span></a>
+    <br>
+    <a id="prefetch-default-nested" href="/prefetch-default-nested"><span>default nested</span></a>
+    <br>
     <a id="prefetch-hover" href="/prefetch-hover" data-astro-prefetch="hover">hover</a>
     <br>
     <button id="prefetch-manual">manual</button>
diff --git a/packages/astro/e2e/fixtures/prefetch/src/pages/prefetch-default-nested.astro b/packages/astro/e2e/fixtures/prefetch/src/pages/prefetch-default-nested.astro
new file mode 100644
index 000000000000..ec60f453dd6b
--- /dev/null
+++ b/packages/astro/e2e/fixtures/prefetch/src/pages/prefetch-default-nested.astro
@@ -0,0 +1 @@
+<h1>Prefetch default nested</h1>
diff --git a/packages/astro/e2e/fixtures/prefetch/src/pages/prefetch-tap-nested.astro b/packages/astro/e2e/fixtures/prefetch/src/pages/prefetch-tap-nested.astro
new file mode 100644
index 000000000000..5f5ab3cb704e
--- /dev/null
+++ b/packages/astro/e2e/fixtures/prefetch/src/pages/prefetch-tap-nested.astro
@@ -0,0 +1 @@
+<h1>Prefetch tap nested</h1>
diff --git a/packages/astro/e2e/prefetch.test.ts b/packages/astro/e2e/prefetch.test.ts
index 27effdd70221..dc8bec517e4b 100644
--- a/packages/astro/e2e/prefetch.test.ts
+++ b/packages/astro/e2e/prefetch.test.ts
@@ -103,6 +103,19 @@ test.describe('Prefetch (default)', () => {
 		expect(reqUrls).toContainEqual('/prefetch-tap');
 	});
 
+	test('data-astro-prefetch="tap" should prefetch on tap when clicking a nested child element', async ({
+		page,
+		astro,
+	}) => {
+		await page.goto(astro.resolveUrl('/'));
+		expect(reqUrls).not.toContainEqual('/prefetch-tap-nested');
+		await Promise.all([
+			page.waitForEvent('request'), // wait prefetch request
+			page.locator('#prefetch-tap-nested span').click(),
+		]);
+		expect(reqUrls).toContainEqual('/prefetch-tap-nested');
+	});
+
 	test('data-astro-prefetch="hover" should prefetch on hover', async ({ page, astro }) => {
 		await page.goto(astro.resolveUrl('/'));
 		await expectUrlNotPrefetched('/prefetch-hover', page);
@@ -195,6 +208,32 @@ test.describe("Prefetch (prefetchAll: true, defaultStrategy: 'tap')", () => {
 		await expectUrlPrefetched('/prefetch-tap', page);
 	});
 
+	test('data-astro-prefetch="tap" should prefetch on tap when clicking a nested child element', async ({
+		page,
+		astro,
+	}) => {
+		await page.goto(astro.resolveUrl('/'));
+		await expectUrlNotPrefetched('/prefetch-tap-nested', page);
+		await Promise.all([
+			page.waitForEvent('request'), // wait prefetch request
+			page.locator('#prefetch-tap-nested span').click(),
+		]);
+		await expectUrlPrefetched('/prefetch-tap-nested', page);
+	});
+
+	test('link without data-astro-prefetch should prefetch on tap when clicking a nested child element', async ({
+		page,
+		astro,
+	}) => {
+		await page.goto(astro.resolveUrl('/'));
+		await expectUrlNotPrefetched('/prefetch-default-nested', page);
+		await Promise.all([
+			page.waitForEvent('request'), // wait prefetch request
+			page.locator('#prefetch-default-nested span').click(),
+		]);
+		await expectUrlPrefetched('/prefetch-default-nested', page);
+	});
+
 	test('data-astro-prefetch="hover" should prefetch on hover', async ({ page, astro }) => {
 		await page.goto(astro.resolveUrl('/'));
 		await expectUrlNotPrefetched('/prefetch-hover', page);
@@ -268,6 +307,19 @@ test.describe("Prefetch (prefetchAll: true, defaultStrategy: 'load')", () => {
 		await expectUrlPrefetched('/prefetch-tap', page);
 	});
 
+	test('data-astro-prefetch="tap" should prefetch on tap when clicking a nested child element', async ({
+		page,
+		astro,
+	}) => {
+		await page.goto(astro.resolveUrl('/'));
+		await expectUrlNotPrefetched('/prefetch-tap-nested', page);
+		await Promise.all([
+			page.waitForEvent('request'), // wait prefetch request
+			page.locator('#prefetch-tap-nested span').click(),
+		]);
+		await expectUrlPrefetched('/prefetch-tap-nested', page);
+	});
+
 	test('data-astro-prefetch="hover" should prefetch on hover', async ({ page, astro }) => {
 		await page.goto(astro.resolveUrl('/'));
 		await expectUrlNotPrefetched('/prefetch-hover', page);
@@ -361,6 +413,16 @@ test.describe('Prefetch (default), Experimental ({ clientPrerender: true })', ()
 		expect(await scriptIsInHead(page, '/prefetch-tap')).toBeTruthy();
 	});
 
+	test('data-astro-prefetch="tap" should prefetch on tap when clicking a nested child element', async ({
+		page,
+		astro,
+	}) => {
+		await page.goto(astro.resolveUrl('/'));
+		expect(await scriptIsInHead(page, '/prefetch-tap-nested')).toBeFalsy();
+		await page.locator('#prefetch-tap-nested span').dragTo(page.locator('#prefetch-hover'));
+		expect(await scriptIsInHead(page, '/prefetch-tap-nested')).toBeTruthy();
+	});
+
 	test('data-astro-prefetch="hover" should prefetch on hover', async ({ page, astro }) => {
 		await page.goto(astro.resolveUrl('/'));
 		expect(await scriptIsInHead(page, '/prefetch-hover')).toBeFalsy();
diff --git a/packages/astro/e2e/view-transitions.test.ts b/packages/astro/e2e/view-transitions.test.ts
index 741eb9d940f8..b4f6e4a188fe 100644
--- a/packages/astro/e2e/view-transitions.test.ts
+++ b/packages/astro/e2e/view-transitions.test.ts
@@ -26,9 +26,10 @@ test.afterAll(async () => {
 
 function collectLoads(page: Page) {
 	const loads: string[] = [];
-	page.on('load', async () => {
+	// Push synchronously; an async handler awaiting `page.title()` races with assertions (often on Firefox).
+	page.on('load', () => {
 		const url = page.url();
-		if (url !== 'about:blank') loads.push(await page.title());
+		if (url !== 'about:blank') loads.push(url);
 	});
 	return loads;
 }
@@ -148,7 +149,7 @@ test.describe('View Transitions', () => {
 
 		expect(
 			loads.length,
-			'There should be 2 page loads. The original, then going from 3 to 2',
+			'There should be 2 page loads. The initial navigation, then the full navigation from page 1 to page 3',
 		).toEqual(2);
 	});
 
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 528356ba0b95..9122cc1abea4 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -151,9 +151,11 @@
     "esbuild": "^0.27.3",
     "flattie": "^1.1.1",
     "fontace": "~0.4.1",
+    "get-tsconfig": "5.0.0-beta.4",
     "github-slugger": "^2.0.0",
     "html-escaper": "3.0.3",
     "http-cache-semantics": "^4.2.0",
+    "jsonc-parser": "^3.3.1",
     "js-yaml": "^4.1.1",
     "magic-string": "^0.30.21",
     "magicast": "^0.5.2",
@@ -173,7 +175,7 @@
     "tinyclip": "^0.1.12",
     "tinyexec": "^1.0.4",
     "tinyglobby": "^0.2.15",
-    "tsconfck": "^3.1.6",
+
     "ultrahtml": "^1.6.0",
     "unifont": "~0.7.4",
     "unist-util-visit": "^5.1.0",
diff --git a/packages/astro/src/assets/internal.ts b/packages/astro/src/assets/internal.ts
index f8798ad50cfe..dd4e4f632091 100644
--- a/packages/astro/src/assets/internal.ts
+++ b/packages/astro/src/assets/internal.ts
@@ -169,9 +169,32 @@ export async function getImage(
 			resolvedOptions['data-astro-image-fit'] = resolvedOptions.fit;
 		}
 
+		// Always output 'data-astro-image-pos', defaulting to 'center' if unspecified.
+		// This ensures compatibility with existing CSP tests and allows consistent CSS control.
+		const currentPosition = resolvedOptions.position || 'center';
+		resolvedOptions['data-astro-image-pos'] = currentPosition.replace(/\s+/g, '-');
+
 		if (resolvedOptions.position) {
 			// Normalize position value for data attribute (spaces to dashes)
-			resolvedOptions['data-astro-image-pos'] = resolvedOptions.position.replace(/\s+/g, '-');
+			// Apply object-position as inline style since position values are arbitrary
+			// and cannot be pre-enumerated in a static stylesheet like fit values can.
+			if (typeof resolvedOptions.style === 'object' && resolvedOptions.style !== null) {
+				if (!('objectPosition' in resolvedOptions.style)) {
+					resolvedOptions.style = {
+						...resolvedOptions.style,
+						objectPosition: resolvedOptions.position,
+					};
+				}
+			} else {
+				const existingStyle =
+					typeof resolvedOptions.style === 'string' ? resolvedOptions.style : '';
+				if (!existingStyle.includes('object-position')) {
+					const positionStyle = `object-position: ${resolvedOptions.position}`;
+					resolvedOptions.style = existingStyle
+						? existingStyle.replace(/;?\s*$/, '; ') + positionStyle
+						: positionStyle;
+				}
+			}
 		}
 	}
 
diff --git a/packages/astro/src/assets/services/sharp.ts b/packages/astro/src/assets/services/sharp.ts
index 2e24d61662c1..d9124fbb2098 100644
--- a/packages/astro/src/assets/services/sharp.ts
+++ b/packages/astro/src/assets/services/sharp.ts
@@ -156,9 +156,21 @@ const sharpService: LocalImageService<SharpImageServiceConfig> = {
 
 		// always call rotate to adjust for EXIF data orientation
 		result.rotate();
-
 		// get some information about the input
-		const { format } = await result.metadata();
+		let format: string | undefined;
+		try {
+			({ format } = await result.metadata());
+		} catch {
+			// Sharp cannot decode this image (e.g. animated AVIF sequences).
+			// Pass it through unmodified rather than crashing the build. When Sharp adds support for these
+			// formats, the image will be optimized automatically without code changes.
+			console.warn(
+				`⚠️  Astro could not optimize image "${transform.src}". ` +
+					`Sharp doesn't support this format. The image will be used unoptimized. ` +
+					`Consider converting to WebP or placing in the public/ folder.`,
+			);
+			return { data: inputBuffer, format: transform.format };
+		}
 
 		if (transform.width && transform.height) {
 			const fit: keyof FitEnum | undefined = transform.fit
diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts
index 1f716b43b08f..a09c9fd90550 100644
--- a/packages/astro/src/cli/add/index.ts
+++ b/packages/astro/src/cli/add/index.ts
@@ -1089,14 +1089,17 @@ async function updateTSConfig(
 	let inputConfig = await loadTSConfig(cwd);
 	let inputConfigText = '';
 
-	if (inputConfig === 'invalid-config' || inputConfig === 'unknown-error') {
+	if (inputConfig.error === 'invalid-config') {
+		logger.warn(`add`, `Couldn't parse tsconfig.json or jsconfig.json: ${inputConfig.message}`);
 		return 'failure';
-	} else if (inputConfig === 'missing-config') {
+	} else if (inputConfig.error === 'missing-config') {
 		logger.debug('add', "Couldn't find tsconfig.json or jsconfig.json, generating one");
+		const tsconfigFile = path.join(cwd, 'tsconfig.json');
 		inputConfig = {
 			tsconfig: defaultTSConfig,
-			tsconfigFile: path.join(cwd, 'tsconfig.json'),
+			tsconfigFile: tsconfigFile,
 			rawConfig: defaultTSConfig,
+			sources: [tsconfigFile],
 		};
 	} else {
 		inputConfigText = JSON.stringify(inputConfig.rawConfig, null, 2);
diff --git a/packages/astro/src/content/loaders/types.ts b/packages/astro/src/content/loaders/types.ts
index c171214ca0e4..c2e199694ba3 100644
--- a/packages/astro/src/content/loaders/types.ts
+++ b/packages/astro/src/content/loaders/types.ts
@@ -84,7 +84,7 @@ export interface LoadCollectionContext<TCollectionFilter = unknown> {
 }
 
 export interface LiveLoader<
-	TData extends Record<string, any> = Record<string, unknown>,
+	TData extends Record<string, any> = Record<string, any>,
 	TEntryFilter extends Record<string, any> | never = never,
 	TCollectionFilter extends Record<string, any> | never = never,
 	TError extends Error = Error,
diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts
index 71bbe7a7f25d..db20b804b33e 100644
--- a/packages/astro/src/content/vite-plugin-content-assets.ts
+++ b/packages/astro/src/content/vite-plugin-content-assets.ts
@@ -138,6 +138,7 @@ export function astroContentAssetPropagationPlugin({
 					}
 
 					const code = `
+					"use astro:head-inject";
 					async function getMod() {
 						return import(${JSON.stringify(basePath)});
 					}
diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts
index e4dac132ce89..776a85c2d30c 100644
--- a/packages/astro/src/core/build/plugins/plugin-css.ts
+++ b/packages/astro/src/core/build/plugins/plugin-css.ts
@@ -2,6 +2,7 @@ import type { BuildOptions, ResolvedConfig, Plugin as VitePlugin, Rolldown } fro
 import { isCSSRequest } from 'vite';
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from '../../constants.js';
 import { isPropagatedAssetBoundary } from '../../head-propagation/boundary.js';
+import { VIRTUAL_PAGE_RESOLVED_MODULE_ID } from '../../../vite-plugin-pages/const.js';
 import {
 	getParentExtendedModuleInfos,
 	getParentModuleInfos,
@@ -32,7 +33,14 @@ interface PluginOptions {
 function isBuildCssBoundary(id: string, ctx: { getModuleInfo: Rolldown.GetModuleInfo }): boolean {
 	if (isPropagatedAssetBoundary(id)) return true;
 	const info = ctx.getModuleInfo(id);
-	return info ? moduleIsTopLevelPage(info) : false;
+	if (!info || !moduleIsTopLevelPage(info)) return false;
+	const allImporters = info.importers.concat(info.dynamicImporters);
+	const hasNonVirtualPageImporter = allImporters.some(
+		(importer) => !importer.includes(VIRTUAL_PAGE_RESOLVED_MODULE_ID),
+	);
+	// Pages imported by non-virtual modules (e.g. partials imported by other pages)
+	// should propagate CSS transitively instead of acting as hard page boundaries.
+	return !hasNonVirtualPageImporter;
 }
 
 function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 81dca1782dc3..991649f982c1 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -95,7 +95,12 @@ export async function manifestBuildPostHook(
 				? internals.middlewareEntryPoint
 				: undefined,
 		});
-		const code = injectManifest(manifest, ssrManifestChunk.code);
+		// Prerendered routes' styles are dead weight in the SSR manifest: the static
+		// HTML on disk already has them inlined, and the SSR worker never renders
+		// these routes. Stripping keeps the entry chunk small on platforms like
+		// Cloudflare Workers that re-parse it on every cold isolate start.
+		const ssrManifest = stripPrerenderedRouteStyles(manifest);
+		const code = injectManifest(ssrManifest, ssrManifestChunk.code);
 		mutate(ssrManifestChunk.fileName, code, false);
 	}
 
@@ -150,6 +155,22 @@ function injectManifest(manifest: SerializedSSRManifest, code: string) {
 	});
 }
 
+/**
+ * Returns a copy of the manifest with `styles` cleared on every prerendered
+ * route. Inline CSS for prerendered routes is dead weight in the SSR manifest:
+ * the prerendered HTML on disk already contains the `<style>` tags, and the
+ * SSR worker never renders these routes.
+ */
+function stripPrerenderedRouteStyles(manifest: SerializedSSRManifest): SerializedSSRManifest {
+	let stripped = false;
+	const routes = manifest.routes.map((route) => {
+		if (!route.routeData.prerender || route.styles.length === 0) return route;
+		stripped = true;
+		return { ...route, styles: [] };
+	});
+	return stripped ? { ...manifest, routes } : manifest;
+}
+
 async function buildManifest(
 	opts: StaticBuildOptions,
 	internals: BuildInternals,
diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
index 63f62f095a33..d848a81e5eab 100644
--- a/packages/astro/src/core/build/static-build.ts
+++ b/packages/astro/src/core/build/static-build.ts
@@ -289,7 +289,16 @@ async function buildEnvironments(opts: StaticBuildOptions, internals: BuildInter
 						}
 						return [prefix, cleanChunkName(name), suffix].join('');
 					},
-					assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
+					assetFileNames(assetInfo) {
+						// Strip the @_@ extension-masking pattern from asset names, just like chunkFileNames above.
+						// The @_@ pattern is an internal mechanism for virtual module IDs and should not leak into output filenames.
+						const name = assetInfo.names?.[0] ?? '';
+						if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
+							const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
+							return `${settings.config.build.assets}/${sanitizedName}.[hash][extname]`;
+						}
+						return `${settings.config.build.assets}/[name].[hash][extname]`;
+					},
 					...viteConfig.build?.rolldownOptions?.output,
 					entryFileNames(chunkInfo) {
 						if (chunkInfo.facadeModuleId?.startsWith(VIRTUAL_PAGE_RESOLVED_MODULE_ID)) {
@@ -424,7 +433,16 @@ async function buildEnvironments(opts: StaticBuildOptions, internals: BuildInter
 							chunkFileNames(chunkInfo) {
 								return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
 							},
-							assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
+							assetFileNames(assetInfo) {
+								// Strip the @_@ extension-masking pattern from asset names.
+								// The @_@ pattern is an internal mechanism for virtual module IDs and should not leak into output filenames.
+								const name = assetInfo.names?.[0] ?? '';
+								if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
+									const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
+									return `${settings.config.build.assets}/${sanitizedName}.[hash][extname]`;
+								}
+								return `${settings.config.build.assets}/[name].[hash][extname]`;
+							},
 							...viteConfig.environments?.client?.build?.rolldownOptions?.output,
 						},
 					},
diff --git a/packages/astro/src/core/compile/style.ts b/packages/astro/src/core/compile/style.ts
index 91754c763034..78eab2ee5eef 100644
--- a/packages/astro/src/core/compile/style.ts
+++ b/packages/astro/src/core/compile/style.ts
@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import { createRequire } from 'node:module';
 import { preprocessCSS, type ResolvedConfig } from 'vite';
 import type { AstroConfig } from '../../types/public/config.js';
 import { AstroErrorData, CSSError, positionAt } from '../errors/index.js';
@@ -91,6 +92,46 @@ function rewriteCssUrls(css: string, base: string): string {
 	});
 }
 
+/**
+ * Workaround for https://github.com/withastro/astro/issues/16524.
+ *
+ * When `vite.css.transformer === 'lightningcss'`, lightningcss flattens nested
+ * selectors (e.g. `.parent { :where(& > :not(:last-child)) { ... } }`) BEFORE
+ * `@astrojs/compiler` injects scope attributes. The injector then sees a
+ * top-level rule whose leading compound is `:where(...)` rather than
+ * `.parent`, and falls back to prepending `[data-astro-cid-X]` as a new
+ * leading compound, which constrains the wrong element.
+ *
+ * To preserve the structural shape the scope injector expects, we ask
+ * lightningcss to skip its `Nesting` lowering pass for the per-component
+ * preprocess call. Vite's downstream pipeline still lowers nesting for the
+ * final bundle, so the produced CSS remains compatible with the user's
+ * targets.
+ *
+ * Returns a NEW config object (no mutation of the shared `viteConfig`) so
+ * that parallel `.astro` compilations don't race on a shared mutable
+ * property. Returns `undefined` if `lightningcss` cannot be resolved from
+ * the user's project, in which case the caller falls back to the original
+ * config (and Vite's preprocessCSS will surface the misconfiguration).
+ */
+function withNestingExcluded(viteConfig: ResolvedConfig): ResolvedConfig | undefined {
+	let Features: { Nesting: number };
+	try {
+		// `lightningcss` is loaded by Vite as an optional peer dep, so we
+		// resolve it from the user's project root (where Vite resolves it).
+		const requireFromRoot = createRequire(viteConfig.root + '/');
+		Features = (requireFromRoot('lightningcss') as { Features: { Nesting: number } }).Features;
+	} catch {
+		return undefined;
+	}
+	const lcss = (viteConfig.css?.lightningcss ?? {}) as { exclude?: number };
+	const prevExclude = lcss.exclude ?? 0;
+	return {
+		...viteConfig,
+		css: { ...viteConfig.css, lightningcss: { ...lcss, exclude: prevExclude | Features.Nesting } },
+	} as ResolvedConfig;
+}
+
 export function createStylePreprocessor({
 	filename,
 	viteConfig,
@@ -111,7 +152,16 @@ export function createStylePreprocessor({
 		const lang = `.${attrs?.lang || 'css'}`.toLowerCase();
 		const id = `${filename}?astro&type=style&index=${index}&lang${lang}`;
 		try {
-			const result = await preprocessCSS(content, id, viteConfig);
+			// Workaround for #16524: when lightningcss is the Vite CSS transformer,
+			// exclude its Nesting lowering pass so the Astro compiler's scope
+			// injector still sees `.parent` (and not `:where(.parent ...)`) as the
+			// leading compound. Vite's downstream pipeline still lowers nesting
+			// for the final bundle.
+			const effectiveViteConfig =
+				viteConfig.css?.transformer === 'lightningcss'
+					? (withNestingExcluded(viteConfig) ?? viteConfig)
+					: viteConfig;
+			const result = await preprocessCSS(content, id, effectiveViteConfig);
 
 			// Rewrite CSS URLs to include the base path
 			// This is necessary because preprocessCSS doesn't handle URL rewriting
diff --git a/packages/astro/src/core/config/index.ts b/packages/astro/src/core/config/index.ts
index 269be68bf97b..3698e429ae4e 100644
--- a/packages/astro/src/core/config/index.ts
+++ b/packages/astro/src/core/config/index.ts
@@ -5,4 +5,9 @@ export {
 } from './config.js';
 export { mergeConfig } from './merge.js';
 export { createSettings } from './settings.js';
-export { loadTSConfig, updateTSConfigForFramework } from './tsconfig.js';
+export {
+	loadTSConfig,
+	updateTSConfigForFramework,
+	type TSConfigLoadedResult,
+	type TSConfigResult,
+} from './tsconfig.js';
diff --git a/packages/astro/src/core/config/settings.ts b/packages/astro/src/core/config/settings.ts
index 3a997c172fed..cefb5a332d4c 100644
--- a/packages/astro/src/core/config/settings.ts
+++ b/packages/astro/src/core/config/settings.ts
@@ -178,10 +178,8 @@ export async function createSettings(
 		watchFiles.push(fileURLToPath(new URL('./package.json', pathToFileURL(cwd))));
 	}
 
-	if (typeof tsconfig !== 'string') {
-		watchFiles.push(
-			...[tsconfig.tsconfigFile, ...(tsconfig.extended ?? []).map((e) => e.tsconfigFile)],
-		);
+	if (!tsconfig.error) {
+		watchFiles.push(...tsconfig.sources);
 		settings.tsConfig = tsconfig.tsconfig;
 		settings.tsConfigPath = tsconfig.tsconfigFile;
 	}
diff --git a/packages/astro/src/core/config/tsconfig.ts b/packages/astro/src/core/config/tsconfig.ts
index ed28b9a931d0..0e29495c135e 100644
--- a/packages/astro/src/core/config/tsconfig.ts
+++ b/packages/astro/src/core/config/tsconfig.ts
@@ -1,13 +1,7 @@
-import { readFile } from 'node:fs/promises';
-import { join } from 'node:path';
-import {
-	find,
-	parse,
-	TSConfckParseError,
-	type TSConfckParseOptions,
-	type TSConfckParseResult,
-	toJson,
-} from 'tsconfck';
+import { readFileSync, existsSync } from 'node:fs';
+import { join, normalize } from 'node:path';
+import { readTsconfig, type TsconfigResult } from 'get-tsconfig';
+import { parse as parseJsonc, type ParseError } from 'jsonc-parser';
 import type { CompilerOptions, TypeAcquisition } from 'typescript';
 
 export const defaultTSConfig: TSConfig = { extends: 'astro/tsconfigs/base' };
@@ -53,81 +47,94 @@ export const presets = new Map<frameworkWithTSSettings, TSConfig>([
 	],
 ]);
 
-type TSConfigResult<T = object> = Promise<
-	(TSConfckParseResult & T) | 'invalid-config' | 'missing-config' | 'unknown-error'
->;
+export interface TSConfigLoadedResult {
+	error?: undefined;
+	/** Absolute path of the root tsconfig/jsconfig file that was loaded. */
+	tsconfigFile: string;
+	/** The merged/resolved config (after `extends` are walked). */
+	tsconfig: TSConfig;
+	/** The user-written, un-merged config. Used by `astro add` to round-trip. */
+	rawConfig: TSConfig;
+	/**
+	 * Every tsconfig file that contributed via `extends`, root-first.
+	 * Includes `tsconfigFile`. Used to populate the dev-server watch list.
+	 */
+	sources: string[];
+}
+
+export type TSConfigResult =
+	| TSConfigLoadedResult
+	| { error: 'invalid-config'; message: string }
+	| { error: 'missing-config' };
 
 /**
- * Load a tsconfig.json or jsconfig.json is the former is not found
- * @param root The root directory to search in, defaults to `process.cwd()`.
- * @param findUp Whether to search for the config file in parent directories, by default only the root directory is searched.
+ * Load a tsconfig.json or jsconfig.json if the former is not found.
+ * @param root The directory to search in, defaults to `process.cwd()`.
  */
-export async function loadTSConfig(
-	root: string | undefined,
-	findUp = false,
-): Promise<TSConfigResult<{ rawConfig: TSConfig }>> {
-	const safeCwd = root ?? process.cwd();
-
-	const [jsconfig, tsconfig] = await Promise.all(
-		['jsconfig.json', 'tsconfig.json'].map((configName) =>
-			// `tsconfck` expects its first argument to be a file path, not a directory path, so we'll fake one
-			find(join(safeCwd, './dummy.txt'), {
-				root: findUp ? undefined : root,
-				configName: configName,
-			}),
-		),
-	);
-
-	// If we have both files, prefer tsconfig.json
-	if (tsconfig) {
-		const parsedConfig = await safeParse(tsconfig, { root: root });
-
-		if (typeof parsedConfig === 'string') {
-			return parsedConfig;
+export async function loadTSConfig(root: string | undefined): Promise<TSConfigResult> {
+	const safeCwd = root || process.cwd();
+	let tsconfigPath: string | undefined;
+
+	// Find the json file path. Prefer tsconfig.json over jsconfig.json.
+	for (const configName of ['tsconfig.json', 'jsconfig.json']) {
+		const possiblePath = join(safeCwd, configName);
+		if (existsSync(possiblePath)) {
+			tsconfigPath = possiblePath;
+			break;
 		}
-
-		// tsconfck does not return the original config, so we need to parse it ourselves
-		// https://github.com/dominikg/tsconfck/issues/138
-		const rawConfig = await readFile(tsconfig, 'utf-8')
-			.then(toJson)
-			.then((content) => JSON.parse(content) as TSConfig);
-
-		return { ...parsedConfig, rawConfig };
 	}
-
-	if (jsconfig) {
-		const parsedConfig = await safeParse(jsconfig, { root: root });
-
-		if (typeof parsedConfig === 'string') {
-			return parsedConfig;
-		}
-
-		const rawConfig = await readFile(jsconfig, 'utf-8')
-			.then(toJson)
-			.then((content) => JSON.parse(content) as TSConfig);
-
-		return { ...parsedConfig, rawConfig: rawConfig };
+	if (!tsconfigPath) {
+		return {
+			error: 'missing-config',
+		};
 	}
 
-	return 'missing-config';
-}
-
-async function safeParse(tsconfigPath: string, options: TSConfckParseOptions = {}): TSConfigResult {
+	// Read the raw json file
+	let rawConfig: TSConfig | undefined;
 	try {
-		const parseResult = await parse(tsconfigPath, options);
-
-		if (parseResult.tsconfig == null) {
-			return 'missing-config';
+		const text = readFileSync(tsconfigPath, 'utf-8');
+		const errors: ParseError[] = [];
+		const parsed = parseJsonc(text, errors, { allowTrailingComma: true }) as TSConfig;
+		if (errors.length > 0) {
+			const first = errors[0];
+			return {
+				error: 'invalid-config',
+				message: `Failed to parse ${tsconfigPath}: Malformed JSONC (error code ${first.error}) at offset ${first.offset}`,
+			};
 		}
-
-		return parseResult;
+		rawConfig = parsed;
 	} catch (e) {
-		if (e instanceof TSConfckParseError) {
-			return 'invalid-config';
-		}
+		const message = e instanceof Error ? e.message : String(e);
+		return {
+			error: 'invalid-config',
+			message: `Failed to parse ${tsconfigPath}: ${message}`,
+		};
+	}
+	if (!rawConfig) {
+		return {
+			error: 'invalid-config',
+			message: `Failed to parse ${tsconfigPath}: Unknown error`,
+		};
+	}
 
-		return 'unknown-error';
+	// Resolve the tsconfig via `extends`
+	let resolved: TsconfigResult | undefined;
+	try {
+		resolved = readTsconfig(tsconfigPath);
+	} catch (e) {
+		const message = e instanceof Error ? e.message : String(e);
+		return {
+			error: 'invalid-config',
+			message: `Failed to resolve ${tsconfigPath}: ${message}`,
+		};
 	}
+
+	return {
+		tsconfigFile: normalize(resolved.path),
+		tsconfig: resolved.config satisfies TSConfig,
+		rawConfig,
+		sources: (resolved.sources || [resolved.path]).map(normalize),
+	};
 }
 
 export function updateTSConfigForFramework(
@@ -186,7 +193,7 @@ type StripEnums<T extends Record<string, any>> = {
 export interface TSConfig {
 	compilerOptions?: StripEnums<CompilerOptions>;
 	compileOnSave?: boolean;
-	extends?: string;
+	extends?: string | string[];
 	files?: string[];
 	include?: string[];
 	exclude?: string[];
diff --git a/packages/astro/src/core/render/params-and-props.ts b/packages/astro/src/core/render/params-and-props.ts
index 2563b678f53e..9498057d1ee2 100644
--- a/packages/astro/src/core/render/params-and-props.ts
+++ b/packages/astro/src/core/render/params-and-props.ts
@@ -87,11 +87,16 @@ export function getParams(route: RouteData, pathname: string): Params {
 	if (!route.params.length) return {};
 	// The RegExp pattern expects a decoded string, but the pathname is encoded
 	// when the URL contains non-English characters.
-	// Strip `.html` from the pathname unless `.html` is a static part of the route definition
-	// itself (e.g. `[slug].html.astro`). Dynamic params like `[id]` would otherwise greedily
-	// capture the `.html` suffix (e.g. `id = '42.html'` instead of `id = '42'`).
+	// Strip `.html` from the pathname of page routes unless `.html` is a static part of the
+	// route definition itself (e.g. `[slug].html.astro`). Dynamic params like `[id]` would
+	// otherwise greedily capture the `.html` suffix that is either implied or injected
+	// for page routes (e.g. `id = '42.html'` instead of `id = '42'`).
+	// Other route types do not enforce HTML generation nor modify the path, so any suffix
+	// was added by user code and their pattern matching should apply on the complete pathname.
 	const path =
-		pathname.endsWith('.html') && !routeHasHtmlExtension(route) ? pathname.slice(0, -5) : pathname;
+		pathname.endsWith('.html') && route.type === 'page' && !routeHasHtmlExtension(route)
+			? pathname.slice(0, -5)
+			: pathname;
 
 	const allPatterns = [route, ...route.fallbackRoutes].map((r) => r.pattern);
 	const paramsMatch = allPatterns.map((pattern) => pattern.exec(path)).find((x) => x);
diff --git a/packages/astro/src/core/render/slots.ts b/packages/astro/src/core/render/slots.ts
index 1d8abf67d66c..4234e6fb78fc 100644
--- a/packages/astro/src/core/render/slots.ts
+++ b/packages/astro/src/core/render/slots.ts
@@ -1,5 +1,6 @@
 import { type ComponentSlots, renderSlotToString } from '../../runtime/server/index.js';
 import { renderJSX } from '../../runtime/server/jsx.js';
+import { isRenderTemplateResult } from '../../runtime/server/render/astro/index.js';
 import { chunkToString } from '../../runtime/server/render/index.js';
 import { isRenderInstruction } from '../../runtime/server/render/instruction.js';
 import type { SSRResult } from '../../types/public/internal.js';
@@ -8,9 +9,15 @@ import type { AstroLogger } from '../logger/core.js';
 
 function getFunctionExpression(slot: any) {
 	if (!slot) return;
-	const expressions = slot?.expressions?.filter((e: unknown) => isRenderInstruction(e) === false);
+	const expressions = slot?.expressions?.filter(
+		(e: unknown) => isRenderInstruction(e) === false || isRenderTemplateResult(e),
+	);
 	if (expressions?.length !== 1) return;
-	return expressions[0] as (...args: any[]) => any;
+	const expression = expressions[0];
+	if (isRenderTemplateResult(expression)) {
+		return getFunctionExpression(expression);
+	}
+	return expression as (...args: any[]) => any;
 }
 
 export class Slots {
diff --git a/packages/astro/src/core/routing/pattern.ts b/packages/astro/src/core/routing/pattern.ts
index 6add541f7453..6ece0af26483 100644
--- a/packages/astro/src/core/routing/pattern.ts
+++ b/packages/astro/src/core/routing/pattern.ts
@@ -38,7 +38,7 @@ export function getPattern(
 	const trailing =
 		addTrailingSlash && segments.length ? getTrailingSlashPattern(addTrailingSlash) : '$';
 	let initial = '\\/';
-	if (addTrailingSlash === 'never' && base !== '/') {
+	if (addTrailingSlash === 'never' && base !== '/' && pathname !== '') {
 		initial = '';
 	}
 	// nosemgrep: javascript.lang.security.audit.detect-non-literal-regexp.detect-non-literal-regexp
diff --git a/packages/astro/src/core/routing/rewrite.ts b/packages/astro/src/core/routing/rewrite.ts
index 932c2334c25e..71f19177fbd1 100644
--- a/packages/astro/src/core/routing/rewrite.ts
+++ b/packages/astro/src/core/routing/rewrite.ts
@@ -227,10 +227,7 @@ export function normalizeRewritePathname(
 			urlPathname === base || urlPathname === removeTrailingForwardSlash(base);
 
 		if (isBasePathRequest) {
-			// For root path requests at the base URL
-			// When trailingSlash is 'never', we should match '' (empty string pathname)
-			// When trailingSlash is 'always', we should match '/' pathname
-			pathname = shouldAppendSlash ? '/' : '';
+			pathname = '/';
 		} else if (urlPathname.startsWith(base)) {
 			// For non-root paths under the base
 			pathname = shouldAppendSlash
@@ -245,10 +242,6 @@ export function normalizeRewritePathname(
 		pathname = prependForwardSlash(pathname);
 	}
 
-	// Convert '/' to '' for trailingSlash: 'never'
-	if (pathname === '/' && base !== '/' && !shouldAppendSlash) {
-		pathname = '';
-	}
 	// If config.build.format = 'file' then pathname includes .html, so we need to remove it
 	if (buildFormat === 'file') {
 		pathname = pathname.replace(/\.html$/, '');
diff --git a/packages/astro/src/core/session/runtime.ts b/packages/astro/src/core/session/runtime.ts
index 3ad511cfa3e1..13d689143fe5 100644
--- a/packages/astro/src/core/session/runtime.ts
+++ b/packages/astro/src/core/session/runtime.ts
@@ -154,7 +154,8 @@ export class AstroSession {
 	 * Deletes a session value.
 	 */
 	delete(key: string) {
-		this.#data?.delete(key);
+		this.#data ??= new Map();
+		this.#data.delete(key);
 		if (this.#partial) {
 			this.#toDelete.add(key);
 		}
@@ -343,12 +344,22 @@ export class AstroSession {
 	 */
 
 	async #ensureData() {
-		const storage = await this.#ensureStorage();
 		if (this.#data && !this.#partial) {
 			return this.#data;
 		}
 		this.#data ??= new Map();
 
+		// If no session ID has been set yet (no prior set() call) and there is no
+		// session cookie, there is nothing to load from storage. Returning early
+		// avoids initialising the storage driver and making a guaranteed-miss read
+		// on every anonymous request.
+		if (!this.#sessionID && !this.#cookies.get(this.#cookieName)?.value) {
+			this.#partial = false;
+			return this.#data;
+		}
+
+		const storage = await this.#ensureStorage();
+
 		// We stored this as a devalue string, but unstorage will have parsed it as JSON
 		const raw = await storage.get<any[]>(this.#ensureSessionID());
 		if (!raw) {
diff --git a/packages/astro/src/i18n/middleware.ts b/packages/astro/src/i18n/middleware.ts
index 13970fc84a01..d670586a87b4 100644
--- a/packages/astro/src/i18n/middleware.ts
+++ b/packages/astro/src/i18n/middleware.ts
@@ -102,7 +102,7 @@ export function createI18nMiddleware(
 		if (i18n.fallback && i18n.fallbackType) {
 			const fallbackDecision = computeFallbackRoute({
 				pathname: context.url.pathname,
-				responseStatus: response.status,
+				responseStatus: typeHeader === 'fallback' ? 404 : response.status,
 				currentLocale: context.currentLocale,
 				fallback: i18n.fallback,
 				fallbackType: i18n.fallbackType,
diff --git a/packages/astro/src/prefetch/index.ts b/packages/astro/src/prefetch/index.ts
index a1f546796a7b..efbedfacdf06 100644
--- a/packages/astro/src/prefetch/index.ts
+++ b/packages/astro/src/prefetch/index.ts
@@ -59,8 +59,9 @@ function initTapStrategy() {
 		document.addEventListener(
 			event,
 			(e) => {
-				if (elMatchesStrategy(e.target, 'tap')) {
-					prefetch(e.target.href, { ignoreSlowConnection: true });
+				const anchor = (e.target as Element).closest('a');
+				if (elMatchesStrategy(anchor, 'tap')) {
+					prefetch(anchor.href, { ignoreSlowConnection: true });
 				}
 			},
 			{ passive: true },
@@ -78,8 +79,9 @@ function initHoverStrategy() {
 	document.body.addEventListener(
 		'focusin',
 		(e) => {
-			if (elMatchesStrategy(e.target, 'hover')) {
-				handleHoverIn(e);
+			const anchor = (e.target as Element).closest('a');
+			if (elMatchesStrategy(anchor, 'hover')) {
+				handleHoverIn(anchor.href);
 			}
 		},
 		{ passive: true },
@@ -94,15 +96,17 @@ function initHoverStrategy() {
 			// Add listeners for anchors matching the strategy
 			if (elMatchesStrategy(anchor, 'hover')) {
 				listenedAnchors.add(anchor);
-				anchor.addEventListener('mouseenter', handleHoverIn, { passive: true });
+				anchor.addEventListener(
+					'mouseenter',
+					(e) => handleHoverIn((e.currentTarget as HTMLAnchorElement).href),
+					{ passive: true },
+				);
 				anchor.addEventListener('mouseleave', handleHoverOut, { passive: true });
 			}
 		}
 	});
 
-	function handleHoverIn(e: Event) {
-		const href = (e.target as HTMLAnchorElement).href;
-
+	function handleHoverIn(href: string) {
 		// Debounce hover prefetches by 80ms
 		if (timeout) {
 			clearTimeout(timeout);
diff --git a/packages/astro/src/runtime/server/render/common.ts b/packages/astro/src/runtime/server/render/common.ts
index 0e0ffbfa2f42..ba8afa8659c1 100644
--- a/packages/astro/src/runtime/server/render/common.ts
+++ b/packages/astro/src/runtime/server/render/common.ts
@@ -61,15 +61,15 @@ function stringifyChunk(
 		switch (instruction.type) {
 			case 'directive': {
 				const { hydration } = instruction;
-				let needsHydrationScript = hydration && determineIfNeedsHydrationScript(result);
-				let needsDirectiveScript =
+				const needsHydrationScript = hydration && determineIfNeedsHydrationScript(result);
+				const needsDirectiveScript =
 					hydration && determinesIfNeedsDirectiveScript(result, hydration.directive);
 
 				if (needsHydrationScript) {
-					let prescripts = getPrescripts(result, 'both', hydration.directive);
+					const prescripts = getPrescripts(result, 'both', hydration.directive);
 					return markHTMLString(prescripts);
 				} else if (needsDirectiveScript) {
-					let prescripts = getPrescripts(result, 'directive', hydration.directive);
+					const prescripts = getPrescripts(result, 'directive', hydration.directive);
 					return markHTMLString(prescripts);
 				} else {
 					return '';
@@ -90,6 +90,9 @@ function stringifyChunk(
 			case 'renderer-hydration-script': {
 				const { rendererSpecificHydrationScripts } = result._metadata;
 				const { rendererName } = instruction;
+				if (result._metadata.templateDepth > 0) {
+					return instruction.render();
+				}
 
 				if (!rendererSpecificHydrationScripts.has(rendererName)) {
 					rendererSpecificHydrationScripts.add(rendererName);
@@ -98,6 +101,9 @@ function stringifyChunk(
 				return '';
 			}
 			case 'server-island-runtime': {
+				if (result._metadata.templateDepth > 0) {
+					return renderServerIslandRuntime();
+				}
 				if (result._metadata.hasRenderedServerIslandRuntime) {
 					return '';
 				}
diff --git a/packages/astro/src/runtime/server/scripts.ts b/packages/astro/src/runtime/server/scripts.ts
index 4adee52f8b60..4c80029319f0 100644
--- a/packages/astro/src/runtime/server/scripts.ts
+++ b/packages/astro/src/runtime/server/scripts.ts
@@ -4,6 +4,10 @@ import islandScriptDev from './astro-island.prebuilt-dev.js';
 import { ISLAND_STYLES } from './astro-island-styles.js';
 
 export function determineIfNeedsHydrationScript(result: SSRResult): boolean {
+	// Scripts in <template> are inert, so don't consume dedup state there.
+	if (result._metadata.templateDepth > 0) {
+		return !result._metadata.hasHydrationScript;
+	}
 	if (result._metadata.hasHydrationScript) {
 		return false;
 	}
@@ -11,6 +15,10 @@ export function determineIfNeedsHydrationScript(result: SSRResult): boolean {
 }
 
 export function determinesIfNeedsDirectiveScript(result: SSRResult, directive: string): boolean {
+	// Scripts in <template> are inert, so don't consume dedup state there.
+	if (result._metadata.templateDepth > 0) {
+		return !result._metadata.hasDirectives.has(directive);
+	}
 	if (result._metadata.hasDirectives.has(directive)) {
 		return false;
 	}
diff --git a/packages/astro/src/types/public/content.ts b/packages/astro/src/types/public/content.ts
index 6bff66a75e24..6f2a06bdf551 100644
--- a/packages/astro/src/types/public/content.ts
+++ b/packages/astro/src/types/public/content.ts
@@ -162,7 +162,7 @@ export interface CacheHint {
 	lastModified?: Date;
 }
 
-export interface LiveDataEntry<TData extends Record<string, any> = Record<string, unknown>> {
+export interface LiveDataEntry<TData extends Record<string, any> = Record<string, any>> {
 	/** The ID of the entry. Unique per collection. */
 	id: string;
 	/** The parsed entry data */
@@ -175,14 +175,14 @@ export interface LiveDataEntry<TData extends Record<string, any> = Record<string
 	cacheHint?: CacheHint;
 }
 
-export interface LiveDataCollection<TData extends Record<string, any> = Record<string, unknown>> {
+export interface LiveDataCollection<TData extends Record<string, any> = Record<string, any>> {
 	entries: Array<LiveDataEntry<TData>>;
 	/** A hint for how to cache this collection. Individual entries can also have cache hints */
 	cacheHint?: CacheHint;
 }
 
 export interface LiveDataCollectionResult<
-	TData extends Record<string, any> = Record<string, unknown>,
+	TData extends Record<string, any> = Record<string, any>,
 	TError extends Error = Error,
 > {
 	entries?: Array<LiveDataEntry<TData>>;
@@ -191,7 +191,7 @@ export interface LiveDataCollectionResult<
 }
 
 export interface LiveDataEntryResult<
-	TData extends Record<string, any> = Record<string, unknown>,
+	TData extends Record<string, any> = Record<string, any>,
 	TError extends Error = Error,
 > {
 	entry?: LiveDataEntry<TData>;
diff --git a/packages/astro/src/vite-plugin-app/app.ts b/packages/astro/src/vite-plugin-app/app.ts
index cd99578db0d4..6263bcee4d09 100644
--- a/packages/astro/src/vite-plugin-app/app.ts
+++ b/packages/astro/src/vite-plugin-app/app.ts
@@ -166,12 +166,6 @@ export class AstroServerApp extends BaseApp<RunnablePipeline> {
 			pathname = decodeURI(url.pathname);
 		}
 
-		// Normalize root path to empty string when trailingSlash is 'never' and there's a non-root base
-		// This ensures consistent route matching for the index route (e.g., /base?query -> '')
-		if (this.manifest.trailingSlash === 'never' && pathname === '/' && this.manifest.base !== '/') {
-			pathname = '';
-		}
-
 		// Add config.base back to url before passing it to SSR
 		url.pathname = removeTrailingForwardSlash(this.manifest.base) + url.pathname;
 		if (
diff --git a/packages/astro/src/vite-plugin-head/index.ts b/packages/astro/src/vite-plugin-head/index.ts
index dd30e4cb9180..501a385e7fd7 100644
--- a/packages/astro/src/vite-plugin-head/index.ts
+++ b/packages/astro/src/vite-plugin-head/index.ts
@@ -32,12 +32,24 @@ const VIRTUAL_COMPONENT_METADATA = 'virtual:astro:component-metadata';
 const RESOLVED_VIRTUAL_COMPONENT_METADATA = `\0${VIRTUAL_COMPONENT_METADATA}`;
 
 export default function configHeadVitePlugin(): vite.Plugin {
-	let environment: DevEnvironment;
+	// Adapters like `@astrojs/cloudflare` load page modules in the `prerender`
+	// environment; default dev uses `ssr`. Track both so propagation covers either.
+	let environments: DevEnvironment[] = [];
+
+	function findModule(id: string) {
+		for (const env of environments) {
+			const mod = env.moduleGraph.getModuleById(id);
+			if (mod) return mod;
+		}
+		return undefined;
+	}
 
 	function invalidateComponentMetadataModule() {
-		const virtualMod = environment.moduleGraph.getModuleById(RESOLVED_VIRTUAL_COMPONENT_METADATA);
-		if (virtualMod) {
-			environment.moduleGraph.invalidateModule(virtualMod);
+		for (const env of environments) {
+			const virtualMod = env.moduleGraph.getModuleById(RESOLVED_VIRTUAL_COMPONENT_METADATA);
+			if (virtualMod) {
+				env.moduleGraph.invalidateModule(virtualMod);
+			}
 		}
 	}
 
@@ -49,7 +61,7 @@ export default function configHeadVitePlugin(): vite.Plugin {
 			const current = queue.pop()!;
 			if (collected.has(current)) continue;
 			collected.add(current);
-			const mod = environment.moduleGraph.getModuleById(current);
+			const mod = findModule(current);
 			for (const importer of mod?.importers ?? []) {
 				if (importer.id) {
 					queue.push(importer.id);
@@ -59,7 +71,7 @@ export default function configHeadVitePlugin(): vite.Plugin {
 
 		// Convert Vite's module graph shape into our plain importer adjacency map.
 		return buildImporterGraphFromModuleInfo(collected, (id) => {
-			const mod = environment.moduleGraph.getModuleById(id);
+			const mod = findModule(id);
 			if (!mod) return null;
 			return {
 				importers: Array.from(mod.importers)
@@ -104,7 +116,10 @@ export default function configHeadVitePlugin(): vite.Plugin {
 		enforce: 'pre',
 		apply: 'serve',
 		configureServer(devServer) {
-			environment = devServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
+			environments = [
+				devServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr],
+				devServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.prerender],
+			].filter((e): e is DevEnvironment => !!e);
 			devServer.watcher.on('add', invalidateComponentMetadataModule);
 			devServer.watcher.on('unlink', invalidateComponentMetadataModule);
 			devServer.watcher.on('change', invalidateComponentMetadataModule);
@@ -114,21 +129,26 @@ export default function configHeadVitePlugin(): vite.Plugin {
 				return;
 			}
 
+			const seen = new Set<string>();
 			const componentMetadataEntries: [string, SSRComponentMetadata][] = [];
-			for (const [moduleId, mod] of environment.moduleGraph.idToModuleMap) {
-				const info = this.getModuleInfo(moduleId) ?? (mod.id ? this.getModuleInfo(mod.id) : null);
-				if (!info) continue;
+			for (const env of environments) {
+				for (const [moduleId, mod] of env.moduleGraph.idToModuleMap) {
+					if (seen.has(moduleId)) continue;
+					const info = this.getModuleInfo(moduleId) ?? (mod.id ? this.getModuleInfo(mod.id) : null);
+					if (!info) continue;
 
-				const astro = getAstroMetadata(info);
-				if (!astro) continue;
+					const astro = getAstroMetadata(info);
+					if (!astro) continue;
 
-				componentMetadataEntries.push([
-					moduleId,
-					{
-						containsHead: astro.containsHead,
-						propagation: astro.propagation,
-					},
-				]);
+					seen.add(moduleId);
+					componentMetadataEntries.push([
+						moduleId,
+						{
+							containsHead: astro.containsHead,
+							propagation: astro.propagation,
+						},
+					]);
+				}
 			}
 
 			return {
diff --git a/packages/astro/src/vite-plugin-utils/index.ts b/packages/astro/src/vite-plugin-utils/index.ts
index 89662b46e3bf..7a932a18dacc 100644
--- a/packages/astro/src/vite-plugin-utils/index.ts
+++ b/packages/astro/src/vite-plugin-utils/index.ts
@@ -33,12 +33,19 @@ export function getFileInfo(id: string, config: AstroConfig) {
  *
  * - /@fs/home/user/project/src/pages/index.astro
  * - /src/pages/index.astro
+ * - ./src/pages/index.astro
  *
  * as absolute file paths with forward slashes.
  */
 export function normalizeFilename(filename: string, root: URL) {
 	if (filename.startsWith('/@fs')) {
 		filename = filename.slice('/@fs'.length);
+	} else if (filename.startsWith('.')) {
+		// Handle relative paths (e.g. ./src/components/Foo.astro) by resolving against root.
+		// This can occur on certain environments (e.g. Windows + newer Node.js) when a component
+		// is imported via a TypeScript path alias and Vite produces a relative virtual module ID.
+		const url = new URL(filename, root);
+		filename = viteID(url);
 	} else if (filename.startsWith('/') && !commonAncestorPath(filename, fileURLToPath(root))) {
 		const url = new URL('.' + filename, root);
 		filename = viteID(url);
diff --git a/packages/astro/test/alias-path-alias-style.test.js b/packages/astro/test/alias-path-alias-style.test.js
new file mode 100644
index 000000000000..52b4ede479ce
--- /dev/null
+++ b/packages/astro/test/alias-path-alias-style.test.js
@@ -0,0 +1,39 @@
+import assert from 'node:assert/strict';
+import { before, describe, it } from 'node:test';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.ts';
+
+// Regression test for https://github.com/withastro/astro/issues/15963
+// <style> tags in components imported via tsconfig path aliases should compile correctly.
+describe('Style compilation with tsconfig path aliases', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/alias-path-alias-style/',
+			build: { inlineStylesheets: 'never' },
+		});
+		await fixture.build();
+	});
+
+	it('builds successfully and includes scoped styles from aliased component', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+
+		// The styled component should be rendered
+		assert.ok($('.styled').length > 0, 'Styled component should be present in output');
+
+		// With inlineStylesheets: 'never', styles are emitted as external CSS files
+		const links = $('link[rel=stylesheet]')
+			.map((_i, el) => $(el).attr('href'))
+			.get();
+		assert.ok(links.length > 0, 'Should have at least one linked stylesheet');
+
+		const cssContents = await Promise.all(links.map((href) => fixture.readFile(href)));
+		const allCss = cssContents.join('\n');
+		assert.ok(
+			allCss.includes('.styled'),
+			'Scoped .styled CSS should be present in emitted stylesheet',
+		);
+	});
+});
diff --git a/packages/astro/test/astro-slots.test.ts b/packages/astro/test/astro-slots.test.ts
index b50fb3ce9a66..2c140ae66804 100644
--- a/packages/astro/test/astro-slots.test.ts
+++ b/packages/astro/test/astro-slots.test.ts
@@ -182,6 +182,13 @@ describe('Slots', () => {
 		assert.deepEqual(afterDiv.text(), 'Test Content AFTER');
 	});
 
+	it('Arguments can be passed to conditional named slots with Astro.slots.render()', async () => {
+		const html = await fixture.readFile('/conditional-slotted-callback/index.html');
+		const $ = cheerio.load(html);
+
+		assert.equal($('#conditional-block').text(), 'Block: block');
+	});
+
 	it('Unused slot builds without error', async () => {
 		const html = await fixture.readFile('/unused-slot/index.html');
 		const $ = cheerio.load(html);
diff --git a/packages/astro/test/core-image.test.ts b/packages/astro/test/core-image.test.ts
index 846f0d81fcec..c8d5e5fcac3c 100644
--- a/packages/astro/test/core-image.test.ts
+++ b/packages/astro/test/core-image.test.ts
@@ -1078,6 +1078,16 @@ describe('astro:image', () => {
 			);
 		});
 
+		it('animated avif does not crash the build', async () => {
+			const html = await fixture.readFile('/animated-avif/index.html');
+			const $ = cheerio.load(html);
+			const src = $('#animated-avif img').attr('src')!;
+			assert.ok(src, 'expected img src to be set');
+			const data = await fixture.readBuffer(src);
+			assert.equal(data instanceof Buffer, true);
+			assert.ok(data.byteLength > 0);
+		});
+
 		it('markdown images are written', async () => {
 			const html = await fixture.readFile('/post/index.html');
 			const $ = cheerio.load(html);
diff --git a/packages/astro/test/css-deduplication.test.ts b/packages/astro/test/css-deduplication.test.ts
index 9f3bc239335c..d9e8d6817a95 100644
--- a/packages/astro/test/css-deduplication.test.ts
+++ b/packages/astro/test/css-deduplication.test.ts
@@ -18,8 +18,10 @@ describe('CSS deduplication for hydrated components', () => {
 		it('should not duplicate CSS for hydrated components', async () => {
 			const assets = await fixture.readdir('/_astro');
 
-			// Generated file for Counter.css (filename format changed in main-next)
-			const COUNTER_CSS_PATH = '/_astro/index@_@astro.BmwMjdxs.css';
+			// Generated file for Counter.css — find it dynamically since the hash may change
+			const counterCssFile = assets.find((f) => f.startsWith('index.') && f.endsWith('.css'));
+			assert.ok(counterCssFile, 'Expected a CSS file starting with "index."');
+			const COUNTER_CSS_PATH = `/_astro/${counterCssFile}`;
 			let file = await fixture.readFile(COUNTER_CSS_PATH);
 			file = file.replace(/\s+/g, '');
 
diff --git a/packages/astro/test/fixtures/alias-path-alias-style/astro.config.mjs b/packages/astro/test/fixtures/alias-path-alias-style/astro.config.mjs
new file mode 100644
index 000000000000..86dbfb924824
--- /dev/null
+++ b/packages/astro/test/fixtures/alias-path-alias-style/astro.config.mjs
@@ -0,0 +1,3 @@
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({});
diff --git a/packages/astro/test/fixtures/alias-path-alias-style/package.json b/packages/astro/test/fixtures/alias-path-alias-style/package.json
new file mode 100644
index 000000000000..1398accacbde
--- /dev/null
+++ b/packages/astro/test/fixtures/alias-path-alias-style/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/alias-path-alias-style",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/alias-path-alias-style/src/components/StyledComponent.astro b/packages/astro/test/fixtures/alias-path-alias-style/src/components/StyledComponent.astro
new file mode 100644
index 000000000000..7ae74ad19ef0
--- /dev/null
+++ b/packages/astro/test/fixtures/alias-path-alias-style/src/components/StyledComponent.astro
@@ -0,0 +1,8 @@
+<div class="styled">Styled Component</div>
+
+<style>
+  .styled {
+    color: blue;
+    font-weight: bold;
+  }
+</style>
diff --git a/packages/astro/test/fixtures/alias-path-alias-style/src/pages/index.astro b/packages/astro/test/fixtures/alias-path-alias-style/src/pages/index.astro
new file mode 100644
index 000000000000..cd166e49bc06
--- /dev/null
+++ b/packages/astro/test/fixtures/alias-path-alias-style/src/pages/index.astro
@@ -0,0 +1,10 @@
+---
+import StyledComponent from '@/components/StyledComponent.astro';
+---
+<html>
+  <head><title>Path Alias Style Test</title></head>
+  <body>
+    <h1>Path Alias Style Test</h1>
+    <StyledComponent />
+  </body>
+</html>
diff --git a/packages/astro/test/fixtures/alias-path-alias-style/tsconfig.json b/packages/astro/test/fixtures/alias-path-alias-style/tsconfig.json
new file mode 100644
index 000000000000..4b1deef74fb9
--- /dev/null
+++ b/packages/astro/test/fixtures/alias-path-alias-style/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": [".astro/types.d.ts", "**/*"],
+  "exclude": ["dist"]
+}
diff --git a/packages/astro/test/fixtures/astro-slots/src/components/ConditionalSlottedCallback.astro b/packages/astro/test/fixtures/astro-slots/src/components/ConditionalSlottedCallback.astro
new file mode 100644
index 000000000000..acc631cca546
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-slots/src/components/ConditionalSlottedCallback.astro
@@ -0,0 +1,8 @@
+---
+let html = '';
+if (Astro.slots.has('block')) {
+	html = await Astro.slots.render('block', [{ test: 'block' }]);
+}
+---
+
+<Fragment set:html={html} />
diff --git a/packages/astro/test/fixtures/astro-slots/src/pages/conditional-slotted-callback.astro b/packages/astro/test/fixtures/astro-slots/src/pages/conditional-slotted-callback.astro
new file mode 100644
index 000000000000..5dc1bc158638
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-slots/src/pages/conditional-slotted-callback.astro
@@ -0,0 +1,13 @@
+---
+import ConditionalSlottedCallback from '../components/ConditionalSlottedCallback.astro';
+---
+
+<ConditionalSlottedCallback>
+	{
+		true && (
+			<fragment slot="block">
+				{({ test }) => <div id="conditional-block">Block: {test}</div>}
+			</fragment>
+		)
+	}
+</ConditionalSlottedCallback>
diff --git a/packages/astro/test/fixtures/core-image-ssg/src/assets/animated.avif b/packages/astro/test/fixtures/core-image-ssg/src/assets/animated.avif
new file mode 100644
index 000000000000..7c5738dba984
Binary files /dev/null and b/packages/astro/test/fixtures/core-image-ssg/src/assets/animated.avif differ
diff --git a/packages/astro/test/fixtures/core-image-ssg/src/pages/animated-avif.astro b/packages/astro/test/fixtures/core-image-ssg/src/pages/animated-avif.astro
new file mode 100644
index 000000000000..d0a08650dfd8
--- /dev/null
+++ b/packages/astro/test/fixtures/core-image-ssg/src/pages/animated-avif.astro
@@ -0,0 +1,11 @@
+---
+import { Image } from 'astro:assets';
+import animatedAvif from '../assets/animated.avif';
+---
+<html>
+<body>
+	<div id="animated-avif">
+		<Image src={animatedAvif} alt="animated avif" />
+	</div>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/head-propagation-prerender-env/astro.config.mjs b/packages/astro/test/fixtures/head-propagation-prerender-env/astro.config.mjs
new file mode 100644
index 000000000000..586ea14f70b2
--- /dev/null
+++ b/packages/astro/test/fixtures/head-propagation-prerender-env/astro.config.mjs
@@ -0,0 +1,45 @@
+import { defineConfig } from 'astro/config';
+import testAdapter from '../../test-adapter.js';
+
+const devPrerenderMiddlewareSymbol = Symbol.for('astro.devPrerenderMiddleware');
+
+/**
+ * Mimics what `@astrojs/cloudflare` does in dev: register a dedicated
+ * `prerender` Vite environment and flip the core dev-prerender middleware
+ * switch. This is the adapter-level setup that exercises the bug fixed by
+ * tracking the `prerender` environment in the `astro:head-metadata` plugin.
+ */
+function prerenderEnvIntegration() {
+	return {
+		name: 'test:prerender-env',
+		hooks: {
+			'astro:config:setup': ({ updateConfig }) => {
+				updateConfig({
+					vite: {
+						plugins: [
+							{
+								name: 'test:prerender-env',
+								config() {
+									return {
+										environments: {
+											prerender: { dev: {} },
+										},
+									};
+								},
+								configureServer(server) {
+									server[devPrerenderMiddlewareSymbol] = true;
+								},
+							},
+						],
+					},
+				});
+			},
+		},
+	};
+}
+
+export default defineConfig({
+	output: 'server',
+	adapter: testAdapter(),
+	integrations: [prerenderEnvIntegration()],
+});
diff --git a/packages/astro/test/fixtures/head-propagation-prerender-env/package.json b/packages/astro/test/fixtures/head-propagation-prerender-env/package.json
new file mode 100644
index 000000000000..de3831145731
--- /dev/null
+++ b/packages/astro/test/fixtures/head-propagation-prerender-env/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/head-propagation-prerender-env",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/Icon.astro b/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/Icon.astro
new file mode 100644
index 000000000000..c837571f1b91
--- /dev/null
+++ b/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/Icon.astro
@@ -0,0 +1,20 @@
+---
+// Mirrors Starlight's `<Icon>`: each instance ships its own scoped `<style>`.
+// In dev these are hoisted as `<style data-vite-dev-id>` blocks emitted at the
+// current SSR render position. The bug traps them between a `<template>`
+// element's opening tag and its first child.
+const { name } = Astro.props;
+---
+<svg class={`icon icon-${name}`} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+	{name === 'sun' && <circle cx="12" cy="12" r="5"></circle>}
+	{name === 'moon' && <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path>}
+	{name === 'laptop' && <rect x="2" y="4" width="20" height="14" rx="2"></rect>}
+</svg>
+
+<style>
+	.icon {
+		width: 1em;
+		height: 1em;
+		display: inline-block;
+	}
+</style>
diff --git a/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/Layout.astro b/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/Layout.astro
new file mode 100644
index 000000000000..56afc6a32736
--- /dev/null
+++ b/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/Layout.astro
@@ -0,0 +1,15 @@
+---
+import ThemeIcons from './ThemeIcons.astro';
+const { title } = Astro.props;
+---
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<title>{title}</title>
+		<ThemeIcons />
+	</head>
+	<body>
+		<slot />
+	</body>
+</html>
diff --git a/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/ThemeIcons.astro b/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/ThemeIcons.astro
new file mode 100644
index 000000000000..a161fa184266
--- /dev/null
+++ b/packages/astro/test/fixtures/head-propagation-prerender-env/src/components/ThemeIcons.astro
@@ -0,0 +1,13 @@
+---
+// Mirrors Starlight's `ThemeProvider.astro`: a `<template id="theme-icons">`
+// lives inside `<head>` and holds several child components that each own
+// scoped CSS. When head propagation is missing the hoisted style blocks
+// get emitted between the template's opening tag and its first child,
+// trapping the styles inside the inert `<template>`.
+import Icon from './Icon.astro';
+---
+<template id="theme-icons">
+	<Icon name="sun" />
+	<Icon name="moon" />
+	<Icon name="laptop" />
+</template>
diff --git a/packages/astro/test/fixtures/head-propagation-prerender-env/src/pages/index.astro b/packages/astro/test/fixtures/head-propagation-prerender-env/src/pages/index.astro
new file mode 100644
index 000000000000..9fc766303d9d
--- /dev/null
+++ b/packages/astro/test/fixtures/head-propagation-prerender-env/src/pages/index.astro
@@ -0,0 +1,8 @@
+---
+export const prerender = true;
+
+import Layout from '../components/Layout.astro';
+---
+<Layout title="Head propagation through prerender env">
+	<p>Hello</p>
+</Layout>
diff --git a/packages/astro/test/fixtures/lightningcss-scoped-nesting/astro.config.mjs b/packages/astro/test/fixtures/lightningcss-scoped-nesting/astro.config.mjs
new file mode 100644
index 000000000000..b1352d85066e
--- /dev/null
+++ b/packages/astro/test/fixtures/lightningcss-scoped-nesting/astro.config.mjs
@@ -0,0 +1,15 @@
+import { defineConfig } from 'astro/config';
+
+// Reproduces https://github.com/withastro/astro/issues/16524.
+// `vite.css.transformer: 'lightningcss'` was the minimal trigger for the bug.
+export default defineConfig({
+	vite: {
+		css: {
+			transformer: 'lightningcss',
+		},
+	},
+	build: {
+		// authored when inlineStylesheets defaulted to never
+		inlineStylesheets: 'never',
+	},
+});
diff --git a/packages/astro/test/fixtures/lightningcss-scoped-nesting/package.json b/packages/astro/test/fixtures/lightningcss-scoped-nesting/package.json
new file mode 100644
index 000000000000..caf0c26d23e5
--- /dev/null
+++ b/packages/astro/test/fixtures/lightningcss-scoped-nesting/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/lightningcss-scoped-nesting",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*",
+    "lightningcss": "^1.32.0"
+  }
+}
diff --git a/packages/astro/test/fixtures/lightningcss-scoped-nesting/src/pages/index.astro b/packages/astro/test/fixtures/lightningcss-scoped-nesting/src/pages/index.astro
new file mode 100644
index 000000000000..65dbe77f3cad
--- /dev/null
+++ b/packages/astro/test/fixtures/lightningcss-scoped-nesting/src/pages/index.astro
@@ -0,0 +1,29 @@
+---
+// Reproduction for https://github.com/withastro/astro/issues/16524.
+// The bug appears when a scoped style nests `:where(& > ...)` under a class
+// selector. With `vite.css.transformer: 'lightningcss'`, lightningcss flattens
+// the nesting BEFORE the Astro compiler injects the scope attribute, which
+// (without the fix) causes `[data-astro-cid-...]` to bind to the matched
+// child instead of the parent.
+---
+<html>
+	<head>
+		<title>lightningcss-scoped-nesting</title>
+	</head>
+	<body>
+		<div class="parent">
+			<span>a</span>
+			<span>b</span>
+			<span>c</span>
+		</div>
+	</body>
+</html>
+
+<style>
+	.parent {
+		display: flex;
+		:where(& > :not(:last-child)) {
+			margin-inline-end: 24px;
+		}
+	}
+</style>
diff --git a/packages/astro/test/fixtures/partials-css-boundary/astro.config.mjs b/packages/astro/test/fixtures/partials-css-boundary/astro.config.mjs
new file mode 100644
index 000000000000..86dbfb924824
--- /dev/null
+++ b/packages/astro/test/fixtures/partials-css-boundary/astro.config.mjs
@@ -0,0 +1,3 @@
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({});
diff --git a/packages/astro/test/fixtures/partials-css-boundary/package.json b/packages/astro/test/fixtures/partials-css-boundary/package.json
new file mode 100644
index 000000000000..5dac595aa12c
--- /dev/null
+++ b/packages/astro/test/fixtures/partials-css-boundary/package.json
@@ -0,0 +1,8 @@
+{
+	"name": "@test/partials-css-boundary",
+	"version": "0.0.0",
+	"private": true,
+	"dependencies": {
+		"astro": "workspace:*"
+	}
+}
diff --git a/packages/astro/test/fixtures/partials-css-boundary/src/components/ResultsTable.astro b/packages/astro/test/fixtures/partials-css-boundary/src/components/ResultsTable.astro
new file mode 100644
index 000000000000..e1196fe74463
--- /dev/null
+++ b/packages/astro/test/fixtures/partials-css-boundary/src/components/ResultsTable.astro
@@ -0,0 +1,13 @@
+<table class="results-table">
+	<tbody>
+		<tr>
+			<td>Alpha</td>
+		</tr>
+	</tbody>
+</table>
+
+<style>
+	.results-table {
+		color: rebeccapurple;
+	}
+</style>
diff --git a/packages/astro/test/fixtures/partials-css-boundary/src/pages/index.astro b/packages/astro/test/fixtures/partials-css-boundary/src/pages/index.astro
new file mode 100644
index 000000000000..2d6f59353b15
--- /dev/null
+++ b/packages/astro/test/fixtures/partials-css-boundary/src/pages/index.astro
@@ -0,0 +1,8 @@
+---
+import SearchResults from './partials/search-results/index.astro';
+---
+
+<main>
+	<h1>Home</h1>
+	<SearchResults />
+</main>
diff --git a/packages/astro/test/fixtures/partials-css-boundary/src/pages/partials/search-results/index.astro b/packages/astro/test/fixtures/partials-css-boundary/src/pages/partials/search-results/index.astro
new file mode 100644
index 000000000000..0756cefb18ef
--- /dev/null
+++ b/packages/astro/test/fixtures/partials-css-boundary/src/pages/partials/search-results/index.astro
@@ -0,0 +1,7 @@
+---
+import ResultsTable from '../../../components/ResultsTable.astro';
+
+export const partial = true;
+---
+
+<ResultsTable />
diff --git a/packages/astro/test/fixtures/tsconfig-handling/extends-array/a.json b/packages/astro/test/fixtures/tsconfig-handling/extends-array/a.json
new file mode 100644
index 000000000000..26f214064a91
--- /dev/null
+++ b/packages/astro/test/fixtures/tsconfig-handling/extends-array/a.json
@@ -0,0 +1,3 @@
+{
+  "compilerOptions": { "strict": true }
+}
diff --git a/packages/astro/test/fixtures/tsconfig-handling/extends-array/b.json b/packages/astro/test/fixtures/tsconfig-handling/extends-array/b.json
new file mode 100644
index 000000000000..9702c26820a9
--- /dev/null
+++ b/packages/astro/test/fixtures/tsconfig-handling/extends-array/b.json
@@ -0,0 +1,3 @@
+{
+  "compilerOptions": { "target": "es2022" }
+}
diff --git a/packages/astro/test/fixtures/tsconfig-handling/extends-array/tsconfig.json b/packages/astro/test/fixtures/tsconfig-handling/extends-array/tsconfig.json
new file mode 100644
index 000000000000..a351928b8fec
--- /dev/null
+++ b/packages/astro/test/fixtures/tsconfig-handling/extends-array/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": ["./a.json", "./b.json"],
+  "files": ["own"]
+}
diff --git a/packages/astro/test/fixtures/tsconfig-handling/extends-chain/grandparent.json b/packages/astro/test/fixtures/tsconfig-handling/extends-chain/grandparent.json
new file mode 100644
index 000000000000..26f214064a91
--- /dev/null
+++ b/packages/astro/test/fixtures/tsconfig-handling/extends-chain/grandparent.json
@@ -0,0 +1,3 @@
+{
+  "compilerOptions": { "strict": true }
+}
diff --git a/packages/astro/test/fixtures/tsconfig-handling/extends-chain/parent.json b/packages/astro/test/fixtures/tsconfig-handling/extends-chain/parent.json
new file mode 100644
index 000000000000..0ba1fca07da1
--- /dev/null
+++ b/packages/astro/test/fixtures/tsconfig-handling/extends-chain/parent.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./grandparent.json",
+  "include": ["lib"]
+}
diff --git a/packages/astro/test/fixtures/tsconfig-handling/extends-chain/tsconfig.json b/packages/astro/test/fixtures/tsconfig-handling/extends-chain/tsconfig.json
new file mode 100644
index 000000000000..87ee10bd6f3d
--- /dev/null
+++ b/packages/astro/test/fixtures/tsconfig-handling/extends-chain/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./parent.json",
+  "files": ["child"]
+}
diff --git a/packages/astro/test/head-propagation-prerender-env.test.js b/packages/astro/test/head-propagation-prerender-env.test.js
new file mode 100644
index 000000000000..549fa9da7aa4
--- /dev/null
+++ b/packages/astro/test/head-propagation-prerender-env.test.js
@@ -0,0 +1,57 @@
+import assert from 'node:assert/strict';
+import { after, before, describe, it } from 'node:test';
+import { loadFixture } from './test-utils.ts';
+
+// Regression test for https://github.com/withastro/astro/issues/16291
+//
+// Adapters like `@astrojs/cloudflare` load prerendered page modules in a
+// dedicated `prerender` Vite environment. The `astro:head-metadata` dev
+// plugin used to track only the `ssr` environment, so `containsHead` /
+// `propagation` were never computed for those modules and `maybeRenderHead()`
+// could fire inside an unrelated component's `<template>` element, trapping
+// the hoisted `<style data-vite-dev-id>` blocks that Vite injects in dev.
+// Because `<template>` content is inert per the HTML spec, any style block
+// trapped inside is non-functional and the page renders unstyled.
+//
+// The fixture mirrors the Starlight `<ThemeProvider>` shape from the bug
+// report (a `<template id="theme-icons">` inside `<head>` holding Icon
+// components with their own scoped CSS) and the integration mirrors what
+// `@astrojs/cloudflare` does in dev (registers a `prerender` Vite
+// environment and flips on the core dev-prerender middleware).
+describe('Head propagation across ssr and prerender envs in dev', () => {
+	let fixture;
+	let devServer;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/head-propagation-prerender-env/',
+		});
+		devServer = await fixture.startDevServer();
+	});
+
+	after(async () => {
+		await devServer?.stop();
+	});
+
+	it('does not trap hoisted dev styles inside a <template> on prerendered routes', async () => {
+		const res = await fixture.fetch('/');
+		const html = await res.text();
+
+		const templateOpen = html.indexOf('<template');
+		const templateClose = html.indexOf('</template>');
+		assert.ok(
+			templateOpen !== -1 && templateClose !== -1 && templateOpen < templateClose,
+			'Expected the fixture to render a <template> element',
+		);
+
+		// The regression is an inline `<style data-vite-dev-id>` block emitted
+		// between the template's opening tag and its first child. Mirrors the
+		// one-liner from the bug report so the failure mode is easy to
+		// recognize in the output.
+		const styleInsideTemplate = html.indexOf('<style data-vite-dev-id', templateOpen);
+		assert.ok(
+			styleInsideTemplate === -1 || styleInsideTemplate > templateClose,
+			'Hoisted <style data-vite-dev-id> block must not be nested inside <template>',
+		);
+	});
+});
diff --git a/packages/astro/test/lightningcss-scoped-nesting.test.ts b/packages/astro/test/lightningcss-scoped-nesting.test.ts
new file mode 100644
index 000000000000..e53dc33eba6d
--- /dev/null
+++ b/packages/astro/test/lightningcss-scoped-nesting.test.ts
@@ -0,0 +1,57 @@
+import assert from 'node:assert/strict';
+import { before, describe, it } from 'node:test';
+import * as cheerio from 'cheerio';
+import { type Fixture, loadFixture } from './test-utils.ts';
+
+// Regression test for https://github.com/withastro/astro/issues/16524.
+//
+// When `vite.css.transformer: 'lightningcss'` is enabled, lightningcss
+// flattens nested selectors before the Astro compiler injects scope
+// attributes. The injector then sees `:where(...)` as the leading compound
+// of the top-level rule and (before the fix) prepended `[data-astro-cid-X]`
+// as a NEW leading compound — incorrectly constraining the matched child
+// rather than `.parent`.
+//
+// The fix in `packages/astro/src/core/compile/style.ts` excludes
+// lightningcss's `Nesting` lowering pass during the per-component
+// `preprocessCSS()` call, so the compiler still sees `.parent` as the
+// leading compound and attaches the cid to it. Vite's downstream pipeline
+// still lowers nesting before the bundle is emitted.
+describe('vite.css.transformer: lightningcss + scoped styles + nested `&`', () => {
+	let fixture: Fixture;
+	let stylesheet: string;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/lightningcss-scoped-nesting/',
+		});
+		await fixture.build();
+
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		const href = $('link[rel=stylesheet]').attr('href')!;
+		stylesheet = await fixture.readFile(href);
+	});
+
+	it('attaches the scope attribute to `.parent`, not as a fresh leading compound', () => {
+		// Correct: .parent[data-astro-cid-...] (or class-strategy variant).
+		// Either way `.parent` must appear immediately before the cid attribute.
+		assert.match(
+			stylesheet,
+			/\.parent\[data-astro-cid-[^\]]+\]/,
+			'expected `.parent[data-astro-cid-...]` in the produced CSS',
+		);
+	});
+
+	it('scopes the descendant rule with the cid attribute', () => {
+		// On the `next` branch the Rust compiler handles scoping after
+		// lightningcss flattens nesting, so the cid appears inside the
+		// `:where(...)` block alongside `.parent`.  Verify the descendant
+		// rule is still scoped (cid is present somewhere in the selector).
+		assert.match(
+			stylesheet,
+			/data-astro-cid-[^\]]+\].*:where/,
+			'expected the descendant rule to include a scope attribute',
+		);
+	});
+});
diff --git a/packages/astro/test/partials-css-boundary.test.js b/packages/astro/test/partials-css-boundary.test.js
new file mode 100644
index 000000000000..9d3538fd0182
--- /dev/null
+++ b/packages/astro/test/partials-css-boundary.test.js
@@ -0,0 +1,38 @@
+import assert from 'node:assert/strict';
+import { before, describe, it } from 'node:test';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.ts';
+
+describe('Partials CSS propagation', () => {
+	/** @type {import('./test-utils.ts').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/partials-css-boundary/',
+			outDir: './dist/partials-css-boundary/',
+		});
+		await fixture.build();
+	});
+
+	it('includes transitive CSS from partials imported as components in build output', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		let styles = $('style')
+			.toArray()
+			.map((el) => $(el).text())
+			.join('\n');
+
+		const stylesheetHrefs = $('link[rel="stylesheet"]')
+			.toArray()
+			.map((el) => $(el).attr('href'))
+			.filter((href) => href && href.startsWith('/_astro/'));
+
+		for (const href of stylesheetHrefs) {
+			styles += `\n${await fixture.readFile(href)}`;
+		}
+
+		assert.match(styles, /\.results-table\[data-astro-cid-/);
+		assert.match(html, /results-table/);
+	});
+});
diff --git a/packages/astro/test/ssr-prerender.test.ts b/packages/astro/test/ssr-prerender.test.ts
index 0d0d62277c9f..f6e8e0e40b4e 100644
--- a/packages/astro/test/ssr-prerender.test.ts
+++ b/packages/astro/test/ssr-prerender.test.ts
@@ -106,6 +106,67 @@ describe('SSR: prerender', () => {
 	});
 });
 
+describe('SSR manifest does not include inline CSS for prerendered routes', () => {
+	let fixture: Fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/ssr-prerender/',
+			output: 'server',
+			outDir: './dist/inline-stylesheets',
+			adapter: testAdapter(),
+			build: {
+				inlineStylesheets: 'always',
+			},
+		});
+		await fixture.build();
+	});
+
+	it('prerendered routes have empty styles in the SSR manifest', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const prerenderedRoutes = app.manifest.routes.filter((r) => r.routeData.prerender);
+		assert.ok(prerenderedRoutes.length > 0, 'fixture must have prerendered routes');
+		for (const route of prerenderedRoutes) {
+			assert.deepEqual(
+				route.styles,
+				[],
+				`route ${route.routeData.route} should have no styles in the SSR manifest`,
+			);
+		}
+	});
+
+	it('SSR routes still have inline styles in the SSR manifest', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const ssrRoute = app.manifest.routes.find((r) => r.routeData.route === '/not-prerendered');
+		assert.ok(ssrRoute, 'expected /not-prerendered route');
+		const hasInline = ssrRoute.styles.some(
+			(s) => s.type === 'inline' && s.content.includes('ssr-only'),
+		);
+		assert.ok(hasInline, 'SSR route should retain its inline CSS in the manifest');
+	});
+
+	it('prerendered HTML on disk still contains inline <style> tags', async () => {
+		const html = await fixture.readFile('/client/static/index.html');
+		const $ = cheerio.load(html);
+		const inlineStyles = $('style')
+			.map((_, el) => $(el).text() ?? '')
+			.toArray()
+			.join('');
+		assert.ok(
+			inlineStyles.includes('prerender-only'),
+			'prerendered HTML should still inline the route CSS',
+		);
+	});
+
+	it('SSR entry chunk does not contain the prerender-only CSS string', async () => {
+		const entry = (await fixture.readFile('/server/entry.mjs')).toString();
+		assert.ok(
+			!entry.includes('prerender-only'),
+			'SSR entry should not carry inline CSS for prerendered routes',
+		);
+	});
+});
+
 // NOTE: This test doesn't make sense as it relies on the fact that on the client build,
 // you can change the prerender state of pages from the SSR build, however, the client build
 // is not always guaranteed to run. If we want to support this feature, we may want to only allow
diff --git a/packages/astro/test/types/define-live-collection.ts b/packages/astro/test/types/define-live-collection.ts
new file mode 100644
index 000000000000..f5c9e2cf606f
--- /dev/null
+++ b/packages/astro/test/types/define-live-collection.ts
@@ -0,0 +1,36 @@
+import { describe, it } from 'node:test';
+import { expectTypeOf } from 'expect-type';
+import { defineLiveCollection } from 'astro/content/config';
+import type { LiveLoader } from 'astro/loaders';
+
+function assertType<T>(data: T, cb: (data: NoInfer<T>) => void) {
+	cb(data);
+}
+
+interface Data {
+	body: string;
+}
+
+const loader: LiveLoader<Data> = {
+	name: 'test-loader',
+	loadEntry: async () => ({
+		id: 'hello-world',
+		data: { body: 'Hello world' },
+	}),
+	loadCollection: async () => ({
+		entries: [
+			{
+				id: 'hello-world',
+				data: { body: 'Hello world' },
+			},
+		],
+	}),
+};
+
+describe('defineLiveCollection()', () => {
+	it('accepts live loaders whose data type is declared as an interface', () => {
+		assertType(defineLiveCollection({ loader }), (config) => {
+			expectTypeOf(config.loader).toEqualTypeOf<LiveLoader<Data>>();
+		});
+	});
+});
diff --git a/packages/astro/test/units/app/inert-script-dedup.test.ts b/packages/astro/test/units/app/inert-script-dedup.test.ts
new file mode 100644
index 000000000000..2aed78be47b9
--- /dev/null
+++ b/packages/astro/test/units/app/inert-script-dedup.test.ts
@@ -0,0 +1,124 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { App } from '../../../dist/core/app/app.js';
+import { createRenderInstruction } from '../../../dist/runtime/server/render/instruction.js';
+import {
+	createComponent,
+	render,
+	templateEnter,
+	templateExit,
+} from '../../../dist/runtime/server/index.js';
+import { createManifest, createRouteInfo } from './test-helpers.ts';
+
+const hydrationRouteData = {
+	route: '/inert-hydration',
+	component: 'src/pages/inert-hydration.astro',
+	params: [],
+	pathname: '/inert-hydration',
+	distURL: [],
+	pattern: /^\/inert-hydration\/?$/,
+	segments: [[{ content: 'inert-hydration', dynamic: false, spread: false }]],
+	type: 'page' as const,
+	prerender: false,
+	fallbackRoutes: [],
+	isIndex: false,
+	origin: 'project' as const,
+};
+
+const serverIslandRouteData = {
+	route: '/inert-server-island-runtime',
+	component: 'src/pages/inert-server-island-runtime.astro',
+	params: [],
+	pathname: '/inert-server-island-runtime',
+	distURL: [],
+	pattern: /^\/inert-server-island-runtime\/?$/,
+	segments: [[{ content: 'inert-server-island-runtime', dynamic: false, spread: false }]],
+	type: 'page' as const,
+	prerender: false,
+	fallbackRoutes: [],
+	isIndex: false,
+	origin: 'project' as const,
+};
+
+const hydrationInstruction = createRenderInstruction({
+	type: 'directive',
+	hydration: {
+		directive: 'load',
+		value: '',
+		componentUrl: '',
+		componentExport: { value: '' },
+	},
+});
+
+const serverIslandInstruction = createRenderInstruction({ type: 'server-island-runtime' });
+
+const hydrationPage = createComponent((result: any) => {
+	return render`
+		<template id="inert-hydration-template">
+			${templateEnter(result)}
+			${hydrationInstruction}
+			${templateExit(result)}
+		</template>
+		<div id="hydration-runtime">${hydrationInstruction}</div>
+	`;
+});
+
+const serverIslandPage = createComponent((result: any) => {
+	return render`
+		<template id="inert-server-island-template">
+			${templateEnter(result)}
+			${serverIslandInstruction}
+			${templateExit(result)}
+		</template>
+		<div id="server-island-runtime">${serverIslandInstruction}</div>
+	`;
+});
+
+const pageMap = new Map([
+	[
+		hydrationRouteData.component,
+		async () => ({
+			page: async () => ({
+				default: hydrationPage,
+			}),
+		}),
+	],
+	[
+		serverIslandRouteData.component,
+		async () => ({
+			page: async () => ({
+				default: serverIslandPage,
+			}),
+		}),
+	],
+]);
+
+const app = new App(
+	createManifest({
+		routes: [createRouteInfo(hydrationRouteData), createRouteInfo(serverIslandRouteData)],
+		clientDirectives: new Map([['load', 'console.log("directive")']]),
+		pageMap: pageMap as any,
+	}) as any,
+);
+
+describe('Inert template script deduplication', () => {
+	it('keeps hydration prescripts available after template content', async () => {
+		const response = await app.render(new Request('http://example.com/inert-hydration'));
+		const html = await response.text();
+
+		assert.equal(countOccurrences(html, 'console.log("directive")'), 2);
+	});
+
+	it('does not consume server-island runtime dedup inside template content', async () => {
+		const response = await app.render(
+			new Request('http://example.com/inert-server-island-runtime'),
+		);
+		const html = await response.text();
+
+		assert.equal(countOccurrences(html, 'replaceServerIsland('), 2);
+	});
+});
+
+function countOccurrences(content: string, needle: string) {
+	return content.split(needle).length - 1;
+}
diff --git a/packages/astro/test/units/assets/getImage.test.ts b/packages/astro/test/units/assets/getImage.test.ts
index d2b95b490e6f..207107aec613 100644
--- a/packages/astro/test/units/assets/getImage.test.ts
+++ b/packages/astro/test/units/assets/getImage.test.ts
@@ -277,6 +277,36 @@ describe('getImage', () => {
 			assert.equal(result.attributes.fit, undefined);
 			assert.equal(result.attributes.position, undefined);
 		});
+
+		it('includes object-position in style attribute when position is provided', async () => {
+			const result = await renderImage({
+				src: 'https://example.com/photo.jpg',
+				width: 300,
+				height: 400,
+				alt: 'Position test',
+				layout: 'constrained',
+				position: 'left top',
+			});
+
+			assert.match(result.attributes.style, /object-position:\s*left top/);
+		});
+
+		it('merges position into existing style object without overwriting', async () => {
+			const result = await renderImage({
+				src: 'https://example.com/photo.jpg',
+				width: 300,
+				height: 400,
+				alt: 'Merge test',
+				layout: 'constrained',
+				position: 'top right',
+				style: { color: 'red' },
+			});
+
+			assert.deepStrictEqual(result.attributes.style, {
+				color: 'red',
+				objectPosition: 'top right',
+			});
+		});
 	});
 
 	describe('format', () => {
diff --git a/packages/astro/test/units/config/config-tsconfig.test.ts b/packages/astro/test/units/config/config-tsconfig.test.ts
index e85e51ef7a38..b3e622768b8a 100644
--- a/packages/astro/test/units/config/config-tsconfig.test.ts
+++ b/packages/astro/test/units/config/config-tsconfig.test.ts
@@ -3,17 +3,20 @@ import { readFile } from 'node:fs/promises';
 import * as path from 'node:path';
 import { describe, it } from 'node:test';
 import { fileURLToPath } from 'node:url';
-import { toJson } from 'tsconfck';
-import { loadTSConfig, updateTSConfigForFramework } from '../../../dist/core/config/index.js';
+import { parse as parseJsonc } from 'jsonc-parser';
+import {
+	loadTSConfig,
+	updateTSConfigForFramework,
+	type TSConfigLoadedResult,
+	type TSConfigResult,
+} from '../../../dist/core/config/index.js';
 import type { frameworkWithTSSettings } from '../../../dist/core/config/tsconfig.js';
 
 const cwd = fileURLToPath(new URL('../../fixtures/tsconfig-handling/', import.meta.url));
 
 /** Assert that loadTSConfig returned a valid result (not an error string). */
-function assertValidConfig(
-	config: Awaited<ReturnType<typeof loadTSConfig>>,
-): asserts config is Exclude<typeof config, string> {
-	assert.ok(typeof config !== 'string', `Expected a valid config but got error: ${config}`);
+function assertValidConfig(config: TSConfigResult): asserts config is TSConfigLoadedResult {
+	assert.ok(!config.error, `Expected a valid config but got error: ${JSON.stringify(config)}`);
 }
 
 describe('TSConfig handling', () => {
@@ -27,33 +30,52 @@ describe('TSConfig handling', () => {
 			const config = await loadTSConfig(cwd);
 			assertValidConfig(config);
 			assert.equal(config.tsconfigFile, path.join(cwd, 'tsconfig.json'));
-			assert.deepEqual(config.tsconfig.files, ['im-a-test']);
+			assert.deepEqual(config.tsconfig.files, ['./im-a-test']);
 		});
 
 		it('can fall back to jsconfig.json if tsconfig.json does not exist', async () => {
 			const config = await loadTSConfig(path.join(cwd, 'jsconfig'));
 			assertValidConfig(config);
 			assert.equal(config.tsconfigFile, path.join(cwd, 'jsconfig', 'jsconfig.json'));
-			assert.deepEqual(config.tsconfig.files, ['im-a-test-js']);
+			assert.deepEqual(config.tsconfig.files, ['./im-a-test-js']);
 		});
 
 		it('properly return errors when not resolving', async () => {
 			const invalidConfig = await loadTSConfig(path.join(cwd, 'invalid'));
 			const missingConfig = await loadTSConfig(path.join(cwd, 'missing'));
 
-			assert.equal(invalidConfig, 'invalid-config');
-			assert.equal(missingConfig, 'missing-config');
+			assert.equal(invalidConfig.error, 'invalid-config');
+			assert.equal(missingConfig.error, 'missing-config');
 		});
 
 		it('does not change baseUrl in raw config', async () => {
 			const loadedConfig = await loadTSConfig(path.join(cwd, 'baseUrl'));
 			assertValidConfig(loadedConfig);
-			const rawConfig = await readFile(path.join(cwd, 'baseUrl', 'tsconfig.json'), 'utf-8')
-				.then(toJson)
-				.then((content) => JSON.parse(content));
+			const rawContent = await readFile(path.join(cwd, 'baseUrl', 'tsconfig.json'), 'utf-8');
+			const rawConfig = parseJsonc(rawContent, [], { allowTrailingComma: true });
 
 			assert.deepEqual(loadedConfig.rawConfig, rawConfig);
 		});
+
+		it('populates `sources` with the full extends chain, root first', async () => {
+			const dir = path.join(cwd, 'extends-chain');
+			const config = await loadTSConfig(dir);
+			assertValidConfig(config);
+			assert.equal(config.sources.length, 3);
+			assert.ok(config.sources[0].endsWith('tsconfig.json'));
+			assert.ok(config.sources.some((p) => p.endsWith('parent.json')));
+			assert.ok(config.sources.some((p) => p.endsWith('grandparent.json')));
+		});
+
+		it('resolves extends array form (TS 5.0+)', async () => {
+			const dir = path.join(cwd, 'extends-array');
+			const config = await loadTSConfig(dir);
+			assertValidConfig(config);
+			assert.equal(config.tsconfig.compilerOptions?.strict, true);
+			assert.equal(config.tsconfig.compilerOptions?.target, 'es2022');
+			assert.deepEqual(config.tsconfig.files, ['./own']);
+			assert.equal(config.sources.length, 3);
+		});
 	});
 
 	describe('tsconfig / jsconfig updates', () => {
diff --git a/packages/astro/test/units/i18n/i18n-middleware.test.ts b/packages/astro/test/units/i18n/i18n-middleware.test.ts
index d8ff04c0b40e..68031e96ab3b 100644
--- a/packages/astro/test/units/i18n/i18n-middleware.test.ts
+++ b/packages/astro/test/units/i18n/i18n-middleware.test.ts
@@ -22,6 +22,13 @@ function makePageResponse(
 	});
 }
 
+function makeFallbackSentinelResponse(): Response {
+	return new Response(null, {
+		status: 500,
+		headers: { 'X-Astro-Route-Type': 'fallback' },
+	});
+}
+
 interface I18nManifestOverrides {
 	defaultLocale?: string;
 	locales?: Locales;
@@ -188,6 +195,29 @@ describe('createI18nMiddleware', () => {
 			assert.equal(result.status, 200);
 			assert.equal(await result.text(), 'rewritten to /en/start');
 		});
+
+		it('rewrites for the fallback-type sentinel response (regression #16113)', async () => {
+			const handler = createI18nMiddleware(
+				makeI18nManifest({
+					strategy: 'pathname-prefix-other-locales',
+					fallbackType: 'rewrite',
+					fallback: { it: 'en' },
+				}),
+				'/',
+				'ignore',
+				'directory',
+			);
+			const ctx = createMockAPIContext({
+				url: 'http://localhost/it/about',
+				rewrite: async (_path: string) => new Response(`<h1>about page</h1>`, { status: 200 }),
+			} as any);
+			const next = async () => makeFallbackSentinelResponse();
+
+			const result = await callHandler(handler, ctx, next);
+
+			assert.equal(result.status, 200);
+			assert.match(await result.text(), /about page/);
+		});
 	});
 
 	describe('early-return guards', () => {
diff --git a/packages/astro/test/units/render/inert-script-dedup.test.ts b/packages/astro/test/units/render/inert-script-dedup.test.ts
new file mode 100644
index 000000000000..2177c4317cb0
--- /dev/null
+++ b/packages/astro/test/units/render/inert-script-dedup.test.ts
@@ -0,0 +1,106 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { chunkToString } from '../../../dist/runtime/server/render/common.js';
+import { createRenderInstruction } from '../../../dist/runtime/server/render/instruction.js';
+
+function createStubResult() {
+	return {
+		clientDirectives: new Map([['load', 'console.log("directive")']]),
+		_metadata: {
+			hasHydrationScript: false,
+			rendererSpecificHydrationScripts: new Set<string>(),
+			hasRenderedHead: false,
+			renderedScripts: new Set<string>(),
+			hasDirectives: new Set<string>(),
+			hasRenderedServerIslandRuntime: false,
+			headInTree: false,
+			extraHead: [],
+			extraStyleHashes: [],
+			extraScriptHashes: [],
+			propagators: new Set(),
+			templateDepth: 0,
+		},
+	};
+}
+
+describe('inert context dedup behavior', () => {
+	it('does not consume directive or hydration dedup inside templates', () => {
+		const result = createStubResult();
+		result._metadata.templateDepth = 1;
+
+		const instruction = createRenderInstruction({
+			type: 'directive',
+			hydration: {
+				directive: 'load',
+				value: '',
+				componentUrl: '',
+				componentExport: { value: '' },
+			},
+		});
+
+		const inertOutput = chunkToString(result as any, instruction).toString();
+		assert.match(inertOutput, /<script>/);
+		assert.equal(result._metadata.hasHydrationScript, false);
+		assert.equal(result._metadata.hasDirectives.has('load'), false);
+
+		result._metadata.templateDepth = 0;
+		const executableOutput = chunkToString(result as any, instruction).toString();
+		assert.match(executableOutput, /<script>/);
+		assert.equal(result._metadata.hasHydrationScript, true);
+		assert.equal(result._metadata.hasDirectives.has('load'), true);
+	});
+
+	it('does not emit inert directive scripts when already deduplicated', () => {
+		const result = createStubResult();
+		const instruction = createRenderInstruction({
+			type: 'directive',
+			hydration: {
+				directive: 'load',
+				value: '',
+				componentUrl: '',
+				componentExport: { value: '' },
+			},
+		});
+
+		result._metadata.hasHydrationScript = true;
+		result._metadata.hasDirectives.add('load');
+		result._metadata.templateDepth = 1;
+
+		const inertOutput = chunkToString(result as any, instruction);
+		assert.equal(inertOutput, '');
+	});
+
+	it('does not consume renderer hydration dedup inside templates', () => {
+		const result = createStubResult();
+		const rendererInstruction = createRenderInstruction({
+			type: 'renderer-hydration-script',
+			rendererName: 'react',
+			render: () => '<script>window.__react = true;</script>',
+		});
+
+		result._metadata.templateDepth = 1;
+		const inertOutput = chunkToString(result as any, rendererInstruction).toString();
+		assert.match(inertOutput, /__react/);
+		assert.equal(result._metadata.rendererSpecificHydrationScripts.has('react'), false);
+
+		result._metadata.templateDepth = 0;
+		const executableOutput = chunkToString(result as any, rendererInstruction).toString();
+		assert.match(executableOutput, /__react/);
+		assert.equal(result._metadata.rendererSpecificHydrationScripts.has('react'), true);
+	});
+
+	it('does not consume server-island runtime dedup inside templates', () => {
+		const result = createStubResult();
+		const instruction = createRenderInstruction({ type: 'server-island-runtime' });
+
+		result._metadata.templateDepth = 1;
+		const inertOutput = chunkToString(result as any, instruction).toString();
+		assert.match(inertOutput, /replaceServerIsland/);
+		assert.equal(result._metadata.hasRenderedServerIslandRuntime, false);
+
+		result._metadata.templateDepth = 0;
+		const executableOutput = chunkToString(result as any, instruction).toString();
+		assert.match(executableOutput, /replaceServerIsland/);
+		assert.equal(result._metadata.hasRenderedServerIslandRuntime, true);
+	});
+});
diff --git a/packages/astro/test/units/routing/manifest.test.ts b/packages/astro/test/units/routing/manifest.test.ts
index 454cf2d6ec5b..833e98bef04b 100644
--- a/packages/astro/test/units/routing/manifest.test.ts
+++ b/packages/astro/test/units/routing/manifest.test.ts
@@ -61,8 +61,8 @@ describe('routing - createRoutesList', () => {
 			defaultLogger,
 		);
 		const [{ pattern }] = manifest.routes;
-		assert.equal(pattern.test(''), true);
-		assert.equal(pattern.test('/'), false);
+		assert.equal(pattern.test('/'), true);
+		assert.equal(pattern.test(''), false);
 	});
 
 	it('endpoint routes are sorted before page routes', async () => {
diff --git a/packages/astro/test/units/routing/pattern.test.ts b/packages/astro/test/units/routing/pattern.test.ts
new file mode 100644
index 000000000000..58aa6e5e4e2b
--- /dev/null
+++ b/packages/astro/test/units/routing/pattern.test.ts
@@ -0,0 +1,36 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { getPattern } from '../../../dist/core/routing/pattern.js';
+
+describe('getPattern', () => {
+	describe('root route (empty segments)', () => {
+		it('should produce a pattern matching "/" with trailingSlash: "never" and base: "/"', () => {
+			const pattern = getPattern([], '/', 'never');
+			assert.ok(pattern.test('/'), `pattern /${pattern.source}/ should match "/"`);
+			assert.ok(!pattern.test(''), `pattern /${pattern.source}/ should not match ""`);
+		});
+
+		// When trailingSlash === 'never' and base !== '/', getPattern() set initial = ''
+		// Root route, pathname is already '', the regex became ^$ instead of ^\/$, causing a 404
+		it('should produce a pattern matching "/" with trailingSlash: "never" and base: "/mybase"', () => {
+			const pattern = getPattern([], '/mybase', 'never');
+			assert.ok(pattern.test('/'), `pattern /${pattern.source}/ should match "/"`);
+			assert.ok(!pattern.test(''), `pattern /${pattern.source}/ should not match ""`);
+		});
+	});
+
+	describe('non-root routes with trailingSlash: "never" and base path', () => {
+		it('should preserve pathname for non-root routes when base !== "/"', () => {
+			// Non-root routes have pathname = '/about' (not empty), so initial = ''
+			// doesn't cause problems. The regex becomes \/about$ which correctly
+			// matches '/about' after base-stripping in the router.
+			const pattern = getPattern(
+				[[{ content: 'about', dynamic: false, spread: false }]],
+				'/mybase',
+				'never',
+			);
+			assert.ok(pattern.test('/about'), `pattern /${pattern.source}/ should match "/about"`);
+			assert.ok(!pattern.test('/about/'), `pattern /${pattern.source}/ should not match "/about/"`);
+		});
+	});
+});
diff --git a/packages/astro/test/units/routing/rewrite.test.ts b/packages/astro/test/units/routing/rewrite.test.ts
index 73336c5dbf36..9753ea042543 100644
--- a/packages/astro/test/units/routing/rewrite.test.ts
+++ b/packages/astro/test/units/routing/rewrite.test.ts
@@ -43,7 +43,7 @@ describe('normalizeRewritePathname', () => {
 
 		it('handles base path root with trailingSlash never', () => {
 			const result = normalizeRewritePathname('/docs', '/docs/', 'never', 'directory');
-			assert.equal(result.pathname, '');
+			assert.equal(result.pathname, '/');
 			assert.equal(result.resolvedUrlPathname, '/docs');
 		});
 
@@ -87,9 +87,9 @@ describe('normalizeRewritePathname', () => {
 			assert.equal(result.pathname, '/about');
 		});
 
-		it('converts root with base to empty string', () => {
+		it('converts root with base to root slash', () => {
 			const result = normalizeRewritePathname('/docs/', '/docs/', 'never', 'directory');
-			assert.equal(result.pathname, '');
+			assert.equal(result.pathname, '/');
 			assert.equal(result.resolvedUrlPathname, '/docs');
 		});
 	});
diff --git a/packages/astro/test/units/routing/router-match.test.ts b/packages/astro/test/units/routing/router-match.test.ts
index 3cda625c45de..a88c9c8c219c 100644
--- a/packages/astro/test/units/routing/router-match.test.ts
+++ b/packages/astro/test/units/routing/router-match.test.ts
@@ -270,6 +270,28 @@ describe('Router.match', () => {
 		assert.equal(aboutMatch.route.route, '/about');
 	});
 
+	it('matches dynamic routes that contain .html in their params', () => {
+		const trailingSlash = 'ignore';
+		const routes = [
+			makeRoute({
+				segments: [[dynamicPart('path')]],
+				trailingSlash,
+				route: '/[path]',
+				pathname: undefined,
+				type: 'endpoint',
+			}),
+		];
+		const router = new Router(routes, {
+			base: '/',
+			trailingSlash,
+			buildFormat: 'directory',
+		});
+
+		const match = router.match('/file.html');
+		assert.equal(match.type, 'match');
+		assert.deepEqual(match.params, { path: 'file.html' });
+	});
+
 	it('matches [slug].html routes and extracts slug without .html', () => {
 		// Routes like `[slug].html.astro` have `.html` as a static segment part.
 		// The router must not strip `.html` before matching, or params extraction fails.
diff --git a/packages/astro/test/units/sessions/astro-session.test.ts b/packages/astro/test/units/sessions/astro-session.test.ts
index 654359c3ae62..0b6760416866 100644
--- a/packages/astro/test/units/sessions/astro-session.test.ts
+++ b/packages/astro/test/units/sessions/astro-session.test.ts
@@ -385,15 +385,41 @@ describe('AstroSession - Sparse Data Operations', () => {
 		session.delete('key');
 		await session[PERSIST_SYMBOL]();
 
-		// Create a new session using the stored data
+		// Create a new session using the stored data (get must return parsed JSON like unstorage)
 		const newSession = createSession(defaultConfig, defaultMockCookies, {
-			get: async () => storedData,
+			get: async () => (storedData != null ? JSON.parse(storedData) : null),
 			setItem: async () => {},
 		} as unknown as Storage);
 
 		assert.equal(await newSession.get('key'), undefined);
 	});
 
+	it('should persist delete as the first mutation (no prior get/set)', async () => {
+		const store = new Map<string, string>();
+		const sessionId = 'sessionid';
+		store.set(sessionId, devalueStringify(new Map([['token', { data: 'secret' }]])));
+
+		const mockStorage = {
+			get: async (key: string) => {
+				const raw = store.get(key);
+				return raw ? JSON.parse(raw) : null;
+			},
+			setItem: async (key: string, value: string) => {
+				store.set(key, value);
+			},
+			removeItem: async (key: string) => {
+				store.delete(key);
+			},
+		} as unknown as Storage;
+
+		const session = createSession(defaultConfig, defaultMockCookies, mockStorage);
+		session.delete('token');
+		await session[PERSIST_SYMBOL]();
+
+		const newSession = createSession(defaultConfig, defaultMockCookies, mockStorage);
+		assert.equal(await newSession.get('token'), undefined);
+	});
+
 	it('should update existing values in sparse mode', async () => {
 		const existingData = stringify(new Map([['key', 'old']]));
 		const mockStorage = {
@@ -554,3 +580,76 @@ describe('AstroSession - Storage Errors', () => {
 });
 
 // #endregion Storage Errors
+
+// #region No-Cookie Short Circuit
+describe('AstroSession - No-Cookie Short Circuit', () => {
+	it('should not initialize the storage driver or read when no session cookie is present', async () => {
+		let driverInitCount = 0;
+		const countingDriverFactory: SessionDriverFactory = () => {
+			driverInitCount++;
+			return driverFactory();
+		};
+
+		const noCookieMock: MockCookies = {
+			set: () => {},
+			delete: () => {},
+			get: () => undefined,
+		};
+
+		// Use a unique driver name so the static #sharedStorage cache from
+		// earlier tests can't mask a regression.
+		const session = new AstroSession({
+			cookies: noCookieMock as any,
+			config: { ...defaultConfig, driver: 'no-cookie-test' },
+			runtimeMode: 'production',
+			driverFactory: countingDriverFactory,
+			mockStorage: null,
+		});
+
+		const value = await session.get('nonexistent');
+		assert.equal(value, undefined);
+		assert.equal(driverInitCount, 0, 'Driver factory should never have been called');
+	});
+
+	it('should read from storage when session cookie is present', async () => {
+		let storageReadCount = 0;
+		const mockStorage = {
+			get: async () => {
+				storageReadCount++;
+				return stringify(new Map([['user', { data: 'alice' }]]));
+			},
+			setItem: async () => {},
+		} as unknown as Storage;
+
+		const withCookieMock: MockCookies = {
+			set: () => {},
+			delete: () => {},
+			get: (name: string) => {
+				if (name === 'test-session') return { value: 'existing-session-id' };
+				return undefined;
+			},
+		};
+
+		const session = createSession(defaultConfig, withCookieMock, mockStorage);
+
+		const value = await session.get('user');
+		assert.equal(value, 'alice');
+		assert.equal(storageReadCount, 1, 'Storage should have been read once');
+	});
+
+	it('should allow set() then get() without a cookie (new session)', async () => {
+		const noCookieMock: MockCookies = {
+			set: () => {},
+			delete: () => {},
+			get: () => undefined,
+		};
+
+		const session = createSession(defaultConfig, noCookieMock);
+
+		session.set('key', 'expected');
+		const value = await session.get('key');
+		assert.equal(value, 'expected');
+	});
+});
+
+// #endregion No-Cookie Short Circuit
diff --git a/packages/integrations/cloudflare/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md
index 3b34743df4af..bbe78ad29ca0 100644
--- a/packages/integrations/cloudflare/CHANGELOG.md
+++ b/packages/integrations/cloudflare/CHANGELOG.md
@@ -10,6 +10,16 @@
 
 - Updated dependencies [[`cafec4e`](https://github.com/withastro/astro/commit/cafec4e23365061491103dfce2e889a15cf86f27), [`cafec4e`](https://github.com/withastro/astro/commit/cafec4e23365061491103dfce2e889a15cf86f27), [`c30a778`](https://github.com/withastro/astro/commit/c30a7789a477e44826c54c8560587d09dc46a229), [`ee079d4`](https://github.com/withastro/astro/commit/ee079d4c7f143076b84d663c832911009a077c7f)]:
   - astro@7.0.0-alpha.0
+
+## 13.3.1
+
+### Patch Changes
+
+- [#16552](https://github.com/withastro/astro/pull/16552) [`409f6ef`](https://github.com/withastro/astro/commit/409f6efb0cfef5b40c5e0058726bc4edbb24e2ab) Thanks [@web-dev0521](https://github.com/web-dev0521)! - Fixes an issue where existing KV namespace bindings were silently removed when session support was enabled.
+
+- [#16277](https://github.com/withastro/astro/pull/16277) [`7666bcd`](https://github.com/withastro/astro/commit/7666bcdf6d7f6d65cdae89b622d33dcc462590e0) Thanks [@Calvin-LL](https://github.com/Calvin-LL)! - Fix static assets and prerendered pages 404ing when `base` is configured.
+
+- Updated dependencies []:
   - @astrojs/underscore-redirects@1.0.3
 
 ## 13.3.0
diff --git a/packages/integrations/cloudflare/src/esbuild-plugin-astro-frontmatter.ts b/packages/integrations/cloudflare/src/esbuild-plugin-astro-frontmatter.ts
index ef2c14a316ef..3f9805e68c21 100644
--- a/packages/integrations/cloudflare/src/esbuild-plugin-astro-frontmatter.ts
+++ b/packages/integrations/cloudflare/src/esbuild-plugin-astro-frontmatter.ts
@@ -3,6 +3,19 @@ import type { DepOptimizationConfig } from 'vite';
 
 const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---/;
 
+// Matches tokens to skip (strings, template literals, comments) OR a top-level `return`.
+// The first alternative is preserved as-is; only the second is rewritten.
+// Negative lookbehind `(?<!\.)` prevents matching member accesses like `gen.return()`.
+const RETURN_REPLACE_RE =
+	/(\/\/[^\n]*|\/\*[\s\S]*?\*\/|`(?:[^`\\]|\\.)*`|"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')|(?<!\.)\breturn(\s*;|\b)/g;
+
+function replaceTopLevelReturns(code: string): string {
+	return code.replace(RETURN_REPLACE_RE, (_match, skip: string | undefined, tail: string) => {
+		if (skip !== undefined) return skip;
+		return tail.trim() === ';' ? 'throw 0;' : 'throw ';
+	});
+}
+
 // Not exposed as a type from Vite, so need to grab this way.
 type ESBuildPlugin = NonNullable<
 	NonNullable<DepOptimizationConfig['esbuildOptions']>['plugins']
@@ -27,12 +40,7 @@ export function astroFrontmatterScanPlugin(): ESBuildPlugin {
 						// Replace `return` with `throw` to avoid esbuild's "Top-level return" error during scanning.
 						// This aligns with Astro's core compiler logic for frontmatter error handling.
 						// See: packages/astro/src/vite-plugin-astro/compile.ts
-						//
-						// Known Limitation: Using regex /\breturn\b/ will incorrectly match
-						// identifiers like `$return` or aliases like `import { return as ret }`.
-						const contents = frontmatterMatch[1]
-							.replace(/\breturn\s*;/g, 'throw 0;')
-							.replace(/\breturn\b/g, 'throw ');
+						const contents = replaceTopLevelReturns(frontmatterMatch[1]);
 
 						// Append `export default {}` so that default imports of .astro files
 						// (e.g. `import MyComponent from './MyComponent.astro'`) resolve correctly
diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts
index 092c637c3a62..555e18390aa9 100644
--- a/packages/integrations/cloudflare/src/index.ts
+++ b/packages/integrations/cloudflare/src/index.ts
@@ -1,5 +1,5 @@
 import { createReadStream, existsSync, readFileSync } from 'node:fs';
-import { appendFile, stat } from 'node:fs/promises';
+import { appendFile, rename, stat } from 'node:fs/promises';
 import { createInterface } from 'node:readline/promises';
 import { removeLeadingForwardSlash } from '@astrojs/internal-helpers/path';
 import { createRedirectsFromAstroRoutes, printAsRedirects } from '@astrojs/underscore-redirects';
@@ -118,6 +118,7 @@ export default function createIntegration({
 	...cloudflareOptions
 }: Options = {}): AstroIntegration {
 	let _config: AstroConfig;
+	let _originalClientDir: URL;
 
 	let _routes: IntegrationResolvedRoute[];
 	let _isFullyStatic = false;
@@ -350,6 +351,15 @@ export default function createIntegration({
 			},
 			'astro:config:done': ({ setAdapter, config, injectTypes, logger }) => {
 				_config = config;
+				_originalClientDir = new URL(config.build.client.href);
+
+				// When a base path is configured, nest the client output directory under
+				// the base so that on-disk paths match the URLs Astro writes into HTML.
+				// Cloudflare Workers' static-asset binding resolves request URLs literally
+				// against the client directory, so the files must live under the base prefix.
+				if (config.base !== '/') {
+					config.build.client = new URL('.' + config.base + '/', config.build.client);
+				}
 
 				injectTypes({
 					filename: 'cloudflare.d.ts',
@@ -437,9 +447,24 @@ export default function createIntegration({
 				}
 			},
 			'astro:build:done': async ({ dir, logger, assets }) => {
+				// Move platform files from the base-prefixed client dir to the
+				// original client root, since Cloudflare reads them from there.
+				if (_config.base !== '/') {
+					for (const file of ['.assetsignore', '_headers']) {
+						try {
+							await rename(
+								new URL(`./${file}`, _config.build.client),
+								new URL(`./${file}`, _originalClientDir),
+							);
+						} catch {
+							// File may not exist — that's fine
+						}
+					}
+				}
+
 				let redirectsExists = false;
 				try {
-					const redirectsStat = await stat(new URL('./_redirects', _config.build.client));
+					const redirectsStat = await stat(new URL('./_redirects', _originalClientDir));
 					if (redirectsStat.isFile()) {
 						redirectsExists = true;
 					}
@@ -450,7 +475,7 @@ export default function createIntegration({
 				const redirects: IntegrationResolvedRoute['segments'][] = [];
 				if (redirectsExists) {
 					const rl = createInterface({
-						input: createReadStream(new URL('./_redirects', _config.build.client)),
+						input: createReadStream(new URL('./_redirects', _originalClientDir)),
 						crlfDelay: Number.POSITIVE_INFINITY,
 					});
 
@@ -489,7 +514,7 @@ export default function createIntegration({
 				if (!trueRedirects.empty()) {
 					try {
 						await appendFile(
-							new URL('./_redirects', _config.build.client),
+							new URL('./_redirects', _originalClientDir),
 							printAsRedirects(trueRedirects),
 						);
 					} catch (_error) {
diff --git a/packages/integrations/cloudflare/src/wrangler.ts b/packages/integrations/cloudflare/src/wrangler.ts
index 36746724ea00..7a8adedce100 100644
--- a/packages/integrations/cloudflare/src/wrangler.ts
+++ b/packages/integrations/cloudflare/src/wrangler.ts
@@ -17,6 +17,17 @@ interface CloudflareConfigOptions {
 	imagesBindingName?: string | false | undefined;
 }
 
+type KVNamespace = NonNullable<WorkerConfig['kv_namespaces']>[number];
+
+function withSessionKVBinding(
+	existing: KVNamespace[] | undefined,
+	sessionBinding: string,
+): KVNamespace[] {
+	const namespaces: KVNamespace[] = existing ? [...existing] : [];
+	namespaces.push({ binding: sessionBinding });
+	return namespaces;
+}
+
 /**
  * Returns a config customizer that sets up the Astro Cloudflare defaults.
  * Sets the main entrypoint and adds bindings for auto-provisioning.
@@ -36,7 +47,7 @@ export function cloudflareConfigCustomizer(
 			nonInheritableConfig: WorkerConfig['previews'],
 		): WorkerConfig['previews'] => {
 			const hasSessionBinding = nonInheritableConfig?.kv_namespaces?.some(
-				(kv) => kv.binding === sessionKVBindingName,
+				(kv: KVNamespace) => kv.binding === sessionKVBindingName,
 			);
 			const hasImagesBinding = nonInheritableConfig?.images?.binding !== undefined;
 
@@ -44,11 +55,7 @@ export function cloudflareConfigCustomizer(
 				kv_namespaces:
 					!needsSessionKVBinding || hasSessionBinding
 						? undefined
-						: [
-								{
-									binding: sessionKVBindingName,
-								},
-							],
+						: withSessionKVBinding(nonInheritableConfig?.kv_namespaces, sessionKVBindingName),
 				images:
 					hasImagesBinding || !imagesBindingName
 						? undefined
diff --git a/packages/integrations/cloudflare/test/client-address.test.ts b/packages/integrations/cloudflare/test/client-address.test.ts
index 534b089adf61..5123c4be0863 100644
--- a/packages/integrations/cloudflare/test/client-address.test.ts
+++ b/packages/integrations/cloudflare/test/client-address.test.ts
@@ -24,7 +24,7 @@ describe('Cloudflare clientAddress', () => {
 	});
 
 	after(async () => {
-		previewServer.stop();
+		await previewServer.stop();
 	});
 
 	it('returns the client IP from cf-connecting-ip header', async () => {
diff --git a/packages/integrations/cloudflare/test/fixtures/with-base/public/.assetsignore b/packages/integrations/cloudflare/test/fixtures/with-base/public/.assetsignore
new file mode 100644
index 000000000000..09a6b399e935
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/with-base/public/.assetsignore
@@ -0,0 +1 @@
+_worker.js
\ No newline at end of file
diff --git a/packages/integrations/cloudflare/test/fixtures/with-base/public/_headers b/packages/integrations/cloudflare/test/fixtures/with-base/public/_headers
new file mode 100644
index 000000000000..6f09724c66eb
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/with-base/public/_headers
@@ -0,0 +1,2 @@
+/*
+  X-Custom-Header: 67
diff --git a/packages/integrations/cloudflare/test/fixtures/with-base/public/favicon.ico b/packages/integrations/cloudflare/test/fixtures/with-base/public/favicon.ico
new file mode 100644
index 000000000000..ce6fb0796dc3
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/with-base/public/favicon.ico
@@ -0,0 +1 @@
+fake-favicon
\ No newline at end of file
diff --git a/packages/integrations/cloudflare/test/prerender-queue-consumers.test.ts b/packages/integrations/cloudflare/test/prerender-queue-consumers.test.ts
index 0518b194caad..691331731b0d 100644
--- a/packages/integrations/cloudflare/test/prerender-queue-consumers.test.ts
+++ b/packages/integrations/cloudflare/test/prerender-queue-consumers.test.ts
@@ -14,7 +14,7 @@ describe('Prerender with queue consumers', () => {
 	});
 
 	after(async () => {
-		previewServer.stop();
+		await previewServer.stop();
 	});
 
 	it('builds and previews without ERR_MULTIPLE_CONSUMERS', async () => {
diff --git a/packages/integrations/cloudflare/test/with-base.test.ts b/packages/integrations/cloudflare/test/with-base.test.ts
index eb0cd4398a1c..9accf4fd9dbe 100644
--- a/packages/integrations/cloudflare/test/with-base.test.ts
+++ b/packages/integrations/cloudflare/test/with-base.test.ts
@@ -41,9 +41,37 @@ describe('base', () => {
 		await fixture.clean();
 	});
 
-	it('correctly prints redirects', async () => {
+	it('correctly prints redirects at the client root', async () => {
 		const fileContent = await fixture.readFile('client/_redirects');
 		assert.match(fileContent, /\/a\/redirect\s+\/\s+301/);
 		assert.match(fileContent, /\/a\/redirect\/\s+\/\s+301/);
 	});
+
+	it('places prerendered pages under the base prefix', async () => {
+		assert.ok(
+			fixture.pathExists('client/blog/static/index.html'),
+			'prerendered page should be at client/blog/static/index.html',
+		);
+	});
+
+	it('places public files under the base prefix', async () => {
+		assert.ok(
+			fixture.pathExists('client/blog/favicon.ico'),
+			'public file should be at client/blog/favicon.ico',
+		);
+	});
+
+	it('keeps .assetsignore at the client root', async () => {
+		assert.ok(
+			fixture.pathExists('client/.assetsignore'),
+			'.assetsignore should be at client/.assetsignore (not under base)',
+		);
+	});
+
+	it('keeps _headers at the client root', async () => {
+		assert.ok(
+			fixture.pathExists('client/_headers'),
+			'_headers should be at client/_headers (not under base)',
+		);
+	});
 });
diff --git a/packages/integrations/cloudflare/test/wrangler-preview-platform.test.ts b/packages/integrations/cloudflare/test/wrangler-preview-platform.test.ts
index 1d0dfaad90c3..5f769896ca0c 100644
--- a/packages/integrations/cloudflare/test/wrangler-preview-platform.test.ts
+++ b/packages/integrations/cloudflare/test/wrangler-preview-platform.test.ts
@@ -15,7 +15,7 @@ describe('WranglerPreviewPlatform', () => {
 	});
 
 	after(async () => {
-		previewServer.stop();
+		await previewServer.stop();
 	});
 
 	it('exists', async () => {
diff --git a/packages/integrations/cloudflare/test/wrangler.test.ts b/packages/integrations/cloudflare/test/wrangler.test.ts
index 39fcbc1d216d..32bec0277ca5 100644
--- a/packages/integrations/cloudflare/test/wrangler.test.ts
+++ b/packages/integrations/cloudflare/test/wrangler.test.ts
@@ -63,7 +63,10 @@ describe('cloudflareConfigCustomizer', () => {
 				kv_namespaces: [{ binding: 'OTHER_KV', id: 'other-id' }],
 			});
 
-			assert.deepEqual(result.kv_namespaces, [{ binding: DEFAULT_SESSION_KV_BINDING_NAME }]);
+			assert.deepEqual(result.kv_namespaces, [
+				{ binding: 'OTHER_KV', id: 'other-id' },
+				{ binding: DEFAULT_SESSION_KV_BINDING_NAME },
+			]);
 		});
 
 		it('does not add SESSION binding when session KV binding is disabled', () => {
@@ -157,6 +160,20 @@ describe('cloudflareConfigCustomizer', () => {
 			assert.equal(result.previews?.images, undefined);
 		});
 
+		it('preserves existing previews KV bindings when adding SESSION binding', () => {
+			const customizer = cloudflareConfigCustomizer();
+			const result = customizer({
+				previews: {
+					kv_namespaces: [{ binding: 'OTHER_KV', id: 'other-id' }],
+				},
+			});
+
+			assert.deepEqual(result.previews?.kv_namespaces, [
+				{ binding: 'OTHER_KV', id: 'other-id' },
+				{ binding: DEFAULT_SESSION_KV_BINDING_NAME },
+			]);
+		});
+
 		it('adds SESSION binding to previews even when top-level has it', () => {
 			const customizer = cloudflareConfigCustomizer();
 			const result = customizer({
diff --git a/packages/language-tools/language-server/src/importPackage.ts b/packages/language-tools/language-server/src/importPackage.ts
index 256d9283a2ac..e53fbe42d463 100644
--- a/packages/language-tools/language-server/src/importPackage.ts
+++ b/packages/language-tools/language-server/src/importPackage.ts
@@ -1,13 +1,6 @@
 import { dirname, resolve } from 'node:path';
 
-// Those three imports needs to always be `type` imports, as we always want to import them dynamically
-
-// TODO: Consider maybe somehow moving those integrations to a separate package to avoid circular dependencies?
-// @ts-ignore - Due to a circular dependency, we can't have those as dependencies
-import type * as svelte from '@astrojs/svelte/dist/editor.cjs';
-// @ts-ignore - Due to a circular dependency, we can't have those as dependencies
-import type * as vue from '@astrojs/vue/dist/editor.cjs';
-
+// The following import needs to always be `type` imports, as we always want to import it dynamically
 import type * as prettier from 'prettier';
 
 type PackageVersion = {
@@ -74,11 +67,14 @@ function importEditorIntegration<T>(packageName: string, fromPath: string): T |
 	return undefined;
 }
 
-export function importSvelteIntegration(fromPath: string): typeof svelte | undefined {
+type SvelteIntegration = { toTSX(code: string, className: string): string };
+type VueIntegration = { toTSX(code: string, className: string): string };
+
+export function importSvelteIntegration(fromPath: string): SvelteIntegration | undefined {
 	return importEditorIntegration('@astrojs/svelte', fromPath);
 }
 
-export function importVueIntegration(fromPath: string): typeof vue | undefined {
+export function importVueIntegration(fromPath: string): VueIntegration | undefined {
 	return importEditorIntegration('@astrojs/vue', fromPath);
 }
 
diff --git a/packages/upgrade/tsconfig.json b/packages/upgrade/tsconfig.json
index d2a92ae5b3e5..5517451eeba9 100644
--- a/packages/upgrade/tsconfig.json
+++ b/packages/upgrade/tsconfig.json
@@ -4,7 +4,6 @@
   "compilerOptions": {
     "rootDir": "./src",
     "allowJs": true,
-    "emitDeclarationOnly": false,
     "target": "ES2022",
     "module": "ES2022",
     "moduleResolution": "Bundler",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 550284dc94d1..cae9c5c3d191 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -577,6 +577,9 @@ importers:
       fontace:
         specifier: ~0.4.1
         version: 0.4.1
+      get-tsconfig:
+        specifier: 5.0.0-beta.4
+        version: 5.0.0-beta.4
       github-slugger:
         specifier: ^2.0.0
         version: 2.0.0
@@ -589,6 +592,9 @@ importers:
       js-yaml:
         specifier: ^4.1.1
         version: 4.1.1
+      jsonc-parser:
+        specifier: ^3.3.1
+        version: 3.3.1
       magic-string:
         specifier: ^0.30.21
         version: 0.30.21
@@ -643,9 +649,6 @@ importers:
       tinyglobby:
         specifier: ^0.2.15
         version: 0.2.16
-      tsconfck:
-        specifier: ^3.1.6
-        version: 3.1.6(typescript@5.9.3)
       ultrahtml:
         specifier: ^1.6.0
         version: 1.6.0
@@ -786,7 +789,7 @@ importers:
     dependencies:
       fast-xml-parser:
         specifier: ^5.5.7
-        version: 5.5.7
+        version: 5.7.0
       piccolore:
         specifier: ^0.1.3
         version: 0.1.3
@@ -1907,6 +1910,12 @@ importers:
         specifier: ^5.54.0
         version: 5.55.3
 
+  packages/astro/test/fixtures/alias-path-alias-style:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/test/fixtures/alias-tsconfig:
     dependencies:
       '@astrojs/svelte':
@@ -3285,6 +3294,12 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/head-propagation-prerender-env:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/test/fixtures/hmr-markdown:
     dependencies:
       astro:
@@ -3460,6 +3475,15 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/lightningcss-scoped-nesting:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+      lightningcss:
+        specifier: ^1.32.0
+        version: 1.32.0
+
   packages/astro/test/fixtures/live-loaders:
     dependencies:
       '@astrojs/node':
@@ -3590,6 +3614,12 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/partials-css-boundary:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/test/fixtures/passthrough-image-service:
     dependencies:
       astro:
@@ -3612,10 +3642,10 @@ importers:
         version: link:../../..
       autoprefixer:
         specifier: ^10.4.27
-        version: 10.4.27(postcss@8.5.8)
+        version: 10.4.27(postcss@8.5.12)
       postcss:
         specifier: ^8.5.8
-        version: 8.5.8
+        version: 8.5.12
       solid-js:
         specifier: ^1.9.11
         version: 1.9.11
@@ -3628,7 +3658,7 @@ importers:
     devDependencies:
       postcss-preset-env:
         specifier: ^11.2.0
-        version: 11.2.0(postcss@8.5.8)
+        version: 11.2.0(postcss@8.5.12)
 
   packages/astro/test/fixtures/preact-compat-component:
     dependencies:
@@ -4330,7 +4360,7 @@ importers:
         version: 1.5.0
       nanoid:
         specifier: ^5.1.6
-        version: 5.1.6
+        version: 5.1.9
       piccolore:
         specifier: ^0.1.3
         version: 0.1.3
@@ -5681,7 +5711,7 @@ importers:
     devDependencies:
       '@fastify/middie':
         specifier: ^9.1.0
-        version: 9.1.0
+        version: 9.3.2
       '@fastify/static':
         specifier: ^9.0.0
         version: 9.0.0
@@ -5714,7 +5744,7 @@ importers:
         version: 5.2.1
       fastify:
         specifier: ^5.7.4
-        version: 5.8.3
+        version: 5.8.5
       node-mocks-http:
         specifier: ^1.17.2
         version: 1.17.2(@types/express@5.0.6)(@types/node@22.19.11)
@@ -6993,6 +7023,9 @@ importers:
       esbuild:
         specifier: ^0.27.3
         version: 0.27.3
+      jsonc-parser:
+        specifier: ^3.3.1
+        version: 3.3.1
       p-limit:
         specifier: ^7.3.0
         version: 7.3.0
@@ -7002,9 +7035,6 @@ importers:
       tinyglobby:
         specifier: ^0.2.16
         version: 0.2.16
-      tsconfck:
-        specifier: ^3.1.6
-        version: 3.1.6(typescript@5.9.3)
       tsx:
         specifier: ^4.21.0
         version: 4.21.0
@@ -8587,8 +8617,8 @@ packages:
   '@fastify/merge-json-schemas@0.2.1':
     resolution: {integrity: sha512-OA3KGBCy6KtIvLf8DINC5880o5iBlDX4SxzLQS8HorJAbqluzLRn80UXU0bxZn7UOFhFgpRJDasfwn9nG4FG4A==}
 
-  '@fastify/middie@9.1.0':
-    resolution: {integrity: sha512-cObruXSFB5CCqn2m9sF5ktf6pNQX+QQth2N39FGXXV+8M4O+dWzkvqjqzwpIWvwvIffP9+O7KaLN+5xVgFFdWw==}
+  '@fastify/middie@9.3.2':
+    resolution: {integrity: sha512-5C3xMHJxpfqoHd+xZSHPBI71fpzkoF6wMsYtgzXRyQUNvsIAxJm2yY4r2fUjF0h3rS9MXlo/aXLaXv3s4TL+JQ==}
 
   '@fastify/proxy-addr@5.1.0':
     resolution: {integrity: sha512-INS+6gh91cLUjB+PVHfu1UqcB76Sqtpyp7bnL+FYojhjygvOPA9ctiD/JDKsyD9Xgu4hUhCSJBPig/w7duNajw==}
@@ -9076,6 +9106,9 @@ packages:
     engines: {node: '>=18.14.0'}
     hasBin: true
 
+  '@nodable/entities@2.1.0':
+    resolution: {integrity: sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==}
+
   '@node-rs/crc32-android-arm-eabi@1.10.6':
     resolution: {integrity: sha512-vZAMuJXm3TpWPOkkhxdrofWDv+Q+I2oO7ucLRbXyAPmXFNDhHtBxbO1rk9Qzz+M3eep8ieS4/+jCL1Q0zacNMQ==}
     engines: {node: '>= 10'}
@@ -10699,8 +10732,8 @@ packages:
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
-  ajv@8.18.0:
-    resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
+  ajv@8.20.0:
+    resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
 
   alpinejs@3.15.8:
     resolution: {integrity: sha512-zxIfCRTBGvF1CCLIOMQOxAyBuqibxSEwS6Jm1a3HGA9rgrJVcjEWlwLcQTVGAWGS8YhAsTRLVrtQ5a5QT9bSSQ==}
@@ -12041,18 +12074,18 @@ packages:
   fast-uri@3.1.0:
     resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
 
-  fast-xml-builder@1.1.4:
-    resolution: {integrity: sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==}
+  fast-xml-builder@1.1.5:
+    resolution: {integrity: sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==}
 
-  fast-xml-parser@5.5.7:
-    resolution: {integrity: sha512-LteOsISQ2GEiDHZch6L9hB0+MLoYVLToR7xotrzU0opCICBkxOPgHAy1HxAvtxfJNXDJpgAsQN30mkrfpO2Prg==}
+  fast-xml-parser@5.7.0:
+    resolution: {integrity: sha512-MTcrUoRQ1GSQ9iG3QJzBGquYYYeA7piZaJoIWbPFGbRn6Jj6z7xgoAyi4DrZX4y2ZIQQBF59gc/zmvvejjgoFQ==}
     hasBin: true
 
   fastify-plugin@5.1.0:
     resolution: {integrity: sha512-FAIDA8eovSt5qcDgcBvDuX/v0Cjz0ohGhENZ/wpc3y+oZCY2afZ9Baqql3g/lC+OHRnciQol4ww7tuthOb9idw==}
 
-  fastify@5.8.3:
-    resolution: {integrity: sha512-XJXpRQ41+rsJ/GLeP9vyDC+fBXilcTlEXokMSexkdEkla4uf7ZQNaI5xl3el+kW5TZQulqYxLr659ey/KX7XmQ==}
+  fastify@5.8.5:
+    resolution: {integrity: sha512-Yqptv59pQzPgQUSIm87hMqHJmdkb1+GPxdE6vW6FRyVE9G86mt7rOghitiU4JHRaTyDUk9pfeKmDeu70lAwM4Q==}
 
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
@@ -12281,6 +12314,10 @@ packages:
   get-tsconfig@4.13.6:
     resolution: {integrity: sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==}
 
+  get-tsconfig@5.0.0-beta.4:
+    resolution: {integrity: sha512-7nF7C9fIPFEMHgEMEfgIlO9wDdZ8CyHw27rWciFZfHvHDReIiPhsYuzPRXsfvBCqFy1l8RRyyWV7QLM+ZhUJsQ==}
+    engines: {node: '>=20.20.0'}
+
   github-from-package@0.0.0:
     resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
 
@@ -13513,8 +13550,8 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  nanoid@5.1.6:
-    resolution: {integrity: sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==}
+  nanoid@5.1.9:
+    resolution: {integrity: sha512-ZUvP7KeBLe3OZ1ypw6dI/TzYJuvHP77IM4Ry73waSQTLn8/g8rpdjfyVAh7t1/+FjBtG4lCP42MEbDxOsRpBMw==}
     engines: {node: ^18 || >=20}
     hasBin: true
 
@@ -13871,8 +13908,8 @@ packages:
     resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  path-expression-matcher@1.1.3:
-    resolution: {integrity: sha512-qdVgY8KXmVdJZRSS1JdEPOKPdTiEK/pi0RkcT2sw1RhXxohdujUlJFPuS1TSkevZ9vzd3ZlL7ULl1MHGTApKzQ==}
+  path-expression-matcher@1.5.0:
+    resolution: {integrity: sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==}
     engines: {node: '>=14.0.0'}
 
   path-is-absolute@1.0.1:
@@ -13904,8 +13941,8 @@ packages:
   path-to-regexp@6.3.0:
     resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==}
 
-  path-to-regexp@8.3.0:
-    resolution: {integrity: sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==}
+  path-to-regexp@8.4.2:
+    resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==}
 
   path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
@@ -14154,10 +14191,6 @@ packages:
     resolution: {integrity: sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==}
     engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.5.8:
-    resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==}
-    engines: {node: ^10 || ^12 || >=14}
-
   preact-render-to-string@6.6.6:
     resolution: {integrity: sha512-EfqZJytnjJldV+YaaqhthU2oXsEf5e+6rDv957p+zxAvNfFLQOPfvBOTncscQ+akzu6Wrl7s3Pa0LjUQmWJsGQ==}
     peerDependencies:
@@ -14580,8 +14613,8 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  safe-regex2@5.1.0:
-    resolution: {integrity: sha512-pNHAuBW7TrcleFHsxBr5QMi/Iyp0ENjUKz7GCcX1UO7cMh+NmVK6HxQckNL1tJp1XAJVjG6B8OKIPqodqj9rtw==}
+  safe-regex2@5.1.1:
+    resolution: {integrity: sha512-mOSBvHGDZMuIEZMdOz/aCEYDCv0E7nfcNsIhUF+/P+xC7Hyf3FkvymqgPbg9D1EdSGu+uKbJgy09K/RKKc7kJA==}
     hasBin: true
 
   safe-stable-stringify@2.5.0:
@@ -14928,8 +14961,8 @@ packages:
     resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
     engines: {node: '>=14.16'}
 
-  strnum@2.2.1:
-    resolution: {integrity: sha512-BwRvNd5/QoAtyW1na1y1LsJGQNvRlkde6Q/ipqqEaivoMdV+B1OMOTVdwR+N/cwVUcIt9PYyHmV8HyexCZSupg==}
+  strnum@2.2.3:
+    resolution: {integrity: sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==}
 
   structured-source@4.0.0:
     resolution: {integrity: sha512-qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA==}
@@ -15132,16 +15165,6 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4'
 
-  tsconfck@3.1.6:
-    resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==}
-    engines: {node: ^18 || >=20}
-    hasBin: true
-    peerDependencies:
-      typescript: ^5.0.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
@@ -15463,6 +15486,7 @@ packages:
 
   uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   v8-to-istanbul@9.3.0:
@@ -16882,283 +16906,283 @@ snapshots:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/postcss-alpha-function@2.0.3(postcss@8.5.8)':
+  '@csstools/postcss-alpha-function@2.0.3(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-cascade-layers@6.0.0(postcss@8.5.8)':
+  '@csstools/postcss-cascade-layers@6.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/selector-specificity': 6.0.0(postcss-selector-parser@7.1.1)
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  '@csstools/postcss-color-function-display-p3-linear@2.0.2(postcss@8.5.8)':
+  '@csstools/postcss-color-function-display-p3-linear@2.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-color-function@5.0.2(postcss@8.5.8)':
+  '@csstools/postcss-color-function@5.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-color-mix-function@4.0.2(postcss@8.5.8)':
+  '@csstools/postcss-color-mix-function@4.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-color-mix-variadic-function-arguments@2.0.2(postcss@8.5.8)':
+  '@csstools/postcss-color-mix-variadic-function-arguments@2.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-content-alt-text@3.0.0(postcss@8.5.8)':
+  '@csstools/postcss-content-alt-text@3.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-contrast-color-function@3.0.2(postcss@8.5.8)':
+  '@csstools/postcss-contrast-color-function@3.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-exponential-functions@3.0.1(postcss@8.5.8)':
+  '@csstools/postcss-exponential-functions@3.0.1(postcss@8.5.12)':
     dependencies:
       '@csstools/css-calc': 3.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-font-format-keywords@5.0.0(postcss@8.5.8)':
+  '@csstools/postcss-font-format-keywords@5.0.0(postcss@8.5.12)':
     dependencies:
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  '@csstools/postcss-font-width-property@1.0.0(postcss@8.5.8)':
+  '@csstools/postcss-font-width-property@1.0.0(postcss@8.5.12)':
     dependencies:
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-gamut-mapping@3.0.2(postcss@8.5.8)':
+  '@csstools/postcss-gamut-mapping@3.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-gradients-interpolation-method@6.0.2(postcss@8.5.8)':
+  '@csstools/postcss-gradients-interpolation-method@6.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-hwb-function@5.0.2(postcss@8.5.8)':
+  '@csstools/postcss-hwb-function@5.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-ic-unit@5.0.0(postcss@8.5.8)':
+  '@csstools/postcss-ic-unit@5.0.0(postcss@8.5.12)':
     dependencies:
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  '@csstools/postcss-initial@3.0.0(postcss@8.5.8)':
+  '@csstools/postcss-initial@3.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-is-pseudo-class@6.0.0(postcss@8.5.8)':
+  '@csstools/postcss-is-pseudo-class@6.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/selector-specificity': 6.0.0(postcss-selector-parser@7.1.1)
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  '@csstools/postcss-light-dark-function@3.0.0(postcss@8.5.8)':
+  '@csstools/postcss-light-dark-function@3.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-logical-float-and-clear@4.0.0(postcss@8.5.8)':
+  '@csstools/postcss-logical-float-and-clear@4.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-logical-overflow@3.0.0(postcss@8.5.8)':
+  '@csstools/postcss-logical-overflow@3.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-logical-overscroll-behavior@3.0.0(postcss@8.5.8)':
+  '@csstools/postcss-logical-overscroll-behavior@3.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-logical-resize@4.0.0(postcss@8.5.8)':
+  '@csstools/postcss-logical-resize@4.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  '@csstools/postcss-logical-viewport-units@4.0.0(postcss@8.5.8)':
+  '@csstools/postcss-logical-viewport-units@4.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-media-minmax@3.0.1(postcss@8.5.8)':
+  '@csstools/postcss-media-minmax@3.0.1(postcss@8.5.12)':
     dependencies:
       '@csstools/css-calc': 3.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
       '@csstools/media-query-list-parser': 5.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-media-queries-aspect-ratio-number-values@4.0.0(postcss@8.5.8)':
+  '@csstools/postcss-media-queries-aspect-ratio-number-values@4.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
       '@csstools/media-query-list-parser': 5.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-mixins@1.0.0(postcss@8.5.8)':
+  '@csstools/postcss-mixins@1.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-nested-calc@5.0.0(postcss@8.5.8)':
+  '@csstools/postcss-nested-calc@5.0.0(postcss@8.5.12)':
     dependencies:
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  '@csstools/postcss-normalize-display-values@5.0.1(postcss@8.5.8)':
+  '@csstools/postcss-normalize-display-values@5.0.1(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  '@csstools/postcss-oklab-function@5.0.2(postcss@8.5.8)':
+  '@csstools/postcss-oklab-function@5.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-position-area-property@2.0.0(postcss@8.5.8)':
+  '@csstools/postcss-position-area-property@2.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-progressive-custom-properties@5.0.0(postcss@8.5.8)':
+  '@csstools/postcss-progressive-custom-properties@5.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  '@csstools/postcss-property-rule-prelude-list@2.0.0(postcss@8.5.8)':
+  '@csstools/postcss-property-rule-prelude-list@2.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-random-function@3.0.1(postcss@8.5.8)':
+  '@csstools/postcss-random-function@3.0.1(postcss@8.5.12)':
     dependencies:
       '@csstools/css-calc': 3.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-relative-color-syntax@4.0.2(postcss@8.5.8)':
+  '@csstools/postcss-relative-color-syntax@4.0.2(postcss@8.5.12)':
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  '@csstools/postcss-scope-pseudo-class@5.0.0(postcss@8.5.8)':
+  '@csstools/postcss-scope-pseudo-class@5.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  '@csstools/postcss-sign-functions@2.0.1(postcss@8.5.8)':
+  '@csstools/postcss-sign-functions@2.0.1(postcss@8.5.12)':
     dependencies:
       '@csstools/css-calc': 3.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-stepped-value-functions@5.0.1(postcss@8.5.8)':
+  '@csstools/postcss-stepped-value-functions@5.0.1(postcss@8.5.12)':
     dependencies:
       '@csstools/css-calc': 3.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-syntax-descriptor-syntax-production@2.0.0(postcss@8.5.8)':
+  '@csstools/postcss-syntax-descriptor-syntax-production@2.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-system-ui-font-family@2.0.0(postcss@8.5.8)':
+  '@csstools/postcss-system-ui-font-family@2.0.0(postcss@8.5.12)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-text-decoration-shorthand@5.0.3(postcss@8.5.8)':
+  '@csstools/postcss-text-decoration-shorthand@5.0.3(postcss@8.5.12)':
     dependencies:
       '@csstools/color-helpers': 6.0.2
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  '@csstools/postcss-trigonometric-functions@5.0.1(postcss@8.5.8)':
+  '@csstools/postcss-trigonometric-functions@5.0.1(postcss@8.5.12)':
     dependencies:
       '@csstools/css-calc': 3.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  '@csstools/postcss-unset-value@5.0.0(postcss@8.5.8)':
+  '@csstools/postcss-unset-value@5.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
   '@csstools/selector-resolve-nested@4.0.0(postcss-selector-parser@7.1.1)':
     dependencies:
@@ -17168,9 +17192,9 @@ snapshots:
     dependencies:
       postcss-selector-parser: 7.1.1
 
-  '@csstools/utilities@3.0.0(postcss@8.5.8)':
+  '@csstools/utilities@3.0.0(postcss@8.5.12)':
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
   '@dabh/diagnostics@2.0.8':
     dependencies:
@@ -17590,7 +17614,7 @@ snapshots:
 
   '@fastify/ajv-compiler@4.0.5':
     dependencies:
-      ajv: 8.18.0
+      ajv: 8.20.0
       ajv-formats: 3.0.1
       fast-uri: 3.1.0
 
@@ -17608,12 +17632,12 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
-  '@fastify/middie@9.1.0':
+  '@fastify/middie@9.3.2':
     dependencies:
       '@fastify/error': 4.2.0
       fastify-plugin: 5.1.0
       find-my-way: 9.5.0
-      path-to-regexp: 8.3.0
+      path-to-regexp: 8.4.2
       reusify: 1.1.0
 
   '@fastify/proxy-addr@5.1.0':
@@ -18102,9 +18126,9 @@ snapshots:
   '@netlify/edge-bundler@14.9.8':
     dependencies:
       '@import-maps/resolve': 2.0.0
-      ajv: 8.18.0
-      ajv-errors: 3.0.0(ajv@8.18.0)
-      better-ajv-errors: 1.2.0(ajv@8.18.0)
+      ajv: 8.20.0
+      ajv-errors: 3.0.0(ajv@8.20.0)
+      better-ajv-errors: 1.2.0(ajv@8.20.0)
       common-path-prefix: 3.0.0
       env-paths: 3.0.0
       esbuild: 0.27.2
@@ -18320,6 +18344,8 @@ snapshots:
       - rollup
       - supports-color
 
+  '@nodable/entities@2.1.0': {}
+
   '@node-rs/crc32-android-arm-eabi@1.10.6':
     optional: true
 
@@ -18816,7 +18842,7 @@ snapshots:
       '@secretlint/profiler': 10.2.2
       '@secretlint/resolver': 10.2.2
       '@secretlint/types': 10.2.2
-      ajv: 8.18.0
+      ajv: 8.20.0
       debug: 4.4.3(supports-color@8.1.1)
       rc-config-loader: 4.1.3
     transitivePeerDependencies:
@@ -19833,7 +19859,7 @@ snapshots:
       '@vue/shared': 3.5.30
       estree-walker: 2.0.2
       magic-string: 0.30.21
-      postcss: 8.5.8
+      postcss: 8.5.12
       source-map-js: 1.2.1
 
   '@vue/compiler-ssr@3.5.30':
@@ -19846,7 +19872,7 @@ snapshots:
       '@vue/devtools-kit': 7.7.9
       '@vue/devtools-shared': 7.7.9
       mitt: 3.0.1
-      nanoid: 5.1.6
+      nanoid: 5.1.9
       pathe: 2.0.3
       vite-hot-client: 2.1.0(vite@6.4.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(tsx@4.21.0)(yaml@2.8.3))
       vue: 3.5.30(typescript@5.9.3)
@@ -19975,17 +20001,17 @@ snapshots:
 
   agent-base@7.1.4: {}
 
-  ajv-draft-04@1.0.0(ajv@8.18.0):
+  ajv-draft-04@1.0.0(ajv@8.20.0):
     optionalDependencies:
-      ajv: 8.18.0
+      ajv: 8.20.0
 
-  ajv-errors@3.0.0(ajv@8.18.0):
+  ajv-errors@3.0.0(ajv@8.20.0):
     dependencies:
-      ajv: 8.18.0
+      ajv: 8.20.0
 
   ajv-formats@3.0.1:
     dependencies:
-      ajv: 8.18.0
+      ajv: 8.20.0
 
   ajv@6.12.6:
     dependencies:
@@ -19994,7 +20020,7 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  ajv@8.18.0:
+  ajv@8.20.0:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-uri: 3.1.0
@@ -20144,13 +20170,13 @@ snapshots:
       semver: 7.7.4
       timestring: 6.0.0
 
-  autoprefixer@10.4.27(postcss@8.5.8):
+  autoprefixer@10.4.27(postcss@8.5.12):
     dependencies:
       browserslist: 4.28.1
       caniuse-lite: 1.0.30001774
       fraction.js: 5.3.4
       picocolors: 1.1.1
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
   avvio@9.2.0:
@@ -20211,11 +20237,11 @@ snapshots:
 
   bcp-47-match@2.0.3: {}
 
-  better-ajv-errors@1.2.0(ajv@8.18.0):
+  better-ajv-errors@1.2.0(ajv@8.20.0):
     dependencies:
       '@babel/code-frame': 7.29.0
       '@humanwhocodes/momoa': 2.0.4
-      ajv: 8.18.0
+      ajv: 8.20.0
       chalk: 4.1.2
       jsonpointer: 5.0.1
       leven: 3.1.0
@@ -20623,21 +20649,21 @@ snapshots:
     dependencies:
       uncrypto: 0.1.3
 
-  css-blank-pseudo@8.0.1(postcss@8.5.8):
+  css-blank-pseudo@8.0.1(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  css-has-pseudo@8.0.0(postcss@8.5.8):
+  css-has-pseudo@8.0.0(postcss@8.5.12):
     dependencies:
       '@csstools/selector-specificity': 6.0.0(postcss-selector-parser@7.1.1)
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
       postcss-value-parser: 4.2.0
 
-  css-prefers-color-scheme@11.0.0(postcss@8.5.8):
+  css-prefers-color-scheme@11.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
   css-select@5.2.2:
     dependencies:
@@ -20775,11 +20801,11 @@ snapshots:
     dependencies:
       node-source-walk: 7.0.1
 
-  detective-postcss@7.0.1(postcss@8.5.8):
+  detective-postcss@7.0.1(postcss@8.5.12):
     dependencies:
       is-url: 1.2.4
-      postcss: 8.5.8
-      postcss-values-parser: 6.0.2(postcss@8.5.8)
+      postcss: 8.5.12
+      postcss-values-parser: 6.0.2(postcss@8.5.12)
 
   detective-sass@6.0.1:
     dependencies:
@@ -21358,7 +21384,7 @@ snapshots:
   fast-json-stringify@6.3.0:
     dependencies:
       '@fastify/merge-json-schemas': 0.2.1
-      ajv: 8.18.0
+      ajv: 8.20.0
       ajv-formats: 3.0.1
       fast-uri: 3.1.0
       json-schema-ref-resolver: 3.0.0
@@ -21374,19 +21400,20 @@ snapshots:
 
   fast-uri@3.1.0: {}
 
-  fast-xml-builder@1.1.4:
+  fast-xml-builder@1.1.5:
     dependencies:
-      path-expression-matcher: 1.1.3
+      path-expression-matcher: 1.5.0
 
-  fast-xml-parser@5.5.7:
+  fast-xml-parser@5.7.0:
     dependencies:
-      fast-xml-builder: 1.1.4
-      path-expression-matcher: 1.1.3
-      strnum: 2.2.1
+      '@nodable/entities': 2.1.0
+      fast-xml-builder: 1.1.5
+      path-expression-matcher: 1.5.0
+      strnum: 2.2.3
 
   fastify-plugin@5.1.0: {}
 
-  fastify@5.8.3:
+  fastify@5.8.5:
     dependencies:
       '@fastify/ajv-compiler': 4.0.5
       '@fastify/error': 4.2.0
@@ -21458,7 +21485,7 @@ snapshots:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-querystring: 1.1.2
-      safe-regex2: 5.1.0
+      safe-regex2: 5.1.1
 
   find-up-simple@1.0.1: {}
 
@@ -21624,6 +21651,10 @@ snapshots:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
+  get-tsconfig@5.0.0-beta.4:
+    dependencies:
+      resolve-pkg-maps: 1.0.0
+
   github-from-package@0.0.0:
     optional: true
 
@@ -23250,7 +23281,7 @@ snapshots:
 
   nanoid@3.3.11: {}
 
-  nanoid@5.1.6: {}
+  nanoid@5.1.9: {}
 
   nanostores@1.1.1: {}
 
@@ -23643,7 +23674,7 @@ snapshots:
 
   path-exists@5.0.0: {}
 
-  path-expression-matcher@1.1.3: {}
+  path-expression-matcher@1.5.0: {}
 
   path-is-absolute@1.0.1: {}
 
@@ -23667,7 +23698,7 @@ snapshots:
 
   path-to-regexp@6.3.0: {}
 
-  path-to-regexp@8.3.0: {}
+  path-to-regexp@8.4.2: {}
 
   path-type@4.0.0: {}
 
@@ -23735,226 +23766,226 @@ snapshots:
 
   port-authority@2.0.1: {}
 
-  postcss-attribute-case-insensitive@8.0.0(postcss@8.5.8):
+  postcss-attribute-case-insensitive@8.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  postcss-clamp@4.1.0(postcss@8.5.8):
+  postcss-clamp@4.1.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-color-functional-notation@8.0.2(postcss@8.5.8):
+  postcss-color-functional-notation@8.0.2(postcss@8.5.12):
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  postcss-color-hex-alpha@11.0.0(postcss@8.5.8):
+  postcss-color-hex-alpha@11.0.0(postcss@8.5.12):
     dependencies:
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-color-rebeccapurple@11.0.0(postcss@8.5.8):
+  postcss-color-rebeccapurple@11.0.0(postcss@8.5.12):
     dependencies:
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-custom-media@12.0.1(postcss@8.5.8):
+  postcss-custom-media@12.0.1(postcss@8.5.12):
     dependencies:
       '@csstools/cascade-layer-name-parser': 3.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
       '@csstools/media-query-list-parser': 5.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  postcss-custom-properties@15.0.1(postcss@8.5.8):
+  postcss-custom-properties@15.0.1(postcss@8.5.12):
     dependencies:
       '@csstools/cascade-layer-name-parser': 3.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-custom-selectors@9.0.1(postcss@8.5.8):
+  postcss-custom-selectors@9.0.1(postcss@8.5.12):
     dependencies:
       '@csstools/cascade-layer-name-parser': 3.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  postcss-dir-pseudo-class@10.0.0(postcss@8.5.8):
+  postcss-dir-pseudo-class@10.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  postcss-double-position-gradients@7.0.0(postcss@8.5.8):
+  postcss-double-position-gradients@7.0.0(postcss@8.5.12):
     dependencies:
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-focus-visible@11.0.0(postcss@8.5.8):
+  postcss-focus-visible@11.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  postcss-focus-within@10.0.0(postcss@8.5.8):
+  postcss-focus-within@10.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  postcss-font-variant@5.0.0(postcss@8.5.8):
+  postcss-font-variant@5.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  postcss-gap-properties@7.0.0(postcss@8.5.8):
+  postcss-gap-properties@7.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  postcss-image-set-function@8.0.0(postcss@8.5.8):
+  postcss-image-set-function@8.0.0(postcss@8.5.12):
     dependencies:
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-lab-function@8.0.2(postcss@8.5.8):
+  postcss-lab-function@8.0.2(postcss@8.5.12):
     dependencies:
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/utilities': 3.0.0(postcss@8.5.8)
-      postcss: 8.5.8
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/utilities': 3.0.0(postcss@8.5.12)
+      postcss: 8.5.12
 
-  postcss-logical@9.0.0(postcss@8.5.8):
+  postcss-logical@9.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-nesting@14.0.0(postcss@8.5.8):
+  postcss-nesting@14.0.0(postcss@8.5.12):
     dependencies:
       '@csstools/selector-resolve-nested': 4.0.0(postcss-selector-parser@7.1.1)
       '@csstools/selector-specificity': 6.0.0(postcss-selector-parser@7.1.1)
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  postcss-opacity-percentage@3.0.0(postcss@8.5.8):
+  postcss-opacity-percentage@3.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  postcss-overflow-shorthand@7.0.0(postcss@8.5.8):
+  postcss-overflow-shorthand@7.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-page-break@3.0.4(postcss@8.5.8):
+  postcss-page-break@3.0.4(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  postcss-place@11.0.0(postcss@8.5.8):
+  postcss-place@11.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-value-parser: 4.2.0
 
-  postcss-preset-env@11.2.0(postcss@8.5.8):
-    dependencies:
-      '@csstools/postcss-alpha-function': 2.0.3(postcss@8.5.8)
-      '@csstools/postcss-cascade-layers': 6.0.0(postcss@8.5.8)
-      '@csstools/postcss-color-function': 5.0.2(postcss@8.5.8)
-      '@csstools/postcss-color-function-display-p3-linear': 2.0.2(postcss@8.5.8)
-      '@csstools/postcss-color-mix-function': 4.0.2(postcss@8.5.8)
-      '@csstools/postcss-color-mix-variadic-function-arguments': 2.0.2(postcss@8.5.8)
-      '@csstools/postcss-content-alt-text': 3.0.0(postcss@8.5.8)
-      '@csstools/postcss-contrast-color-function': 3.0.2(postcss@8.5.8)
-      '@csstools/postcss-exponential-functions': 3.0.1(postcss@8.5.8)
-      '@csstools/postcss-font-format-keywords': 5.0.0(postcss@8.5.8)
-      '@csstools/postcss-font-width-property': 1.0.0(postcss@8.5.8)
-      '@csstools/postcss-gamut-mapping': 3.0.2(postcss@8.5.8)
-      '@csstools/postcss-gradients-interpolation-method': 6.0.2(postcss@8.5.8)
-      '@csstools/postcss-hwb-function': 5.0.2(postcss@8.5.8)
-      '@csstools/postcss-ic-unit': 5.0.0(postcss@8.5.8)
-      '@csstools/postcss-initial': 3.0.0(postcss@8.5.8)
-      '@csstools/postcss-is-pseudo-class': 6.0.0(postcss@8.5.8)
-      '@csstools/postcss-light-dark-function': 3.0.0(postcss@8.5.8)
-      '@csstools/postcss-logical-float-and-clear': 4.0.0(postcss@8.5.8)
-      '@csstools/postcss-logical-overflow': 3.0.0(postcss@8.5.8)
-      '@csstools/postcss-logical-overscroll-behavior': 3.0.0(postcss@8.5.8)
-      '@csstools/postcss-logical-resize': 4.0.0(postcss@8.5.8)
-      '@csstools/postcss-logical-viewport-units': 4.0.0(postcss@8.5.8)
-      '@csstools/postcss-media-minmax': 3.0.1(postcss@8.5.8)
-      '@csstools/postcss-media-queries-aspect-ratio-number-values': 4.0.0(postcss@8.5.8)
-      '@csstools/postcss-mixins': 1.0.0(postcss@8.5.8)
-      '@csstools/postcss-nested-calc': 5.0.0(postcss@8.5.8)
-      '@csstools/postcss-normalize-display-values': 5.0.1(postcss@8.5.8)
-      '@csstools/postcss-oklab-function': 5.0.2(postcss@8.5.8)
-      '@csstools/postcss-position-area-property': 2.0.0(postcss@8.5.8)
-      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.8)
-      '@csstools/postcss-property-rule-prelude-list': 2.0.0(postcss@8.5.8)
-      '@csstools/postcss-random-function': 3.0.1(postcss@8.5.8)
-      '@csstools/postcss-relative-color-syntax': 4.0.2(postcss@8.5.8)
-      '@csstools/postcss-scope-pseudo-class': 5.0.0(postcss@8.5.8)
-      '@csstools/postcss-sign-functions': 2.0.1(postcss@8.5.8)
-      '@csstools/postcss-stepped-value-functions': 5.0.1(postcss@8.5.8)
-      '@csstools/postcss-syntax-descriptor-syntax-production': 2.0.0(postcss@8.5.8)
-      '@csstools/postcss-system-ui-font-family': 2.0.0(postcss@8.5.8)
-      '@csstools/postcss-text-decoration-shorthand': 5.0.3(postcss@8.5.8)
-      '@csstools/postcss-trigonometric-functions': 5.0.1(postcss@8.5.8)
-      '@csstools/postcss-unset-value': 5.0.0(postcss@8.5.8)
-      autoprefixer: 10.4.27(postcss@8.5.8)
+  postcss-preset-env@11.2.0(postcss@8.5.12):
+    dependencies:
+      '@csstools/postcss-alpha-function': 2.0.3(postcss@8.5.12)
+      '@csstools/postcss-cascade-layers': 6.0.0(postcss@8.5.12)
+      '@csstools/postcss-color-function': 5.0.2(postcss@8.5.12)
+      '@csstools/postcss-color-function-display-p3-linear': 2.0.2(postcss@8.5.12)
+      '@csstools/postcss-color-mix-function': 4.0.2(postcss@8.5.12)
+      '@csstools/postcss-color-mix-variadic-function-arguments': 2.0.2(postcss@8.5.12)
+      '@csstools/postcss-content-alt-text': 3.0.0(postcss@8.5.12)
+      '@csstools/postcss-contrast-color-function': 3.0.2(postcss@8.5.12)
+      '@csstools/postcss-exponential-functions': 3.0.1(postcss@8.5.12)
+      '@csstools/postcss-font-format-keywords': 5.0.0(postcss@8.5.12)
+      '@csstools/postcss-font-width-property': 1.0.0(postcss@8.5.12)
+      '@csstools/postcss-gamut-mapping': 3.0.2(postcss@8.5.12)
+      '@csstools/postcss-gradients-interpolation-method': 6.0.2(postcss@8.5.12)
+      '@csstools/postcss-hwb-function': 5.0.2(postcss@8.5.12)
+      '@csstools/postcss-ic-unit': 5.0.0(postcss@8.5.12)
+      '@csstools/postcss-initial': 3.0.0(postcss@8.5.12)
+      '@csstools/postcss-is-pseudo-class': 6.0.0(postcss@8.5.12)
+      '@csstools/postcss-light-dark-function': 3.0.0(postcss@8.5.12)
+      '@csstools/postcss-logical-float-and-clear': 4.0.0(postcss@8.5.12)
+      '@csstools/postcss-logical-overflow': 3.0.0(postcss@8.5.12)
+      '@csstools/postcss-logical-overscroll-behavior': 3.0.0(postcss@8.5.12)
+      '@csstools/postcss-logical-resize': 4.0.0(postcss@8.5.12)
+      '@csstools/postcss-logical-viewport-units': 4.0.0(postcss@8.5.12)
+      '@csstools/postcss-media-minmax': 3.0.1(postcss@8.5.12)
+      '@csstools/postcss-media-queries-aspect-ratio-number-values': 4.0.0(postcss@8.5.12)
+      '@csstools/postcss-mixins': 1.0.0(postcss@8.5.12)
+      '@csstools/postcss-nested-calc': 5.0.0(postcss@8.5.12)
+      '@csstools/postcss-normalize-display-values': 5.0.1(postcss@8.5.12)
+      '@csstools/postcss-oklab-function': 5.0.2(postcss@8.5.12)
+      '@csstools/postcss-position-area-property': 2.0.0(postcss@8.5.12)
+      '@csstools/postcss-progressive-custom-properties': 5.0.0(postcss@8.5.12)
+      '@csstools/postcss-property-rule-prelude-list': 2.0.0(postcss@8.5.12)
+      '@csstools/postcss-random-function': 3.0.1(postcss@8.5.12)
+      '@csstools/postcss-relative-color-syntax': 4.0.2(postcss@8.5.12)
+      '@csstools/postcss-scope-pseudo-class': 5.0.0(postcss@8.5.12)
+      '@csstools/postcss-sign-functions': 2.0.1(postcss@8.5.12)
+      '@csstools/postcss-stepped-value-functions': 5.0.1(postcss@8.5.12)
+      '@csstools/postcss-syntax-descriptor-syntax-production': 2.0.0(postcss@8.5.12)
+      '@csstools/postcss-system-ui-font-family': 2.0.0(postcss@8.5.12)
+      '@csstools/postcss-text-decoration-shorthand': 5.0.3(postcss@8.5.12)
+      '@csstools/postcss-trigonometric-functions': 5.0.1(postcss@8.5.12)
+      '@csstools/postcss-unset-value': 5.0.0(postcss@8.5.12)
+      autoprefixer: 10.4.27(postcss@8.5.12)
       browserslist: 4.28.1
-      css-blank-pseudo: 8.0.1(postcss@8.5.8)
-      css-has-pseudo: 8.0.0(postcss@8.5.8)
-      css-prefers-color-scheme: 11.0.0(postcss@8.5.8)
+      css-blank-pseudo: 8.0.1(postcss@8.5.12)
+      css-has-pseudo: 8.0.0(postcss@8.5.12)
+      css-prefers-color-scheme: 11.0.0(postcss@8.5.12)
       cssdb: 8.8.0
-      postcss: 8.5.8
-      postcss-attribute-case-insensitive: 8.0.0(postcss@8.5.8)
-      postcss-clamp: 4.1.0(postcss@8.5.8)
-      postcss-color-functional-notation: 8.0.2(postcss@8.5.8)
-      postcss-color-hex-alpha: 11.0.0(postcss@8.5.8)
-      postcss-color-rebeccapurple: 11.0.0(postcss@8.5.8)
-      postcss-custom-media: 12.0.1(postcss@8.5.8)
-      postcss-custom-properties: 15.0.1(postcss@8.5.8)
-      postcss-custom-selectors: 9.0.1(postcss@8.5.8)
-      postcss-dir-pseudo-class: 10.0.0(postcss@8.5.8)
-      postcss-double-position-gradients: 7.0.0(postcss@8.5.8)
-      postcss-focus-visible: 11.0.0(postcss@8.5.8)
-      postcss-focus-within: 10.0.0(postcss@8.5.8)
-      postcss-font-variant: 5.0.0(postcss@8.5.8)
-      postcss-gap-properties: 7.0.0(postcss@8.5.8)
-      postcss-image-set-function: 8.0.0(postcss@8.5.8)
-      postcss-lab-function: 8.0.2(postcss@8.5.8)
-      postcss-logical: 9.0.0(postcss@8.5.8)
-      postcss-nesting: 14.0.0(postcss@8.5.8)
-      postcss-opacity-percentage: 3.0.0(postcss@8.5.8)
-      postcss-overflow-shorthand: 7.0.0(postcss@8.5.8)
-      postcss-page-break: 3.0.4(postcss@8.5.8)
-      postcss-place: 11.0.0(postcss@8.5.8)
-      postcss-pseudo-class-any-link: 11.0.0(postcss@8.5.8)
-      postcss-replace-overflow-wrap: 4.0.0(postcss@8.5.8)
-      postcss-selector-not: 9.0.0(postcss@8.5.8)
-
-  postcss-pseudo-class-any-link@11.0.0(postcss@8.5.8):
-    dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
+      postcss-attribute-case-insensitive: 8.0.0(postcss@8.5.12)
+      postcss-clamp: 4.1.0(postcss@8.5.12)
+      postcss-color-functional-notation: 8.0.2(postcss@8.5.12)
+      postcss-color-hex-alpha: 11.0.0(postcss@8.5.12)
+      postcss-color-rebeccapurple: 11.0.0(postcss@8.5.12)
+      postcss-custom-media: 12.0.1(postcss@8.5.12)
+      postcss-custom-properties: 15.0.1(postcss@8.5.12)
+      postcss-custom-selectors: 9.0.1(postcss@8.5.12)
+      postcss-dir-pseudo-class: 10.0.0(postcss@8.5.12)
+      postcss-double-position-gradients: 7.0.0(postcss@8.5.12)
+      postcss-focus-visible: 11.0.0(postcss@8.5.12)
+      postcss-focus-within: 10.0.0(postcss@8.5.12)
+      postcss-font-variant: 5.0.0(postcss@8.5.12)
+      postcss-gap-properties: 7.0.0(postcss@8.5.12)
+      postcss-image-set-function: 8.0.0(postcss@8.5.12)
+      postcss-lab-function: 8.0.2(postcss@8.5.12)
+      postcss-logical: 9.0.0(postcss@8.5.12)
+      postcss-nesting: 14.0.0(postcss@8.5.12)
+      postcss-opacity-percentage: 3.0.0(postcss@8.5.12)
+      postcss-overflow-shorthand: 7.0.0(postcss@8.5.12)
+      postcss-page-break: 3.0.4(postcss@8.5.12)
+      postcss-place: 11.0.0(postcss@8.5.12)
+      postcss-pseudo-class-any-link: 11.0.0(postcss@8.5.12)
+      postcss-replace-overflow-wrap: 4.0.0(postcss@8.5.12)
+      postcss-selector-not: 9.0.0(postcss@8.5.12)
+
+  postcss-pseudo-class-any-link@11.0.0(postcss@8.5.12):
+    dependencies:
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
-  postcss-replace-overflow-wrap@4.0.0(postcss@8.5.8):
+  postcss-replace-overflow-wrap@4.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
 
-  postcss-selector-not@9.0.0(postcss@8.5.8):
+  postcss-selector-not@9.0.0(postcss@8.5.12):
     dependencies:
-      postcss: 8.5.8
+      postcss: 8.5.12
       postcss-selector-parser: 7.1.1
 
   postcss-selector-parser@7.1.1:
@@ -23964,11 +23995,11 @@ snapshots:
 
   postcss-value-parser@4.2.0: {}
 
-  postcss-values-parser@6.0.2(postcss@8.5.8):
+  postcss-values-parser@6.0.2(postcss@8.5.12):
     dependencies:
       color-name: 1.1.4
       is-url-superb: 4.0.0
-      postcss: 8.5.8
+      postcss: 8.5.12
       quote-unquote: 1.0.0
 
   postcss@8.5.12:
@@ -23977,12 +24008,6 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postcss@8.5.8:
-    dependencies:
-      nanoid: 3.3.11
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
   preact-render-to-string@6.6.6(preact@10.29.0):
     dependencies:
       preact: 10.29.0
@@ -24012,7 +24037,7 @@ snapshots:
       detective-amd: 6.0.1
       detective-cjs: 6.0.1
       detective-es6: 5.0.1
-      detective-postcss: 7.0.1(postcss@8.5.8)
+      detective-postcss: 7.0.1(postcss@8.5.12)
       detective-sass: 6.0.1
       detective-scss: 5.0.1
       detective-stylus: 5.0.1
@@ -24020,7 +24045,7 @@ snapshots:
       detective-vue2: 2.2.0(typescript@5.9.3)
       module-definition: 6.0.1
       node-source-walk: 7.0.1
-      postcss: 8.5.8
+      postcss: 8.5.12
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
@@ -24546,7 +24571,7 @@ snapshots:
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
-      path-to-regexp: 8.3.0
+      path-to-regexp: 8.4.2
     transitivePeerDependencies:
       - supports-color
 
@@ -24566,7 +24591,7 @@ snapshots:
 
   safe-buffer@5.2.1: {}
 
-  safe-regex2@5.1.0:
+  safe-regex2@5.1.1:
     dependencies:
       ret: 0.5.0
 
@@ -24961,7 +24986,7 @@ snapshots:
 
   strip-json-comments@5.0.3: {}
 
-  strnum@2.2.1: {}
+  strnum@2.2.3: {}
 
   structured-source@4.0.0:
     dependencies:
@@ -25059,7 +25084,7 @@ snapshots:
 
   table@6.9.0:
     dependencies:
-      ajv: 8.18.0
+      ajv: 8.20.0
       lodash.truncate: 4.4.2
       slice-ansi: 4.0.0
       string-width: 4.2.3
@@ -25188,10 +25213,6 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
-  tsconfck@3.1.6(typescript@5.9.3):
-    optionalDependencies:
-      typescript: 5.9.3
-
   tslib@2.8.1: {}
 
   tsx@4.21.0:
@@ -25660,7 +25681,7 @@ snapshots:
       esbuild: 0.25.5
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
-      postcss: 8.5.8
+      postcss: 8.5.12
       rollup: 4.59.1
       tinyglobby: 0.2.16
     optionalDependencies:
@@ -25677,7 +25698,7 @@ snapshots:
       esbuild: 0.27.3
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
-      postcss: 8.5.8
+      postcss: 8.5.12
       rollup: 4.59.1
       tinyglobby: 0.2.16
     optionalDependencies:
@@ -26042,8 +26063,8 @@ snapshots:
   yaml-language-server@1.20.0:
     dependencies:
       '@vscode/l10n': 0.0.18
-      ajv: 8.18.0
-      ajv-draft-04: 1.0.0(ajv@8.18.0)
+      ajv: 8.20.0
+      ajv-draft-04: 1.0.0(ajv@8.20.0)
       prettier: 3.8.2
       request-light: 0.5.8
       vscode-json-languageservice: 4.1.8
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3c421de6d52e..4549c8ebfd11 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -37,12 +37,12 @@ minimumReleaseAgeExclude:
   - vite
   - rolldown
   - '@rolldown/*'
-  # Renovate security update: fast-xml-parser@5.3.8
-  - fast-xml-parser@5.3.8
+  # Renovate security update: fast-xml-parser@5.3.8 || 5.7.0
+  - fast-xml-parser@5.3.8 || 5.7.0
   # Renovate security update: svelte@5.53.5
   - svelte@5.53.5
-  # Renovate security update: fastify@5.8.1 || 5.8.3
-  - fastify@5.8.1 || 5.8.3
+  # Renovate security update: fastify@5.8.1 || 5.8.3 || 5.8.5
+  - fastify@5.8.1 || 5.8.3 || 5.8.5
   # Renovate security update: rollup@4.59.0
   - rollup@4.59.0
   # Renovate security update: undici@7.24.0
@@ -55,6 +55,10 @@ minimumReleaseAgeExclude:
   - astro-og-canvas@0.11.0
   # @types/node@24.12.2 published <3 days ago
   - '@types/node@24.12.2'
+  # Renovate security update: postcss@8.5.10
+  - postcss@8.5.10
+  # Renovate security update: @fastify/middie@9.3.2
+  - '@fastify/middie@9.3.2'
 peerDependencyRules:
   allowAny:
     - 'astro'
diff --git a/scripts/package.json b/scripts/package.json
index 8ad104bbdfd6..45cefd68af7f 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -11,8 +11,8 @@
     "esbuild": "^0.27.3",
     "p-limit": "^7.3.0",
     "piccolore": "^0.1.3",
+    "jsonc-parser": "^3.3.1",
     "tinyglobby": "^0.2.16",
-    "tsconfck": "^3.1.6",
     "tsx": "^4.21.0"
   }
 }
diff --git a/scripts/smoke/check.js b/scripts/smoke/check.js
index 1f199aac21a1..898ab35f8b0e 100644
--- a/scripts/smoke/check.js
+++ b/scripts/smoke/check.js
@@ -3,8 +3,8 @@
 import { spawn } from 'node:child_process';
 import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
 import * as path from 'node:path';
+import { parse as parseJsonc } from 'jsonc-parser';
 import pLimit from 'p-limit';
-import { toJson } from 'tsconfck';
 
 const skippedExamples = ['toolbar-app', 'component', 'server-islands'];
 
@@ -73,7 +73,7 @@ function prepareExample(examplePath) {
 	if (!existsSync(tsconfigPath)) return
 	
 	const originalConfig = readFileSync(tsconfigPath, 'utf-8');
-	const tsconfig = JSON.parse(toJson(originalConfig));
+	const tsconfig = parseJsonc(originalConfig, [], { allowTrailingComma: true });
 
 	// Swap to strictest config to make sure it also passes
 	tsconfig.extends = 'astro/tsconfigs/strictest';