astro 5.16.7 → 5.16.9

package/dist/core/config/schemas/relative.d.ts

@@ -70,11 +70,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             entrypoint: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodString]>>;
             config: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
         }, "strip", z.ZodTypeAny, {
-            entrypoint: string;
             config: Record<string, any>;
+            entrypoint: string;
         }, {
-            entrypoint?: string | undefined;
             config?: Record<string, any> | undefined;
+            entrypoint?: string | undefined;
         }>>;
         domains: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
         remotePatterns: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -105,8 +105,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             entrypoint?: string | undefined;
         };
         service: {
-            entrypoint: string;
             config: Record<string, any>;
+            entrypoint: string;
         };
         domains: string[];
         remotePatterns: {
@@ -126,8 +126,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             route?: string | undefined;
         } | undefined;
         service?: {
-            entrypoint?: string | undefined;
             config?: Record<string, any> | undefined;
+            entrypoint?: string | undefined;
         } | undefined;
         domains?: string[] | undefined;
         remotePatterns?: {
@@ -733,14 +733,39 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             optimizedFallbacks?: boolean | undefined;
         }>, z.ZodObject<{
             provider: z.ZodObject<{
-                entrypoint: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
+                name: z.ZodString;
                 config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+                init: z.ZodOptional<z.ZodType<((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined, z.ZodTypeDef, ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined>>;
+                resolveFont: z.ZodType<(options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined, z.ZodTypeDef, (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined>;
+                listFonts: z.ZodOptional<z.ZodType<(() => string[] | Promise<string[] | undefined> | undefined) | undefined, z.ZodTypeDef, (() => string[] | Promise<string[] | undefined> | undefined) | undefined>>;
             }, "strict", z.ZodTypeAny, {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             }, {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             }>;
             weights: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "atleastone">>;
             styles: z.ZodOptional<z.ZodArray<z.ZodEnum<["normal", "italic", "oblique"]>, "atleastone">>;
@@ -757,8 +782,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             cssVariable: z.ZodString;
         }, "strict", z.ZodTypeAny, {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -775,8 +807,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             unicodeRange?: [string, ...string[]] | undefined;
         }, {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -910,8 +949,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -967,8 +1013,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -1206,8 +1259,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             entrypoint?: string | undefined;
         };
         service: {
-            entrypoint: string;
             config: Record<string, any>;
+            entrypoint: string;
         };
         domains: string[];
         remotePatterns: {
@@ -1291,8 +1344,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -1475,8 +1535,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             route?: string | undefined;
         } | undefined;
         service?: {
-            entrypoint?: string | undefined;
             config?: Record<string, any> | undefined;
+            entrypoint?: string | undefined;
         } | undefined;
         domains?: string[] | undefined;
         remotePatterns?: {
@@ -1552,8 +1612,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -1710,8 +1777,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             entrypoint?: string | undefined;
         };
         service: {
-            entrypoint: string;
             config: Record<string, any>;
+            entrypoint: string;
         };
         domains: string[];
         remotePatterns: {
@@ -1795,8 +1862,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -1979,8 +2053,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             route?: string | undefined;
         } | undefined;
         service?: {
-            entrypoint?: string | undefined;
             config?: Record<string, any> | undefined;
+            entrypoint?: string | undefined;
         } | undefined;
         domains?: string[] | undefined;
         remotePatterns?: {
@@ -2056,8 +2130,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;

package/dist/core/constants.js

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

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.16.7";
+  const version = "5.16.9";
   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.16.7"}`
+        `v${"5.16.9"}`
       )} ${headline}`
     );
   }

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

@@ -66,6 +66,7 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
     ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS,
     ...settings.pageExtensions
   ]);
+  const invalidPotentialPages = /* @__PURE__ */ new Set([".tsx", ".jsx", ".vue", ".svelte"]);
   const validEndpointExtensions = /* @__PURE__ */ new Set([".js", ".ts"]);
   const localFs = fsMod ?? nodeFs;
   const prerender = getPrerenderDefault(settings.config);
@@ -85,12 +86,14 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
         continue;
       }
       if (!isDir && !validPageExtensions.has(ext) && !validEndpointExtensions.has(ext)) {
-        logger.warn(
-          null,
-          `Unsupported file type ${colors.bold(
-            resolved
-          )} found. Prefix filename with an underscore (\`_\`) to ignore.`
-        );
+        if (invalidPotentialPages.has(ext)) {
+          logger.warn(
+            null,
+            `Unsupported file type ${colors.bold(
+              resolved
+            )} found in pages directory. Only Astro files can be used as pages. Prefix filename with an underscore (\`_\`) to ignore this warning, or move the file outside of the pages directory.`
+          );
+        }
         continue;
       }
       const segment = isDir ? basename : name;

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

@@ -6,6 +6,7 @@ const perf = [
     message: "This image could be replaced with the Image component to improve performance.",
     selector: "img:not([data-image-component])",
     async match(element) {
+      if (element.closest("astro-island")) return false;
       const src = element.getAttribute("src");
       if (!src) return false;
       if (src.startsWith("data:")) return false;

package/dist/runtime/server/jsx.js

@@ -8,6 +8,7 @@ import {
 } from "./index.js";
 import { isAstroComponentFactory } from "./render/astro/factory.js";
 import { renderComponentToString } from "./render/component.js";
+import { mergeSlotInstructions, SlotString } from "./render/slot.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 const hasTriedRenderComponentSymbol = Symbol("hasTriedRenderComponent");
 async function renderJSX(result, vnode) {
@@ -23,10 +24,23 @@ async function renderJSX(result, vnode) {
       return vnode;
     case (!vnode && vnode !== 0):
       return "";
-    case Array.isArray(vnode):
-      return markHTMLString(
-        (await Promise.all(vnode.map((v) => renderJSX(result, v)))).join("")
-      );
+    case Array.isArray(vnode): {
+      const renderedItems = await Promise.all(vnode.map((v) => renderJSX(result, v)));
+      let instructions = null;
+      let content = "";
+      for (const item of renderedItems) {
+        if (item instanceof SlotString) {
+          content += item;
+          instructions = mergeSlotInstructions(instructions, item);
+        } else {
+          content += item;
+        }
+      }
+      if (instructions) {
+        return markHTMLString(new SlotString(content, instructions));
+      }
+      return markHTMLString(content);
+    }
   }
   return renderJSXVNode(result, vnode);
 }

package/dist/runtime/server/render/common.js

@@ -58,6 +58,14 @@ function stringifyChunk(result, chunk) {
         result._metadata.hasRenderedServerIslandRuntime = true;
         return renderServerIslandRuntime();
       }
+      case "script": {
+        const { id, content } = instruction;
+        if (result._metadata.renderedScripts.has(id)) {
+          return "";
+        }
+        result._metadata.renderedScripts.add(id);
+        return content;
+      }
       default: {
         throw new Error(`Unknown chunk type: ${chunk.type}`);
       }

package/dist/runtime/server/render/component.js

@@ -16,9 +16,17 @@ import {
 } from "./common.js";
 import { componentIsHTMLElement, renderHTMLElement } from "./dom.js";
 import { maybeRenderHead } from "./head.js";
-import { createRenderInstruction } from "./instruction.js";
+import {
+  createRenderInstruction,
+  isRenderInstruction
+} from "./instruction.js";
 import { containsServerDirective, ServerIslandComponent } from "./server-islands.js";
-import { renderSlots, renderSlotToString } from "./slot.js";
+import {
+  mergeSlotInstructions,
+  renderSlots,
+  renderSlotToString,
+  SlotString
+} from "./slot.js";
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from "./util.js";
 const needsHeadRenderingSymbol = Symbol.for("astro.needsHeadRendering");
 const rendererAliases = /* @__PURE__ */ new Map([["solid", "solid-js"]]);
@@ -397,6 +405,7 @@ function normalizeProps(props) {
 }
 async function renderComponentToString(result, displayName, Component, props, slots = {}, isPage = false, route) {
   let str = "";
+  let instructions = null;
   let renderedFirstPageChunk = false;
   let head = "";
   if (isPage && !result.partial && nonAstroPageNeedsHeadInjection(Component)) {
@@ -413,7 +422,19 @@ async function renderComponentToString(result, displayName, Component, props, sl
           }
         }
         if (chunk instanceof Response) return;
-        str += chunkToString(result, chunk);
+        if (isPage) {
+          str += chunkToString(result, chunk);
+        } else {
+          if (chunk instanceof SlotString) {
+            str += chunk;
+            instructions = mergeSlotInstructions(instructions, chunk);
+          } else if (isRenderInstruction(chunk)) {
+            instructions ??= [];
+            instructions.push(chunk);
+          } else {
+            str += chunkToString(result, chunk);
+          }
+        }
       }
     };
     const renderInstance = await renderComponent(result, displayName, Component, props, slots);
@@ -429,7 +450,10 @@ async function renderComponentToString(result, displayName, Component, props, sl
     }
     throw e;
   }
-  return str;
+  if (isPage) {
+    return str;
+  }
+  return new SlotString(str, instructions);
 }
 function nonAstroPageNeedsHeadInjection(pageComponent) {
   return !!pageComponent?.[needsHeadRenderingSymbol];

package/dist/runtime/server/render/instruction.d.ts

@@ -21,6 +21,11 @@ export type MaybeRenderHeadInstruction = {
 export type ServerIslandRuntimeInstruction = {
     type: 'server-island-runtime';
 };
-export type RenderInstruction = RenderDirectiveInstruction | RenderHeadInstruction | MaybeRenderHeadInstruction | RendererHydrationScriptInstruction | ServerIslandRuntimeInstruction;
+export type RenderScriptInstruction = {
+    type: 'script';
+    id: string;
+    content: string;
+};
+export type RenderInstruction = RenderDirectiveInstruction | RenderHeadInstruction | MaybeRenderHeadInstruction | RendererHydrationScriptInstruction | ServerIslandRuntimeInstruction | RenderScriptInstruction;
 export declare function createRenderInstruction<T extends RenderInstruction>(instruction: T): T;
 export declare function isRenderInstruction(chunk: any): chunk is RenderInstruction;

package/dist/runtime/server/render/script.d.ts

@@ -3,4 +3,8 @@ import type { SSRResult } from '../../../types/public/internal.js';
  * Relies on the `renderScript: true` compiler option
  * @experimental
  */
-export declare function renderScript(result: SSRResult, id: string): Promise<any>;
+export declare function renderScript(result: SSRResult, id: string): Promise<{
+    type: "script";
+    id: string;
+    content: string;
+}>;

package/dist/runtime/server/render/script.js

@@ -1,19 +1,16 @@
-import { markHTMLString } from "../escape.js";
+import { createRenderInstruction } from "./instruction.js";
 async function renderScript(result, id) {
-  if (result._metadata.renderedScripts.has(id)) return;
-  result._metadata.renderedScripts.add(id);
   const inlined = result.inlinedScripts.get(id);
+  let content = "";
   if (inlined != null) {
     if (inlined) {
-      return markHTMLString(`<script type="module">${inlined}</script>`);
-    } else {
-      return "";
+      content = `<script type="module">${inlined}</script>`;
     }
+  } else {
+    const resolved = await result.resolve(id);
+    content = `<script type="module" src="${result.userAssetsBase ? (result.base === "/" ? "" : result.base) + result.userAssetsBase : ""}${resolved}"></script>`;
   }
-  const resolved = await result.resolve(id);
-  return markHTMLString(
-    `<script type="module" src="${result.userAssetsBase ? (result.base === "/" ? "" : result.base) + result.userAssetsBase : ""}${resolved}"></script>`
-  );
+  return createRenderInstruction({ type: "script", id, content });
 }
 export {
   renderScript

package/dist/runtime/server/render/slot.d.ts

@@ -13,6 +13,11 @@ export declare class SlotString extends HTMLString {
     constructor(content: string, instructions: null | RenderInstruction[]);
 }
 export declare function isSlotString(str: string): str is any;
+/**
+ * Collects instructions from a SlotString into the target array.
+ * Returns the (possibly newly created) instructions array.
+ */
+export declare function mergeSlotInstructions(target: RenderInstruction[] | null, source: SlotString): RenderInstruction[] | null;
 export declare function renderSlot(result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult): RenderInstance;
 export declare function renderSlotToString(result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult): Promise<string>;
 interface RenderSlotsResult {

package/dist/runtime/server/render/slot.js

@@ -15,6 +15,13 @@ class SlotString extends HTMLString {
 function isSlotString(str) {
   return !!str[slotString];
 }
+function mergeSlotInstructions(target, source) {
+  if (source.instructions?.length) {
+    target ??= [];
+    target.push(...source.instructions);
+  }
+  return target;
+}
 function renderSlot(result, slotted, fallback) {
   if (!slotted && fallback) {
     return renderSlot(result, fallback);
@@ -32,10 +39,7 @@ async function renderSlotToString(result, slotted, fallback) {
     write(chunk) {
       if (chunk instanceof SlotString) {
         content += chunk;
-        if (chunk.instructions) {
-          instructions ??= [];
-          instructions.push(...chunk.instructions);
-        }
+        instructions = mergeSlotInstructions(instructions, chunk);
       } else if (chunk instanceof Response) return;
       else if (typeof chunk === "object" && "type" in chunk && typeof chunk.type === "string") {
         if (instructions === null) {
@@ -80,6 +84,7 @@ export {
   SlotString,
   createSlotValueFromString,
   isSlotString,
+  mergeSlotInstructions,
   renderSlot,
   renderSlotToString,
   renderSlots

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

@@ -6,8 +6,9 @@ import { notFoundTemplate, subpathNotUsedTemplate } from "../template/4xx.js";
 import { writeHtmlResponse } from "./response.js";
 function baseMiddleware(settings, logger) {
   const { config } = settings;
-  const site = config.site ? new URL(config.base, config.site) : void 0;
-  const devRootURL = new URL(config.base, "http://localhost");
+  const base = config.base || "/";
+  const site = config.site ? new URL(base, config.site) : void 0;
+  const devRootURL = new URL(base, "http://localhost");
   const devRoot = site ? site.pathname : devRootURL.pathname;
   const devRootReplacement = devRoot.endsWith("/") ? "/" : "";
   return function devBaseMiddleware(req, res, next) {

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

@@ -27,6 +27,9 @@ async function handleRequest({
       return;
     }
   }
+  if (config.trailingSlash === "never" && pathname === "/" && config.base !== "/") {
+    pathname = "";
+  }
   url.pathname = removeTrailingForwardSlash(config.base) + pathname;
   if (config.trailingSlash === "never") {
     url.pathname = removeTrailingForwardSlash(url.pathname);

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

@@ -43,13 +43,11 @@ function writeRedirectResponse(res, statusCode, location) {
 }
 async function writeWebResponse(res, webResponse) {
   const { status, headers, body, statusText } = webResponse;
-  const setCookieHeaders = Array.from(getSetCookiesFromResponse(webResponse));
-  if (setCookieHeaders.length) {
-    res.setHeader("set-cookie", setCookieHeaders);
-  }
+  const setCookiesFromResponse = Array.from(getSetCookiesFromResponse(webResponse));
+  const setCookieHeaders = [...setCookiesFromResponse, ...headers.getSetCookie()];
   const _headers = Object.fromEntries(headers.entries());
-  if (headers.has("set-cookie")) {
-    _headers["set-cookie"] = headers.getSetCookie();
+  if (setCookieHeaders.length) {
+    _headers["set-cookie"] = setCookieHeaders;
   }
   if (!(res instanceof Http2ServerResponse)) {
     res.statusMessage = statusText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.16.7",
+  "version": "5.16.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -63,7 +63,6 @@
     "./assets/endpoint/*": "./dist/assets/endpoint/*.js",
     "./assets/services/sharp": "./dist/assets/services/sharp.js",
     "./assets/services/noop": "./dist/assets/services/noop.js",
-    "./assets/fonts/providers/*": "./dist/assets/fonts/providers/entrypoints/*.js",
     "./assets/fonts/runtime": "./dist/assets/fonts/runtime.js",
     "./loaders": "./dist/content/loaders/index.js",
     "./content/config": "./dist/content/config.js",
@@ -154,9 +153,9 @@
     "zod": "^3.25.76",
     "zod-to-json-schema": "^3.25.1",
     "zod-to-ts": "^1.2.0",
+    "@astrojs/internal-helpers": "0.7.5",
     "@astrojs/markdown-remark": "6.3.10",
-    "@astrojs/telemetry": "3.3.0",
-    "@astrojs/internal-helpers": "0.7.5"
+    "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -195,8 +194,8 @@
     "undici": "^6.22.0",
     "unified": "^11.0.5",
     "vitest": "^3.2.4",
-    "astro-scripts": "0.0.14",
-    "@astrojs/check": "0.9.6"
+    "@astrojs/check": "0.9.6",
+    "astro-scripts": "0.0.14"
   },
   "engines": {
     "node": "18.20.8 || ^20.3.0 || >=22.0.0",

package/dist/assets/fonts/infra/build-remote-font-provider-mod-resolver.d.ts

@@ -1,4 +0,0 @@
-import type { RemoteFontProviderModResolver } from '../definitions.js';
-export declare class BuildRemoteFontProviderModResolver implements RemoteFontProviderModResolver {
-    resolve(id: string): Promise<any>;
-}

package/dist/assets/fonts/infra/build-remote-font-provider-mod-resolver.js

@@ -1,8 +0,0 @@
-class BuildRemoteFontProviderModResolver {
-  async resolve(id) {
-    return await import(id);
-  }
-}
-export {
-  BuildRemoteFontProviderModResolver
-};

package/dist/assets/fonts/infra/dev-remote-font-provider-mod-resolver.d.ts

@@ -1,9 +0,0 @@
-import type { ViteDevServer } from 'vite';
-import type { RemoteFontProviderModResolver } from '../definitions.js';
-export declare class DevServerRemoteFontProviderModResolver implements RemoteFontProviderModResolver {
-    #private;
-    constructor({ server, }: {
-        server: ViteDevServer;
-    });
-    resolve(id: string): Promise<any>;
-}