astro 5.16.5 → 6.0.0-alpha.1

package/dist/core/errors/dev/vite.js

@@ -2,9 +2,9 @@ import * as fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import { codeToHtml, createCssVariablesTheme } from "shiki";
 import { AstroError } from "../errors.js";
-import { FailedToLoadModuleSSR, InvalidGlob, MdxIntegrationMissingError } from "../errors-data.js";
+import { FailedToLoadModuleSSR, MdxIntegrationMissingError } from "../errors-data.js";
 import { createSafeError } from "../utils.js";
-import { getDocsForError, renderErrorMarkdown } from "./utils.js";
+import { getDocsForError, renderErrorMarkdown } from "./runtime.js";
 function enhanceViteSSRError({
   error,
   filePath,
@@ -47,23 +47,6 @@ function enhanceViteSSRError({
         stack: safeError.stack
       });
     }
-    if (safeError.message.includes("Invalid glob")) {
-      const globPattern = /glob: "(.+)" \(/.exec(safeError.message)?.[1];
-      if (globPattern) {
-        safeError.message = InvalidGlob.message(globPattern);
-        safeError.name = "InvalidGlob";
-        safeError.title = InvalidGlob.title;
-        const line = lns.findIndex((ln) => ln.includes(globPattern));
-        if (line !== -1) {
-          const column = lns[line]?.indexOf(globPattern);
-          safeError.loc = {
-            file: path,
-            line: line + 1,
-            column
-          };
-        }
-      }
-    }
   }
   return safeError;
 }

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

@@ -1,4 +1,4 @@
-import type { ZodError } from 'zod';
+import type { $ZodError } from 'zod/v4/core';
 export interface ErrorData {
     name: string;
     title: string;
@@ -282,8 +282,9 @@ export declare const GetStaticPathsExpectedParams: {
  * export async function getStaticPaths() {
  * 	return [
  * 		{ params: { id: '1' } } // Works
- * 		{ params: { id: 2 } } // Works
+ * 		{ params: { id: 2 } } // Does not work
  * 		{ params: { id: false } } // Does not work
+ * 		{ params: { id: [1, 2] } } // Does not work
  * 	];
  * }
  * ---
@@ -295,8 +296,8 @@ export declare const GetStaticPathsExpectedParams: {
  * ---
  * export async function getStaticPaths() {
  * 	return [
- * 		{ params: { id: 1 } } // /route/1
- * 		{ params: { id: 2 } } // /route/2
+ * 		{ params: { id: '1' } } // /route/1
+ * 		{ params: { id: '2' } } // /route/2
  * 		{ params: { id: undefined } } // /route/
  * 	];
  * }
@@ -306,7 +307,7 @@ export declare const GetStaticPathsExpectedParams: {
 export declare const GetStaticPathsInvalidRouteParam: {
     name: string;
     title: string;
-    message: (key: string, value: any, valueType: any) => string;
+    message: (key: string, value: any, valueType: string) => string;
     hint: string;
 };
 /**
@@ -542,8 +543,8 @@ export declare const PrerenderDynamicEndpointPathCollide: {
 /**
  * @docs
  * @see
- * - [`getStaticPaths()`](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)
- * - [`params`](https://docs.astro.build/en/reference/api-reference/#params)
+ * - [Route Priority Order](https://docs.astro.build/en/guides/routing/#route-priority-order)
+ * - [`prerenderConflictBehavior`](https://docs.astro.build/en/reference/configuration-reference/#prerenderconflictbehavior)
  * @description
  * Two prerendered routes generate the same path, resulting in a collision.
  * A static path can only be generated by one route.
@@ -850,6 +851,7 @@ export declare const LocalImageUsedWrongly: {
  * - [Astro.glob](https://docs.astro.build/en/reference/api-reference/#astroglob)
  * @description
  * `Astro.glob()` can only be used in `.astro` files. You can use [`import.meta.glob()`](https://vite.dev/guide/features.html#glob-import) instead to achieve the same result.
+ * @deprecated This error was removed in Astro v6.0.0 along with the removal of `Astro.glob()`.
  */
 export declare const AstroGlobUsedOutside: {
     name: string;
@@ -863,6 +865,7 @@ export declare const AstroGlobUsedOutside: {
  * - [Astro.glob](https://docs.astro.build/en/reference/api-reference/#astroglob)
  * @description
  * `Astro.glob()` did not return any matching files. There might be a typo in the glob pattern.
+ * @deprecated This error was removed in Astro v6.0.0 along with the removal of `Astro.glob()`.
  */
 export declare const AstroGlobNoMatch: {
     name: string;
@@ -965,6 +968,7 @@ export declare const FailedToLoadModuleSSR: {
  * - [Glob Patterns](https://docs.astro.build/en/guides/imports/#glob-patterns)
  * @description
  * Astro encountered an invalid glob pattern. This is often caused by the glob pattern not being a valid file path.
+ * @deprecated This error was removed in Astro v6.0.0 along with the removal of `Astro.glob()`.
  */
 export declare const InvalidGlob: {
     name: string;
@@ -1039,6 +1043,16 @@ export declare const MissingMiddlewareForInternationalization: {
     title: string;
     message: string;
 };
+/**
+ * @docs
+ * @description
+ * An invalid i18n middleware configuration  was detected.
+ */
+export declare const InvalidI18nMiddlewareConfiguration: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @description
@@ -1252,13 +1266,25 @@ export declare const FontFamilyNotFound: {
  * @description
  * The CSP feature isn't enabled
  * @message
- * The `experimental.csp` configuration isn't enabled.
+ * The `security.csp` configuration isn't enabled.
  */
 export declare const CspNotEnabled: {
     name: string;
     title: string;
     message: string;
 };
+/**
+ * @docs
+ * @description
+ * Unavailable Astro global in getStaticPaths
+ * @message
+ * The Astro global is not available in getStaticPaths().
+ */
+export declare const UnavailableAstroGlobal: {
+    name: string;
+    title: string;
+    message: (name: string) => string;
+};
 /**
  * @docs
  * @kind heading
@@ -1441,7 +1467,7 @@ export declare const RenderUndefinedEntryError: {
 /**
  * @docs
  * @description
- * The `getDataEntryById` and `getEntryBySlug` functions are deprecated and cannot be used with content layer collections. Use the `getEntry` function instead.
+ * The `getDataEntryById` and `getEntryBySlug` functions are deprecated and cannot be used with content collections. Use the `getEntry` function instead.
  */
 export declare const GetEntryDeprecationError: {
     name: string;
@@ -1461,18 +1487,19 @@ export declare const GetEntryDeprecationError: {
  * Make sure that all required fields are present, and that all fields are of the correct type.
  * You can check against the collection schema in your `src/content.config.*` file.
  * See the [Content collections documentation](https://docs.astro.build/en/guides/content-collections/) for more information.
+ * @deprecated This error only applies to legacy content collections which were removed in Astro 6.
  */
 export declare const InvalidContentEntryFrontmatterError: {
     name: string;
     title: string;
-    message(collection: string, entryId: string, error: ZodError): string;
+    message(collection: string, entryId: string, error: $ZodError): string;
     hint: string;
 };
 /**
  * @docs
  * @message
  * **Example error message:**<br/>
- * **blog** → **post** frontmatter does not match collection schema.<br/>
+ * **blog** → **post** data does not match collection schema.<br/>
  * "title" is required.<br/>
  * "date" must be a valid date.
  * @description
@@ -1484,7 +1511,52 @@ export declare const InvalidContentEntryFrontmatterError: {
 export declare const InvalidContentEntryDataError: {
     name: string;
     title: string;
-    message(collection: string, entryId: string, error: ZodError): string;
+    message(collection: string, entryId: string, error: $ZodError): string;
+    hint: string;
+};
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * Found legacy content config file in "src/content/config.ts". Please move this file to "src/content.config.ts" and ensure each collection has a loader defined.<br/>
+ * @description
+ * A legacy content config file was found. Move the file to `src/content.config.ts` and update any collection definitions if needed.
+ * See the [Astro 6 migration guide](https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections) for more information.
+ */
+export declare const LegacyContentConfigError: {
+    name: string;
+    title: string;
+    message: (filename: string) => string;
+    hint: string;
+};
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * Collections must have a `loader` defined. Check your collection definitions in your content config file.<br/>
+ * @description
+ * A content collection is missing a `loader` definition. Make sure that each collection in your content config file has a `loader`.
+ * See the [Content collections documentation](https://docs.astro.build/en/guides/content-collections/) for more information.
+ */
+export declare const ContentCollectionMissingLoader: {
+    name: string;
+    title: string;
+    message: (file?: any) => string;
+    hint: string;
+};
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * Invalid collection type "data". Remove the type from your collection definition in your content config file.
+ * @description
+ * Content collections should no longer have a `type` field. Remove this field from your content config file.
+ * See the [Astro 6 migration guide](https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections) for more information.
+ */
+export declare const ContentCollectionInvalidType: {
+    name: string;
+    title: string;
+    message: (type: string, file?: any) => string;
     hint: string;
 };
 /**
@@ -1523,7 +1595,7 @@ export declare const ContentLoaderReturnsInvalidId: {
 export declare const ContentEntryDataError: {
     name: string;
     title: string;
-    message(collection: string, entryId: string, error: ZodError): string;
+    message(collection: string, entryId: string, error: $ZodError): string;
     hint: string;
 };
 /**
@@ -1774,50 +1846,6 @@ export declare const SessionStorageSaveError: {
     message: (error: string, driver?: string) => string;
     hint: string;
 };
-/**
- * @docs
- * @see
- * 	- [Sessions](https://docs.astro.build/en/guides/sessions/)
- * @deprecated This error was removed in Astro 5.7, when the Sessions feature stopped being experimental.
- * @description
- * Your adapter must support server output to use sessions.
- */
-export declare const SessionWithoutSupportedAdapterOutputError: {
-    name: string;
-    title: string;
-    message: string;
-    hint: string;
-};
-/**
- * @docs
- * @message The `experimental.session` flag was set to `true`, but no storage was configured. Either configure the storage manually or use an adapter that provides session storage.
- * @deprecated This error was removed in Astro 5.7, when the Sessions feature stopped being experimental.
- * @see
- * 	- [Sessions](https://docs.astro.build/en/guides/sessions/)
- * @description
- * Thrown when session storage is enabled but not configured.
- */
-export declare const SessionConfigMissingError: {
-    name: string;
-    title: string;
-    message: string;
-    hint: string;
-};
-/**
- * @docs
- * @message Session config was provided without enabling the `experimental.session` flag
- * @deprecated This error was removed in Astro 5.7, when the Sessions feature stopped being experimental.
- * @see
- * 	- [Sessions](https://docs.astro.build/en/guides/sessions/)
- * @description
- * Thrown when session storage is configured but the `experimental.session` flag is not enabled.
- */
-export declare const SessionConfigWithoutFlagError: {
-    name: string;
-    title: string;
-    message: string;
-    hint: string;
-};
 /**
  * @docs
  * @message An error occurred while optimizing the SVG file with SVGO.

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

@@ -85,8 +85,8 @@ const GetStaticPathsExpectedParams = {
 };
 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}\`)`,
+  title: "Invalid route parameter returned by `getStaticPaths()`.",
+  message: (key, value, valueType) => `Invalid \`getStaticPaths()\` route parameter for \`${key}\`. Expected a string or undefined, received \`${valueType}\` (\`${value}\`)`,
   hint: "See https://docs.astro.build/en/reference/routing-reference/#getstaticpaths for more information on getStaticPaths."
 };
 const GetStaticPathsRequired = {
@@ -372,6 +372,11 @@ const MissingMiddlewareForInternationalization = {
   title: "Enabled manual internationalization routing without having a middleware.",
   message: "Your configuration setting `i18n.routing: 'manual'` requires you to provide your own i18n `middleware` file."
 };
+const InvalidI18nMiddlewareConfiguration = {
+  name: "InvalidI18nMiddlewareConfiguration",
+  title: "Invalid internationalization middleware configuration",
+  message: "The option `redirectToDefaultLocale` can be enabled only when `prefixDefaultLocale` is also set to `true`, otherwise redirects might cause infinite loops. Enable the option `prefixDefaultLocale` to continue to use `redirectToDefaultLocale`, or ensure both are set to `false`."
+};
 const CantRenderPage = {
   name: "CantRenderPage",
   title: "Astro can't render the route.",
@@ -473,7 +478,12 @@ const FontFamilyNotFound = {
 const CspNotEnabled = {
   name: "CspNotEnabled",
   title: "CSP feature isn't enabled",
-  message: "The `experimental.csp` configuration isn't enabled."
+  message: "The `security.csp` configuration isn't enabled."
+};
+const UnavailableAstroGlobal = {
+  name: "UnavailableAstroGlobal",
+  title: "Unavailable Astro global in getStaticPaths()",
+  message: (name) => `The Astro global is not available in this scope. Please remove "Astro.${name}" from your getStaticPaths() function.`
 };
 const UnknownCSSError = {
   name: "UnknownCSSError",
@@ -541,7 +551,7 @@ const GetEntryDeprecationError = {
   name: "GetEntryDeprecationError",
   title: "Invalid use of `getDataEntryById` or `getEntryBySlug` function.",
   message: (collection, method) => `The \`${method}\` function is deprecated and cannot be used to query the "${collection}" collection. Use \`getEntry\` instead.`,
-  hint: "Use the `getEntry` or `getCollection` functions to query content layer collections."
+  hint: "See https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information."
 };
 const InvalidContentEntryFrontmatterError = {
   name: "InvalidContentEntryFrontmatterError",
@@ -551,7 +561,7 @@ const InvalidContentEntryFrontmatterError = {
       `**${String(collection)} \u2192 ${String(
         entryId
       )}** frontmatter does not match collection schema.`,
-      ...error.errors.map((zodError) => zodError.message)
+      error.message
     ].join("\n");
   },
   hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas."
@@ -563,12 +573,30 @@ const InvalidContentEntryDataError = {
     return [
       `**${String(collection)} \u2192 ${String(entryId)}** data does not match collection schema.
 `,
-      ...error.errors.map((zodError) => `  **${zodError.path.join(".")}**: ${zodError.message}`),
+      `  **: ${error.message}`,
       ""
     ].join("\n");
   },
   hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas."
 };
+const LegacyContentConfigError = {
+  name: "LegacyContentConfigError",
+  title: "Legacy content config file found.",
+  message: (filename) => `Found legacy content config file in "${filename}". Please move this file to "src/content.config.${filename.split(".").at(-1)}" and ensure each collection has a loader defined.`,
+  hint: "See https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on updating collections."
+};
+const ContentCollectionMissingLoader = {
+  name: "ContentCollectionMissingLoader",
+  title: "Content collection is missing a `loader` definition.",
+  message: (file = "your content config file") => `Collections must have a \`loader\` defined. Check your collection definitions in ${file}.`,
+  hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content loaders and https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on migrating from legacy collections."
+};
+const ContentCollectionInvalidType = {
+  name: "ContentCollectionInvalidType",
+  title: "Content collection has an invalid `type` field.",
+  message: (type, file = "your content config file") => `Invalid collection type "${type}". Remove the type from your collection definition in ${file}.`,
+  hint: "See https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on migrating from legacy collections."
+};
 const ContentLoaderReturnsInvalidId = {
   name: "ContentLoaderReturnsInvalidId",
   title: "Content loader returned an entry with an invalid `id`.",
@@ -587,7 +615,7 @@ const ContentEntryDataError = {
     return [
       `**${String(collection)} \u2192 ${String(entryId)}** data does not match collection schema.
 `,
-      ...error.errors.map((zodError) => `  **${zodError.path.join(".")}**: ${zodError.message}`),
+      `  **: ${error.message}`,
       ""
     ].join("\n");
   },
@@ -714,24 +742,6 @@ const SessionStorageSaveError = {
   message: (error, driver) => `Error when saving session data${driver ? ` with driver \`${driver}\`` : ""}. \`${error ?? ""}\``,
   hint: "For more information, see https://docs.astro.build/en/guides/sessions/"
 };
-const SessionWithoutSupportedAdapterOutputError = {
-  name: "SessionWithoutSupportedAdapterOutputError",
-  title: "Sessions cannot be used with an adapter that doesn't support server output.",
-  message: 'Sessions require an adapter that supports server output. The adapter must set `"server"` in the `buildOutput` adapter feature.',
-  hint: 'Ensure your adapter supports `buildOutput: "server"`: https://docs.astro.build/en/reference/adapter-reference/#building-an-adapter'
-};
-const SessionConfigMissingError = {
-  name: "SessionConfigMissingError",
-  title: "Session storage was enabled but not configured.",
-  message: "The `experimental.session` flag was set to `true`, but no storage was configured. Either configure the storage manually or use an adapter that provides session storage",
-  hint: "For more information, see https://docs.astro.build/en/guides/sessions/"
-};
-const SessionConfigWithoutFlagError = {
-  name: "SessionConfigWithoutFlagError",
-  title: "Session flag not set",
-  message: "Session config was provided without enabling the `experimental.session` flag",
-  hint: "For more information, see https://docs.astro.build/en/guides/sessions/"
-};
 const CannotOptimizeSvg = {
   name: "CannotOptimizeSvg",
   title: "Cannot optimize SVG",
@@ -758,6 +768,8 @@ export {
   ClientAddressNotAvailable,
   ConfigLegacyKey,
   ConfigNotFound,
+  ContentCollectionInvalidType,
+  ContentCollectionMissingLoader,
   ContentCollectionTypeMismatchError,
   ContentEntryDataError,
   ContentLoaderInvalidDataError,
@@ -799,8 +811,10 @@ export {
   InvalidGetStaticPathsEntry,
   InvalidGetStaticPathsReturn,
   InvalidGlob,
+  InvalidI18nMiddlewareConfiguration,
   InvalidImageService,
   InvalidPrerenderExport,
+  LegacyContentConfigError,
   LiveContentConfigError,
   LocalImageUsedWrongly,
   LocalsNotAnObject,
@@ -838,12 +852,10 @@ export {
   RewriteWithBodyUsed,
   RouteNotFound,
   ServerOnlyModule,
-  SessionConfigMissingError,
-  SessionConfigWithoutFlagError,
   SessionStorageInitError,
   SessionStorageSaveError,
-  SessionWithoutSupportedAdapterOutputError,
   StaticClientAddressNotAvailable,
+  UnavailableAstroGlobal,
   UnhandledRejection,
   UnknownCLIError,
   UnknownCSSError,

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

@@ -1,4 +1,4 @@
-import type { ZodError } from 'zod';
+import type { $ZodError } from 'zod/v4/core';
 interface ErrorProperties {
     title?: string;
     name: string;
@@ -58,11 +58,11 @@ export declare class AggregateError extends AstroError {
  * Check if an error is a ZodError from an AstroConfig validation.
  * Used to suppress formatting a ZodError if needed.
  */
-export declare function isAstroConfigZodError(error: unknown): error is ZodError;
+export declare function isAstroConfigZodError(error: unknown): error is $ZodError;
 /**
  * Track that a ZodError comes from an AstroConfig validation.
  */
-export declare function trackAstroConfigZodError(error: ZodError): void;
+export declare function trackAstroConfigZodError(error: $ZodError): void;
 /**
  * Generic object representing an error with all possible data
  * Compatible with both Astro's and Vite's errors

package/dist/core/errors/errors.js

@@ -1,6 +1,6 @@
 import { codeFrame } from "./printer.js";
 function isAstroError(e) {
-  return e instanceof AstroError || AstroError.is(e);
+  return e != null && (e instanceof AstroError || AstroError.is(e));
 }
 class AstroError extends Error {
   loc;

package/dist/core/errors/overlay.js

@@ -754,7 +754,7 @@ function getOverlayCode() {
 	`;
 }
 function patchOverlay(code) {
-  return code.replace("class ErrorOverlay", getOverlayCode() + "\nclass ViteErrorOverlay");
+  return code.replace("var ErrorOverlay", getOverlayCode() + "\nvar ViteErrorOverlay");
 }
 export {
   patchOverlay

package/dist/core/errors/zod-error-map.d.ts

@@ -1,2 +1,2 @@
-import type { ZodErrorMap } from 'zod';
-export declare const errorMap: ZodErrorMap;
+import type { $ZodErrorMap } from 'zod/v4/core';
+export declare const errorMap: $ZodErrorMap;

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

@@ -1,9 +1,9 @@
-const errorMap = (baseError, ctx) => {
-  const baseErrorPath = flattenErrorPath(baseError.path);
-  if (baseError.code === "invalid_union") {
+const errorMap = (issue) => {
+  const baseErrorPath = flattenErrorPath(issue.path ?? []);
+  if (issue.code === "invalid_union") {
     let typeOrLiteralErrByPath = /* @__PURE__ */ new Map();
-    for (const unionError of baseError.unionErrors.map((e) => e.errors).flat()) {
-      if (unionError.code === "invalid_type" || unionError.code === "invalid_literal") {
+    for (const unionError of issue.errors.flat()) {
+      if (unionError.code === "invalid_type") {
         const flattenedErrorPath = flattenErrorPath(unionError.path);
         if (typeOrLiteralErrByPath.has(flattenedErrorPath)) {
           typeOrLiteralErrByPath.get(flattenedErrorPath).expected.push(unionError.expected);
@@ -17,7 +17,7 @@ const errorMap = (baseError, ctx) => {
       }
     }
     const messages = [prefix(baseErrorPath, "Did not match union.")];
-    const details = [...typeOrLiteralErrByPath.entries()].filter(([, error]) => error.expected.length === baseError.unionErrors.length).map(
+    const details = [...typeOrLiteralErrByPath.entries()].filter(([, error]) => error.expected.length === issue.errors.flat().length).map(
       ([key, error]) => key === baseErrorPath ? (
         // Avoid printing the key again if it's a base error
         `> ${getTypeOrLiteralMsg(error)}`
@@ -25,50 +25,52 @@ const errorMap = (baseError, ctx) => {
     );
     if (details.length === 0) {
       const expectedShapes = [];
-      for (const unionError of baseError.unionErrors) {
+      for (const unionErrors of issue.errors) {
         const expectedShape = [];
-        for (const issue of unionError.issues) {
-          if (issue.code === "invalid_union") {
-            return errorMap(issue, ctx);
+        for (const _issue of unionErrors) {
+          if (_issue.code === "invalid_union") {
+            return errorMap(_issue);
           }
-          const relativePath = flattenErrorPath(issue.path).replace(baseErrorPath, "").replace(leadingPeriod, "");
-          if ("expected" in issue && typeof issue.expected === "string") {
+          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
+              relativePath ? `${relativePath}: ${_issue.expected}` : _issue.expected
             );
-          } else {
+          } else if ("values" in _issue) {
+            expectedShape.push(
+              ..._issue.values.filter((v) => typeof v === "string").map((v) => `"${v}"`)
+            );
+          } else if (relativePath) {
             expectedShape.push(relativePath);
           }
         }
         if (expectedShape.length === 1 && !expectedShape[0]?.includes(":")) {
           expectedShapes.push(expectedShape.join(""));
-        } else {
+        } else if (expectedShape.length > 0) {
           expectedShapes.push(`{ ${expectedShape.join("; ")} }`);
         }
       }
       if (expectedShapes.length) {
         details.push("> Expected type `" + expectedShapes.join(" | ") + "`");
-        details.push("> Received `" + stringify(ctx.data) + "`");
+        details.push("> Received `" + stringify(issue.input) + "`");
       }
     }
     return {
       message: messages.concat(details).join("\n")
     };
-  } else if (baseError.code === "invalid_literal" || baseError.code === "invalid_type") {
+  } else if (issue.code === "invalid_type") {
     return {
       message: prefix(
         baseErrorPath,
         getTypeOrLiteralMsg({
-          code: baseError.code,
-          received: baseError.received,
-          expected: [baseError.expected]
+          code: issue.code,
+          received: typeof issue.input,
+          expected: [issue.expected]
         })
       )
     };
-  } else if (baseError.message) {
-    return { message: prefix(baseErrorPath, baseError.message) };
-  } else {
-    return { message: prefix(baseErrorPath, ctx.defaultError) };
+  } else if (issue.message) {
+    return { message: prefix(baseErrorPath, issue.message) };
   }
 };
 const getTypeOrLiteralMsg = (error) => {

package/dist/core/messages.d.ts

@@ -1,5 +1,5 @@
 import type { ResolvedServerUrls } from 'vite';
-import type { ZodError } from 'zod';
+import type { $ZodError } from 'zod/v4/core';
 import { type ErrorWithMetadata } from './errors/index.js';
 /**
  * Prestyled messages for the CLI. Used by astro CLI commands.
@@ -45,7 +45,7 @@ export declare function prerelease({ currentVersion }: {
 export declare function success(message: string, tip?: string): string;
 export declare function actionRequired(message: string): string;
 export declare function cancelled(message: string, tip?: string): string;
-export declare function formatConfigErrorMessage(err: ZodError): string;
+export declare function formatConfigErrorMessage(err: $ZodError): string;
 export declare function formatErrorMessage(err: ErrorWithMetadata, showFullStacktrace: boolean): string;
 /** @deprecated Migrate to HelpDisplay */
 export declare function printHelp({ commandName, headline, usage, tables, description, }: {

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.16.5";
+  const version = "6.0.0-alpha.1";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -275,7 +275,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.16.5"}`
+        `v${"6.0.0-alpha.1"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/callMiddleware.js

@@ -7,7 +7,7 @@ async function callMiddleware(onRequest, apiContext, responseFunction) {
     responseFunctionPromise = responseFunction(apiContext, payload);
     return responseFunctionPromise;
   };
-  let middlewarePromise = onRequest(apiContext, next);
+  const middlewarePromise = onRequest(apiContext, next);
   return await Promise.resolve(middlewarePromise).then(async (value) => {
     if (nextCalled) {
       if (typeof value !== "undefined") {

package/dist/core/middleware/defineMiddleware.d.ts

@@ -0,0 +1,2 @@
+import type { MiddlewareHandler } from '../../types/public/common.js';
+export declare function defineMiddleware(fn: MiddlewareHandler): MiddlewareHandler;

package/dist/core/middleware/defineMiddleware.js

@@ -0,0 +1,6 @@
+function defineMiddleware(fn) {
+  return fn;
+}
+export {
+  defineMiddleware
+};