astro 7.0.0-alpha.0 → 7.0.0-alpha.2

package/dist/runtime/server/render/server-islands.js

@@ -100,7 +100,8 @@ class ServerIslandComponent {
     }
     const componentPath = this.getComponentPath();
     const componentExport = this.getComponentExport();
-    let componentId = this.result.serverIslandNameMap.get(componentPath);
+    const serverIslandNameMap = await this.result.getServerIslandNameMap();
+    let componentId = serverIslandNameMap.get(componentPath);
     if (!componentId) {
       throw new Error(`Could not find server component name ${componentPath}`);
     }

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

@@ -10,7 +10,7 @@ const toIdent = (k) => k.trim().replace(/(?!^)\b\w|\s+|\W+/g, (match, index) =>
   if (/\W/.test(match)) return "";
   return index === 0 ? match : match.toUpperCase();
 });
-const toAttributeString = (value, shouldEscape = true) => shouldEscape ? String(value).replace(AMPERSAND_REGEX, "&").replace(DOUBLE_QUOTE_REGEX, """) : value;
+const toAttributeString = (value, shouldEscape = true) => shouldEscape ? String(value).replace(AMPERSAND_REGEX, "&").replace(DOUBLE_QUOTE_REGEX, """) : value;
 const kebab = (k) => k.toLowerCase() === k ? k : k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
 const toStyleString = (obj) => Object.entries(obj).filter(([_, v]) => typeof v === "string" && v.trim() || typeof v === "number").map(([k, v]) => {
   if (k[0] !== "-" && k[1] !== "-") return `${kebab(k)}:${v}`;
@@ -149,7 +149,7 @@ class BufferedRenderer {
 function createBufferedRenderer(destination, renderFunction) {
   return new BufferedRenderer(destination, renderFunction);
 }
-const isNode = typeof process !== "undefined" && Object.prototype.toString.call(process) === "[object process]";
+const isNode = typeof process !== "undefined" && Object.prototype.toString.call(process) === "[object process]" && !(typeof navigator !== "undefined" && navigator.userAgent === "Cloudflare-Workers");
 const isDeno = typeof Deno !== "undefined";
 function promiseWithResolvers() {
   let resolve, reject;

package/dist/runtime/server/scripts.js

@@ -2,12 +2,18 @@ import islandScript from "./astro-island.prebuilt.js";
 import islandScriptDev from "./astro-island.prebuilt-dev.js";
 import { ISLAND_STYLES } from "./astro-island-styles.js";
 function determineIfNeedsHydrationScript(result) {
+  if (result._metadata.templateDepth > 0) {
+    return !result._metadata.hasHydrationScript;
+  }
   if (result._metadata.hasHydrationScript) {
     return false;
   }
   return result._metadata.hasHydrationScript = true;
 }
 function determinesIfNeedsDirectiveScript(result, directive) {
+  if (result._metadata.templateDepth > 0) {
+    return !result._metadata.hasDirectives.has(directive);
+  }
   if (result._metadata.hasDirectives.has(directive)) {
     return false;
   }

package/dist/runtime/server/transition.d.ts

@@ -1,13 +1,8 @@
 import type { SSRResult } from '../../types/public/internal.js';
-import type { TransitionAnimation, TransitionAnimationPair, TransitionAnimationValue } from '../../types/public/view-transitions.js';
+import type { TransitionAnimation, TransitionAnimationValue } from '../../types/public/view-transitions.js';
 export declare function createTransitionScope(result: SSRResult, hash: string): string;
 export declare function reEncode(s: string): string;
 export declare function renderTransition(result: SSRResult, hash: string, animationName: TransitionAnimationValue | undefined, transitionName: string): string;
-/** @deprecated This will be removed in Astro 7 */
-export declare function createAnimationScope(transitionName: string, animations: Record<string, TransitionAnimationPair>): {
-    scope: string;
-    styles: string;
-};
 export declare class ViewTransitionStyleSheet {
     private modern;
     private fallback;

package/dist/runtime/server/transition.js

@@ -60,13 +60,6 @@ function renderTransition(result, hash, animationName, transitionName) {
   result._metadata.extraHead.push(markHTMLString(`<style>${css}</style>`));
   return scope;
 }
-function createAnimationScope(transitionName, animations) {
-  const hash = Math.random().toString(36).slice(2, 8);
-  const scope = `astro-${hash}`;
-  const sheet = new ViewTransitionStyleSheet(scope, transitionName);
-  addPairs(animations, sheet);
-  return { scope, styles: sheet.toString().replaceAll('"', "") };
-}
 class ViewTransitionStyleSheet {
   modern = [];
   fallback = [];
@@ -177,7 +170,6 @@ function toTimeValue(num) {
 }
 export {
   ViewTransitionStyleSheet,
-  createAnimationScope,
   createTransitionScope,
   reEncode,
   renderTransition,

package/dist/transitions/events.d.ts

@@ -1,14 +1,4 @@
 import type { Direction, NavigationTypeString } from './types.js';
-/** @deprecated This will be removed in Astro 7 */
-export declare const TRANSITION_BEFORE_PREPARATION = "astro:before-preparation";
-/** @deprecated This will be removed in Astro 7 */
-export declare const TRANSITION_AFTER_PREPARATION = "astro:after-preparation";
-/** @deprecated This will be removed in Astro 7 */
-export declare const TRANSITION_BEFORE_SWAP = "astro:before-swap";
-/** @deprecated This will be removed in Astro 7 */
-export declare const TRANSITION_AFTER_SWAP = "astro:after-swap";
-/** @deprecated This will be removed in Astro 7 */
-export declare const TRANSITION_PAGE_LOAD = "astro:page-load";
 type Events = 'astro:after-preparation' | 'astro:after-swap' | 'astro:page-load';
 export declare const triggerEvent: (name: Events) => boolean;
 export declare const onPageLoad: () => boolean;
@@ -23,15 +13,11 @@ declare class BeforeEvent extends Event {
     readonly signal: AbortSignal;
     constructor(type: string, eventInitDict: EventInit | undefined, from: URL, to: URL, direction: Direction | string, navigationType: NavigationTypeString, sourceElement: Element | undefined, info: any, newDocument: Document, signal: AbortSignal);
 }
-/** @deprecated This will be removed in Astro 7 */
-export declare const isTransitionBeforePreparationEvent: (value: any) => value is TransitionBeforePreparationEvent;
 export declare class TransitionBeforePreparationEvent extends BeforeEvent {
     formData: FormData | undefined;
     loader: () => Promise<void>;
     constructor(from: URL, to: URL, direction: Direction | string, navigationType: NavigationTypeString, sourceElement: Element | undefined, info: any, newDocument: Document, signal: AbortSignal, formData: FormData | undefined, loader: (event: TransitionBeforePreparationEvent) => Promise<void>);
 }
-/** @deprecated This will be removed in Astro 7 */
-export declare const isTransitionBeforeSwapEvent: (value: any) => value is TransitionBeforeSwapEvent;
 export declare class TransitionBeforeSwapEvent extends BeforeEvent {
     readonly direction: Direction | string;
     readonly viewTransition: ViewTransition;

package/dist/transitions/events.js

@@ -1,9 +1,4 @@
 import { swap } from "./swap-functions.js";
-const TRANSITION_BEFORE_PREPARATION = "astro:before-preparation";
-const TRANSITION_AFTER_PREPARATION = "astro:after-preparation";
-const TRANSITION_BEFORE_SWAP = "astro:before-swap";
-const TRANSITION_AFTER_SWAP = "astro:after-swap";
-const TRANSITION_PAGE_LOAD = "astro:page-load";
 const triggerEvent = (name) => document.dispatchEvent(new Event(name));
 const onPageLoad = () => triggerEvent("astro:page-load");
 class BeforeEvent extends Event {
@@ -37,7 +32,6 @@ class BeforeEvent extends Event {
     });
   }
 }
-const isTransitionBeforePreparationEvent = (value) => value.type === TRANSITION_BEFORE_PREPARATION;
 class TransitionBeforePreparationEvent extends BeforeEvent {
   formData;
   loader;
@@ -62,7 +56,6 @@ class TransitionBeforePreparationEvent extends BeforeEvent {
     });
   }
 }
-const isTransitionBeforeSwapEvent = (value) => value.type === "astro:before-swap";
 class TransitionBeforeSwapEvent extends BeforeEvent {
   direction;
   viewTransition;
@@ -130,17 +123,10 @@ async function doSwap(afterPreparation, viewTransition, afterDispatch) {
   return event;
 }
 export {
-  TRANSITION_AFTER_PREPARATION,
-  TRANSITION_AFTER_SWAP,
-  TRANSITION_BEFORE_PREPARATION,
-  TRANSITION_BEFORE_SWAP,
-  TRANSITION_PAGE_LOAD,
   TransitionBeforePreparationEvent,
   TransitionBeforeSwapEvent,
   doPreparation,
   doSwap,
-  isTransitionBeforePreparationEvent,
-  isTransitionBeforeSwapEvent,
   onPageLoad,
   triggerEvent,
   updateScrollPosition

package/dist/transitions/index.d.ts

@@ -1,5 +1,4 @@
 import type { TransitionDirectionalAnimations } from '../types/public/view-transitions.js';
-export { createAnimationScope } from '../runtime/server/transition.js';
 export declare function slide({ duration, }?: {
     duration?: string | number;
 }): TransitionDirectionalAnimations;

package/dist/transitions/index.js

@@ -1,4 +1,3 @@
-import { createAnimationScope } from "../runtime/server/transition.js";
 const EASE_IN_OUT_QUART = "cubic-bezier(0.76, 0, 0.24, 1)";
 function slide({
   duration
@@ -64,7 +63,6 @@ function fade({
   };
 }
 export {
-  createAnimationScope,
   fade,
   slide
 };

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

@@ -37,10 +37,8 @@ function astroTransitions({ settings }) {
 						export { navigate, supportsViewTransitions, transitionEnabledOnThisPage } from "astro/virtual-modules/transitions-router.js";
 						export * from "astro/virtual-modules/transitions-types.js";
 						export {
-							TRANSITION_BEFORE_PREPARATION, isTransitionBeforePreparationEvent, TransitionBeforePreparationEvent,
-							TRANSITION_AFTER_PREPARATION,
-							TRANSITION_BEFORE_SWAP, isTransitionBeforeSwapEvent, TransitionBeforeSwapEvent,
-							TRANSITION_AFTER_SWAP, TRANSITION_PAGE_LOAD
+							TransitionBeforePreparationEvent,
+							TransitionBeforeSwapEvent,
 						} from "astro/virtual-modules/transitions-events.js";
 						export { swapFunctions } from "astro/virtual-modules/transitions-swap-functions.js";
 					`

package/dist/types/public/config.d.ts

@@ -1,6 +1,7 @@
 import type { OutgoingHttpHeaders } from 'node:http';
 import type { RemotePattern } from '@astrojs/internal-helpers/remote';
-import type { RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig, Smartypants, SyntaxHighlightConfigType } from '@astrojs/markdown-remark';
+import type { RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig, Smartypants, SyntaxHighlightConfigType } from '@astrojs/internal-helpers/markdown';
+import type { MarkdownProcessor } from '../../markdown/index.js';
 import type { UserConfig as OriginalViteUserConfig, SSROptions as ViteSSROptions } from 'vite';
 import type { FontFamily, FontProvider } from '../../assets/fonts/types.js';
 import type { ImageFit, ImageLayout } from '../../assets/types.js';
@@ -426,7 +427,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      *
      * By default, Astro removes whitespace from your HTML, including line breaks, in a lossless manner from `.astro` components. Some whitespace may be preserved as needed to maintain the visual rendering of your HTML.
      *
-     * Setting this option to `"jsx"` instead applies the JSX whitespace stripping rules used by frameworks like React. Leading and trailing whitespace is only preserved when explicitly included in the source code through constructs such as `{" "}`, and is otherwise removed entirely.
+     * Since 6.2.0, this option can also be set to `"jsx"`, Astro will apply the JSX whitespace stripping rules used by frameworks like React. Leading and trailing whitespace is only preserved when explicitly included in the source code through constructs such as `{" "}`, and is otherwise removed entirely.
      *
      * Setting this option to false disables HTML compression and preserves all whitespace.
      *
@@ -1328,23 +1329,25 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      * @description
      *
      * Configures session storage for your Astro project. This is used to store session data in a persistent way, so that it can be accessed across different requests.
-     * Some adapters may provide a default session driver, but you can override it with your own configuration.
      *
-     * See [the sessions guide](https://docs.astro.build/en/guides/sessions/) for more information.
+     * Some adapters may provide a default session driver, but you can override it with your own configuration:
      *
      * ```js title="astro.config.mjs"
-     *   {
-     *     session: {
-     *       // The name of the Unstorage driver
-     *       driver: 'redis',
-     *       // The required options depend on the driver
-     *       options: {
-     *         url: process.env.REDIS_URL,
-     *       },
-     *       ttl: 3600, // 1 hour
-     *     }
+     * import { defineConfig, sessionDrivers } from 'astro/config';
+     *
+     * export default defineConfig({
+     *   session: {
+     *     driver: sessionDrivers.redis({
+     *       // The options are driver-dependent and some may be required.
+     *       url: process.env.REDIS_URL
+     *     }),
      *   }
+     * });
      * ```
+     *
+     * Session drivers are configured at build time. This means environment variables used in the driver configuration are inlined. You must create your own driver entrypoint to [override the configuration at runtime](https://docs.astro.build/en/guides/sessions/#overriding-the-configuration-at-runtime).
+     *
+     * See [the sessions guide](https://docs.astro.build/en/guides/sessions/) for more information.
      */
     session?: SessionConfig<TDriver>;
     /**
@@ -1708,6 +1711,19 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * This can be used for options such as `compressionLevel`, `effort`, `palette`, or a default `quality`.
          * Per-image `quality` values from `<Image />`, `<Picture />`, and `getImage()` still take precedence.
          */
+        /**
+         * @docs
+         * @name image.dangerouslyProcessSVG
+         * @type {boolean}
+         * @default `false`
+         * @version 6.3.0
+         * @description
+         *
+         * Allows SVG source images to be processed by the image optimization pipeline.
+         *
+         * This is disabled by default as specifically formed SVGs can be prohibitively expensive to process and used by malicious actors to execute denial of service attacks. Only enable this option if you trust the source of your SVG images and understand the risks of processing them.
+         */
+        dangerouslyProcessSVG?: boolean;
         /**
          * @docs
          * @name image.domains
@@ -1766,6 +1782,8 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * `pathname` patterns:
          *   - End with `/**` to allow all sub-routes (like `startsWith`).
          *   - End with `/*` to allow only one level of sub-route.
+         *
+         * HTTP redirects are also followed when an image URL matches a remote pattern. The final destination URL must be among the allowed remote patterns to be loaded.
 
          */
         remotePatterns?: Partial<RemotePattern>[];
@@ -1963,6 +1981,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * @docs
          * @name markdown.remarkPlugins
          * @type {RemarkPlugins}
+         * @deprecated Pass `remarkPlugins` to `unified({ remarkPlugins })` from `@astrojs/markdown-remark` and set it as `markdown.processor` instead. Will be removed in a future major.
          * @description
          * Pass [remark plugins](https://github.com/remarkjs/remark) to customize how your Markdown is built. You can import and apply the plugin function (recommended), or pass the plugin name as a string.
          *
@@ -1980,6 +1999,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * @docs
          * @name markdown.rehypePlugins
          * @type {RehypePlugins}
+         * @deprecated Pass `rehypePlugins` to `unified({ rehypePlugins })` from `@astrojs/markdown-remark` and set it as `markdown.processor` instead. Will be removed in a future major.
          * @description
          * Pass [rehype plugins](https://github.com/remarkjs/remark-rehype) to customize how your Markdown's output HTML is processed. You can import and apply the plugin function (recommended), or pass the plugin name as a string.
          *
@@ -1999,6 +2019,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * @type {boolean}
          * @default `true`
          * @version 2.0.0
+         * @deprecated Pass `gfm` to your processor instead (e.g. `unified({ gfm: false })`). Will be removed in a future major.
          * @description
          * Astro uses [GitHub-flavored Markdown](https://github.com/remarkjs/remark-gfm) by default. To disable this, set the `gfm` flag to `false`:
          *
@@ -2017,6 +2038,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * @type {boolean | Smartypants}
          * @default `true`
          * @version 2.0.0
+         * @deprecated Pass `smartypants` to your processor instead (e.g. `unified({ smartypants: false })`). Will be removed in a future major.
          * @description
          * Whether to use the [SmartyPants formatter](https://daringfireball.net/projects/smartypants/) to transform straight quotes into smart quotes, dashes into en/em dashes, and triple dots into ellipses.
          *
@@ -2029,6 +2051,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * @docs
          * @name markdown.remarkRehype
          * @type {RemarkRehype}
+         * @deprecated Pass `remarkRehype` to `unified({ remarkRehype })` from `@astrojs/markdown-remark` and set it as `markdown.processor` instead. Will be removed in a future major.
          * @description
          * Pass options to [remark-rehype](https://github.com/remarkjs/remark-rehype#api).
          *
@@ -2042,6 +2065,31 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * ```
          */
         remarkRehype?: RemarkRehype;
+        /**
+         * @docs
+         * @name markdown.processor
+         * @type {MarkdownProcessor}
+         * @version 6.4.0
+         * @description
+         * Configures the Markdown processor used to render `.md` files. Defaults to `unified()` from
+         * `@astrojs/markdown-remark` (the remark/rehype pipeline).
+         *
+         * ```js
+         * // astro.config.mjs
+         * import { defineConfig } from 'astro/config';
+         * import { unified } from '@astrojs/markdown-remark';
+         * import remarkToc from 'remark-toc';
+         *
+         * export default defineConfig({
+         *   markdown: {
+         *     processor: unified({
+         *       remarkPlugins: [remarkToc],
+         *     }),
+         *   },
+         * });
+         * ```
+         */
+        processor?: MarkdownProcessor;
     };
     /**
      * @docs
@@ -2628,6 +2676,40 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      * These flags are not guaranteed to be stable.
      */
     experimental?: {
+        /**
+         * @name experimental.advancedRouting
+         * @type {boolean | object}
+         * @default `false`
+         * @description
+         * Enables `src/app.ts` as an advanced routing entrypoint, allowing you to
+         * compose Astro's request pipeline with the Web Fetch standard or your own Hono middleware.
+         *
+         * Pass `true` to enable with default settings, or an object to customize:
+         *
+         * ```js
+         * export default defineConfig({
+         *   experimental: {
+         *     advancedRouting: {
+         *       fetchFile: 'fetch.ts',
+         *     },
+         *   },
+         * });
+         * ```
+         */
+        advancedRouting?: boolean | {
+            /**
+             * @name experimental.advancedRouting.fetchFile
+             * @type {string | null}
+             * @default 'app'
+             * @description
+             *
+             * Customizes the file used as the advanced routing entrypoint inside `srcDir`.
+             * Defaults to `'app'`, meaning Astro looks for `src/app.ts`.
+             *
+             * If you already have a `src/app.ts` file in use for other purposes, define a different filename or set the value to `null` to disable the entrypoint.
+             */
+            fetchFile?: string | null;
+        };
         /**
          *
          * @name experimental.clientPrerender

package/dist/types/public/content.d.ts

@@ -1,4 +1,4 @@
-import type { MarkdownHeading } from '@astrojs/markdown-remark';
+import type { MarkdownHeading } from '@astrojs/internal-helpers/markdown';
 import type { DataEntry, RenderedContent } from '../../content/data-store.js';
 import type { LiveCollectionError } from '../../content/loaders/errors.js';
 import type { AstroComponentFactory } from '../../runtime/server/index.js';
@@ -142,7 +142,7 @@ export interface CacheHint {
     /** Last modified time of the content */
     lastModified?: Date;
 }
-export interface LiveDataEntry<TData extends Record<string, any> = Record<string, unknown>> {
+export interface LiveDataEntry<TData extends Record<string, any> = Record<string, any>> {
     /** The ID of the entry. Unique per collection. */
     id: string;
     /** The parsed entry data */
@@ -154,17 +154,17 @@ export interface LiveDataEntry<TData extends Record<string, any> = Record<string
     /** A hint for how to cache this entry */
     cacheHint?: CacheHint;
 }
-export interface LiveDataCollection<TData extends Record<string, any> = Record<string, unknown>> {
+export interface LiveDataCollection<TData extends Record<string, any> = Record<string, any>> {
     entries: Array<LiveDataEntry<TData>>;
     /** A hint for how to cache this collection. Individual entries can also have cache hints */
     cacheHint?: CacheHint;
 }
-export interface LiveDataCollectionResult<TData extends Record<string, any> = Record<string, unknown>, TError extends Error = Error> {
+export interface LiveDataCollectionResult<TData extends Record<string, any> = Record<string, any>, TError extends Error = Error> {
     entries?: Array<LiveDataEntry<TData>>;
     error?: TError | LiveCollectionError;
     cacheHint?: CacheHint;
 }
-export interface LiveDataEntryResult<TData extends Record<string, any> = Record<string, unknown>, TError extends Error = Error> {
+export interface LiveDataEntryResult<TData extends Record<string, any> = Record<string, any>, TError extends Error = Error> {
     entry?: LiveDataEntry<TData>;
     error?: TError | LiveCollectionError;
     cacheHint?: CacheHint;

package/dist/types/public/index.d.ts

@@ -1,5 +1,5 @@
 export type { RemotePattern } from '@astrojs/internal-helpers/remote';
-export type { MarkdownHeading, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
+export type { MarkdownHeading, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/internal-helpers/markdown';
 export type { ExternalImageService, ImageService, LocalImageService, } from '../../assets/services/service.js';
 export type { AssetsGlobalStaticImagesList, GetImageResult, ImageInputFormat, ImageMetadata, ImageOutputFormat, ImageQuality, ImageQualityPreset, ImageTransform, UnresolvedImageTransform, } from '../../assets/types.js';
 export type { ContainerRenderer } from '../../container/index.js';
@@ -9,6 +9,7 @@ export type { AstroIntegrationLogger } from '../../core/logger/core.js';
 export type { AstroSession } from '../../core/session/runtime.js';
 export type { ToolbarServerHelpers } from '../../runtime/client/dev-toolbar/helpers.js';
 export type { AstroEnvironmentNames } from '../../core/constants.js';
+export type { Fetchable } from '../../core/fetch/types.js';
 export type { SessionDriver, SessionDriverConfig } from '../../core/session/types.js';
 export type { CacheProvider, CacheProviderConfig, CacheProviderFactory, CacheOptions, InvalidateOptions, } from '../../core/cache/types.js';
 export type * from './common.js';

package/dist/types/public/integrations.d.ts

@@ -1,5 +1,5 @@
 import type { AddressInfo } from 'node:net';
-import type { ViteDevServer, InlineConfig as ViteInlineConfig } from 'vite';
+import type { ViteDevServer, InlineConfig } from 'vite';
 import type { SerializedSSRManifest } from '../../core/app/types.js';
 import type { AssetsGlobalStaticImagesList } from '../../assets/types.js';
 import type { PageBuildData } from '../../core/build/types.js';
@@ -102,6 +102,14 @@ export interface AstroAdapterFeatures {
      * of the build output type.
      */
     preserveBuildClientDir?: boolean;
+    /**
+     * When true, static builds will preserve the server directory structure
+     * instead of outputting to outDir. This ensures static builds use
+     * build.server for server output, maintaining consistency with server builds.
+     * Useful for adapters that require a specific directory structure regardless
+     * of the build output type.
+     */
+    preserveBuildServerDir?: boolean;
 }
 interface AdapterExplicitProperties {
     /**
@@ -320,10 +328,10 @@ export interface BaseIntegrationHooks {
         setPrerenderer: (prerenderer: AstroPrerenderer | ((defaultPrerenderer: AstroPrerenderer) => AstroPrerenderer)) => void;
     }) => void | Promise<void>;
     'astro:build:setup': (options: {
-        vite: ViteInlineConfig;
+        vite: InlineConfig;
         pages: Map<string, PageBuildData>;
         target: 'client' | 'server';
-        updateConfig: (newConfig: ViteInlineConfig) => void;
+        updateConfig: (newConfig: InlineConfig) => void;
         logger: AstroIntegrationLogger;
     }) => void | Promise<void>;
     'astro:build:generated': (options: {

package/dist/types/public/internal.d.ts

@@ -207,7 +207,7 @@ export interface SSRResult {
      */
     pathname: string;
     cookies: AstroCookies | undefined;
-    serverIslandNameMap: Map<string, string>;
+    getServerIslandNameMap: () => Promise<Map<string, string>>;
     trailingSlash: AstroConfig['trailingSlash'];
     key: Promise<CryptoKey>;
     _metadata: SSRMetadata;

package/dist/types/public/manifest.d.ts

@@ -13,7 +13,7 @@ type Dirs = Pick<SSRManifest, 'cacheDir' | 'outDir' | 'publicDir' | 'srcDir'>;
 type DeserializedDirs = Extend<Dirs, URL>;
 export type ServerDeserializedManifest = Pick<SSRManifest, 'base' | 'trailingSlash' | 'compressHTML' | 'site'> & DeserializedDirs & {
     i18n: AstroConfig['i18n'];
-    build: Pick<AstroConfig['build'], 'server' | 'client' | 'format'>;
+    build: Pick<AstroConfig['build'], 'server' | 'client' | 'format' | 'assetsPrefix'>;
     root: URL;
     image: Pick<AstroConfig['image'], 'objectFit' | 'objectPosition' | 'layout'>;
 };

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

@@ -207,9 +207,9 @@ export type I18nMiddlewareOptions = {
 /**
  * @param {AstroConfig['i18n']['routing']} customOptions
  *
- * A function that allows to programmatically create the Astro i18n middleware.
+ * A function that allows you to programmatically create the Astro i18n middleware.
  *
- * This is use useful when you still want to use the default i18n logic, but add only few exceptions to your website.
+ * This is useful when you still want to use the default i18n logic, but add only a few exceptions to your website.
  *
  * ## Examples
  *

package/dist/virtual-modules/i18n.js

@@ -1,4 +1,4 @@
-import * as config from "astro:config/server";
+import * as config from "astro:config/client";
 import { toFallbackType } from "../core/app/common.js";
 import { toRoutingStrategy } from "../core/app/entrypoints/index.js";
 import {

package/dist/vite-plugin-app/app.d.ts

@@ -1,18 +1,18 @@
 import type http from 'node:http';
-import { BaseApp, type RenderErrorOptions } from '../core/app/entrypoints/index.js';
+import { BaseApp } from '../core/app/entrypoints/index.js';
+import type { ErrorHandler } from '../core/errors/handler.js';
 import type { AstroLogger } from '../core/logger/core.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';
-import type { CreateRenderContext, RenderContext } from '../core/render-context.js';
 import type { AstroSettings, RoutesList } from '../types/astro.js';
 import type { RouteData, SSRManifest } from '../types/public/index.js';
 import type { DevServerController } from '../vite-plugin-astro-server/controller.js';
 import { RunnablePipeline } from './pipeline.js';
 import type { DevMatch, LogRequestPayload } from '../core/app/base.js';
 export declare class AstroServerApp extends BaseApp<RunnablePipeline> {
+    #private;
     settings: AstroSettings;
     loader: ModuleLoader;
     manifestData: RoutesList;
-    currentRenderContext: RenderContext | undefined;
     constructor(manifest: SSRManifest, streaming: boolean | undefined, logger: AstroLogger, manifestData: RoutesList, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>);
     isDev(): boolean;
     /**
@@ -33,10 +33,15 @@ export declare class AstroServerApp extends BaseApp<RunnablePipeline> {
     devMatch(pathname: string): Promise<DevMatch | undefined>;
     static create(manifest: SSRManifest, routesList: RoutesList, logger: AstroLogger, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>): Promise<AstroServerApp>;
     createPipeline(_streaming: boolean, manifest: SSRManifest, settings: AstroSettings, logger: AstroLogger, loader: ModuleLoader, manifestData: RoutesList, getDebugInfo: () => Promise<string>): RunnablePipeline;
-    createRenderContext(payload: CreateRenderContext): Promise<RenderContext>;
-    handleRequest({ controller, incomingRequest, incomingResponse, isHttps, }: HandleRequest): Promise<void>;
+    /**
+     * Handle a request.
+     * @returns The return value indicates whether or not the request was handled
+     * by this handler. If the result is not `true`, then the request has not
+     * been handled yet and other handlers can be run.
+     */
+    handleRequest({ controller, incomingRequest, incomingResponse, isHttps, prerenderOnly, }: HandleRequest): Promise<boolean>;
     match(request: Request, _allowPrerenderedRoutes: boolean): RouteData | undefined;
-    renderError(request: Request, { skipMiddleware, error, status, response: _response, ...resolvedRenderOptions }: RenderErrorOptions): Promise<Response>;
+    protected createErrorHandler(): ErrorHandler;
     logRequest({ pathname, method, statusCode, isRewrite, reqTime }: LogRequestPayload): void;
 }
 type HandleRequest = {
@@ -44,5 +49,7 @@ type HandleRequest = {
     incomingRequest: http.IncomingMessage;
     incomingResponse: http.ServerResponse;
     isHttps: boolean;
+    /** When true, only handle prerendered routes. Returns false for SSR routes. */
+    prerenderOnly?: boolean;
 };
 export {};