astro 6.1.3 → 6.1.5

package/dist/assets/consts.d.ts

@@ -1,6 +1,8 @@
 export declare const VIRTUAL_MODULE_ID = "astro:assets";
 export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
 export declare const VIRTUAL_SERVICE_ID = "virtual:image-service";
+export declare const VIRTUAL_GET_IMAGE_ID = "virtual:astro:get-image";
+export declare const RESOLVED_VIRTUAL_GET_IMAGE_ID: string;
 export declare const VIRTUAL_IMAGE_STYLES_ID = "virtual:astro:image-styles.css";
 export declare const RESOLVED_VIRTUAL_IMAGE_STYLES_ID: string;
 export declare const VALID_INPUT_FORMATS: readonly ["jpeg", "jpg", "png", "tiff", "webp", "gif", "svg", "avif"];

package/dist/assets/consts.js

@@ -1,6 +1,8 @@
 const VIRTUAL_MODULE_ID = "astro:assets";
 const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 const VIRTUAL_SERVICE_ID = "virtual:image-service";
+const VIRTUAL_GET_IMAGE_ID = "virtual:astro:get-image";
+const RESOLVED_VIRTUAL_GET_IMAGE_ID = "\0" + VIRTUAL_GET_IMAGE_ID;
 const VIRTUAL_IMAGE_STYLES_ID = "virtual:astro:image-styles.css";
 const RESOLVED_VIRTUAL_IMAGE_STYLES_ID = "\0" + VIRTUAL_IMAGE_STYLES_ID;
 const VALID_INPUT_FORMATS = [
@@ -38,11 +40,13 @@ const DEFAULT_HASH_PROPS = [
 export {
   DEFAULT_HASH_PROPS,
   DEFAULT_OUTPUT_FORMAT,
+  RESOLVED_VIRTUAL_GET_IMAGE_ID,
   RESOLVED_VIRTUAL_IMAGE_STYLES_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
   VALID_INPUT_FORMATS,
   VALID_OUTPUT_FORMATS,
   VALID_SUPPORTED_FORMATS,
+  VIRTUAL_GET_IMAGE_ID,
   VIRTUAL_IMAGE_STYLES_ID,
   VIRTUAL_MODULE_ID,
   VIRTUAL_SERVICE_ID

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

@@ -4,7 +4,7 @@
  *
  * If some functions don't need to be exposed, just import the file that contains the functions.
  */
-export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from '@astrojs/internal-helpers/remote';
+export { isRemoteAllowed, matchPattern, type RemotePattern, } from '@astrojs/internal-helpers/remote';
 export { emitClientAsset } from './assets.js';
 export { isESMImportedImage, isRemoteImage, resolveSrc } from './imageKind.js';
 export { imageMetadata } from './metadata.js';

package/dist/assets/utils/index.js

@@ -1,10 +1,6 @@
 import {
   isRemoteAllowed,
-  matchHostname,
-  matchPathname,
-  matchPattern,
-  matchPort,
-  matchProtocol
+  matchPattern
 } from "@astrojs/internal-helpers/remote";
 import { emitClientAsset } from "./assets.js";
 import { isESMImportedImage, isRemoteImage, resolveSrc } from "./imageKind.js";
@@ -19,10 +15,6 @@ export {
   isESMImportedImage,
   isRemoteAllowed,
   isRemoteImage,
-  matchHostname,
-  matchPathname,
   matchPattern,
-  matchPort,
-  matchProtocol,
   resolveSrc
 };

package/dist/assets/utils/vendor/image-size/utils/bit-reader.d.ts

@@ -1,9 +1,9 @@
 /** This class helps read Uint8Array bit-by-bit */
 export declare class BitReader {
-    private readonly input;
-    private readonly endianness;
     private byteOffset;
     private bitOffset;
+    private readonly input;
+    private readonly endianness;
     constructor(input: Uint8Array, endianness: 'big-endian' | 'little-endian');
     /** Reads a specified number of bits, and move the offset */
     getBits(length?: number): number;

package/dist/assets/utils/vendor/image-size/utils/bit-reader.js

@@ -1,11 +1,13 @@
 class BitReader {
+  // Skip the first 16 bits (2 bytes) of signature
+  byteOffset = 2;
+  bitOffset = 0;
+  input;
+  endianness;
   constructor(input, endianness) {
     this.input = input;
     this.endianness = endianness;
   }
-  // Skip the first 16 bits (2 bytes) of signature
-  byteOffset = 2;
-  bitOffset = 0;
   /** Reads a specified number of bits, and move the offset */
   getBits(length = 1) {
     let result = 0;

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

@@ -13,9 +13,11 @@ import { normalizePath } from "../core/viteUtils.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../core/constants.js";
 import { isAstroServerEnvironment } from "../environments.js";
 import {
+  RESOLVED_VIRTUAL_GET_IMAGE_ID,
   RESOLVED_VIRTUAL_IMAGE_STYLES_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
   VALID_INPUT_FORMATS,
+  VIRTUAL_GET_IMAGE_ID,
   VIRTUAL_IMAGE_STYLES_ID,
   VIRTUAL_MODULE_ID,
   VIRTUAL_SERVICE_ID
@@ -99,7 +101,7 @@ function assets({ fs, settings, sync, logger }) {
       },
       resolveId: {
         filter: {
-          id: new RegExp(`^(${VIRTUAL_SERVICE_ID}|${VIRTUAL_MODULE_ID})$`)
+          id: new RegExp(`^(${VIRTUAL_SERVICE_ID}|${VIRTUAL_MODULE_ID}|${VIRTUAL_GET_IMAGE_ID})$`)
         },
         async handler(id) {
           if (id === VIRTUAL_SERVICE_ID) {
@@ -111,13 +113,41 @@ function assets({ fs, settings, sync, logger }) {
           if (id === VIRTUAL_MODULE_ID) {
             return RESOLVED_VIRTUAL_MODULE_ID;
           }
+          if (id === VIRTUAL_GET_IMAGE_ID) {
+            return RESOLVED_VIRTUAL_GET_IMAGE_ID;
+          }
         }
       },
       load: {
         filter: {
-          id: new RegExp(`^(${RESOLVED_VIRTUAL_MODULE_ID})$`)
+          id: new RegExp(`^(${RESOLVED_VIRTUAL_MODULE_ID}|${RESOLVED_VIRTUAL_GET_IMAGE_ID})$`)
         },
-        handler() {
+        handler(id) {
+          if (id === RESOLVED_VIRTUAL_GET_IMAGE_ID) {
+            const isServerEnvironment2 = isAstroServerEnvironment(this.environment);
+            const getImageExport2 = isServerEnvironment2 ? `import { getImage as getImageInternal } from "astro/assets";
+								export const getImage = async (options) => await getImageInternal(options, imageConfig);` : `import { AstroError, AstroErrorData } from "astro/errors";
+								export const getImage = async () => {
+									throw new AstroError(
+										AstroErrorData.GetImageNotUsedOnServer.message,
+										AstroErrorData.GetImageNotUsedOnServer.hint,
+									);
+								};`;
+            const assetQueryParams = settings.adapter?.client?.assetQueryParams ? `new URLSearchParams(${JSON.stringify(
+              Array.from(settings.adapter.client.assetQueryParams.entries())
+            )})` : "undefined";
+            return {
+              code: `
+								export const imageConfig = ${JSON.stringify(settings.config.image)};
+								Object.defineProperty(imageConfig, 'assetQueryParams', {
+									value: ${assetQueryParams},
+									enumerable: false,
+									configurable: true,
+								});
+								${getImageExport2}
+							`
+            };
+          }
           const isServerEnvironment = isAstroServerEnvironment(this.environment);
           const getImageExport = isServerEnvironment ? `import { getImage as getImageInternal } from "astro/assets";
 							export const getImage = async (options) => await getImageInternal(options, imageConfig);` : `import { AstroError, AstroErrorData } from "astro/errors";

package/dist/cli/add/index.js

@@ -1,5 +1,4 @@
 import fsMod, { existsSync, promises as fs } from "node:fs";
-import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import * as clack from "@clack/prompts";
@@ -170,7 +169,7 @@ async function add(names, { flags }) {
     return null;
   }
   switch (installResult) {
-    case 1 /* updated */: {
+    case "updated": {
       if (hasCloudflareIntegration) {
         const wranglerConfigURL = new URL("./wrangler.jsonc", configURL);
         if (!existsSync(wranglerConfigURL)) {
@@ -182,16 +181,7 @@ async function add(names, { flags }) {
           );
           if (await askToContinue({ flags, logger })) {
             const data = await getPackageJson();
-            let compatibilityDate;
-            try {
-              const require2 = createRequire(root);
-              const { getLocalWorkerdCompatibilityDate } = await import(require2.resolve("@astrojs/cloudflare/info"));
-              ({ date: compatibilityDate } = getLocalWorkerdCompatibilityDate({
-                projectPath: rootPath
-              }));
-            } catch {
-              compatibilityDate = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-            }
+            let compatibilityDate = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
             await fs.writeFile(
               wranglerConfigURL,
               STUBS.CLOUDFLARE_WRANGLER_CONFIG(data?.name ?? "example", compatibilityDate),
@@ -332,7 +322,7 @@ ${gitignoreEntry}
       }
       break;
     }
-    case 2 /* cancelled */: {
+    case "cancelled": {
       logger.info(
         "SKIP_FORMAT",
         msg.cancelled(
@@ -342,10 +332,10 @@ ${gitignoreEntry}
       );
       break;
     }
-    case 3 /* failure */: {
+    case "failure": {
       throw createPrettyError(new Error(`Unable to install dependencies`));
     }
-    case 0 /* none */:
+    case "none":
       break;
   }
   let mod;
@@ -402,14 +392,14 @@ ${gitignoreEntry}
     }
   }
   switch (configResult) {
-    case 2 /* cancelled */: {
+    case "cancelled": {
       logger.info(
         "SKIP_FORMAT",
         msg.cancelled(`Your configuration has ${bold("NOT")} been updated.`)
       );
       break;
     }
-    case 0 /* none */: {
+    case "none": {
       const data = await getPackageJson();
       if (data) {
         const { dependencies = {}, devDependencies = {} } = data;
@@ -426,9 +416,9 @@ ${gitignoreEntry}
       break;
     }
     // NOTE: failure shouldn't happen in practice because `updateAstroConfig` doesn't return that.
-    // Pipe this to the same handling as `UpdateResult.updated` for now.
-    case 3 /* failure */:
-    case 1 /* updated */:
+    // Pipe this to the same handling as `'updated'` for now.
+    case "failure":
+    case "updated":
     case void 0: {
       const list = integrations.map((integration) => `  - ${integration.integrationName}`).join("\n");
       logger.info(
@@ -461,22 +451,22 @@ ${list}`
     addIncludes: hasCloudflareIntegration ? ["./worker-configuration.d.ts"] : []
   });
   switch (updateTSConfigResult) {
-    case 0 /* none */: {
+    case "none": {
       break;
     }
-    case 2 /* cancelled */: {
+    case "cancelled": {
       logger.info(
         "SKIP_FORMAT",
         msg.cancelled(`Your TypeScript configuration has ${bold("NOT")} been updated.`)
       );
       break;
     }
-    case 3 /* failure */: {
+    case "failure": {
       throw new Error(
         `Unknown error parsing tsconfig.json or jsconfig.json. Could not update TypeScript settings.`
       );
     }
-    case 1 /* updated */:
+    case "updated":
       logger.info("SKIP_FORMAT", msg.success(`Successfully updated tsconfig`));
   }
 }
@@ -548,13 +538,6 @@ function setAdapter(mod, adapter, exportName) {
       break;
   }
 }
-var UpdateResult = /* @__PURE__ */ ((UpdateResult2) => {
-  UpdateResult2[UpdateResult2["none"] = 0] = "none";
-  UpdateResult2[UpdateResult2["updated"] = 1] = "updated";
-  UpdateResult2[UpdateResult2["cancelled"] = 2] = "cancelled";
-  UpdateResult2[UpdateResult2["failure"] = 3] = "failure";
-  return UpdateResult2;
-})(UpdateResult || {});
 async function updateAstroConfig({
   configURL,
   mod,
@@ -571,11 +554,11 @@ async function updateAstroConfig({
     }
   }).code;
   if (input === output) {
-    return 0 /* none */;
+    return "none";
   }
   const diff = getDiffContent(input, output);
   if (!diff) {
-    return 0 /* none */;
+    return "none";
   }
   logger.info(
     "SKIP_FORMAT",
@@ -602,9 +585,9 @@ async function updateAstroConfig({
   if (await askToContinue({ flags, logger })) {
     await fs.writeFile(fileURLToPath(configURL), output, { encoding: "utf-8" });
     logger.debug("add", `Updated astro config`);
-    return 1 /* updated */;
+    return "updated";
   } else {
-    return 2 /* cancelled */;
+    return "cancelled";
   }
 }
 async function updatePackageJsonOverrides({
@@ -616,7 +599,7 @@ async function updatePackageJsonOverrides({
   const pkgURL = new URL("./package.json", configURL);
   if (!existsSync(pkgURL)) {
     logger.debug("add", "No package.json found, skipping overrides update");
-    return 0 /* none */;
+    return "none";
   }
   const pkgPath = fileURLToPath(pkgURL);
   const input = await fs.readFile(pkgPath, { encoding: "utf-8" });
@@ -630,12 +613,12 @@ async function updatePackageJsonOverrides({
     }
   }
   if (!hasChanges) {
-    return 0 /* none */;
+    return "none";
   }
   const output = JSON.stringify(pkgJson, null, 2);
   const diff = getDiffContent(input, output);
   if (!diff) {
-    return 0 /* none */;
+    return "none";
   }
   logger.info(
     "SKIP_FORMAT",
@@ -650,9 +633,9 @@ async function updatePackageJsonOverrides({
   if (await askToContinue({ flags, logger })) {
     await fs.writeFile(pkgPath, output, { encoding: "utf-8" });
     logger.debug("add", "Updated package.json overrides");
-    return 1 /* updated */;
+    return "updated";
   } else {
-    return 2 /* cancelled */;
+    return "cancelled";
   }
 }
 async function updatePackageJsonScripts({
@@ -664,7 +647,7 @@ async function updatePackageJsonScripts({
   const pkgURL = new URL("./package.json", configURL);
   if (!existsSync(pkgURL)) {
     logger.debug("add", "No package.json found, skipping scripts update");
-    return 0 /* none */;
+    return "none";
   }
   const pkgPath = fileURLToPath(pkgURL);
   const input = await fs.readFile(pkgPath, { encoding: "utf-8" });
@@ -678,12 +661,12 @@ async function updatePackageJsonScripts({
     }
   }
   if (!hasChanges) {
-    return 0 /* none */;
+    return "none";
   }
   const output = JSON.stringify(pkgJson, null, 2);
   const diff = getDiffContent(input, output);
   if (!diff) {
-    return 0 /* none */;
+    return "none";
   }
   logger.info(
     "SKIP_FORMAT",
@@ -698,9 +681,9 @@ async function updatePackageJsonScripts({
   if (await askToContinue({ flags, logger })) {
     await fs.writeFile(pkgPath, output, { encoding: "utf-8" });
     logger.debug("add", "Updated package.json scripts");
-    return 1 /* updated */;
+    return "updated";
   } else {
-    return 2 /* cancelled */;
+    return "cancelled";
   }
 }
 async function convertIntegrationsToInstallSpecifiers(integrations) {
@@ -744,7 +727,7 @@ async function tryToInstallIntegrations({
     strategies: ["install-metadata", "lockfile", "packageManager-field"]
   });
   logger.debug("add", `package manager: "${packageManager?.name}"`);
-  if (!packageManager) return 0 /* none */;
+  if (!packageManager) return "none";
   const inheritedFlags = Object.entries(flags).map(([flag]) => {
     if (flag === "_") return;
     if (INHERITED_FLAGS.has(flag)) {
@@ -753,7 +736,7 @@ async function tryToInstallIntegrations({
     }
   }).filter(Boolean).flat();
   const installCommand = resolveCommand(packageManager?.agent ?? "npm", "add", inheritedFlags);
-  if (!installCommand) return 0 /* none */;
+  if (!installCommand) return "none";
   const installSpecifiers = await convertIntegrationsToInstallSpecifiers(integrations).then(
     (specifiers) => installCommand.command === "deno" ? specifiers.map((specifier) => `npm:${specifier}`) : specifiers
   );
@@ -783,15 +766,15 @@ async function tryToInstallIntegrations({
         }
       });
       spinner.stop("Dependencies installed.");
-      return 1 /* updated */;
+      return "updated";
     } catch (err) {
       spinner.error("Error installing dependencies.");
       logger.debug("add", "Error installing dependencies", err);
       console.error("\n", err.stdout || err.message, "\n");
-      return 3 /* failure */;
+      return "failure";
     }
   } else {
-    return 2 /* cancelled */;
+    return "cancelled";
   }
 }
 async function validateIntegrations(integrations, flags, logger) {
@@ -911,12 +894,12 @@ async function updateTSConfig(cwd = process.cwd(), logger, integrationsInfo, fla
     (integration) => presets.has(integration)
   );
   if (!firstIntegrationWithTSSettings && includesToAppend.length === 0) {
-    return 0 /* none */;
+    return "none";
   }
   let inputConfig = await loadTSConfig(cwd);
   let inputConfigText = "";
   if (inputConfig === "invalid-config" || inputConfig === "unknown-error") {
-    return 3 /* failure */;
+    return "failure";
   } else if (inputConfig === "missing-config") {
     logger.debug("add", "Couldn't find tsconfig.json or jsconfig.json, generating one");
     inputConfig = {
@@ -938,7 +921,7 @@ async function updateTSConfig(cwd = process.cwd(), logger, integrationsInfo, fla
   const output = JSON.stringify(outputConfig, null, 2);
   const diff = getDiffContent(inputConfigText, output);
   if (!diff) {
-    return 0 /* none */;
+    return "none";
   }
   logger.info(
     "SKIP_FORMAT",
@@ -975,9 +958,9 @@ async function updateTSConfig(cwd = process.cwd(), logger, integrationsInfo, fla
       encoding: "utf-8"
     });
     logger.debug("add", `Updated ${configFileName} file`);
-    return 1 /* updated */;
+    return "updated";
   } else {
-    return 2 /* cancelled */;
+    return "cancelled";
   }
 }
 function parseIntegrationName(spec) {

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

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.1.3";
+  version = "6.1.5";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/cli/preferences/index.js

@@ -1,6 +1,5 @@
 import { fileURLToPath } from "node:url";
 import { formatWithOptions } from "node:util";
-import dlv from "dlv";
 import { flattie } from "flattie";
 import colors from "piccolore";
 import { resolveConfig } from "../../core/config/config.js";
@@ -8,6 +7,7 @@ import { createSettings } from "../../core/config/settings.js";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
 import * as msg from "../../core/messages/runtime.js";
 import { DEFAULT_PREFERENCES } from "../../preferences/defaults.js";
+import dlv from "../../preferences/dlv.js";
 import { coerce, isValidKey } from "../../preferences/index.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 const { bgGreen, black, bold, dim, yellow } = colors;

package/dist/content/content-layer.js

@@ -192,7 +192,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.1.3") {
+    if (previousAstroVersion && previousAstroVersion !== "6.1.5") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -200,8 +200,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.1.3") {
-      this.#store.metaStore().set("astro-version", "6.1.3");
+    if ("6.1.5") {
+      this.#store.metaStore().set("astro-version", "6.1.5");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

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

@@ -2,8 +2,8 @@ import type * as z from 'zod/v4/core';
 export declare class LiveCollectionError extends Error {
     readonly collection: string;
     readonly message: string;
-    readonly cause?: Error | undefined;
-    constructor(collection: string, message: string, cause?: Error | undefined);
+    readonly cause?: Error;
+    constructor(collection: string, message: string, cause?: Error);
     static is(error: unknown): error is LiveCollectionError;
 }
 export declare class LiveEntryNotFoundError extends LiveCollectionError {

package/dist/content/loaders/errors.js

@@ -2,6 +2,9 @@ function formatZodError(error) {
   return error.issues.map((issue) => `  **${issue.path.join(".")}**: ${issue.message}`);
 }
 class LiveCollectionError extends Error {
+  collection;
+  message;
+  cause;
   constructor(collection, message, cause) {
     super(message);
     this.collection = collection;

package/dist/content/runtime.js

@@ -318,7 +318,7 @@ const CONTENT_LAYER_IMAGE_REGEX = /__ASTRO_IMAGE_="([^"]+)"/g;
 async function updateImageReferencesInBody(html, fileName) {
   const { default: imageAssetMap } = await import("astro:asset-imports");
   const imageObjects = /* @__PURE__ */ new Map();
-  const { getImage } = await import("astro:assets");
+  const { getImage } = await import("virtual:astro:get-image");
   for (const [_full, imagePath] of html.matchAll(CONTENT_LAYER_IMAGE_REGEX)) {
     try {
       const decodedImagePath = JSON.parse(imagePath.replaceAll(""", '"'));

package/dist/core/app/base.js

@@ -8,7 +8,7 @@ import {
   prependForwardSlash,
   removeTrailingForwardSlash
 } from "@astrojs/internal-helpers/path";
-import { matchPattern } from "../../assets/utils/index.js";
+import { matchPattern } from "@astrojs/internal-helpers/remote";
 import { normalizeTheLocale } from "../../i18n/index.js";
 import {
   clientAddressSymbol,

package/dist/core/base-pipeline.d.ts

@@ -8,6 +8,7 @@ import type { ServerIslandMappings } from './app/types.js';
 import type { SinglePageBuiltModule } from './build/types.js';
 import type { Logger } from './logger/core.js';
 import { RouteCache } from './render/route-cache.js';
+import { type DefaultRouteParams } from './routing/default.js';
 import type { CacheProvider, CacheProviderFactory } from './cache/types.js';
 import type { CompiledCacheRoute } from './cache/runtime/route-matching.js';
 import type { SessionDriverFactory } from './session/types.js';
@@ -20,6 +21,14 @@ import { HTMLStringCache } from '../runtime/server/html-string-cache.js';
  * Thus, a `Pipeline` is created once at process start and then used by every `RenderContext`.
  */
 export declare abstract class Pipeline {
+    readonly internalMiddleware: MiddlewareHandler[];
+    resolvedMiddleware: MiddlewareHandler | undefined;
+    resolvedActions: SSRActions | undefined;
+    resolvedSessionDriver: SessionDriverFactory | null | undefined;
+    resolvedCacheProvider: CacheProvider | null | undefined;
+    compiledCacheRoutes: CompiledCacheRoute[] | undefined;
+    nodePool: NodePool | undefined;
+    htmlStringCache: HTMLStringCache | undefined;
     readonly logger: Logger;
     readonly manifest: SSRManifest;
     /**
@@ -32,12 +41,12 @@ export declare abstract class Pipeline {
     /**
      * Used to provide better error messages for `Astro.clientAddress`
      */
-    readonly adapterName: string;
-    readonly clientDirectives: Map<string, string>;
-    readonly inlinedScripts: Map<string, string>;
-    readonly compressHTML: boolean;
-    readonly i18n: import("./app/types.js").SSRManifestI18n | undefined;
-    readonly middleware: (() => Promise<import("../types/public/common.js").AstroMiddlewareInstance> | import("../types/public/common.js").AstroMiddlewareInstance) | undefined;
+    readonly adapterName: SSRManifest['adapterName'];
+    readonly clientDirectives: SSRManifest['clientDirectives'];
+    readonly inlinedScripts: SSRManifest['inlinedScripts'];
+    readonly compressHTML: SSRManifest['compressHTML'];
+    readonly i18n: SSRManifest['i18n'];
+    readonly middleware: SSRManifest['middleware'];
     readonly routeCache: RouteCache;
     /**
      * Used for `Astro.site`.
@@ -47,29 +56,12 @@ export declare abstract class Pipeline {
      * Array of built-in, internal, routes.
      * Used to find the route module
      */
-    readonly defaultRoutes: {
-        instance: ComponentInstance;
-        matchesComponent(filePath: URL): boolean;
-        route: string;
-        component: string;
-    }[];
-    readonly actions: (() => Promise<SSRActions> | SSRActions) | undefined;
-    readonly sessionDriver: (() => Promise<{
-        default: SessionDriverFactory | null;
-    }>) | undefined;
-    readonly cacheProvider: (() => Promise<{
-        default: CacheProviderFactory | null;
-    }>) | undefined;
-    readonly cacheConfig: import("./cache/types.js").SSRManifestCache | undefined;
-    readonly serverIslands: (() => Promise<ServerIslandMappings> | ServerIslandMappings) | undefined;
-    readonly internalMiddleware: MiddlewareHandler[];
-    resolvedMiddleware: MiddlewareHandler | undefined;
-    resolvedActions: SSRActions | undefined;
-    resolvedSessionDriver: SessionDriverFactory | null | undefined;
-    resolvedCacheProvider: CacheProvider | null | undefined;
-    compiledCacheRoutes: CompiledCacheRoute[] | undefined;
-    nodePool: NodePool | undefined;
-    htmlStringCache: HTMLStringCache | undefined;
+    readonly defaultRoutes: Array<DefaultRouteParams>;
+    readonly actions: SSRManifest['actions'];
+    readonly sessionDriver: SSRManifest['sessionDriver'];
+    readonly cacheProvider: SSRManifest['cacheProvider'];
+    readonly cacheConfig: SSRManifest['cacheConfig'];
+    readonly serverIslands: SSRManifest['serverIslandMappings'];
     constructor(logger: Logger, manifest: SSRManifest, 
     /**
      * "development" or "production" only
@@ -87,12 +79,7 @@ export declare abstract class Pipeline {
      * Array of built-in, internal, routes.
      * Used to find the route module
      */
-    defaultRoutes?: {
-        instance: ComponentInstance;
-        matchesComponent(filePath: URL): boolean;
-        route: string;
-        component: string;
-    }[], actions?: (() => Promise<SSRActions> | SSRActions) | undefined, sessionDriver?: (() => Promise<{
+    defaultRoutes?: DefaultRouteParams[], actions?: (() => Promise<SSRActions> | SSRActions) | undefined, sessionDriver?: (() => Promise<{
         default: SessionDriverFactory | null;
     }>) | undefined, cacheProvider?: (() => Promise<{
         default: CacheProviderFactory | null;