astro 3.6.3 → 3.6.5

package/dist/@types/astro.d.ts

@@ -1412,23 +1412,42 @@ export interface AstroUserConfig {
             /**
              * @docs
              * @kind h4
-             * @name experimental.i18n.routingStrategy
-             * @type {'prefix-always' | 'prefix-other-locales'}
-             * @default 'prefix-other-locales'
-             * @version 3.5.0
+             * @name experimental.i18n.routing
+             * @type {Routing}
+             * @version 3.7.0
              * @description
              *
-             * Controls the routing strategy to determine your site URLs. Set this based on your folder/URL path configuration for your default language:
-             *
-             *  - `prefix-other-locales`(default): Only non-default languages will display a language prefix.
-             *    The `defaultLocale` will not show a language prefix and content files do not exist in a localized folder.
-             *    URLs will be of the form `example.com/[locale]/content/` for all non-default languages, but `example.com/content/` for the default locale.
-             *  - `prefix-always`: All URLs will display a language prefix.
-             *    URLs will be of the form `example.com/[locale]/content/` for every route, including the default language.
-             *    Localized folders are used for every language, including the default.
-             *
+             * Controls the routing strategy to determine your site URLs. Set this based on your folder/URL path configuration for your default language.
              */
-            routingStrategy?: 'prefix-always' | 'prefix-other-locales';
+            routing?: {
+                /**
+                 * @docs
+                 * @name experimental.i18n.routing.prefixDefaultLocale
+                 * @type {boolean}
+                 * @default `false`
+                 * @version 3.7.0
+                 * @description
+                 *
+                 * When `false`, only non-default languages will display a language prefix.
+                 * The `defaultLocale` will not show a language prefix and content files do not exist in a localized folder.
+                 *  URLs will be of the form `example.com/[locale]/content/` for all non-default languages, but `example.com/content/` for the default locale.
+                 *
+                 * When `true`, all URLs will display a language prefix.
+                 * URLs will be of the form `example.com/[locale]/content/` for every route, including the default language.
+                 * Localized folders are used for every language, including the default.
+                 */
+                prefixDefaultLocale: boolean;
+                /**
+                 * @name experimental.i18n.routing.strategy
+                 * @type {"pathname"}
+                 * @default `"pathname"`
+                 * @version 3.7.0
+                 * @description
+                 *
+                 * - `"pathanme": The strategy is applied to the pathname of the URLs
+                 */
+                strategy: 'pathname';
+            };
         };
         /**
          * @docs

package/dist/assets/endpoint/node.js

@@ -1,21 +1,42 @@
+import os from "node:os";
+import { isAbsolute } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
 import { readFile } from "fs/promises";
 import mime from "mime/lite.js";
-import os from "os";
 import { getConfiguredImageService, isRemoteAllowed } from "../internal.js";
 import { etag } from "../utils/etag.js";
-import { assetsDir, imageConfig } from "astro:assets";
+import { assetsDir, outDir, imageConfig } from "astro:assets";
 function replaceFileSystemReferences(src) {
   return os.platform().includes("win32") ? src.replace(/^\/@fs\//, "") : src.replace(/^\/@fs/, "");
 }
 async function loadLocalImage(src, url) {
-  const filePath = import.meta.env.DEV ? removeQueryString(replaceFileSystemReferences(src)) : new URL("." + src, assetsDir);
+  const assetsDirPath = fileURLToPath(assetsDir);
+  let fileUrl;
+  if (import.meta.env.DEV) {
+    fileUrl = pathToFileURL(removeQueryString(replaceFileSystemReferences(src)));
+  } else {
+    try {
+      fileUrl = new URL("." + src, outDir);
+      const filePath = fileURLToPath(fileUrl);
+      if (!isAbsolute(filePath) || !filePath.startsWith(assetsDirPath)) {
+        return void 0;
+      }
+    } catch (err) {
+      return void 0;
+    }
+  }
   let buffer = void 0;
   try {
-    buffer = await readFile(filePath);
+    buffer = await readFile(fileUrl);
   } catch (e) {
-    const sourceUrl = new URL(src, url.origin);
-    buffer = await loadRemoteImage(sourceUrl);
+    try {
+      const sourceUrl = new URL(src, url.origin);
+      buffer = await loadRemoteImage(sourceUrl);
+    } catch (err) {
+      console.error("Could not process image request:", err);
+      return void 0;
+    }
   }
   return buffer;
 }
@@ -39,7 +60,11 @@ const GET = async ({ request }) => {
     const url = new URL(request.url);
     const transform = await imageService.parseURL(url, imageConfig);
     if (!transform?.src) {
-      throw new Error("Incorrect transform returned by `parseURL`");
+      const err = new Error(
+        "Incorrect transform returned by `parseURL`. Expected a transform with a `src` property."
+      );
+      console.error("Could not parse image transform from URL:", err);
+      return new Response("Internal Server Error", { status: 500 });
     }
     let inputBuffer = void 0;
     if (isRemotePath(transform.src)) {
@@ -51,7 +76,7 @@ const GET = async ({ request }) => {
       inputBuffer = await loadLocalImage(transform.src, url);
     }
     if (!inputBuffer) {
-      return new Response("Not Found", { status: 404 });
+      return new Response("Internal Server Error", { status: 500 });
     }
     const { data, format } = await imageService.transform(inputBuffer, transform, imageConfig);
     return new Response(data, {
@@ -64,7 +89,13 @@ const GET = async ({ request }) => {
       }
     });
   } catch (err) {
-    return new Response(`Server Error: ${err}`, { status: 500 });
+    console.error("Could not process image request:", err);
+    return new Response(
+      import.meta.env.DEV ? `Could not process image request: ${err}` : `Internal Server Error`,
+      {
+        status: 500
+      }
+    );
   }
 };
 export {

package/dist/assets/vite-plugin-assets.js

@@ -54,11 +54,12 @@ function assets({
 					export { default as Picture } from "astro/components/Picture.astro";
 
 					export const imageConfig = ${JSON.stringify(settings.config.image)};
-					export const assetsDir = new URL(${JSON.stringify(
+					export const outDir = new URL(${JSON.stringify(
             new URL(
               isServerLikeOutput(settings.config) ? settings.config.build.client : settings.config.outDir
             )
           )});
+					export const assetsDir = new URL(${JSON.stringify(settings.config.build.assets)}, outDir);
 					export const getImage = async (options) => await getImageInternal(options, imageConfig);
 				`;
         }

package/dist/core/app/index.js

@@ -195,7 +195,7 @@ class App {
         env: this.#pipeline.env,
         mod: handler,
         locales: this.#manifest.i18n?.locales,
-        routingStrategy: this.#manifest.i18n?.routingStrategy,
+        routing: this.#manifest.i18n?.routing,
         defaultLocale: this.#manifest.i18n?.defaultLocale
       });
     } else {
@@ -229,7 +229,7 @@ class App {
         mod,
         env: this.#pipeline.env,
         locales: this.#manifest.i18n?.locales,
-        routingStrategy: this.#manifest.i18n?.routingStrategy,
+        routing: this.#manifest.i18n?.routing,
         defaultLocale: this.#manifest.i18n?.defaultLocale
       });
     }

package/dist/core/app/types.d.ts

@@ -47,7 +47,7 @@ export type SSRManifest = {
 };
 export type SSRManifestI18n = {
     fallback?: Record<string, string>;
-    routingStrategy?: 'prefix-always' | 'prefix-other-locales';
+    routing?: 'prefix-always' | 'prefix-other-locales';
     locales: string[];
     defaultLocale: string;
 };

package/dist/core/build/generate.js

@@ -431,7 +431,7 @@ async function generatePath(pathname, gopts, pipeline) {
       env: pipeline.getEnvironment(),
       mod,
       locales: i18n?.locales,
-      routingStrategy: i18n?.routingStrategy,
+      routing: i18n?.routing,
       defaultLocale: i18n?.defaultLocale
     });
     let body;
@@ -486,7 +486,7 @@ function createBuildManifest(settings, internals, renderers) {
   if (settings.config.experimental.i18n) {
     i18nManifest = {
       fallback: settings.config.experimental.i18n.fallback,
-      routingStrategy: settings.config.experimental.i18n.routingStrategy,
+      routing: settings.config.experimental.i18n.routing,
       defaultLocale: settings.config.experimental.i18n.defaultLocale,
       locales: settings.config.experimental.i18n.locales
     };

package/dist/core/build/plugins/plugin-manifest.js

@@ -186,7 +186,7 @@ function buildManifest(opts, internals, staticFiles) {
   if (settings.config.experimental.i18n) {
     i18nManifest = {
       fallback: settings.config.experimental.i18n.fallback,
-      routingStrategy: settings.config.experimental.i18n.routingStrategy,
+      routing: settings.config.experimental.i18n.routing,
       locales: settings.config.experimental.i18n.locales,
       defaultLocale: settings.config.experimental.i18n.defaultLocale
     };

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

@@ -250,27 +250,45 @@ export declare const AstroConfigSchema: z.ZodObject<{
             defaultLocale: z.ZodString;
             locales: z.ZodArray<z.ZodString, "many">;
             fallback: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-            routingStrategy: z.ZodDefault<z.ZodOptional<z.ZodEnum<["prefix-always", "prefix-other-locales"]>>>;
+            routing: z.ZodEffects<z.ZodDefault<z.ZodObject<{
+                prefixDefaultLocale: z.ZodDefault<z.ZodBoolean>;
+                strategy: z.ZodDefault<z.ZodEnum<["pathname"]>>;
+            }, "strip", z.ZodTypeAny, {
+                prefixDefaultLocale: boolean;
+                strategy: "pathname";
+            }, {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            }>>, "prefix-always" | "prefix-other-locales", {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined>;
         }, "strip", z.ZodTypeAny, {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         }, {
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         }>>, {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         } | undefined, {
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         } | undefined>>;
         contentCollectionCache: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
@@ -280,7 +298,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         i18n?: {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         } | undefined;
     }, {
@@ -290,7 +308,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         } | undefined;
         contentCollectionCache?: boolean | undefined;
     }>>;
@@ -374,7 +395,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         i18n?: {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         } | undefined;
     };
@@ -465,7 +486,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         } | undefined;
         contentCollectionCache?: boolean | undefined;
     } | undefined;
@@ -647,27 +671,45 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             defaultLocale: z.ZodString;
             locales: z.ZodArray<z.ZodString, "many">;
             fallback: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-            routingStrategy: z.ZodDefault<z.ZodOptional<z.ZodEnum<["prefix-always", "prefix-other-locales"]>>>;
+            routing: z.ZodEffects<z.ZodDefault<z.ZodObject<{
+                prefixDefaultLocale: z.ZodDefault<z.ZodBoolean>;
+                strategy: z.ZodDefault<z.ZodEnum<["pathname"]>>;
+            }, "strip", z.ZodTypeAny, {
+                prefixDefaultLocale: boolean;
+                strategy: "pathname";
+            }, {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            }>>, "prefix-always" | "prefix-other-locales", {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined>;
         }, "strip", z.ZodTypeAny, {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         }, {
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         }>>, {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         } | undefined, {
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         } | undefined>>;
         contentCollectionCache: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
@@ -677,7 +719,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         i18n?: {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         } | undefined;
     }, {
@@ -687,7 +729,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         } | undefined;
         contentCollectionCache?: boolean | undefined;
     }>>;
@@ -837,7 +882,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         i18n?: {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         } | undefined;
     };
@@ -909,7 +954,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         } | undefined;
         contentCollectionCache?: boolean | undefined;
     } | undefined;
@@ -1013,7 +1061,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         i18n?: {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         } | undefined;
     };
@@ -1085,7 +1133,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         } | undefined;
         contentCollectionCache?: boolean | undefined;
     } | undefined;
@@ -1189,7 +1240,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         i18n?: {
             defaultLocale: string;
             locales: string[];
-            routingStrategy: "prefix-always" | "prefix-other-locales";
+            routing: "prefix-always" | "prefix-other-locales";
             fallback?: Record<string, string> | undefined;
         } | undefined;
     };
@@ -1261,7 +1312,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             defaultLocale: string;
             locales: string[];
             fallback?: Record<string, string> | undefined;
-            routingStrategy?: "prefix-always" | "prefix-other-locales" | undefined;
+            routing?: {
+                prefixDefaultLocale?: boolean | undefined;
+                strategy?: "pathname" | undefined;
+            } | undefined;
         } | undefined;
         contentCollectionCache?: boolean | undefined;
     } | undefined;

package/dist/core/config/schema.js

@@ -214,8 +214,22 @@ const AstroConfigSchema = z.object({
         defaultLocale: z.string(),
         locales: z.string().array(),
         fallback: z.record(z.string(), z.string()).optional(),
-        // TODO: properly add default when the feature goes of experimental
-        routingStrategy: z.enum(["prefix-always", "prefix-other-locales"]).optional().default("prefix-other-locales")
+        routing: z.object({
+          prefixDefaultLocale: z.boolean().default(false),
+          strategy: z.enum(["pathname"]).default("pathname")
+        }).default({}).transform((routing) => {
+          let strategy;
+          switch (routing.strategy) {
+            case "pathname": {
+              if (routing.prefixDefaultLocale === true) {
+                strategy = "prefix-always";
+              } else {
+                strategy = "prefix-other-locales";
+              }
+            }
+          }
+          return strategy;
+        })
       }).optional().superRefine((i18n, ctx) => {
         if (i18n) {
           const { defaultLocale, locales, fallback } = i18n;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.6.3";
+const ASTRO_VERSION = "3.6.5";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.6.3";
+  const currentVersion = "3.6.5";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/endpoint/index.js

@@ -129,7 +129,7 @@ async function callEndpoint(mod, env, ctx, onRequest) {
     props: ctx.props,
     site: env.site,
     adapterName: env.adapterName,
-    routingStrategy: ctx.routingStrategy,
+    routingStrategy: ctx.routing,
     defaultLocale: ctx.defaultLocale,
     locales: ctx.locales
   });

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.6.3";
+  const version = "3.6.5";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.6.3"}`
+        `v${"3.6.5"}`
       )} ${headline}`
     );
   }

package/dist/core/pipeline.js

@@ -90,7 +90,7 @@ class Pipeline {
       site: env.site,
       adapterName: env.adapterName,
       locales: renderContext.locales,
-      routingStrategy: renderContext.routingStrategy,
+      routingStrategy: renderContext.routing,
       defaultLocale: renderContext.defaultLocale
     });
     switch (renderContext.route.type) {

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

@@ -17,7 +17,7 @@ export interface RenderContext {
     locals?: object;
     locales: string[] | undefined;
     defaultLocale: string | undefined;
-    routingStrategy: 'prefix-always' | 'prefix-other-locales' | undefined;
+    routing: 'prefix-always' | 'prefix-other-locales' | undefined;
 }
 export type CreateRenderContextArgs = Partial<Omit<RenderContext, 'params' | 'props' | 'locals'>> & {
     route: RouteData;

package/dist/core/render/context.js

@@ -19,7 +19,7 @@ async function createRenderContext(options) {
     params,
     props,
     locales: options.locales,
-    routingStrategy: options.routingStrategy,
+    routing: options.routing,
     defaultLocale: options.defaultLocale
   };
   Object.defineProperty(context, "locals", {

package/dist/core/render/core.js

@@ -45,7 +45,7 @@ async function renderPage({ mod, renderContext, env, cookies }) {
     locals: renderContext.locals ?? {},
     locales: renderContext.locales,
     defaultLocale: renderContext.defaultLocale,
-    routingStrategy: renderContext.routingStrategy
+    routingStrategy: renderContext.routing
   });
   if (mod.frontmatter && typeof mod.frontmatter === "object" && "draft" in mod.frontmatter) {
     env.logger.warn(
@@ -57,7 +57,7 @@ async function renderPage({ mod, renderContext, env, cookies }) {
     result,
     Component,
     renderContext.props,
-    null,
+    {},
     env.streaming,
     renderContext.route
   );

package/dist/core/routing/manifest/create.js

@@ -367,7 +367,7 @@ This route collides with: "${collision.component}".`
       }
       setRoutes.delete(route);
     }
-    if (i18n.routingStrategy === "prefix-always") {
+    if (i18n.routing === "prefix-always") {
       const defaultLocaleRoutes = routesByLocale.get(i18n.defaultLocale);
       if (defaultLocaleRoutes) {
         const indexDefaultRoute = defaultLocaleRoutes.find((routeData) => {

package/dist/i18n/middleware.js

@@ -29,14 +29,14 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
       const separators = url.pathname.split("/");
       const pathnameContainsDefaultLocale = url.pathname.includes(`/${defaultLocale}`);
       const isLocaleFree = checkIsLocaleFree(url.pathname, i18n.locales);
-      if (i18n.routingStrategy === "prefix-other-locales" && pathnameContainsDefaultLocale) {
+      if (i18n.routing === "prefix-other-locales" && pathnameContainsDefaultLocale) {
         const newLocation = url.pathname.replace(`/${defaultLocale}`, "");
         response.headers.set("Location", newLocation);
         return new Response(null, {
           status: 404,
           headers: response.headers
         });
-      } else if (i18n.routingStrategy === "prefix-always") {
+      } else if (i18n.routing === "prefix-always") {
         if (url.pathname === base + "/" || url.pathname === base) {
           if (trailingSlash === "always") {
             return context.redirect(`${appendForwardSlash(joinPaths(base, i18n.defaultLocale))}`);
@@ -56,7 +56,7 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
         if (urlLocale && fallbackKeys.includes(urlLocale)) {
           const fallbackLocale = fallback[urlLocale];
           let newPathname;
-          if (fallbackLocale === defaultLocale) {
+          if (fallbackLocale === defaultLocale && i18n.routing !== "prefix-always") {
             newPathname = url.pathname.replace(`/${urlLocale}`, ``);
           } else {
             newPathname = url.pathname.replace(`/${urlLocale}`, `/${fallbackLocale}`);

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

@@ -11,7 +11,7 @@ async function renderPage(result, componentFactory, props, children, streaming,
       componentFactory.name,
       componentFactory,
       pageProps,
-      null,
+      {},
       true,
       route
     );

package/dist/vite-plugin-astro/hmr.js

@@ -59,7 +59,7 @@ async function handleHotUpdate(ctx, { config, logger, compile, source }) {
   const file = ctx.file.replace(slash(fileURLToPath(config.root)), "/");
   if (isStyleOnlyChange) {
     logger.info("astro", msg.hmr({ file, style: true }));
-    return mods.filter((mod) => mod.id !== ctx.file && !mod.id?.endsWith(".ts"));
+    return mods.filter((mod) => mod.id?.includes("astro&type=style"));
   }
   for (const mod of mods) {
     for (const imp of mod.importedModules) {

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

@@ -63,7 +63,7 @@ function createDevelopmentManifest(settings) {
   if (settings.config.experimental.i18n) {
     i18nManifest = {
       fallback: settings.config.experimental.i18n.fallback,
-      routingStrategy: settings.config.experimental.i18n.routingStrategy,
+      routing: settings.config.experimental.i18n.routing,
       defaultLocale: settings.config.experimental.i18n.defaultLocale,
       locales: settings.config.experimental.i18n.locales
     };

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

@@ -149,7 +149,7 @@ async function handleRoute({
         mod,
         route,
         locales: manifest.i18n?.locales,
-        routingStrategy: manifest.i18n?.routingStrategy,
+        routing: manifest.i18n?.routing,
         defaultLocale: manifest.i18n?.defaultLocale
       });
     } else {
@@ -202,7 +202,7 @@ async function handleRoute({
       mod,
       env,
       locales: i18n?.locales,
-      routingStrategy: i18n?.routingStrategy,
+      routing: i18n?.routing,
       defaultLocale: i18n?.defaultLocale
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.6.3",
+  "version": "3.6.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -167,8 +167,8 @@
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
     "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/markdown-remark": "3.5.0",
-    "@astrojs/telemetry": "3.0.4"
+    "@astrojs/telemetry": "3.0.4",
+    "@astrojs/markdown-remark": "3.5.0"
   },
   "optionalDependencies": {
     "sharp": "^0.32.5"