astro 6.1.2 → 6.1.4

package/dist/actions/integration.js

@@ -1,6 +1,6 @@
 import { AstroError } from "../core/errors/errors.js";
 import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
-import { hasNonPrerenderedProjectRoute } from "../core/routing/helpers.js";
+import { hasNonPrerenderedRoute } from "../core/routing/helpers.js";
 import { viteID } from "../core/util.js";
 import { ACTION_RPC_ROUTE_PATTERN, ACTIONS_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
 function astroIntegrationActionsRouteHandler({
@@ -30,7 +30,7 @@ function astroIntegrationActionsRouteHandler({
         });
       },
       "astro:routes:resolved": ({ routes }) => {
-        if (!hasNonPrerenderedProjectRoute(routes)) {
+        if (!hasNonPrerenderedRoute(routes)) {
           const error = new AstroError(ActionsWithoutServerOutputError);
           error.stack = void 0;
           throw error;

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/cli/add/index.js

@@ -170,7 +170,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)) {
@@ -332,7 +332,7 @@ ${gitignoreEntry}
       }
       break;
     }
-    case 2 /* cancelled */: {
+    case "cancelled": {
       logger.info(
         "SKIP_FORMAT",
         msg.cancelled(
@@ -342,10 +342,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 +402,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 +426,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 +461,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 +548,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 +564,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 +595,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 +609,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 +623,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 +643,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 +657,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 +671,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 +691,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 +737,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 +746,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 +776,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 +904,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 +931,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 +968,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.2";
+  version = "6.1.4";
 }
 export {
   BuildTimeAstroVersionProvider

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.2") {
+    if (previousAstroVersion && previousAstroVersion !== "6.1.4") {
       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.2") {
-      this.#store.metaStore().set("astro-version", "6.1.2");
+    if ("6.1.4") {
+      this.#store.metaStore().set("astro-version", "6.1.4");
     }
     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/loaders/glob.js

@@ -242,8 +242,12 @@ function glob(globOptions) {
         const entryType = configForFile(changedPath);
         const baseUrl = pathToFileURL(basePath);
         const oldId = fileToIdMap.get(changedPath);
-        await syncData(entry, baseUrl, entryType, oldId);
-        logger.info(`Reloaded data from ${colors.green(entry)}`);
+        try {
+          await syncData(entry, baseUrl, entryType, oldId);
+          logger.info(`Reloaded data from ${colors.green(entry)}`);
+        } catch (e) {
+          logger.error(`Failed to reload ${entry}: ${e.message}`);
+        }
       }
       watcher.on("change", onChange);
       watcher.on("add", onChange);

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

@@ -35,15 +35,18 @@ class MutableDataStore extends ImmutableDataStore {
     if (collection) {
       collection.delete(String(key));
       this.#saveToDiskDebounced();
+      this.#writeAssetsImportsDebounced();
     }
   }
   clear(collectionName) {
     this._collections.delete(collectionName);
     this.#saveToDiskDebounced();
+    this.#writeAssetsImportsDebounced();
   }
   clearAll() {
     this._collections.clear();
     this.#saveToDiskDebounced();
+    this.#writeAssetsImportsDebounced();
   }
   addAssetImport(assetImport, filePath) {
     const id = imageSrcToImportId(assetImport, filePath);
@@ -62,8 +65,31 @@ class MutableDataStore extends ImmutableDataStore {
       this.#writeModulesImportsDebounced();
     }
   }
+  /**
+   * Rebuilds #assetImports from the current entries in _collections.
+   * This ensures stale import IDs are removed when entries are updated or deleted,
+   * preventing unrecoverable ImageNotFound errors in astro dev after a content entry's
+   * image path is temporarily set to an invalid value and then restored.
+   */
+  #rebuildAssetImports() {
+    this.#assetImports.clear();
+    for (const collection of this._collections.values()) {
+      for (const entry of collection.values()) {
+        const typedEntry = entry;
+        if (typedEntry.assetImports?.length) {
+          for (const assetImport of typedEntry.assetImports) {
+            const id = imageSrcToImportId(assetImport, typedEntry.filePath);
+            if (id) {
+              this.#assetImports.add(id);
+            }
+          }
+        }
+      }
+    }
+  }
   async writeAssetImports(filePath) {
     this.#assetsFile = filePath;
+    this.#rebuildAssetImports();
     if (this.#assetImports.size === 0) {
       try {
         await this.#writeFileAtomic(filePath, "export default new Map();");

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/app/dev/pipeline.js

@@ -42,6 +42,10 @@ class NonRunnablePipeline extends Pipeline {
     return pipeline;
   }
   async headElements(routeData) {
+    const { componentMetadataEntries } = await import("virtual:astro:component-metadata");
+    for (const [id, entry] of componentMetadataEntries) {
+      this.manifest.componentMetadata.set(id, entry);
+    }
     const { assetsPrefix, base } = this.manifest;
     const routeInfo = this.manifest.routes.find((route) => route.routeData === routeData);
     const links = /* @__PURE__ */ new Set();

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;

package/dist/core/base-pipeline.js

@@ -11,6 +11,47 @@ import { createDefaultRoutes } from "./routing/default.js";
 import { NodePool } from "../runtime/server/render/queue/pool.js";
 import { HTMLStringCache } from "../runtime/server/html-string-cache.js";
 class Pipeline {
+  internalMiddleware;
+  resolvedMiddleware = void 0;
+  resolvedActions = void 0;
+  resolvedSessionDriver = void 0;
+  resolvedCacheProvider = void 0;
+  compiledCacheRoutes = void 0;
+  nodePool;
+  htmlStringCache;
+  logger;
+  manifest;
+  /**
+   * "development" or "production" only
+   */
+  runtimeMode;
+  renderers;
+  resolve;
+  streaming;
+  /**
+   * Used to provide better error messages for `Astro.clientAddress`
+   */
+  adapterName;
+  clientDirectives;
+  inlinedScripts;
+  compressHTML;
+  i18n;
+  middleware;
+  routeCache;
+  /**
+   * Used for `Astro.site`.
+   */
+  site;
+  /**
+   * Array of built-in, internal, routes.
+   * Used to find the route module
+   */
+  defaultRoutes;
+  actions;
+  sessionDriver;
+  cacheProvider;
+  cacheConfig;
+  serverIslands;
   constructor(logger, manifest, runtimeMode, renderers, resolve, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, inlinedScripts = manifest.inlinedScripts, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, runtimeMode), site = manifest.site ? new URL(manifest.site) : void 0, defaultRoutes = createDefaultRoutes(manifest), actions = manifest.actions, sessionDriver = manifest.sessionDriver, cacheProvider = manifest.cacheProvider, cacheConfig = manifest.cacheConfig, serverIslands = manifest.serverIslandMappings) {
     this.logger = logger;
     this.manifest = manifest;
@@ -48,14 +89,6 @@ class Pipeline {
       }
     }
   }
-  internalMiddleware;
-  resolvedMiddleware = void 0;
-  resolvedActions = void 0;
-  resolvedSessionDriver = void 0;
-  resolvedCacheProvider = void 0;
-  compiledCacheRoutes = void 0;
-  nodePool;
-  htmlStringCache;
   /**
    * Resolves the middleware from the manifest, and returns the `onRequest` function. If `onRequest` isn't there,
    * it returns a no-op function

package/dist/core/build/generate.js

@@ -9,7 +9,9 @@ import {
   prepareAssetsGenerationEnv
 } from "../../assets/build/generate.js";
 import {
+  appendForwardSlash,
   collapseDuplicateTrailingSlashes,
+  hasFileExtension,
   joinPaths,
   removeLeadingForwardSlash,
   removeTrailingForwardSlash,
@@ -359,7 +361,13 @@ function getUrlForPath(pathname, base, origin, format, trailingSlash, routeType)
     }
   } else if (routeType === "endpoint") {
     const buildPathRelative = removeLeadingForwardSlash(pathname);
-    buildPathname = joinPaths(base, buildPathRelative);
+    let endpointPathname = joinPaths(base, buildPathRelative);
+    if (trailingSlash === "always" && !hasFileExtension(pathname)) {
+      endpointPathname = appendForwardSlash(endpointPathname);
+    } else if (trailingSlash === "never") {
+      endpointPathname = removeTrailingForwardSlash(endpointPathname);
+    }
+    buildPathname = endpointPathname;
   } else {
     const buildPathRelative = removeTrailingForwardSlash(removeLeadingForwardSlash(pathname)) + ending;
     buildPathname = joinPaths(base, buildPathRelative);