astro 5.15.3 → 5.15.5

package/dist/assets/fonts/implementations/font-metrics-resolver.js

@@ -15,9 +15,11 @@ function filterRequiredMetrics({
     xWidthAvg
   };
 }
-function toPercentage(value, fractionDigits = 4) {
-  const percentage = value * 100;
-  return `${+percentage.toFixed(fractionDigits)}%`;
+function round(value) {
+  return parseFloat(value.toFixed(4));
+}
+function toPercentString(value) {
+  return `${round(value * 100)}%`;
 }
 function createCapsizeFontMetricsResolver({
   fontFetcher,
@@ -29,7 +31,8 @@ function createCapsizeFontMetricsResolver({
       cache[name] ??= filterRequiredMetrics(await fromBuffer(await fontFetcher.fetch(input)));
       return cache[name];
     },
-    // Source: https://github.com/unjs/fontaine/blob/f00f84032c5d5da72c8798eae4cd68d3ddfbf340/src/css.ts#L170
+    // Adapted from Capsize
+    // Source: https://github.com/seek-oss/capsize/blob/b752693428b45994442433f7e3476ca4e3e3c507/packages/core/src/createFontStack.ts
     generateFontFace({
       metrics,
       fallbackMetrics,
@@ -39,18 +42,21 @@ function createCapsizeFontMetricsResolver({
     }) {
       const preferredFontXAvgRatio = metrics.xWidthAvg / metrics.unitsPerEm;
       const fallbackFontXAvgRatio = fallbackMetrics.xWidthAvg / fallbackMetrics.unitsPerEm;
-      const sizeAdjust = preferredFontXAvgRatio / fallbackFontXAvgRatio;
+      const sizeAdjust = preferredFontXAvgRatio && fallbackFontXAvgRatio ? preferredFontXAvgRatio / fallbackFontXAvgRatio : 1;
       const adjustedEmSquare = metrics.unitsPerEm * sizeAdjust;
       const ascentOverride = metrics.ascent / adjustedEmSquare;
       const descentOverride = Math.abs(metrics.descent) / adjustedEmSquare;
       const lineGapOverride = metrics.lineGap / adjustedEmSquare;
+      const fallbackAscentOverride = fallbackMetrics.ascent / adjustedEmSquare;
+      const fallbackDescentOverride = Math.abs(fallbackMetrics.descent) / adjustedEmSquare;
+      const fallbackLineGapOverride = fallbackMetrics.lineGap / adjustedEmSquare;
       return cssRenderer.generateFontFace(fallbackName, {
         ...properties,
         src: renderFontSrc([{ name: fallbackFontName }]),
-        "size-adjust": toPercentage(sizeAdjust),
-        "ascent-override": toPercentage(ascentOverride),
-        "descent-override": toPercentage(descentOverride),
-        "line-gap-override": toPercentage(lineGapOverride)
+        "size-adjust": sizeAdjust && sizeAdjust !== 1 ? toPercentString(sizeAdjust) : void 0,
+        "ascent-override": ascentOverride && ascentOverride !== fallbackAscentOverride ? toPercentString(ascentOverride) : void 0,
+        "descent-override": descentOverride && descentOverride !== fallbackDescentOverride ? toPercentString(descentOverride) : void 0,
+        "line-gap-override": lineGapOverride !== fallbackLineGapOverride ? toPercentString(lineGapOverride) : void 0
       });
     }
   };

package/dist/assets/fonts/logic/normalize-remote-font-faces.js

@@ -4,7 +4,7 @@ function normalizeRemoteFontFaces({
   urlProxy,
   fontTypeExtractor
 }) {
-  return fonts.filter((font) => typeof font.meta?.priority === "number" ? font.meta.priority === 0 : true).map((font) => {
+  return fonts.filter((font) => typeof font.meta?.priority === "number" ? font.meta.priority <= 1 : true).map((font) => {
     let index = 0;
     return {
       ...font,

package/dist/assets/fonts/logic/optimize-fallbacks.js

@@ -24,7 +24,7 @@ async function optimizeFallbacks({
   }
   const localFontsMappings = localFonts.map((font) => ({
     font,
-    // We must't wrap in quote because that's handled by the CSS renderer
+    // We mustn't wrap in quote because that's handled by the CSS renderer
     name: `${family.nameWithHash} fallback: ${font}`
   }));
   fallbacks = [...localFontsMappings.map((m) => m.name), ...fallbacks];

package/dist/cli/add/index.js

@@ -24,7 +24,6 @@ import {
 import * as msg from "../../core/messages.js";
 import { printHelp } from "../../core/messages.js";
 import { appendForwardSlash } from "../../core/path.js";
-import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { ensureProcessNodeEnv, parseNpmName } from "../../core/util.js";
 import { eventCliSession, telemetry } from "../../events/index.js";
 import { exec } from "../exec.js";
@@ -90,7 +89,6 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
 };
 async function add(names, { flags }) {
   ensureProcessNodeEnv("production");
-  applyPolyfill();
   const inlineConfig = flagsToAstroInlineConfig(flags);
   const { userConfig } = await resolveConfig(inlineConfig, "add");
   telemetry.record(eventCliSession("add", userConfig));

package/dist/cli/db/index.js

@@ -1,9 +1,7 @@
 import { resolveConfig } from "../../core/config/config.js";
-import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { getPackage } from "../install-package.js";
 async function db({ flags }) {
-  applyPolyfill();
   const logger = createLoggerFromFlags(flags);
   const getPackageOpts = {
     skipAsk: !!flags.yes || !!flags.y,

package/dist/cli/definitions.d.ts

@@ -1,3 +1,4 @@
+import type { StdioOptions } from 'node:child_process';
 import type { AnyCommand } from './domain/command.js';
 import type { HelpPayload } from './domain/help-payload.js';
 export interface HelpDisplay {
@@ -18,3 +19,18 @@ export interface AstroVersionProvider {
 export interface CommandRunner {
     run: <T extends AnyCommand>(command: T, ...args: Parameters<T['run']>) => ReturnType<T['run']>;
 }
+export interface CommandExecutor {
+    execute: (command: string, args?: Array<string>, options?: {
+        cwd?: string;
+        env?: Record<string, string | undefined>;
+        shell?: boolean;
+        input?: string;
+        stdio?: StdioOptions;
+    }) => Promise<{
+        stdout: string;
+    }>;
+}
+export interface OperatingSystemProvider {
+    getName: () => NodeJS.Platform;
+    getDisplayName: () => string;
+}

package/dist/cli/docs/core/open-docs.d.ts

@@ -1,10 +1,12 @@
 import type { Logger } from '../../../core/logger/core.js';
-import type { CommandExecutor, PlatformProvider } from '../definitions.js';
+import type { CommandExecutor, OperatingSystemProvider } from '../../definitions.js';
+import type { CloudIdeProvider } from '../definitions.js';
 interface Options {
     url: string;
-    platformProvider: PlatformProvider;
+    operatingSystemProvider: OperatingSystemProvider;
     logger: Logger;
     commandExecutor: CommandExecutor;
+    cloudIdeProvider: CloudIdeProvider;
 }
 export declare const openDocsCommand: {
     help: {
@@ -14,6 +16,6 @@ export declare const openDocsCommand: {
         };
         description: string;
     };
-    run({ url, platformProvider, logger, commandExecutor }: Options): Promise<void>;
+    run({ url, operatingSystemProvider, logger, commandExecutor, cloudIdeProvider }: Options): Promise<void>;
 };
 export {};

package/dist/cli/docs/core/open-docs.js

@@ -10,13 +10,6 @@ function getExecInputForPlatform(platform) {
       return ["cmd", ["/c", "start"]];
     case "gitpod":
       return ["/ide/bin/remote-cli/gitpod-code", ["--openExternal"]];
-    case "aix":
-    case "freebsd":
-    case "haiku":
-    case "openbsd":
-    case "sunos":
-    case "cygwin":
-    case "netbsd":
     default:
       return null;
   }
@@ -29,8 +22,8 @@ const openDocsCommand = defineCommand({
     },
     description: `Launches the Astro Docs website directly from the terminal.`
   },
-  async run({ url, platformProvider, logger, commandExecutor }) {
-    const platform = platformProvider.get();
+  async run({ url, operatingSystemProvider, logger, commandExecutor, cloudIdeProvider }) {
+    const platform = cloudIdeProvider.getName() ?? operatingSystemProvider.getName();
     const input = getExecInputForPlatform(platform);
     if (!input) {
       logger.error(

package/dist/cli/docs/definitions.d.ts

@@ -1,12 +1,4 @@
-import type { Platform } from './domains/platform.js';
-export interface PlatformProvider {
-    get: () => Platform;
-}
-export interface CommandExecutor {
-    execute: (command: string, args?: Array<string>, options?: {
-        cwd?: string;
-        env: Record<string, string | undefined>;
-    }) => Promise<{
-        stdout: string;
-    }>;
+import type { CloudIde } from './domain/cloud-ide.js';
+export interface CloudIdeProvider {
+    getName: () => CloudIde | null;
 }

package/dist/cli/docs/domain/cloud-ide.d.ts

@@ -0,0 +1 @@
+export type CloudIde = 'gitpod';

package/dist/cli/docs/infra/process-cloud-ide-provider.d.ts

@@ -0,0 +1,2 @@
+import type { CloudIdeProvider } from '../definitions.js';
+export declare function createProcessCloudIdeProvider(): CloudIdeProvider;

package/dist/cli/docs/infra/process-cloud-ide-provider.js

@@ -0,0 +1,10 @@
+function createProcessCloudIdeProvider() {
+  return {
+    getName() {
+      return Boolean(process.env.GITPOD_REPO_ROOT) ? "gitpod" : null;
+    }
+  };
+}
+export {
+  createProcessCloudIdeProvider
+};

package/dist/cli/index.js

@@ -1,4 +1,5 @@
 import yargs from "yargs-parser";
+import { apply as applyPolyfill } from "../core/polyfill.js";
 function resolveCommand(flags) {
   const cmd = flags._[2];
   if (flags.version) return "version";
@@ -26,6 +27,7 @@ function resolveCommand(flags) {
   return "help";
 }
 async function runCommand(cmd, flags) {
+  applyPolyfill();
   const [
     { createLoggerFromFlags },
     { createPicocolorsTextStyler },
@@ -81,20 +83,24 @@ async function runCommand(cmd, flags) {
     case "docs": {
       const [
         { createTinyexecCommandExecutor },
-        { createProcessPlatformProvider },
+        { createProcessOperatingSystemProvider },
+        { createProcessCloudIdeProvider },
         { openDocsCommand }
       ] = await Promise.all([
-        import("./docs/infra/tinyexec-command-executor.js"),
-        import("./docs/infra/process-platform-provider.js"),
+        import("./infra/tinyexec-command-executor.js"),
+        import("./infra/process-operating-system-provider.js"),
+        import("./docs/infra/process-cloud-ide-provider.js"),
         import("./docs/core/open-docs.js")
       ]);
       const commandExecutor = createTinyexecCommandExecutor();
-      const platformProvider = createProcessPlatformProvider();
+      const operatingSystemProvider = createProcessOperatingSystemProvider();
+      const cloudIdeProvider = createProcessCloudIdeProvider();
       return await runner.run(openDocsCommand, {
         url: "https://docs.astro.build/",
         logger,
         commandExecutor,
-        platformProvider
+        operatingSystemProvider,
+        cloudIdeProvider
       });
     }
     case "telemetry": {

package/dist/cli/info/index.js

@@ -4,7 +4,6 @@ import colors from "picocolors";
 import prompts from "prompts";
 import { resolveConfig } from "../../core/config/index.js";
 import { ASTRO_VERSION } from "../../core/constants.js";
-import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { flagsToAstroInlineConfig } from "../flags.js";
 async function getInfoOutput({
   userConfig,
@@ -52,7 +51,6 @@ async function getInfoOutput({
   return output.trim();
 }
 async function printInfo({ flags }) {
-  applyPolyfill();
   const { userConfig } = await resolveConfig(flagsToAstroInlineConfig(flags), "info");
   const output = await getInfoOutput({ userConfig, print: true });
   await copyToClipboard(output, flags.copy);

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,5 +1,5 @@
 function createBuildTimeAstroVersionProvider() {
-  const version = "5.15.3";
+  const version = "5.15.5";
   return {
     getVersion() {
       return version;

package/dist/cli/infra/passthrough-text-styler.d.ts

@@ -0,0 +1,2 @@
+import type { TextStyler } from '../definitions.js';
+export declare function createPassthroughTextStyler(): TextStyler;

package/dist/cli/infra/passthrough-text-styler.js

@@ -0,0 +1,13 @@
+function createPassthroughTextStyler() {
+  return {
+    bgWhite: (msg) => msg,
+    black: (msg) => msg,
+    dim: (msg) => msg,
+    green: (msg) => msg,
+    bold: (msg) => msg,
+    bgGreen: (msg) => msg
+  };
+}
+export {
+  createPassthroughTextStyler
+};

package/dist/cli/infra/process-operating-system-provider.d.ts

@@ -0,0 +1,2 @@
+import type { OperatingSystemProvider } from '../definitions.js';
+export declare function createProcessOperatingSystemProvider(): OperatingSystemProvider;

package/dist/cli/infra/process-operating-system-provider.js

@@ -0,0 +1,20 @@
+const PLATFORM_TO_OS = {
+  darwin: "macOS",
+  win32: "Windows",
+  linux: "Linux"
+};
+function createProcessOperatingSystemProvider() {
+  const platform = process.platform;
+  return {
+    getName() {
+      return platform;
+    },
+    getDisplayName() {
+      const system = PLATFORM_TO_OS[platform] ?? platform;
+      return `${system} (${process.arch})`;
+    }
+  };
+}
+export {
+  createProcessOperatingSystemProvider
+};

package/dist/cli/{docs/infra → infra}/tinyexec-command-executor.js

@@ -2,13 +2,19 @@ import { NonZeroExitError, x } from "tinyexec";
 function createTinyexecCommandExecutor() {
   return {
     async execute(command, args, options) {
-      return await x(command, args, {
+      const proc = x(command, args, {
         throwOnError: true,
         nodeOptions: {
           cwd: options?.cwd,
-          env: options?.env
+          env: options?.env,
+          shell: options?.shell,
+          stdio: options?.stdio
         }
-      }).then(
+      });
+      if (options?.input) {
+        proc.process?.stdin?.end(options.input);
+      }
+      return await proc.then(
         (o) => o,
         (e) => {
           if (e instanceof NonZeroExitError) {

package/dist/cli/preferences/index.js

@@ -7,7 +7,6 @@ import { resolveConfig } from "../../core/config/config.js";
 import { createSettings } from "../../core/config/settings.js";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
 import * as msg from "../../core/messages.js";
-import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { DEFAULT_PREFERENCES } from "../../preferences/defaults.js";
 import { coerce, isValidKey } from "../../preferences/index.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
@@ -25,7 +24,6 @@ function isValidSubcommand(subcommand) {
   return PREFERENCES_SUBCOMMANDS.includes(subcommand);
 }
 async function preferences(subcommand, key, value, { flags }) {
-  applyPolyfill();
   if (!isValidSubcommand(subcommand) || flags?.help || flags?.h) {
     msg.printHelp({
       commandName: "astro preferences",

package/dist/container/index.d.ts

@@ -3,7 +3,10 @@ import type { AstroComponentFactory } from '../runtime/server/index.js';
 import type { Props } from '../types/public/common.js';
 import type { AstroUserConfig } from '../types/public/config.js';
 import type { NamedSSRLoadedRendererValue, RouteType, SSRLoadedRenderer, SSRLoadedRendererValue, SSRManifest, SSRResult } from '../types/public/internal.js';
-/** Public type, used for integrations to define a renderer for the container API */
+/**
+ * Public type, used for integrations to define a renderer for the container API
+ * @deprecated Use `AstroRenderer` instead.
+ */
 export type ContainerRenderer = {
     /**
      * The name of the renderer.

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.15.3") {
+    if (previousAstroVersion && previousAstroVersion !== "5.15.5") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.15.3") {
-      await this.#store.metaStore().set("astro-version", "5.15.3");
+    if ("5.15.5") {
+      await this.#store.metaStore().set("astro-version", "5.15.5");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

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

@@ -71,6 +71,21 @@ export declare class App {
     protected set manifest(value: SSRManifest);
     protected matchesAllowedDomains(forwardedHost: string, protocol?: string): boolean;
     static validateForwardedHost(forwardedHost: string, allowedDomains?: Partial<RemotePattern>[], protocol?: string): boolean;
+    /**
+     * Validate a hostname by rejecting any with path separators.
+     * Prevents path injection attacks. Invalid hostnames return undefined.
+     */
+    static sanitizeHost(hostname: string | undefined): string | undefined;
+    /**
+     * Validate forwarded headers (proto, host, port) against allowedDomains.
+     * Returns validated values or undefined for rejected headers.
+     * Uses strict defaults: http/https only for proto, rejects port if not in allowedDomains.
+     */
+    static validateForwardedHeaders(forwardedProtocol?: string, forwardedHost?: string, forwardedPort?: string, allowedDomains?: Partial<RemotePattern>[]): {
+        protocol?: string;
+        host?: string;
+        port?: string;
+    };
     set setManifestData(newManifestData: RoutesList);
     removeBase(pathname: string): string;
     /**

package/dist/core/app/index.js

@@ -83,6 +83,72 @@ class App {
       return false;
     }
   }
+  /**
+   * Validate a hostname by rejecting any with path separators.
+   * Prevents path injection attacks. Invalid hostnames return undefined.
+   */
+  static sanitizeHost(hostname) {
+    if (!hostname) return void 0;
+    if (/[/\\]/.test(hostname)) return void 0;
+    return hostname;
+  }
+  /**
+   * Validate forwarded headers (proto, host, port) against allowedDomains.
+   * Returns validated values or undefined for rejected headers.
+   * Uses strict defaults: http/https only for proto, rejects port if not in allowedDomains.
+   */
+  static validateForwardedHeaders(forwardedProtocol, forwardedHost, forwardedPort, allowedDomains) {
+    const result = {};
+    if (forwardedProtocol) {
+      if (allowedDomains && allowedDomains.length > 0) {
+        const hasProtocolPatterns = allowedDomains.some(
+          (pattern) => pattern.protocol !== void 0
+        );
+        if (hasProtocolPatterns) {
+          try {
+            const testUrl = new URL(`${forwardedProtocol}://example.com`);
+            const isAllowed = allowedDomains.some((pattern) => matchPattern(testUrl, pattern));
+            if (isAllowed) {
+              result.protocol = forwardedProtocol;
+            }
+          } catch {
+          }
+        } else if (/^https?$/.test(forwardedProtocol)) {
+          result.protocol = forwardedProtocol;
+        }
+      } else if (/^https?$/.test(forwardedProtocol)) {
+        result.protocol = forwardedProtocol;
+      }
+    }
+    if (forwardedPort && allowedDomains && allowedDomains.length > 0) {
+      const hasPortPatterns = allowedDomains.some((pattern) => pattern.port !== void 0);
+      if (hasPortPatterns) {
+        const isAllowed = allowedDomains.some((pattern) => pattern.port === forwardedPort);
+        if (isAllowed) {
+          result.port = forwardedPort;
+        }
+      }
+    }
+    if (forwardedHost && forwardedHost.length > 0 && allowedDomains && allowedDomains.length > 0) {
+      const protoForValidation = result.protocol || "https";
+      const sanitized = App.sanitizeHost(forwardedHost);
+      if (sanitized) {
+        try {
+          const hostnameOnly = sanitized.split(":")[0];
+          const portFromHost = sanitized.includes(":") ? sanitized.split(":")[1] : void 0;
+          const portForValidation = result.port || portFromHost;
+          const hostWithPort = portForValidation ? `${hostnameOnly}:${portForValidation}` : hostnameOnly;
+          const testUrl = new URL(`${protoForValidation}://${hostWithPort}`);
+          const isAllowed = allowedDomains.some((pattern) => matchPattern(testUrl, pattern));
+          if (isAllowed) {
+            result.host = sanitized;
+          }
+        } catch {
+        }
+      }
+    }
+    return result;
+  }
   /**
    * Creates a pipeline by reading the stored manifest
    *
@@ -165,20 +231,14 @@ class App {
     let pathname = void 0;
     const url = new URL(request.url);
     if (this.#manifest.i18n && (this.#manifest.i18n.strategy === "domains-prefix-always" || this.#manifest.i18n.strategy === "domains-prefix-other-locales" || this.#manifest.i18n.strategy === "domains-prefix-always-no-redirect")) {
-      let forwardedHost = request.headers.get("X-Forwarded-Host");
-      let protocol = request.headers.get("X-Forwarded-Proto");
-      if (protocol) {
-        protocol = protocol + ":";
-      } else {
-        protocol = url.protocol;
-      }
-      if (forwardedHost && !this.matchesAllowedDomains(forwardedHost, protocol?.replace(":", ""))) {
-        forwardedHost = null;
-      }
-      let host = forwardedHost;
-      if (!host) {
-        host = request.headers.get("Host");
-      }
+      const validated = App.validateForwardedHeaders(
+        request.headers.get("X-Forwarded-Proto") ?? void 0,
+        request.headers.get("X-Forwarded-Host") ?? void 0,
+        request.headers.get("X-Forwarded-Port") ?? void 0,
+        this.#manifest.allowedDomains
+      );
+      let protocol = validated.protocol ? validated.protocol + ":" : url.protocol;
+      let host = validated.host ?? request.headers.get("Host");
       if (host && protocol) {
         host = host.split(":")[0];
         try {

package/dist/core/app/node.js

@@ -49,20 +49,20 @@ class NodeApp extends App {
     const getFirstForwardedValue = (multiValueHeader) => {
       return multiValueHeader?.toString()?.split(",").map((e) => e.trim())?.[0];
     };
-    const forwardedProtocol = getFirstForwardedValue(req.headers["x-forwarded-proto"]);
     const providedProtocol = isEncrypted ? "https" : "http";
-    const protocol = forwardedProtocol ?? providedProtocol;
-    let forwardedHostname = getFirstForwardedValue(req.headers["x-forwarded-host"]);
     const providedHostname = req.headers.host ?? req.headers[":authority"];
-    if (forwardedHostname && !App.validateForwardedHost(
-      forwardedHostname,
-      allowedDomains,
-      forwardedProtocol ?? providedProtocol
-    )) {
-      forwardedHostname = void 0;
-    }
-    const hostname = forwardedHostname ?? providedHostname;
-    const port = getFirstForwardedValue(req.headers["x-forwarded-port"]);
+    const validated = App.validateForwardedHeaders(
+      getFirstForwardedValue(req.headers["x-forwarded-proto"]),
+      getFirstForwardedValue(req.headers["x-forwarded-host"]),
+      getFirstForwardedValue(req.headers["x-forwarded-port"]),
+      allowedDomains
+    );
+    const protocol = validated.protocol ?? providedProtocol;
+    const sanitizedProvidedHostname = App.sanitizeHost(
+      typeof providedHostname === "string" ? providedHostname : void 0
+    );
+    const hostname = validated.host ?? sanitizedProvidedHostname;
+    const port = validated.port;
     let url;
     try {
       const hostnamePort = getHostnamePort(hostname, port);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.15.3";
+const ASTRO_VERSION = "5.15.5";
 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 = "5.15.3";
+  const currentVersion = "5.15.5";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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

@@ -1176,7 +1176,7 @@ export declare const UnknownFilesystemError: {
  * @description
  * Cannot extract the font type from the given URL.
  * @message
- * An error occured while trying to extract the font type from the given URL.
+ * An error occurred while trying to extract the font type from the given URL.
  */
 export declare const CannotExtractFontType: {
     name: string;
@@ -1189,7 +1189,7 @@ export declare const CannotExtractFontType: {
  * @description
  * Cannot determine weight and style from font file, update your family config and set `weight` and `style` manually instead.
  * @message
- * An error occured while determining the weight and style from the local font file.
+ * An error occurred while determining the weight and style from the local font file.
  */
 export declare const CannotDetermineWeightAndStyleFromFontFile: {
     name: string;
@@ -1202,7 +1202,7 @@ export declare const CannotDetermineWeightAndStyleFromFontFile: {
  * @description
  * Cannot fetch the given font file
  * @message
- * An error occured while fetching font file from the given URL.
+ * An error occurred while fetching font file from the given URL.
  */
 export declare const CannotFetchFontFile: {
     name: string;

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

@@ -455,7 +455,7 @@ const CannotFetchFontFile = {
 const CannotLoadFontProvider = {
   name: "CannotLoadFontProvider",
   title: "Cannot load font provider",
-  message: (entrypoint) => `An error occured while loading the "${entrypoint}" provider.`,
+  message: (entrypoint) => `An error occurred while loading the "${entrypoint}" provider.`,
   hint: "This is an issue with the font provider. Please open an issue on their repository."
 };
 const ExperimentalFontsNotEnabled = {

package/dist/core/messages.js

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

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

@@ -13,42 +13,13 @@ import { invalidVariablesToError } from "./errors.js";
 import { getEnvFieldType, validateEnvVariable } from "./validators.js";
 function astroEnv({ settings, sync, envLoader }) {
   const { schema, validateSecrets } = settings.config.env;
-  let isDev;
-  let templates = null;
-  function ensureTemplateAreLoaded() {
-    if (templates !== null) {
-      return;
-    }
-    const loadedEnv = envLoader.get();
-    if (!isDev) {
-      for (const [key, value] of Object.entries(loadedEnv)) {
-        if (value !== void 0) {
-          process.env[key] = value;
-        }
-      }
-    }
-    const validatedVariables = validatePublicVariables({
-      schema,
-      loadedEnv,
-      validateSecrets,
-      sync
-    });
-    templates = {
-      ...getTemplates(schema, validatedVariables, isDev ? loadedEnv : null),
-      internal: `export const schema = ${JSON.stringify(schema)};`
-    };
-  }
+  let isBuild;
+  let populated = false;
   return {
     name: "astro-env-plugin",
     enforce: "pre",
     config(_, { command }) {
-      isDev = command !== "build";
-    },
-    buildStart() {
-      ensureTemplateAreLoaded();
-    },
-    buildEnd() {
-      templates = null;
+      isBuild = command === "build";
     },
     resolveId(id) {
       if (id === CLIENT_VIRTUAL_MODULE_ID) {
@@ -62,23 +33,43 @@ function astroEnv({ settings, sync, envLoader }) {
       }
     },
     load(id, options) {
-      if (id === RESOLVED_CLIENT_VIRTUAL_MODULE_ID) {
-        ensureTemplateAreLoaded();
-        return { code: templates.client };
+      if (id === RESOLVED_INTERNAL_VIRTUAL_MODULE_ID) {
+        return { code: `export const schema = ${JSON.stringify(schema)};` };
       }
-      if (id === RESOLVED_SERVER_VIRTUAL_MODULE_ID) {
-        if (options?.ssr) {
-          ensureTemplateAreLoaded();
-          return { code: templates.server };
-        }
+      if (id === RESOLVED_SERVER_VIRTUAL_MODULE_ID && !options?.ssr) {
         throw new AstroError({
           ...AstroErrorData.ServerOnlyModule,
           message: AstroErrorData.ServerOnlyModule.message(SERVER_VIRTUAL_MODULE_ID)
         });
       }
-      if (id === RESOLVED_INTERNAL_VIRTUAL_MODULE_ID) {
-        ensureTemplateAreLoaded();
-        return { code: templates.internal };
+      if (id === RESOLVED_CLIENT_VIRTUAL_MODULE_ID || id === RESOLVED_SERVER_VIRTUAL_MODULE_ID) {
+        const loadedEnv = envLoader.get();
+        if (isBuild && !populated) {
+          for (const [key, value] of Object.entries(loadedEnv)) {
+            if (value !== void 0) {
+              process.env[key] = value;
+            }
+          }
+          populated = true;
+        }
+        const validatedVariables = validatePublicVariables({
+          schema,
+          loadedEnv,
+          validateSecrets,
+          sync
+        });
+        const { client, server } = getTemplates({
+          schema,
+          validatedVariables,
+          // In dev, we inline process.env to avoid freezing it
+          loadedEnv: isBuild ? null : loadedEnv
+        });
+        if (id === RESOLVED_CLIENT_VIRTUAL_MODULE_ID) {
+          return { code: client };
+        }
+        if (id === RESOLVED_SERVER_VIRTUAL_MODULE_ID) {
+          return { code: server };
+        }
       }
     }
   };
@@ -112,9 +103,14 @@ function validatePublicVariables({
   }
   return valid;
 }
-function getTemplates(schema, validatedVariables, loadedEnv) {
+let cachedServerTemplate;
+function getTemplates({
+  schema,
+  validatedVariables,
+  loadedEnv
+}) {
   let client = "";
-  let server = readFileSync(MODULE_TEMPLATE_URL, "utf-8");
+  let server = cachedServerTemplate ??= readFileSync(MODULE_TEMPLATE_URL, "utf-8");
   let onSetGetEnv = "";
   for (const { key, value, context } of validatedVariables) {
     const str = `export const ${key} = ${JSON.stringify(value)};`;

package/dist/virtual-modules/i18n.d.ts

@@ -3,7 +3,6 @@ import * as I18nInternals from '../i18n/index.js';
 import type { MiddlewareHandler } from '../types/public/common.js';
 import type { AstroConfig, ValidRedirectStatus } from '../types/public/config.js';
 import type { APIContext } from '../types/public/context.js';
-export { normalizeTheLocale, toCodes, toPaths } from '../i18n/index.js';
 export type GetLocaleOptions = I18nInternals.GetLocaleOptions;
 /**
  * @param locale A locale
@@ -155,9 +154,9 @@ export declare const getLocaleByPath: (path: string) => string;
  *
  * ```js
  * import { pathHasLocale } from "astro:i18n";
- * getLocaleByPath("italiano"); // returns `true`
- * getLocaleByPath("es"); // returns `true`
- * getLocaleByPath("it-VT"); // returns `false`
+ * pathHasLocale("italiano"); // returns `true`
+ * pathHasLocale("es"); // returns `true`
+ * pathHasLocale("it-VT"); // returns `false`
  * ```
  */
 export declare const pathHasLocale: (path: string) => boolean;
@@ -189,7 +188,7 @@ export declare let notFound: (context: APIContext, response?: Response) => Respo
  */
 export declare let requestHasLocale: (context: APIContext) => boolean;
 /**
- * Allows to use the build-in fallback system of Astro
+ * Allows to use the built-in fallback system of Astro
  *
  * @param {APIContext} context The context passed to the middleware
  * @param {Promise<Response>} response An optional `Response` in case you're handling a `Response` coming from the `next` function.
@@ -228,3 +227,86 @@ type NewAstroRoutingConfigWithoutManual = OnlyObject<NonNullable<AstroConfig['i1
  * ```
  */
 export declare let middleware: (customOptions: NewAstroRoutingConfigWithoutManual) => MiddlewareHandler;
+/**
+ * Replaces underscores (`_`) with hyphens (`-`) in the given locale before
+ * returning a lowercase version.
+ *
+ * @param {string} locale A locale code to normalize.
+ * @returns {string} The normalized locale.
+ *
+ * ## Example
+ *
+ * ```js
+ * import { normalizeTheLocale } from "astro:i18n";
+ * normalizeTheLocale("it_VT") // returns `it-vt`
+ * ```
+ */
+export declare const normalizeTheLocale: typeof I18nInternals.normalizeTheLocale;
+/**
+ * Retrieves the configured locale codes for each locale defined in your
+ * configuration. When multiple codes are associated to a locale, only the
+ * first one will be added to the array.
+ *
+ * @param {Locales} locales The configured locales.
+ * @returns {string[]} The configured locales codes.
+ *
+ * ## Example
+ *
+ * Given the following configuration:
+ *
+ * ```js
+ * // astro.config.mjs
+ *
+ * export default defineConfig({
+ * 	i18n: {
+ * 		locales: [
+ * 			{ codes: ["it-VT", "it"], path: "italiano" },
+ * 			"es"
+ * 		]
+ * 	}
+ * })
+ * ```
+ *
+ * Here's a use case:
+ *
+ * ```js
+ * import { i18n } from "astro:config/client";
+ * import { toCodes } from "astro:i18n";
+ * toCodes(i18n.locales); // ["it-VT", "es"]
+ * ```
+ */
+export declare const toCodes: typeof I18nInternals.toCodes;
+/**
+ * Retrieves the configured locale paths for each locale defined in your
+ * configuration.
+ *
+ * @param {Locales} locales The configured locales.
+ * @returns {string[]} The configured locales paths.
+ *
+ * ## Example
+ *
+ * Given the following configuration:
+ *
+ * ```js
+ * // astro.config.mjs
+ *
+ * export default defineConfig({
+ * 	i18n: {
+ * 		locales: [
+ * 			{ codes: ["it-VT", "it"], path: "italiano" },
+ * 			"es"
+ * 		]
+ * 	}
+ * })
+ * ```
+ *
+ * Here's a use case:
+ *
+ * ```js
+ * import { i18n } from "astro:config/client";
+ * import { toPaths } from "astro:i18n";
+ * toPaths(i18n.locales); // ["italiano", "es"]
+ * ```
+ */
+export declare const toPaths: typeof I18nInternals.toPaths;
+export {};

package/dist/virtual-modules/i18n.js

@@ -2,7 +2,6 @@ import { IncorrectStrategyForI18n } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
 import * as I18nInternals from "../i18n/index.js";
 import { toFallbackType, toRoutingStrategy } from "../i18n/utils.js";
-import { normalizeTheLocale, toCodes, toPaths } from "../i18n/index.js";
 const { trailingSlash, format, site, i18n, isBuild } = (
   // @ts-expect-error
   __ASTRO_INTERNAL_I18N_CONFIG__
@@ -141,6 +140,9 @@ if (i18n?.routing === "manual") {
 } else {
   middleware = noop("middleware");
 }
+const normalizeTheLocale = I18nInternals.normalizeTheLocale;
+const toCodes = I18nInternals.toCodes;
+const toPaths = I18nInternals.toPaths;
 export {
   getAbsoluteLocaleUrl,
   getAbsoluteLocaleUrlList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.15.3",
+  "version": "5.15.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -154,8 +154,8 @@
     "zod-to-json-schema": "^3.24.6",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.7.4",
-    "@astrojs/markdown-remark": "6.3.8",
-    "@astrojs/telemetry": "3.3.0"
+    "@astrojs/telemetry": "3.3.0",
+    "@astrojs/markdown-remark": "6.3.8"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -178,7 +178,6 @@
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.1.2",
     "eol": "^0.10.0",
-    "execa": "^8.0.1",
     "expect-type": "^1.2.2",
     "fs-fixture": "^2.8.1",
     "mdast-util-mdx": "^3.0.0",

package/dist/cli/docs/domains/platform.d.ts

@@ -1 +0,0 @@
-export type Platform = NodeJS.Platform | 'gitpod';

package/dist/cli/docs/infra/process-platform-provider.d.ts

@@ -1,2 +0,0 @@
-import type { PlatformProvider } from '../definitions.js';
-export declare function createProcessPlatformProvider(): PlatformProvider;

package/dist/cli/docs/infra/process-platform-provider.js

@@ -1,11 +0,0 @@
-function createProcessPlatformProvider() {
-  const platform = Boolean(process.env.GITPOD_REPO_ROOT) ? "gitpod" : process.platform;
-  return {
-    get() {
-      return platform;
-    }
-  };
-}
-export {
-  createProcessPlatformProvider
-};