Merge branch 'main' into feat/refresh-content

.changeset/afraid-apricots-develop.md

@@ -0,0 +1,7 @@
+---
+'astro': minor
+---
+
+Adds a new variant `sync` for the `astro:config:setup` hook's `command` property. This value is set when calling the command `astro sync`.
+
+If your integration previously relied on knowing how many variants existed for the `command` property, you must update your logic to account for this new option.

.changeset/blue-pens-divide.md

@@ -0,0 +1,22 @@
+---
+'astro': patch
+---
+
+Fixes a bug in the logic of `Astro.rewrite()` which led to the value for `base`, if configured, being automatically prepended to the rewrite URL passed. This was unintended behavior and has been corrected, and Astro now processes the URLs exactly as passed.
+
+If you use the `rewrite()` function on a project that has `base` configured, you must now prepend the base to your existing rewrite URL:
+
+```js
+// astro.config.mjs
+export default defineConfig({
+  base: '/blog'
+})
+```
+
+```diff
+// src/middleware.js
+export function onRequest(ctx, next) {
+-  return ctx.rewrite("/about")
++  return ctx.rewrite("/blog/about")
+}
+```

.changeset/chilled-timers-shave.md

@@ -0,0 +1,26 @@
+---
+'astro': patch
+---
+
+**BREAKING CHANGE to experimental content layer loaders only!**
+
+Passes `AstroConfig` instead of `AstroSettings` object to content layer loaders.
+
+This will not affect you unless you have created a loader that uses the `settings` object. If you have, you will need to update your loader to use the `config` object instead.
+
+```diff
+export default function myLoader() {
+  return {
+    name: 'my-loader'
+-   async load({ settings }) {
+-     const base = settings.config.base;
++   async load({ config }) {
++     const base = config.base;
+      // ...
+    }
+  }
+}
+
+```
+
+Other properties of the settings object are private internals, and should not be accessed directly. If you think you need access to other properties, please open an issue to discuss your use case.

.changeset/clever-emus-roll.md

@@ -0,0 +1,11 @@
+---
+'astro': minor
+---
+
+Adds a new, optional property `timeout` for the `client:idle` directive. 
+
+This value allows you to specify a maximum time to wait, in milliseconds, before hydrating a UI framework component, even if the page is not yet done with its initial load. This means you can delay hydration for lower-priority UI elements with more control to ensure your element is interactive within a specified time frame.
+
+```astro
+<ShowHideButton client:idle={{timeout: 500}} />
+```

.changeset/eight-balloons-cover.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Uses `magicast` to update the config for `astro add`

.changeset/four-beans-remember.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Replaces `execa` with `tinyexec` internally

.changeset/healthy-boxes-poke.md

@@ -0,0 +1,14 @@
+---
+'@astrojs/db': minor
+---
+
+Adds support for connecting Astro DB to any remote LibSQL server. This allows Astro DB to be used with self-hosting and air-gapped deployments.
+
+To connect Astro DB to a remote LibSQL server instead of Studio, set the following environment variables:
+
+- `ASTRO_DB_REMOTE_URL`: the connection URL to your LibSQL server
+- `ASTRO_DB_APP_TOKEN`: the auth token to your LibSQL server
+
+Details of the LibSQL connection can be configured using the connection URL. For example, `memory:?syncUrl=libsql%3A%2F%2Fdb-server.example.com` would create an in-memory embedded replica for the LibSQL DB on `libsql://db-server.example.com`.
+
+For more details, please visit [the Astro DB documentation](https://docs.astro.build/en/guides/astro-db/#libsql)

.changeset/lazy-feet-join.md

@@ -0,0 +1,32 @@
+---
+'astro': minor
+---
+
+Adds a new option `fallbackType` to `i18n.routing` configuration that allows you to control how fallback pages are handled.
+
+When `i18n.fallback` is configured, this new routing option controls whether to [redirect](https://docs.astro.build/en/guides/routing/#redirects) to the fallback page, or to [rewrite](https://docs.astro.build/en/guides/routing/#rewrites) the fallback page's content in place.
+
+The `"redirect"` option is the default value and matches the current behavior of the existing fallback system.
+
+The option `"rewrite"` uses the new [rewriting system](https://docs.astro.build/en/guides/routing/#rewrites) to create fallback pages that render content on the original, requested URL without a browser refresh.
+
+For example, the following configuration will generate a page `/fr/index.html` that will contain the same HTML rendered by the page `/en/index.html` when `src/pages/fr/index.astro` does not exist.
+
+```js
+// astro.config.mjs
+export default defineConfig({
+  i18n: {
+    locals: ["en", "fr"],
+    defaultLocale: "en",
+    routing: {
+      prefixDefaultLocale: true,
+      fallbackType: "rewrite"
+    },
+    fallback: {
+      fr: "en"
+    },
+  }
+})
+```
+
+

.changeset/mighty-trees-teach.md

@@ -1,5 +0,0 @@
----
-'@astrojs/mdx': patch
----
-
-Fixes stack trace location when failed to parse an MDX file with frontmatter

.changeset/new-monkeys-sit.md

@@ -0,0 +1,32 @@
+---
+'astro': minor
+---
+
+Adds a new object `swapFunctions` to expose the necessary utility functions on `astro:transitions/client` that allow you to build custom swap functions to be used with view transitions. 
+
+The example below uses these functions to replace Astro's built-in default `swap` function with one that only swaps the `<main>` part of the page:
+
+```astro
+<script>
+import { swapFunctions } from 'astro:transitions/client';
+
+document.addEventListener('astro:before-swap', (e) => { e.swap = () => swapMainOnly(e.newDocument) });
+
+function swapMainOnly(doc: Document) {
+  swapFunctions.deselectScripts(doc);
+  swapFunctions.swapRootAttributes(doc);
+  swapFunctions.swapHeadElements(doc);
+  const restoreFocusFunction = swapFunctions.saveFocus();
+  const newMain = doc.querySelector('main');
+  const oldMain = document.querySelector('main');
+  if (newMain && oldMain) {
+    swapFunctions.swapBodyElement(newMain, oldMain);
+  } else {
+    swapFunctions.swapBodyElement(doc.body, document.body);
+  }
+  restoreFocusFunction();
+};
+<script>
+```
+
+See the [view transitions guide](https://docs.astro.build/en/guides/view-transitions/#astrobefore-swap) for more information about hooking into the `astro:before-swap` lifecycle event and adding a custom swap implementation.

.changeset/new-pillows-kick.md

@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Prints prerender dynamic value usage warning only if it's used

.changeset/rich-kings-wait.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Correctly resolves content layer images when filePath is not set

.changeset/spicy-houses-fry.md

@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Simplifies path operations of `astro sync`

.changeset/weak-dancers-beam.md

@@ -1,20 +0,0 @@
----
-'@astrojs/vercel': minor
----
-
-Deprecates the `functionPerRoute` option
-
-This option is now deprecated, and will be removed entirely in Astro v5.0. We suggest removing this option from your configuration as soon as you are able to:
-
-```diff
-import { defineConfig } from 'astro/config';
-import vercel from '@astrojs/vercel/serverless';
-
-export default defineConfig({
-  // ...
-  output: 'server',
-  adapter: vercel({
--     functionPerRoute: true,
-  }),
-});
-```

.github/workflows/dispatch-event.yml

@@ -0,0 +1,61 @@
+name: Dispatch event
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    tags:
+      - '!**'
+
+permissions:
+  contents: read
+  actions: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+  
+env:
+  ASTRO_ADAPTERS_REPO: withastro/adapters
+  ASTRO_STARLIGHT_REPO: withastro/starlight
+  ASTRO_PUSH_MAIN_EVENT: astro-push-main-event
+    
+jobs:
+  repository-dispatch:
+    name: Repository dispatch
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch event on push - adapters
+        if: ${{ github.event_name == 'push' }}
+        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
+        with:
+          token: ${{ secrets.ASTRO_REPOSITORY_DISPATCH }}
+          repository: ${{ env.ASTRO_ADAPTERS_REPO }}
+          event-type: ${{ env.ASTRO_PUSH_MAIN_EVENT }}
+          client-payload: '{"event": ${{ toJson(github.event) }}}'
+      - name: Dispatch event on push - starlight
+        if: ${{ github.event_name == 'push' }}
+        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
+        with:
+          token: ${{ secrets.ASTRO_REPOSITORY_DISPATCH }}
+          repository: ${{ env.ASTRO_STARLIGHT_REPO }}
+          event-type: ${{ env.ASTRO_PUSH_MAIN_EVENT }}
+          client-payload: '{"event": ${{ toJson(github.event) }}}'
+      # For testing only, the payload is mocked
+      - name: Dispatch event on workflow dispatch - adapters
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
+        with:
+          token: ${{ secrets.ASTRO_REPOSITORY_DISPATCH }}
+          repository: ${{ env.ASTRO_ADAPTERS_REPO }}
+          event-type: ${{ env.ASTRO_PUSH_MAIN_EVENT }}
+          client-payload: '{"event": {"head_commit": {"id": "${{ env.GITHUB_SHA }}"}}}'
+      - name: Dispatch event on workflow dispatch - starlight
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
+        with:
+          token: ${{ secrets.ASTRO_REPOSITORY_DISPATCH }}
+          repository: ${{ env.ASTRO_STARLIGHT_REPO }}
+          event-type: ${{ env.ASTRO_PUSH_MAIN_EVENT }}
+          client-payload: '{"event": {"head_commit": {"id": "${{ env.GITHUB_SHA }}"}}}'          

.github/workflows/preview-comment.yml

@@ -0,0 +1,19 @@
+name: Add continuous release label
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  label:
+    if: ${{ github.repository_owner == 'withastro' && startsWith(github.event.comment.body, '!preview') }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - run: |
+          gh issue edit ${{ github.event.issue.number }} --add-label "pr: preview" --repo ${{ github.repository }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/preview-release.yml

@@ -0,0 +1,60 @@
+name: Preview release
+
+on:
+  pull_request:
+    branches: [main]
+    types: [opened, synchronize, labeled, ready_for_review]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}
+  cancel-in-progress: true
+        
+permissions:
+  contents: read
+  actions: write
+  
+env:
+  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+  FORCE_COLOR: true
+  ASTRO_TELEMETRY_DISABLED: true
+  # 7 GiB by default on GitHub, setting to 6 GiB
+  # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
+  NODE_OPTIONS: --max-old-space-size=6144
+
+jobs:
+  preview:
+    if: |
+      ${{ github.repository_owner == 'withastro' && github.event.issue.pull_request && contains(github.event.pull_request.labels.*.name, 'pr: preview') }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      issues: write
+      pull-requests: write
+    name: Publish preview release
+    timeout-minutes: 5
+    steps:
+      - name: Disable git crlf
+        run: git config --global core.autocrlf false
+  
+      - name: Checkout
+        uses: actions/checkout@v4
+  
+      - name: Setup PNPM
+        uses: pnpm/action-setup@v3
+  
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: "pnpm"
+  
+      - name: Install dependencies
+        run: pnpm install
+  
+      - name: Build Packages
+        run: pnpm run build
+  
+      - name: Publish packages
+        run: pnpx pkg-pr-new publish --pnpm './packages/*' './packages/integrations/*'

.gitignore

@@ -16,9 +16,6 @@ package-lock.json
 .eslintcache
 .pnpm-store
 
-# ignore top-level vscode settings
-/.vscode/settings.json
-
 # do not commit .env files or any files that end with `.env`
 *.env
 
@@ -37,3 +34,8 @@ packages/**/e2e/**/fixtures/**/.astro/
 packages/**/e2e/**/fixtures/**/env.d.ts
 examples/**/.astro/
 examples/**/env.d.ts
+
+# make it easy for people to add project-specific Astro settings that they don't
+# want to share with others (see
+# https://github.com/withastro/astro/pull/11759#discussion_r1721444711)
+*.code-workspace

.vscode/extensions.json

@@ -3,7 +3,8 @@
     "astro-build.astro-vscode",
     "esbenp.prettier-vscode",
     "editorconfig.editorconfig",
-    "dbaeumer.vscode-eslint"
+    "dbaeumer.vscode-eslint",
+    "biomejs.biome"
   ],
   "unwantedRecommendations": []
 }

.vscode/settings.json

@@ -0,0 +1,21 @@
+{
+  "[json]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "editor.codeActionsOnSave": {
+    "quickFix.biome": true,
+    "source.fixAll.biome": true
+  }
+}

benchmark/bench/cli-startup.js

@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'node:url';
-import { execaCommand } from 'execa';
+import { exec } from 'tinyexec';
 import { markdownTable } from 'markdown-table';
 import { astroBin, calculateStat } from './_util.js';
 
@@ -14,11 +14,11 @@ export async function run(projectDir, outputFile) {
 	const root = fileURLToPath(projectDir);
 
 	console.log('Benchmarking `astro --help`...');
-	const helpStat = await benchmarkCommand(`node ${astroBin} --help`, root);
+	const helpStat = await benchmarkCommand('node', [astroBin, '--help'], root);
 	console.log('Done');
 
-	console.log('Benchmarking `astro info`...');
-	const infoStat = await benchmarkCommand(`node ${astroBin} info`, root);
+	console.log('Benchmarking `astro preferences list`...');
+	const infoStat = await benchmarkCommand('node', [astroBin, 'preferences', 'list'], root);
 	console.log('Done');
 
 	console.log('Result preview:');
@@ -35,16 +35,17 @@ export async function run(projectDir, outputFile) {
 
 /**
  * @param {string} command
+ * @param {string[]} args
  * @param {string} root
  * @returns {Promise<import('./_util.js').Stat>}
  */
-async function benchmarkCommand(command, root) {
+async function benchmarkCommand(command, args, root) {
 	/** @type {number[]} */
 	const durations = [];
 
 	for (let i = 0; i < 10; i++) {
 		const start = performance.now();
-		await execaCommand(command, { cwd: root });
+		await exec(command, args, { nodeOptions: { cwd: root } });
 		durations.push(performance.now() - start);
 	}
 

benchmark/bench/memory.js

@@ -1,4 +1,4 @@
-import { execaCommand } from 'execa';
+import { exec } from 'tinyexec';
 import { markdownTable } from 'markdown-table';
 import fs from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
@@ -18,11 +18,13 @@ export async function run(projectDir, outputFile) {
 	const outputFilePath = fileURLToPath(outputFile);
 
 	console.log('Building and benchmarking...');
-	await execaCommand(`node --expose-gc --max_old_space_size=10000 ${astroBin} build --silent`, {
-		cwd: root,
-		stdio: 'inherit',
-		env: {
-			ASTRO_TIMER_PATH: outputFilePath,
+	await exec('node', ['--expose-gc', '--max_old_space_size=10000', astroBin, 'build'], {
+		nodeOptions: {
+			cwd: root,
+			stdio: 'inherit',
+			env: {
+				ASTRO_TIMER_PATH: outputFilePath,
+			},
 		},
 	});
 

benchmark/bench/render.js

@@ -1,4 +1,4 @@
-import { execaCommand } from 'execa';
+import { exec } from 'tinyexec';
 import { markdownTable } from 'markdown-table';
 import fs from 'node:fs/promises';
 import http from 'node:http';
@@ -20,15 +20,19 @@ export async function run(projectDir, outputFile) {
 	const root = fileURLToPath(projectDir);
 
 	console.log('Building...');
-	await execaCommand(`${astroBin} build`, {
-		cwd: root,
-		stdio: 'inherit',
+	await exec(astroBin, ['build'], {
+		nodeOptions: {
+			cwd: root,
+			stdio: 'inherit',
+		},
 	});
 
 	console.log('Previewing...');
-	const previewProcess = execaCommand(`${astroBin} preview --port ${port}`, {
-		cwd: root,
-		stdio: 'inherit',
+	const previewProcess = exec(astroBin, ['preview', '--port', port], {
+		nodeOptions: {
+			cwd: root,
+			stdio: 'inherit',
+		},
 	});
 
 	console.log('Waiting for server ready...');

benchmark/bench/server-stress.js

@@ -1,5 +1,5 @@
 import autocannon from 'autocannon';
-import { execaCommand } from 'execa';
+import { exec } from 'tinyexec';
 import { markdownTable } from 'markdown-table';
 import fs from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
@@ -19,9 +19,11 @@ export async function run(projectDir, outputFile) {
 	const root = fileURLToPath(projectDir);
 
 	console.log('Building...');
-	await execaCommand(`${astroBin} build`, {
-		cwd: root,
-		stdio: 'inherit',
+	await exec(astroBin, ['build'], {
+		nodeOptions: {
+			cwd: root,
+			stdio: 'inherit',
+		},
 	});
 
 	console.log('Previewing...');

benchmark/package.json

@@ -12,11 +12,11 @@
     "@benchmark/timer": "workspace:*",
     "astro": "workspace:*",
     "autocannon": "^7.15.0",
-    "execa": "^8.0.1",
     "markdown-table": "^3.0.3",
     "mri": "^1.2.0",
     "port-authority": "^2.0.1",
     "pretty-bytes": "^6.1.1",
-    "sharp": "^0.33.3"
+    "sharp": "^0.33.3",
+    "tinyexec": "^0.3.0"
   }
 }

benchmark/packages/timer/package.json

@@ -29,7 +29,7 @@
     "astro": "workspace:*"
   },
   "devDependencies": {
-    "@types/server-destroy": "^1.0.3",
+    "@types/server-destroy": "^1.0.4",
     "astro": "workspace:*",
     "astro-scripts": "workspace:*"
   }

biome.json

@@ -9,7 +9,7 @@
       "**/vendor/**",
       "**/.vercel/**"
     ],
-    "include": ["test/**", "e2e/**", "packages/**"]
+    "include": ["test/**", "e2e/**", "packages/**", "/scripts/**"]
   },
   "formatter": {
     "indentStyle": "tab",
@@ -31,7 +31,8 @@
     "rules": {
       "recommended": false,
       "style": {
-        "useNodejsImportProtocol": "error"
+        "useNodejsImportProtocol": "error",
+        "useImportType": "error"
       }
     }
   },

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/blog/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^3.1.3",
+    "@astrojs/mdx": "^3.1.5",
     "@astrojs/rss": "^4.0.7",
     "@astrojs/sitemap": "^3.1.6",
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/component/package.json

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

examples/container-with-vitest/package.json

@@ -12,14 +12,14 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "@astrojs/react": "^3.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vitest": "^2.0.5"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0"
   }
 }

examples/framework-alpine/package.json

@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.4.0",
     "@types/alpinejs": "^3.13.10",
     "alpinejs": "^3.14.1",
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.3.0",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "lit": "^3.2.0"
   }
 }

examples/framework-multiple/package.json

@@ -11,19 +11,19 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^3.5.1",
+    "@astrojs/preact": "^3.5.2",
     "@astrojs/react": "^3.6.2",
     "@astrojs/solid-js": "^4.4.1",
     "@astrojs/svelte": "^5.7.0",
     "@astrojs/vue": "^4.5.0",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.14.2",
-    "preact": "^10.23.1",
+    "astro": "^4.14.6",
+    "preact": "^10.23.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "solid-js": "^1.8.20",
-    "svelte": "^4.2.18",
-    "vue": "^3.4.37"
+    "solid-js": "^1.8.22",
+    "svelte": "^4.2.19",
+    "vue": "^3.4.38"
   }
 }

examples/framework-preact/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^3.5.1",
+    "@astrojs/preact": "^3.5.2",
     "@preact/signals": "^1.3.0",
-    "astro": "^4.14.2",
-    "preact": "^10.23.1"
+    "astro": "^4.14.6",
+    "preact": "^10.23.2"
   }
 }

examples/framework-react/package.json

@@ -12,9 +12,9 @@
   },
   "dependencies": {
     "@astrojs/react": "^3.6.2",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

examples/framework-solid/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^4.4.1",
-    "astro": "^4.14.2",
-    "solid-js": "^1.8.20"
+    "astro": "^4.14.6",
+    "solid-js": "^1.8.22"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.7.0",
-    "astro": "^4.14.2",
-    "svelte": "^4.2.18"
+    "astro": "^4.14.6",
+    "svelte": "^4.2.19"
   }
 }

examples/framework-vue/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.5.0",
-    "astro": "^4.14.2",
-    "vue": "^3.4.37"
+    "astro": "^4.14.6",
+    "vue": "^3.4.38"
   }
 }

examples/hackernews/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.3.3",
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/integration/package.json

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

examples/middleware/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.3.3",
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

examples/middleware/src/middleware.ts

@@ -56,16 +56,27 @@ const validation = defineMiddleware(async (context, next) => {
 	} else if (context.request.url.endsWith('/api/login')) {
 		const response = await next();
 		// the login endpoint will return to us a JSON with username and password
-		const data = await response.json();
-		// we naively check if username and password are equals to some string
-		if (data.username === 'astro' && data.password === 'astro') {
-			// we store the token somewhere outside of locals because the `locals` object is attached to the request
-			// and when doing a redirect, we lose that information
-			loginInfo.token = 'loggedIn';
-			loginInfo.currentTime = new Date().getTime();
-			return context.redirect('/admin');
-		}
-	}
+    if (response.headers.get('content-type') === 'application/json') {
+      const data = await response.json();
+      // we naively check if username and password are equals to some string
+      if (data.username === 'astro' && data.password === 'astro') {
+        // we store the token somewhere outside of locals because the `locals` object is attached to the request
+        // and when doing a redirect, we lose that information
+        loginInfo.token = 'loggedIn';
+        loginInfo.currentTime = new Date().getTime();
+        return context.redirect('/admin');
+      }
+    }
+    return response;
+  } else if (context.request.url.endsWith('/api/logout')) {
+		const response = await next();
+    if (response.ok) {
+      loginInfo.token = undefined;
+      loginInfo.currentTime = undefined;
+      return context.redirect('/login');
+    }
+    return response;
+  }
 	return next();
 });
 

examples/middleware/src/pages/admin.astro

@@ -1,11 +1,16 @@
 ---
 import Layout from '../layouts/Layout.astro';
+import Card from '../components/Card.astro';
 const user = Astro.locals.user;
 ---
 
 <Layout title="Welcome back!!">
 	<main>
 		<h1>Welcome back <span class="text-gradient">{user.name} {user.surname}</span></h1>
+		{}
+		<ul role="list" class="link-card-grid">
+			<Card href="/api/logout" title="Logout" body="Logout now" />
+		</ul>
 	</main>
 </Layout>
 

examples/middleware/src/pages/api/login.ts

@@ -0,0 +1,21 @@
+import type { APIRoute, APIContext } from "astro";
+
+export const POST: APIRoute = async (context: APIContext) => {
+  try {
+    const data = await context.request.formData();
+    return new Response(
+      JSON.stringify({
+        username: data.get("username"),
+        password: data.get("password"),
+      }),
+      {
+        headers: { "Content-Type": "application/json" },
+      }
+    );
+  } catch (e) {
+    if (e instanceof Error) {
+      console.error(e.message);
+    }
+  }
+  return new Response(null, { status: 400 });
+};

examples/middleware/src/pages/api/logout.ts

@@ -0,0 +1,5 @@
+import type { APIRoute, APIContext } from "astro";
+
+export const GET: APIRoute = async (_: APIContext) => {
+  return new Response(null, { status: 200 });
+};

examples/middleware/src/pages/index.astro

@@ -12,7 +12,7 @@ import Card from '../components/Card.astro';
 		</p>
 		{}
 		<ul role="list" class="link-card-grid">
-			<Card href="/login" title="Login" body="Try the login" />
+			<Card href="/login" title="Login" body="Try the login with astro/astro" />
 		</ul>
 	</main>
 </Layout>

examples/middleware/src/pages/login.astro

@@ -14,6 +14,7 @@ if (status === 301) {
 		<p class="instructions">
 			To get started, open the directory <code>src/pages</code> in your project.<br />
 			<strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
+			<strong>Login with:</strong> Username: <code>astro</code> Password: <code>astro</code>
 		</p>
 		{redirectMessage}
 		<form action="/api/login" method="POST">

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/server-islands/package.json

@@ -15,12 +15,12 @@
     "@astrojs/tailwind": "^5.1.0",
     "@fortawesome/fontawesome-free": "^6.6.0",
     "@tailwindcss/forms": "^0.5.7",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "postcss": "^8.4.41",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "tailwindcss": "^3.4.9"
+    "tailwindcss": "^3.4.10"
   }
 }

examples/ssr/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^8.3.3",
     "@astrojs/svelte": "^5.7.0",
-    "astro": "^4.14.2",
-    "svelte": "^4.2.18"
+    "astro": "^4.14.6",
+    "svelte": "^4.2.19"
   }
 }

examples/starlog/package.json

@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "sass": "^1.77.8",
     "sharp": "^0.33.3"
   }

examples/toolbar-app/package.json

@@ -15,6 +15,6 @@
     "./app": "./dist/app.js"
   },
   "devDependencies": {
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/view-transitions/package.json

@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.1.0",
     "@astrojs/node": "^8.3.3",
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/with-markdoc/package.json

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^0.11.3",
-    "astro": "^4.14.2"
+    "@astrojs/markdoc": "^0.11.4",
+    "astro": "^4.14.6"
   }
 }

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^5.2.0",
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",

examples/with-markdown-shiki/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.14.2"
+    "astro": "^4.14.6"
   }
 }

examples/with-mdx/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^3.1.3",
-    "@astrojs/preact": "^3.5.1",
-    "astro": "^4.14.2",
-    "preact": "^10.23.1"
+    "@astrojs/mdx": "^3.1.5",
+    "@astrojs/preact": "^3.5.2",
+    "astro": "^4.14.6",
+    "preact": "^10.23.2"
   }
 }

examples/with-nanostores/package.json

@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^3.5.1",
+    "@astrojs/preact": "^3.5.2",
     "@nanostores/preact": "^0.5.2",
-    "astro": "^4.14.2",
-    "nanostores": "^0.11.2",
-    "preact": "^10.23.1"
+    "astro": "^4.14.6",
+    "nanostores": "^0.11.3",
+    "preact": "^10.23.2"
   }
 }

examples/with-tailwindcss/package.json

@@ -11,13 +11,13 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^3.1.3",
+    "@astrojs/mdx": "^3.1.5",
     "@astrojs/tailwind": "^5.1.0",
     "@types/canvas-confetti": "^1.6.4",
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "autoprefixer": "^10.4.20",
     "canvas-confetti": "^1.9.3",
     "postcss": "^8.4.41",
-    "tailwindcss": "^3.4.9"
+    "tailwindcss": "^3.4.10"
   }
 }

examples/with-vitest/package.json

@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.14.2",
+    "astro": "^4.14.6",
     "vitest": "^2.0.5"
   }
 }

package.json

@@ -52,22 +52,22 @@
     "astro-benchmark": "workspace:*"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.9.2",
+    "@astrojs/check": "^0.9.3",
     "@biomejs/biome": "1.8.3",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.7",
     "@types/node": "^18.17.8",
     "esbuild": "^0.21.5",
-    "eslint": "^9.9.0",
-    "eslint-plugin-no-only-tests": "^3.1.0",
+    "eslint": "^9.9.1",
+    "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-regexp": "^2.6.0",
     "globby": "^14.0.2",
     "only-allow": "^1.2.1",
     "prettier": "^3.3.3",
     "prettier-plugin-astro": "^0.14.1",
-    "turbo": "^2.0.12",
+    "turbo": "^2.1.0",
     "typescript": "~5.5.4",
-    "typescript-eslint": "^8.0.1"
+    "typescript-eslint": "^8.3.0"
   },
   "pnpm": {
     "peerDependencyRules": {

packages/astro/CHANGELOG.md

@@ -1,5 +1,59 @@
 # astro
 
+## 4.14.6
+
+### Patch Changes
+
+- [#11847](https://github.com/withastro/astro/pull/11847) [`45b599c`](https://github.com/withastro/astro/commit/45b599c4d40ded6a3e03881181b441ae494cbfcf) Thanks [@ascorbic](https://github.com/ascorbic)! - Fixes a case where Vite would be imported by the SSR runtime, causing bundling errors and bloat.
+
+- [#11822](https://github.com/withastro/astro/pull/11822) [`6fcaab8`](https://github.com/withastro/astro/commit/6fcaab84de1044ff4d186b2dfa5831964460062d) Thanks [@bluwy](https://github.com/bluwy)! - Marks internal `vite-plugin-fileurl` plugin with `enforce: 'pre'`
+
+- [#11713](https://github.com/withastro/astro/pull/11713) [`497324c`](https://github.com/withastro/astro/commit/497324c4e87538dc1dc13aea3ced9bd3642d9ba6) Thanks [@voidfill](https://github.com/voidfill)! - Prevents prefetching of the same urls with different hashes.
+
+- [#11814](https://github.com/withastro/astro/pull/11814) [`2bb72c6`](https://github.com/withastro/astro/commit/2bb72c63969f8f21dd279fa927c32f192ff79a3f) Thanks [@eduardocereto](https://github.com/eduardocereto)! - Updates the documentation for experimental Content Layer API with a corrected code example
+
+- [#11842](https://github.com/withastro/astro/pull/11842) [`1ffaae0`](https://github.com/withastro/astro/commit/1ffaae04cf790390f730bf900b9722b99642adc1) Thanks [@stephan281094](https://github.com/stephan281094)! - Fixes a typo in the `MissingImageDimension` error message
+
+- [#11828](https://github.com/withastro/astro/pull/11828) [`20d47aa`](https://github.com/withastro/astro/commit/20d47aa85a3a0d7ac3390f749715d92de830cf3e) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Improves error message when invalid data is returned by an Action.
+
+## 4.14.5
+
+### Patch Changes
+
+- [#11809](https://github.com/withastro/astro/pull/11809) [`62e97a2`](https://github.com/withastro/astro/commit/62e97a20f72bacb017c633ddcb776abc89167660) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fixes usage of `.transform()`, `.refine()`, `.passthrough()`, and other effects on Action form inputs.
+
+- [#11812](https://github.com/withastro/astro/pull/11812) [`260c4be`](https://github.com/withastro/astro/commit/260c4be050f91353bc5ba6af073e7bc17429d552) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Exposes `ActionAPIContext` type from the `astro:actions` module.
+
+- [#11813](https://github.com/withastro/astro/pull/11813) [`3f7630a`](https://github.com/withastro/astro/commit/3f7630afd697809b1d4fbac6edd18153983c70ac) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fixes unexpected `undefined` value when calling an action from the client without a return value.
+
+## 4.14.4
+
+### Patch Changes
+
+- [#11794](https://github.com/withastro/astro/pull/11794) [`3691a62`](https://github.com/withastro/astro/commit/3691a626fb67d617e5f8bd057443cd2ff6caa054) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fixes unexpected warning log when using Actions on "hybrid" rendered projects.
+
+- [#11801](https://github.com/withastro/astro/pull/11801) [`9f943c1`](https://github.com/withastro/astro/commit/9f943c1344671b569a0d1ddba683b3cca0068adc) Thanks [@delucis](https://github.com/delucis)! - Fixes a bug where the `filePath` property was not available on content collection entries when using the content layer `file()` loader with a JSON file that contained an object instead of an array. This was breaking use of the `image()` schema utility among other things.
+
+## 4.14.3
+
+### Patch Changes
+
+- [#11780](https://github.com/withastro/astro/pull/11780) [`c6622ad`](https://github.com/withastro/astro/commit/c6622adaeb405e961b12c91f0e5d02c7333d01cf) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Deprecates the Squoosh image service, to be removed in Astro 5.0. We recommend migrating to the default Sharp service.
+
+- [#11790](https://github.com/withastro/astro/pull/11790) [`41c3fcb`](https://github.com/withastro/astro/commit/41c3fcb6189709450a67ea8f726071d5f3cdc80e) Thanks [@sarah11918](https://github.com/sarah11918)! - Updates the documentation for experimental `astro:env` with a corrected link to the RFC proposal
+
+- [#11773](https://github.com/withastro/astro/pull/11773) [`86a3391`](https://github.com/withastro/astro/commit/86a33915ff41b23ff6b35bcfb1805fefc0760ca7) Thanks [@ematipico](https://github.com/ematipico)! - Changes messages logged when using unsupported, deprecated, or experimental adapter features for clarity
+
+- [#11745](https://github.com/withastro/astro/pull/11745) [`89bab1e`](https://github.com/withastro/astro/commit/89bab1e70786123fbe933a9d7a1b80c9334dcc5f) Thanks [@bluwy](https://github.com/bluwy)! - Prints prerender dynamic value usage warning only if it's used
+
+- [#11774](https://github.com/withastro/astro/pull/11774) [`c6400ab`](https://github.com/withastro/astro/commit/c6400ab99c5e5f4477bc6ef7e801b7869b0aa9ab) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes the path returned by `injectTypes`
+
+- [#11730](https://github.com/withastro/astro/pull/11730) [`2df49a6`](https://github.com/withastro/astro/commit/2df49a6fb4f6d92fe45f7429430abe63defeacd6) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Simplifies path operations of `astro sync`
+
+- [#11771](https://github.com/withastro/astro/pull/11771) [`49650a4`](https://github.com/withastro/astro/commit/49650a45550af46c70c6cf3f848b7b529103a649) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes an error thrown by `astro sync` when an `astro:env` virtual module is imported inside the Content Collections config
+
+- [#11744](https://github.com/withastro/astro/pull/11744) [`b677429`](https://github.com/withastro/astro/commit/b67742961a384c10e5cd04cf5b02d0f014ea7362) Thanks [@bluwy](https://github.com/bluwy)! - Disables the WebSocket server when creating a Vite server for loading config files
+
 ## 4.14.2
 
 ### Patch Changes

packages/astro/client.d.ts

@@ -150,6 +150,9 @@ declare module 'astro:transitions/client' {
 		import('./dist/virtual-modules/transitions-events.js').TransitionBeforeSwapEvent;
 	export const isTransitionBeforePreparationEvent: EventModule['isTransitionBeforePreparationEvent'];
 	export const isTransitionBeforeSwapEvent: EventModule['isTransitionBeforeSwapEvent'];
+	type TransitionSwapFunctionModule =
+		typeof import('./dist/virtual-modules/transitions-swap-functions.js');
+	export const swapFunctions: TransitionSwapFunctionModule['swapFunctions'];
 }
 
 declare module 'astro:prefetch' {

packages/astro/config.d.ts

@@ -26,6 +26,9 @@ export function getViteConfig(
 export function sharpImageService(config?: SharpImageServiceConfig): ImageServiceConfig;
 
 /**
+ * @deprecated The Squoosh image service is deprecated and will be removed in Astro 5.x.
+ * We suggest migrating to the default Sharp image service instead, as it is faster, more powerful and better maintained.
+ *
  * Return the configuration needed to use the Squoosh-based image service
  * See: https://docs.astro.build/en/guides/images/#configure-squoosh
  */

packages/astro/e2e/actions-blog.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
-import { testFactory } from './test-utils.js';
+import { testFactory, waitForHydrate } from './test-utils.js';
 
-const test = testFactory({ root: './fixtures/actions-blog/' });
+const test = testFactory(import.meta.url, { root: './fixtures/actions-blog/' });
 
 let devServer;
 
@@ -23,6 +23,7 @@ test.describe('Astro Actions - Blog', () => {
 		await page.goto(astro.resolveUrl('/blog/first-post/'));
 
 		const likeButton = page.getByLabel('Like');
+		await waitForHydrate(page, likeButton);
 		await expect(likeButton, 'like button starts with 10 likes').toContainText('10');
 		await likeButton.click();
 		await expect(likeButton, 'like button should increment likes').toContainText('11');
@@ -125,4 +126,13 @@ test.describe('Astro Actions - Blog', () => {
 		await expect(comments).toBeVisible();
 		await expect(comments).toContainText(body);
 	});
+
+	test('Logout action redirects', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/blog/first-post/'));
+
+		const logoutButton = page.getByTestId('logout-button');
+		await waitForHydrate(page, logoutButton);
+		await logoutButton.click();
+		await expect(page).toHaveURL(astro.resolveUrl('/blog/'));
+	});
 });

packages/astro/e2e/actions-react-19.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
-import { testFactory } from './test-utils.js';
+import { testFactory, waitForHydrate } from './test-utils.js';
 
-const test = testFactory({ root: './fixtures/actions-react-19/' });
+const test = testFactory(import.meta.url, { root: './fixtures/actions-react-19/' });
 
 let devServer;
 
@@ -23,10 +23,12 @@ test.describe('Astro Actions - React 19', () => {
 		await page.goto(astro.resolveUrl('/blog/first-post/'));
 
 		const likeButton = page.getByLabel('likes-client');
+		await waitForHydrate(page, likeButton);
+
 		await expect(likeButton).toBeVisible();
 		await likeButton.click();
 		await expect(likeButton, 'like button should be disabled when pending').toBeDisabled();
-		await expect(likeButton).not.toBeDisabled({ timeout: 5000 });
+		await expect(likeButton).not.toBeDisabled();
 	});
 
 	test('Like action - server progressive enhancement', async ({ page, astro }) => {
@@ -43,6 +45,8 @@ test.describe('Astro Actions - React 19', () => {
 		await page.goto(astro.resolveUrl('/blog/first-post/'));
 
 		const likeButton = page.getByLabel('likes-action-client');
+		await waitForHydrate(page, likeButton);
+
 		await expect(likeButton).toBeVisible();
 		await likeButton.click();
 

packages/astro/e2e/astro-component.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { testFactory } from './test-utils.js';
 
-const test = testFactory({ root: './fixtures/astro-component/' });
+const test = testFactory(import.meta.url, { root: './fixtures/astro-component/' });
 
 let devServer;
 

packages/astro/e2e/astro-envs.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { testFactory } from './test-utils.js';
 
-const test = testFactory({
+const test = testFactory(import.meta.url, {
 	root: './fixtures/astro-envs/',
 	devToolbar: {
 		enabled: false,

packages/astro/e2e/client-idle-timeout.test.js

@@ -0,0 +1,33 @@
+import { expect } from '@playwright/test';
+import { testFactory, waitForHydrate } from './test-utils.js';
+
+const test = testFactory(import.meta.url, { root: './fixtures/client-idle-timeout/' });
+
+let devServer;
+
+test.beforeAll(async ({ astro }) => {
+	devServer = await astro.startDevServer();
+});
+
+test.afterAll(async () => {
+	await devServer.stop();
+});
+
+test.describe('Client idle timeout', () => {
+	test('React counter', async ({ astro, page }) => {
+		await page.goto(astro.resolveUrl('/'));
+
+		const counter = page.locator('#react-counter');
+		await expect(counter, 'component is visible').toBeVisible();
+
+		const count = counter.locator('pre');
+		await expect(count, 'initial count is 0').toHaveText('0');
+
+		await waitForHydrate(page, counter);
+
+		const inc = counter.locator('.increment');
+		await inc.click();
+
+		await expect(count, 'count incremented by 1').toHaveText('1');
+	});
+});

packages/astro/e2e/client-only.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { testFactory } from './test-utils.js';
 
-const test = testFactory({ root: './fixtures/client-only/' });
+const test = testFactory(import.meta.url, { root: './fixtures/client-only/' });
 
 let devServer;
 

packages/astro/e2e/content-collections.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { testFactory } from './test-utils.js';
 
-const test = testFactory({ root: './fixtures/content-collections/' });
+const test = testFactory(import.meta.url, { root: './fixtures/content-collections/' });
 
 let devServer;
 

packages/astro/e2e/css.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { testFactory } from './test-utils.js';
 
-const test = testFactory({
+const test = testFactory(import.meta.url, {
 	root: './fixtures/css/',
 	devToolbar: {
 		enabled: false,

packages/astro/e2e/custom-client-directives.test.js

@@ -2,7 +2,7 @@ import { expect } from '@playwright/test';
 import testAdapter from '../test/test-adapter.js';
 import { testFactory, waitForHydrate } from './test-utils.js';
 
-const test = testFactory({
+const test = testFactory(import.meta.url, {
 	root: './fixtures/custom-client-directives/',
 });
 

packages/astro/e2e/dev-toolbar-audits.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { testFactory } from './test-utils.js';
 
-const test = testFactory({
+const test = testFactory(import.meta.url, {
 	root: './fixtures/dev-toolbar/',
 });
 

packages/astro/e2e/dev-toolbar.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { testFactory } from './test-utils.js';
 
-const test = testFactory({
+const test = testFactory(import.meta.url, {
 	root: './fixtures/dev-toolbar/',
 });
 

packages/astro/e2e/error-cyclic.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { getErrorOverlayContent, testFactory } from './test-utils.js';
 
-const test = testFactory({
+const test = testFactory(import.meta.url, {
 	root: './fixtures/error-cyclic/',
 });
 

packages/astro/e2e/error-sass.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { getErrorOverlayContent, testFactory } from './test-utils.js';
 
-const test = testFactory({
+const test = testFactory(import.meta.url, {
 	root: './fixtures/error-sass/',
 });
 

packages/astro/e2e/errors.test.js

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { getErrorOverlayContent, testFactory } from './test-utils.js';
 
-const test = testFactory({
+const test = testFactory(import.meta.url, {
 	root: './fixtures/errors/',
 	// Only test the error overlay, don't print to console
 	vite: {

packages/astro/e2e/fixtures/actions-blog/package.json

@@ -10,11 +10,11 @@
 		"astro": "astro"
 	},
 	"dependencies": {
-		"@astrojs/check": "^0.9.2",
+		"@astrojs/check": "^0.9.3",
 		"@astrojs/db": "workspace:*",
 		"@astrojs/node": "workspace:*",
 		"@astrojs/react": "workspace:*",
-		"@types/react": "^18.3.3",
+		"@types/react": "^18.3.4",
 		"@types/react-dom": "^18.3.0",
 		"astro": "workspace:*",
 		"react": "^18.3.1",

packages/astro/e2e/fixtures/actions-blog/src/actions/index.ts

@@ -3,11 +3,16 @@ import { ActionError, defineAction, z } from 'astro:actions';
 import { getCollection } from 'astro:content';
 
 export const server = {
+	logout: defineAction({
+		handler: async () => {
+			await new Promise((r) => setTimeout(r, 500));
+		},
+	}),
 	blog: {
 		like: defineAction({
 			input: z.object({ postId: z.string() }),
 			handler: async ({ postId }) => {
-				await new Promise((r) => setTimeout(r, 1000));
+				await new Promise((r) => setTimeout(r, 500));
 
 				const { likes } = await db
 					.update(Likes)
@@ -30,7 +35,7 @@ export const server = {
 				body: z.string().min(10),
 			}),
 			handler: async ({ postId, author, body }) => {
-				if (!(await getCollection('blog')).find(b => b.id === postId)) {
+				if (!(await getCollection('blog')).find((b) => b.id === postId)) {
 					throw new ActionError({
 						code: 'NOT_FOUND',
 						message: 'Post not found',

packages/astro/e2e/fixtures/actions-blog/src/components/Logout.tsx

@@ -0,0 +1,16 @@
+import { actions } from 'astro:actions';
+import { navigate } from 'astro:transitions/client';
+
+export function Logout() {
+	return (
+		<button
+			data-testid="logout-button"
+			onClick={async () => {
+				const { error } = await actions.logout();
+				if (!error) navigate('/blog/');
+			}}
+		>
+			Logout
+		</button>
+	);
+}

packages/astro/e2e/fixtures/actions-blog/src/pages/blog/[...slug].astro

@@ -1,6 +1,7 @@
 ---
 import { type CollectionEntry, getCollection, getEntry } from 'astro:content';
 import BlogPost from '../../layouts/BlogPost.astro';
+import { Logout } from '../../components/Logout';
 import { db, eq, Comment, Likes } from 'astro:db';
 import { Like } from '../../components/Like';
 import { PostComment } from '../../components/PostComment';
@@ -17,14 +18,13 @@ export async function getStaticPaths() {
 	}));
 }
 
-
 type Props = CollectionEntry<'blog'>;
 
 const post = await getEntry('blog', Astro.params.slug)!;
 const { Content } = await post.render();
 
 if (Astro.url.searchParams.has('like')) {
-	await Astro.callAction(actions.blog.like.orThrow, {postId: post.id});
+	await Astro.callAction(actions.blog.like.orThrow, { postId: post.id });
 }
 
 const comment = Astro.getActionResult(actions.blog.comment);
@@ -40,6 +40,8 @@ const commentPostIdOverride = Astro.url.searchParams.get('commentPostIdOverride'
 <BlogPost {...post.data}>
 	<Like postId={post.id} initial={initialLikes?.likes ?? 0} client:load />
 
+	<Logout client:load />
+
 	<form>
 		<input type="hidden" name="like" />
 		<button type="submit" aria-label="get-request">Like GET request</button>
@@ -57,17 +59,17 @@ const commentPostIdOverride = Astro.url.searchParams.get('commentPostIdOverride'
 	/>
 	<form method="POST" data-testid="progressive-fallback" action={actions.blog.comment.queryString}>
 		<input type="hidden" name="postId" value={post.id} />
-		<label for="fallback-author">
-			Author
-		</label>
-			<input id="fallback-author" type="text" name="author" required />
-		<label for="fallback-body" class="sr-only">
-			Comment
-		</label>
+		<label for="fallback-author"> Author </label>
+		<input id="fallback-author" type="text" name="author" required />
+		<label for="fallback-body" class="sr-only"> Comment </label>
 		<textarea id="fallback-body" rows={10} name="body" required></textarea>
-		{isInputError(comment?.error) && comment.error.fields.body && (
-			<p class="error" data-error="body">{comment.error.fields.body.toString()}</p>
-		)}
+		{
+			isInputError(comment?.error) && comment.error.fields.body && (
+				<p class="error" data-error="body">
+					{comment.error.fields.body.toString()}
+				</p>
+			)
+		}
 		<button type="submit">Post Comment</button>
 	</form>
 	<div data-testid="server-comments">

packages/astro/e2e/fixtures/actions-react-19/package.json

@@ -10,7 +10,7 @@
 		"astro": "astro"
 	},
 	"dependencies": {
-		"@astrojs/check": "^0.9.2",
+		"@astrojs/check": "^0.9.3",
 		"@astrojs/db": "workspace:*",
 		"@astrojs/node": "workspace:*",
 		"@astrojs/react": "workspace:*",

packages/astro/e2e/fixtures/astro-component/package.json

@@ -6,6 +6,6 @@
     "@astrojs/preact": "workspace:*",
     "@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib",
     "astro": "workspace:*",
-    "preact": "^10.23.1"
+    "preact": "^10.23.2"
   }
 }

packages/astro/e2e/fixtures/astro-envs/package.json

@@ -5,6 +5,6 @@
   "dependencies": {
     "@astrojs/vue": "workspace:*",
     "astro": "workspace:*",
-    "vue": "^3.4.37"
+    "vue": "^3.4.38"
   }
 }

packages/astro/e2e/fixtures/client-idle-timeout/astro.config.mjs

@@ -0,0 +1,9 @@
+import react from '@astrojs/react';
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+export default defineConfig({
+	integrations: [
+		react(),
+	],
+});

packages/astro/e2e/fixtures/client-idle-timeout/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "@e2e/client-idle-timeout",
+  "version": "0.0.0",
+  "private": true,
+  "devDependencies": {
+    "@astrojs/react": "workspace:*",
+    "astro": "workspace:*"
+  },
+  "dependencies": {
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
+  }
+}

packages/astro/e2e/fixtures/client-idle-timeout/src/components/Counter.jsx

@@ -0,0 +1,18 @@
+import React, { useState } from 'react';
+
+export default function Counter({ children, count: initialCount = 0, id }) {
+	const [count, setCount] = useState(initialCount);
+	const add = () => setCount((i) => i + 1);
+	const subtract = () => setCount((i) => i - 1);
+
+	return (
+		<>
+			<div id={id} className="counter">
+				<button className="decrement" onClick={subtract}>-</button>
+				<pre>{count}</pre>
+				<button className="increment" onClick={add}>+</button>
+			</div>
+			<div className="counter-message">{children}</div>
+		</>
+	);
+}

packages/astro/e2e/fixtures/client-idle-timeout/src/pages/index.astro

@@ -0,0 +1,16 @@
+---
+import Counter from '../components/Counter.jsx';
+---
+
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width" />
+		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+	</head>
+	<body>
+		<main>
+			<Counter id="react-counter" client:idle={{timeout: 200}}></Counter>
+		</main>
+	</body>
+</html>

packages/astro/e2e/fixtures/client-only/package.json

@@ -11,11 +11,11 @@
     "astro": "workspace:*"
   },
   "dependencies": {
-    "preact": "^10.23.1",
+    "preact": "^10.23.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "solid-js": "^1.8.20",
-    "svelte": "^4.2.18",
-    "vue": "^3.4.37"
+    "solid-js": "^1.8.22",
+    "svelte": "^4.2.19",
+    "vue": "^3.4.38"
   }
 }

packages/astro/e2e/fixtures/dev-toolbar/package.json

@@ -5,6 +5,6 @@
   "dependencies": {
     "@astrojs/preact": "workspace:*",
     "astro": "workspace:*",
-    "preact": "^10.23.1"
+    "preact": "^10.23.2"
   }
 }

packages/astro/e2e/fixtures/error-cyclic/package.json

@@ -5,6 +5,6 @@
   "dependencies": {
     "@astrojs/preact": "workspace:*",
     "astro": "workspace:*",
-    "preact": "^10.23.1"
+    "preact": "^10.23.2"
   }
 }

packages/astro/e2e/fixtures/errors/package.json

@@ -9,12 +9,12 @@
     "@astrojs/svelte": "workspace:*",
     "@astrojs/vue": "workspace:*",
     "astro": "workspace:*",
-    "preact": "^10.23.1",
+    "preact": "^10.23.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "sass": "^1.77.8",
-    "solid-js": "^1.8.20",
-    "svelte": "^4.2.18",
-    "vue": "^3.4.37"
+    "solid-js": "^1.8.22",
+    "svelte": "^4.2.19",
+    "vue": "^3.4.38"
   }
 }

packages/astro/e2e/fixtures/hydration-race/package.json

@@ -9,6 +9,6 @@
   "dependencies": {
     "@astrojs/preact": "workspace:*",
     "astro": "workspace:*",
-    "preact": "^10.23.1"
+    "preact": "^10.23.2"
   }
 }

packages/astro/e2e/fixtures/multiple-frameworks/package.json

@@ -14,11 +14,11 @@
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.2.1",
     "lit": "^3.2.0",
-    "preact": "^10.23.1",
+    "preact": "^10.23.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "solid-js": "^1.8.20",
-    "svelte": "^4.2.18",
-    "vue": "^3.4.37"
+    "solid-js": "^1.8.22",
+    "svelte": "^4.2.19",
+    "vue": "^3.4.38"
   }
 }

packages/astro/e2e/fixtures/namespaced-component/package.json

@@ -8,6 +8,6 @@
     "astro": "workspace:*"
   },
   "dependencies": {
-    "preact": "^10.23.1"
+    "preact": "^10.23.2"
   }
 }

packages/astro/e2e/fixtures/nested-in-preact/package.json

@@ -11,11 +11,11 @@
     "astro": "workspace:*"
   },
   "dependencies": {
-    "preact": "^10.23.1",
+    "preact": "^10.23.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "solid-js": "^1.8.20",
-    "svelte": "^4.2.18",
-    "vue": "^3.4.37"
+    "solid-js": "^1.8.22",
+    "svelte": "^4.2.19",
+    "vue": "^3.4.38"
   }
 }