Merge branch 'v6' into feat/disallow-get-image-client

sarah11918 · web-flow · commit 81f949df6968 · 2026-03-06T14:11:02.000-04:00
diff --git a/src/content/docs/en/guides/upgrade-to/v6.mdx b/src/content/docs/en/guides/upgrade-to/v6.mdx
@@ -97,7 +97,7 @@ Astro v6.0 upgrades to Vite v7.0 as the development server and production bundle
 
 If you are using Vite-specific plugins, configuration, or APIs, check the [Vite migration guide](https://vite.dev/guide/migration) for their breaking changes and upgrade your project as needed.
 
-Using [Astro's `getViteConfig()` helper](/en/guides/testing/#vitest) requires Vitest v3.2 (Vitest v4 is not yet supported).
+Using [Astro's `getViteConfig()` helper](/en/guides/testing/#vitest) requires at least Vitest v3.2 or v4.1 beta 5.
 
 ### Vite Environment API
 
diff --git a/src/content/docs/en/reference/modules/astro-middleware.mdx b/src/content/docs/en/reference/modules/astro-middleware.mdx
@@ -118,7 +118,7 @@ import type {
 
 <p>
 
-**Type:** `{ request: Request; params?: Params; userDefinedLocales?: string[]; defaultLocale: string; locals: App.Locals; }`<br />
+**Type:** `{ request: Request; params?: Params; userDefinedLocales?: string[]; defaultLocale: string; locals: App.Locals; clientAddress?: string }`<br />
 <Since v="2.8.0" />
 </p>
 
@@ -174,6 +174,21 @@ An object for storing arbitrary information from a middleware, accessible to the
 
 <ReadMore>Learn more about [storing data in `locals`](/en/guides/middleware/#storing-data-in-contextlocals) with example usage.</ReadMore>
 
+
+#### `CreateContext.clientAddress`
+
+<p>
+
+**Type:** `string`<br />
+<Since v="6.0.0" />
+</p>
+
+The [IP address](https://en.wikipedia.org/wiki/IP_address) of the request.
+
+This must be provided by the adapter or platform from a trusted source (e.g. socket address, platform-provided header).
+
+If not provided, accessing `clientAddress` will throw an error. 
+
 ## `astro` types
 
 ```js
