Merge branch 'v6' into feat/sessions-drivers-changes

sarah11918 · web-flow · commit 41ab00dec3b2 · 2025-12-18T15:35:43.000-04:00
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Format code
         run: pnpm run format:ci
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3 # v7.0.0
+        uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
         with:
           commit_message: '[ci] format'
           branch: ${{ github.head_ref }}
diff --git a/src/content/docs/en/guides/upgrade-to/v5.mdx b/src/content/docs/en/guides/upgrade-to/v5.mdx
@@ -1111,8 +1111,6 @@ function useRoute(route: IntegrationRouteData) {
 }
 ```
 
-<ReadMore>See the API reference for `IntegrationRouteData`.</ReadMore>
-
 ### Changed: `distURL` is now an array (Integrations API)
 
 <SourcePR number="11864" title="send `IntegrationRouteData` to integrations"/>
@@ -1138,7 +1136,7 @@ if (route.distURL) {
 }
 ```
 
-<ReadMore>See the API reference for `IntegrationRouteData`.</ReadMore>
+<ReadMore>See the [API reference for `distURL`](/en/reference/integrations-reference/#disturl).</ReadMore>
 
 ### Changed: Arguments passed to `app.render()` (Adapter API)
 
diff --git a/src/content/docs/en/reference/adapter-reference.mdx b/src/content/docs/en/reference/adapter-reference.mdx
@@ -519,11 +519,11 @@ If not provided, Astro will fallback to its default behavior for fetching error
 
 <p>
 
-**Type:** `RouteData`<br />
+**Type:** [`RouteData`](/en/reference/integrations-reference/#routedata)<br />
 **Default:** `app.match(request)`
 </p>
 
-Provides a value for [`integrationResolvedRoute`](/en/reference/integrations-reference/#integrationresolvedroute-type-reference) if you already know the route to render. Doing so will bypass the internal call to [`app.match()`](#appmatch) to determine the route to render.
+Defines the information about a route. This is useful when you already know the route to render. Doing so will bypass the internal call to [`app.match()`](#appmatch) to determine the route to render.
 
 ```js "routeData"
 const routeData = app.match(request);
diff --git a/src/content/docs/en/reference/integrations-reference.mdx b/src/content/docs/en/reference/integrations-reference.mdx
@@ -612,7 +612,7 @@ If the final value after running all the hooks is `undefined`, the route will fa
 
 <p>
 
-**Type:** [`IntegrationResolvedRoute[]`](#integrationresolvedroute-type-reference)
+**Type:** [`IntegrationResolvedRoute[]`](#integrationresolvedroute)
 </p>
 
 A list of all routes with their associated metadata.
@@ -1161,7 +1161,7 @@ export default function myIntegration() {
 <Since v="5.0.0" />
 </p>
 
-Contains URLs to output files paths, grouped by [`IntegrationResolvedRoute`](#integrationresolvedroute-type-reference) `pattern` property.
+Contains URLs to output files paths, grouped by [`IntegrationResolvedRoute`](#integrationresolvedroute) `pattern` property.
 
 #### `pages` option
 
@@ -1192,6 +1192,21 @@ Astro reserves the `astro:` prefix for future built-in hooks. Please choose a di
 
 ## Integration types reference
 
+The following types can be imported from the `astro` module:
+
+```ts
+import type {
+  AstroIntegrationLogger,
+  HookParameters,
+  IntegrationResolvedRoute,
+  RedirectConfig,
+  RouteData,
+  RoutePart,
+  RouteType,
+  ValidRedirectStatus,
+} from "astro";
+```
+
 ### `AstroIntegrationLogger`
 
 An instance of the Astro logger, useful to write logs. This logger uses the same [log level](/en/reference/cli-reference/#--verbose)
@@ -1267,30 +1282,28 @@ function mySetup(options: HookParameters<'astro:config:setup'>) {
 }
 ```
 
-### `IntegrationResolvedRoute` type reference
+### `IntegrationResolvedRoute`
+
+A subset of [`RouteData`](#routedata) with remapped properties.
 
 ```ts
-interface IntegrationResolvedRoute {
+interface IntegrationResolvedRoute extends Pick<
+		RouteData,
+		'generate' | 'params' | 'pathname' | 'segments' | 'type' | 'redirect' | 'origin'
+	> & {
 	pattern: RouteData['route'];
 	patternRegex: RouteData['pattern'];
 	entrypoint: RouteData['component'];
 	isPrerendered: RouteData['prerender'];
 	redirectRoute?: IntegrationResolvedRoute;
-	generate: (data?: any) => string;
-	params: string[];
-	pathname?: string;
-	segments: RoutePart[][];
-	type: RouteType;
-	redirect?: RedirectConfig;
-	origin: 'internal' | 'external' | 'project';
 }
 ```
 
 #### `pattern`
 
 <p>
 
-**Type:** `string`
+**Type:** [`RouteData['route']`](#route)
 </p>
 
 Allows you to identify the type of route based on its path. Here are some examples of paths associated with their pattern:
@@ -1302,7 +1315,7 @@ Allows you to identify the type of route based on its path. Here are some exampl
 
 <p>
 
-**Type:** `RegExp`
+**Type:** [`RouteData['pattern']`](#pattern-1)
 </p>
 
 Allows you to access a regex used for matching an input URL against a requested route.
@@ -1313,7 +1326,7 @@ For example, given a `[fruit]/about.astro` path, the regex will be `/^\/([^/]+?)
 
 <p>
 
-**Type:** `string`
+**Type:** [`RouteData['component']`](#component)
 </p>
 
 The URL pathname of the source component.
@@ -1322,7 +1335,7 @@ The URL pathname of the source component.
 
 <p>
 
-**Type:** `boolean`
+**Type:** [`RouteData['prerender']`](#prerender)
 </p>
 
 Determines whether the route use [on demand rendering](/en/guides/on-demand-rendering/). The value will be `true` for projects configured with:
@@ -1338,6 +1351,40 @@ Determines whether the route use [on demand rendering](/en/guides/on-demand-rend
 
 When the value of `IntegrationResolvedRoute.type` is `redirect`, the value will be the `IntegrationResolvedRoute` to redirect to. Otherwise, the value will be undefined.
 
+### `RedirectConfig`
+
+<p>
+
+**Type:** <code>string | \{ status: <a href="#validredirectstatus">ValidRedirectStatus</a>; destination: string; \}</code>
+</p>
+
+Describes the destination of a redirect. This can be a string or an object containing information about the status code and its destination.
+
+### `RouteData`
+
+Describes the information about a route. This contains the following properties:
+
+#### `route`
+
+<p>
+
+**Type:** `string`
+</p>
+
+Defines the current route pattern. Here are some examples of paths associated with their pattern:
+* `src/pages/index.astro` will be `/`
+* `src/pages/blog/[...slug].astro` will be `/blog/[...slug]`
+* `src/pages/site/[blog]/[...slug].astro` will be `/site/[blog]/[...slug]`
+
+#### `component`
+
+<p>
+
+**Type:** `string`
+</p>
+
+Specifies the source component URL.
+
 #### `generate()`
 
 <p>
@@ -1347,10 +1394,10 @@ When the value of `IntegrationResolvedRoute.type` is `redirect`, the value will
 
 A function that provides the optional parameters of the route, interpolates them with the route pattern, and returns the path name of the route.
 
-For example, with a route such as `/blog/[...id].astro`, the `generate` function could return:
+For example, with a route such as `/blog/[...id].astro`, the `generate()` function could return:
 
 ```js
-console.log(generate({ id: 'presentation' })) // will log `/blog/presentation`
+generate({ id: 'presentation' }) // will output `/blog/presentation`
 ```
 
 #### `params`
@@ -1371,11 +1418,32 @@ Allows you to access the route `params`. For example, when a project uses the fo
 
 For regular routes, the value will be the URL pathname where this route will be served. When the project uses [dynamic routes](/en/guides/routing/#dynamic-routes) (ie. `[dynamic]` or `[...spread]`), the pathname will be undefined.
 
+#### `distURL`
+
+<p>
+
+**Type:** `URL[]  | undefined`<br />
+<Since v="5.0.0" />
+</p>
+
+Defines the paths of the physical files emitted by this route. When a route isn't prerendered, the value is either `undefined` or an empty array.
+
+#### `pattern`
+
+<p>
+
+**Type:** `RegExp`
+</p>
+
+Specifies a regex to use for matching an input URL against a requested route.
+
+For example, given a `[fruit]/about.astro` path, the regex will be `/^\/([^/]+?)\/about\/?$/`. Using `pattern.test("banana/about")` will return `true`.
+
 #### `segments`
 
 <p>
 
-**Type:** <code><a href="https://github.com/withastro/astro/blob/3b10b97a4fecd1dfd959b160a07b5b8427fe40a7/packages/astro/src/types/public/internal.ts#L154-L158">RoutePart</a>[][]</code>
+**Type:** <code><a href="#routepart">RoutePart</a>[][]</code>
 </p>
 
 Allows you to access the route [`params`](#params) with additional metadata. Each object contains the following properties:
@@ -1397,33 +1465,131 @@ For example, the following route `/pages/[blog]/[...slug].astro` will output the
 
 <p>
 
-**Type:** `RouteType`
+**Type:** [`RouteType`](#routetype)
 </p>
 
-Allows you to identify the type of route. Possible values are:
-* `page`: a route that lives in the file system, usually an Astro component
-* `endpoint`: a route that lives in the file system, usually a JS file that exposes endpoints methods
-* `redirect`: a route points to another route that lives in the file system
-* `fallback`: a route that doesn't exist in the file system that needs to be handled with other means, usually the middleware
+Allows you to identify the [type of route](#routetype).
+
+#### `prerender`
+
+<p>
+
+**Type:** `boolean`
+</p>
+
+Determines whether a route uses [on demand rendering](/en/guides/on-demand-rendering/) or is statically prerendered at build time.
+
+See also [`prerendered`](/en/reference/routing-reference/#prerender) in the routing reference.
 
 #### `redirect`
 
 <p>
 
-**Type:** <code><a href="https://github.com/withastro/astro/blob/3b10b97a4fecd1dfd959b160a07b5b8427fe40a7/packages/astro/src/types/public/config.ts#L39-L44">RedirectConfig</a> | undefined</code>
+**Type:** <code><a href="#redirectconfig">RedirectConfig</a> | undefined</code>
+</p>
+
+Allows you to access the route to redirect to.
+
+#### `redirectRoute`
+
+<p>
+
+**Type:** `RouteData | undefined`
+</p>
+
+Specifies the `RouteData` to redirect to when [`RouteData.type`](#type) is `redirect`.
+
+#### `fallbackRoutes`
+
+<p>
+
+**Type:** `RouteData[]`<br />
+<Since v="3.5.6" />
+</p>
+
+Defines a list of `RouteData` to fallback to when [`i18n.fallback`](/en/reference/configuration-reference/#i18nfallback) has a list of locales.
+
+#### `isIndex`
+
+<p>
+
+**Type:** `boolean`
 </p>
 
-Allows you to access the route to redirect to. This can be a string or an object containing information about the status code and its destination.
+Specifies if the route is a directory index (e.g. `src/pages/index.astro`, `src/pages/blog/index.astro`).
 
 #### `origin`
 
 <p>
 
-**Type:** `'internal' | 'external' | 'project'`
+**Type:** `'internal' | 'external' | 'project'`<br />
+<Since v="5.0.0" />
 </p>
 
 Determines if a route comes from Astro core (`internal`), an integration (`external`) or the user's project (`project`).
 
+### `RoutePart`
+
+<p>
+
+**Type:** `{ content: string; dynamic: boolean; spread: boolean; }`
+</p>
+
+Describes a route segment. This contains the following properties:
+
+#### `content`
+
+<p>
+
+**Type:** `string`
+</p>
+
+Specifies the parameter name for the route. For example:
+* `about.astro` has the name `about`
+* `[slug].astro` has the name `slug`
+* `[...id].astro` has the name `id`
+
+#### `dynamic`
+
+<p>
+
+**Type:** `boolean`
+</p>
+
+Whether the route is dynamic or not.
+
+#### `spread`
+
+<p>
+
+**Type:** `boolean`
+</p>
+
+Whether the dynamic route uses the spread syntax or not.
+
+### `RouteType`
+
+<p>
+
+**Type:** `'page' | 'endpoint' | 'redirect' | 'fallback'`
+</p>
+
+A union of supported route types:
+
+* `page`: a route that lives in the file system, usually an Astro component
+* `endpoint`: a route that lives in the file system, usually a JS file that exposes endpoints methods
+* `redirect`: a route points to another route that lives in the file system
+* `fallback`: a route that doesn't exist in the file system that needs to be handled with other means, usually a middleware
+
+### `ValidRedirectStatus`
+
+<p>
+
+**Type:** `301 | 302 | 303 | 307 | 308 | 300 | 304`
+</p>
+
+A union of supported redirect status code.
+
 ## Allow installation with `astro add`
 
 [The `astro add` command](/en/reference/cli-reference/#astro-add) allows users to easily add integrations and adapters to their project. If you want _your_ integration to be installable with this tool, **add `astro-integration` to the `keywords` field in your `package.json`**:
diff --git a/src/content/docs/zh-cn/recipes/docker.mdx b/src/content/docs/zh-cn/recipes/docker.mdx
@@ -37,7 +37,7 @@ RUN npm run build
 ENV HOST=0.0.0.0
 ENV PORT=4321
 EXPOSE 4321
-CMD node ./dist/server/entry.mjs
+CMD ["node", "./dist/server/entry.mjs"]
 ```
 
 :::tip[温馨提示]
@@ -158,7 +158,7 @@ COPY --from=build /app/dist ./dist
 ENV HOST=0.0.0.0
 ENV PORT=4321
 EXPOSE 4321
-CMD node ./dist/server/entry.mjs
+CMD ["node", "./dist/server/entry.mjs"]
 ```
 
 ## 操作步骤

Original file line number	Diff line number	Diff line change
`@@ -1111,8 +1111,6 @@ function useRoute(route: IntegrationRouteData) {`
`1111`	`1111`	`}`
`1112`	`1112`	```
`1113`	`1113`
`1114`		-<ReadMore>See the API reference for `IntegrationRouteData`.</ReadMore>
`1115`		`-`
`1116`	`1114`	### Changed: `distURL` is now an array (Integrations API)
`1117`	`1115`
`1118`	`1116`	<SourcePR number="11864" title="send `IntegrationRouteData` to integrations"/>
`@@ -1138,7 +1136,7 @@ if (route.distURL) {`
`1138`	`1136`	`}`
`1139`	`1137`	```
`1140`	`1138`
`1141`		-<ReadMore>See the API reference for `IntegrationRouteData`.</ReadMore>
	`1139`	+<ReadMore>See the [API reference for `distURL`](/en/reference/integrations-reference/#disturl).</ReadMore>
`1142`	`1140`
`1143`	`1141`	### Changed: Arguments passed to `app.render()` (Adapter API)
`1144`	`1142`