astro 5.5.6 → 5.6.1

package/client.d.ts

@@ -108,22 +108,7 @@ declare module '*.avif' {
 	export default metadata;
 }
 declare module '*.svg' {
-	type Props = {
-		/**
-		 * Accessible, short-text description
-		 *
-		 *  {@link https://developer.mozilla.org/en-US/docs/Web/SVG/Element/title|MDN Reference}
-		 */
-		title?: string;
-		/**
-		 * Shorthand for setting the `height` and `width` properties
-		 */
-		size?: number | string;
-		/**
-		 * Override the default rendering mode for SVGs
-		 */
-		mode?: import('./dist/assets/utils/svg.js').SvgRenderMode;
-	} & astroHTML.JSX.SVGAttributes;
+	type Props = astroHTML.JSX.SVGAttributes;
 
 	const Component: ((_props: Props) => any) & ImageMetadata;
 	export default Component;

package/dist/actions/plugins.js

@@ -95,7 +95,7 @@ export * from 'astro/actions/runtime/virtual/client.js';`;
           shouldAppendForwardSlash(settings.config.trailingSlash, settings.config.build.format)
         )
       );
-      return code;
+      return { code };
     }
   };
 }

package/dist/assets/runtime.js

@@ -4,30 +4,10 @@ import {
   spreadAttributes,
   unescapeHTML
 } from "../runtime/server/index.js";
-const countersByPage = /* @__PURE__ */ new WeakMap();
 function createSvgComponent({ meta, attributes, children }) {
-  const renderedIds = /* @__PURE__ */ new WeakMap();
-  const Component = createComponent((result, props) => {
-    let counter = countersByPage.get(result) ?? 0;
-    const {
-      title: titleProp,
-      viewBox,
-      mode,
-      ...normalizedProps
-    } = normalizeProps(attributes, props);
-    const title = titleProp ? unescapeHTML(`<title>${titleProp}</title>`) : "";
-    if (mode === "sprite") {
-      let symbol = "";
-      let id = renderedIds.get(result);
-      if (!id) {
-        countersByPage.set(result, ++counter);
-        id = `a:${counter}`;
-        symbol = unescapeHTML(`<symbol${spreadAttributes({ viewBox, id })}>${children}</symbol>`);
-        renderedIds.set(result, id);
-      }
-      return render`<svg${spreadAttributes(normalizedProps)}>${title}${symbol}<use href="#${id}" /></svg>`;
-    }
-    return render`<svg${spreadAttributes({ viewBox, ...normalizedProps })}>${title}${unescapeHTML(children)}</svg>`;
+  const Component = createComponent((_, props) => {
+    const normalizedProps = normalizeProps(attributes, props);
+    return render`<svg${spreadAttributes(normalizedProps)}>${unescapeHTML(children)}</svg>`;
   });
   if (import.meta.env.DEV) {
     makeNonEnumerable(Component);
@@ -38,18 +18,14 @@ function createSvgComponent({ meta, attributes, children }) {
   return Object.assign(Component, meta);
 }
 const ATTRS_TO_DROP = ["xmlns", "xmlns:xlink", "version"];
-const DEFAULT_ATTRS = { role: "img" };
+const DEFAULT_ATTRS = {};
 function dropAttributes(attributes) {
   for (const attr of ATTRS_TO_DROP) {
     delete attributes[attr];
   }
   return attributes;
 }
-function normalizeProps(attributes, { size, ...props }) {
-  if (size !== void 0 && props.width === void 0 && props.height === void 0) {
-    props.height = size;
-    props.width = size;
-  }
+function normalizeProps(attributes, props) {
   return dropAttributes({ ...DEFAULT_ATTRS, ...attributes, ...props });
 }
 function makeNonEnumerable(object) {

package/dist/assets/utils/svg.d.ts

@@ -1,5 +1,2 @@
 import type { ImageMetadata } from '../types.js';
-export type SvgRenderMode = 'inline' | 'sprite';
-export declare function makeSvgComponent(meta: ImageMetadata, contents: Buffer | string, options?: {
-    mode?: SvgRenderMode;
-}): string;
+export declare function makeSvgComponent(meta: ImageMetadata, contents: Buffer | string): string;

package/dist/assets/utils/svg.js

@@ -12,12 +12,12 @@ function parseSvg(contents) {
   const body = renderSync({ ...root, children });
   return { attributes, body };
 }
-function makeSvgComponent(meta, contents, options) {
+function makeSvgComponent(meta, contents) {
   const file = typeof contents === "string" ? contents : contents.toString("utf-8");
   const { attributes, body: children } = parseSvg(file);
   const props = {
     meta,
-    attributes: dropAttributes({ mode: options?.mode, ...attributes }),
+    attributes: dropAttributes(attributes),
     children
   };
   return `import { createSvgComponent } from 'astro/assets/runtime';

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

@@ -88,33 +88,32 @@ function assets({ settings }) {
       },
       load(id) {
         if (id === resolvedVirtualModuleId) {
-          return (
-            /* ts */
-            `
-					export { getConfiguredImageService, isLocalService } from "astro/assets";
-					import { getImage as getImageInternal } from "astro/assets";
-					export { default as Image } from "astro/components/${imageComponentPrefix}Image.astro";
-					export { default as Picture } from "astro/components/${imageComponentPrefix}Picture.astro";
-					export { inferRemoteSize } from "astro/assets/utils/inferRemoteSize.js";
+          return {
+            code: `
+							export { getConfiguredImageService, isLocalService } from "astro/assets";
+							import { getImage as getImageInternal } from "astro/assets";
+							export { default as Image } from "astro/components/${imageComponentPrefix}Image.astro";
+							export { default as Picture } from "astro/components/${imageComponentPrefix}Picture.astro";
+							export { inferRemoteSize } from "astro/assets/utils/inferRemoteSize.js";
 
-					export const imageConfig = ${JSON.stringify({ ...settings.config.image, experimentalResponsiveImages: settings.config.experimental.responsiveImages })};
-					// This is used by the @astrojs/node integration to locate images.
-					// It's unused on other platforms, but on some platforms like Netlify (and presumably also Vercel)
-					// new URL("dist/...") is interpreted by the bundler as a signal to include that directory
-					// in the Lambda bundle, which would bloat the bundle with images.
-					// To prevent this, we mark the URL construction as pure,
-					// so that it's tree-shaken away for all platforms that don't need it.
-					export const outDir = /* #__PURE__ */ new URL(${JSON.stringify(
+							export const imageConfig = ${JSON.stringify({ ...settings.config.image, experimentalResponsiveImages: settings.config.experimental.responsiveImages })};
+							// This is used by the @astrojs/node integration to locate images.
+							// It's unused on other platforms, but on some platforms like Netlify (and presumably also Vercel)
+							// new URL("dist/...") is interpreted by the bundler as a signal to include that directory
+							// in the Lambda bundle, which would bloat the bundle with images.
+							// To prevent this, we mark the URL construction as pure,
+							// so that it's tree-shaken away for all platforms that don't need it.
+							export const outDir = /* #__PURE__ */ new URL(${JSON.stringify(
               new URL(
                 settings.buildOutput === "server" ? settings.config.build.client : settings.config.outDir
               )
             )});
-					export const assetsDir = /* #__PURE__ */ new URL(${JSON.stringify(
+							export const assetsDir = /* #__PURE__ */ new URL(${JSON.stringify(
               settings.config.build.assets
             )}, outDir);
-					export const getImage = async (options) => await getImageInternal(options, imageConfig);
-				`
-          );
+							export const getImage = async (options) => await getImageInternal(options, imageConfig);
+						`
+          };
         }
       },
       buildStart() {
@@ -123,7 +122,7 @@ function assets({ settings }) {
       },
       // In build, rewrite paths to ESM imported images in code to their final location
       async renderChunk(code) {
-        const assetUrlRE = /__ASTRO_ASSET_IMAGE__([\w$]{8})__(?:_(.*?)__)?/g;
+        const assetUrlRE = /__ASTRO_ASSET_IMAGE__([\w$]+)__(?:_(.*?)__)?/g;
         let match;
         let s;
         while (match = assetUrlRE.exec(code)) {
@@ -167,7 +166,7 @@ function assets({ settings }) {
           if (!assetRegexEnds.test(id)) {
             return;
           }
-          const emitFile = shouldEmitFile ? this.emitFile : void 0;
+          const emitFile = shouldEmitFile ? this.emitFile.bind(this) : void 0;
           const imageMetadata = await emitESMImage(
             id,
             this.meta.watchMode,
@@ -182,18 +181,20 @@ function assets({ settings }) {
           }
           if (settings.config.experimental.svg && /\.svg$/.test(id)) {
             const { contents, ...metadata } = imageMetadata;
-            return makeSvgComponent(metadata, contents, {
-              mode: settings.config.experimental.svg.mode
-            });
+            return { code: makeSvgComponent(metadata, contents) };
           }
           if (options?.ssr) {
-            return `export default ${getProxyCode(
-              imageMetadata,
-              settings.buildOutput === "server"
-            )}`;
+            return {
+              code: `export default ${getProxyCode(
+                imageMetadata,
+                settings.buildOutput === "server"
+              )}`
+            };
           } else {
             globalThis.astroAsset.referencedImages.add(imageMetadata.fsPath);
-            return `export default ${JSON.stringify(imageMetadata)}`;
+            return {
+              code: `export default ${JSON.stringify(imageMetadata)}`
+            };
           }
         }
       }

package/dist/container/index.js

@@ -1,7 +1,7 @@
 import "./polyfill.js";
 import { posix } from "node:path";
 import { getDefaultClientDirectives } from "../core/client-directive/index.js";
-import { ASTRO_CONFIG_DEFAULTS } from "../core/config/schema.js";
+import { ASTRO_CONFIG_DEFAULTS } from "../core/config/schemas/index.js";
 import { validateConfig } from "../core/config/validate.js";
 import { createKey } from "../core/encryption.js";
 import { Logger } from "../core/logger/core.js";

package/dist/content/content-layer.js

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

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -122,7 +122,7 @@ function astroContentVirtualModPlugin({
       }
       if (id === RESOLVED_DATA_STORE_VIRTUAL_ID) {
         if (!fs.existsSync(dataStoreFile)) {
-          return "export default new Map()";
+          return { code: "export default new Map()" };
         }
         const jsonData = await fs.promises.readFile(dataStoreFile, "utf-8");
         try {
@@ -140,17 +140,15 @@ function astroContentVirtualModPlugin({
       }
       if (id === ASSET_IMPORTS_RESOLVED_STUB_ID) {
         const assetImportsFile = new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir);
-        if (!fs.existsSync(assetImportsFile)) {
-          return "export default new Map()";
-        }
-        return fs.readFileSync(assetImportsFile, "utf-8");
+        return {
+          code: fs.existsSync(assetImportsFile) ? fs.readFileSync(assetImportsFile, "utf-8") : "export default new Map()"
+        };
       }
       if (id === MODULES_MJS_VIRTUAL_ID) {
         const modules = new URL(MODULES_IMPORTS_FILE, settings.dotAstroDir);
-        if (!fs.existsSync(modules)) {
-          return "export default new Map()";
-        }
-        return fs.readFileSync(modules, "utf-8");
+        return {
+          code: fs.existsSync(modules) ? fs.readFileSync(modules, "utf-8") : "export default new Map()"
+        };
       }
     },
     configureServer(server) {

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

@@ -3,6 +3,7 @@ import type { RouteData, SSRManifest } from '../../types/public/internal.js';
 import { getSetCookiesFromResponse } from '../cookies/index.js';
 import { AstroIntegrationLogger } from '../logger/core.js';
 export { deserializeManifest } from './common.js';
+type ErrorPagePath = `${string}/404` | `${string}/500` | `${string}/404/` | `${string}/500/` | `${string}404.html` | `${string}500.html`;
 export interface RenderOptions {
     /**
      * Whether to automatically add all cookies written by `Astro.cookie.set()` to the response headers.
@@ -24,6 +25,19 @@ export interface RenderOptions {
      * The mutable object that will be made available as `Astro.locals` in pages, and as `ctx.locals` in API routes and middleware.
      */
     locals?: object;
+    /**
+     * A custom fetch function for retrieving prerendered pages - 404 or 500.
+     *
+     * If not provided, Astro will fallback to its default behavior for fetching error pages.
+     *
+     * When a dynamic route is matched but ultimately results in a 404, this function will be used
+     * to fetch the prerendered 404 page if available. Similarly, it may be used to fetch a
+     * prerendered 500 error page when necessary.
+     *
+     * @param {ErrorPagePath} url - The URL of the prerendered 404 or 500 error page to fetch.
+     * @returns {Promise<Response>} A promise resolving to the prerendered response.
+     */
+    prerenderedErrorPageFetch?: (url: ErrorPagePath) => Promise<Response>;
     /**
      * **Advanced API**: you probably do not need to use this.
      *
@@ -45,6 +59,7 @@ export interface RenderErrorOptions {
      */
     error?: unknown;
     clientAddress: string | undefined;
+    prerenderedErrorPageFetch: (url: ErrorPagePath) => Promise<Response>;
 }
 export declare class App {
     #private;

package/dist/core/app/index.js

@@ -193,6 +193,7 @@ class App {
     let addCookieHeader;
     const url = new URL(request.url);
     const redirect = this.#redirectTrailingSlash(url.pathname);
+    const prerenderedErrorPageFetch = renderOptions?.prerenderedErrorPageFetch ?? fetch;
     if (redirect !== url.pathname) {
       const status = request.method === "GET" ? 301 : 308;
       return new Response(
@@ -226,7 +227,12 @@ class App {
       if (typeof locals !== "object") {
         const error = new AstroError(AstroErrorData.LocalsNotAnObject);
         this.#logger.error(null, error.stack);
-        return this.#renderError(request, { status: 500, error, clientAddress });
+        return this.#renderError(request, {
+          status: 500,
+          error,
+          clientAddress,
+          prerenderedErrorPageFetch
+        });
       }
     }
     if (!routeData) {
@@ -242,7 +248,12 @@ class App {
     if (!routeData) {
       this.#logger.debug("router", "Astro hasn't found routes that match " + request.url);
       this.#logger.debug("router", "Here's the available routes:\n", this.#manifestData);
-      return this.#renderError(request, { locals, status: 404, clientAddress });
+      return this.#renderError(request, {
+        locals,
+        status: 404,
+        clientAddress,
+        prerenderedErrorPageFetch
+      });
     }
     const pathname = this.#getPathnameFromRequest(request);
     const defaultStatus = this.#getDefaultStatusCode(routeData, pathname);
@@ -263,7 +274,13 @@ class App {
       response = await renderContext.render(await mod.page());
     } catch (err) {
       this.#logger.error(null, err.stack || err.message || String(err));
-      return this.#renderError(request, { locals, status: 500, error: err, clientAddress });
+      return this.#renderError(request, {
+        locals,
+        status: 500,
+        error: err,
+        clientAddress,
+        prerenderedErrorPageFetch
+      });
     } finally {
       await session?.[PERSIST_SYMBOL]();
     }
@@ -275,7 +292,8 @@ class App {
         // We don't have an error to report here. Passing null means we pass nothing intentionally
         // while undefined means there's no error
         error: response.status === 500 ? null : void 0,
-        clientAddress
+        clientAddress,
+        prerenderedErrorPageFetch
       });
     }
     if (response.headers.has(REROUTE_DIRECTIVE_HEADER)) {
@@ -314,7 +332,8 @@ class App {
     response: originalResponse,
     skipMiddleware = false,
     error,
-    clientAddress
+    clientAddress,
+    prerenderedErrorPageFetch
   }) {
     const errorRoutePath = `/${status}${this.#manifest.trailingSlash === "always" ? "/" : ""}`;
     const errorRouteData = matchRoute(errorRoutePath, this.#manifestData);
@@ -327,7 +346,7 @@ class App {
           url
         );
         if (statusURL.toString() !== request.url) {
-          const response2 = await fetch(statusURL.toString());
+          const response2 = await prerenderedErrorPageFetch(statusURL.toString());
           const override = { status };
           return this.#mergeResponses(response2, originalResponse, override);
         }
@@ -356,7 +375,8 @@ class App {
             status,
             response: originalResponse,
             skipMiddleware: true,
-            clientAddress
+            clientAddress,
+            prerenderedErrorPageFetch
           });
         }
       } finally {

package/dist/core/build/index.js

@@ -111,7 +111,7 @@ class AstroBuilder {
   }
   /** Run the build logic. build() is marked private because usage should go through ".run()" */
   async build({ viteConfig }) {
-    await runHookBuildStart({ config: this.settings.config, logging: this.logger });
+    await runHookBuildStart({ config: this.settings.config, logger: this.logger });
     this.validateConfig();
     this.logger.info("build", `output: ${blue('"' + this.settings.config.output + '"')}`);
     this.logger.info("build", `mode: ${blue('"' + this.settings.buildOutput + '"')}`);
@@ -166,7 +166,7 @@ class AstroBuilder {
       settings: this.settings,
       pages: pageNames,
       routes: Object.values(allPages).flat().map((pageData) => pageData.route).concat(hasServerIslands ? getServerIslandRouteData(this.settings.config) : []),
-      logging: this.logger
+      logger: this.logger
     });
     if (this.logger.level && levels[this.logger.level()] <= levels["info"]) {
       await this.printStats({

package/dist/core/build/plugins/plugin-component-entry.js

@@ -44,7 +44,9 @@ function vitePluginComponentEntry(internals) {
         const componentId = id.slice(astroEntryPrefix.length);
         const exportNames = componentToExportNames.get(componentId);
         if (exportNames) {
-          return `export { ${exportNames.join(", ")} } from ${JSON.stringify(componentId)}`;
+          return {
+            code: `export { ${exportNames.join(", ")} } from ${JSON.stringify(componentId)}`
+          };
         }
       }
     }

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

@@ -48,7 +48,7 @@ function vitePluginManifest(options, internals) {
           `_privateSetManifestDontUseThis(manifest);`
         ];
         const exports = [`export { manifest }`];
-        return [...imports, ...contents, ...exports].join("\n");
+        return { code: [...imports, ...contents, ...exports].join("\n") };
       }
     },
     async generateBundle(_opts, bundle) {

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

@@ -40,7 +40,7 @@ function vitePluginPages(opts, internals) {
             exports.push(`export const page = () => _page`);
             imports.push(`import { renderers } from "${RENDERERS_MODULE_ID}";`);
             exports.push(`export { renderers };`);
-            return `${imports.join("\n")}${exports.join("\n")}`;
+            return { code: `${imports.join("\n")}${exports.join("\n")}` };
           }
         }
       }

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

@@ -41,6 +41,9 @@ function getNonPrerenderOnlyChunks(bundle, internals) {
       }
       nonPrerenderOnlyEntryChunks.add(chunk);
     }
+    if (chunk.type === "chunk" && chunk.isDynamicEntry) {
+      nonPrerenderOnlyEntryChunks.add(chunk);
+    }
   }
   const nonPrerenderOnlyChunks = new Set(nonPrerenderOnlyEntryChunks);
   for (const chunk of nonPrerenderOnlyChunks) {

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

@@ -26,10 +26,10 @@ function vitePluginRenderers(opts) {
             i++;
           }
           exports.push(`export const renderers = [${rendererItems}];`);
-          return `${imports.join("\n")}
-${exports.join("\n")}`;
+          return { code: `${imports.join("\n")}
+${exports.join("\n")}` };
         } else {
-          return `export const renderers = [];`;
+          return { code: `export const renderers = [];` };
         }
       }
     }

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

@@ -22,7 +22,7 @@ function vitePluginAdapter(adapter) {
     },
     async load(id) {
       if (id === RESOLVED_ADAPTER_VIRTUAL_MODULE_ID) {
-        return `export * from ${JSON.stringify(adapter.serverEntrypoint)};`;
+        return { code: `export * from ${JSON.stringify(adapter.serverEntrypoint)};` };
       }
     }
   };
@@ -86,7 +86,7 @@ function vitePluginSSR(internals, adapter, options) {
         const ssrCode = generateSSRCode(adapter, middleware.id);
         imports.push(...ssrCode.imports);
         contents.push(...ssrCode.contents);
-        return [...imports, ...contents, ...exports].join("\n");
+        return { code: [...imports, ...contents, ...exports].join("\n") };
       }
     },
     async generateBundle(_opts, bundle) {

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

@@ -1,6 +1,6 @@
 export { configPaths, resolveConfig, resolveConfigPath, resolveRoot, } from './config.js';
 export { createNodeLogger } from './logging.js';
 export { mergeConfig } from './merge.js';
-export type { AstroConfigType } from './schema.js';
+export type { AstroConfigType } from './schemas/index.js';
 export { createSettings } from './settings.js';
 export { loadTSConfig, updateTSConfigForFramework } from './tsconfig.js';