astro 3.5.5 → 3.5.6

package/components/ViewTransitions.astro

@@ -30,6 +30,7 @@ const { fallback = 'animate', handleForms } = Astro.props;
 	import type { Options } from 'astro:transitions/client';
 	import { supportsViewTransitions, navigate } from 'astro:transitions/client';
 	// NOTE: import from `astro/prefetch` as `astro:prefetch` requires the `prefetch` config to be enabled
+	// @ts-ignore
 	import { init } from 'astro/prefetch';
 
 	export type Fallback = 'none' | 'animate' | 'swap';
@@ -42,27 +43,34 @@ const { fallback = 'animate', handleForms } = Astro.props;
 		return 'animate';
 	}
 
-	function isReloadEl(el: HTMLElement): boolean {
+	function isReloadEl(el: HTMLElement | SVGAElement): boolean {
 		return el.dataset.astroReload !== undefined;
 	}
 
 	if (supportsViewTransitions || getFallback() !== 'none') {
 		document.addEventListener('click', (ev) => {
 			let link = ev.target;
-			if (link instanceof Element && link.tagName !== 'A') {
-				link = link.closest('a');
+			if (link instanceof Element) {
+				link = link.closest('a, area');
 			}
+			if (
+				!(link instanceof HTMLAnchorElement) &&
+				!(link instanceof SVGAElement) &&
+				!(link instanceof HTMLAreaElement)
+			)
+				return;
 			// This check verifies that the click is happening on an anchor
 			// that is going to another page within the same origin. Basically it determines
 			// same-origin navigation, but omits special key combos for new tabs, etc.
+			const linkTarget = link instanceof HTMLElement ? link.target : link.target.baseVal;
+			const href = link instanceof HTMLElement ? link.href : link.href.baseVal;
+			const origin = new URL(href, location.href).origin;
 			if (
-				!link ||
-				!(link instanceof HTMLAnchorElement) ||
 				isReloadEl(link) ||
 				link.hasAttribute('download') ||
 				!link.href ||
-				(link.target && link.target !== '_self') ||
-				link.origin !== location.origin ||
+				(linkTarget && linkTarget !== '_self') ||
+				origin !== location.origin ||
 				ev.button !== 0 || // left clicks only
 				ev.metaKey || // new tab (mac)
 				ev.ctrlKey || // new tab (windows)
@@ -75,7 +83,7 @@ const { fallback = 'animate', handleForms } = Astro.props;
 				return;
 			}
 			ev.preventDefault();
-			navigate(link.href, {
+			navigate(href, {
 				history: link.dataset.astroHistory === 'replace' ? 'replace' : 'auto',
 			});
 		});

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

@@ -1903,6 +1903,10 @@ interface AstroSharedContext<Props extends Record<string, any> = Record<string,
      * The list of locales computed from the `Accept-Language` header of the browser, sorted by quality value (**SSR Only**).
      */
     preferredLocaleList: string[] | undefined;
+    /**
+     * The current locale computed from the URL of the request. It matches the locales in `i18n.locales`, and returns `undefined` otherwise.
+     */
+    currentLocale: string | undefined;
 }
 export interface APIContext<Props extends Record<string, any> = Record<string, any>, APIParams extends Record<string, string | undefined> = Record<string, string | undefined>> extends AstroSharedContext<Props, Params> {
     site: URL | undefined;
@@ -2025,6 +2029,10 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
      * [quality value]: https://developer.mozilla.org/en-US/docs/Glossary/Quality_values
      */
     preferredLocaleList: string[] | undefined;
+    /**
+     * The current locale computed from the URL of the request. It matches the locales in `i18n.locales`, and returns `undefined` otherwise.
+     */
+    currentLocale: string | undefined;
 }
 export type EndpointOutput = {
     body: Body;
@@ -2178,14 +2186,16 @@ export interface RouteData {
     prerender: boolean;
     redirect?: RedirectConfig;
     redirectRoute?: RouteData;
+    fallbackRoutes: RouteData[];
 }
 export type RedirectRouteData = RouteData & {
     redirect: string;
 };
-export type SerializedRouteData = Omit<RouteData, 'generate' | 'pattern' | 'redirectRoute'> & {
+export type SerializedRouteData = Omit<RouteData, 'generate' | 'pattern' | 'redirectRoute' | 'fallbackRoutes'> & {
     generate: undefined;
     pattern: string;
     redirectRoute: SerializedRouteData | undefined;
+    fallbackRoutes: SerializedRouteData[];
     _meta: {
         trailingSlash: AstroConfig['trailingSlash'];
     };

package/dist/cli/add/index.js

@@ -608,8 +608,10 @@ async function fetchPackageJson(scope, name, tag) {
   const res = await fetch(`${registry}/${packageName}/${tag}`);
   if (res.status >= 200 && res.status < 300) {
     return await res.json();
-  } else {
+  } else if (res.status === 404) {
     return new Error();
+  } else {
+    return new Error(`Failed to fetch ${registry}/${packageName}/${tag} - GET ${res.status}`);
   }
 }
 async function validateIntegrations(integrations) {
@@ -629,6 +631,9 @@ async function validateIntegrations(integrations) {
         } else {
           const firstPartyPkgCheck = await fetchPackageJson("@astrojs", name, tag);
           if (firstPartyPkgCheck instanceof Error) {
+            if (firstPartyPkgCheck.message) {
+              spinner.warn(yellow(firstPartyPkgCheck.message));
+            }
             spinner.warn(
               yellow(`${bold(integration)} is not an official Astro package. Use at your own risk!`)
             );
@@ -655,6 +660,9 @@ async function validateIntegrations(integrations) {
         if (pkgType === "third-party") {
           const thirdPartyPkgCheck = await fetchPackageJson(scope, name, tag);
           if (thirdPartyPkgCheck instanceof Error) {
+            if (thirdPartyPkgCheck.message) {
+              spinner.warn(yellow(thirdPartyPkgCheck.message));
+            }
             throw new Error(`Unable to fetch ${bold(integration)}. Does the package exist?`);
           } else {
             pkgJson = thirdPartyPkgCheck;

package/dist/core/app/index.js

@@ -96,6 +96,11 @@ class App {
     }
     return pathname;
   }
+  #getPathnameFromRequest(request) {
+    const url = new URL(request.url);
+    const pathname = prependForwardSlash(this.removeBase(url.pathname));
+    return pathname;
+  }
   match(request, _opts = {}) {
     const url = new URL(request.url);
     if (this.#manifest.assets.has(url.pathname))
@@ -117,7 +122,8 @@ class App {
       return this.#renderError(request, { status: 404 });
     }
     Reflect.set(request, clientLocalsSymbol, locals ?? {});
-    const defaultStatus = this.#getDefaultStatusCode(routeData.route);
+    const pathname = this.#getPathnameFromRequest(request);
+    const defaultStatus = this.#getDefaultStatusCode(routeData, pathname);
     const mod = await this.#getModuleForRoute(routeData);
     const pageModule = await mod.page();
     const url = new URL(request.url);
@@ -188,7 +194,9 @@ class App {
         status,
         env: this.#pipeline.env,
         mod: handler,
-        locales: this.#manifest.i18n ? this.#manifest.i18n.locales : void 0
+        locales: this.#manifest.i18n?.locales,
+        routingStrategy: this.#manifest.i18n?.routingStrategy,
+        defaultLocale: this.#manifest.i18n?.defaultLocale
       });
     } else {
       const pathname = prependForwardSlash(this.removeBase(url.pathname));
@@ -220,7 +228,9 @@ class App {
         status,
         mod,
         env: this.#pipeline.env,
-        locales: this.#manifest.i18n ? this.#manifest.i18n.locales : void 0
+        locales: this.#manifest.i18n?.locales,
+        routingStrategy: this.#manifest.i18n?.routingStrategy,
+        defaultLocale: this.#manifest.i18n?.defaultLocale
       });
     }
   }
@@ -293,8 +303,15 @@ class App {
       headers: new Headers(Array.from(headers))
     });
   }
-  #getDefaultStatusCode(route) {
-    route = removeTrailingForwardSlash(route);
+  #getDefaultStatusCode(routeData, pathname) {
+    if (!routeData.pattern.exec(pathname)) {
+      for (const fallbackRoute of routeData.fallbackRoutes) {
+        if (fallbackRoute.pattern.test(pathname)) {
+          return 302;
+        }
+      }
+    }
+    const route = removeTrailingForwardSlash(routeData.route);
     if (route.endsWith("/404"))
       return 404;
     if (route.endsWith("/500"))

package/dist/core/build/buildPipeline.js

@@ -128,13 +128,11 @@ class BuildPipeline extends Pipeline {
         pages.set(pageData, filePath);
       }
     }
-    for (const [path, pageDataList] of this.#internals.pagesByComponents.entries()) {
-      for (const pageData of pageDataList) {
-        if (routeIsRedirect(pageData.route)) {
-          pages.set(pageData, path);
-        } else if (routeIsFallback(pageData.route) && (i18nHasFallback(this.getConfig()) || routeIsFallback(pageData.route) && pageData.route.route === "/")) {
-          pages.set(pageData, path);
-        }
+    for (const [path, pageData] of this.#internals.pagesByComponent.entries()) {
+      if (routeIsRedirect(pageData.route)) {
+        pages.set(pageData, path);
+      } else if (routeIsFallback(pageData.route) && (i18nHasFallback(this.getConfig()) || routeIsFallback(pageData.route) && pageData.route.route === "/")) {
+        pages.set(pageData, path);
       }
     }
     return pages;

package/dist/core/build/generate.js

@@ -194,15 +194,40 @@ ${bgGreen(black(` generating optimized images `))}`);
   });
 }
 async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
-  let timeStart = performance.now();
   const logger = pipeline.getLogger();
   const config = pipeline.getConfig();
-  const pageInfo = getPageDataByComponent(pipeline.getInternals(), pageData.route.component);
-  const linkIds = [];
-  const scripts = pageInfo?.hoistedScript ?? null;
-  const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
+  const manifest = pipeline.getManifest();
   const pageModulePromise = ssrEntry.page;
   const onRequest = ssrEntry.onRequest;
+  const pageInfo = getPageDataByComponent(pipeline.getInternals(), pageData.route.component);
+  const hoistedScripts = pageInfo?.hoistedScript ?? null;
+  const moduleStyles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
+  const links = /* @__PURE__ */ new Set();
+  const styles = createStylesheetElementSet(moduleStyles, manifest.base, manifest.assetsPrefix);
+  const scripts = createModuleScriptsSet(
+    hoistedScripts ? [hoistedScripts] : [],
+    manifest.base,
+    manifest.assetsPrefix
+  );
+  if (pipeline.getSettings().scripts.some((script) => script.stage === "page")) {
+    const hashedFilePath = pipeline.getInternals().entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);
+    if (typeof hashedFilePath !== "string") {
+      throw new Error(`Cannot find the built path for ${PAGE_SCRIPT_ID}`);
+    }
+    const src = createAssetLink(hashedFilePath, manifest.base, manifest.assetsPrefix);
+    scripts.add({
+      props: { type: "module", src },
+      children: ""
+    });
+  }
+  for (const script of pipeline.getSettings().scripts) {
+    if (script.stage === "head-inline") {
+      scripts.add({
+        props: {},
+        children: script.content
+      });
+    }
+  }
   const i18nMiddleware = createI18nMiddleware(
     pipeline.getManifest().i18n,
     pipeline.getManifest().base,
@@ -234,42 +259,44 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     );
     return;
   }
-  const generationOptions = {
-    pageData,
-    linkIds,
-    scripts,
-    styles,
-    mod: pageModule
-  };
-  const icon = pageData.route.type === "page" || pageData.route.type === "redirect" || pageData.route.type === "fallback" ? green("\u25B6") : magenta("\u03BB");
-  if (isRelativePath(pageData.route.component)) {
-    logger.info(null, `${icon} ${pageData.route.route}`);
-  } else {
-    logger.info(null, `${icon} ${pageData.route.component}`);
+  for (const route of eachRouteInRouteData(pageData)) {
+    const paths = await getPathsForRoute(route, pageModule, pipeline, builtPaths);
+    let timeStart = performance.now();
+    let prevTimeEnd = timeStart;
+    for (let i = 0; i < paths.length; i++) {
+      const path = paths[i];
+      pipeline.getEnvironment().logger.debug("build", `Generating: ${path}`);
+      await generatePath(path, pipeline, route, links, scripts, styles, pageModule);
+      const timeEnd = performance.now();
+      const timeChange = getTimeStat(prevTimeEnd, timeEnd);
+      const timeIncrease = `(+${timeChange})`;
+      const filePath = getOutputFilename(pipeline.getConfig(), path, pageData.route.type);
+      const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
+      logger.info(null, `  ${cyan(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
+      prevTimeEnd = timeEnd;
+    }
   }
-  const paths = await getPathsForRoute(pageData, pageModule, pipeline, builtPaths);
-  let prevTimeEnd = timeStart;
-  for (let i = 0; i < paths.length; i++) {
-    const path = paths[i];
-    await generatePath(path, generationOptions, pipeline);
-    const timeEnd = performance.now();
-    const timeChange = getTimeStat(prevTimeEnd, timeEnd);
-    const timeIncrease = `(+${timeChange})`;
-    const filePath = getOutputFilename(pipeline.getConfig(), path, pageData.route.type);
-    const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
-    logger.info(null, `  ${cyan(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
-    prevTimeEnd = timeEnd;
+}
+function* eachRouteInRouteData(data) {
+  yield data.route;
+  for (const fallbackRoute of data.route.fallbackRoutes) {
+    yield fallbackRoute;
   }
 }
-async function getPathsForRoute(pageData, mod, pipeline, builtPaths) {
+async function getPathsForRoute(route, mod, pipeline, builtPaths) {
   const opts = pipeline.getStaticBuildOptions();
   const logger = pipeline.getLogger();
   let paths = [];
-  if (pageData.route.pathname) {
-    paths.push(pageData.route.pathname);
-    builtPaths.add(pageData.route.pathname);
+  if (route.pathname) {
+    paths.push(route.pathname);
+    builtPaths.add(route.pathname);
+    for (const virtualRoute of route.fallbackRoutes) {
+      if (virtualRoute.pathname) {
+        paths.push(virtualRoute.pathname);
+        builtPaths.add(virtualRoute.pathname);
+      }
+    }
   } else {
-    const route = pageData.route;
     const staticPaths = await callGetStaticPaths({
       mod,
       route,
@@ -353,38 +380,18 @@ function getUrlForPath(pathname, base, origin, format, routeType) {
   const url = new URL(buildPathname, origin);
   return url;
 }
-async function generatePath(pathname, gopts, pipeline) {
+async function generatePath(pathname, pipeline, route, links, scripts, styles, mod) {
   const manifest = pipeline.getManifest();
-  const { mod, scripts: hoistedScripts, styles: _styles, pageData } = gopts;
-  if (pageData.route.type === "page") {
-    addPageName(pathname, pipeline.getStaticBuildOptions());
-  }
+  const logger = pipeline.getLogger();
   pipeline.getEnvironment().logger.debug("build", `Generating: ${pathname}`);
-  const links = /* @__PURE__ */ new Set();
-  const scripts = createModuleScriptsSet(
-    hoistedScripts ? [hoistedScripts] : [],
-    manifest.base,
-    manifest.assetsPrefix
-  );
-  const styles = createStylesheetElementSet(_styles, manifest.base, manifest.assetsPrefix);
-  if (pipeline.getSettings().scripts.some((script) => script.stage === "page")) {
-    const hashedFilePath = pipeline.getInternals().entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);
-    if (typeof hashedFilePath !== "string") {
-      throw new Error(`Cannot find the built path for ${PAGE_SCRIPT_ID}`);
-    }
-    const src = createAssetLink(hashedFilePath, manifest.base, manifest.assetsPrefix);
-    scripts.add({
-      props: { type: "module", src },
-      children: ""
-    });
+  const icon = route.type === "page" || route.type === "redirect" || route.type === "fallback" ? green("\u25B6") : magenta("\u03BB");
+  if (isRelativePath(route.component)) {
+    logger.info(null, `${icon} ${route.route}`);
+  } else {
+    logger.info(null, `${icon} ${route.component}`);
   }
-  for (const script of pipeline.getSettings().scripts) {
-    if (script.stage === "head-inline") {
-      scripts.add({
-        props: {},
-        children: script.content
-      });
-    }
+  if (route.type === "page") {
+    addPageName(pathname, pipeline.getStaticBuildOptions());
   }
   const ssr = isServerLikeOutput(pipeline.getConfig());
   const url = getUrlForPath(
@@ -392,7 +399,7 @@ async function generatePath(pathname, gopts, pipeline) {
     pipeline.getConfig().base,
     pipeline.getStaticBuildOptions().origin,
     pipeline.getConfig().build.format,
-    pageData.route.type
+    route.type
   );
   const request = createRequest({
     url,
@@ -408,10 +415,12 @@ async function generatePath(pathname, gopts, pipeline) {
     scripts,
     styles,
     links,
-    route: pageData.route,
+    route,
     env: pipeline.getEnvironment(),
     mod,
-    locales: i18n ? i18n.locales : void 0
+    locales: i18n?.locales,
+    routingStrategy: i18n?.routingStrategy,
+    defaultLocale: i18n?.defaultLocale
   });
   let body;
   let encoding;
@@ -420,7 +429,7 @@ async function generatePath(pathname, gopts, pipeline) {
     response = await pipeline.renderRoute(renderContext, mod);
   } catch (err) {
     if (!AstroError.is(err) && !err.id && typeof err === "object") {
-      err.id = pageData.component;
+      err.id = route.component;
     }
     throw err;
   }
@@ -444,8 +453,8 @@ async function generatePath(pathname, gopts, pipeline) {
     if (pipeline.getConfig().compressHTML === true) {
       body = body.replaceAll("\n", "");
     }
-    if (pageData.route.type !== "redirect") {
-      pageData.route.redirect = location.toString();
+    if (route.type !== "redirect") {
+      route.redirect = location.toString();
     }
   } else {
     if (!response.body)
@@ -453,9 +462,9 @@ async function generatePath(pathname, gopts, pipeline) {
     body = Buffer.from(await response.arrayBuffer());
     encoding = response.headers.get("X-Astro-Encoding") ?? "utf-8";
   }
-  const outFolder = getOutFolder(pipeline.getConfig(), pathname, pageData.route.type);
-  const outFile = getOutFile(pipeline.getConfig(), outFolder, pathname, pageData.route.type);
-  pageData.route.distURL = outFile;
+  const outFolder = getOutFolder(pipeline.getConfig(), pathname, route.type);
+  const outFile = getOutFile(pipeline.getConfig(), outFolder, pathname, route.type);
+  route.distURL = outFile;
   await fs.promises.mkdir(outFolder, { recursive: true });
   await fs.promises.writeFile(outFile, body, encoding);
 }

package/dist/core/build/internal.d.ts

@@ -20,14 +20,8 @@ export interface BuildInternals {
     pageToBundleMap: Map<string, string>;
     /**
      * A map for page-specific information.
-     * // TODO: Remove in Astro 4.0
-     * @deprecated
      */
     pagesByComponent: Map<string, PageBuildData>;
-    /**
-     * TODO: Use this in Astro 4.0
-     */
-    pagesByComponents: Map<string, PageBuildData[]>;
     /**
      * A map for page-specific output.
      */

package/dist/core/build/internal.js

@@ -1,5 +1,4 @@
 import { prependForwardSlash, removeFileExtension } from "../path.js";
-import { routeIsFallback } from "../redirects/helpers.js";
 import { viteID } from "../util.js";
 import {
   ASTRO_PAGE_RESOLVED_MODULE_ID,
@@ -18,7 +17,6 @@ function createBuildInternals() {
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
     pageToBundleMap: /* @__PURE__ */ new Map(),
     pagesByComponent: /* @__PURE__ */ new Map(),
-    pagesByComponents: /* @__PURE__ */ new Map(),
     pageOptionsByPage: /* @__PURE__ */ new Map(),
     pagesByViteID: /* @__PURE__ */ new Map(),
     pagesByClientOnly: /* @__PURE__ */ new Map(),
@@ -35,16 +33,7 @@ function createBuildInternals() {
 }
 function trackPageData(internals, component, pageData, componentModuleId, componentURL) {
   pageData.moduleSpecifier = componentModuleId;
-  if (!routeIsFallback(pageData.route)) {
-    internals.pagesByComponent.set(component, pageData);
-  }
-  const list = internals.pagesByComponents.get(component);
-  if (list) {
-    list.push(pageData);
-    internals.pagesByComponents.set(component, list);
-  } else {
-    internals.pagesByComponents.set(component, [pageData]);
-  }
+  internals.pagesByComponent.set(component, pageData);
   internals.pagesByViteID.set(viteID(componentURL), pageData);
 }
 function trackClientOnlyPageDatas(internals, pageData, clientOnlys) {
@@ -105,10 +94,8 @@ function* eachPageData(internals) {
   yield* internals.pagesByComponent.values();
 }
 function* eachPageFromAllPages(allPages) {
-  for (const [path, list] of Object.entries(allPages)) {
-    for (const pageData of list) {
-      yield [path, pageData];
-    }
+  for (const [path, pageData] of Object.entries(allPages)) {
+    yield [path, pageData];
   }
 }
 function* eachPageDataFromEntryPoint(internals) {

package/dist/core/build/page-data.js

@@ -21,29 +21,15 @@ async function collectPagesData(opts) {
         clearInterval(routeCollectionLogTimeout);
       }, 1e4);
       builtPaths.add(route.pathname);
-      if (allPages[route.component]) {
-        allPages[route.component].push({
-          component: route.component,
-          route,
-          moduleSpecifier: "",
-          styles: [],
-          propagatedStyles: /* @__PURE__ */ new Map(),
-          propagatedScripts: /* @__PURE__ */ new Map(),
-          hoistedScript: void 0
-        });
-      } else {
-        allPages[route.component] = [
-          {
-            component: route.component,
-            route,
-            moduleSpecifier: "",
-            styles: [],
-            propagatedStyles: /* @__PURE__ */ new Map(),
-            propagatedScripts: /* @__PURE__ */ new Map(),
-            hoistedScript: void 0
-          }
-        ];
-      }
+      allPages[route.component] = {
+        component: route.component,
+        route,
+        moduleSpecifier: "",
+        styles: [],
+        propagatedStyles: /* @__PURE__ */ new Map(),
+        propagatedScripts: /* @__PURE__ */ new Map(),
+        hoistedScript: void 0
+      };
       clearInterval(routeCollectionLogTimeout);
       if (settings.config.output === "static") {
         const html = `${route.pathname}`.replace(/\/?$/, "/index.html");
@@ -56,29 +42,15 @@ async function collectPagesData(opts) {
       }
       continue;
     }
-    if (allPages[route.component]) {
-      allPages[route.component].push({
-        component: route.component,
-        route,
-        moduleSpecifier: "",
-        styles: [],
-        propagatedStyles: /* @__PURE__ */ new Map(),
-        propagatedScripts: /* @__PURE__ */ new Map(),
-        hoistedScript: void 0
-      });
-    } else {
-      allPages[route.component] = [
-        {
-          component: route.component,
-          route,
-          moduleSpecifier: "",
-          styles: [],
-          propagatedStyles: /* @__PURE__ */ new Map(),
-          propagatedScripts: /* @__PURE__ */ new Map(),
-          hoistedScript: void 0
-        }
-      ];
-    }
+    allPages[route.component] = {
+      component: route.component,
+      route,
+      moduleSpecifier: "",
+      styles: [],
+      propagatedStyles: /* @__PURE__ */ new Map(),
+      propagatedScripts: /* @__PURE__ */ new Map(),
+      hoistedScript: void 0
+    };
   }
   clearInterval(dataCollectionLogTimeout);
   return { assets, allPages };

package/dist/core/build/static-build.js

@@ -39,14 +39,12 @@ async function viteBuild(opts) {
   settings.timer.start("SSR build");
   const pageInput = /* @__PURE__ */ new Set();
   const internals = createBuildInternals();
-  for (const [component, pageDataList] of Object.entries(allPages)) {
-    for (const pageData of pageDataList) {
-      const astroModuleURL = new URL("./" + component, settings.config.root);
-      const astroModuleId = prependForwardSlash(component);
-      trackPageData(internals, component, pageData, astroModuleId, astroModuleURL);
-      if (!routeIsRedirect(pageData.route)) {
-        pageInput.add(astroModuleId);
-      }
+  for (const [component, pageData] of Object.entries(allPages)) {
+    const astroModuleURL = new URL("./" + component, settings.config.root);
+    const astroModuleId = prependForwardSlash(component);
+    trackPageData(internals, component, pageData, astroModuleId, astroModuleURL);
+    if (!routeIsRedirect(pageData.route)) {
+      pageInput.add(astroModuleId);
     }
   }
   if (settings.config?.vite?.build?.emptyOutDir !== false) {
@@ -108,7 +106,7 @@ async function ssrBuild(opts, internals, input, container) {
   const { allPages, settings, viteConfig } = opts;
   const ssr = isServerLikeOutput(settings.config);
   const out = getOutputDirectory(settings.config);
-  const routes = Object.values(allPages).flat().map((pageData) => pageData.route);
+  const routes = Object.values(allPages).flatMap((pageData) => pageData.route);
   const isContentCache = !ssr && settings.config.experimental.contentCollectionCache;
   const { lastVitePlugins, vitePlugins } = await container.runBeforeHook("server", input);
   const viteBuildConfig = {

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

@@ -29,7 +29,7 @@ export interface PageBuildData {
         sheet: StylesheetAsset;
     }>;
 }
-export type AllPagesData = Record<ComponentPath, PageBuildData[]>;
+export type AllPagesData = Record<ComponentPath, PageBuildData>;
 /** Options for the static build */
 export interface StaticBuildOptions {
     allPages: AllPagesData;

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

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

@@ -8,16 +8,18 @@ type CreateAPIContext = {
     props: Record<string, any>;
     adapterName?: string;
     locales: string[] | undefined;
+    routingStrategy: 'prefix-always' | 'prefix-other-locales' | undefined;
+    defaultLocale: string | undefined;
 };
 /**
  * Creates a context that holds all the information needed to handle an Astro endpoint.
  *
  * @param {CreateAPIContext} payload
  */
-export declare function createAPIContext({ request, params, site, props, adapterName, locales, }: CreateAPIContext): APIContext;
+export declare function createAPIContext({ request, params, site, props, adapterName, locales, routingStrategy, defaultLocale, }: CreateAPIContext): APIContext;
 type ResponseParameters = ConstructorParameters<typeof Response>;
 export declare class ResponseWithEncoding extends Response {
     constructor(body: ResponseParameters[0], init: ResponseParameters[1], encoding?: BufferEncoding);
 }
-export declare function callEndpoint<MiddlewareResult = Response | EndpointOutput>(mod: EndpointHandler, env: Environment, ctx: RenderContext, onRequest: MiddlewareHandler<MiddlewareResult> | undefined, locales: undefined | string[]): Promise<Response>;
+export declare function callEndpoint<MiddlewareResult = Response | EndpointOutput>(mod: EndpointHandler, env: Environment, ctx: RenderContext, onRequest: MiddlewareHandler<MiddlewareResult> | undefined): Promise<Response>;
 export {};

package/dist/core/endpoint/index.js

@@ -4,7 +4,11 @@ import { ASTRO_VERSION } from "../constants.js";
 import { AstroCookies, attachCookiesToResponse } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { callMiddleware } from "../middleware/callMiddleware.js";
-import { computePreferredLocale, computePreferredLocaleList } from "../render/context.js";
+import {
+  computeCurrentLocale,
+  computePreferredLocale,
+  computePreferredLocaleList
+} from "../render/context.js";
 import {} from "../render/index.js";
 const encoder = new TextEncoder();
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
@@ -15,10 +19,13 @@ function createAPIContext({
   site,
   props,
   adapterName,
-  locales
+  locales,
+  routingStrategy,
+  defaultLocale
 }) {
   let preferredLocale = void 0;
   let preferredLocaleList = void 0;
+  let currentLocale = void 0;
   const context = {
     cookies: new AstroCookies(request),
     request,
@@ -55,6 +62,15 @@ function createAPIContext({
       }
       return void 0;
     },
+    get currentLocale() {
+      if (currentLocale) {
+        return currentLocale;
+      }
+      if (locales) {
+        currentLocale = computeCurrentLocale(request, locales, routingStrategy, defaultLocale);
+      }
+      return currentLocale;
+    },
     url: new URL(request.url),
     get clientAddress() {
       if (clientAddressSymbol in request) {
@@ -106,14 +122,16 @@ class ResponseWithEncoding extends Response {
     }
   }
 }
-async function callEndpoint(mod, env, ctx, onRequest, locales) {
+async function callEndpoint(mod, env, ctx, onRequest) {
   const context = createAPIContext({
     request: ctx.request,
     params: ctx.params,
     props: ctx.props,
     site: env.site,
     adapterName: env.adapterName,
-    locales
+    routingStrategy: ctx.routingStrategy,
+    defaultLocale: ctx.defaultLocale,
+    locales: ctx.locales
   });
   let response;
   if (onRequest) {

package/dist/core/messages.js

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

package/dist/core/middleware/index.js

@@ -9,7 +9,9 @@ function createContext({ request, params, userDefinedLocales = [] }) {
     params: params ?? {},
     props: {},
     site: void 0,
-    locales: userDefinedLocales
+    locales: userDefinedLocales,
+    defaultLocale: void 0,
+    routingStrategy: void 0
   });
 }
 function isLocalsSerializable(value) {

package/dist/core/pipeline.js

@@ -89,7 +89,9 @@ class Pipeline {
       props: renderContext.props,
       site: env.site,
       adapterName: env.adapterName,
-      locales: renderContext.locales
+      locales: renderContext.locales,
+      routingStrategy: renderContext.routingStrategy,
+      defaultLocale: renderContext.defaultLocale
     });
     switch (renderContext.route.type) {
       case "page":
@@ -119,13 +121,7 @@ class Pipeline {
         }
       }
       case "endpoint": {
-        return await callEndpoint(
-          mod,
-          env,
-          renderContext,
-          onRequest,
-          renderContext.locales
-        );
+        return await callEndpoint(mod, env, renderContext, onRequest);
       }
       default:
         throw new Error(`Couldn't find route of type [${renderContext.route.type}]`);

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

@@ -16,6 +16,8 @@ export interface RenderContext {
     props: Props;
     locals?: object;
     locales: string[] | undefined;
+    defaultLocale: string | undefined;
+    routingStrategy: 'prefix-always' | 'prefix-other-locales' | undefined;
 }
 export type CreateRenderContextArgs = Partial<Omit<RenderContext, 'params' | 'props' | 'locals'>> & {
     route: RouteData;
@@ -45,4 +47,5 @@ export declare function parseLocale(header: string): BrowserLocale[];
  */
 export declare function computePreferredLocale(request: Request, locales: string[]): string | undefined;
 export declare function computePreferredLocaleList(request: Request, locales: string[]): string[];
+export declare function computeCurrentLocale(request: Request, locales: string[], routingStrategy: 'prefix-always' | 'prefix-other-locales' | undefined, defaultLocale: string | undefined): undefined | string;
 export {};

package/dist/core/render/context.js

@@ -18,7 +18,9 @@ async function createRenderContext(options) {
     pathname,
     params,
     props,
-    locales: options.locales
+    locales: options.locales,
+    routingStrategy: options.routingStrategy,
+    defaultLocale: options.defaultLocale
   };
   Object.defineProperty(context, "locals", {
     enumerable: true,
@@ -124,7 +126,22 @@ function computePreferredLocaleList(request, locales) {
   }
   return result;
 }
+function computeCurrentLocale(request, locales, routingStrategy, defaultLocale) {
+  const requestUrl = new URL(request.url);
+  for (const segment of requestUrl.pathname.split("/")) {
+    for (const locale of locales) {
+      if (normalizeTheLocale(locale) === normalizeTheLocale(segment)) {
+        return locale;
+      }
+    }
+  }
+  if (routingStrategy === "prefix-other-locales") {
+    return defaultLocale;
+  }
+  return void 0;
+}
 export {
+  computeCurrentLocale,
   computePreferredLocale,
   computePreferredLocaleList,
   createRenderContext,

package/dist/core/render/core.js

@@ -43,7 +43,9 @@ async function renderPage({ mod, renderContext, env, cookies }) {
     status: renderContext.status ?? 200,
     cookies,
     locals: renderContext.locals ?? {},
-    locales: renderContext.locales
+    locales: renderContext.locales,
+    defaultLocale: renderContext.defaultLocale,
+    routingStrategy: renderContext.routingStrategy
   });
   if (mod.frontmatter && typeof mod.frontmatter === "object" && "draft" in mod.frontmatter) {
     env.logger.warn(

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

@@ -31,5 +31,7 @@ export interface CreateResultArgs {
     locals: App.Locals;
     cookies?: AstroCookies;
     locales: string[] | undefined;
+    defaultLocale: string | undefined;
+    routingStrategy: 'prefix-always' | 'prefix-other-locales' | undefined;
 }
 export declare function createResult(args: CreateResultArgs): SSRResult;

package/dist/core/render/result.js

@@ -3,7 +3,11 @@ import { renderJSX } from "../../runtime/server/jsx.js";
 import { chunkToString } from "../../runtime/server/render/index.js";
 import { AstroCookies } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
-import { computePreferredLocale, computePreferredLocaleList } from "./context.js";
+import {
+  computeCurrentLocale,
+  computePreferredLocale,
+  computePreferredLocaleList
+} from "./context.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 const responseSentSymbol = Symbol.for("astro.responseSent");
 function getFunctionExpression(slot) {
@@ -91,6 +95,7 @@ function createResult(args) {
   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(),
@@ -149,6 +154,23 @@ function createResult(args) {
           }
           return void 0;
         },
+        get currentLocale() {
+          if (currentLocale) {
+            return currentLocale;
+          }
+          if (args.locales) {
+            currentLocale = computeCurrentLocale(
+              request,
+              args.locales,
+              args.routingStrategy,
+              args.defaultLocale
+            );
+            if (currentLocale) {
+              return currentLocale;
+            }
+          }
+          return void 0;
+        },
         params,
         props,
         locals,

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

@@ -236,7 +236,8 @@ function createRouteManifest({ settings, cwd, fsMod }, logger) {
           component,
           generate,
           pathname: pathname || void 0,
-          prerender
+          prerender,
+          fallbackRoutes: []
         });
       }
     });
@@ -290,7 +291,8 @@ This route collides with: "${collision.component}".`
       component,
       generate,
       pathname: pathname || void 0,
-      prerender: prerenderInjected ?? prerender
+      prerender: prerenderInjected ?? prerender,
+      fallbackRoutes: []
     });
   });
   Object.entries(settings.config.redirects).forEach(([from, to]) => {
@@ -315,7 +317,8 @@ This route collides with: "${collision.component}".`
       pathname: pathname || void 0,
       prerender: false,
       redirect: to,
-      redirectRoute: routes.find((r) => r.route === to)
+      redirectRoute: routes.find((r) => r.route === to),
+      fallbackRoutes: []
     };
     const lastSegmentIsDynamic = (r) => !!r.segments.at(-1)?.at(-1)?.dynamic;
     const redirBase = path.posix.dirname(route);
@@ -414,33 +417,35 @@ This route collides with: "${collision.component}".`
             if (!hasRoute) {
               let pathname;
               let route;
-              if (fallbackToLocale === i18n.defaultLocale) {
+              if (fallbackToLocale === i18n.defaultLocale && i18n.routingStrategy === "prefix-other-locales") {
                 if (fallbackToRoute.pathname) {
                   pathname = `/${fallbackFromLocale}${fallbackToRoute.pathname}`;
                 }
                 route = `/${fallbackFromLocale}${fallbackToRoute.route}`;
               } else {
-                pathname = fallbackToRoute.pathname?.replace(
-                  `/${fallbackToLocale}`,
-                  `/${fallbackFromLocale}`
-                );
-                route = fallbackToRoute.route.replace(
-                  `/${fallbackToLocale}`,
-                  `/${fallbackFromLocale}`
-                );
+                pathname = fallbackToRoute.pathname?.replace(`/${fallbackToLocale}/`, `/${fallbackFromLocale}/`).replace(`/${fallbackToLocale}`, `/${fallbackFromLocale}`);
+                route = fallbackToRoute.route.replace(`/${fallbackToLocale}`, `/${fallbackFromLocale}`).replace(`/${fallbackToLocale}/`, `/${fallbackFromLocale}/`);
               }
               const segments = removeLeadingForwardSlash(route).split(path.posix.sep).filter(Boolean).map((s) => {
                 validateSegment(s);
                 return getParts(s, route);
               });
-              routes.push({
-                ...fallbackToRoute,
-                pathname,
-                route,
-                segments,
-                pattern: getPattern(segments, config, config.trailingSlash),
-                type: "fallback"
-              });
+              const generate = getRouteGenerator(segments, config.trailingSlash);
+              const index = routes.findIndex((r) => r === fallbackToRoute);
+              if (index) {
+                const fallbackRoute = {
+                  ...fallbackToRoute,
+                  pathname,
+                  route,
+                  segments,
+                  generate,
+                  pattern: getPattern(segments, config, config.trailingSlash),
+                  type: "fallback",
+                  fallbackRoutes: []
+                };
+                const routeData = routes[index];
+                routeData.fallbackRoutes.push(fallbackRoute);
+              }
             }
           }
         }

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

@@ -5,6 +5,9 @@ function serializeRouteData(routeData, trailingSlash) {
     generate: void 0,
     pattern: routeData.pattern.source,
     redirectRoute: routeData.redirectRoute ? serializeRouteData(routeData.redirectRoute, trailingSlash) : void 0,
+    fallbackRoutes: routeData.fallbackRoutes.map((fallbackRoute) => {
+      return serializeRouteData(fallbackRoute, trailingSlash);
+    }),
     _meta: { trailingSlash }
   };
 }
@@ -20,7 +23,10 @@ function deserializeRouteData(rawRouteData) {
     segments: rawRouteData.segments,
     prerender: rawRouteData.prerender,
     redirect: rawRouteData.redirect,
-    redirectRoute: rawRouteData.redirectRoute ? deserializeRouteData(rawRouteData.redirectRoute) : void 0
+    redirectRoute: rawRouteData.redirectRoute ? deserializeRouteData(rawRouteData.redirectRoute) : void 0,
+    fallbackRoutes: rawRouteData.fallbackRoutes.map((fallback) => {
+      return deserializeRouteData(fallback);
+    })
   };
 }
 export {

package/dist/core/routing/match.js

@@ -1,5 +1,8 @@
 function matchRoute(pathname, manifest) {
-  return manifest.routes.find((route) => route.pattern.test(decodeURI(pathname)));
+  const decodedPathname = decodeURI(pathname);
+  return manifest.routes.find((route) => {
+    return route.pattern.test(decodedPathname) || route.fallbackRoutes.some((fallbackRoute) => fallbackRoute.pattern.test(decodedPathname));
+  });
 }
 function matchAllRoutes(pathname, manifest) {
   return manifest.routes.filter((route) => route.pattern.test(pathname));

package/dist/core/routing/params.js

@@ -16,7 +16,7 @@ function getParams(array) {
 }
 function stringifyParams(params, route) {
   const validatedParams = Object.entries(params).reduce((acc, next) => {
-    validateGetStaticPathsParameter(next, route.component);
+    validateGetStaticPathsParameter(next, route.route);
     const [key, value] = next;
     if (value !== void 0) {
       acc[key] = typeof value === "string" ? trimSlashes(value) : value.toString();

package/dist/i18n/middleware.js

@@ -23,7 +23,7 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
       }
     }
     const url = context.url;
-    const { locales, defaultLocale, fallback } = i18n;
+    const { locales, defaultLocale, fallback, routingStrategy } = i18n;
     const response = await next();
     if (response instanceof Response) {
       const separators = url.pathname.split("/");
@@ -56,7 +56,7 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
         if (urlLocale && fallbackKeys.includes(urlLocale)) {
           const fallbackLocale = fallback[urlLocale];
           let newPathname;
-          if (fallbackLocale === defaultLocale) {
+          if (fallbackLocale === defaultLocale && routingStrategy === "prefix-other-locales") {
             newPathname = url.pathname.replace(`/${urlLocale}`, ``);
           } else {
             newPathname = url.pathname.replace(`/${urlLocale}`, `/${fallbackLocale}`);

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

@@ -139,14 +139,18 @@ async function handleRoute({
         prerender: false,
         segments: [],
         type: "fallback",
-        route: ""
+        route: "",
+        fallbackRoutes: []
       };
       renderContext = await createRenderContext({
         request,
         pathname,
         env,
         mod,
-        route
+        route,
+        locales: manifest.i18n?.locales,
+        routingStrategy: manifest.i18n?.routingStrategy,
+        defaultLocale: manifest.i18n?.defaultLocale
       });
     } else {
       return handle404Response(origin, incomingRequest, incomingResponse);
@@ -197,7 +201,9 @@ async function handleRoute({
       route: options.route,
       mod,
       env,
-      locales: i18n ? i18n.locales : void 0
+      locales: i18n?.locales,
+      routingStrategy: i18n?.routingStrategy,
+      defaultLocale: i18n?.defaultLocale
     });
   }
   const onRequest = middleware?.onRequest;

package/package.json

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