astro 5.0.1 → 5.0.3

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.0.1";
+const ASTRO_VERSION = "5.0.3";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/container.js

@@ -66,7 +66,8 @@ async function createContainer({
     mode,
     logger,
     skip: {
-      content: true
+      content: true,
+      cleanup: true
     },
     force: inlineConfig?.force,
     manifest

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.0.1";
+  const currentVersion = "5.0.3";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {
@@ -69,7 +69,7 @@ async function dev(inlineConfig) {
   await attachContentServerListeners(restart.container);
   let store;
   try {
-    const dataStoreFile = getDataStoreFile(restart.container.settings);
+    const dataStoreFile = getDataStoreFile(restart.container.settings, true);
     if (existsSync(dataStoreFile)) {
       store = await MutableDataStore.fromFile(dataStoreFile);
     }

package/dist/core/errors/errors-data.d.ts

@@ -30,7 +30,7 @@ export declare const UnknownCompilerError: {
  * @docs
  * @see
  * - [Official integrations](https://docs.astro.build/en/guides/integrations-guide/#official-integrations)
- * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#astroclientaddress)
+ * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#clientaddress)
  * @description
  * The adapter you're using unfortunately does not support `Astro.clientAddress`.
  */
@@ -43,7 +43,7 @@ export declare const ClientAddressNotAvailable: {
  * @docs
  * @see
  * - [On-demand rendering](https://docs.astro.build/en/guides/on-demand-rendering/)
- * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#astroclientaddress)
+ * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#clientaddress)
  * @description
  * The `Astro.clientAddress` property cannot be used inside prerendered routes.
  */
@@ -56,7 +56,7 @@ export declare const PrerenderClientAddressNotAvailable: {
  * @docs
  * @see
  * - [Enabling SSR in Your Project](https://docs.astro.build/en/guides/on-demand-rendering/)
- * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#astroclientaddress)
+ * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#clientaddress)
  * @description
  * The `Astro.clientAddress` property is only available when [Server-side rendering](https://docs.astro.build/en/guides/on-demand-rendering/) is enabled.
  *
@@ -71,7 +71,7 @@ export declare const StaticClientAddressNotAvailable: {
 /**
  * @docs
  * @see
- * - [getStaticPaths()](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+ * - [getStaticPaths()](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
  * @description
  * A [dynamic route](https://docs.astro.build/en/guides/routing/#dynamic-routes) was matched, but no corresponding path was found for the requested parameters. This is often caused by a typo in either the generated or the requested path.
  */
@@ -176,7 +176,7 @@ export declare const NoClientOnlyHint: {
 /**
  * @docs
  * @see
- * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+ * - [`getStaticPaths()`](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
  * - [`params`](https://docs.astro.build/en/reference/api-reference/#params)
  * @description
  * The `params` property in `getStaticPaths`'s return value (an array of objects) should also be an object.
@@ -201,7 +201,7 @@ export declare const InvalidGetStaticPathParam: {
 /**
  * @docs
  * @see
- * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+ * - [`getStaticPaths()`](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
  * @description
  * `getStaticPaths`'s return value must be an array of objects. In most cases, this error happens because an array of array was returned. Using [`.flatMap()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flatMap) or a [`.flat()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flat) call may be useful.
  *
@@ -223,7 +223,7 @@ export declare const InvalidGetStaticPathsEntry: {
 /**
  * @docs
  * @see
- * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+ * - [`getStaticPaths()`](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
  * - [`params`](https://docs.astro.build/en/reference/api-reference/#params)
  * @description
  * `getStaticPaths`'s return value must be an array of objects.
@@ -246,7 +246,7 @@ export declare const InvalidGetStaticPathsReturn: {
 /**
  * @docs
  * @see
- * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+ * - [`getStaticPaths()`](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
  * - [`params`](https://docs.astro.build/en/reference/api-reference/#params)
  * @description
  * Every route specified by `getStaticPaths` require a `params` property specifying the path parameters needed to match the route.
@@ -272,7 +272,7 @@ export declare const GetStaticPathsExpectedParams: {
 /**
  * @docs
  * @see
- * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+ * - [`getStaticPaths()`](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
  * - [`params`](https://docs.astro.build/en/reference/api-reference/#params)
  * @description
  * Since `params` are encoded into the URL, only certain types are supported as values.
@@ -313,7 +313,7 @@ export declare const GetStaticPathsInvalidRouteParam: {
  * @docs
  * @see
  * - [Dynamic Routes](https://docs.astro.build/en/guides/routing/#dynamic-routes)
- * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+ * - [`getStaticPaths()`](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
  * - [Server-side Rendering](https://docs.astro.build/en/guides/on-demand-rendering/)
  * @description
  * In [Static Mode](https://docs.astro.build/en/guides/routing/#static-ssg-mode), all routes must be determined at build time. As such, dynamic routes must `export` a `getStaticPaths` function returning the different paths to generate.
@@ -367,7 +367,7 @@ export declare const AdapterSupportOutputMismatch: {
 /**
  * @docs
  * @see
- * - [On-demand Rendering](https://5-0-0-beta.docs.astro.build/en/guides/on-demand-rendering/)
+ * - [On-demand Rendering](https://docs.astro.build/en/guides/on-demand-rendering/)
  * @description
  * To use server islands, the same constraints exist as for sever-side rendering, so an adapter is needed.
  */
@@ -526,7 +526,7 @@ export declare const UnsupportedImageConversion: {
 /**
  * @docs
  * @see
- * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+ * - [`getStaticPaths()`](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
  * - [`params`](https://docs.astro.build/en/reference/api-reference/#params)
  * @description
  * The endpoint is prerendered with an `undefined` param so the generated path will collide with another route.
@@ -1112,7 +1112,7 @@ export declare const ServerOnlyModule: {
  *
  * @see
  * - [Request.clone()](https://developer.mozilla.org/en-US/docs/Web/API/Request/clone)
- * - [Astro.rewrite](https://docs.astro.build/en/reference/api-reference/#astrorewrite)
+ * - [Astro.rewrite](https://docs.astro.build/en/reference/api-reference/#rewrite)
  */
 export declare const RewriteWithBodyUsed: {
     name: string;
@@ -1500,7 +1500,7 @@ export declare const UnsupportedConfigTransformError: {
 /**
  * @docs
  * @see
- * - [On-demand rendering](https://5-0-0-beta.docs.astro.build/en/guides/on-demand-rendering/)
+ * - [On-demand rendering](https://docs.astro.build/en/guides/on-demand-rendering/)
  * @description
  * Your project must have a server output to create backend functions with Actions.
  */
@@ -1537,7 +1537,7 @@ export declare const ActionNotFoundError: {
 /**
  * @docs
  * @see
- * - [`Astro.callAction()` reference](https://docs.astro.build/en/reference/api-reference/#astrocallaction)
+ * - [`Astro.callAction()` reference](https://docs.astro.build/en/reference/api-reference/#callaction)
  * @description
  * Action called from a server page or endpoint without using `Astro.callAction()`.
  */

package/dist/core/errors/errors-data.js

@@ -63,31 +63,31 @@ const InvalidGetStaticPathParam = {
   name: "InvalidGetStaticPathParam",
   title: "Invalid value returned by a `getStaticPaths` path.",
   message: (paramType) => `Invalid params given to \`getStaticPaths\` path. Expected an \`object\`, got \`${paramType}\``,
-  hint: "See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths."
+  hint: "See https://docs.astro.build/en/reference/routing-reference/#getstaticpaths for more information on getStaticPaths."
 };
 const InvalidGetStaticPathsEntry = {
   name: "InvalidGetStaticPathsEntry",
   title: "Invalid entry inside getStaticPath's return value",
   message: (entryType) => `Invalid entry returned by getStaticPaths. Expected an object, got \`${entryType}\``,
-  hint: "If you're using a `.map` call, you might be looking for `.flatMap()` instead. See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths."
+  hint: "If you're using a `.map` call, you might be looking for `.flatMap()` instead. See https://docs.astro.build/en/reference/routing-reference/#getstaticpaths for more information on getStaticPaths."
 };
 const InvalidGetStaticPathsReturn = {
   name: "InvalidGetStaticPathsReturn",
   title: "Invalid value returned by getStaticPaths.",
   message: (returnType) => `Invalid type returned by \`getStaticPaths\`. Expected an \`array\`, got \`${returnType}\``,
-  hint: "See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths."
+  hint: "See https://docs.astro.build/en/reference/routing-reference/#getstaticpaths for more information on getStaticPaths."
 };
 const GetStaticPathsExpectedParams = {
   name: "GetStaticPathsExpectedParams",
   title: "Missing params property on `getStaticPaths` route.",
   message: "Missing or empty required `params` property on `getStaticPaths` route.",
-  hint: "See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths."
+  hint: "See https://docs.astro.build/en/reference/routing-reference/#getstaticpaths for more information on getStaticPaths."
 };
 const GetStaticPathsInvalidRouteParam = {
   name: "GetStaticPathsInvalidRouteParam",
   title: "Invalid value for `getStaticPaths` route parameter.",
   message: (key, value, valueType) => `Invalid getStaticPaths route parameter for \`${key}\`. Expected undefined, a string or a number, received \`${valueType}\` (\`${value}\`)`,
-  hint: "See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths."
+  hint: "See https://docs.astro.build/en/reference/routing-reference/#getstaticpaths for more information on getStaticPaths."
 };
 const GetStaticPathsRequired = {
   name: "GetStaticPathsRequired",
@@ -117,7 +117,7 @@ const NoAdapterInstalledServerIslands = {
   name: "NoAdapterInstalledServerIslands",
   title: "Cannot use Server Islands without an adapter.",
   message: `Cannot use server islands without an adapter. Please install and configure the appropriate server adapter for your final deployment.`,
-  hint: "See https://5-0-0-beta.docs.astro.build/en/guides/on-demand-rendering/ for more information."
+  hint: "See https://docs.astro.build/en/guides/on-demand-rendering/ for more information."
 };
 const NoMatchingImport = {
   name: "NoMatchingImport",
@@ -591,7 +591,7 @@ const ActionsWithoutServerOutputError = {
   name: "ActionsWithoutServerOutputError",
   title: "Actions must be used with server output.",
   message: "A server is required to create callable backend functions. To deploy routes to a server, add an adapter to your Astro config and configure your route for on-demand rendering",
-  hint: "Add an adapter and enable on-demand rendering: https://5-0-0-beta.docs.astro.build/en/guides/on-demand-rendering/"
+  hint: "Add an adapter and enable on-demand rendering: https://docs.astro.build/en/guides/on-demand-rendering/"
 };
 const ActionsReturnedInvalidDataError = {
   name: "ActionsReturnedInvalidDataError",
@@ -609,7 +609,7 @@ const ActionCalledFromServerError = {
   name: "ActionCalledFromServerError",
   title: "Action unexpected called from the server.",
   message: "Action called from a server page or endpoint without using `Astro.callAction()`. This wrapper must be used to call actions from server code.",
-  hint: "See the `Astro.callAction()` reference for usage examples: https://docs.astro.build/en/reference/api-reference/#astrocallaction"
+  hint: "See the `Astro.callAction()` reference for usage examples: https://docs.astro.build/en/reference/api-reference/#callaction"
 };
 const UnknownError = { name: "UnknownError", title: "Unknown Error." };
 export {

package/dist/core/errors/zod-error-map.js

@@ -16,24 +16,45 @@ const errorMap = (baseError, ctx) => {
         }
       }
     }
-    let messages = [
-      prefix(
-        baseErrorPath,
-        typeOrLiteralErrByPath.size ? "Did not match union:" : "Did not match union."
-      )
-    ];
+    const messages = [prefix(baseErrorPath, "Did not match union.")];
+    const details = [...typeOrLiteralErrByPath.entries()].filter(([, error]) => error.expected.length === baseError.unionErrors.length).map(
+      ([key, error]) => key === baseErrorPath ? (
+        // Avoid printing the key again if it's a base error
+        `> ${getTypeOrLiteralMsg(error)}`
+      ) : `> ${prefix(key, getTypeOrLiteralMsg(error))}`
+    );
+    if (details.length === 0) {
+      const expectedShapes = [];
+      for (const unionError of baseError.unionErrors) {
+        const expectedShape = [];
+        for (const issue of unionError.issues) {
+          if (issue.code === "invalid_union") {
+            return errorMap(issue, ctx);
+          }
+          const relativePath = flattenErrorPath(issue.path).replace(baseErrorPath, "").replace(leadingPeriod, "");
+          if ("expected" in issue && typeof issue.expected === "string") {
+            expectedShape.push(
+              relativePath ? `${relativePath}: ${issue.expected}` : issue.expected
+            );
+          } else {
+            expectedShape.push(relativePath);
+          }
+        }
+        if (expectedShape.length === 1 && !expectedShape[0]?.includes(":")) {
+          expectedShapes.push(expectedShape.join(""));
+        } else {
+          expectedShapes.push(`{ ${expectedShape.join("; ")} }`);
+        }
+      }
+      if (expectedShapes.length) {
+        details.push("> Expected type `" + expectedShapes.join(" | ") + "`");
+        details.push("> Received `" + stringify(ctx.data) + "`");
+      }
+    }
     return {
-      message: messages.concat(
-        [...typeOrLiteralErrByPath.entries()].filter(([, error]) => error.expected.length === baseError.unionErrors.length).map(
-          ([key, error]) => key === baseErrorPath ? (
-            // Avoid printing the key again if it's a base error
-            `> ${getTypeOrLiteralMsg(error)}`
-          ) : `> ${prefix(key, getTypeOrLiteralMsg(error))}`
-        )
-      ).join("\n")
+      message: messages.concat(details).join("\n")
     };
-  }
-  if (baseError.code === "invalid_literal" || baseError.code === "invalid_type") {
+  } else if (baseError.code === "invalid_literal" || baseError.code === "invalid_type") {
     return {
       message: prefix(
         baseErrorPath,
@@ -51,26 +72,25 @@ const errorMap = (baseError, ctx) => {
   }
 };
 const getTypeOrLiteralMsg = (error) => {
-  if (error.received === "undefined") return "Required";
+  if (typeof error.received === "undefined" || error.received === "undefined") return "Required";
   const expectedDeduped = new Set(error.expected);
   switch (error.code) {
     case "invalid_type":
-      return `Expected type \`${unionExpectedVals(expectedDeduped)}\`, received ${JSON.stringify(
+      return `Expected type \`${unionExpectedVals(expectedDeduped)}\`, received \`${stringify(
         error.received
-      )}`;
+      )}\``;
     case "invalid_literal":
-      return `Expected \`${unionExpectedVals(expectedDeduped)}\`, received ${JSON.stringify(
+      return `Expected \`${unionExpectedVals(expectedDeduped)}\`, received \`${stringify(
         error.received
-      )}`;
+      )}\``;
   }
 };
 const prefix = (key, msg) => key.length ? `**${key}**: ${msg}` : msg;
-const unionExpectedVals = (expectedVals) => [...expectedVals].map((expectedVal, idx) => {
-  if (idx === 0) return JSON.stringify(expectedVal);
-  const sep = " | ";
-  return `${sep}${JSON.stringify(expectedVal)}`;
-}).join("");
+const unionExpectedVals = (expectedVals) => [...expectedVals].map((expectedVal) => stringify(expectedVal)).join(" | ");
 const flattenErrorPath = (errorPath) => errorPath.join(".");
+const stringify = (val) => JSON.stringify(val, null, 1).split(newlinePlusWhitespace).join(" ");
+const newlinePlusWhitespace = /\n\s*/;
+const leadingPeriod = /^\./;
 export {
   errorMap
 };

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.0.1";
+  const version = "5.0.3";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -179,13 +179,15 @@ function getNetworkLogging(host) {
     return "visible";
   }
 }
+const codeRegex = /`([^`]+)`/g;
 function formatConfigErrorMessage(err) {
   const errorList = err.issues.map(
-    (issue) => `  ! ${bold(issue.path.join("."))}  ${red(issue.message + ".")}`
+    (issue) => `! ${renderErrorMarkdown(issue.message, "cli")}`.replaceAll(codeRegex, blue("$1")).split("\n").map((line, index) => index === 0 ? red(line) : "  " + line).join("\n")
   );
   return `${red("[config]")} Astro found issue(s) with your configuration:
+
 ${errorList.join(
-    "\n"
+    "\n\n"
   )}`;
 }
 const STACK_LINE_REGEXP = /^\s+at /g;
@@ -274,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.0.1"}`
+        `v${"5.0.3"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.d.ts

@@ -19,6 +19,7 @@ export declare class RenderContext {
     request: Request;
     routeData: RouteData;
     status: number;
+    clientAddress: string | undefined;
     protected cookies: AstroCookies;
     params: import("../types/public/common.js").Params;
     protected url: URL;
@@ -33,7 +34,7 @@ export declare class RenderContext {
      * A safety net in case of loops
      */
     counter: number;
-    static create({ locals, middleware, pathname, pipeline, request, routeData, status, props, partial, }: Pick<RenderContext, 'pathname' | 'pipeline' | 'request' | 'routeData'> & Partial<Pick<RenderContext, 'locals' | 'middleware' | 'status' | 'props' | 'partial'>>): Promise<RenderContext>;
+    static create({ locals, middleware, pathname, pipeline, request, routeData, clientAddress, status, props, partial, }: Pick<RenderContext, 'pathname' | 'pipeline' | 'request' | 'routeData' | 'clientAddress'> & Partial<Pick<RenderContext, 'locals' | 'middleware' | 'status' | 'props' | 'partial'>>): Promise<RenderContext>;
     /**
      * The main function of the RenderContext.
      *
@@ -59,7 +60,7 @@ export declare class RenderContext {
      */
     createAstro(result: SSRResult, astroStaticPartial: AstroGlobalPartial, props: Record<string, any>, slotValues: Record<string, any> | null): AstroGlobal;
     createAstroPagePartial(result: SSRResult, astroStaticPartial: AstroGlobalPartial): Omit<AstroGlobal, 'props' | 'self' | 'slots'>;
-    clientAddress(): string;
+    getClientAddress(): string;
     computeCurrentLocale(): string | undefined;
     computePreferredLocale(): string | undefined;
     computePreferredLocaleList(): string[] | undefined;

package/dist/core/render-context.js

@@ -29,7 +29,7 @@ import { copyRequest, getOriginPathname, setOriginPathname } from "./routing/rew
 import { SERVER_ISLAND_COMPONENT } from "./server-islands/endpoint.js";
 const apiContextRoutesSymbol = Symbol.for("context.routes");
 class RenderContext {
-  constructor(pipeline, locals, middleware, pathname, request, routeData, status, cookies = new AstroCookies(request), params = getParams(routeData, pathname), url = new URL(request.url), props = {}, partial = void 0) {
+  constructor(pipeline, locals, middleware, pathname, request, routeData, status, clientAddress, cookies = new AstroCookies(request), params = getParams(routeData, pathname), url = new URL(request.url), props = {}, partial = void 0) {
     this.pipeline = pipeline;
     this.locals = locals;
     this.middleware = middleware;
@@ -37,6 +37,7 @@ class RenderContext {
     this.request = request;
     this.routeData = routeData;
     this.status = status;
+    this.clientAddress = clientAddress;
     this.cookies = cookies;
     this.params = params;
     this.url = url;
@@ -58,6 +59,7 @@ class RenderContext {
     pipeline,
     request,
     routeData,
+    clientAddress,
     status = 200,
     props,
     partial = void 0
@@ -72,6 +74,7 @@ class RenderContext {
       request,
       routeData,
       status,
+      clientAddress,
       void 0,
       void 0,
       void 0,
@@ -245,7 +248,7 @@ class RenderContext {
       routePattern: this.routeData.route,
       isPrerendered: this.routeData.prerender,
       get clientAddress() {
-        return renderContext.clientAddress();
+        return renderContext.getClientAddress();
       },
       get currentLocale() {
         return renderContext.computeCurrentLocale();
@@ -393,7 +396,7 @@ class RenderContext {
       isPrerendered: this.routeData.prerender,
       cookies,
       get clientAddress() {
-        return renderContext.clientAddress();
+        return renderContext.getClientAddress();
       },
       get currentLocale() {
         return renderContext.computeCurrentLocale();
@@ -421,14 +424,17 @@ class RenderContext {
       }
     };
   }
-  clientAddress() {
-    const { pipeline, request } = this;
+  getClientAddress() {
+    const { pipeline, request, routeData, clientAddress } = this;
+    if (routeData.prerender) {
+      throw new AstroError(AstroErrorData.PrerenderClientAddressNotAvailable);
+    }
+    if (clientAddress) {
+      return clientAddress;
+    }
     if (clientAddressSymbol in request) {
       return Reflect.get(request, clientAddressSymbol);
     }
-    if (request.body === null) {
-      throw new AstroError(AstroErrorData.PrerenderClientAddressNotAvailable);
-    }
     if (pipeline.adapterName) {
       throw new AstroError({
         ...AstroErrorData.ClientAddressNotAvailable,

package/dist/core/request.d.ts

@@ -18,6 +18,7 @@ export interface CreateRequestOptions {
      * @default false
      */
     isPrerendered?: boolean;
+    routePattern: string;
 }
 /**
  * Used by astro internals to create a web standard request object.
@@ -26,5 +27,5 @@ export interface CreateRequestOptions {
  *
  * This is used by the static build to create fake requests for prerendering, and by the dev server to convert node requests into the standard request object.
  */
-export declare function createRequest({ url, headers, clientAddress, method, body, logger, locals, isPrerendered, }: CreateRequestOptions): Request;
+export declare function createRequest({ url, headers, method, body, logger, locals, isPrerendered, routePattern, }: CreateRequestOptions): Request;
 export {};

package/dist/core/request.js

@@ -1,14 +1,13 @@
-const clientAddressSymbol = Symbol.for("astro.clientAddress");
 const clientLocalsSymbol = Symbol.for("astro.locals");
 function createRequest({
   url,
   headers,
-  clientAddress,
   method = "GET",
   body = void 0,
   logger,
   locals,
-  isPrerendered = false
+  isPrerendered = false,
+  routePattern
 }) {
   const headersObj = isPrerendered ? void 0 : headers instanceof Headers ? headers : new Headers(
     // Filter out HTTP/2 pseudo-headers. These are internally-generated headers added to all HTTP/2 requests with trusted metadata about the request.
@@ -35,7 +34,7 @@ function createRequest({
       get() {
         logger.warn(
           null,
-          `\`Astro.request.headers\` is not available on prerendered pages. If you need access to request headers, make sure that the page is server rendered using \`export const prerender = false;\` or by setting \`output\` to \`"server"\` in your Astro config to make all your pages server rendered.`
+          `\`Astro.request.headers\` was used when rendering the route \`${routePattern}'\`. \`Astro.request.headers\` is not available on prerendered pages. If you need access to request headers, make sure that the page is server-rendered using \`export const prerender = false;\` or by setting \`output\` to \`"server"\` in your Astro config to make all your pages server-rendered by default.`
         );
         return _headers;
       },
@@ -43,8 +42,6 @@ function createRequest({
         _headers = newHeaders;
       }
     });
-  } else if (clientAddress) {
-    Reflect.set(request, clientAddressSymbol, clientAddress);
   }
   Reflect.set(request, clientLocalsSymbol, locals ?? {});
   return request;

package/dist/core/sync/index.d.ts

@@ -9,6 +9,7 @@ export type SyncOptions = {
     force?: boolean;
     skip?: {
         content?: boolean;
+        cleanup?: boolean;
     };
     manifest: ManifestData;
 };

package/dist/core/sync/index.js

@@ -98,6 +98,9 @@ async function syncInternal({
       store
     });
     await contentLayer.sync();
+    if (!skip?.cleanup) {
+      contentLayer.dispose();
+    }
     settings.timer.end("Sync content layer");
   } else {
     const paths = getContentPaths(settings.config, fs);

package/dist/i18n/index.js

@@ -239,9 +239,9 @@ function redirectToFallback({
           newPathname = context.url.pathname.replace(`/${urlLocale}`, `/${pathFallbackLocale}`);
         }
         if (fallbackType === "rewrite") {
-          return await context.rewrite(newPathname);
+          return await context.rewrite(newPathname + context.url.search);
         } else {
-          return context.redirect(newPathname);
+          return context.redirect(newPathname + context.url.search);
         }
       }
     }

package/dist/runtime/server/render/component.js

@@ -209,12 +209,6 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     }
   } else {
     if (metadata.hydrate === "only") {
-      const rendererName = rendererAliases.has(metadata.hydrateArgs) ? rendererAliases.get(metadata.hydrateArgs) : metadata.hydrateArgs;
-      if (!clientOnlyValues.has(rendererName)) {
-        console.warn(
-          `The client:only directive for ${metadata.displayName} is not recognized. The renderer ${renderer.name} will be used. If you intended to use a different renderer, please provide a valid client:only directive.`
-        );
-      }
       html = await renderSlotToString(result, slots?.fallback);
     } else {
       const componentRenderStartTime = performance.now();

package/dist/types/public/config.d.ts

@@ -286,7 +286,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      * @type {string}
      * @default `"."` (current working directory)
      * @summary Set the project root. The project root is the directory where your Astro project (and all `src`, `public` and `package.json` files) live.
-     * @description  You should only provide this option if you run the `astro` CLI commands in a directory other than the project root directory. Usually, this option is provided via the CLI instead of the [Astro config file](https://docs.astro.build/en/guides/configuring-astro/#supported-config-file-types), since Astro needs to know your project root before it can locate your config file.
+     * @description  You should only provide this option if you run the `astro` CLI commands in a directory other than the project root directory. Usually, this option is provided via the CLI instead of the Astro config file, since Astro needs to know your project root before it can locate your config file.
      *
      * If you provide a relative path (ex: `--root: './my-project'`) Astro will resolve it against your current working directory.
      *
@@ -1852,7 +1852,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * For a complete overview, and to give feedback on this experimental API,
          * see the [Feature RFC](https://github.com/withastro/roadmap/pull/1035).
          */
-        svg?: {
+        svg?: boolean | {
             /**
              *
              * @name experimental.svg.mode
@@ -1872,7 +1872,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
              * <Logo size={24} mode="sprite" />
              * ```
              */
-            mode?: SvgRenderMode;
+            mode: SvgRenderMode;
         };
     };
 }

package/dist/vite-plugin-astro-server/route.js

@@ -114,8 +114,8 @@ async function handleRoute({
     method: incomingRequest.method,
     body,
     logger,
-    clientAddress: incomingRequest.socket.remoteAddress,
-    isPrerendered: route.prerender
+    isPrerendered: route.prerender,
+    routePattern: route.component
   });
   for (const [name, value] of Object.entries(config.server.headers ?? {})) {
     if (value) incomingResponse.setHeader(name, value);
@@ -127,7 +127,8 @@ async function handleRoute({
     pathname,
     middleware: isDefaultPrerendered404(matchedRoute.route) ? void 0 : middleware,
     request,
-    routeData: route
+    routeData: route,
+    clientAddress: incomingRequest.socket.remoteAddress
   });
   let response;
   let statusCode = 200;
@@ -180,7 +181,8 @@ async function handleRoute({
         pathname,
         middleware: isDefaultPrerendered404(fourOhFourRoute.route) ? void 0 : middleware,
         request,
-        routeData: fourOhFourRoute.route
+        routeData: fourOhFourRoute.route,
+        clientAddress: incomingRequest.socket.remoteAddress
       });
       response = await renderContext.render(fourOhFourRoute.preloadedComponent);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

package/templates/content/types.d.ts

@@ -92,7 +92,9 @@ declare module 'astro:content' {
 		collection: C,
 		id: E,
 	): E extends keyof DataEntryMap[C]
-		? Promise<DataEntryMap[C][E]>
+		? string extends keyof DataEntryMap[C]
+			? Promise<DataEntryMap[C][E]> | undefined
+			: Promise<DataEntryMap[C][E]>
 		: Promise<CollectionEntry<C> | undefined>;
 
 	/** Resolve an array of entry references from the same collection */