astro 5.10.0 → 5.10.2

package/components/Image.astro

@@ -1,5 +1,5 @@
 ---
-import { type LocalImageProps, type RemoteImageProps, getImage, imageConfig } from 'astro:assets';
+import { getImage, imageConfig, type LocalImageProps, type RemoteImageProps } from 'astro:assets';
 import type { UnresolvedImageTransform } from '../dist/assets/types';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type { HTMLAttributes } from '../types';

package/components/Picture.astro

@@ -1,5 +1,5 @@
 ---
-import { type LocalImageProps, type RemoteImageProps, getImage, imageConfig } from 'astro:assets';
+import { getImage, imageConfig, type LocalImageProps, type RemoteImageProps } from 'astro:assets';
 import * as mime from 'mrmime';
 import { isESMImportedImage, resolveSrc } from '../dist/assets/utils/imageKind.js';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';

package/dist/actions/integration.js

@@ -1,7 +1,7 @@
-import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
+import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
 import { viteID } from "../core/util.js";
-import { ACTIONS_TYPES_FILE, ACTION_RPC_ROUTE_PATTERN, VIRTUAL_MODULE_ID } from "./consts.js";
+import { ACTION_RPC_ROUTE_PATTERN, ACTIONS_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
 function astroIntegrationActionsRouteHandler({
   settings,
   filename

package/dist/actions/runtime/virtual/server.d.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import type { APIContext } from '../../../types/public/index.js';
 import { type ActionAPIContext, type ErrorInferenceObject, type MaybePromise } from '../utils.js';
-import { type SafeResult, type SerializedActionResult, deserializeActionResult, serializeActionResult } from './shared.js';
+import { deserializeActionResult, type SafeResult, type SerializedActionResult, serializeActionResult } from './shared.js';
 export * from './shared.js';
 export type ActionAccept = 'form' | 'json';
 export type ActionHandler<TInputSchema, TOutput> = TInputSchema extends z.ZodType ? (input: z.infer<TInputSchema>, context: ActionAPIContext) => MaybePromise<TOutput> : (input: any, context: ActionAPIContext) => MaybePromise<TOutput>;

package/dist/actions/runtime/virtual/server.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { shouldAppendForwardSlash } from "../../../core/build/util.js";
-import { ActionCalledFromServerError } from "../../../core/errors/errors-data.js";
 import { AstroError } from "../../../core/errors/errors.js";
+import { ActionCalledFromServerError } from "../../../core/errors/errors-data.js";
 import { removeTrailingForwardSlash } from "../../../core/path.js";
 import { apiContextRoutesSymbol } from "../../../core/render-context.js";
 import { ACTION_RPC_ROUTE_PATTERN } from "../../consts.js";

package/dist/actions/runtime/virtual/shared.d.ts

@@ -1,7 +1,7 @@
 import type { z } from 'zod';
 import { AstroError } from '../../../core/errors/errors.js';
 import { appendForwardSlash as _appendForwardSlash } from '../../../core/path.js';
-import type { ErrorInferenceObject, MaybePromise, ActionAPIContext as _ActionAPIContext } from '../utils.js';
+import type { ActionAPIContext as _ActionAPIContext, ErrorInferenceObject, MaybePromise } from '../utils.js';
 export type ActionAPIContext = _ActionAPIContext;
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;

package/dist/actions/runtime/virtual/shared.js

@@ -1,10 +1,10 @@
 import { parse as devalueParse, stringify as devalueStringify } from "devalue";
 import { REDIRECT_STATUS_CODES } from "../../../core/constants.js";
+import { AstroError } from "../../../core/errors/errors.js";
 import {
   ActionCalledFromServerError,
   ActionsReturnedInvalidDataError
 } from "../../../core/errors/errors-data.js";
-import { AstroError } from "../../../core/errors/errors.js";
 import { appendForwardSlash as _appendForwardSlash } from "../../../core/path.js";
 import { ACTION_QUERY_PARAMS as _ACTION_QUERY_PARAMS } from "../../consts.js";
 const ACTION_QUERY_PARAMS = _ACTION_QUERY_PARAMS;

package/dist/assets/endpoint/node.js

@@ -1,8 +1,8 @@
+import { assetsDir, imageConfig, outDir } from "astro:assets";
 import { readFile } from "node:fs/promises";
 import os from "node:os";
 import { isAbsolute } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { assetsDir, imageConfig, outDir } from "astro:assets";
 import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
 import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import * as mime from "mrmime";

package/dist/assets/fonts/definitions.d.ts

@@ -1,7 +1,6 @@
 import type * as unifont from 'unifont';
 import type { CollectedFontForMetrics } from './logic/optimize-fallbacks.js';
-import type { AstroFontProvider, FontFileData, FontType, PreloadData, ResolvedFontProvider, Style } from './types.js';
-import type { FontFaceMetrics, GenericFallbackName } from './types.js';
+import type { AstroFontProvider, FontFaceMetrics, FontFileData, FontType, GenericFallbackName, PreloadData, ResolvedFontProvider, Style } from './types.js';
 export interface Hasher {
     hashString: (input: string) => string;
     hashObject: (input: Record<string, any>) => string;

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

@@ -30,11 +30,11 @@ import {
 import { createRemoteFontProviderResolver } from "./implementations/remote-font-provider-resolver.js";
 import { createFsStorage } from "./implementations/storage.js";
 import { createSystemFallbacksProvider } from "./implementations/system-fallbacks-provider.js";
+import { createUrlProxy } from "./implementations/url-proxy.js";
 import {
   createLocalUrlProxyContentResolver,
   createRemoteUrlProxyContentResolver
 } from "./implementations/url-proxy-content-resolver.js";
-import { createUrlProxy } from "./implementations/url-proxy.js";
 import { createBuildUrlResolver, createDevUrlResolver } from "./implementations/url-resolver.js";
 import { orchestrate } from "./orchestrate.js";
 function fontsPlugin({ settings, sync, logger }) {

package/dist/assets/internal.js

@@ -3,9 +3,9 @@ import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { DEFAULT_HASH_PROPS } from "./consts.js";
 import {
   DEFAULT_RESOLUTIONS,
-  LIMITED_RESOLUTIONS,
   getSizesAttribute,
-  getWidths
+  getWidths,
+  LIMITED_RESOLUTIONS
 } from "./layout.js";
 import { isLocalService } from "./services/service.js";
 import {

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

@@ -4,14 +4,14 @@
  *
  * If some functions don't need to be exposed, just import the file that contains the functions.
  */
+export { isESMImportedImage, isRemoteImage } from './imageKind.js';
+export { imageMetadata } from './metadata.js';
 export { 
 /**
  * @deprecated
  */
 emitESMImage, emitImageMetadata, } from './node/emitAsset.js';
-export { isESMImportedImage, isRemoteImage } from './imageKind.js';
-export { imageMetadata } from './metadata.js';
 export { getOrigQueryParams } from './queryParams.js';
-export { hashTransform, propsToFilename } from './transformToPath.js';
-export { inferRemoteSize } from './remoteProbe.js';
 export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from './remotePattern.js';
+export { inferRemoteSize } from './remoteProbe.js';
+export { hashTransform, propsToFilename } from './transformToPath.js';

package/dist/assets/utils/index.js

@@ -1,12 +1,10 @@
+import { isESMImportedImage, isRemoteImage } from "./imageKind.js";
+import { imageMetadata } from "./metadata.js";
 import {
   emitESMImage,
   emitImageMetadata
 } from "./node/emitAsset.js";
-import { isESMImportedImage, isRemoteImage } from "./imageKind.js";
-import { imageMetadata } from "./metadata.js";
 import { getOrigQueryParams } from "./queryParams.js";
-import { hashTransform, propsToFilename } from "./transformToPath.js";
-import { inferRemoteSize } from "./remoteProbe.js";
 import {
   isRemoteAllowed,
   matchHostname,
@@ -15,6 +13,8 @@ import {
   matchPort,
   matchProtocol
 } from "./remotePattern.js";
+import { inferRemoteSize } from "./remoteProbe.js";
+import { hashTransform, propsToFilename } from "./transformToPath.js";
 export {
   emitESMImage,
   emitImageMetadata,

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

@@ -1,3 +1,3 @@
-import { type RemotePattern, isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol } from '@astrojs/internal-helpers/remote';
+import { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern } from '@astrojs/internal-helpers/remote';
 export { isRemoteAllowed, matchHostname, matchPort, matchPathname, matchProtocol, matchPattern };
 export type { RemotePattern };

package/dist/config/entrypoint.d.ts

@@ -1,11 +1,11 @@
 import type { SharpImageServiceConfig } from '../assets/services/sharp.js';
 import type { ImageServiceConfig } from '../types/public/index.js';
-export { defineConfig, getViteConfig } from './index.js';
-export { envField } from '../env/config.js';
+export { defineAstroFontProvider, fontProviders } from '../assets/fonts/providers/index.js';
+export type { AstroFontProvider } from '../assets/fonts/types.js';
 export { mergeConfig } from '../core/config/merge.js';
 export { validateConfig } from '../core/config/validate.js';
-export { fontProviders, defineAstroFontProvider } from '../assets/fonts/providers/index.js';
-export type { AstroFontProvider } from '../assets/fonts/types.js';
+export { envField } from '../env/config.js';
+export { defineConfig, getViteConfig } from './index.js';
 /**
  * Return the configuration needed to use the Sharp-based image service
  */

package/dist/config/entrypoint.js

@@ -1,8 +1,8 @@
-import { defineConfig, getViteConfig } from "./index.js";
-import { envField } from "../env/config.js";
+import { defineAstroFontProvider, fontProviders } from "../assets/fonts/providers/index.js";
 import { mergeConfig } from "../core/config/merge.js";
 import { validateConfig } from "../core/config/validate.js";
-import { fontProviders, defineAstroFontProvider } from "../assets/fonts/providers/index.js";
+import { envField } from "../env/config.js";
+import { defineConfig, getViteConfig } from "./index.js";
 function sharpImageService(config = {}) {
   return {
     entrypoint: "astro/assets/services/sharp",

package/dist/content/config.d.ts

@@ -64,7 +64,7 @@ type ContentCollectionConfig<S extends BaseSchema> = {
     loader?: never;
 };
 export type LiveCollectionConfig<L extends LiveLoader, S extends BaseSchema | undefined = undefined> = {
-    type: 'live';
+    type?: 'live';
     schema?: S;
     loader: L;
 };

package/dist/content/config.js

@@ -2,7 +2,7 @@ import { AstroError, AstroErrorData, AstroUserError } from "../core/errors/index
 import { CONTENT_LAYER_TYPE, LIVE_CONTENT_TYPE } from "./consts.js";
 function getImporterFilename() {
   const stackLine = new Error().stack?.split("\n").find(
-    (line) => !line.includes("defineCollection") && !line.includes("defineLiveCollection") && !line.includes("getImporterFilename") && line !== "Error"
+    (line) => !line.includes("defineCollection") && !line.includes("defineLiveCollection") && !line.includes("getImporterFilename") && !line.startsWith("Error")
   );
   if (!stackLine) {
     return void 0;
@@ -12,7 +12,7 @@ function getImporterFilename() {
 }
 function defineLiveCollection(config) {
   const importerFilename = getImporterFilename();
-  if (!importerFilename?.includes("live.config")) {
+  if (importerFilename && !importerFilename.includes("live.config")) {
     throw new AstroError({
       ...AstroErrorData.LiveContentConfigError,
       message: AstroErrorData.LiveContentConfigError.message(
@@ -21,6 +21,7 @@ function defineLiveCollection(config) {
       )
     });
   }
+  config.type ??= LIVE_CONTENT_TYPE;
   if (config.type !== LIVE_CONTENT_TYPE) {
     throw new AstroError({
       ...AstroErrorData.LiveContentConfigError,
@@ -39,6 +40,15 @@ function defineLiveCollection(config) {
       )
     });
   }
+  if (!config.loader.loadCollection || !config.loader.loadEntry) {
+    throw new AstroError({
+      ...AstroErrorData.LiveContentConfigError,
+      message: AstroErrorData.LiveContentConfigError.message(
+        "Live collection loaders must have `loadCollection()` and `loadEntry()` methods. Please check that you are not using a loader intended for build-time collections",
+        importerFilename
+      )
+    });
+  }
   if (typeof config.schema === "function") {
     throw new AstroError({
       ...AstroErrorData.LiveContentConfigError,
@@ -67,6 +77,11 @@ function defineCollection(config) {
         `Collections that use the Content Layer API must have a \`loader\` defined and no \`type\` set. Check your collection definitions in ${importerFilename ?? "your content config file"}.`
       );
     }
+    if (typeof config.loader === "object" && typeof config.loader.load !== "function" && ("loadEntry" in config.loader || "loadCollection" in config.loader)) {
+      throw new AstroUserError(
+        `Live content collections must be defined in "src/live.config.ts" file. Check your collection definitions in "${importerFilename ?? "your content config file"}" to ensure you are not using a live loader.`
+      );
+    }
     config.type = CONTENT_LAYER_TYPE;
   }
   if (!config.type) config.type = "content";

package/dist/content/content-layer.js

@@ -1,4 +1,4 @@
-import { promises as fs, existsSync } from "node:fs";
+import { existsSync, promises as fs } from "node:fs";
 import { createMarkdownProcessor } from "@astrojs/markdown-remark";
 import PQueue from "p-queue";
 import xxhash from "xxhash-wasm";
@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.10.0") {
+    if (previousAstroVersion && previousAstroVersion !== "5.10.2") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.10.0") {
-      await this.#store.metaStore().set("astro-version", "5.10.0");
+    if ("5.10.2") {
+      await this.#store.metaStore().set("astro-version", "5.10.2");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/loaders/file.js

@@ -1,4 +1,4 @@
-import { promises as fs, existsSync } from "node:fs";
+import { existsSync, promises as fs } from "node:fs";
 import { fileURLToPath } from "node:url";
 import yaml from "js-yaml";
 import { FileGlobNotSupported, FileParserNotFound } from "../../core/errors/errors-data.js";

package/dist/content/loaders/glob.js

@@ -1,4 +1,4 @@
-import { promises as fs, existsSync } from "node:fs";
+import { existsSync, promises as fs } from "node:fs";
 import { relative } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { bold, green } from "kleur/colors";

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

@@ -1,4 +1,4 @@
-import { promises as fs, existsSync } from "node:fs";
+import { existsSync, promises as fs } from "node:fs";
 import * as devalue from "devalue";
 import { Traverse } from "neotraverse/modern";
 import { imageSrcToImportId, importIdToSymbolName } from "../assets/utils/resolveImports.js";

package/dist/content/runtime-assets.d.ts

@@ -2,10 +2,10 @@ import type { PluginContext } from 'rollup';
 import { z } from 'zod';
 export declare function createImage(pluginContext: PluginContext, shouldEmitFile: boolean, entryFilePath: string, experimentalSvgEnabled: boolean): () => z.ZodEffects<z.ZodString, z.ZodNever | {
     ASTRO_ASSET: string;
-    width: number;
-    height: number;
     src: string;
     format: import("../assets/types.js").ImageInputFormat;
+    width: number;
+    height: number;
     fsPath: string;
     orientation?: number | undefined;
 }, string>;

package/dist/content/runtime.js

@@ -5,7 +5,6 @@ import { ZodIssueCode, z } from "zod";
 import { imageSrcToImportId } from "../assets/utils/resolveImports.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { prependForwardSlash } from "../core/path.js";
-import { defineCollection as defineCollectionOrig } from "./config.js";
 import {
   createComponent,
   createHeadAndContent,
@@ -16,6 +15,7 @@ import {
   render as serverRender,
   unescapeHTML
 } from "../runtime/server/index.js";
+import { defineCollection as defineCollectionOrig } from "./config.js";
 import { IMAGE_IMPORT_PREFIX } from "./consts.js";
 import { globalDataStore } from "./data-store.js";
 import {
@@ -41,7 +41,8 @@ function createCollectionToGlobResultMap({
 }
 const cacheHintSchema = z.object({
   tags: z.array(z.string()).optional(),
-  maxAge: z.number().optional()
+  maxAge: z.number().optional(),
+  lastModified: z.date().optional()
 });
 async function parseLiveEntry(entry, schema, collection) {
   try {
@@ -381,24 +382,37 @@ function createGetLiveCollection({
       if (processedEntries.length > 0) {
         const entryTags = /* @__PURE__ */ new Set();
         let minMaxAge;
+        let latestModified;
         for (const entry of processedEntries) {
           if (entry.cacheHint) {
             if (entry.cacheHint.tags) {
               entry.cacheHint.tags.forEach((tag) => entryTags.add(tag));
             }
             if (typeof entry.cacheHint.maxAge === "number") {
-              minMaxAge = minMaxAge === void 0 ? entry.cacheHint.maxAge : Math.min(minMaxAge, entry.cacheHint.maxAge);
+              if (minMaxAge === void 0 || entry.cacheHint.maxAge < minMaxAge) {
+                minMaxAge = entry.cacheHint.maxAge;
+              }
+            }
+            if (entry.cacheHint.lastModified instanceof Date) {
+              if (latestModified === void 0 || entry.cacheHint.lastModified > latestModified) {
+                latestModified = entry.cacheHint.lastModified;
+              }
             }
           }
         }
-        if (entryTags.size > 0 || minMaxAge !== void 0 || cacheHint) {
+        if (entryTags.size > 0 || minMaxAge !== void 0 || latestModified || cacheHint) {
           const mergedCacheHint = {};
           if (cacheHint?.tags || entryTags.size > 0) {
-            mergedCacheHint.tags = [...cacheHint?.tags || [], ...entryTags];
+            mergedCacheHint.tags = [.../* @__PURE__ */ new Set([...cacheHint?.tags || [], ...entryTags])];
           }
           if (cacheHint?.maxAge !== void 0 || minMaxAge !== void 0) {
             mergedCacheHint.maxAge = cacheHint?.maxAge !== void 0 && minMaxAge !== void 0 ? Math.min(cacheHint.maxAge, minMaxAge) : cacheHint?.maxAge ?? minMaxAge;
           }
+          if (cacheHint?.lastModified && latestModified) {
+            mergedCacheHint.lastModified = cacheHint.lastModified > latestModified ? cacheHint.lastModified : latestModified;
+          } else if (cacheHint?.lastModified || latestModified) {
+            mergedCacheHint.lastModified = cacheHint?.lastModified ?? latestModified;
+          }
           cacheHint = mergedCacheHint;
         }
       }
@@ -498,7 +512,9 @@ async function updateImageReferencesInBody(html, fileName) {
     return Object.entries({
       ...attributes,
       src: image.src,
-      srcset: image.srcSet.attribute
+      srcset: image.srcSet.attribute,
+      // This attribute is used by the toolbar audit
+      ...import.meta.env.DEV ? { "data-image-component": "true" } : {}
     }).map(([key, value]) => value ? `${key}="${escape(value)}"` : "").join(" ");
   });
 }

package/dist/content/utils.d.ts

@@ -177,7 +177,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
     schema?: any;
     _legacy?: boolean | undefined;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<"live">;
+    type: z.ZodDefault<z.ZodOptional<z.ZodLiteral<"live">>>;
     schema: z.ZodOptional<z.ZodAny>;
     loader: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>;
 }, "strip", z.ZodTypeAny, {
@@ -185,8 +185,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
     loader: (...args: unknown[]) => unknown;
     schema?: any;
 }, {
-    type: "live";
     loader: (...args: unknown[]) => unknown;
+    type?: "live" | undefined;
     schema?: any;
 }>]>;
 declare const contentConfigParser: z.ZodObject<{
@@ -334,7 +334,7 @@ declare const contentConfigParser: z.ZodObject<{
         schema?: any;
         _legacy?: boolean | undefined;
     }>, z.ZodObject<{
-        type: z.ZodLiteral<"live">;
+        type: z.ZodDefault<z.ZodOptional<z.ZodLiteral<"live">>>;
         schema: z.ZodOptional<z.ZodAny>;
         loader: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>;
     }, "strip", z.ZodTypeAny, {
@@ -342,8 +342,8 @@ declare const contentConfigParser: z.ZodObject<{
         loader: (...args: unknown[]) => unknown;
         schema?: any;
     }, {
-        type: "live";
         loader: (...args: unknown[]) => unknown;
+        type?: "live" | undefined;
         schema?: any;
     }>]>>;
 }, "strip", z.ZodTypeAny, {
@@ -410,8 +410,8 @@ declare const contentConfigParser: z.ZodObject<{
         schema?: any;
         _legacy?: boolean | undefined;
     } | {
-        type: "live";
         loader: (...args: unknown[]) => unknown;
+        type?: "live" | undefined;
         schema?: any;
     }>;
 }>;

package/dist/content/utils.js

@@ -6,7 +6,7 @@ import { slug as githubSlug } from "github-slugger";
 import { green } from "kleur/colors";
 import xxhash from "xxhash-wasm";
 import { z } from "zod";
-import { AstroError, AstroErrorData, MarkdownError, errorMap } from "../core/errors/index.js";
+import { AstroError, AstroErrorData, errorMap, MarkdownError } from "../core/errors/index.js";
 import { isYAMLException } from "../core/errors/utils.js";
 import { appendForwardSlash } from "../core/path.js";
 import { normalizePath } from "../core/viteUtils.js";
@@ -81,7 +81,7 @@ const collectionConfigParser = z.union([
     _legacy: z.boolean().optional()
   }),
   z.object({
-    type: z.literal(LIVE_CONTENT_TYPE),
+    type: z.literal(LIVE_CONTENT_TYPE).optional().default(LIVE_CONTENT_TYPE),
     schema: z.any().optional(),
     loader: z.function()
   })

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

@@ -1,2 +1,2 @@
-import type { SSRManifest, SerializedSSRManifest } from './types.js';
+import type { SerializedSSRManifest, SSRManifest } from './types.js';
 export declare function deserializeManifest(serializedManifest: SerializedSSRManifest): SSRManifest;

package/dist/core/app/index.js

@@ -1,10 +1,10 @@
 import { collapseDuplicateTrailingSlashes, hasFileExtension } from "@astrojs/internal-helpers/path";
 import { normalizeTheLocale } from "../../i18n/index.js";
 import {
+  clientAddressSymbol,
   DEFAULT_404_COMPONENT,
   REROUTABLE_STATUS_CODES,
   REROUTE_DIRECTIVE_HEADER,
-  clientAddressSymbol,
   responseSentSymbol
 } from "../constants.js";
 import { getSetCookiesFromResponse } from "../cookies/index.js";
@@ -18,8 +18,8 @@ import {
   prependForwardSlash,
   removeTrailingForwardSlash
 } from "../path.js";
-import { RenderContext } from "../render-context.js";
 import { createAssetLink } from "../render/ssr-element.js";
+import { RenderContext } from "../render-context.js";
 import { redirectTemplate } from "../routing/3xx.js";
 import { ensure404Route } from "../routing/astro-designed-error-pages.js";
 import { createDefaultRoutes } from "../routing/default.js";

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

@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { RouteData } from '../../types/public/internal.js';
-import { App } from './index.js';
 import type { RenderOptions } from './index.js';
+import { App } from './index.js';
 import type { SSRManifest } from './types.js';
 export { apply as applyPolyfills } from '../polyfill.js';
 /**

package/dist/core/build/generate.js

@@ -34,16 +34,15 @@ import { NoPrerenderedRoutesWithDomains } from "../errors/errors-data.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { NOOP_MIDDLEWARE_FN } from "../middleware/noop-middleware.js";
 import { getRedirectLocationOrThrow, routeIsRedirect } from "../redirects/index.js";
-import { RenderContext } from "../render-context.js";
 import { callGetStaticPaths } from "../render/route-cache.js";
+import { RenderContext } from "../render-context.js";
 import { createRequest } from "../request.js";
 import { redirectTemplate } from "../routing/3xx.js";
 import { matchRoute } from "../routing/match.js";
 import { stringifyParams } from "../routing/params.js";
 import { getOutputFilename } from "../util.js";
 import { getOutFile, getOutFolder } from "./common.js";
-import { hasPrerenderedPages } from "./internal.js";
-import { cssOrder, mergeInlineCss } from "./internal.js";
+import { cssOrder, hasPrerenderedPages, mergeInlineCss } from "./internal.js";
 import { BuildPipeline } from "./pipeline.js";
 import { getTimeStat, shouldAppendForwardSlash } from "./util.js";
 async function generatePages(options, internals) {

package/dist/core/build/index.js

@@ -53,7 +53,6 @@ class AstroBuilder {
   routesList;
   timer;
   teardownCompiler;
-  manifest;
   constructor(settings, options) {
     this.mode = options.mode;
     this.runtimeMode = options.runtimeMode;
@@ -62,7 +61,6 @@ class AstroBuilder {
     this.teardownCompiler = options.teardownCompiler ?? true;
     this.origin = settings.config.site ? new URL(settings.config.site).origin : `http://localhost:${settings.config.server.port}`;
     this.routesList = { routes: [] };
-    this.manifest = createDevelopmentManifest(settings);
     this.timer = {};
   }
   /** Setup Vite and run any async setup logic that couldn't run inside of the constructor. */
@@ -75,6 +73,7 @@ class AstroBuilder {
       command: "build",
       logger
     });
+    const manifest = createDevelopmentManifest(this.settings);
     this.routesList = await createRoutesList({ settings: this.settings }, this.logger);
     await runHookConfigDone({ settings: this.settings, logger, command: "build" });
     if (!this.settings.config.adapter && this.settings.buildOutput === "server") {
@@ -94,7 +93,7 @@ class AstroBuilder {
         command: "build",
         sync: false,
         routesList: this.routesList,
-        manifest: this.manifest
+        manifest
       }
     );
     const { syncInternal } = await import("../sync/index.js");
@@ -105,7 +104,7 @@ class AstroBuilder {
       fs,
       routesList: this.routesList,
       command: "build",
-      manifest: this.manifest
+      manifest
     });
     return { viteConfig };
   }

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

@@ -1,5 +1,5 @@
-import { isBuildableCSSRequest } from "../../../vite-plugin-astro-server/util.js";
 import { hasAssetPropagationFlag } from "../../../content/index.js";
+import { isBuildableCSSRequest } from "../../../vite-plugin-astro-server/util.js";
 import * as assetName from "../css-asset-name.js";
 import {
   getParentExtendedModuleInfos,

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

@@ -1,2 +1,2 @@
-export { compile } from './compile.js';
 export type { CompileProps, CompileResult } from './compile.js';
+export { compile } from './compile.js';

package/dist/core/config/schemas/base.d.ts

@@ -1,5 +1,5 @@
 import type { OutgoingHttpHeaders } from 'node:http';
-import type { ShikiConfig, RehypePlugin as _RehypePlugin, RemarkPlugin as _RemarkPlugin, RemarkRehype as _RemarkRehype } from '@astrojs/markdown-remark';
+import type { RehypePlugin as _RehypePlugin, RemarkPlugin as _RemarkPlugin, RemarkRehype as _RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';
 import { z } from 'zod';
 import type { ViteUserConfig } from '../../../types/public/config.js';
 /** @lintignore */

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

@@ -1,3 +1,3 @@
-export { AstroConfigSchema, ASTRO_CONFIG_DEFAULTS, type AstroConfigType, } from './base.js';
-export { createRelativeSchema } from './relative.js';
+export { ASTRO_CONFIG_DEFAULTS, AstroConfigSchema, type AstroConfigType, } from './base.js';
 export { AstroConfigRefinedSchema } from './refined.js';
+export { createRelativeSchema } from './relative.js';

package/dist/core/config/schemas/index.js

@@ -1,9 +1,9 @@
 import {
-  AstroConfigSchema,
-  ASTRO_CONFIG_DEFAULTS
+  ASTRO_CONFIG_DEFAULTS,
+  AstroConfigSchema
 } from "./base.js";
-import { createRelativeSchema } from "./relative.js";
 import { AstroConfigRefinedSchema } from "./refined.js";
+import { createRelativeSchema } from "./relative.js";
 export {
   ASTRO_CONFIG_DEFAULTS,
   AstroConfigRefinedSchema,

package/dist/core/config/settings.js

@@ -5,9 +5,9 @@ import { getContentPaths } from "../../content/index.js";
 import createPreferences from "../../preferences/index.js";
 import { markdownContentEntryType } from "../../vite-plugin-markdown/content-entry-type.js";
 import { getDefaultClientDirectives } from "../client-directive/index.js";
+import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { formatYAMLException, isYAMLException } from "../errors/utils.js";
-import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
 import { AstroTimer } from "./timer.js";
 import { loadTSConfig } from "./tsconfig.js";
 function createBaseSettings(config) {