astro 5.0.0-alpha.3 → 5.0.0-alpha.5

package/dist/actions/integration.js

@@ -1,6 +1,6 @@
 import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
-import { isServerLikeOutput, viteID } from "../core/util.js";
+import { viteID } from "../core/util.js";
 import { ACTIONS_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
 function astroIntegrationActionsRouteHandler({
   settings
@@ -20,7 +20,7 @@ function astroIntegrationActionsRouteHandler({
         });
       },
       "astro:config:done": async (params) => {
-        if (!isServerLikeOutput(params.config)) {
+        if (params.buildOutput === "static") {
           const error = new AstroError(ActionsWithoutServerOutputError);
           error.stack = void 0;
           throw error;

package/dist/actions/runtime/middleware.js

@@ -7,7 +7,7 @@ import {
   serializeActionResult
 } from "./virtual/shared.js";
 const onRequest = defineMiddleware(async (context, next) => {
-  if (context._isPrerendered) {
+  if (context.isPrerendered) {
     if (context.request.method === "POST") {
       console.warn(
         yellow("[astro:actions]"),

package/dist/assets/build/generate.js

@@ -6,12 +6,11 @@ import { getTimeStat } from "../../core/build/util.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, removeLeadingForwardSlash } from "../../core/path.js";
-import { isServerLikeOutput } from "../../core/util.js";
 import { getConfiguredImageService } from "../internal.js";
 import { isESMImportedImage } from "../utils/imageKind.js";
 import { loadRemoteImage } from "./remote.js";
 async function prepareAssetsGenerationEnv(pipeline, totalCount) {
-  const { config, logger } = pipeline;
+  const { config, logger, settings } = pipeline;
   let useCache = true;
   const assetsCacheDir = new URL("assets/", config.cacheDir);
   const count = { total: totalCount, current: 1 };
@@ -24,8 +23,9 @@ async function prepareAssetsGenerationEnv(pipeline, totalCount) {
     );
     useCache = false;
   }
+  const isServerOutput = settings.buildOutput === "server";
   let serverRoot, clientRoot;
-  if (isServerLikeOutput(config)) {
+  if (isServerOutput) {
     serverRoot = config.build.server;
     clientRoot = config.build.client;
   } else {
@@ -34,7 +34,7 @@ async function prepareAssetsGenerationEnv(pipeline, totalCount) {
   }
   return {
     logger,
-    isSSR: isServerLikeOutput(config),
+    isSSR: isServerOutput,
     count,
     useCache,
     assetsCacheDir,

package/dist/assets/endpoint/config.d.ts

@@ -1,2 +1,3 @@
-import type { AstroSettings } from '../../types/astro.js';
-export declare function injectImageEndpoint(settings: AstroSettings, mode: 'dev' | 'build'): AstroSettings;
+import type { AstroSettings, ManifestData } from '../../types/astro.js';
+export declare function injectImageEndpoint(settings: AstroSettings, manifest: ManifestData, mode: 'dev' | 'build', cwd?: string): void;
+export declare function ensureImageEndpointRoute(settings: AstroSettings, manifest: ManifestData, mode: 'dev' | 'build', cwd?: string): void;

package/dist/assets/endpoint/config.js

@@ -1,12 +1,29 @@
-function injectImageEndpoint(settings, mode) {
+import { resolveInjectedRoute } from "../../core/routing/manifest/create.js";
+function injectImageEndpoint(settings, manifest, mode, cwd) {
+  manifest.routes.push(getImageEndpointData(settings, mode, cwd));
+}
+function ensureImageEndpointRoute(settings, manifest, mode, cwd) {
+  if (!manifest.routes.some((route) => route.route === "/_image")) {
+    manifest.routes.push(getImageEndpointData(settings, mode, cwd));
+  }
+}
+function getImageEndpointData(settings, mode, cwd) {
   const endpointEntrypoint = settings.config.image.endpoint ?? (mode === "dev" ? "astro/assets/endpoint/node" : "astro/assets/endpoint/generic");
-  settings.injectedRoutes.push({
-    pattern: "/_image",
-    entrypoint: endpointEntrypoint,
-    prerender: false
-  });
-  return settings;
+  return {
+    type: "endpoint",
+    isIndex: false,
+    route: "/_image",
+    pattern: /^\/_image$/,
+    segments: [[{ content: "_image", dynamic: false, spread: false }]],
+    params: [],
+    component: resolveInjectedRoute(endpointEntrypoint, settings.config.root, cwd).component,
+    generate: () => "",
+    pathname: "/_image",
+    prerender: false,
+    fallbackRoutes: []
+  };
 }
 export {
+  ensureImageEndpointRoute,
   injectImageEndpoint
 };

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

@@ -9,7 +9,6 @@ import {
   removeBase,
   removeQueryString
 } from "../core/path.js";
-import { isServerLikeOutput } from "../core/util.js";
 import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { getAssetsPrefix } from "./utils/getAssetsPrefix.js";
 import { isESMImportedImage } from "./utils/imageKind.js";
@@ -102,7 +101,7 @@ function assets({
 					// 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(
-              isServerLikeOutput(settings.config) ? settings.config.build.client : settings.config.outDir
+              settings.buildOutput === "server" ? settings.config.build.client : settings.config.outDir
             )
           )});
 					export const assetsDir = /* #__PURE__ */ new URL(${JSON.stringify(
@@ -175,7 +174,7 @@ function assets({
           if (options?.ssr) {
             return `export default ${getProxyCode(
               imageMetadata,
-              isServerLikeOutput(settings.config)
+              settings.buildOutput === "server"
             )}`;
           } else {
             globalThis.astroAsset.referencedImages.add(imageMetadata.fsPath);

package/dist/config/index.js

@@ -1,4 +1,5 @@
 import { Logger } from "../core/logger/core.js";
+import { createRouteManifest } from "../core/routing/index.js";
 function defineConfig(config) {
   return config;
 }
@@ -29,6 +30,7 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
     const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd);
     let settings = await createSettings(config, userViteConfig.root);
     settings = await runHookConfigSetup({ settings, command: cmd, logger });
+    const manifest = await createRouteManifest({ settings }, logger);
     const viteConfig = await createVite(
       {
         mode,
@@ -37,7 +39,7 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
           astroContentListenPlugin({ settings, logger, fs })
         ]
       },
-      { settings, logger, mode, sync: false }
+      { settings, logger, mode, sync: false, manifest }
     );
     await runHookConfigDone({ settings, logger });
     return mergeConfig(viteConfig, userViteConfig);

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

@@ -35,7 +35,12 @@ export declare class ContentLayer {
 export declare function simpleLoader<TData extends {
     id: string;
 }>(handler: () => Array<TData> | Promise<Array<TData>>, context: LoaderContext): Promise<void>;
-export declare function getDataStoreFile(settings: AstroSettings): URL;
+/**
+ * Get the path to the data store file.
+ * During development, this is in the `.astro` directory so that the Vite watcher can see it.
+ * 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;

package/dist/content/content-layer.js

@@ -1,7 +1,6 @@
 import { promises as fs, existsSync } from "node:fs";
 import * as fastq from "fastq";
 import xxhash from "xxhash-wasm";
-import { AstroUserError } from "../core/errors/errors.js";
 import {
   ASSET_IMPORTS_FILE,
   CONTENT_LAYER_TYPE,
@@ -103,18 +102,6 @@ class ContentLayer {
       logger.debug("Content config not loaded, skipping sync");
       return;
     }
-    if (!this.#settings.config.experimental.contentLayer) {
-      const contentLayerCollections = Object.entries(contentConfig.config.collections).filter(
-        ([_, collection]) => collection.type === CONTENT_LAYER_TYPE
-      );
-      if (contentLayerCollections.length > 0) {
-        throw new AstroUserError(
-          `The following collections have a loader defined, but the content layer is not enabled: ${contentLayerCollections.map(([title]) => title).join(", ")}.`,
-          "To enable the Content Layer API, set `experimental: { contentLayer: true }` in your Astro config file."
-        );
-      }
-      return;
-    }
     logger.info("Syncing content");
     const { digest: currentConfigDigest } = contentConfig.config;
     this.#lastConfigDigest = currentConfigDigest;
@@ -228,11 +215,9 @@ async function simpleLoader(handler, context) {
     context.store.set({ id: raw.id, data: item });
   }
 }
-function getDataStoreFile(settings) {
-  return new URL(
-    DATA_STORE_FILE,
-    process?.env.NODE_ENV === "development" ? settings.dotAstroDir : settings.config.cacheDir
-  );
+function getDataStoreFile(settings, isDev) {
+  isDev ??= process?.env.NODE_ENV === "development";
+  return new URL(DATA_STORE_FILE, isDev ? settings.dotAstroDir : settings.config.cacheDir);
 }
 function contentLayerSingleton() {
   let instance = null;

package/dist/content/data-store.d.ts

@@ -36,7 +36,7 @@ export interface DataEntry<TData extends Record<string, unknown> = Record<string
  * A read-only data store for content collections. This is used to retrieve data from the content layer at runtime.
  * To add or modify data, use {@link MutableDataStore} instead.
  */
-export declare class DataStore {
+export declare class ImmutableDataStore {
     protected _collections: Map<string, Map<string, any>>;
     constructor();
     get<T = DataEntry>(collectionName: string, key: string): T | undefined;
@@ -50,6 +50,6 @@ export declare class DataStore {
      * Attempts to load a DataStore from the virtual module.
      * This only works in Vite.
      */
-    static fromModule(): Promise<DataStore>;
-    static fromMap(data: Map<string, Map<string, any>>): Promise<DataStore>;
+    static fromModule(): Promise<ImmutableDataStore>;
+    static fromMap(data: Map<string, Map<string, any>>): Promise<ImmutableDataStore>;
 }

package/dist/content/data-store.js

@@ -1,5 +1,5 @@
 import * as devalue from "devalue";
-class DataStore {
+class ImmutableDataStore {
   _collections = /* @__PURE__ */ new Map();
   constructor() {
     this._collections = /* @__PURE__ */ new Map();
@@ -40,16 +40,16 @@ class DataStore {
     try {
       const data = await import("astro:data-layer-content");
       if (data.default instanceof Map) {
-        return DataStore.fromMap(data.default);
+        return ImmutableDataStore.fromMap(data.default);
       }
       const map = devalue.unflatten(data.default);
-      return DataStore.fromMap(map);
+      return ImmutableDataStore.fromMap(map);
     } catch {
     }
-    return new DataStore();
+    return new ImmutableDataStore();
   }
   static async fromMap(data) {
-    const store = new DataStore();
+    const store = new ImmutableDataStore();
     store._collections = data;
     return store;
   }
@@ -59,7 +59,7 @@ function dataStoreSingleton() {
   return {
     get: async () => {
       if (!instance) {
-        instance = DataStore.fromModule();
+        instance = ImmutableDataStore.fromModule();
       }
       return instance;
     },
@@ -70,6 +70,6 @@ function dataStoreSingleton() {
 }
 const globalDataStore = dataStoreSingleton();
 export {
-  DataStore,
+  ImmutableDataStore,
   globalDataStore
 };

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

@@ -2,8 +2,8 @@ import type { FSWatcher } from 'vite';
 import type { ZodSchema } from 'zod';
 import type { AstroIntegrationLogger } from '../../core/logger/core.js';
 import type { AstroConfig } from '../../types/public/config.js';
-import type { ContentEntryType } from '../../types/public/content.js';
-import type { MetaStore, ScopedDataStore } from '../mutable-data-store.js';
+import type { DataStore, MetaStore } from '../mutable-data-store.js';
+export type { DataStore, MetaStore };
 export interface ParseDataOptions<TData extends Record<string, unknown>> {
     /** The ID of the entry. Unique per collection */
     id: string;
@@ -15,8 +15,8 @@ export interface ParseDataOptions<TData extends Record<string, unknown>> {
 export interface LoaderContext {
     /** The unique name of the collection */
     collection: string;
-    /** A database abstraction to store the actual data */
-    store: ScopedDataStore;
+    /** A database to store the actual data */
+    store: DataStore;
     /**  A simple KV store, designed for things like sync tokens */
     meta: MetaStore;
     logger: AstroIntegrationLogger;
@@ -30,7 +30,6 @@ export interface LoaderContext {
     watcher?: FSWatcher;
     /** If the loader has been triggered by an integration, this may optionally contain extra data set by that integration */
     refreshContextData?: Record<string, unknown>;
-    entryTypes: Map<string, ContentEntryType>;
 }
 export interface Loader {
     /** Unique name of the loader, e.g. the npm package name */

package/dist/content/mutable-data-store.d.ts

@@ -1,10 +1,10 @@
 import { type PathLike } from 'node:fs';
-import { type DataEntry, DataStore, type RenderedContent } from './data-store.js';
+import { type DataEntry, ImmutableDataStore, type RenderedContent } from './data-store.js';
 /**
  * Extends the DataStore with the ability to change entries and write them to disk.
  * This is kept as a separate class to avoid needing node builtins at runtime, when read-only access is all that is needed.
  */
-export declare class MutableDataStore extends DataStore {
+export declare class MutableDataStore extends ImmutableDataStore {
     #private;
     set(collectionName: string, key: string, value: unknown): void;
     delete(collectionName: string, key: string): void;
@@ -15,7 +15,7 @@ export declare class MutableDataStore extends DataStore {
     addModuleImport(fileName: string): void;
     writeAssetImports(filePath: PathLike): Promise<void>;
     writeModuleImports(filePath: PathLike): Promise<void>;
-    scopedStore(collectionName: string): ScopedDataStore;
+    scopedStore(collectionName: string): DataStore;
     /**
      * Returns a MetaStore for a given collection, or if no collection is provided, the default meta collection.
      */
@@ -31,7 +31,7 @@ export declare class MutableDataStore extends DataStore {
     static fromString(data: string): Promise<MutableDataStore>;
     static fromFile(filePath: string | URL): Promise<MutableDataStore>;
 }
-export interface ScopedDataStore {
+export interface DataStore {
     get: <TData extends Record<string, unknown> = Record<string, unknown>>(key: string) => DataEntry<TData> | undefined;
     entries: () => Array<[id: string, DataEntry]>;
     set: <TData extends Record<string, unknown>>(opts: {

package/dist/content/mutable-data-store.js

@@ -4,10 +4,10 @@ import { Traverse } from "neotraverse/modern";
 import { imageSrcToImportId, importIdToSymbolName } from "../assets/utils/resolveImports.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { IMAGE_IMPORT_PREFIX } from "./consts.js";
-import { DataStore } from "./data-store.js";
+import { ImmutableDataStore } from "./data-store.js";
 import { contentModuleToId } from "./utils.js";
 const SAVE_DEBOUNCE_MS = 500;
-class MutableDataStore extends DataStore {
+class MutableDataStore extends ImmutableDataStore {
   #file;
   #assetsFile;
   #modulesFile;

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

@@ -4,7 +4,6 @@ import * as devalue from "devalue";
 import { getProxyCode } from "../assets/utils/proxy.js";
 import { AstroError } from "../core/errors/errors.js";
 import { AstroErrorData } from "../core/errors/index.js";
-import { isServerLikeOutput } from "../core/util.js";
 import { CONTENT_FLAG, DATA_FLAG } from "./consts.js";
 import {
   getContentEntryExts,
@@ -76,7 +75,7 @@ function astroContentImportPlugin({
           const code = `
 export const id = ${JSON.stringify(id)};
 export const collection = ${JSON.stringify(collection)};
-export const data = ${stringifyEntryData(data, isServerLikeOutput(settings.config))};
+export const data = ${stringifyEntryData(data, settings.buildOutput === "server")};
 export const _internal = {
 	type: 'data',
 	filePath: ${JSON.stringify(_internal.filePath)},
@@ -100,7 +99,7 @@ export const _internal = {
 						export const collection = ${JSON.stringify(collection)};
 						export const slug = ${JSON.stringify(slug)};
 						export const body = ${JSON.stringify(body)};
-						export const data = ${stringifyEntryData(data, isServerLikeOutput(settings.config))};
+						export const data = ${stringifyEntryData(data, settings.buildOutput === "server")};
 						export const _internal = {
 							type: 'content',
 							filePath: ${JSON.stringify(_internal.filePath)},

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

@@ -7,7 +7,6 @@ import pLimit from "p-limit";
 import { encodeName } from "../core/build/util.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { appendForwardSlash, removeFileExtension } from "../core/path.js";
-import { isServerLikeOutput } from "../core/util.js";
 import { rootRelativePath } from "../core/viteUtils.js";
 import { createDefaultAstroMetadata } from "../vite-plugin-astro/metadata.js";
 import {
@@ -17,7 +16,6 @@ import {
   CONTENT_FLAG,
   CONTENT_RENDER_FLAG,
   DATA_FLAG,
-  DATA_STORE_FILE,
   DATA_STORE_VIRTUAL_ID,
   MODULES_IMPORTS_FILE,
   MODULES_MJS_ID,
@@ -26,6 +24,7 @@ import {
   RESOLVED_VIRTUAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 } from "./consts.js";
+import { getDataStoreFile } from "./content-layer.js";
 import {
   getContentEntryIdAndSlug,
   getContentPaths,
@@ -43,17 +42,14 @@ function astroContentVirtualModPlugin({
   fs
 }) {
   let IS_DEV = false;
-  const IS_SERVER = isServerLikeOutput(settings.config);
+  const IS_SERVER = settings.buildOutput === "server";
   let dataStoreFile;
   return {
     name: "astro-content-virtual-mod-plugin",
     enforce: "pre",
     configResolved(config) {
       IS_DEV = config.mode === "development";
-      dataStoreFile = new URL(
-        DATA_STORE_FILE,
-        IS_DEV ? settings.dotAstroDir : settings.config.cacheDir
-      );
+      dataStoreFile = getDataStoreFile(settings, IS_DEV);
     },
     async resolveId(id) {
       if (id === VIRTUAL_MODULE_ID) {

package/dist/core/build/common.d.ts

@@ -1,6 +1,7 @@
+import type { AstroSettings } from '../../types/astro.js';
 import type { AstroConfig } from '../../types/public/config.js';
 import type { RouteData } from '../../types/public/internal.js';
-export declare function getOutFolder(astroConfig: AstroConfig, pathname: string, routeData: RouteData): URL;
+export declare function getOutFolder(astroSettings: AstroSettings, pathname: string, routeData: RouteData): URL;
 export declare function getOutFile(astroConfig: AstroConfig, outFolder: URL, pathname: string, routeData: RouteData): URL;
 /**
  * Ensures the `outDir` is within `process.cwd()`. If not it will fallback to `<cwd>/.astro`.

package/dist/core/build/common.js

@@ -3,15 +3,15 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { appendForwardSlash } from "../../core/path.js";
 const STATUS_CODE_PAGES = /* @__PURE__ */ new Set(["/404", "/500"]);
 const FALLBACK_OUT_DIR_NAME = "./.astro/";
-function getOutRoot(astroConfig) {
-  if (astroConfig.output === "static") {
-    return new URL("./", astroConfig.outDir);
+function getOutRoot(astroSettings) {
+  if (astroSettings.buildOutput === "static") {
+    return new URL("./", astroSettings.config.outDir);
   } else {
-    return new URL("./", astroConfig.build.client);
+    return new URL("./", astroSettings.config.build.client);
   }
 }
-function getOutFolder(astroConfig, pathname, routeData) {
-  const outRoot = getOutRoot(astroConfig);
+function getOutFolder(astroSettings, pathname, routeData) {
+  const outRoot = getOutRoot(astroSettings);
   const routeType = routeData.type;
   switch (routeType) {
     case "endpoint":
@@ -19,7 +19,7 @@ function getOutFolder(astroConfig, pathname, routeData) {
     case "fallback":
     case "page":
     case "redirect":
-      switch (astroConfig.build.format) {
+      switch (astroSettings.config.build.format) {
         case "directory": {
           if (STATUS_CODE_PAGES.has(pathname)) {
             return new URL("." + appendForwardSlash(npath.dirname(pathname)), outRoot);

package/dist/core/build/generate.js

@@ -25,19 +25,19 @@ import { callGetStaticPaths } from "../render/route-cache.js";
 import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
 import { stringifyParams } from "../routing/params.js";
-import { getOutputFilename, isServerLikeOutput } from "../util.js";
+import { getOutputFilename } from "../util.js";
 import { getOutFile, getOutFolder } from "./common.js";
 import { cssOrder, mergeInlineCss } from "./internal.js";
 import { BuildPipeline } from "./pipeline.js";
 import { getTimeStat, shouldAppendForwardSlash } from "./util.js";
 async function generatePages(options, internals) {
   const generatePagesTimer = performance.now();
-  const ssr = isServerLikeOutput(options.settings.config);
+  const ssr = options.settings.buildOutput === "server";
   let manifest;
   if (ssr) {
     manifest = await BuildPipeline.retrieveManifest(options, internals);
   } else {
-    const baseDirectory = getOutputDirectory(options.settings.config);
+    const baseDirectory = getOutputDirectory(options.settings);
     const renderersEntryUrl = new URL("renderers.mjs", baseDirectory);
     const renderers = await import(renderersEntryUrl.toString());
     let middleware = (_, next) => next();
@@ -108,7 +108,7 @@ ${bgGreen(black(` ${verb} static routes `))}`);
 `));
     delete globalThis?.astroAsset?.addStaticImage;
   }
-  await runHookBuildGenerated({ config, logger });
+  await runHookBuildGenerated({ settings: options.settings, logger });
 }
 const THRESHOLD_SLOW_RENDER_TIME_MS = 500;
 async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
@@ -328,7 +328,7 @@ async function generatePath(pathname, pipeline, gopts, route) {
     if (!response.body) return;
     body = Buffer.from(await response.arrayBuffer());
   }
-  const outFolder = getOutFolder(config, pathname, route);
+  const outFolder = getOutFolder(pipeline.settings, pathname, route);
   const outFile = getOutFile(config, outFolder, pathname, route);
   route.distURL = outFile;
   await fs.promises.mkdir(outFolder, { recursive: true });

package/dist/core/build/index.js

@@ -16,12 +16,13 @@ import { createNodeLogger } from "../config/logging.js";
 import { createSettings } from "../config/settings.js";
 import { createVite } from "../create-vite.js";
 import { createKey } from "../encryption.js";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 import { levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { createRouteManifest } from "../routing/index.js";
 import { getServerIslandRouteData } from "../server-islands/endpoint.js";
 import { clearContentLayerCache } from "../sync/index.js";
-import { ensureProcessNodeEnv, isServerLikeOutput } from "../util.js";
+import { ensureProcessNodeEnv } from "../util.js";
 import { collectPagesData } from "./page-data.js";
 import { staticBuild, viteBuild } from "./static-build.js";
 import { getTimeStat } from "./util.js";
@@ -79,10 +80,13 @@ class AstroBuilder {
       command: "build",
       logger
     });
-    if (isServerLikeOutput(this.settings.config)) {
-      this.settings = injectImageEndpoint(this.settings, "build");
+    this.manifest = await createRouteManifest({ settings: this.settings }, this.logger);
+    if (this.settings.buildOutput === "server") {
+      injectImageEndpoint(this.settings, this.manifest, "build");
+    }
+    if (!this.settings.config.adapter && this.settings.buildOutput === "server") {
+      throw new AstroError(AstroErrorData.NoAdapterInstalled);
     }
-    this.manifest = createRouteManifest({ settings: this.settings }, this.logger);
     const viteConfig = await createVite(
       {
         mode: this.mode,
@@ -96,7 +100,8 @@ class AstroBuilder {
         logger: this.logger,
         mode: "build",
         command: "build",
-        sync: false
+        sync: false,
+        manifest: this.manifest
       }
     );
     await runHookConfigDone({ settings: this.settings, logger });
@@ -104,7 +109,8 @@ class AstroBuilder {
     await syncInternal({
       settings: this.settings,
       logger,
-      fs
+      fs,
+      manifest: this.manifest
     });
     return { viteConfig };
   }
@@ -155,7 +161,7 @@ class AstroBuilder {
     });
     this.logger.debug("build", timerMessage("Additional assets copied", this.timer.assetsStart));
     await runHookBuildDone({
-      config: this.settings.config,
+      settings: this.settings,
       pages: pageNames,
       routes: Object.values(allPages).flat().map((pageData) => pageData.route).concat(
         this.settings.config.experimental.serverIslands ? [getServerIslandRouteData(this.settings.config)] : []

package/dist/core/build/page-data.js

@@ -15,7 +15,7 @@ function collectPagesData(opts) {
         moduleSpecifier: "",
         styles: []
       };
-      if (settings.config.output === "static") {
+      if (settings.buildOutput === "static") {
         const html = `${route.pathname}`.replace(/\/?$/, "/index.html");
         debug(
           "build",

package/dist/core/build/pipeline.js

@@ -6,7 +6,6 @@ import { Pipeline } from "../render/index.js";
 import { createAssetLink, createStylesheetElementSet } from "../render/ssr-element.js";
 import { createDefaultRoutes } from "../routing/default.js";
 import { findRouteToRewrite } from "../routing/rewrite.js";
-import { isServerLikeOutput } from "../util.js";
 import { getOutDirWithinCwd } from "./common.js";
 import { cssOrder, getPageData, mergeInlineCss } from "./internal.js";
 import { ASTRO_PAGE_MODULE_ID, ASTRO_PAGE_RESOLVED_MODULE_ID } from "./plugins/plugin-pages.js";
@@ -31,7 +30,7 @@ class BuildPipeline extends Pipeline {
       resolveCache.set(specifier, assetLink);
       return assetLink;
     }
-    const serverLike = isServerLikeOutput(config);
+    const serverLike = settings.buildOutput === "server";
     const streaming = serverLike;
     super(
       options.logger,
@@ -56,8 +55,7 @@ class BuildPipeline extends Pipeline {
    */
   #routesByFilePath = /* @__PURE__ */ new WeakMap();
   get outFolder() {
-    const ssr = isServerLikeOutput(this.settings.config);
-    return ssr ? this.settings.config.build.server : getOutDirWithinCwd(this.settings.config.outDir);
+    return this.settings.buildOutput === "server" ? this.settings.config.build.server : getOutDirWithinCwd(this.settings.config.outDir);
   }
   static create({
     internals,
@@ -80,8 +78,7 @@ class BuildPipeline extends Pipeline {
    * @param staticBuildOptions
    */
   static async retrieveManifest(staticBuildOptions, internals) {
-    const config = staticBuildOptions.settings.config;
-    const baseDirectory = getOutputDirectory(config);
+    const baseDirectory = getOutputDirectory(staticBuildOptions.settings);
     const manifestEntryUrl = new URL(
       `${internals.manifestFileName}?time=${Date.now()}`,
       baseDirectory

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

@@ -365,7 +365,7 @@ function pluginContent(opts, internals) {
     targets: ["server"],
     hooks: {
       async "build:before"() {
-        if (!isContentCollectionsCacheEnabled(opts.settings.config)) {
+        if (!isContentCollectionsCacheEnabled(opts.settings)) {
           return { vitePlugin: void 0 };
         }
         const lookupMap = await generateLookupMap({ settings: opts.settings, fs: fsMod });
@@ -374,7 +374,7 @@ function pluginContent(opts, internals) {
         };
       },
       async "build:post"() {
-        if (!isContentCollectionsCacheEnabled(opts.settings.config)) {
+        if (!isContentCollectionsCacheEnabled(opts.settings)) {
           return;
         }
         const promises = [];

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

@@ -132,7 +132,7 @@ function buildManifest(opts, internals, staticFiles, encodedKey) {
   for (const route of opts.manifest.routes) {
     if (!route.prerender) continue;
     if (!route.pathname) continue;
-    const outFolder = getOutFolder(opts.settings.config, route.pathname, route);
+    const outFolder = getOutFolder(opts.settings, route.pathname, route);
     const outFile = getOutFile(opts.settings.config, outFolder, route.pathname, route);
     const file = outFile.toString().replace(opts.settings.config.build.client.toString(), "");
     routes.push({