astro 6.0.0-beta.16 → 6.0.0-beta.18

package/dist/actions/runtime/server.js

@@ -99,9 +99,10 @@ function getActionContext(context) {
           }
           throw error;
         }
+        const bodySizeLimit = pipeline.manifest.actionBodySizeLimit;
         let input;
         try {
-          input = await parseRequestBody(context.request);
+          input = await parseRequestBody(context.request, bodySizeLimit);
         } catch (e) {
           if (e instanceof ActionError) {
             return { data: void 0, error: e };
@@ -149,22 +150,21 @@ function getCallerInfo(ctx) {
   }
   return void 0;
 }
-const DEFAULT_ACTION_BODY_SIZE_LIMIT = 1024 * 1024;
-async function parseRequestBody(request) {
+async function parseRequestBody(request, bodySizeLimit) {
   const contentType = request.headers.get("content-type");
   const contentLengthHeader = request.headers.get("content-length");
   const contentLength = contentLengthHeader ? Number.parseInt(contentLengthHeader, 10) : void 0;
   const hasContentLength = typeof contentLength === "number" && Number.isFinite(contentLength);
   if (!contentType) return void 0;
-  if (hasContentLength && contentLength > DEFAULT_ACTION_BODY_SIZE_LIMIT) {
+  if (hasContentLength && contentLength > bodySizeLimit) {
     throw new ActionError({
       code: "CONTENT_TOO_LARGE",
-      message: `Request body exceeds ${DEFAULT_ACTION_BODY_SIZE_LIMIT} bytes`
+      message: `Request body exceeds ${bodySizeLimit} bytes`
     });
   }
   if (hasContentType(contentType, formContentTypes)) {
     if (!hasContentLength) {
-      const body = await readRequestBodyWithLimit(request.clone(), DEFAULT_ACTION_BODY_SIZE_LIMIT);
+      const body = await readRequestBodyWithLimit(request.clone(), bodySizeLimit);
       const formRequest = new Request(request.url, {
         method: request.method,
         headers: request.headers,
@@ -177,7 +177,7 @@ async function parseRequestBody(request) {
   if (hasContentType(contentType, ["application/json"])) {
     if (contentLength === 0) return void 0;
     if (!hasContentLength) {
-      const body = await readRequestBodyWithLimit(request.clone(), DEFAULT_ACTION_BODY_SIZE_LIMIT);
+      const body = await readRequestBodyWithLimit(request.clone(), bodySizeLimit);
       if (body.byteLength === 0) return void 0;
       return JSON.parse(new TextDecoder().decode(body));
     }

package/dist/actions/runtime/types.d.ts

@@ -49,7 +49,7 @@ export interface ActionsLocals {
         actionName: string;
     };
 }
-export type ActionAPIContext = Pick<APIContext, 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session' | 'csp'>;
+export type ActionAPIContext = Pick<APIContext, 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session' | 'cache' | 'csp'>;
 export type MaybePromise<T> = T | Promise<T>;
 /**
  * Used to preserve the input schema type in the error object.

package/dist/assets/utils/proxy.js

@@ -9,7 +9,7 @@ function getProxyCode(options, isSSR) {
 							if (name === 'fsPath') {
 								return ${stringifiedFSPath};
 							}
-							${!isSSR ? `if (target[name] !== undefined && globalThis.astroAsset) globalThis.astroAsset?.referencedImages.add(${stringifiedFSPath});` : ""}
+							${!isSSR ? `if (target[name] !== undefined && globalThis.astroAsset) globalThis.astroAsset?.referencedImages?.add(${stringifiedFSPath});` : ""}
 							return target[name];
 						}
 					})

package/dist/assets/utils/svg.js

@@ -49,6 +49,16 @@ function makeSvgComponent(meta, contents, svgoConfig) {
   return `import { createSvgComponent } from 'astro/assets/runtime';
 export default createSvgComponent(${JSON.stringify(props)})`;
 }
+function parseSvgComponentData(meta, contents, svgoConfig) {
+  const file = typeof contents === "string" ? contents : contents.toString("utf-8");
+  const { attributes, body: children } = parseSvg({
+    path: meta.fsPath,
+    contents: file,
+    svgoConfig
+  });
+  return { attributes: dropAttributes(attributes), children };
+}
 export {
-  makeSvgComponent
+  makeSvgComponent,
+  parseSvgComponentData
 };

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

@@ -29,7 +29,7 @@ import { hashTransform, propsToFilename } from "./utils/hash.js";
 import { emitImageMetadata } from "./utils/node.js";
 import { CONTENT_IMAGE_FLAG } from "../content/consts.js";
 import { getProxyCode } from "./utils/proxy.js";
-import { makeSvgComponent } from "./utils/svg.js";
+import { makeSvgComponent, parseSvgComponentData } from "./utils/svg.js";
 import { createPlaceholderURL, stringifyPlaceholderURL } from "./utils/url.js";
 const assetRegex = new RegExp(`\\.(${VALID_INPUT_FORMATS.join("|")})`, "i");
 const assetRegexEnds = new RegExp(`\\.(${VALID_INPUT_FORMATS.join("|")})$`, "i");
@@ -252,6 +252,20 @@ function assets({ fs, settings, sync, logger }) {
             if (isSSROnlyEnvironment) {
               globalThis.astroAsset.referencedImages.add(imageMetadata.fsPath);
             }
+            if (id.endsWith(".svg") && isContentImage) {
+              const contents = await fs.promises.readFile(imageMetadata.fsPath, {
+                encoding: "utf8"
+              });
+              const svgData = parseSvgComponentData(
+                imageMetadata,
+                contents,
+                settings.config.experimental.svgo
+              );
+              const metadataWithSvg = { ...imageMetadata, __svgData: svgData };
+              return {
+                code: `export default ${getProxyCode(metadataWithSvg, isSSROnlyEnvironment)}`
+              };
+            }
             return {
               code: `export default ${getProxyCode(imageMetadata, isSSROnlyEnvironment)}`
             };

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

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.0.0-beta.16";
+  version = "6.0.0-beta.18";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/config/entrypoint.d.ts

@@ -1,4 +1,6 @@
 import type { SharpImageServiceConfig } from '../assets/services/sharp.js';
+import type { MemoryCacheProviderOptions } from '../core/cache/memory-provider.js';
+import type { CacheProviderConfig } from '../core/cache/types.js';
 import type { ImageServiceConfig } from '../types/public/index.js';
 export { fontProviders } from '../assets/fonts/providers/index.js';
 export { mergeConfig } from '../core/config/merge.js';
@@ -17,3 +19,8 @@ export declare function sharpImageService(config?: SharpImageServiceConfig): Ima
  * See: https://docs.astro.build/en/guides/images/#configure-no-op-passthrough-service
  */
 export declare function passthroughImageService(): ImageServiceConfig;
+/**
+ * Return the configuration needed to use the built-in in-memory LRU cache provider.
+ * This is a runtime-agnostic provider suitable for single-instance deployments.
+ */
+export declare function memoryCache(config?: MemoryCacheProviderOptions): CacheProviderConfig<MemoryCacheProviderOptions>;

package/dist/config/entrypoint.js

@@ -16,11 +16,19 @@ function passthroughImageService() {
     config: {}
   };
 }
+function memoryCache(config = {}) {
+  return {
+    name: "memory",
+    entrypoint: "astro/cache/memory",
+    config
+  };
+}
 export {
   defineConfig,
   envField,
   fontProviders,
   getViteConfig,
+  memoryCache,
   mergeConfig,
   passthroughImageService,
   sessionDrivers,

package/dist/container/index.js

@@ -33,6 +33,7 @@ function createManifest(manifest, renderers, middleware) {
     compressHTML: manifest?.compressHTML ?? ASTRO_CONFIG_DEFAULTS.compressHTML,
     assetsDir: manifest?.assetsDir ?? ASTRO_CONFIG_DEFAULTS.build.assets,
     serverLike: manifest?.serverLike ?? true,
+    middlewareMode: manifest?.middlewareMode ?? "classic",
     assets: manifest?.assets ?? /* @__PURE__ */ new Set(),
     assetsPrefix: manifest?.assetsPrefix ?? void 0,
     entryModules: manifest?.entryModules ?? {},
@@ -47,6 +48,7 @@ function createManifest(manifest, renderers, middleware) {
     i18n: manifest?.i18n,
     checkOrigin: false,
     allowedDomains: manifest?.allowedDomains ?? [],
+    actionBodySizeLimit: 1024 * 1024,
     middleware: manifest?.middleware ?? middlewareInstance,
     key: createKey(),
     csp: manifest?.csp,

package/dist/content/content-layer.d.ts

@@ -3,15 +3,17 @@ import type { Logger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
 import type { RefreshContentOptions } from '../types/public/content.js';
 import type { MutableDataStore } from './mutable-data-store.js';
-interface ContentLayerOptions {
+import { type ContentObservable } from './utils.js';
+export interface ContentLayerOptions {
     store: MutableDataStore;
     settings: AstroSettings;
     logger: Logger;
     watcher?: FSWatcher;
+    contentConfigObserver?: ContentObservable;
 }
-declare class ContentLayer {
+export declare class ContentLayer {
     #private;
-    constructor({ settings, logger, store, watcher }: ContentLayerOptions);
+    constructor({ settings, logger, store, watcher, contentConfigObserver, }: ContentLayerOptions);
     /**
      * Whether the content layer is currently loading content
      */
@@ -37,9 +39,3 @@ declare class ContentLayer {
  * In production, it's in the cache directory so that it's preserved between builds.
  */
 export declare function getDataStoreFile(settings: AstroSettings, isDev: boolean): URL;
-export declare const globalContentLayer: {
-    init: (options: ContentLayerOptions) => ContentLayer;
-    get: () => ContentLayer | null;
-    dispose: () => void;
-};
-export {};

package/dist/content/content-layer.js

@@ -30,12 +30,20 @@ class ContentLayer {
   #unsubscribe;
   #markdownProcessor;
   #generateDigest;
+  #contentConfigObserver;
   #queue;
-  constructor({ settings, logger, store, watcher }) {
+  constructor({
+    settings,
+    logger,
+    store,
+    watcher,
+    contentConfigObserver = globalContentConfigObserver
+  }) {
     watcher?.setMaxListeners(50);
     this.#logger = logger;
     this.#store = store;
     this.#settings = settings;
+    this.#contentConfigObserver = contentConfigObserver;
     if (watcher) {
       this.#watcher = createWatcherWrapper(watcher);
     }
@@ -52,7 +60,7 @@ class ContentLayer {
    */
   watchContentConfig() {
     this.#unsubscribe?.();
-    this.#unsubscribe = globalContentConfigObserver.subscribe(async (ctx) => {
+    this.#unsubscribe = this.#contentConfigObserver.subscribe(async (ctx) => {
       if (ctx.status === "loaded" && ctx.config.digest !== this.#lastConfigDigest) {
         this.sync();
       }
@@ -122,12 +130,12 @@ class ContentLayer {
     return this.#queue.add(() => this.#doSync(options));
   }
   async #doSync(options) {
-    let contentConfig = globalContentConfigObserver.get();
+    let contentConfig = this.#contentConfigObserver.get();
     const logger = this.#logger.forkIntegrationLogger("content");
     if (contentConfig?.status === "loading") {
       contentConfig = await Promise.race([
         new Promise((resolve) => {
-          const unsub = globalContentConfigObserver.subscribe((ctx) => {
+          const unsub = this.#contentConfigObserver.subscribe((ctx) => {
             unsub();
             resolve(ctx);
           });
@@ -170,9 +178,9 @@ ${contentConfig.error.message}`
     const { digest: currentConfigDigest } = contentConfig.config;
     this.#lastConfigDigest = currentConfigDigest;
     let shouldClear = false;
-    const previousConfigDigest = await this.#store.metaStore().get("content-config-digest");
-    const previousAstroConfigDigest = await this.#store.metaStore().get("astro-config-digest");
-    const previousAstroVersion = await this.#store.metaStore().get("astro-version");
+    const previousConfigDigest = this.#store.metaStore().get("content-config-digest");
+    const previousAstroConfigDigest = this.#store.metaStore().get("astro-config-digest");
+    const previousAstroVersion = this.#store.metaStore().get("astro-version");
     if (previousAstroConfigDigest && previousAstroConfigDigest !== astroConfigDigest) {
       logger.info("Astro config changed");
       shouldClear = true;
@@ -181,7 +189,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.16") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.18") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -189,14 +197,14 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.0-beta.16") {
-      await this.#store.metaStore().set("astro-version", "6.0.0-beta.16");
+    if ("6.0.0-beta.18") {
+      this.#store.metaStore().set("astro-version", "6.0.0-beta.18");
     }
     if (currentConfigDigest) {
-      await this.#store.metaStore().set("content-config-digest", currentConfigDigest);
+      this.#store.metaStore().set("content-config-digest", currentConfigDigest);
     }
     if (astroConfigDigest) {
-      await this.#store.metaStore().set("astro-config-digest", astroConfigDigest);
+      this.#store.metaStore().set("astro-config-digest", astroConfigDigest);
     }
     if (!options?.loaders?.length) {
       this.#watcher?.removeAllTrackedListeners();
@@ -354,23 +362,7 @@ ${JSON.stringify({ ...raw, id: void 0 }, null, 2)}`
 function getDataStoreFile(settings, isDev) {
   return new URL(DATA_STORE_FILE, isDev ? settings.dotAstroDir : settings.config.cacheDir);
 }
-function contentLayerSingleton() {
-  let instance = null;
-  return {
-    init: (options) => {
-      instance?.dispose();
-      instance = new ContentLayer(options);
-      return instance;
-    },
-    get: () => instance,
-    dispose: () => {
-      instance?.dispose();
-      instance = null;
-    }
-  };
-}
-const globalContentLayer = contentLayerSingleton();
 export {
-  getDataStoreFile,
-  globalContentLayer
+  ContentLayer,
+  getDataStoreFile
 };

package/dist/content/instance.d.ts

@@ -0,0 +1,17 @@
+import type { FSWatcher } from 'vite';
+import { ContentLayer } from './content-layer.js';
+import type { Logger } from '../core/logger/core.js';
+import type { AstroSettings } from '../types/astro.js';
+import type { MutableDataStore } from './mutable-data-store.js';
+interface ContentLayerOptions {
+    store: MutableDataStore;
+    settings: AstroSettings;
+    logger: Logger;
+    watcher?: FSWatcher;
+}
+export declare const globalContentLayer: {
+    init: (options: ContentLayerOptions) => ContentLayer;
+    get: () => ContentLayer | null;
+    dispose: () => void;
+};
+export {};

package/dist/content/instance.js

@@ -0,0 +1,20 @@
+import { ContentLayer } from "./content-layer.js";
+function contentLayerSingleton() {
+  let instance = null;
+  return {
+    init: (options) => {
+      instance?.dispose();
+      instance = new ContentLayer(options);
+      return instance;
+    },
+    get: () => instance,
+    dispose: () => {
+      instance?.dispose();
+      instance = null;
+    }
+  };
+}
+const globalContentLayer = contentLayerSingleton();
+export {
+  globalContentLayer
+};

package/dist/content/runtime.js

@@ -1,6 +1,7 @@
 import { escape } from "html-escaper";
 import { Traverse } from "neotraverse/modern";
 import * as z from "zod/v4";
+import { createSvgComponent } from "../assets/runtime.js";
 import { imageSrcToImportId } from "../assets/utils/resolveImports.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { isRemotePath, prependForwardSlash } from "../core/path.js";
@@ -363,7 +364,12 @@ function updateImageReferencesInData(data, fileName, imageAssetMap) {
       }
       const imported = imageAssetMap?.get(id);
       if (imported) {
-        ctx.update(imported);
+        if (imported.__svgData) {
+          const { __svgData: svgData, ...meta } = imported;
+          ctx.update(createSvgComponent({ meta, ...svgData }));
+        } else {
+          ctx.update(imported);
+        }
       } else {
         ctx.update(src);
       }

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

@@ -60,10 +60,12 @@ function astroContentAssetPropagationPlugin({
       }
     },
     configureServer(server) {
-      if (!isRunnableDevEnvironment(server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr])) {
-        return;
+      const ssrEnv = server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
+      if (isRunnableDevEnvironment(ssrEnv)) {
+        environment = ssrEnv;
+      } else if (isRunnableDevEnvironment(server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.astro])) {
+        environment = server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.astro];
       }
-      environment = server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
     },
     transform: {
       filter: {
@@ -75,7 +77,8 @@ function astroContentAssetPropagationPlugin({
           let stringifiedLinks, stringifiedStyles;
           if (isAstroServerEnvironment(this.environment) && environment) {
             if (!environment.moduleGraph.getModuleById(basePath)?.ssrModule) {
-              await environment.runner.import(basePath);
+              await environment.runner.import(basePath).catch(() => {
+              });
             }
             const {
               styles,

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

@@ -51,9 +51,15 @@ export interface RenderOptions {
      */
     routeData?: RouteData;
 }
-export interface RenderErrorOptions {
-    locals?: App.Locals;
-    routeData?: RouteData;
+type RequiredRenderOptions = Required<RenderOptions>;
+interface ResolvedRenderOptions {
+    addCookieHeader: RequiredRenderOptions['addCookieHeader'];
+    clientAddress: RequiredRenderOptions['clientAddress'] | undefined;
+    prerenderedErrorPageFetch: RequiredRenderOptions['prerenderedErrorPageFetch'] | undefined;
+    locals: RequiredRenderOptions['locals'] | undefined;
+    routeData: RequiredRenderOptions['routeData'] | undefined;
+}
+export interface RenderErrorOptions extends ResolvedRenderOptions {
     response?: Response;
     status: 404 | 500;
     /**
@@ -64,8 +70,6 @@ export interface RenderErrorOptions {
      * Allows passing an error to 500.astro. It will be available through `Astro.props.error`.
      */
     error?: unknown;
-    clientAddress: string | undefined;
-    prerenderedErrorPageFetch: ((url: ErrorPagePath) => Promise<Response>) | undefined;
 }
 type ErrorPagePath = `${string}/404` | `${string}/500` | `${string}/404/` | `${string}/500/` | `${string}404.html` | `${string}500.html`;
 export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
@@ -120,7 +124,7 @@ export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
     devMatch(pathname?: string): Promise<DevMatch | undefined> | undefined;
     private computePathnameFromDomain;
     private redirectTrailingSlash;
-    render(request: Request, renderOptions?: RenderOptions): Promise<Response>;
+    render(request: Request, { addCookieHeader, clientAddress, locals, prerenderedErrorPageFetch, routeData, }?: RenderOptions): Promise<Response>;
     setCookieHeaders(response: Response): Generator<string, string[], any>;
     /**
      * Reads all the cookies written by `Astro.cookie.set()` onto the passed response.
@@ -138,7 +142,7 @@ export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
      * If it is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
      * This also handles pre-rendered /404 or /500 routes
      */
-    renderError(request: Request, { locals, status, response: originalResponse, skipMiddleware, error, clientAddress, prerenderedErrorPageFetch, }: RenderErrorOptions): Promise<Response>;
+    renderError(request: Request, { status, response: originalResponse, skipMiddleware, error, ...resolvedRenderOptions }: RenderErrorOptions): Promise<Response>;
     private mergeResponses;
     getDefaultStatusCode(routeData: RouteData, pathname: string): number;
     getManifest(): SSRManifest;