astro 4.2.7 → 4.3.0

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

@@ -689,14 +689,15 @@ export interface AstroUserConfig {
          * @default `'directory'`
          * @description
          * Control the output file format of each page. This value may be set by an adapter for you.
-         *   - If `'file'`, Astro will generate an HTML file (ex: "/foo.html") for each page.
-         *   - If `'directory'`, Astro will generate a directory with a nested `index.html` file (ex: "/foo/index.html") for each page.
+         *   - `'file'`: Astro will generate an HTML file named for each page route. (e.g. `src/pages/about.astro` and `src/pages/about/index.astro` both build the file `/about.html`)
+         *   - `'directory'`: Astro will generate a directory with a nested `index.html` file for each page. (e.g. `src/pages/about.astro` and `src/pages/about/index.astro` both build the file `/about/index.html`)
+         *   - `'preserve'`: Astro will generate HTML files exactly as they appear in your source folder. (e.g. `src/pages/about.astro` builds `/about.html` and `src/pages/about/index.astro` builds the file `/about/index.html`)
          *
          * ```js
          * {
          *   build: {
          *     // Example: Generate `page.html` instead of `page/index.html` during build.
-         *     format: 'file'
+         *     format: 'preserve'
          *   }
          * }
          * ```
@@ -714,7 +715,7 @@ export interface AstroUserConfig {
          * - `directory` - Set `trailingSlash: 'always'`
          * - `file` - Set `trailingSlash: 'never'`
          */
-        format?: 'file' | 'directory';
+        format?: 'file' | 'directory' | 'preserve';
         /**
          * @docs
          * @name build.client
@@ -1412,6 +1413,44 @@ export interface AstroUserConfig {
              * - `"pathanme": The strategy is applied to the pathname of the URLs
              */
             strategy: 'pathname';
+            /**
+             * @name i18n.domains
+             * @type {Record<string, string> }
+             * @default '{}'
+             * @version 4.3.0
+             * @description
+             *
+             * Configures the URL pattern of one or more supported languages to use a custom domain (or sub-domain).
+             *
+             * When a locale is mapped to a domain, a `/[locale]/` path prefix will not be used.
+             * However, localized folders within `src/pages/` are still required, including for your configured `defaultLocale`.
+             *
+             * Any other locale not configured will default to a localized path-based URL according to your `prefixDefaultLocale` strategy (e.g. `https://example.com/[locale]/blog`).
+             *
+             * ```js
+             * //astro.config.mjs
+             * export default defineConfig({
+             * 	site: "https://example.com",
+             * 	output: "server", // required, with no prerendered pages
+             *   adapter: node({
+             *     mode: 'standalone',
+             *   }),
+             * 	i18n: {
+             * 		defaultLocale: "en",
+             * 		locales: ["en", "fr", "pt-br", "es"],
+             *     prefixDefaultLocale: false,
+             *		  domains: {
+             *			  fr: "https://fr.example.com",
+             *       es: "https://example.es"
+             *    },
+             * })
+             * ```
+             *
+             * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
+             *
+             * See the [Internationalization Guide](https://docs.astro.build/en/guides/internationalization/#domains) for more details, including the limitations of this feature.
+             */
+            domains?: Record<string, string>;
         };
     };
     /** ⚠️ WARNING: SUBJECT TO CHANGE */
@@ -1538,6 +1577,47 @@ export interface AstroUserConfig {
          * In the event of route collisions, where two routes of equal route priority attempt to build the same URL, Astro will log a warning identifying the conflicting routes.
          */
         globalRoutePriority?: boolean;
+        /**
+         * @docs
+         * @name experimental.i18nDomains
+         * @type {boolean}
+         * @default `false`
+         * @version 4.3.0
+         * @description
+         *
+         * Enables domain support for the [experimental `domains` routing strategy](https://docs.astro.build/en/guides/internationalization/#domains-experimental) which allows you to configure the URL pattern of one or more supported languages to use a custom domain (or sub-domain).
+         *
+         * When a locale is mapped to a domain, a `/[locale]/` path prefix will not be used. However, localized folders within `src/pages/` are still required, including for your configured `defaultLocale`.
+         *
+         * Any other locale not configured will default to a localized path-based URL according to your `prefixDefaultLocale` strategy (e.g. `https://example.com/[locale]/blog`).
+         *
+         * ```js
+         * //astro.config.mjs
+         * export default defineConfig({
+         * 	site: "https://example.com",
+         * 	output: "server", // required, with no prerendered pages
+         *   adapter: node({
+         *     mode: 'standalone',
+         *   }),
+         * 	i18n: {
+         * 		defaultLocale: "en",
+         * 		locales: ["en", "fr", "pt-br", "es"],
+         *     prefixDefaultLocale: false,
+         *		  domains: {
+         *			  fr: "https://fr.example.com",
+         *       es: "https://example.es"
+         *    },
+         *  experimental: {
+         *     i18nDomains: true
+         *  }
+         * })
+         * ```
+         *
+         * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
+         *
+         * See the [Internationalization Guide](https://docs.astro.build/en/guides/internationalization/#domains-experimental) for more details, including the limitations of this experimental feature.
+         */
+        i18nDomains?: boolean;
     };
 }
 /**
@@ -1918,7 +1998,7 @@ export type AstroFeatureMap = {
     /**
      * List of features that orbit around the i18n routing
      */
-    i18n?: AstroInternationalizationFeature;
+    i18nDomains?: SupportsKind;
 };
 export interface AstroAssetsFeature {
     supportKind?: SupportsKind;
@@ -1933,9 +2013,9 @@ export interface AstroAssetsFeature {
 }
 export interface AstroInternationalizationFeature {
     /**
-     * Whether the adapter is able to detect the language of the browser, usually using the `Accept-Language` header.
+     * The adapter should be able to create the proper redirects
      */
-    detectBrowserLanguage?: SupportsKind;
+    domains?: SupportsKind;
 }
 export type Locales = (string | {
     codes: string[];
@@ -2288,6 +2368,7 @@ export interface RouteData {
     redirect?: RedirectConfig;
     redirectRoute?: RouteData;
     fallbackRoutes: RouteData[];
+    isIndex: boolean;
 }
 export type RedirectRouteData = RouteData & {
     redirect: string;

package/dist/content/types-generator.js

@@ -266,7 +266,8 @@ function invalidateVirtualMod(viteServer) {
 }
 function normalizeConfigPath(from, to) {
   const configPath = path.relative(from, to).replace(/\.ts$/, ".js");
-  return `"${isRelativePath(configPath) ? "" : "./"}${configPath}"`;
+  const normalizedPath = configPath.replaceAll("\\", "/");
+  return `"${isRelativePath(configPath) ? "" : "./"}${normalizedPath}"`;
 }
 async function writeContentFiles({
   fs,

package/dist/content/utils.d.ts

@@ -119,7 +119,7 @@ export declare function getContentEntryIdAndSlug({ entry, contentDir, collection
 };
 export declare function getEntryType(entryPath: string, paths: Pick<ContentPaths, 'config' | 'contentDir'>, contentFileExts: string[], dataFileExts: string[]): 'content' | 'data' | 'config' | 'ignored';
 export declare function hasUnderscoreBelowContentDirectoryPath(fileUrl: URL, contentDir: ContentPaths['contentDir']): boolean;
-export declare function parseFrontmatter(fileContents: string): matter.GrayMatterFile<string>;
+export declare function safeParseFrontmatter(source: string, id?: string): matter.GrayMatterFile<string>;
 /**
  * The content config is loaded separately from other `src/` files.
  * This global observable lets dependent plugins (like the content flag plugin)

package/dist/content/utils.js

@@ -6,7 +6,8 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
 import { z } from "zod";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
-import { formatYAMLException, isYAMLException } from "../core/errors/utils.js";
+import { MarkdownError } from "../core/errors/index.js";
+import { isYAMLException } from "../core/errors/utils.js";
 import { CONTENT_FLAGS, CONTENT_TYPES_FILE } from "./consts.js";
 import { errorMap } from "./error-map.js";
 import { createImage } from "./runtime-assets.js";
@@ -199,16 +200,27 @@ function getYAMLErrorLine(rawData, objectKey) {
   const numNewlinesBeforeKey = dataBeforeKey.split("\n").length;
   return numNewlinesBeforeKey;
 }
-function parseFrontmatter(fileContents) {
+function safeParseFrontmatter(source, id) {
   try {
-    matter.clearCache();
-    return matter(fileContents);
-  } catch (e) {
-    if (isYAMLException(e)) {
-      throw formatYAMLException(e);
-    } else {
-      throw e;
+    return matter(source);
+  } catch (err) {
+    const markdownError = new MarkdownError({
+      name: "MarkdownError",
+      message: err.message,
+      stack: err.stack,
+      location: id ? {
+        file: id
+      } : void 0
+    });
+    if (isYAMLException(err)) {
+      markdownError.setLocation({
+        file: id,
+        line: err.mark.line,
+        column: err.mark.column
+      });
+      markdownError.setMessage(err.reason);
     }
+    throw markdownError;
   }
 }
 const globalContentConfigObserver = contentObservable({ status: "init" });
@@ -356,6 +368,6 @@ export {
   loadContentConfig,
   msg,
   parseEntrySlug,
-  parseFrontmatter,
-  reloadContentConfigObserver
+  reloadContentConfigObserver,
+  safeParseFrontmatter
 };

package/dist/core/app/index.js

@@ -5,7 +5,9 @@ import { consoleLogDestination } from "../logger/console.js";
 import { AstroIntegrationLogger, Logger } from "../logger/core.js";
 import { sequence } from "../middleware/index.js";
 import {
+  appendForwardSlash,
   collapseDuplicateSlashes,
+  joinPaths,
   prependForwardSlash,
   removeTrailingForwardSlash
 } from "../path.js";
@@ -19,6 +21,7 @@ import {
 } from "../render/ssr-element.js";
 import { matchRoute } from "../routing/match.js";
 import { SSRRoutePipeline } from "./ssrPipeline.js";
+import { normalizeTheLocale } from "../../i18n/index.js";
 import { deserializeManifest } from "./common.js";
 const localsSymbol = Symbol.for("astro.locals");
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
@@ -108,12 +111,62 @@ class App {
     const url = new URL(request.url);
     if (this.#manifest.assets.has(url.pathname))
       return void 0;
-    const pathname = prependForwardSlash(this.removeBase(url.pathname));
-    const routeData = matchRoute(pathname, this.#manifestData);
+    let pathname = this.#computePathnameFromDomain(request);
+    if (!pathname) {
+      pathname = prependForwardSlash(this.removeBase(url.pathname));
+    }
+    let routeData = matchRoute(pathname, this.#manifestData);
     if (!routeData || routeData.prerender)
       return void 0;
     return routeData;
   }
+  #computePathnameFromDomain(request) {
+    let pathname = void 0;
+    const url = new URL(request.url);
+    if (this.#manifest.i18n && (this.#manifest.i18n.routing === "domains-prefix-always" || this.#manifest.i18n.routing === "domains-prefix-other-locales" || this.#manifest.i18n.routing === "domains-prefix-other-no-redirect")) {
+      let host = request.headers.get("X-Forwarded-Host");
+      let protocol = request.headers.get("X-Forwarded-Proto");
+      if (protocol) {
+        protocol = protocol + ":";
+      } else {
+        protocol = url.protocol;
+      }
+      if (!host) {
+        host = request.headers.get("Host");
+      }
+      if (host && protocol) {
+        host = host.split(":")[0];
+        try {
+          let locale;
+          const hostAsUrl = new URL(`${protocol}//${host}`);
+          for (const [domainKey, localeValue] of Object.entries(
+            this.#manifest.i18n.domainLookupTable
+          )) {
+            const domainKeyAsUrl = new URL(domainKey);
+            if (hostAsUrl.host === domainKeyAsUrl.host && hostAsUrl.protocol === domainKeyAsUrl.protocol) {
+              locale = localeValue;
+              break;
+            }
+          }
+          if (locale) {
+            pathname = prependForwardSlash(
+              joinPaths(normalizeTheLocale(locale), this.removeBase(url.pathname))
+            );
+            if (url.pathname.endsWith("/")) {
+              pathname = appendForwardSlash(pathname);
+            }
+          }
+        } catch (e) {
+          this.#logger.error(
+            "router",
+            `Astro tried to parse ${protocol}//${host} as an URL, but it threw a parsing error. Check the X-Forwarded-Host and X-Forwarded-Proto headers.`
+          );
+          this.#logger.error("router", `Error: ${e}`);
+        }
+      }
+    }
+    return pathname;
+  }
   async render(request, routeDataOrOptions, maybeLocals) {
     let routeData;
     let locals;

package/dist/core/app/node.js

@@ -84,11 +84,11 @@ class NodeApp extends App {
           destination.write(result.value);
           result = await reader.read();
         }
+        destination.end();
       } catch {
-        destination.write("Internal server error");
+        destination.end("Internal server error");
       }
     }
-    destination.end();
   }
 }
 function makeRequestHeaders(req) {

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

@@ -32,7 +32,7 @@ export type SSRManifest = {
     site?: string;
     base: string;
     trailingSlash: 'always' | 'never' | 'ignore';
-    buildFormat: 'file' | 'directory';
+    buildFormat: 'file' | 'directory' | 'preserve';
     compressHTML: boolean;
     assetsPrefix?: string;
     renderers: SSRLoadedRenderer[];
@@ -53,6 +53,7 @@ export type SSRManifestI18n = {
     routing: RoutingStrategies;
     locales: Locales;
     defaultLocale: string;
+    domainLookupTable: Record<string, string>;
 };
 export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'clientDirectives'> & {
     routes: SerializedRouteInfo[];

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

@@ -1,6 +1,6 @@
-import type { AstroConfig, RouteType } from '../../@types/astro.js';
-export declare function getOutFolder(astroConfig: AstroConfig, pathname: string, routeType: RouteType): URL;
-export declare function getOutFile(astroConfig: AstroConfig, outFolder: URL, pathname: string, routeType: RouteType): URL;
+import type { AstroConfig, RouteData } from '../../@types/astro.js';
+export declare function getOutFolder(astroConfig: AstroConfig, pathname: string, routeData: RouteData): URL;
+export declare function getOutFile(astroConfig: AstroConfig, outFolder: URL, pathname: string, routeData: RouteData): URL;
 /**
  * Ensures the `outDir` is within `process.cwd()`. If not it will fallback to `<cwd>/.astro`.
  * This is used for static `ssrBuild` so the output can access node_modules when we import

package/dist/core/build/common.js

@@ -10,8 +10,9 @@ function getOutRoot(astroConfig) {
     return new URL("./", astroConfig.build.client);
   }
 }
-function getOutFolder(astroConfig, pathname, routeType) {
+function getOutFolder(astroConfig, pathname, routeData) {
   const outRoot = getOutRoot(astroConfig);
+  const routeType = routeData.type;
   switch (routeType) {
     case "endpoint":
       return new URL("." + appendForwardSlash(npath.dirname(pathname)), outRoot);
@@ -29,10 +30,20 @@ function getOutFolder(astroConfig, pathname, routeType) {
           const d = pathname === "" ? pathname : npath.dirname(pathname);
           return new URL("." + appendForwardSlash(d), outRoot);
         }
+        case "preserve": {
+          let dir;
+          if (pathname === "" || routeData.isIndex) {
+            dir = pathname;
+          } else {
+            dir = npath.dirname(pathname);
+          }
+          return new URL("." + appendForwardSlash(dir), outRoot);
+        }
       }
   }
 }
-function getOutFile(astroConfig, outFolder, pathname, routeType) {
+function getOutFile(astroConfig, outFolder, pathname, routeData) {
+  const routeType = routeData.type;
   switch (routeType) {
     case "endpoint":
       return new URL(npath.basename(pathname), outFolder);
@@ -51,6 +62,13 @@ function getOutFile(astroConfig, outFolder, pathname, routeType) {
           const baseName = npath.basename(pathname);
           return new URL("./" + (baseName || "index") + ".html", outFolder);
         }
+        case "preserve": {
+          let baseName = npath.basename(pathname);
+          if (!baseName || routeData.isIndex) {
+            baseName = "index";
+          }
+          return new URL(`./${baseName}.html`, outFolder);
+        }
       }
   }
 }

package/dist/core/build/generate.js

@@ -47,6 +47,7 @@ import {
   mergeInlineCss
 } from "./internal.js";
 import { getTimeStat, shouldAppendForwardSlash } from "./util.js";
+import { NoPrerenderedRoutesWithDomains } from "../errors/errors-data.js";
 function createEntryURL(filePath, outFolder) {
   return new URL("./" + filePath + `?time=${Date.now()}`, outFolder);
 }
@@ -130,9 +131,16 @@ async function generatePages(opts, internals) {
 ${bgGreen(black(` ${verb} static routes `))}`);
   const builtPaths = /* @__PURE__ */ new Set();
   const pagesToGenerate = pipeline.retrieveRoutesToGenerate();
+  const config = pipeline.getConfig();
   if (ssr) {
     for (const [pageData, filePath] of pagesToGenerate) {
       if (pageData.route.prerender) {
+        if (config.experimental.i18nDomains) {
+          throw new AstroError({
+            ...NoPrerenderedRoutesWithDomains,
+            message: NoPrerenderedRoutesWithDomains.message(pageData.component)
+          });
+        }
         const ssrEntryURLPage = createEntryURL(filePath, outFolder);
         const ssrEntryPage = await import(ssrEntryURLPage.toString());
         if (opts.settings.adapter?.adapterFeatures?.functionPerRoute) {
@@ -334,8 +342,8 @@ function addPageName(pathname, opts) {
   const pageName = shouldAppendForwardSlash(trailingSlash, buildFormat) ? pathname.replace(/\/?$/, "/").replace(/^\//, "") : pathname.replace(/^\//, "");
   opts.pageNames.push(pageName);
 }
-function getUrlForPath(pathname, base, origin, format, routeType) {
-  const ending = format === "directory" ? "/" : ".html";
+function getUrlForPath(pathname, base, origin, format, trailingSlash, routeType) {
+  const ending = format === "directory" ? trailingSlash === "never" ? "" : "/" : ".html";
   let buildPathname;
   if (pathname === "/" || pathname === "") {
     buildPathname = base;
@@ -389,6 +397,7 @@ async function generatePath(pathname, pipeline, gopts, route) {
     pipeline.getConfig().base,
     pipeline.getStaticBuildOptions().origin,
     pipeline.getConfig().build.format,
+    pipeline.getConfig().trailingSlash,
     route.type
   );
   const request = createRequest({
@@ -450,8 +459,8 @@ async function generatePath(pathname, pipeline, gopts, route) {
       return;
     body = Buffer.from(await response.arrayBuffer());
   }
-  const outFolder = getOutFolder(pipeline.getConfig(), pathname, route.type);
-  const outFile = getOutFile(pipeline.getConfig(), outFolder, pathname, route.type);
+  const outFolder = getOutFolder(pipeline.getConfig(), pathname, route);
+  const outFile = getOutFile(pipeline.getConfig(), outFolder, pathname, route);
   route.distURL = outFile;
   await fs.promises.mkdir(outFolder, { recursive: true });
   await fs.promises.writeFile(outFile, body);
@@ -472,7 +481,8 @@ function createBuildManifest(settings, internals, renderers, middleware) {
       fallback: settings.config.i18n.fallback,
       routing: settings.config.i18n.routing,
       defaultLocale: settings.config.i18n.defaultLocale,
-      locales: settings.config.i18n.locales
+      locales: settings.config.i18n.locales,
+      domainLookupTable: {}
     };
   }
   return {

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

@@ -8,6 +8,7 @@ import { serializeRouteData } from "../../routing/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
 import { cssOrder, mergeInlineCss } from "../internal.js";
+import { normalizeTheLocale } from "../../../i18n/index.js";
 const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
 const replaceExp = new RegExp(`['"](${manifestReplace})['"]`, "g");
 const SSR_MANIFEST_VIRTUAL_MODULE_ID = "@astrojs-manifest";
@@ -111,6 +112,7 @@ function injectManifest(manifest, chunk) {
 function buildManifest(opts, internals, staticFiles) {
   const { settings } = opts;
   const routes = [];
+  const domainLookupTable = {};
   const entryModules = Object.fromEntries(internals.entrySpecifierToBundleMap.entries());
   if (settings.scripts.some((script) => script.stage === "page")) {
     staticFiles.push(entryModules[PAGE_SCRIPT_ID]);
@@ -127,8 +129,8 @@ function buildManifest(opts, internals, staticFiles) {
       continue;
     if (!route.pathname)
       continue;
-    const outFolder = getOutFolder(opts.settings.config, route.pathname, route.type);
-    const outFile = getOutFile(opts.settings.config, outFolder, route.pathname, route.type);
+    const outFolder = getOutFolder(opts.settings.config, route.pathname, route);
+    const outFile = getOutFile(opts.settings.config, outFolder, route.pathname, route);
     const file = outFile.toString().replace(opts.settings.config.build.client.toString(), "");
     routes.push({
       file,
@@ -174,6 +176,12 @@ function buildManifest(opts, internals, staticFiles) {
       routeData: serializeRouteData(route, settings.config.trailingSlash)
     });
   }
+  const i18n = settings.config.i18n;
+  if (settings.config.experimental.i18nDomains && i18n && i18n.domains && (i18n.routing === "domains-prefix-always" || i18n.routing === "domains-prefix-other-locales" || i18n.routing === "domains-prefix-other-no-redirect")) {
+    for (const [locale, domainValue] of Object.entries(i18n.domains)) {
+      domainLookupTable[domainValue] = normalizeTheLocale(locale);
+    }
+  }
   if (!(BEFORE_HYDRATION_SCRIPT_ID in entryModules)) {
     entryModules[BEFORE_HYDRATION_SCRIPT_ID] = "";
   }
@@ -183,7 +191,8 @@ function buildManifest(opts, internals, staticFiles) {
       fallback: settings.config.i18n.fallback,
       routing: settings.config.i18n.routing,
       locales: settings.config.i18n.locales,
-      defaultLocale: settings.config.i18n.defaultLocale
+      defaultLocale: settings.config.i18n.defaultLocale,
+      domainLookupTable
     };
   }
   return {

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

@@ -210,7 +210,14 @@ function generateSSRCode(adapter, middlewareId) {
         return `export const ${name} = _exports['${name}'];`;
       }
     }) ?? [],
-    `serverEntrypointModule.start?.(_manifest, _args);`
+    // NOTE: This is intentionally obfuscated!
+    // Do NOT simplify this to something like `serverEntrypointModule.start?.(_manifest, _args)`
+    // They are NOT equivalent! Some bundlers will throw if `start` is not exported, but we
+    // only want to silently ignore it... hence the dynamic, obfuscated weirdness.
+    `const _start = 'start';
+if (_start in serverEntrypointModule) {
+	serverEntrypointModule[_start](_manifest, _args);
+}`
   ];
   return {
     imports,

package/dist/core/build/util.js

@@ -12,6 +12,7 @@ function shouldAppendForwardSlash(trailingSlash, buildFormat) {
       switch (buildFormat) {
         case "directory":
           return true;
+        case "preserve":
         case "file":
           return false;
       }