astro 4.15.12 → 4.16.0

package/astro-jsx.d.ts

@@ -1,5 +1,4 @@
 /// <reference lib="dom" />
-/* eslint @typescript-eslint/no-unused-vars: off */
 /**
  * Adapted from babel-plugin-react-html-attrs's TypeScript definition from DefinitelyTyped.
  * @see https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/babel-plugin-react-html-attrs/index.d.ts

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

@@ -979,6 +979,33 @@ export interface AstroUserConfig {
          * ```
          */
         inlineStylesheets?: 'always' | 'auto' | 'never';
+        /**
+         * @docs
+         * @name build.concurrency
+         * @type { number }
+         * @default `1`
+         * @version 4.16.0
+         * @description
+         * The number of pages to build in parallel.
+         *
+         * **In most cases, you should not change the default value of `1`.**
+         *
+         * Use this option only when other attempts to reduce the overall rendering time (e.g. batch or cache long running tasks like fetch calls or data access) are not possible or are insufficient.
+         * If the number is set too high, page rendering may slow down due to insufficient memory resources and because JS is single-threaded.
+         *
+         * ```js
+         * {
+         *   build: {
+         *     concurrency: 2
+         *   }
+         * }
+         * ```
+         *
+         *  :::caution[Breaking changes possible]
+         *  This feature is stable and is not considered experimental. However, this feature is only intended to address difficult performance issues, and breaking changes may occur in a [minor release](https://docs.astro.build/en/upgrade-astro/#semantic-versioning) to keep this option as performant as possible. Please check the [Astro CHANGELOG](https://github.com/withastro/astro/blob/refs/heads/next/packages/astro/CHANGELOG.md) for every minor release if you are using this feature.
+         *  :::
+         */
+        concurrency?: number;
     };
     /**
      * @docs
@@ -1997,7 +2024,7 @@ export interface AstroUserConfig {
          * }
          * ```
          *
-         * To use this feature with the Astro VS Code extension, you must also enable the `astro.content-intellisense` option in your VS Code settings. For editors using the Astro language server directly, pass the `contentIntellisense: true` initialization parameter to enable this feature.
+         * To use this feature with the Astro VS Code extension, you must also enable the `astro.content-intellisense` option in your VS Code settings. For editors using the Astro language server directly, pass the `contentIntellisense: true` initialization parameter to enable this feature. See the [content Intellisense implementation PR](https://github.com/withastro/language-tools/pull/915) for more details about this early feature.
          */
         contentIntellisense?: boolean;
         /**

package/dist/actions/runtime/virtual/shared.d.ts

@@ -8,7 +8,7 @@ export declare const ACTION_QUERY_PARAMS: {
 };
 export declare const ACTION_ERROR_CODES: readonly ["BAD_REQUEST", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "TIMEOUT", "CONFLICT", "PRECONDITION_FAILED", "PAYLOAD_TOO_LARGE", "UNSUPPORTED_MEDIA_TYPE", "UNPROCESSABLE_CONTENT", "TOO_MANY_REQUESTS", "CLIENT_CLOSED_REQUEST", "INTERNAL_SERVER_ERROR"];
 export type ActionErrorCode = (typeof ACTION_ERROR_CODES)[number];
-export declare class ActionError<T extends ErrorInferenceObject = ErrorInferenceObject> extends Error {
+export declare class ActionError<_T extends ErrorInferenceObject = ErrorInferenceObject> extends Error {
     type: string;
     code: ActionErrorCode;
     status: number;

package/dist/cli/preferences/index.js

@@ -1,8 +1,8 @@
 import { fileURLToPath } from "node:url";
-import { bgGreen, black, bold, dim, yellow } from "kleur/colors";
 import { formatWithOptions } from "node:util";
 import dlv from "dlv";
 import { flattie } from "flattie";
+import { bgGreen, black, bold, dim, yellow } from "kleur/colors";
 import { resolveConfig } from "../../core/config/config.js";
 import { createSettings } from "../../core/config/settings.js";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
@@ -257,7 +257,7 @@ function formatTable(object, columnLabels) {
   const [colA, colB] = columnLabels;
   const colALength = [colA, ...Object.keys(object)].reduce(longest, 0) + 3;
   const colBLength = [colB, ...Object.values(object).map(annotatedFormat)].reduce(longest, 0) + 3;
-  function formatRow(i2, a, b, style = (v) => v.toString()) {
+  function formatRow(_i, a, b, style = (v) => v.toString()) {
     return `${dim(chars.v)} ${style(a)} ${space(colALength - a.length - 2)} ${dim(
       chars.v
     )} ${formatAnnotated(b, style)} ${space(colBLength - annotatedFormat(b).length - 3)} ${dim(

package/dist/content/content-layer.js

@@ -121,7 +121,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "4.15.12") {
+    if (previousAstroVersion !== "4.16.0") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -129,8 +129,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("4.15.12") {
-      await this.#store.metaStore().set("astro-version", "4.15.12");
+    if ("4.16.0") {
+      await this.#store.metaStore().set("astro-version", "4.16.0");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/core/app/node.js

@@ -1,4 +1,5 @@
 import fs from "node:fs";
+import { Http2ServerResponse } from "node:http2";
 import { deserializeManifest } from "./common.js";
 import { createOutgoingHttpHeaders } from "./createOutgoingHttpHeaders.js";
 import { App } from "./index.js";
@@ -33,11 +34,18 @@ class NodeApp extends App {
    * ```
    */
   static createRequest(req, { skipBody = false } = {}) {
-    const protocol = req.headers["x-forwarded-proto"] ?? ("encrypted" in req.socket && req.socket.encrypted ? "https" : "http");
-    const hostname = req.headers["x-forwarded-host"] ?? req.headers.host ?? req.headers[":authority"];
-    const port = req.headers["x-forwarded-port"];
-    const portInHostname = typeof hostname === "string" && typeof port === "string" && hostname.endsWith(port);
-    const hostnamePort = portInHostname ? hostname : hostname + (port ? `:${port}` : "");
+    const isEncrypted = "encrypted" in req.socket && req.socket.encrypted;
+    const getFirstForwardedValue = (multiValueHeader) => {
+      return multiValueHeader?.toString()?.split(",").map((e) => e.trim())?.[0];
+    };
+    const forwardedProtocol = getFirstForwardedValue(req.headers["x-forwarded-proto"]);
+    const protocol = forwardedProtocol ?? (isEncrypted ? "https" : "http");
+    const forwardedHostname = getFirstForwardedValue(req.headers["x-forwarded-host"]);
+    const hostname = forwardedHostname ?? req.headers.host ?? req.headers[":authority"];
+    const forwardedPort = getFirstForwardedValue(req.headers["x-forwarded-port"]);
+    const port = forwardedPort ?? req.socket?.remotePort?.toString() ?? (isEncrypted ? "443" : "80");
+    const portInHostname = typeof hostname === "string" && /:\d+$/.test(hostname);
+    const hostnamePort = portInHostname ? hostname : `${hostname}:${port}`;
     const url = `${protocol}://${hostnamePort}${req.url}`;
     const options = {
       method: req.method || "GET",
@@ -48,11 +56,10 @@ class NodeApp extends App {
       Object.assign(options, makeRequestBody(req));
     }
     const request = new Request(url, options);
-    const clientIp = req.headers["x-forwarded-for"];
+    const forwardedClientIp = getFirstForwardedValue(req.headers["x-forwarded-for"]);
+    const clientIp = forwardedClientIp || req.socket?.remoteAddress;
     if (clientIp) {
       Reflect.set(request, clientAddressSymbol, clientIp);
-    } else if (req.socket?.remoteAddress) {
-      Reflect.set(request, clientAddressSymbol, req.socket.remoteAddress);
     }
     return request;
   }
@@ -73,7 +80,9 @@ class NodeApp extends App {
    */
   static async writeResponse(source, destination) {
     const { status, headers, body, statusText } = source;
-    destination.statusMessage = statusText;
+    if (!(destination instanceof Http2ServerResponse)) {
+      destination.statusMessage = statusText;
+    }
     destination.writeHead(status, createOutgoingHttpHeaders(headers));
     if (!body) return destination.end();
     try {

package/dist/core/build/generate.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import os from "node:os";
 import { bgGreen, black, blue, bold, dim, green, magenta, red } from "kleur/colors";
+import PLimit from "p-limit";
 import PQueue from "p-queue";
 import {
   generateImagesForPath,
@@ -146,30 +147,41 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     styles,
     mod: pageModule
   };
+  async function generatePathWithLogs(path, route, index, paths, isConcurrent) {
+    const timeStart = performance.now();
+    pipeline.logger.debug("build", `Generating: ${path}`);
+    const filePath = getOutputFilename(config, path, pageData.route.type);
+    const lineIcon = index === paths.length - 1 && !isConcurrent || paths.length === 1 ? "\u2514\u2500" : "\u251C\u2500";
+    if (!isConcurrent) {
+      logger.info(null, `  ${blue(lineIcon)} ${dim(filePath)}`, false);
+    }
+    await generatePath(path, pipeline, generationOptions, route);
+    const timeEnd = performance.now();
+    const isSlow = timeEnd - timeStart > THRESHOLD_SLOW_RENDER_TIME_MS;
+    const timeIncrease = (isSlow ? red : dim)(`(+${getTimeStat(timeStart, timeEnd)})`);
+    if (isConcurrent) {
+      logger.info(null, `  ${blue(lineIcon)} ${dim(filePath)} ${timeIncrease}`);
+    } else {
+      logger.info("SKIP_FORMAT", ` ${timeIncrease}`);
+    }
+  }
   for (const route of eachRouteInRouteData(pageData)) {
     const icon = route.type === "page" || route.type === "redirect" || route.type === "fallback" ? green("\u25B6") : magenta("\u03BB");
     logger.info(null, `${icon} ${getPrettyRouteName(route)}`);
     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.logger.debug("build", `Generating: ${path}`);
-      const filePath = getOutputFilename(config, path, pageData.route.type);
-      const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
-      logger.info(null, `  ${blue(lineIcon)} ${dim(filePath)}`, false);
-      await generatePath(path, pipeline, generationOptions, route);
-      const timeEnd = performance.now();
-      const timeChange = getTimeStat(prevTimeEnd, timeEnd);
-      const timeIncrease = `(+${timeChange})`;
-      let timeIncreaseLabel;
-      if (timeEnd - prevTimeEnd > THRESHOLD_SLOW_RENDER_TIME_MS) {
-        timeIncreaseLabel = red(timeIncrease);
-      } else {
-        timeIncreaseLabel = dim(timeIncrease);
+    if (config.build.concurrency > 1) {
+      const limit = PLimit(config.build.concurrency);
+      const promises = [];
+      for (let i = 0; i < paths.length; i++) {
+        const path = paths[i];
+        promises.push(limit(() => generatePathWithLogs(path, route, i, paths, true)));
+      }
+      await Promise.allSettled(promises);
+    } else {
+      for (let i = 0; i < paths.length; i++) {
+        const path = paths[i];
+        await generatePathWithLogs(path, route, i, paths, false);
       }
-      logger.info("SKIP_FORMAT", ` ${timeIncreaseLabel}`);
-      prevTimeEnd = timeEnd;
     }
   }
 }

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

@@ -89,7 +89,7 @@ export interface BuildInternals {
  * @returns {BuildInternals}
  */
 export declare function createBuildInternals(): BuildInternals;
-export declare function trackPageData(internals: BuildInternals, component: string, pageData: PageBuildData, componentModuleId: string, componentURL: URL): void;
+export declare function trackPageData(internals: BuildInternals, _component: string, pageData: PageBuildData, componentModuleId: string, componentURL: URL): void;
 /**
  * Tracks client-only components to the pages they are associated with.
  */

package/dist/core/build/internal.js

@@ -27,7 +27,7 @@ function createBuildInternals() {
     prerenderOnlyChunks: []
   };
 }
-function trackPageData(internals, component, pageData, componentModuleId, componentURL) {
+function trackPageData(internals, _component, pageData, componentModuleId, componentURL) {
   pageData.moduleSpecifier = componentModuleId;
   internals.pagesByKeys.set(pageData.key, pageData);
   internals.pagesByViteID.set(viteID(componentURL), pageData);

package/dist/core/build/pipeline.js

@@ -246,7 +246,7 @@ class BuildPipeline extends Pipeline {
     this.#componentsInterner.set(route, entry);
     return entry;
   }
-  async #getEntryForFallbackRoute(route, internals, outFolder) {
+  async #getEntryForFallbackRoute(route, _internals, outFolder) {
     if (route.type !== "fallback") {
       throw new Error(`Expected a redirect route.`);
     }
@@ -260,7 +260,7 @@ class BuildPipeline extends Pipeline {
     }
     return RedirectSinglePageBuiltModule;
   }
-  async #getEntryForRedirectRoute(route, internals, outFolder) {
+  async #getEntryForRedirectRoute(route, _internals, outFolder) {
     if (route.type !== "redirect") {
       throw new Error(`Expected a redirect route.`);
     }

package/dist/core/config/schema.d.ts

@@ -28,6 +28,7 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         serverEntry: string;
         redirects: true;
         inlineStylesheets: "auto";
+        concurrency: number;
     };
     image: {
         service: {
@@ -123,6 +124,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
+        concurrency: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
         format: "file" | "directory" | "preserve";
         client: URL;
@@ -131,6 +133,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
+        concurrency: number;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -142,6 +145,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "always" | "never" | "auto" | undefined;
+        concurrency?: number | undefined;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -254,6 +258,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
         shikiConfig: z.ZodDefault<z.ZodObject<{
             langs: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiLang, z.ZodTypeDef, ShikiLang>, "many">, ShikiLang[], ShikiLang[]>>;
+            langAlias: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
             theme: z.ZodDefault<z.ZodUnion<[z.ZodEnum<[import("shiki").BundledTheme, ...import("shiki").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>;
             themes: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodEnum<[import("shiki").BundledTheme, ...import("shiki").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>>;
             defaultColor: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"light">, z.ZodLiteral<"dark">, z.ZodString, z.ZodLiteral<false>]>>;
@@ -261,6 +266,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             transformers: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiTransformer, z.ZodTypeDef, ShikiTransformer>, "many">, ShikiTransformer[], ShikiTransformer[]>>;
         }, "strip", z.ZodTypeAny, {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -268,6 +274,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             defaultColor?: string | false | undefined;
         }, {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;
@@ -283,6 +290,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -298,6 +306,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;
@@ -775,6 +784,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
+        concurrency: number;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -786,6 +796,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -923,6 +934,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "always" | "never" | "auto" | undefined;
+        concurrency?: number | undefined;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -938,6 +950,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;
@@ -1082,6 +1095,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
+        concurrency: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
         format: "file" | "directory" | "preserve";
         client: URL;
@@ -1090,6 +1104,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
+        concurrency: number;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -1101,6 +1116,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "always" | "never" | "auto" | undefined;
+        concurrency?: number | undefined;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -1213,6 +1229,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
         shikiConfig: z.ZodDefault<z.ZodObject<{
             langs: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiLang, z.ZodTypeDef, ShikiLang>, "many">, ShikiLang[], ShikiLang[]>>;
+            langAlias: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
             theme: z.ZodDefault<z.ZodUnion<[z.ZodEnum<[import("shiki").BundledTheme, ...import("shiki").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>;
             themes: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodEnum<[import("shiki").BundledTheme, ...import("shiki").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>>;
             defaultColor: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"light">, z.ZodLiteral<"dark">, z.ZodString, z.ZodLiteral<false>]>>;
@@ -1220,6 +1237,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             transformers: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiTransformer, z.ZodTypeDef, ShikiTransformer>, "many">, ShikiTransformer[], ShikiTransformer[]>>;
         }, "strip", z.ZodTypeAny, {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -1227,6 +1245,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             defaultColor?: string | false | undefined;
         }, {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;
@@ -1242,6 +1261,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -1257,6 +1277,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;
@@ -1711,6 +1732,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
+        concurrency: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
         format: "file" | "directory" | "preserve";
         client: import("url").URL;
@@ -1719,6 +1741,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
+        concurrency: number;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -1730,6 +1753,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "always" | "never" | "auto" | undefined;
+        concurrency?: number | undefined;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -1809,6 +1833,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
+        concurrency: number;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -1820,6 +1845,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -1957,6 +1983,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "always" | "never" | "auto" | undefined;
+        concurrency?: number | undefined;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -1972,6 +1999,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;
@@ -2104,6 +2132,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
+        concurrency: number;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -2115,6 +2144,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -2252,6 +2282,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "always" | "never" | "auto" | undefined;
+        concurrency?: number | undefined;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -2267,6 +2298,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;
@@ -2399,6 +2431,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
+        concurrency: number;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -2410,6 +2443,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -2547,6 +2581,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "always" | "never" | "auto" | undefined;
+        concurrency?: number | undefined;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -2562,6 +2597,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;
@@ -2694,6 +2730,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry: string;
         redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
+        concurrency: number;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -2705,6 +2742,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ShikiLang[];
+            langAlias: Record<string, string>;
             theme: import("shiki").BundledTheme | ShikiTheme;
             themes: Record<string, import("shiki").BundledTheme | ShikiTheme>;
             wrap: boolean | null;
@@ -2842,6 +2880,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         serverEntry?: string | undefined;
         redirects?: boolean | undefined;
         inlineStylesheets?: "always" | "never" | "auto" | undefined;
+        concurrency?: number | undefined;
         assetsPrefix?: string | ({
             fallback: string;
         } & Record<string, string>) | undefined;
@@ -2857,6 +2896,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
+            langAlias?: Record<string, string> | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
             themes?: Record<string, import("shiki").BundledTheme | ShikiTheme> | undefined;
             defaultColor?: string | false | undefined;

package/dist/core/config/schema.js

@@ -20,7 +20,8 @@ const ASTRO_CONFIG_DEFAULTS = {
     assets: "_astro",
     serverEntry: "entry.mjs",
     redirects: true,
-    inlineStylesheets: "auto"
+    inlineStylesheets: "auto",
+    concurrency: 1
   },
   image: {
     service: { entrypoint: "astro/assets/services/sharp", config: {} }
@@ -92,7 +93,8 @@ const AstroConfigSchema = z.object({
     ),
     serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
     redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
-    inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets)
+    inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets),
+    concurrency: z.number().min(1).optional().default(ASTRO_CONFIG_DEFAULTS.build.concurrency)
   }).default({}),
   server: z.preprocess(
     // preprocess
@@ -178,6 +180,7 @@ const AstroConfigSchema = z.object({
         }
         return langs;
       }).default([]),
+      langAlias: z.record(z.string(), z.string()).optional().default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.langAlias),
       theme: z.enum(Object.keys(bundledThemes)).or(z.custom()).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.theme),
       themes: z.record(
         z.enum(Object.keys(bundledThemes)).or(z.custom())
@@ -371,7 +374,8 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
       ),
       serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
       redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
-      inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets)
+      inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets),
+      concurrency: z.number().min(1).optional().default(ASTRO_CONFIG_DEFAULTS.build.concurrency)
     }).optional().default({}),
     server: z.preprocess(
       // preprocess

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.15.12";
+const ASTRO_VERSION = "4.16.0";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.15.12";
+  const currentVersion = "4.16.0";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/dev/restart.js

@@ -20,7 +20,7 @@ async function createRestartedContainer(container, settings) {
   await startContainer(newContainer);
   return newContainer;
 }
-const configRE = /.*astro.config.(?:mjs|cjs|js|ts)$/;
+const configRE = /.*astro.config.(?:mjs|mts|cjs|cts|js|ts)$/;
 function shouldRestartContainer({ settings, inlineConfig, restartInFlight }, changedFile) {
   if (restartInFlight) return false;
   let shouldRestart = false;

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.15.12";
+  const version = "4.16.0";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -270,7 +270,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.15.12"}`
+        `v${"4.16.0"}`
       )} ${headline}`
     );
   }

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

@@ -17,11 +17,15 @@ export type CreateContext = {
      * A list of locales that are supported by the user
      */
     userDefinedLocales?: string[];
+    /**
+     * User defined default locale
+     */
+    defaultLocale: string;
 };
 /**
  * Creates a context to be passed to Astro middleware `onRequest` function.
  */
-declare function createContext({ request, params, userDefinedLocales, }: CreateContext): APIContext;
+declare function createContext({ request, params, userDefinedLocales, defaultLocale, }: CreateContext): APIContext;
 /**
  * It attempts to serialize `value` and return it as a string.
  *

package/dist/core/middleware/index.js

@@ -14,7 +14,8 @@ function defineMiddleware(fn) {
 function createContext({
   request,
   params = {},
-  userDefinedLocales = []
+  userDefinedLocales = [],
+  defaultLocale = ""
 }) {
   let preferredLocale = void 0;
   let preferredLocaleList = void 0;
@@ -47,7 +48,7 @@ function createContext({
       return preferredLocaleList ??= computePreferredLocaleList(request, userDefinedLocales);
     },
     get currentLocale() {
-      return currentLocale ??= computeCurrentLocale(route, userDefinedLocales);
+      return currentLocale ??= computeCurrentLocale(route, userDefinedLocales, defaultLocale);
     },
     url,
     get clientAddress() {

package/dist/core/preview/vite-plugin-astro-preview.js

@@ -50,7 +50,7 @@ function vitePluginAstroPreview(settings) {
         next();
       });
       return () => {
-        server.middlewares.use((req, res, next) => {
+        server.middlewares.use((req, _res, next) => {
           const pathname = cleanUrl(req.url);
           if (pathname.endsWith("/")) {
             const pathnameWithoutSlash = pathname.slice(0, -1);

package/dist/core/render-context.js

@@ -428,7 +428,7 @@ class RenderContext {
     if (!i18n) return;
     const { defaultLocale, locales, strategy } = i18n;
     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;
+    return this.#currentLocale ??= computeCurrentLocale(routeData.route, locales, defaultLocale) ?? computeCurrentLocale(url.pathname, locales, defaultLocale) ?? fallbackTo;
   }
   #preferredLocale;
   computePreferredLocale() {

package/dist/events/error.js

@@ -49,7 +49,7 @@ function getSafeErrorMessage(message) {
     const arrowIndex = func.indexOf("=>") + "=>".length;
     return func.slice(arrowIndex).trim().slice(1, -1).replace(
       /\$\{([^}]+)\}/g,
-      (str, match1) => `${match1.split(/\.?(?=[A-Z])/).join("_").toUpperCase()}`
+      (_str, match1) => `${match1.split(/\.?(?=[A-Z])/).join("_").toUpperCase()}`
     ).replace(/\\`/g, "`");
   }
 }

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): undefined | string;
+export declare function computeCurrentLocale(pathname: string, locales: Locales, defaultLocale: string): string | undefined;
 export type RoutingStrategies = 'manual' | 'pathname-prefix-always' | 'pathname-prefix-other-locales' | 'pathname-prefix-always-no-redirect' | 'domains-prefix-always' | 'domains-prefix-other-locales' | 'domains-prefix-always-no-redirect';
 export declare function toRoutingStrategy(routing: NonNullable<AstroConfig['i18n']>['routing'], domains: NonNullable<AstroConfig['i18n']>['domains']): RoutingStrategies;
 export declare function toFallbackType(routing: NonNullable<AstroConfig['i18n']>['routing']): 'redirect' | 'rewrite';

package/dist/i18n/utils.js

@@ -105,7 +105,7 @@ function computePreferredLocaleList(request, locales) {
   }
   return result;
 }
-function computeCurrentLocale(pathname, locales) {
+function computeCurrentLocale(pathname, locales, defaultLocale) {
   for (const segment of pathname.split("/")) {
     for (const locale of locales) {
       if (typeof locale === "string") {
@@ -126,6 +126,17 @@ function computeCurrentLocale(pathname, locales) {
       }
     }
   }
+  for (const locale of locales) {
+    if (typeof locale === "string") {
+      if (locale === defaultLocale) {
+        return locale;
+      }
+    } else {
+      if (locale.path === defaultLocale) {
+        return locale.codes.at(0);
+      }
+    }
+  }
 }
 function toRoutingStrategy(routing, domains) {
   let strategy;

package/dist/i18n/vite-plugin-i18n.js

@@ -14,7 +14,7 @@ function astroInternationalization({
   return {
     name: "astro:i18n",
     enforce: "pre",
-    config(config, { command }) {
+    config(_config, { command }) {
       const i18nConfig = {
         base,
         format,

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

@@ -1,3 +1,4 @@
+import { Http2ServerResponse } from "node:http2";
 import { Readable } from "node:stream";
 import { getSetCookiesFromResponse } from "../core/cookies/index.js";
 import { getViteErrorPayload } from "../core/errors/dev/index.js";
@@ -46,7 +47,9 @@ async function writeWebResponse(res, webResponse) {
   if (headers.has("set-cookie")) {
     _headers["set-cookie"] = headers.getSetCookie();
   }
-  res.statusMessage = statusText;
+  if (!(res instanceof Http2ServerResponse)) {
+    res.statusMessage = statusText;
+  }
   res.writeHead(status, _headers);
   if (body) {
     if (Symbol.for("astro.responseBody") in webResponse) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.15.12",
+  "version": "4.16.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -170,7 +170,7 @@
     "zod-to-json-schema": "^3.23.3",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/markdown-remark": "5.2.0",
+    "@astrojs/markdown-remark": "5.3.0",
     "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {

package/templates/env/module.mjs

@@ -26,7 +26,6 @@ const _internalGetSecret = (key) => {
 };
 
 // used while generating the virtual module
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-setOnSetGetEnv((reset) => {
+setOnSetGetEnv((_reset) => {
 	// @@ON_SET_GET_ENV@@
 });