astro 5.0.0-alpha.4 → 5.0.0-alpha.6

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/loaders/glob.d.ts

@@ -9,7 +9,7 @@ export interface GenerateIdOptions {
 }
 export interface GlobOptions {
     /** The glob pattern to match files, relative to the base directory */
-    pattern: string;
+    pattern: string | Array<string>;
     /** The base directory to resolve the glob pattern from. Relative to the root directory, or an absolute file URL. Defaults to `.` */
     base?: string | URL;
     /**

package/dist/content/loaders/glob.js

@@ -17,13 +17,19 @@ function generateIdDefault({ entry, base, data }) {
   });
   return slug;
 }
+function checkPrefix(pattern, prefix) {
+  if (Array.isArray(pattern)) {
+    return pattern.some((p) => p.startsWith(prefix));
+  }
+  return pattern.startsWith(prefix);
+}
 function glob(globOptions) {
-  if (globOptions.pattern.startsWith("../")) {
+  if (checkPrefix(globOptions.pattern, "../")) {
     throw new Error(
       "Glob patterns cannot start with `../`. Set the `base` option to a parent directory instead."
     );
   }
-  if (globOptions.pattern.startsWith("/")) {
+  if (checkPrefix(globOptions.pattern, "/")) {
     throw new Error(
       "Glob patterns cannot start with `/`. Set the `base` option to a parent directory or use a relative path instead."
     );
@@ -160,13 +166,14 @@ function glob(globOptions) {
       );
       const skipCount = skippedFiles.length;
       if (skipCount > 0) {
+        const patternList = Array.isArray(globOptions.pattern) ? globOptions.pattern.join(", ") : globOptions.pattern;
         logger.warn(`The glob() loader cannot be used for files in ${bold("src/content")}.`);
         if (skipCount > 10) {
           logger.warn(
-            `Skipped ${green(skippedFiles.length)} files that matched ${green(globOptions.pattern)}.`
+            `Skipped ${green(skippedFiles.length)} files that matched ${green(patternList)}.`
           );
         } else {
-          logger.warn(`Skipped the following files that matched ${green(globOptions.pattern)}:`);
+          logger.warn(`Skipped the following files that matched ${green(patternList)}:`);
           skippedFiles.forEach((file) => logger.warn(`\u2022 ${green(file)}`));
         }
       }
@@ -174,8 +181,7 @@ function glob(globOptions) {
       if (!watcher) {
         return;
       }
-      const matcher = micromatch.makeRe(globOptions.pattern);
-      const matchesGlob = (entry) => !entry.startsWith("../") && matcher.test(entry);
+      const matchesGlob = (entry) => !entry.startsWith("../") && micromatch.isMatch(entry, globOptions.pattern);
       const basePath = fileURLToPath(baseDir);
       async function onChange(changedPath) {
         const entry = posixRelative(basePath, changedPath);

package/dist/content/utils.d.ts

@@ -66,6 +66,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData: z.ZodAny;
             generateDigest: z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>;
             watcher: z.ZodOptional<z.ZodAny>;
+            refreshContextData: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
         }, "strip", z.ZodTypeAny, {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -76,6 +77,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             entryTypes?: any;
             parseData?: any;
             watcher?: any;
+            refreshContextData?: Record<string, unknown> | undefined;
         }, {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -86,6 +88,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             entryTypes?: any;
             parseData?: any;
             watcher?: any;
+            refreshContextData?: Record<string, unknown> | undefined;
         }>], null>, z.ZodUnknown>;
         schema: z.ZodOptional<z.ZodAny>;
         render: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>>;
@@ -100,6 +103,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             entryTypes?: any;
             parseData?: any;
             watcher?: any;
+            refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
         render?: ((args_0: any) => unknown) | undefined;
@@ -115,6 +119,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             entryTypes?: any;
             parseData?: any;
             watcher?: any;
+            refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
         render?: ((args_0: any) => unknown) | undefined;
@@ -137,6 +142,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             entryTypes?: any;
             parseData?: any;
             watcher?: any;
+            refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
         render?: ((args_0: any) => unknown) | undefined;
@@ -160,6 +166,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             entryTypes?: any;
             parseData?: any;
             watcher?: any;
+            refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
         render?: ((args_0: any) => unknown) | undefined;
@@ -213,6 +220,7 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData: z.ZodAny;
                 generateDigest: z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>;
                 watcher: z.ZodOptional<z.ZodAny>;
+                refreshContextData: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
             }, "strip", z.ZodTypeAny, {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -223,6 +231,7 @@ declare const contentConfigParser: z.ZodObject<{
                 entryTypes?: any;
                 parseData?: any;
                 watcher?: any;
+                refreshContextData?: Record<string, unknown> | undefined;
             }, {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -233,6 +242,7 @@ declare const contentConfigParser: z.ZodObject<{
                 entryTypes?: any;
                 parseData?: any;
                 watcher?: any;
+                refreshContextData?: Record<string, unknown> | undefined;
             }>], null>, z.ZodUnknown>;
             schema: z.ZodOptional<z.ZodAny>;
             render: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>>;
@@ -247,6 +257,7 @@ declare const contentConfigParser: z.ZodObject<{
                 entryTypes?: any;
                 parseData?: any;
                 watcher?: any;
+                refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
             render?: ((args_0: any) => unknown) | undefined;
@@ -262,6 +273,7 @@ declare const contentConfigParser: z.ZodObject<{
                 entryTypes?: any;
                 parseData?: any;
                 watcher?: any;
+                refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
             render?: ((args_0: any) => unknown) | undefined;
@@ -284,6 +296,7 @@ declare const contentConfigParser: z.ZodObject<{
                 entryTypes?: any;
                 parseData?: any;
                 watcher?: any;
+                refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
             render?: ((args_0: any) => unknown) | undefined;
@@ -307,6 +320,7 @@ declare const contentConfigParser: z.ZodObject<{
                 entryTypes?: any;
                 parseData?: any;
                 watcher?: any;
+                refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
             render?: ((args_0: any) => unknown) | undefined;
@@ -338,6 +352,7 @@ declare const contentConfigParser: z.ZodObject<{
                 entryTypes?: any;
                 parseData?: any;
                 watcher?: any;
+                refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
             render?: ((args_0: any) => unknown) | undefined;
@@ -369,6 +384,7 @@ declare const contentConfigParser: z.ZodObject<{
                 entryTypes?: any;
                 parseData?: any;
                 watcher?: any;
+                refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
             render?: ((args_0: any) => unknown) | undefined;

package/dist/content/utils.js

@@ -60,7 +60,8 @@ const collectionConfigParser = z.union([
                 entryTypes: z.any(),
                 parseData: z.any(),
                 generateDigest: z.function(z.tuple([z.any()], z.string())),
-                watcher: z.any().optional()
+                watcher: z.any().optional(),
+                refreshContextData: z.record(z.unknown()).optional()
               })
             ],
             z.unknown()

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 {
@@ -43,7 +42,7 @@ 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",

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();
@@ -59,7 +59,6 @@ async function generatePages(options, internals) {
   const { config, logger } = pipeline;
   if (ssr && !hasPrerenderedPages(internals)) {
     delete globalThis?.astroAsset?.addStaticImage;
-    return;
   }
   const verb = ssr ? "prerendering" : "generating";
   logger.info("SKIP_FORMAT", `
@@ -108,7 +107,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) {
@@ -288,7 +287,7 @@ async function generatePath(pathname, pipeline, gopts, route) {
     url,
     headers: new Headers(),
     logger,
-    staticLike: true
+    isPrerendered: true
   });
   const renderContext = RenderContext.create({ pipeline, pathname, request, routeData: route });
   let body;
@@ -328,7 +327,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,14 @@ 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");
+    }
+    await runHookConfigDone({ settings: this.settings, logger, command: "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,15 +101,16 @@ class AstroBuilder {
         logger: this.logger,
         mode: "build",
         command: "build",
-        sync: false
+        sync: false,
+        manifest: this.manifest
       }
     );
-    await runHookConfigDone({ settings: this.settings, logger });
     const { syncInternal } = await import("../sync/index.js");
     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)] : []
@@ -168,7 +174,8 @@ class AstroBuilder {
         logger: this.logger,
         timeStart: this.timer.init,
         pageCount: pageNames.length,
-        buildMode: this.settings.config.output
+        buildMode: this.settings.buildOutput
+        // buildOutput is always set at this point
       });
     }
   }

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({

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

@@ -8,7 +8,7 @@ function vitePluginPages(opts, internals) {
   return {
     name: "@astro/plugin-build-pages",
     options(options) {
-      if (opts.settings.config.output === "static") {
+      if (opts.settings.buildOutput === "static") {
         const inputs = /* @__PURE__ */ new Set();
         for (const pageData of Object.values(opts.allPages)) {
           if (routeIsRedirect(pageData.route)) {