astro 4.5.18 → 4.6.0

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

@@ -954,6 +954,19 @@ export declare const MissingIndexForInternationalization: {
     message: (defaultLocale: string) => string;
     hint: (src: string) => string;
 };
+/**
+ * @docs
+ * @description
+ * Some internationalization functions are only available when Astro's own i18n routing is disabled by the configuration setting `i18n.routing: "manual"`.
+ *
+ * @see
+ * - [`i18n` routing](https://docs.astro.build/en/guides/internationalization/#routing)
+ */
+export declare const IncorrectStrategyForI18n: {
+    name: string;
+    title: string;
+    message: (functionName: string) => string;
+};
 /**
  * @docs
  * @description
@@ -964,6 +977,16 @@ export declare const NoPrerenderedRoutesWithDomains: {
     title: string;
     message: (component: string) => string;
 };
+/**
+ * @docs
+ * @description
+ * Astro throws an error if the user enables manual routing, but it doesn't have a middleware file.
+ */
+export declare const MissingMiddlewareForInternationalization: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @description

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

@@ -337,10 +337,20 @@ const MissingIndexForInternationalization = {
   message: (defaultLocale) => `Could not find index page. A root index page is required in order to create a redirect to the index URL of the default locale. (\`/${defaultLocale}\`)`,
   hint: (src) => `Create an index page (\`index.astro, index.md, etc.\`) in \`${src}\`.`
 };
+const IncorrectStrategyForI18n = {
+  name: "IncorrectStrategyForI18n",
+  title: "You can't use the current function with the current strategy",
+  message: (functionName) => `The function \`${functionName}' can only be used when the \`i18n.routing.strategy\` is set to \`"manual"\`.`
+};
 const NoPrerenderedRoutesWithDomains = {
   name: "NoPrerenderedRoutesWithDomains",
   title: "Prerendered routes aren't supported when internationalization domains are enabled.",
-  message: (component) => `Static pages aren't yet supported with multiple domains. If you wish to enable this feature, you have to disable prerendering for the page ${component}`
+  message: (component) => `Static pages aren't yet supported with multiple domains. To enable this feature, you must disable prerendering for the page ${component}`
+};
+const MissingMiddlewareForInternationalization = {
+  name: "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 CantRenderPage = {
   name: "CantRenderPage",
@@ -520,6 +530,7 @@ export {
   ImageMissingAlt,
   ImageNotFound,
   IncompatibleDescriptorOptions,
+  IncorrectStrategyForI18n,
   InvalidComponentArgs,
   InvalidContentEntryFrontmatterError,
   InvalidContentEntrySlugError,
@@ -543,6 +554,7 @@ export {
   MissingIndexForInternationalization,
   MissingLocale,
   MissingMediaQueryDirective,
+  MissingMiddlewareForInternationalization,
   MissingSharp,
   MixedContentDataCollectionError,
   NoAdapterInstalled,

package/dist/core/errors/overlay.js

@@ -588,13 +588,14 @@ class ErrorOverlay extends HTMLElement {
     const themeToggle = this.root.querySelector(".theme-toggle-checkbox");
     if (localStorage.astroErrorOverlayTheme === "dark" || !("astroErrorOverlayTheme" in localStorage) && window.matchMedia("(prefers-color-scheme: dark)").matches) {
       this?.classList.add("astro-dark");
+      localStorage.astroErrorOverlayTheme = "dark";
       themeToggle.checked = true;
     } else {
       this?.classList.remove("astro-dark");
       themeToggle.checked = false;
     }
     themeToggle?.addEventListener("click", () => {
-      const isDark = localStorage.astroErrorOverlayTheme === "dark";
+      const isDark = localStorage.astroErrorOverlayTheme === "dark" || this?.classList.contains("astro-dark");
       this?.classList.toggle("astro-dark", !isDark);
       localStorage.astroErrorOverlayTheme = isDark ? "light" : "dark";
     });

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.5.18";
+  const version = "4.6.0";
   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.5.18"}`
+        `v${"4.6.0"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/vite-plugin.js

@@ -2,6 +2,8 @@ import { normalizePath } from "vite";
 import { getOutputDirectory } from "../../prerender/utils.js";
 import { addRollupInput } from "../build/add-rollup-input.js";
 import { MIDDLEWARE_PATH_SEGMENT_NAME } from "../constants.js";
+import { MissingMiddlewareForInternationalization } from "../errors/errors-data.js";
+import { AstroError } from "../errors/index.js";
 const MIDDLEWARE_MODULE_ID = "\0astro-internal:middleware";
 const NOOP_MIDDLEWARE = "\0noop-middleware";
 function vitePluginMiddleware({ settings }) {
@@ -36,8 +38,14 @@ function vitePluginMiddleware({ settings }) {
     },
     async load(id) {
       if (id === NOOP_MIDDLEWARE) {
+        if (!userMiddlewareIsPresent && settings.config.i18n?.routing === "manual") {
+          throw new AstroError(MissingMiddlewareForInternationalization);
+        }
         return "export const onRequest = (_, next) => next()";
       } else if (id === MIDDLEWARE_MODULE_ID) {
+        if (!userMiddlewareIsPresent && settings.config.i18n?.routing === "manual") {
+          throw new AstroError(MissingMiddlewareForInternationalization);
+        }
         if (isCommandBuild) {
           this.emitFile({
             type: "chunk",

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

@@ -3,7 +3,7 @@ import type { Pipeline } from '../base-pipeline.js';
 export { Pipeline } from '../base-pipeline.js';
 export { getParams, getProps } from './params-and-props.js';
 export { loadRenderer } from './renderer.js';
-export { Slots } from './result.js';
+export { Slots } from './slots.js';
 export interface SSROptions {
     /** The pipeline instance */
     pipeline: Pipeline;

package/dist/core/render/index.js

@@ -1,7 +1,7 @@
 import { Pipeline } from "../base-pipeline.js";
 import { getParams, getProps } from "./params-and-props.js";
 import { loadRenderer } from "./renderer.js";
-import { Slots } from "./result.js";
+import { Slots } from "./slots.js";
 export {
   Pipeline,
   Slots,

package/dist/core/render/{result.js → slots.js}

@@ -1,13 +1,15 @@
 import { renderSlotToString } from "../../runtime/server/index.js";
 import { renderJSX } from "../../runtime/server/jsx.js";
 import { chunkToString } from "../../runtime/server/render/index.js";
+import { isRenderInstruction } from "../../runtime/server/render/instruction.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 function getFunctionExpression(slot) {
   if (!slot)
     return;
-  if (slot.expressions?.length !== 1)
+  const expressions = slot?.expressions?.filter((e) => isRenderInstruction(e) === false);
+  if (expressions?.length !== 1)
     return;
-  return slot.expressions[0];
+  return expressions[0];
 }
 class Slots {
   #result;

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

@@ -384,7 +384,7 @@ function createRouteManifest(params, logger) {
   }
   const i18n = settings.config.i18n;
   if (i18n) {
-    const strategy = toRoutingStrategy(i18n);
+    const strategy = toRoutingStrategy(i18n.routing, i18n.domains);
     if (strategy === "pathname-prefix-always") {
       let index = routes.find((route) => route.route === "/");
       if (!index) {

package/dist/i18n/index.d.ts

@@ -1,5 +1,7 @@
-import type { AstroConfig, Locales } from '../@types/astro.js';
+import type { APIContext, AstroConfig, Locales, SSRManifest, ValidRedirectStatus } from '../@types/astro.js';
 import type { RoutingStrategies } from './utils.js';
+export declare function requestHasLocale(locales: Locales): (context: APIContext) => boolean;
+export declare function pathHasLocale(path: string, locales: Locales): boolean;
 type GetLocaleRelativeUrl = GetLocaleOptions & {
     locale: string;
     base: string;
@@ -80,4 +82,19 @@ export declare function toCodes(locales: Locales): string[];
  * @param locales
  */
 export declare function toPaths(locales: Locales): string[];
+export type MiddlewarePayload = {
+    base: string;
+    locales: Locales;
+    trailingSlash: AstroConfig['trailingSlash'];
+    format: AstroConfig['build']['format'];
+    strategy: RoutingStrategies;
+    defaultLocale: string;
+    domains: Record<string, string> | undefined;
+    fallback: Record<string, string> | undefined;
+};
+export declare function redirectToDefaultLocale({ trailingSlash, format, base, defaultLocale, }: MiddlewarePayload): (context: APIContext, statusCode?: ValidRedirectStatus) => Response;
+export declare function notFound({ base, locales }: MiddlewarePayload): (context: APIContext, response?: Response) => Response | undefined;
+export type RedirectToFallback = (context: APIContext, response: Response) => Response;
+export declare function redirectToFallback({ fallback, locales, defaultLocale, strategy, }: MiddlewarePayload): (context: APIContext, response: Response) => Response;
+export declare function createMiddleware(i18nManifest: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash'], format: SSRManifest['buildFormat']): import("../@types/astro.js").MiddlewareHandler;
 export {};

package/dist/i18n/index.js

@@ -1,7 +1,29 @@
 import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
+import { REROUTE_DIRECTIVE_HEADER } from "../core/constants.js";
 import { MissingLocale } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
+import { createI18nMiddleware } from "./middleware.js";
+function requestHasLocale(locales) {
+  return function(context) {
+    return pathHasLocale(context.url.pathname, locales);
+  };
+}
+function pathHasLocale(path, locales) {
+  const segments = path.split("/");
+  for (const segment of segments) {
+    for (const locale of locales) {
+      if (typeof locale === "string") {
+        if (normalizeTheLocale(segment) === normalizeTheLocale(locale)) {
+          return true;
+        }
+      } else if (segment === locale.path) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
 function getLocaleRelativeUrl({
   locale,
   base,
@@ -145,7 +167,87 @@ class Unreachable extends Error {
     );
   }
 }
+function redirectToDefaultLocale({
+  trailingSlash,
+  format,
+  base,
+  defaultLocale
+}) {
+  return function(context, statusCode) {
+    if (shouldAppendForwardSlash(trailingSlash, format)) {
+      return context.redirect(`${appendForwardSlash(joinPaths(base, defaultLocale))}`, statusCode);
+    } else {
+      return context.redirect(`${joinPaths(base, defaultLocale)}`, statusCode);
+    }
+  };
+}
+function notFound({ base, locales }) {
+  return function(context, response) {
+    if (response?.headers.get(REROUTE_DIRECTIVE_HEADER) === "no")
+      return response;
+    const url = context.url;
+    const isRoot = url.pathname === base + "/" || url.pathname === base;
+    if (!(isRoot || pathHasLocale(url.pathname, locales))) {
+      if (response) {
+        response.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+        return new Response(null, {
+          status: 404,
+          headers: response.headers
+        });
+      } else {
+        return new Response(null, {
+          status: 404,
+          headers: {
+            [REROUTE_DIRECTIVE_HEADER]: "no"
+          }
+        });
+      }
+    }
+    return void 0;
+  };
+}
+function redirectToFallback({
+  fallback,
+  locales,
+  defaultLocale,
+  strategy
+}) {
+  return function(context, response) {
+    if (response.status >= 300 && fallback) {
+      const fallbackKeys = fallback ? Object.keys(fallback) : [];
+      const segments = context.url.pathname.split("/");
+      const urlLocale = segments.find((segment) => {
+        for (const locale of locales) {
+          if (typeof locale === "string") {
+            if (locale === segment) {
+              return true;
+            }
+          } else if (locale.path === segment) {
+            return true;
+          }
+        }
+        return false;
+      });
+      if (urlLocale && fallbackKeys.includes(urlLocale)) {
+        const fallbackLocale = fallback[urlLocale];
+        const pathFallbackLocale = getPathByLocale(fallbackLocale, locales);
+        let newPathname;
+        if (pathFallbackLocale === defaultLocale && strategy === "pathname-prefix-other-locales") {
+          newPathname = context.url.pathname.replace(`/${urlLocale}`, ``);
+        } else {
+          newPathname = context.url.pathname.replace(`/${urlLocale}`, `/${pathFallbackLocale}`);
+        }
+        return context.redirect(newPathname);
+      }
+    }
+    return response;
+  };
+}
+function createMiddleware(i18nManifest, base, trailingSlash, format) {
+  return createI18nMiddleware(i18nManifest, base, trailingSlash, format);
+}
 export {
+  createMiddleware,
   getLocaleAbsoluteUrl,
   getLocaleAbsoluteUrlList,
   getLocaleByPath,
@@ -153,6 +255,11 @@ export {
   getLocaleRelativeUrlList,
   getPathByLocale,
   normalizeTheLocale,
+  notFound,
+  pathHasLocale,
+  redirectToDefaultLocale,
+  redirectToFallback,
+  requestHasLocale,
   toCodes,
   toPaths
 };

package/dist/i18n/middleware.d.ts

@@ -1,2 +1,2 @@
 import type { MiddlewareHandler, SSRManifest } from '../@types/astro.js';
-export declare function createI18nMiddleware(i18n: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash'], buildFormat: SSRManifest['buildFormat']): MiddlewareHandler;
+export declare function createI18nMiddleware(i18n: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash'], format: SSRManifest['buildFormat']): MiddlewareHandler;

package/dist/i18n/middleware.js

@@ -1,39 +1,38 @@
-import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
-import { shouldAppendForwardSlash } from "../core/build/util.js";
-import { REROUTE_DIRECTIVE_HEADER, ROUTE_TYPE_HEADER } from "../core/constants.js";
-import { getPathByLocale, normalizeTheLocale } from "./index.js";
-function pathnameHasLocale(pathname, locales) {
-  const segments = pathname.split("/");
-  for (const segment of segments) {
-    for (const locale of locales) {
-      if (typeof locale === "string") {
-        if (normalizeTheLocale(segment) === normalizeTheLocale(locale)) {
-          return true;
-        }
-      } else if (segment === locale.path) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
+import { ROUTE_TYPE_HEADER } from "../core/constants.js";
+import {
+  getPathByLocale,
+  normalizeTheLocale,
+  notFound,
+  redirectToDefaultLocale,
+  redirectToFallback,
+  requestHasLocale
+} from "./index.js";
+function createI18nMiddleware(i18n, base, trailingSlash, format) {
   if (!i18n)
     return (_, next) => next();
-  const prefixAlways = (url, response, context) => {
+  const payload = {
+    ...i18n,
+    trailingSlash,
+    base,
+    format,
+    domains: {}
+  };
+  const _redirectToDefaultLocale = redirectToDefaultLocale(payload);
+  const _noFoundForNonLocaleRoute = notFound(payload);
+  const _requestHasLocale = requestHasLocale(payload.locales);
+  const _redirectToFallback = redirectToFallback(payload);
+  const prefixAlways = (context) => {
+    const url = context.url;
     if (url.pathname === base + "/" || url.pathname === base) {
-      if (shouldAppendForwardSlash(trailingSlash, buildFormat)) {
-        return context.redirect(`${appendForwardSlash(joinPaths(base, i18n.defaultLocale))}`);
-      } else {
-        return context.redirect(`${joinPaths(base, i18n.defaultLocale)}`);
-      }
-    } else if (!pathnameHasLocale(url.pathname, i18n.locales)) {
-      return notFound(response);
+      return _redirectToDefaultLocale(context);
+    } else if (!_requestHasLocale(context)) {
+      return _noFoundForNonLocaleRoute(context);
     }
     return void 0;
   };
-  const prefixOtherLocales = (url, response) => {
+  const prefixOtherLocales = (context, response) => {
     let pathnameContainsDefaultLocale = false;
+    const url = context.url;
     for (const segment of url.pathname.split("/")) {
       if (normalizeTheLocale(segment) === normalizeTheLocale(i18n.defaultLocale)) {
         pathnameContainsDefaultLocale = true;
@@ -43,14 +42,7 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
     if (pathnameContainsDefaultLocale) {
       const newLocation = url.pathname.replace(`/${i18n.defaultLocale}`, "");
       response.headers.set("Location", newLocation);
-      return notFound(response);
-    }
-    return void 0;
-  };
-  const prefixAlwaysNoRedirect = (url, response) => {
-    const isRoot = url.pathname === base + "/" || url.pathname === base;
-    if (!(isRoot || pathnameHasLocale(url.pathname, i18n.locales))) {
-      return notFound(response);
+      return _noFoundForNonLocaleRoute(context);
     }
     return void 0;
   };
@@ -60,12 +52,14 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
     if (type !== "page" && type !== "fallback") {
       return response;
     }
-    const { url, currentLocale } = context;
-    const { locales, defaultLocale, fallback, strategy } = i18n;
+    const { currentLocale } = context;
     switch (i18n.strategy) {
+      case "manual": {
+        return response;
+      }
       case "domains-prefix-other-locales": {
         if (localeHasntDomain(i18n, currentLocale)) {
-          const result = prefixOtherLocales(url, response);
+          const result = prefixOtherLocales(context, response);
           if (result) {
             return result;
           }
@@ -73,7 +67,7 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
         break;
       }
       case "pathname-prefix-other-locales": {
-        const result = prefixOtherLocales(url, response);
+        const result = prefixOtherLocales(context, response);
         if (result) {
           return result;
         }
@@ -81,7 +75,7 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
       }
       case "domains-prefix-always-no-redirect": {
         if (localeHasntDomain(i18n, currentLocale)) {
-          const result = prefixAlwaysNoRedirect(url, response);
+          const result = _noFoundForNonLocaleRoute(context, response);
           if (result) {
             return result;
           }
@@ -89,14 +83,14 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
         break;
       }
       case "pathname-prefix-always-no-redirect": {
-        const result = prefixAlwaysNoRedirect(url, response);
+        const result = _noFoundForNonLocaleRoute(context, response);
         if (result) {
           return result;
         }
         break;
       }
       case "pathname-prefix-always": {
-        const result = prefixAlways(url, response, context);
+        const result = prefixAlways(context);
         if (result) {
           return result;
         }
@@ -104,7 +98,7 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
       }
       case "domains-prefix-always": {
         if (localeHasntDomain(i18n, currentLocale)) {
-          const result = prefixAlways(url, response, context);
+          const result = prefixAlways(context);
           if (result) {
             return result;
           }
@@ -112,44 +106,9 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
         break;
       }
     }
-    if (response.status >= 300 && fallback) {
-      const fallbackKeys = i18n.fallback ? Object.keys(i18n.fallback) : [];
-      const segments = url.pathname.split("/");
-      const urlLocale = segments.find((segment) => {
-        for (const locale of locales) {
-          if (typeof locale === "string") {
-            if (locale === segment) {
-              return true;
-            }
-          } else if (locale.path === segment) {
-            return true;
-          }
-        }
-        return false;
-      });
-      if (urlLocale && fallbackKeys.includes(urlLocale)) {
-        const fallbackLocale = fallback[urlLocale];
-        const pathFallbackLocale = getPathByLocale(fallbackLocale, locales);
-        let newPathname;
-        if (pathFallbackLocale === defaultLocale && strategy === "pathname-prefix-other-locales") {
-          newPathname = url.pathname.replace(`/${urlLocale}`, ``);
-        } else {
-          newPathname = url.pathname.replace(`/${urlLocale}`, `/${pathFallbackLocale}`);
-        }
-        return context.redirect(newPathname);
-      }
-    }
-    return response;
+    return _redirectToFallback(context, response);
   };
 }
-function notFound(response) {
-  if (response.headers.get(REROUTE_DIRECTIVE_HEADER) === "no")
-    return response;
-  return new Response(null, {
-    status: 404,
-    headers: response.headers
-  });
-}
 function localeHasntDomain(i18n, currentLocale) {
   for (const domainLocale of Object.values(i18n.domainLookupTable)) {
     if (domainLocale === currentLocale) {

package/dist/i18n/utils.d.ts

@@ -21,6 +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): 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 type RoutingStrategies = 'manual' | '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(routing: NonNullable<AstroConfig['i18n']>['routing'], domains: NonNullable<AstroConfig['i18n']>['domains']): RoutingStrategies;
 export {};

package/dist/i18n/utils.js

@@ -43,11 +43,7 @@ function sortAndFilterLocales(browserLocaleList, locales) {
     return true;
   }).sort((a, b) => {
     if (a.qualityValue && b.qualityValue) {
-      if (a.qualityValue > b.qualityValue) {
-        return -1;
-      } else if (a.qualityValue < b.qualityValue) {
-        return 1;
-      }
+      return Math.sign(b.qualityValue - a.qualityValue);
     }
     return 0;
   });
@@ -132,29 +128,32 @@ function computeCurrentLocale(pathname, locales) {
     }
   }
 }
-function toRoutingStrategy(i18n) {
-  let { routing, domains } = i18n;
+function toRoutingStrategy(routing, domains) {
   let strategy;
   const hasDomains = domains ? Object.keys(domains).length > 0 : false;
-  if (!hasDomains) {
-    if (routing?.prefixDefaultLocale === true) {
-      if (routing.redirectToDefaultLocale) {
-        strategy = "pathname-prefix-always";
+  if (routing === "manual") {
+    strategy = "manual";
+  } else {
+    if (!hasDomains) {
+      if (routing?.prefixDefaultLocale === true) {
+        if (routing.redirectToDefaultLocale) {
+          strategy = "pathname-prefix-always";
+        } else {
+          strategy = "pathname-prefix-always-no-redirect";
+        }
       } else {
-        strategy = "pathname-prefix-always-no-redirect";
+        strategy = "pathname-prefix-other-locales";
       }
     } else {
-      strategy = "pathname-prefix-other-locales";
-    }
-  } else {
-    if (routing?.prefixDefaultLocale === true) {
-      if (routing.redirectToDefaultLocale) {
-        strategy = "domains-prefix-always";
+      if (routing?.prefixDefaultLocale === true) {
+        if (routing.redirectToDefaultLocale) {
+          strategy = "domains-prefix-always";
+        } else {
+          strategy = "domains-prefix-always-no-redirect";
+        }
       } else {
-        strategy = "domains-prefix-always-no-redirect";
+        strategy = "domains-prefix-other-locales";
       }
-    } else {
-      strategy = "domains-prefix-other-locales";
     }
   }
   return strategy;

package/dist/runtime/client/dev-toolbar/apps/astro.js

@@ -1,6 +1,10 @@
 import { isDefinedIcon } from "../ui-library/icons.js";
 import { colorForIntegration, iconForIntegration } from "./utils/icons.js";
-import { closeOnOutsideClick, createWindowElement } from "./utils/window.js";
+import {
+  closeOnOutsideClick,
+  createWindowElement,
+  synchronizePlacementOnUpdate
+} from "./utils/window.js";
 const astroLogo = '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 99 26" width="100"><path fill="#fff" d="M6.70402 22.1453c-1.17459-1.0737-1.51748-3.3297-1.02811-4.9641.84853 1.0304 2.02424 1.3569 3.24204 1.5411 1.88005.2844 3.72635.178 5.47285-.6813.1998-.0984.3844-.2292.6027-.3617.1639.4755.2065.9554.1493 1.4439-.1392 1.1898-.7313 2.1088-1.673 2.8054-.3765.2787-.775.5278-1.1639.7905-1.1948.8075-1.518 1.7544-1.0691 3.1318.0107.0336.0202.0671.0444.149-.6101-.273-1.0557-.6705-1.39518-1.1931-.3586-.5517-.52921-1.1619-.53819-1.8221-.00449-.3213-.00449-.6455-.0477-.9623-.10551-.7722-.46804-1.118-1.15102-1.1379-.70094-.0205-1.2554.4129-1.40244 1.0953-.01122.0523-.02749.1041-.04377.1649l.00112.0006Z"/><path fill="url(#paint0_linear_386_2739)" d="M6.70402 22.1453c-1.17459-1.0737-1.51748-3.3297-1.02811-4.9641.84853 1.0304 2.02424 1.3569 3.24204 1.5411 1.88005.2844 3.72635.178 5.47285-.6813.1998-.0984.3844-.2292.6027-.3617.1639.4755.2065.9554.1493 1.4439-.1392 1.1898-.7313 2.1088-1.673 2.8054-.3765.2787-.775.5278-1.1639.7905-1.1948.8075-1.518 1.7544-1.0691 3.1318.0107.0336.0202.0671.0444.149-.6101-.273-1.0557-.6705-1.39518-1.1931-.3586-.5517-.52921-1.1619-.53819-1.8221-.00449-.3213-.00449-.6455-.0477-.9623-.10551-.7722-.46804-1.118-1.15102-1.1379-.70094-.0205-1.2554.4129-1.40244 1.0953-.01122.0523-.02749.1041-.04377.1649l.00112.0006Z"/><path fill="#fff" d="M0 16.909s3.47815-1.6944 6.96603-1.6944l2.62973-8.13858c.09846-.39359.38592-.66106.71044-.66106.3246 0 .612.26747.7105.66106l2.6297 8.13858c4.1309 0 6.966 1.6944 6.966 1.6944S14.7045.814589 14.693.782298C14.5234.306461 14.2371 0 13.8512 0H6.76183c-.38593 0-.66063.306461-.84174.782298C5.90733.81398 0 16.909 0 16.909ZM36.671 11.7318c0 1.4262-1.7739 2.2779-4.2302 2.2779-1.5985 0-2.1638-.3962-2.1638-1.2281 0-.8715.7018-1.2875 2.3003-1.2875 1.4426 0 2.6707.0198 4.0937.1981v.0396Zm.0195-1.7629c-.8772-.19808-2.2028-.31693-3.7818-.31693-4.6006 0-6.7644 1.08943-6.7644 3.62483 0 2.6344 1.4815 3.6446 4.9125 3.6446 2.9046 0 4.8735-.7328 5.5947-2.5354h.117c-.0195.4358-.039.8716-.039 1.2083 0 .931.156 1.0102.9162 1.0102h3.5869c-.1949-.5546-.3119-2.1194-.3119-3.4663 0-1.446.0585-2.5355.0585-4.00123 0-2.99098-1.7934-4.89253-7.4077-4.89253-2.4173 0-5.1074.41596-7.1543 1.03.1949.81213.4679 2.45617.6043 3.5258 1.774-.83193 4.2887-1.18847 6.2381-1.18847 2.6902 0 3.4309.61404 3.4309 1.86193v.4952ZM46.5325 12.5637c-.4874.0594-1.1502.0594-1.8325.0594-.7213 0-1.3841-.0198-1.8324-.0792 0 .1585-.0195.3367-.0195.4952 0 2.476 1.618 3.922 7.3102 3.922 5.3609 0 7.0958-1.4262 7.0958-3.9418 0-2.3769-1.1501-3.5456-6.238-3.8031-3.9573-.17827-4.3082-.61404-4.3082-1.10924 0-.57442.5068-.87154 3.158-.87154 2.7487 0 3.4894.37635 3.4894 1.16866v.17827c.3899-.01981 1.0917-.03961 1.813-.03961.6823 0 1.423.0198 1.8519.05942 0-.17827.0195-.33674.0195-.47539 0-2.91175-2.4172-3.86252-7.0958-3.86252-5.2634 0-7.0373 1.2875-7.0373 3.8031 0 2.25805 1.423 3.66445 6.472 3.88235 3.7233.1188 4.1327.5348 4.1327 1.1092 0 .6141-.6043.8914-3.2165.8914-3.0021 0-3.7623-.416-3.7623-1.2677v-.1189ZM63.6883 2.125c-1.423 1.32712-3.9768 2.65425-5.3998 3.01079.0195.73289.0195 2.07982.0195 2.81271l1.3061.01981c-.0195 1.40635-.039 3.10979-.039 4.23889 0 2.6344 1.3841 4.6152 5.6922 4.6152 1.813 0 3.0216-.1981 4.5226-.515-.1559-.9706-.3314-2.4562-.3898-3.5852-.8968.2971-2.0274.4556-3.275.4556-1.735 0-2.4368-.4754-2.4368-1.8422 0-1.1884 0-2.29767.0195-3.32768 2.2223.01981 4.4446.05943 5.7507.09904-.0195-1.03.0195-2.51559.078-3.50598-1.8909.03961-4.0157.05942-5.7702.05942.0195-.87154.039-1.70347.0585-2.5354h-.1365ZM75.3313 7.35427c.0195-1.03001.039-1.90156.0585-2.75329h-3.9183c.0585 1.70347.0585 3.44656.0585 6.00172 0 2.5553-.0195 4.3182-.0585 6.0018h4.4836c-.078-1.1885-.0975-3.189-.0975-4.8925 0-2.69388 1.0917-3.46638 3.5674-3.46638 1.1502 0 1.9689.13865 2.6902.39615.0195-1.01019.2144-2.97117.3314-3.84271-.7408-.21789-1.5595-.35655-2.5537-.35655-2.1249-.0198-3.6844.85174-4.4056 2.93156l-.156-.0198ZM94.8501 10.5235c0 2.1591-1.5595 3.1693-4.0157 3.1693-2.4368 0-3.9963-.9508-3.9963-3.1693 0-2.21846 1.579-3.05039 3.9963-3.05039 2.4367 0 4.0157.89135 4.0157 3.05039Zm4.0743-.099c0-4.29832-3.353-6.21968-8.09-6.21968-4.7566 0-7.9926 1.92136-7.9926 6.21968 0 4.2785 3.0216 6.5762 7.9731 6.5762 4.9904 0 8.1095-2.2977 8.1095-6.5762Z"/><defs><linearGradient id="paint0_linear_386_2739" x1="5.46011" x2="16.8017" y1="25.9999" y2="20.6412" gradientUnits="userSpaceOnUse"><stop stop-color="#D83333"/><stop offset="1" stop-color="#F041FF"/></linearGradient></defs></svg>';
 let integrationData;
 var astro_default = {
@@ -20,6 +24,7 @@ var astro_default = {
       }
     });
     closeOnOutsideClick(eventTarget);
+    synchronizePlacementOnUpdate(eventTarget, canvas);
     function fetchIntegrationData() {
       fetch("https://astro.build/api/v1/dev-overlay/", {
         cache: "no-cache"

package/dist/runtime/client/dev-toolbar/apps/audit/rules/a11y.js

@@ -463,7 +463,7 @@ const a11y = [
         return false;
       if (!isInteractive(element))
         return false;
-      if (!interactiveElements.includes(element.localName))
+      if (!interactiveElements.includes(element.localName) && !roleless_elements.includes(element.localName))
         return true;
     }
   },