astro 4.4.1 → 4.4.2

package/dist/core/app/index.js

@@ -110,7 +110,7 @@ class App {
   #computePathnameFromDomain(request) {
     let pathname = void 0;
     const url = new URL(request.url);
-    if (this.#manifest.i18n && (this.#manifest.i18n.routing === "domains-prefix-always" || this.#manifest.i18n.routing === "domains-prefix-other-locales" || this.#manifest.i18n.routing === "domains-prefix-always-no-redirect")) {
+    if (this.#manifest.i18n && (this.#manifest.i18n.strategy === "domains-prefix-always" || this.#manifest.i18n.strategy === "domains-prefix-other-locales" || this.#manifest.i18n.strategy === "domains-prefix-always-no-redirect")) {
       let host = request.headers.get("X-Forwarded-Host");
       let protocol = request.headers.get("X-Forwarded-Proto");
       if (protocol) {

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

@@ -1,6 +1,6 @@
 import type { Locales, MiddlewareHandler, RouteData, SerializedRouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult } from '../../@types/astro.js';
 import type { SinglePageBuiltModule } from '../build/types.js';
-import type { RoutingStrategies } from '../config/schema.js';
+import type { RoutingStrategies } from '../../i18n/utils.js';
 export type ComponentPath = string;
 export type StylesheetAsset = {
     type: 'inline';
@@ -50,7 +50,7 @@ export type SSRManifest = {
 };
 export type SSRManifestI18n = {
     fallback?: Record<string, string>;
-    routing: RoutingStrategies;
+    strategy: RoutingStrategies;
     locales: Locales;
     defaultLocale: string;
     domainLookupTable: Record<string, string>;

package/dist/core/build/generate.js

@@ -40,6 +40,7 @@ import {
 import { getTimeStat, shouldAppendForwardSlash } from "./util.js";
 import { NoPrerenderedRoutesWithDomains } from "../errors/errors-data.js";
 import { RenderContext } from "../render-context.js";
+import { toRoutingStrategy } from "../../i18n/utils.js";
 function createEntryURL(filePath, outFolder) {
   return new URL("./" + filePath + `?time=${Date.now()}`, outFolder);
 }
@@ -409,7 +410,7 @@ function createBuildManifest(settings, internals, renderers, middleware) {
   if (settings.config.i18n) {
     i18nManifest = {
       fallback: settings.config.i18n.fallback,
-      routing: settings.config.i18n.routing,
+      strategy: toRoutingStrategy(settings.config.i18n),
       defaultLocale: settings.config.i18n.defaultLocale,
       locales: settings.config.i18n.locales,
       domainLookupTable: {}

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

@@ -9,6 +9,7 @@ import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
 import { cssOrder, mergeInlineCss } from "../internal.js";
 import { normalizeTheLocale } from "../../../i18n/index.js";
+import { toRoutingStrategy } from "../../../i18n/utils.js";
 const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
 const replaceExp = new RegExp(`['"]${manifestReplace}['"]`, "g");
 const SSR_MANIFEST_VIRTUAL_MODULE_ID = "@astrojs-manifest";
@@ -177,7 +178,7 @@ function buildManifest(opts, internals, staticFiles) {
     });
   }
   const i18n = settings.config.i18n;
-  if (settings.config.experimental.i18nDomains && i18n && i18n.domains && (i18n.routing === "domains-prefix-always" || i18n.routing === "domains-prefix-other-locales" || i18n.routing === "domains-prefix-always-no-redirect")) {
+  if (settings.config.experimental.i18nDomains && i18n && i18n.domains) {
     for (const [locale, domainValue] of Object.entries(i18n.domains)) {
       domainLookupTable[domainValue] = normalizeTheLocale(locale);
     }
@@ -189,7 +190,7 @@ function buildManifest(opts, internals, staticFiles) {
   if (settings.config.i18n) {
     i18nManifest = {
       fallback: settings.config.i18n.fallback,
-      routing: settings.config.i18n.routing,
+      strategy: toRoutingStrategy(settings.config.i18n),
       locales: settings.config.i18n.locales,
       defaultLocale: settings.config.i18n.defaultLocale,
       domainLookupTable

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.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.4.1";
+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];

package/dist/core/dev/dev.js

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

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

@@ -1,6 +1,6 @@
 import type { APIContext, Locales, Params } from '../../@types/astro.js';
 import type { AstroCookies } from '../cookies/index.js';
-import type { RoutingStrategies } from '../config/schema.js';
+import { type RoutingStrategies } from '../../i18n/utils.js';
 type CreateAPIContext = {
     request: Request;
     params: Params;

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

@@ -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.1";
+  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.1"}`
+        `v${"4.4.2"}`
       )} ${headline}`
     );
   }

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

@@ -1,7 +1,7 @@
 import type { Locales, Params, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro.js';
 import { AstroCookies } from '../cookies/index.js';
 import type { Logger } from '../logger/core.js';
-import type { RoutingStrategies } from '../config/schema.js';
+import { type RoutingStrategies } from '../../i18n/utils.js';
 export interface CreateResultArgs {
     /**
      * Used to provide better error messages for `Astro.clientAddress`
@@ -34,6 +34,6 @@ export interface CreateResultArgs {
     locales: Locales | undefined;
     defaultLocale: string | undefined;
     route: string;
-    routingStrategy: RoutingStrategies | undefined;
+    strategy: RoutingStrategies | undefined;
 }
 export declare function createResult(args: CreateResultArgs): SSRResult;

package/dist/core/render/result.js

@@ -161,7 +161,7 @@ function createResult(args) {
             currentLocale = computeCurrentLocale(
               url.pathname,
               args.locales,
-              args.routingStrategy,
+              args.strategy,
               args.defaultLocale
             );
             if (currentLocale) {

package/dist/core/render-context.js

@@ -159,7 +159,7 @@ class RenderContext {
     } = pipeline;
     const { links, scripts, styles } = await pipeline.headElements(routeData);
     const componentMetadata = await pipeline.componentMetadata(routeData) ?? manifest.componentMetadata;
-    const { defaultLocale, locales, routing: routingStrategy } = i18n ?? {};
+    const { defaultLocale, locales, strategy } = i18n ?? {};
     const partial = Boolean(mod.partial);
     return createResult({
       adapterName,
@@ -179,7 +179,7 @@ class RenderContext {
       resolve,
       request,
       route: routeData.route,
-      routingStrategy,
+      strategy,
       site,
       scripts,
       ssr: serverLike,
@@ -206,9 +206,9 @@ class RenderContext {
         preferredLocale: void 0,
         preferredLocaleList: void 0
       };
-    const { defaultLocale, locales, routing } = i18n;
+    const { defaultLocale, locales, strategy } = i18n;
     return this.#i18nData = {
-      currentLocale: computeCurrentLocale(routeData.route, locales, routing, defaultLocale),
+      currentLocale: computeCurrentLocale(routeData.route, locales, strategy, defaultLocale),
       preferredLocale: computePreferredLocale(request, locales),
       preferredLocaleList: computePreferredLocaleList(request, locales)
     };

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

@@ -10,6 +10,7 @@ import { AstroError } from "../../errors/index.js";
 import { removeLeadingForwardSlash, slash } from "../../path.js";
 import { resolvePages } from "../../util.js";
 import { getRouteGenerator } from "./generator.js";
+import { toRoutingStrategy } from "../../../i18n/utils.js";
 const require2 = createRequire(import.meta.url);
 function countOccurrences(needle, haystack) {
   let count = 0;
@@ -423,7 +424,8 @@ function createRouteManifest(params, logger) {
   }
   const i18n = settings.config.i18n;
   if (i18n) {
-    if (i18n.routing === "pathname-prefix-always") {
+    const strategy = toRoutingStrategy(i18n);
+    if (strategy === "pathname-prefix-always") {
       let index = routes.find((route) => route.route === "/");
       if (!index) {
         let relativePath = path.relative(
@@ -475,7 +477,7 @@ function createRouteManifest(params, logger) {
       }
       setRoutes.delete(route);
     }
-    if (i18n.routing === "pathname-prefix-always") {
+    if (strategy === "pathname-prefix-always") {
       const defaultLocaleRoutes = routesByLocale.get(i18n.defaultLocale);
       if (defaultLocaleRoutes) {
         const indexDefaultRoute = defaultLocaleRoutes.find(({ route }) => route === "/") ?? defaultLocaleRoutes.find(({ route }) => route === `/${i18n.defaultLocale}`);
@@ -523,7 +525,7 @@ function createRouteManifest(params, logger) {
             if (!hasRoute) {
               let pathname;
               let route;
-              if (fallbackToLocale === i18n.defaultLocale && i18n.routing === "pathname-prefix-other-locales") {
+              if (fallbackToLocale === i18n.defaultLocale && strategy === "pathname-prefix-other-locales") {
                 if (fallbackToRoute.pathname) {
                   pathname = `/${fallbackFromLocale}${fallbackToRoute.pathname}`;
                 }

package/dist/i18n/index.d.ts

@@ -1,12 +1,12 @@
 import type { AstroConfig, Locales } from '../@types/astro.js';
-import type { RoutingStrategies } from '../core/config/schema.js';
+import type { RoutingStrategies } from './utils.js';
 type GetLocaleRelativeUrl = GetLocaleOptions & {
     locale: string;
     base: string;
     locales: Locales;
     trailingSlash: AstroConfig['trailingSlash'];
     format: AstroConfig['build']['format'];
-    routing?: RoutingStrategies;
+    strategy?: RoutingStrategies;
     defaultLocale: string;
     domains: Record<string, string> | undefined;
     path?: string;
@@ -29,7 +29,7 @@ type GetLocaleAbsoluteUrl = GetLocaleRelativeUrl & {
 /**
  * The base URL
  */
-export declare function getLocaleRelativeUrl({ locale, base, locales: _locales, trailingSlash, format, path, prependWith, normalizeLocale, routing, defaultLocale, }: GetLocaleRelativeUrl): string;
+export declare function getLocaleRelativeUrl({ locale, base, locales: _locales, trailingSlash, format, path, prependWith, normalizeLocale, strategy, defaultLocale, }: GetLocaleRelativeUrl): string;
 /**
  * The absolute URL
  */
@@ -40,7 +40,7 @@ interface GetLocalesRelativeUrlList extends GetLocaleOptions {
     locales: Locales;
     trailingSlash: AstroConfig['trailingSlash'];
     format: AstroConfig['build']['format'];
-    routing?: RoutingStrategies;
+    strategy?: RoutingStrategies;
     defaultLocale: string;
     domains: Record<string, string> | undefined;
 }

package/dist/i18n/index.js

@@ -11,7 +11,7 @@ function getLocaleRelativeUrl({
   path,
   prependWith,
   normalizeLocale = true,
-  routing = "pathname-prefix-other-locales",
+  strategy = "pathname-prefix-other-locales",
   defaultLocale
 }) {
   const codeToUse = peekCodePathToUse(_locales, locale);
@@ -23,7 +23,7 @@ function getLocaleRelativeUrl({
   }
   const pathsToJoin = [base, prependWith];
   const normalizedLocale = normalizeLocale ? normalizeTheLocale(codeToUse) : codeToUse;
-  if (routing === "pathname-prefix-always" || routing === "pathname-prefix-always-no-redirect" || routing === "domains-prefix-always" || routing === "domains-prefix-always-no-redirect") {
+  if (strategy === "pathname-prefix-always" || strategy === "pathname-prefix-always-no-redirect" || strategy === "domains-prefix-always" || strategy === "domains-prefix-always-no-redirect") {
     pathsToJoin.push(normalizedLocale);
   } else if (locale !== defaultLocale) {
     pathsToJoin.push(normalizedLocale);

package/dist/i18n/middleware.js

@@ -70,8 +70,8 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
       return response;
     }
     const { url, currentLocale } = context;
-    const { locales, defaultLocale, fallback, routing } = i18n;
-    switch (i18n.routing) {
+    const { locales, defaultLocale, fallback, strategy } = i18n;
+    switch (i18n.strategy) {
       case "domains-prefix-other-locales": {
         if (localeHasntDomain(i18n, currentLocale)) {
           const result = prefixOtherLocales(url, response);
@@ -140,7 +140,7 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
         const fallbackLocale = fallback[urlLocale];
         const pathFallbackLocale = getPathByLocale(fallbackLocale, locales);
         let newPathname;
-        if (pathFallbackLocale === defaultLocale && routing === "pathname-prefix-other-locales") {
+        if (pathFallbackLocale === defaultLocale && strategy === "pathname-prefix-other-locales") {
           newPathname = url.pathname.replace(`/${urlLocale}`, ``);
         } else {
           newPathname = url.pathname.replace(`/${urlLocale}`, `/${pathFallbackLocale}`);

package/dist/i18n/utils.d.ts

@@ -1,5 +1,4 @@
-import type { Locales } from '../@types/astro.js';
-import type { RoutingStrategies } from '../core/config/schema.js';
+import type { AstroConfig, Locales } from '../@types/astro.js';
 type BrowserLocale = {
     locale: string;
     qualityValue: number | undefined;
@@ -22,4 +21,6 @@ export declare function parseLocale(header: string): BrowserLocale[];
 export declare function computePreferredLocale(request: Request, locales: Locales): string | undefined;
 export declare function computePreferredLocaleList(request: Request, locales: Locales): string[];
 export declare function computeCurrentLocale(pathname: string, locales: Locales, routingStrategy: RoutingStrategies | undefined, defaultLocale: string | undefined): undefined | string;
+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 function toRoutingStrategy(i18n: NonNullable<AstroConfig['i18n']>): RoutingStrategies;
 export {};

package/dist/i18n/utils.js

@@ -136,9 +136,37 @@ function computeCurrentLocale(pathname, locales, routingStrategy, defaultLocale)
   }
   return void 0;
 }
+function toRoutingStrategy(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 strategy;
+}
 export {
   computeCurrentLocale,
   computePreferredLocale,
   computePreferredLocaleList,
-  parseLocale
+  parseLocale,
+  toRoutingStrategy
 };

package/dist/virtual-modules/i18n.js

@@ -1,11 +1,13 @@
 import * as I18nInternals from "../i18n/index.js";
+import { toRoutingStrategy } from "../i18n/utils.js";
 import { normalizeTheLocale, toCodes, toPaths } from "../i18n/index.js";
 const { trailingSlash, format, site, i18n, isBuild } = (
   // @ts-expect-error
   __ASTRO_INTERNAL_I18N_CONFIG__
 );
-const { defaultLocale, locales, routing, domains } = i18n;
+const { defaultLocale, locales, domains } = i18n;
 const base = import.meta.env.BASE_URL;
+const routing = toRoutingStrategy(i18n);
 const getRelativeLocaleUrl = (locale, path, options) => I18nInternals.getLocaleRelativeUrl({
   locale,
   path,
@@ -14,7 +16,7 @@ const getRelativeLocaleUrl = (locale, path, options) => I18nInternals.getLocaleR
   format,
   defaultLocale,
   locales,
-  routing,
+  strategy: routing,
   domains,
   ...options
 });
@@ -27,7 +29,7 @@ const getAbsoluteLocaleUrl = (locale, path, options) => I18nInternals.getLocaleA
   site,
   defaultLocale,
   locales,
-  routing,
+  strategy: routing,
   domains,
   isBuild,
   ...options
@@ -39,7 +41,7 @@ const getRelativeLocaleUrlList = (path, options) => I18nInternals.getLocaleRelat
   format,
   defaultLocale,
   locales,
-  routing,
+  strategy: routing,
   domains,
   ...options
 });
@@ -51,7 +53,7 @@ const getAbsoluteLocaleUrlList = (path, options) => I18nInternals.getLocaleAbsol
   format,
   defaultLocale,
   locales,
-  routing,
+  strategy: routing,
   domains,
   isBuild,
   ...options

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

@@ -11,6 +11,7 @@ import { AsyncLocalStorage } from "node:async_hooks";
 import { IncomingMessage } from "node:http";
 import { setRouteError } from "./server-state.js";
 import { recordServerError } from "./error.js";
+import { toRoutingStrategy } from "../i18n/utils.js";
 function createVitePluginAstroServer({
   settings,
   logger,
@@ -88,7 +89,7 @@ function createDevelopmentManifest(settings) {
   if (settings.config.i18n) {
     i18nManifest = {
       fallback: settings.config.i18n.fallback,
-      routing: settings.config.i18n.routing,
+      strategy: toRoutingStrategy(settings.config.i18n),
       defaultLocale: settings.config.i18n.defaultLocale,
       locales: settings.config.i18n.locales,
       domainLookupTable: {}

package/package.json

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