astro 4.4.0 → 4.4.2

package/dist/core/config/schema.d.ts

@@ -7,7 +7,6 @@ import { z } from 'zod';
 import 'mdast-util-to-hast';
 import 'shikiji-core';
 type ShikiTheme = NonNullable<ShikiConfig['theme']>;
-export type RoutingStrategies = 'pathname-prefix-always' | 'pathname-prefix-other-locales' | 'pathname-prefix-always-no-redirect' | 'domains-prefix-always' | 'domains-prefix-other-locales' | 'domains-prefix-always-no-redirect';
 export declare const AstroConfigSchema: z.ZodObject<{
     root: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     srcDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
@@ -238,7 +237,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         smartypants?: boolean | undefined;
     }>>;
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
-    i18n: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+    i18n: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
         defaultLocale: z.ZodString;
         locales: z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
             path: z.ZodString;
@@ -300,34 +299,16 @@ export declare const AstroConfigSchema: z.ZodObject<{
             strategy?: "pathname" | undefined;
         } | undefined;
     }>>, {
-        routing: RoutingStrategies;
-        defaultLocale: string;
-        locales: (string | {
-            path: string;
-            codes: [string, ...string[]];
-        })[];
-        domains?: Record<string, string> | undefined;
-        fallback?: Record<string, string> | undefined;
-    } | undefined, {
-        defaultLocale: string;
-        locales: (string | {
-            path: string;
-            codes: [string, ...string[]];
-        })[];
-        domains?: Record<string, string> | undefined;
-        fallback?: Record<string, string> | undefined;
-        routing?: {
-            prefixDefaultLocale?: boolean | undefined;
-            redirectToDefaultLocale?: boolean | undefined;
-            strategy?: "pathname" | undefined;
-        } | undefined;
-    } | undefined>, {
-        routing: RoutingStrategies;
         defaultLocale: string;
         locales: (string | {
             path: string;
             codes: [string, ...string[]];
         })[];
+        routing: {
+            prefixDefaultLocale: boolean;
+            redirectToDefaultLocale: boolean;
+            strategy: "pathname";
+        };
         domains?: Record<string, string> | undefined;
         fallback?: Record<string, string> | undefined;
     } | undefined, {
@@ -455,12 +436,16 @@ export declare const AstroConfigSchema: z.ZodObject<{
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
     } | undefined;
     i18n?: {
-        routing: RoutingStrategies;
         defaultLocale: string;
         locales: (string | {
             path: string;
             codes: [string, ...string[]];
         })[];
+        routing: {
+            prefixDefaultLocale: boolean;
+            redirectToDefaultLocale: boolean;
+            strategy: "pathname";
+        };
         domains?: Record<string, string> | undefined;
         fallback?: Record<string, string> | undefined;
     } | undefined;
@@ -733,7 +718,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         smartypants?: boolean | undefined;
     }>>;
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
-    i18n: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+    i18n: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
         defaultLocale: z.ZodString;
         locales: z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
             path: z.ZodString;
@@ -795,34 +780,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             strategy?: "pathname" | undefined;
         } | undefined;
     }>>, {
-        routing: RoutingStrategies;
-        defaultLocale: string;
-        locales: (string | {
-            path: string;
-            codes: [string, ...string[]];
-        })[];
-        domains?: Record<string, string> | undefined;
-        fallback?: Record<string, string> | undefined;
-    } | undefined, {
-        defaultLocale: string;
-        locales: (string | {
-            path: string;
-            codes: [string, ...string[]];
-        })[];
-        domains?: Record<string, string> | undefined;
-        fallback?: Record<string, string> | undefined;
-        routing?: {
-            prefixDefaultLocale?: boolean | undefined;
-            redirectToDefaultLocale?: boolean | undefined;
-            strategy?: "pathname" | undefined;
-        } | undefined;
-    } | undefined>, {
-        routing: RoutingStrategies;
         defaultLocale: string;
         locales: (string | {
             path: string;
             codes: [string, ...string[]];
         })[];
+        routing: {
+            prefixDefaultLocale: boolean;
+            redirectToDefaultLocale: boolean;
+            strategy: "pathname";
+        };
         domains?: Record<string, string> | undefined;
         fallback?: Record<string, string> | undefined;
     } | undefined, {
@@ -1010,12 +977,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
     } | undefined;
     i18n?: {
-        routing: RoutingStrategies;
         defaultLocale: string;
         locales: (string | {
             path: string;
             codes: [string, ...string[]];
         })[];
+        routing: {
+            prefixDefaultLocale: boolean;
+            redirectToDefaultLocale: boolean;
+            strategy: "pathname";
+        };
         domains?: Record<string, string> | undefined;
         fallback?: Record<string, string> | undefined;
     } | undefined;
@@ -1203,12 +1174,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
     } | undefined;
     i18n?: {
-        routing: RoutingStrategies;
         defaultLocale: string;
         locales: (string | {
             path: string;
             codes: [string, ...string[]];
         })[];
+        routing: {
+            prefixDefaultLocale: boolean;
+            redirectToDefaultLocale: boolean;
+            strategy: "pathname";
+        };
         domains?: Record<string, string> | undefined;
         fallback?: Record<string, string> | undefined;
     } | undefined;
@@ -1396,12 +1371,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
     } | undefined;
     i18n?: {
-        routing: RoutingStrategies;
         defaultLocale: string;
         locales: (string | {
             path: string;
             codes: [string, ...string[]];
         })[];
+        routing: {
+            prefixDefaultLocale: boolean;
+            redirectToDefaultLocale: boolean;
+            strategy: "pathname";
+        };
         domains?: Record<string, string> | undefined;
         fallback?: Record<string, string> | undefined;
     } | undefined;
@@ -1589,12 +1568,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
     } | undefined;
     i18n?: {
-        routing: RoutingStrategies;
         defaultLocale: string;
         locales: (string | {
             path: string;
             codes: [string, ...string[]];
         })[];
+        routing: {
+            prefixDefaultLocale: boolean;
+            redirectToDefaultLocale: boolean;
+            strategy: "pathname";
+        };
         domains?: Record<string, string> | undefined;
         fallback?: Record<string, string> | undefined;
     } | undefined;

package/dist/core/config/schema.js

@@ -217,36 +217,7 @@ const AstroConfigSchema = z.object({
           message: "The option `i18n.redirectToDefaultLocale` is only useful when the `i18n.prefixDefaultLocale` is set to `true`. Remove the option `i18n.redirectToDefaultLocale`, or change its value to `true`."
         }
       )
-    }).optional().transform((i18n) => {
-      if (i18n) {
-        let { routing, domains } = i18n;
-        let strategy;
-        const hasDomains = domains ? Object.keys(domains).length > 0 : false;
-        if (!hasDomains) {
-          if (routing.prefixDefaultLocale === true) {
-            if (routing.redirectToDefaultLocale) {
-              strategy = "pathname-prefix-always";
-            } else {
-              strategy = "pathname-prefix-always-no-redirect";
-            }
-          } else {
-            strategy = "pathname-prefix-other-locales";
-          }
-        } else {
-          if (routing.prefixDefaultLocale === true) {
-            if (routing.redirectToDefaultLocale) {
-              strategy = "domains-prefix-always";
-            } else {
-              strategy = "domains-prefix-always-no-redirect";
-            }
-          } else {
-            strategy = "domains-prefix-other-locales";
-          }
-        }
-        return { ...i18n, routing: strategy };
-      }
-      return void 0;
-    }).superRefine((i18n, ctx) => {
+    }).optional().superRefine((i18n, ctx) => {
       if (i18n) {
         const { defaultLocale, locales: _locales, fallback, domains, routing } = i18n;
         const locales = _locales.map((locale) => {
@@ -286,15 +257,14 @@ const AstroConfigSchema = z.object({
         }
         if (domains) {
           const entries = Object.entries(domains);
-          if (entries.length > 0) {
-            if (routing !== "domains-prefix-other-locales" && routing !== "domains-prefix-always-no-redirect" && routing !== "domains-prefix-always") {
-              ctx.addIssue({
-                code: z.ZodIssueCode.custom,
-                message: `When specifying some domains, the property \`i18n.routingStrategy\` must be set to \`"domains"\`.`
-              });
-            }
+          const hasDomains = domains ? Object.keys(domains).length > 0 : false;
+          if (entries.length > 0 && !hasDomains) {
+            ctx.addIssue({
+              code: z.ZodIssueCode.custom,
+              message: `When specifying some domains, the property \`i18n.routingStrategy\` must be set to \`"domains"\`.`
+            });
           }
-          for (const [domainKey, domainValue] of Object.entries(domains)) {
+          for (const [domainKey, domainValue] of entries) {
             if (!locales.includes(domainKey)) {
               ctx.addIssue({
                 code: z.ZodIssueCode.custom,
@@ -394,7 +364,8 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
   }).superRefine((configuration, ctx) => {
     const { site, experimental, i18n, output } = configuration;
     if (experimental.i18nDomains) {
-      if (i18n?.routing === "domains-prefix-other-locales" || i18n?.routing === "domains-prefix-always-no-redirect" || i18n?.routing === "domains-prefix-always") {
+      const hasDomains = i18n?.domains ? Object.keys(i18n.domains).length > 0 : false;
+      if (hasDomains) {
         if (!site) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,

package/dist/core/constants.d.ts

@@ -1,4 +1,13 @@
 export declare const ASTRO_VERSION: string;
+export declare const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
+export declare const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
+/**
+ * A response with one of these status codes will be rewritten
+ * with the result of rendering the respective error page.
+ */
+export declare const REROUTABLE_STATUS_CODES: number[];
+export declare const clientAddressSymbol: unique symbol;
+export declare const clientLocalsSymbol: unique symbol;
+export declare const responseSentSymbol: unique symbol;
 export declare const SUPPORTED_MARKDOWN_FILE_EXTENSIONS: readonly [".markdown", ".mdown", ".mkdn", ".mkd", ".mdwn", ".md"];
 export declare const MIDDLEWARE_PATH_SEGMENT_NAME = "middleware";
-export declare const ROUTE_DATA_SYMBOL = "astro.routeData";

package/dist/core/constants.js

@@ -1,4 +1,10 @@
-const ASTRO_VERSION = "4.4.0";
+const ASTRO_VERSION = "4.4.2";
+const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
+const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
+const REROUTABLE_STATUS_CODES = [404, 500];
+const clientAddressSymbol = Symbol.for("astro.clientAddress");
+const clientLocalsSymbol = Symbol.for("astro.locals");
+const responseSentSymbol = Symbol.for("astro.responseSent");
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",
@@ -8,10 +14,14 @@ const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".md"
 ];
 const MIDDLEWARE_PATH_SEGMENT_NAME = "middleware";
-const ROUTE_DATA_SYMBOL = "astro.routeData";
 export {
   ASTRO_VERSION,
   MIDDLEWARE_PATH_SEGMENT_NAME,
-  ROUTE_DATA_SYMBOL,
-  SUPPORTED_MARKDOWN_FILE_EXTENSIONS
+  REROUTABLE_STATUS_CODES,
+  REROUTE_DIRECTIVE_HEADER,
+  ROUTE_TYPE_HEADER,
+  SUPPORTED_MARKDOWN_FILE_EXTENSIONS,
+  clientAddressSymbol,
+  clientLocalsSymbol,
+  responseSentSymbol
 };

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.4.0";
+  const currentVersion = "4.4.2";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/dev/restart.js

@@ -54,7 +54,7 @@ async function restartContainer(container) {
         formatErrorMessage(collectErrorMetadata(error), logger.level() === "debug") + "\n"
       );
     }
-    container.viteServer.ws.send({
+    container.viteServer.hot.send({
       type: "error",
       err: {
         message: error.message,

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

@@ -1,6 +1,6 @@
-import type { APIContext, EndpointHandler, Locales, MiddlewareHandler, Params } from '../../@types/astro.js';
-import { type Environment, type RenderContext } from '../render/index.js';
-import type { RoutingStrategies } from '../config/schema.js';
+import type { APIContext, Locales, Params } from '../../@types/astro.js';
+import type { AstroCookies } from '../cookies/index.js';
+import { type RoutingStrategies } from '../../i18n/utils.js';
 type CreateAPIContext = {
     request: Request;
     params: Params;
@@ -10,12 +10,13 @@ type CreateAPIContext = {
     locales: Locales | undefined;
     routingStrategy: RoutingStrategies | undefined;
     defaultLocale: string | undefined;
+    route: string;
+    cookies: AstroCookies;
 };
 /**
  * Creates a context that holds all the information needed to handle an Astro endpoint.
  *
  * @param {CreateAPIContext} payload
  */
-export declare function createAPIContext({ request, params, site, props, adapterName, locales, routingStrategy, defaultLocale, }: CreateAPIContext): APIContext;
-export declare function callEndpoint(mod: EndpointHandler, env: Environment, ctx: RenderContext, onRequest: MiddlewareHandler | undefined): Promise<Response>;
+export declare function createAPIContext({ request, params, site, props, adapterName, locales, routingStrategy, defaultLocale, route, cookies, }: CreateAPIContext): APIContext;
 export {};

package/dist/core/endpoint/index.js

@@ -1,16 +1,10 @@
-import { renderEndpoint } from "../../runtime/server/index.js";
-import { ASTRO_VERSION } from "../constants.js";
-import { AstroCookies, attachCookiesToResponse } from "../cookies/index.js";
+import { ASTRO_VERSION, clientAddressSymbol, clientLocalsSymbol } from "../constants.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
-import { callMiddleware } from "../middleware/callMiddleware.js";
 import {
   computeCurrentLocale,
   computePreferredLocale,
   computePreferredLocaleList
-} from "../render/context.js";
-import {} from "../render/index.js";
-const clientAddressSymbol = Symbol.for("astro.clientAddress");
-const clientLocalsSymbol = Symbol.for("astro.locals");
+} from "../../i18n/utils.js";
 function createAPIContext({
   request,
   params,
@@ -19,13 +13,15 @@ function createAPIContext({
   adapterName,
   locales,
   routingStrategy,
-  defaultLocale
+  defaultLocale,
+  route,
+  cookies
 }) {
   let preferredLocale = void 0;
   let preferredLocaleList = void 0;
   let currentLocale = void 0;
   const context = {
-    cookies: new AstroCookies(request),
+    cookies,
     request,
     params,
     site: site ? new URL(site) : void 0,
@@ -64,7 +60,7 @@ function createAPIContext({
         return currentLocale;
       }
       if (locales) {
-        currentLocale = computeCurrentLocale(request, locales, routingStrategy, defaultLocale);
+        currentLocale = computeCurrentLocale(route, locales, routingStrategy, defaultLocale);
       }
       return currentLocale;
     },
@@ -104,29 +100,6 @@ function createAPIContext({
   };
   return context;
 }
-async function callEndpoint(mod, env, ctx, onRequest) {
-  const context = createAPIContext({
-    request: ctx.request,
-    params: ctx.params,
-    props: ctx.props,
-    site: env.site,
-    adapterName: env.adapterName,
-    routingStrategy: ctx.routing,
-    defaultLocale: ctx.defaultLocale,
-    locales: ctx.locales
-  });
-  let response;
-  if (onRequest) {
-    response = await callMiddleware(onRequest, context, async () => {
-      return await renderEndpoint(mod, context, env.ssr, env.logger);
-    });
-  } else {
-    response = await renderEndpoint(mod, context, env.ssr, env.logger);
-  }
-  attachCookiesToResponse(response, context.cookies);
-  return response;
-}
 export {
-  callEndpoint,
   createAPIContext
 };

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

@@ -458,7 +458,7 @@ export declare const InvalidImageService: {
  * - [Images](https://docs.astro.build/en/guides/images/)
  * - [Image component#width-and-height-required](https://docs.astro.build/en/guides/images/#width-and-height-required-for-images-in-public)
  * @description
- * For remote images, `width` and `height` cannot automatically be inferred from the original file. To avoid cumulative layout shift (CLS), either specify these two properties, or set [inferSize`](https://docs.astro.build/en/guides/images/#infersize) to `true` to fetch a remote image's original dimensions.
+ * For remote images, `width` and `height` cannot automatically be inferred from the original file. To avoid cumulative layout shift (CLS), either specify these two properties, or set [`inferSize`](https://docs.astro.build/en/guides/images/#infersize) to `true` to fetch a remote image's original dimensions.
  *
  * If your image is inside your `src` folder, you probably meant to import it instead. See [the Imports guide for more information](https://docs.astro.build/en/guides/imports/#other-assets).
  */
@@ -473,7 +473,7 @@ export declare const MissingImageDimension: {
  * @message
  * Failed to get the dimensions for `IMAGE_URL`.
  * @description
- * Determining the remote image's dimensions failed. This is typically caused by an incorrect URL or attempting to infer the size of an image in the public folder which is not possible. Here is where the probing logic lives in Astro's [sourcecode](https://github.com/withastro/astro/blob/main/packages/astro/src/assets/utils/image-size/).
+ * Determining the remote image's dimensions failed. This is typically caused by an incorrect URL or attempting to infer the size of an image in the public folder which is not possible.
  */
 export declare const FailedToFetchRemoteImageDimensions: {
     name: string;
@@ -776,7 +776,7 @@ export declare const LocalImageUsedWrongly: {
  * @see
  * - [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://vitejs.dev/guide/features.html#glob-import) instead to acheive the same result.
+ * `Astro.glob()` can only be used in `.astro` files. You can use [`import.meta.glob()`](https://vitejs.dev/guide/features.html#glob-import) instead to achieve the same result.
  */
 export declare const AstroGlobUsedOutside: {
     name: string;

package/dist/core/messages.js

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

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

@@ -33,4 +33,4 @@ import type { APIContext, MiddlewareHandler } from '../../@types/astro.js';
  * @param apiContext The API context
  * @param responseFunction A callback function that should return a promise with the response
  */
-export declare function callMiddleware(onRequest: MiddlewareHandler, apiContext: APIContext, responseFunction: () => Promise<Response>): Promise<Response>;
+export declare function callMiddleware(onRequest: MiddlewareHandler, apiContext: APIContext, responseFunction: () => Promise<Response> | Response): Promise<Response>;

package/dist/core/middleware/callMiddleware.js

@@ -1,4 +1,3 @@
-import { attachCookiesToResponse, responseHasCookies } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 async function callMiddleware(onRequest, apiContext, responseFunction) {
   let nextCalled = false;
@@ -15,7 +14,7 @@ async function callMiddleware(onRequest, apiContext, responseFunction) {
         if (value instanceof Response === false) {
           throw new AstroError(AstroErrorData.MiddlewareNotAResponse);
         }
-        return ensureCookiesAttached(apiContext, value);
+        return value;
       } else {
         if (responseFunctionPromise) {
           return responseFunctionPromise;
@@ -28,16 +27,10 @@ async function callMiddleware(onRequest, apiContext, responseFunction) {
     } else if (value instanceof Response === false) {
       throw new AstroError(AstroErrorData.MiddlewareNotAResponse);
     } else {
-      return ensureCookiesAttached(apiContext, value);
+      return value;
     }
   });
 }
-function ensureCookiesAttached(apiContext, response) {
-  if (apiContext.cookies !== void 0 && !responseHasCookies(response)) {
-    attachCookiesToResponse(response, apiContext.cookies);
-  }
-  return response;
-}
 export {
   callMiddleware
 };

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

@@ -1,4 +1,4 @@
-import type { MiddlewareHandler, Params } from '../../@types/astro.js';
+import type { APIContext, MiddlewareHandler, Params } from '../../@types/astro.js';
 import { sequence } from './sequence.js';
 declare function defineMiddleware(fn: MiddlewareHandler): MiddlewareHandler;
 /**
@@ -21,7 +21,7 @@ export type CreateContext = {
 /**
  * Creates a context to be passed to Astro middleware `onRequest` function.
  */
-declare function createContext({ request, params, userDefinedLocales }: CreateContext): import("../../@types/astro.js").APIContext<Record<string, any>, Record<string, string | undefined>>;
+declare function createContext({ request, params, userDefinedLocales, }: CreateContext): APIContext;
 /**
  * It attempts to serialize `value` and return it as a string.
  *

package/dist/core/middleware/index.js

@@ -1,18 +1,83 @@
-import { createAPIContext } from "../endpoint/index.js";
+import { AstroCookies } from "../cookies/index.js";
 import { sequence } from "./sequence.js";
+import { ASTRO_VERSION } from "../constants.js";
+import { AstroError, AstroErrorData } from "../errors/index.js";
+import {
+  computeCurrentLocale,
+  computePreferredLocale,
+  computePreferredLocaleList
+} from "../../i18n/utils.js";
+const clientAddressSymbol = Symbol.for("astro.clientAddress");
+const clientLocalsSymbol = Symbol.for("astro.locals");
 function defineMiddleware(fn) {
   return fn;
 }
-function createContext({ request, params, userDefinedLocales = [] }) {
-  return createAPIContext({
+function createContext({
+  request,
+  params = {},
+  userDefinedLocales = []
+}) {
+  let preferredLocale = void 0;
+  let preferredLocaleList = void 0;
+  let currentLocale = void 0;
+  const url = new URL(request.url);
+  const route = url.pathname;
+  return {
+    cookies: new AstroCookies(request),
     request,
-    params: params ?? {},
-    props: {},
+    params,
     site: void 0,
-    locales: userDefinedLocales,
-    defaultLocale: void 0,
-    routingStrategy: void 0
-  });
+    generator: `Astro v${ASTRO_VERSION}`,
+    props: {},
+    redirect(path, status) {
+      return new Response(null, {
+        status: status || 302,
+        headers: {
+          Location: path
+        }
+      });
+    },
+    get preferredLocale() {
+      return preferredLocale ??= computePreferredLocale(request, userDefinedLocales);
+    },
+    get preferredLocaleList() {
+      return preferredLocaleList ??= computePreferredLocaleList(request, userDefinedLocales);
+    },
+    get currentLocale() {
+      return currentLocale ??= computeCurrentLocale(
+        route,
+        userDefinedLocales,
+        void 0,
+        void 0
+      );
+    },
+    url,
+    get clientAddress() {
+      if (clientAddressSymbol in request) {
+        return Reflect.get(request, clientAddressSymbol);
+      }
+      throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
+    },
+    get locals() {
+      let locals = Reflect.get(request, clientLocalsSymbol);
+      if (locals === void 0) {
+        locals = {};
+        Reflect.set(request, clientLocalsSymbol, locals);
+      }
+      if (typeof locals !== "object") {
+        throw new AstroError(AstroErrorData.LocalsNotAnObject);
+      }
+      return locals;
+    },
+    // We define a custom property, so we can check the value passed to locals
+    set locals(val) {
+      if (typeof val !== "object") {
+        throw new AstroError(AstroErrorData.LocalsNotAnObject);
+      } else {
+        Reflect.set(request, clientLocalsSymbol, val);
+      }
+    }
+  };
 }
 function isLocalsSerializable(value) {
   let type = typeof value;

package/dist/core/module-loader/vite.js

@@ -24,8 +24,8 @@ function createViteLoader(viteServer) {
       events.emit("file-change", args);
     }
   });
-  const _wsSend = viteServer.ws.send;
-  viteServer.ws.send = function(...args) {
+  const _wsSend = viteServer.hot.send;
+  viteServer.hot.send = function(...args) {
     if (isTsconfigUpdated) {
       isTsconfigUpdated = false;
       return;
@@ -63,13 +63,13 @@ function createViteLoader(viteServer) {
       return viteServer.ssrFixStacktrace(err);
     },
     clientReload() {
-      viteServer.ws.send({
+      viteServer.hot.send({
         type: "full-reload",
         path: "*"
       });
     },
     webSocketSend(msg) {
-      return viteServer.ws.send(msg);
+      return viteServer.hot.send(msg);
     },
     isHttps() {
       return !!viteServer.config.server.https;

package/dist/core/preview/index.js

@@ -11,7 +11,9 @@ import { createSettings } from "../config/settings.js";
 import createStaticPreviewServer from "./static-preview-server.js";
 import { getResolvedHostForHttpServer } from "./util.js";
 import { ensureProcessNodeEnv } from "../util.js";
+import { apply as applyPolyfills } from "../polyfill.js";
 async function preview(inlineConfig) {
+  applyPolyfills();
   ensureProcessNodeEnv("production");
   const logger = createNodeLogger(inlineConfig);
   const { userConfig, astroConfig } = await resolveConfig(inlineConfig ?? {}, "preview");