astro 4.4.13 → 4.4.14

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

@@ -1524,7 +1524,7 @@ export interface AstroUserConfig {
          * @description
          * Enables pre-rendering your prefetched pages on the client in supported browsers.
          *
-         * This feature uses the experimental [Speculation Rules Web API](https://developer.mozilla.org/en-US/docs/Web/API/Speculation_Rules_API) and overrides the default `prefetch` behavior globally to prerender links on the client.
+         * This feature uses the experimental [Speculation Rules Web API](https://developer.mozilla.org/en-US/docs/Web/API/Speculation_Rules_API) and enhances the default `prefetch` behavior globally to prerender links on the client.
          * You may wish to review the [possible risks when prerendering on the client](https://developer.mozilla.org/en-US/docs/Web/API/Speculation_Rules_API#unsafe_prefetching) before enabling this feature.
          *
          * Enable client side prerendering in your `astro.config.mjs` along with any desired `prefetch` configuration options:
@@ -2413,7 +2413,7 @@ export interface SSRResult {
     componentMetadata: Map<string, SSRComponentMetadata>;
     createAstro(Astro: AstroGlobalPartial, props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
     resolve: (s: string) => Promise<string>;
-    response: ResponseInit;
+    response: AstroGlobal['response'];
     renderers: SSRLoadedRenderer[];
     /**
      * Map of directive name (e.g. `load`) to the directive script code

package/dist/content/runtime.d.ts

@@ -14,7 +14,7 @@ export declare function createGetCollection({ contentCollectionToEntryMap, dataC
     contentCollectionToEntryMap: CollectionToEntryMap;
     dataCollectionToEntryMap: CollectionToEntryMap;
     getRenderEntryImport: GetEntryImport;
-}): (collection: string, filter?: ((entry: any) => unknown) | undefined) => Promise<any[] | undefined>;
+}): (collection: string, filter?: ((entry: any) => unknown) | undefined) => Promise<any[]>;
 export declare function createGetEntryBySlug({ getEntryImport, getRenderEntryImport, }: {
     getEntryImport: GetEntryImport;
     getRenderEntryImport: GetEntryImport;

package/dist/content/runtime.js

@@ -49,7 +49,7 @@ function createGetCollection({
           collection
         )} does not exist or is empty. Ensure a collection directory with this name exists.`
       );
-      return;
+      return [];
     }
     const lazyImports = Object.values(
       type === "content" ? contentCollectionToEntryMap[collection] : dataCollectionToEntryMap[collection]

package/dist/core/base-pipeline.d.ts

@@ -33,7 +33,7 @@ export declare abstract class Pipeline {
     /**
      * Used for `Astro.site`.
      */
-    readonly site: string | undefined;
+    readonly site: URL | undefined;
     readonly internalMiddleware: MiddlewareHandler[];
     constructor(logger: Logger, manifest: SSRManifest, 
     /**
@@ -51,7 +51,7 @@ export declare abstract class Pipeline {
     /**
      * Used for `Astro.site`.
      */
-    site?: string | undefined);
+    site?: URL | undefined);
     abstract headElements(routeData: RouteData): Promise<HeadElements> | HeadElements;
     abstract componentMetadata(routeData: RouteData): Promise<SSRResult['componentMetadata']> | void;
 }

package/dist/core/base-pipeline.js

@@ -1,7 +1,7 @@
 import { createI18nMiddleware } from "../i18n/middleware.js";
 import { RouteCache } from "./render/route-cache.js";
 class Pipeline {
-  constructor(logger, manifest, mode, renderers, resolve, serverLike, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, mode), site = manifest.site) {
+  constructor(logger, manifest, mode, renderers, resolve, serverLike, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, mode), site = manifest.site ? new URL(manifest.site) : void 0) {
     this.logger = logger;
     this.manifest = manifest;
     this.mode = mode;

package/dist/core/build/generate.js

@@ -428,7 +428,7 @@ function createBuildManifest(settings, internals, renderers, middleware) {
     renderers,
     base: settings.config.base,
     assetsPrefix: settings.config.build.assetsPrefix,
-    site: settings.config.site ? new URL(settings.config.base, settings.config.site).toString() : settings.config.site,
+    site: settings.config.site,
     componentMetadata: internals.componentMetadata,
     i18n: i18nManifest,
     buildFormat: settings.config.build.format,

package/dist/core/compile/compile.js

@@ -22,6 +22,8 @@ async function compile({
       normalizedFilename: normalizeFilename(filename, astroConfig.root),
       sourcemap: "both",
       internalURL: "astro/compiler-runtime",
+      // TODO: this is no longer neccessary for `Astro.site`
+      // but it somehow allows working around caching issues in content collections for some tests
       astroGlobalArgs: JSON.stringify(astroConfig.site),
       scopedStyleStrategy: astroConfig.scopedStyleStrategy,
       resultScopedSlot: true,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.4.13";
+const ASTRO_VERSION = "4.4.14";
 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.13";
+  const currentVersion = "4.4.14";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

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

@@ -701,7 +701,7 @@ export declare const MiddlewareNotAResponse: {
  * @docs
  * @description
  *
- * Thrown in development mode when `locals` is overwritten with something that is not an object
+ * Thrown when `locals` is overwritten with something that is not an object
  *
  * For example:
  * ```ts
@@ -718,6 +718,17 @@ export declare const LocalsNotAnObject: {
     message: string;
     hint: string;
 };
+/**
+ * @docs
+ * @description
+ * Thrown when a value is being set as the `headers` field on the `ResponseInit` object available as `Astro.response`.
+ */
+export declare const AstroResponseHeadersReassigned: {
+    name: string;
+    title: string;
+    message: string;
+    hint: string;
+};
 /**
  * @docs
  * @description

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

@@ -256,6 +256,12 @@ const LocalsNotAnObject = {
   message: "`locals` can only be assigned to an object. Other values like numbers, strings, etc. are not accepted.",
   hint: "If you tried to remove some information from the `locals` object, try to use `delete` or set the property to `undefined`."
 };
+const AstroResponseHeadersReassigned = {
+  name: "AstroResponseHeadersReassigned",
+  title: "`Astro.response.headers` must not be reassigned.",
+  message: "Individual headers can be added to and removed from `Astro.response.headers`, but it must not be replaced with another instance of `Headers` altogether.",
+  hint: "Consider using `Astro.response.headers.add()`, and `Astro.response.headers.delete()`."
+};
 const MiddlewareCantBeLoaded = {
   name: "MiddlewareCantBeLoaded",
   title: "Can't load the middleware.",
@@ -483,6 +489,7 @@ const UnknownError = { name: "UnknownError", title: "Unknown Error." };
 export {
   AstroGlobNoMatch,
   AstroGlobUsedOutside,
+  AstroResponseHeadersReassigned,
   CSSSyntaxError,
   CantRenderPage,
   ClientAddressNotAvailable,

package/dist/core/messages.js

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

package/dist/core/middleware/index.js

@@ -44,12 +44,7 @@ function createContext({
       return preferredLocaleList ??= computePreferredLocaleList(request, userDefinedLocales);
     },
     get currentLocale() {
-      return currentLocale ??= computeCurrentLocale(
-        route,
-        userDefinedLocales,
-        void 0,
-        void 0
-      );
+      return currentLocale ??= computeCurrentLocale(route, userDefinedLocales);
     },
     url,
     get clientAddress() {

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 { createResult } from './result.js';
+export { Slots } from './result.js';
 export interface SSROptions {
     /** The pipeline instance */
     pipeline: Pipeline;

package/dist/core/render/index.js

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

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

@@ -1,39 +1,9 @@
-import type { Locales, Params, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro.js';
-import { type RoutingStrategies } from '../../i18n/utils.js';
-import { AstroCookies } from '../cookies/index.js';
+import type { SSRResult } from '../../@types/astro.js';
+import { type ComponentSlots } from '../../runtime/server/index.js';
 import type { Logger } from '../logger/core.js';
-export interface CreateResultArgs {
-    /**
-     * Used to provide better error messages for `Astro.clientAddress`
-     */
-    adapterName: string | undefined;
-    /**
-     * Value of Astro config's `output` option, true if "server" or "hybrid"
-     */
-    ssr: boolean;
-    logger: Logger;
-    params: Params;
-    pathname: string;
-    renderers: SSRLoadedRenderer[];
-    clientDirectives: Map<string, string>;
-    compressHTML: boolean;
-    partial: boolean;
-    resolve: (s: string) => Promise<string>;
-    /**
-     * Used for `Astro.site`
-     */
-    site: string | undefined;
-    links: Set<SSRElement>;
-    scripts: Set<SSRElement>;
-    styles: Set<SSRElement>;
-    componentMetadata: SSRResult['componentMetadata'];
-    request: Request;
-    status: number;
-    locals: App.Locals;
-    cookies: AstroCookies;
-    locales: Locales | undefined;
-    defaultLocale: string | undefined;
-    route: string;
-    strategy: RoutingStrategies | undefined;
+export declare class Slots {
+    #private;
+    constructor(result: SSRResult, slots: ComponentSlots | null, logger: Logger);
+    has(name: string): boolean;
+    render(name: string, args?: any[]): Promise<any>;
 }
-export declare function createResult(args: CreateResultArgs): SSRResult;

package/dist/core/render/result.js

@@ -1,13 +1,6 @@
-import {
-  computeCurrentLocale,
-  computePreferredLocale,
-  computePreferredLocaleList
-} from "../../i18n/utils.js";
 import { renderSlotToString } from "../../runtime/server/index.js";
 import { renderJSX } from "../../runtime/server/jsx.js";
 import { chunkToString } from "../../runtime/server/render/index.js";
-import { clientAddressSymbol, responseSentSymbol } from "../constants.js";
-import { AstroCookies } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 function getFunctionExpression(slot) {
   if (!slot)
@@ -76,137 +69,6 @@ class Slots {
     return outHTML;
   }
 }
-function createResult(args) {
-  const { params, request, resolve, locals } = args;
-  const url = new URL(request.url);
-  const headers = new Headers();
-  headers.set("Content-Type", "text/html");
-  const response = {
-    status: args.status,
-    statusText: "OK",
-    headers
-  };
-  Object.defineProperty(response, "headers", {
-    value: response.headers,
-    enumerable: true,
-    writable: false
-  });
-  let cookies = args.cookies;
-  let preferredLocale = void 0;
-  let preferredLocaleList = void 0;
-  let currentLocale = void 0;
-  const result = {
-    styles: args.styles ?? /* @__PURE__ */ new Set(),
-    scripts: args.scripts ?? /* @__PURE__ */ new Set(),
-    links: args.links ?? /* @__PURE__ */ new Set(),
-    componentMetadata: args.componentMetadata ?? /* @__PURE__ */ new Map(),
-    renderers: args.renderers,
-    clientDirectives: args.clientDirectives,
-    compressHTML: args.compressHTML,
-    partial: args.partial,
-    pathname: args.pathname,
-    cookies,
-    /** This function returns the `Astro` faux-global */
-    createAstro(astroGlobal, props, slots) {
-      const astroSlots = new Slots(result, slots, args.logger);
-      const Astro = {
-        // @ts-expect-error
-        __proto__: astroGlobal,
-        get clientAddress() {
-          if (!(clientAddressSymbol in request)) {
-            if (args.adapterName) {
-              throw new AstroError({
-                ...AstroErrorData.ClientAddressNotAvailable,
-                message: AstroErrorData.ClientAddressNotAvailable.message(args.adapterName)
-              });
-            } else {
-              throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
-            }
-          }
-          return Reflect.get(request, clientAddressSymbol);
-        },
-        get cookies() {
-          if (cookies) {
-            return cookies;
-          }
-          cookies = new AstroCookies(request);
-          result.cookies = cookies;
-          return cookies;
-        },
-        get preferredLocale() {
-          if (preferredLocale) {
-            return preferredLocale;
-          }
-          if (args.locales) {
-            preferredLocale = computePreferredLocale(request, args.locales);
-            return preferredLocale;
-          }
-          return void 0;
-        },
-        get preferredLocaleList() {
-          if (preferredLocaleList) {
-            return preferredLocaleList;
-          }
-          if (args.locales) {
-            preferredLocaleList = computePreferredLocaleList(request, args.locales);
-            return preferredLocaleList;
-          }
-          return void 0;
-        },
-        get currentLocale() {
-          if (currentLocale) {
-            return currentLocale;
-          }
-          if (args.locales) {
-            currentLocale = computeCurrentLocale(
-              url.pathname,
-              args.locales,
-              args.strategy,
-              args.defaultLocale
-            );
-            if (currentLocale) {
-              return currentLocale;
-            }
-          }
-          return void 0;
-        },
-        params,
-        props,
-        locals,
-        request,
-        url,
-        redirect(path, status) {
-          if (request[responseSentSymbol]) {
-            throw new AstroError({
-              ...AstroErrorData.ResponseSentError
-            });
-          }
-          return new Response(null, {
-            status: status || 302,
-            headers: {
-              Location: path
-            }
-          });
-        },
-        response,
-        slots: astroSlots
-      };
-      return Astro;
-    },
-    resolve,
-    response,
-    _metadata: {
-      hasHydrationScript: false,
-      rendererSpecificHydrationScripts: /* @__PURE__ */ new Set(),
-      hasRenderedHead: false,
-      hasDirectives: /* @__PURE__ */ new Set(),
-      headInTree: false,
-      extraHead: [],
-      propagators: /* @__PURE__ */ new Set()
-    }
-  };
-  return result;
-}
 export {
-  createResult
+  Slots
 };

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

@@ -1,4 +1,4 @@
-import type { APIContext, ComponentInstance, MiddlewareHandler, RouteData } from '../@types/astro.js';
+import type { APIContext, AstroGlobal, AstroGlobalPartial, ComponentInstance, MiddlewareHandler, RouteData, SSRResult } from '../@types/astro.js';
 import { AstroCookies } from './cookies/index.js';
 import { type Pipeline } from './render/index.js';
 export declare class RenderContext {
@@ -28,7 +28,9 @@ export declare class RenderContext {
      */
     render(componentInstance: ComponentInstance | undefined): Promise<Response>;
     createAPIContext(props: APIContext['props']): APIContext;
-    createResult(mod: ComponentInstance): Promise<import("../@types/astro.js").SSRResult>;
+    createResult(mod: ComponentInstance): Promise<SSRResult>;
+    createAstro(result: SSRResult, astroGlobalPartial: AstroGlobalPartial, props: Record<string, any>, slotValues: Record<string, any> | null): AstroGlobal;
+    clientAddress(): string;
     computeCurrentLocale(): string | undefined;
     computePreferredLocale(): string | undefined;
     computePreferredLocaleList(): string[] | undefined;

package/dist/core/render-context.js

@@ -10,16 +10,15 @@ import {
   REROUTE_DIRECTIVE_HEADER,
   ROUTE_TYPE_HEADER,
   clientAddressSymbol,
-  clientLocalsSymbol
+  clientLocalsSymbol,
+  responseSentSymbol
 } from "./constants.js";
-import { attachCookiesToResponse } from "./cookies/index.js";
-import { AstroCookies } from "./cookies/index.js";
+import { AstroCookies, attachCookiesToResponse } from "./cookies/index.js";
 import { AstroError, AstroErrorData } from "./errors/index.js";
 import { callMiddleware } from "./middleware/callMiddleware.js";
 import { sequence } from "./middleware/index.js";
 import { renderRedirect } from "./redirects/render.js";
-import { createResult } from "./render/index.js";
-import { getParams, getProps } from "./render/index.js";
+import { Slots, getParams, getProps } from "./render/index.js";
 class RenderContext {
   constructor(pipeline, locals, middleware, pathname, request, routeData, status, cookies = new AstroCookies(request), params = getParams(routeData, pathname), url = new URL(request.url)) {
     this.pipeline = pipeline;
@@ -106,38 +105,15 @@ class RenderContext {
     const { cookies, params, pipeline, request, url } = this;
     const generator = `Astro v${ASTRO_VERSION}`;
     const redirect = (path, status = 302) => new Response(null, { status, headers: { Location: path } });
-    const site = pipeline.site ? new URL(pipeline.site) : void 0;
     return {
       cookies,
+      get clientAddress() {
+        return renderContext.clientAddress();
+      },
       get currentLocale() {
         return renderContext.computeCurrentLocale();
       },
       generator,
-      params,
-      get preferredLocale() {
-        return renderContext.computePreferredLocale();
-      },
-      get preferredLocaleList() {
-        return renderContext.computePreferredLocaleList();
-      },
-      props,
-      redirect,
-      request,
-      site,
-      url,
-      get clientAddress() {
-        if (clientAddressSymbol in request) {
-          return Reflect.get(request, clientAddressSymbol);
-        }
-        if (pipeline.adapterName) {
-          throw new AstroError({
-            ...AstroErrorData.ClientAddressNotAvailable,
-            message: AstroErrorData.ClientAddressNotAvailable.message(pipeline.adapterName)
-          });
-        } else {
-          throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
-        }
-      },
       get locals() {
         return renderContext.locals;
       },
@@ -149,52 +125,119 @@ class RenderContext {
           renderContext.locals = val;
           Reflect.set(request, clientLocalsSymbol, val);
         }
-      }
+      },
+      params,
+      get preferredLocale() {
+        return renderContext.computePreferredLocale();
+      },
+      get preferredLocaleList() {
+        return renderContext.computePreferredLocaleList();
+      },
+      props,
+      redirect,
+      request,
+      site: pipeline.site,
+      url
     };
   }
   async createResult(mod) {
-    const { cookies, locals, params, pathname, pipeline, request, routeData, status } = this;
-    const {
-      adapterName,
-      clientDirectives,
-      compressHTML,
-      i18n,
-      manifest,
-      logger,
-      renderers,
-      resolve,
-      site,
-      serverLike
-    } = pipeline;
+    const { cookies, pathname, pipeline, routeData, status } = this;
+    const { clientDirectives, compressHTML, manifest, renderers, resolve } = pipeline;
     const { links, scripts, styles } = await pipeline.headElements(routeData);
     const componentMetadata = await pipeline.componentMetadata(routeData) ?? manifest.componentMetadata;
-    const { defaultLocale, locales, strategy } = i18n ?? {};
+    const headers = new Headers({ "Content-Type": "text/html" });
     const partial = Boolean(mod.partial);
-    return createResult({
-      adapterName,
+    const response = {
+      status,
+      statusText: "OK",
+      get headers() {
+        return headers;
+      },
+      // Disallow `Astro.response.headers = new Headers`
+      set headers(_) {
+        throw new AstroError(AstroErrorData.AstroResponseHeadersReassigned);
+      }
+    };
+    const result = {
       clientDirectives,
       componentMetadata,
       compressHTML,
       cookies,
-      defaultLocale,
-      locales,
-      locals,
-      logger,
+      /** This function returns the `Astro` faux-global */
+      createAstro: (astroGlobal, props, slots) => this.createAstro(result, astroGlobal, props, slots),
       links,
-      params,
       partial,
       pathname,
       renderers,
       resolve,
-      request,
-      route: routeData.route,
-      strategy,
-      site,
+      response,
       scripts,
-      ssr: serverLike,
-      status,
-      styles
-    });
+      styles,
+      _metadata: {
+        hasHydrationScript: false,
+        rendererSpecificHydrationScripts: /* @__PURE__ */ new Set(),
+        hasRenderedHead: false,
+        hasDirectives: /* @__PURE__ */ new Set(),
+        headInTree: false,
+        extraHead: [],
+        propagators: /* @__PURE__ */ new Set()
+      }
+    };
+    return result;
+  }
+  createAstro(result, astroGlobalPartial, props, slotValues) {
+    const renderContext = this;
+    const { cookies, locals, params, pipeline, request, url } = this;
+    const { response } = result;
+    const redirect = (path, status = 302) => {
+      if (request[responseSentSymbol]) {
+        throw new AstroError({
+          ...AstroErrorData.ResponseSentError
+        });
+      }
+      return new Response(null, { status, headers: { Location: path } });
+    };
+    const slots = new Slots(result, slotValues, pipeline.logger);
+    const astroGlobalCombined = {
+      ...astroGlobalPartial,
+      cookies,
+      get clientAddress() {
+        return renderContext.clientAddress();
+      },
+      get currentLocale() {
+        return renderContext.computeCurrentLocale();
+      },
+      params,
+      get preferredLocale() {
+        return renderContext.computePreferredLocale();
+      },
+      get preferredLocaleList() {
+        return renderContext.computePreferredLocaleList();
+      },
+      props,
+      locals,
+      redirect,
+      request,
+      response,
+      slots,
+      site: pipeline.site,
+      url
+    };
+    return astroGlobalCombined;
+  }
+  clientAddress() {
+    const { pipeline, request } = this;
+    if (clientAddressSymbol in request) {
+      return Reflect.get(request, clientAddressSymbol);
+    }
+    if (pipeline.adapterName) {
+      throw new AstroError({
+        ...AstroErrorData.ClientAddressNotAvailable,
+        message: AstroErrorData.ClientAddressNotAvailable.message(pipeline.adapterName)
+      });
+    } else {
+      throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
+    }
   }
   /**
    * API Context may be created multiple times per request, i18n data needs to be computed only once.
@@ -210,12 +253,8 @@ class RenderContext {
     if (!i18n)
       return;
     const { defaultLocale, locales, strategy } = i18n;
-    return this.#currentLocale ??= computeCurrentLocale(
-      routeData.route,
-      locales,
-      strategy,
-      defaultLocale
-    );
+    const fallbackTo = strategy === "pathname-prefix-other-locales" || strategy === "domains-prefix-other-locales" ? defaultLocale : void 0;
+    return this.#currentLocale ??= computeCurrentLocale(routeData.route, locales) ?? computeCurrentLocale(url.pathname, locales) ?? fallbackTo;
   }
   #preferredLocale;
   computePreferredLocale() {

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

@@ -20,9 +20,11 @@ function countOccurrences(needle, haystack) {
   }
   return count;
 }
+const ROUTE_DYNAMIC_SPLIT = /\[(.+?\(.+?\)|.+?)\]/;
+const ROUTE_SPREAD = /^\.{3}.+$/;
 function getParts(part, file) {
   const result = [];
-  part.split(/\[(.+?\(.+?\)|.+?)\]/).map((str, i) => {
+  part.split(ROUTE_DYNAMIC_SPLIT).map((str, i) => {
     if (!str)
       return;
     const dynamic = i % 2 === 1;
@@ -33,7 +35,7 @@ function getParts(part, file) {
     result.push({
       content,
       dynamic,
-      spread: dynamic && /^\.{3}.+$/.test(content)
+      spread: dynamic && ROUTE_SPREAD.test(content)
     });
   });
   return result;
@@ -116,6 +118,11 @@ function routeComparator(a, b) {
     if (aIsStatic !== bIsStatic) {
       return aIsStatic ? -1 : 1;
     }
+    const aAllDynamic = aSegment.every((part) => part.dynamic);
+    const bAllDynamic = bSegment.every((part) => part.dynamic);
+    if (aAllDynamic !== bAllDynamic) {
+      return aAllDynamic ? 1 : -1;
+    }
     const aHasSpread = aSegment.some((part) => part.spread);
     const bHasSpread = bSegment.some((part) => part.spread);
     if (aHasSpread !== bHasSpread) {

package/dist/i18n/utils.d.ts

@@ -20,7 +20,7 @@ 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 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 {};

package/dist/i18n/utils.js

@@ -109,7 +109,7 @@ function computePreferredLocaleList(request, locales) {
   }
   return result;
 }
-function computeCurrentLocale(pathname, locales, routingStrategy, defaultLocale) {
+function computeCurrentLocale(pathname, locales) {
   for (const segment of pathname.split("/")) {
     for (const locale of locales) {
       if (typeof locale === "string") {
@@ -131,10 +131,6 @@ function computeCurrentLocale(pathname, locales, routingStrategy, defaultLocale)
       }
     }
   }
-  if (routingStrategy === "pathname-prefix-other-locales" || routingStrategy === "domains-prefix-other-locales") {
-    return defaultLocale;
-  }
-  return void 0;
 }
 function toRoutingStrategy(i18n) {
   let { routing, domains } = i18n;

package/dist/prefetch/index.js

@@ -200,6 +200,15 @@ function appendSpeculationRules(url) {
         source: "list",
         urls: [url]
       }
+    ],
+    // Currently, adding `prefetch` is required to fallback if `prerender` fails.
+    // Possibly will be automatic in the future, in which case it can be removed.
+    // https://github.com/WICG/nav-speculation/issues/162#issuecomment-1977818473
+    prefetch: [
+      {
+        source: "list",
+        urls: [url]
+      }
     ]
   });
   document.head.append(script);

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

@@ -35,7 +35,24 @@ const a11y_required_attributes = {
   img: ["alt"],
   object: ["title", "aria-label", "aria-labelledby"]
 };
-const interactiveElements = ["button", "details", "embed", "iframe", "label", "select", "textarea"];
+const MAYBE_INTERACTIVE = /* @__PURE__ */ new Map([
+  ["a", "href"],
+  ["input", "type"],
+  ["audio", "controls"],
+  ["img", "usemap"],
+  ["object", "usemap"],
+  ["video", "controls"]
+]);
+const interactiveElements = [
+  "button",
+  "details",
+  "embed",
+  "iframe",
+  "label",
+  "select",
+  "textarea",
+  ...MAYBE_INTERACTIVE.keys()
+];
 const labellableElements = ["input", "meter", "output", "progress", "select", "textarea"];
 const aria_non_interactive_roles = [
   "alert",
@@ -170,6 +187,13 @@ const ariaRoles = new Set(
     " "
   )
 );
+function isInteractive(element) {
+  const attribute = MAYBE_INTERACTIVE.get(element.localName);
+  if (attribute) {
+    return element.hasAttribute(attribute);
+  }
+  return true;
+}
 const a11y = [
   {
     code: "a11y-accesskey",
@@ -390,6 +414,8 @@ const a11y = [
     message: "Interactive HTML elements like `<a>` and `<button>` cannot use non-interactive roles like `heading`, `list`, `menu`, and `toolbar`.",
     selector: `[role]:is(${interactiveElements.join(",")})`,
     match(element) {
+      if (!isInteractive(element))
+        return false;
       const role = element.getAttribute("role");
       if (!role)
         return false;
@@ -405,6 +431,8 @@ const a11y = [
     message: "Interactive roles should not be used to convert a non-interactive element to an interactive element",
     selector: `[role]:not(${interactiveElements.join(",")})`,
     match(element) {
+      if (!isInteractive(element))
+        return false;
       const role = element.getAttribute("role");
       if (!role)
         return false;
@@ -426,6 +454,8 @@ const a11y = [
       const isScrollable = element.scrollHeight > element.clientHeight || element.scrollWidth > element.clientWidth;
       if (isScrollable)
         return false;
+      if (!isInteractive(element))
+        return false;
       if (!interactiveElements.includes(element.localName))
         return true;
     }

package/dist/runtime/server/astro-global.js

@@ -21,6 +21,8 @@ function createAstroGlobFn() {
 }
 function createAstro(site) {
   return {
+    // TODO: this is no longer neccessary for `Astro.site`
+    // but it somehow allows working around caching issues in content collections for some tests
     site: site ? new URL(site) : void 0,
     generator: `Astro v${ASTRO_VERSION}`,
     glob: createAstroGlobFn()

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

@@ -107,7 +107,7 @@ function createDevelopmentManifest(settings) {
     renderers: [],
     base: settings.config.base,
     assetsPrefix: settings.config.build.assetsPrefix,
-    site: settings.config.site ? new URL(settings.config.base, settings.config.site).toString() : settings.config.site,
+    site: settings.config.site,
     componentMetadata: /* @__PURE__ */ new Map(),
     i18n: i18nManifest,
     middleware(_, next) {

package/package.json

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