astro 4.0.5 → 4.0.6

package/components/Picture.astro

@@ -1,7 +1,7 @@
 ---
 import { getImage, type LocalImageProps, type RemoteImageProps } from 'astro:assets';
 import type { GetImageResult, ImageOutputFormat } from '../dist/@types/astro';
-import { isESMImportedImage } from '../dist/assets/internal';
+import { isESMImportedImage } from '../dist/assets/utils/imageKind';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type { HTMLAttributes } from '../types';
 

package/dist/assets/build/generate.js

@@ -5,7 +5,8 @@ import { getOutDirWithinCwd } from "../../core/build/common.js";
 import { getTimeStat } from "../../core/build/util.js";
 import { isRemotePath, prependForwardSlash } from "../../core/path.js";
 import { isServerLikeOutput } from "../../prerender/utils.js";
-import { getConfiguredImageService, isESMImportedImage } from "../internal.js";
+import { getConfiguredImageService } from "../internal.js";
+import { isESMImportedImage } from "../utils/imageKind.js";
 import { loadRemoteImage } from "./remote.js";
 async function prepareAssetsGenerationEnv(pipeline, totalCount) {
   const config = pipeline.getConfig();

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

@@ -0,0 +1,2 @@
+import type { AstroSettings } from '../../@types/astro.js';
+export declare function injectImageEndpoint(settings: AstroSettings, mode: 'dev' | 'build'): AstroSettings;

package/dist/assets/endpoint/config.js

@@ -0,0 +1,12 @@
+function injectImageEndpoint(settings, mode) {
+  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;
+}
+export {
+  injectImageEndpoint
+};

package/dist/assets/endpoint/generic.js

@@ -1,8 +1,9 @@
 import { isRemotePath } from "@astrojs/internal-helpers/path";
 import mime from "mime/lite.js";
-import { getConfiguredImageService, isRemoteAllowed } from "../internal.js";
+import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
 import { imageConfig } from "astro:assets";
+import { isRemoteAllowed } from "../utils/remotePattern.js";
 async function loadRemoteImage(src) {
   try {
     const res = await fetch(src);

package/dist/assets/endpoint/node.js

@@ -2,9 +2,10 @@ import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path"
 import { readFile } from "fs/promises";
 import mime from "mime/lite.js";
 import os from "os";
-import { getConfiguredImageService, isRemoteAllowed } from "../internal.js";
+import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
 import { assetsDir, imageConfig } from "astro:assets";
+import { isRemoteAllowed } from "../utils/remotePattern.js";
 function replaceFileSystemReferences(src) {
   return os.platform().includes("win32") ? src.replace(/^\/@fs\//, "") : src.replace(/^\/@fs/, "");
 }

package/dist/assets/internal.d.ts

@@ -1,9 +1,5 @@
-import type { AstroConfig, AstroSettings } from '../@types/astro.js';
+import type { AstroConfig } from '../@types/astro.js';
 import { type ImageService } from './services/service.js';
-import type { GetImageResult, ImageMetadata, UnresolvedImageTransform } from './types.js';
-export declare function injectImageEndpoint(settings: AstroSettings, mode: 'dev' | 'build'): AstroSettings;
-export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
-export declare function isRemoteImage(src: ImageMetadata | string): src is string;
-export declare function isRemoteAllowed(src: string, { domains, remotePatterns, }: Partial<Pick<AstroConfig['image'], 'domains' | 'remotePatterns'>>): boolean;
+import type { GetImageResult, UnresolvedImageTransform } from './types.js';
 export declare function getConfiguredImageService(): Promise<ImageService>;
 export declare function getImage(options: UnresolvedImageTransform, imageConfig: AstroConfig['image']): Promise<GetImageResult>;

package/dist/assets/internal.js

@@ -1,32 +1,7 @@
-import { isRemotePath } from "@astrojs/internal-helpers/path";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { DEFAULT_HASH_PROPS } from "./consts.js";
 import { isLocalService } from "./services/service.js";
-import { matchHostname, matchPattern } from "./utils/remotePattern.js";
-function injectImageEndpoint(settings, mode) {
-  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;
-}
-function isESMImportedImage(src) {
-  return typeof src === "object";
-}
-function isRemoteImage(src) {
-  return typeof src === "string";
-}
-function isRemoteAllowed(src, {
-  domains = [],
-  remotePatterns = []
-}) {
-  if (!isRemotePath(src))
-    return false;
-  const url = new URL(src);
-  return domains.some((domain) => matchHostname(url, domain)) || remotePatterns.some((remotePattern) => matchPattern(url, remotePattern));
-}
+import { isESMImportedImage, isRemoteImage } from "./utils/imageKind.js";
 async function getConfiguredImageService() {
   if (!globalThis?.astroAsset?.imageService) {
     const { default: service } = await import(
@@ -105,9 +80,5 @@ async function getImage(options, imageConfig) {
 }
 export {
   getConfiguredImageService,
-  getImage,
-  injectImageEndpoint,
-  isESMImportedImage,
-  isRemoteAllowed,
-  isRemoteImage
+  getImage
 };

package/dist/assets/services/service.js

@@ -1,7 +1,8 @@
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, joinPaths } from "../../core/path.js";
 import { DEFAULT_HASH_PROPS, DEFAULT_OUTPUT_FORMAT, VALID_SUPPORTED_FORMATS } from "../consts.js";
-import { isESMImportedImage, isRemoteAllowed } from "../internal.js";
+import { isESMImportedImage } from "../utils/imageKind.js";
+import { isRemoteAllowed } from "../utils/remotePattern.js";
 function isLocalService(service) {
   if (!service) {
     return false;

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

@@ -0,0 +1,3 @@
+import type { ImageMetadata } from '../types.js';
+export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
+export declare function isRemoteImage(src: ImageMetadata | string): src is string;

package/dist/assets/utils/imageKind.js

@@ -0,0 +1,10 @@
+function isESMImportedImage(src) {
+  return typeof src === "object";
+}
+function isRemoteImage(src) {
+  return typeof src === "string";
+}
+export {
+  isESMImportedImage,
+  isRemoteImage
+};

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

@@ -1,4 +1,6 @@
 export { emitESMImage } from './emitAsset.js';
+export { isESMImportedImage, isRemoteImage } from './imageKind.js';
 export { imageMetadata } from './metadata.js';
 export { getOrigQueryParams } from './queryParams.js';
+export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from './remotePattern.js';
 export { hashTransform, propsToFilename } from './transformToPath.js';

package/dist/assets/utils/index.js

@@ -1,11 +1,28 @@
 import { emitESMImage } from "./emitAsset.js";
+import { isESMImportedImage, isRemoteImage } from "./imageKind.js";
 import { imageMetadata } from "./metadata.js";
 import { getOrigQueryParams } from "./queryParams.js";
+import {
+  isRemoteAllowed,
+  matchHostname,
+  matchPathname,
+  matchPattern,
+  matchPort,
+  matchProtocol
+} from "./remotePattern.js";
 import { hashTransform, propsToFilename } from "./transformToPath.js";
 export {
   emitESMImage,
   getOrigQueryParams,
   hashTransform,
   imageMetadata,
+  isESMImportedImage,
+  isRemoteAllowed,
+  isRemoteImage,
+  matchHostname,
+  matchPathname,
+  matchPattern,
+  matchPort,
+  matchProtocol,
   propsToFilename
 };

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

@@ -1,3 +1,4 @@
+import type { AstroConfig } from '../../@types/astro.js';
 export type RemotePattern = {
     hostname?: string;
     pathname?: string;
@@ -9,3 +10,4 @@ export declare function matchPort(url: URL, port?: string): boolean;
 export declare function matchProtocol(url: URL, protocol?: string): boolean;
 export declare function matchHostname(url: URL, hostname?: string, allowWildcard?: boolean): boolean;
 export declare function matchPathname(url: URL, pathname?: string, allowWildcard?: boolean): boolean;
+export declare function isRemoteAllowed(src: string, { domains, remotePatterns, }: Partial<Pick<AstroConfig['image'], 'domains' | 'remotePatterns'>>): boolean;

package/dist/assets/utils/remotePattern.js

@@ -1,3 +1,4 @@
+import { isRemotePath } from "@astrojs/internal-helpers/path";
 function matchPattern(url, remotePattern) {
   return matchProtocol(url, remotePattern.protocol) && matchHostname(url, remotePattern.hostname, true) && matchPort(url, remotePattern.port) && matchPathname(url, remotePattern.pathname, true);
 }
@@ -37,7 +38,17 @@ function matchPathname(url, pathname, allowWildcard) {
   }
   return false;
 }
+function isRemoteAllowed(src, {
+  domains = [],
+  remotePatterns = []
+}) {
+  if (!isRemotePath(src))
+    return false;
+  const url = new URL(src);
+  return domains.some((domain) => matchHostname(url, domain)) || remotePatterns.some((remotePattern) => matchPattern(url, remotePattern));
+}
 export {
+  isRemoteAllowed,
   matchHostname,
   matchPathname,
   matchPattern,

package/dist/assets/utils/transformToPath.js

@@ -2,7 +2,7 @@ import { deterministicString } from "deterministic-object-hash";
 import { basename, extname } from "node:path";
 import { removeQueryString } from "../../core/path.js";
 import { shorthash } from "../../runtime/server/shorthash.js";
-import { isESMImportedImage } from "../internal.js";
+import { isESMImportedImage } from "./imageKind.js";
 function propsToFilename(transform, hash) {
   let filename = removeQueryString(
     isESMImportedImage(transform.src) ? transform.src.src : transform.src

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

@@ -10,8 +10,8 @@ import {
 } from "../core/path.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
 import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
-import { isESMImportedImage } from "./internal.js";
 import { emitESMImage } from "./utils/emitAsset.js";
+import { isESMImportedImage } from "./utils/imageKind.js";
 import { getProxyCode } from "./utils/proxy.js";
 import { hashTransform, propsToFilename } from "./utils/transformToPath.js";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;

package/dist/core/app/index.js

@@ -263,7 +263,8 @@ class App {
    * This also handles pre-rendered /404 or /500 routes
    */
   async #renderError(request, { status, response: originalResponse, skipMiddleware = false }) {
-    const errorRouteData = matchRoute("/" + status, this.#manifestData);
+    const errorRoutePath = `/${status}${this.#manifest.trailingSlash === "always" ? "/" : ""}`;
+    const errorRouteData = matchRoute(errorRoutePath, this.#manifestData);
     const url = new URL(request.url);
     if (errorRouteData) {
       if (errorRouteData.prerender) {
@@ -308,8 +309,8 @@ class App {
     Reflect.set(response, responseSentSymbol, true);
     return response;
   }
-  #mergeResponses(newResponse, oldResponse, override) {
-    if (!oldResponse) {
+  #mergeResponses(newResponse, originalResponse, override) {
+    if (!originalResponse) {
       if (override !== void 0) {
         return new Response(newResponse.body, {
           status: override.status,
@@ -319,12 +320,23 @@ class App {
       }
       return newResponse;
     }
-    const { statusText, headers } = oldResponse;
-    const status = override?.status ? override.status : oldResponse.status === 200 ? newResponse.status : oldResponse.status;
+    const status = override?.status ? override.status : originalResponse.status === 200 ? newResponse.status : originalResponse.status;
+    try {
+      originalResponse.headers.delete("Content-type");
+    } catch {
+    }
     return new Response(newResponse.body, {
       status,
-      statusText: status === 200 ? newResponse.statusText : statusText,
-      headers: new Headers(Array.from(headers))
+      statusText: status === 200 ? newResponse.statusText : originalResponse.statusText,
+      // If you're looking at here for possible bugs, it means that it's not a bug.
+      // With the middleware, users can meddle with headers, and we should pass to the 404/500.
+      // If users see something weird, it's because they are setting some headers they should not.
+      //
+      // Although, we don't want it to replace the content-type, because the error page must return `text/html`
+      headers: new Headers([
+        ...Array.from(newResponse.headers),
+        ...Array.from(originalResponse.headers)
+      ])
     });
   }
   #getDefaultStatusCode(routeData, pathname) {

package/dist/core/build/index.js

@@ -2,7 +2,7 @@ import { blue, bold, green } from "kleur/colors";
 import fs from "node:fs";
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
-import { injectImageEndpoint } from "../../assets/internal.js";
+import { injectImageEndpoint } from "../../assets/endpoint/config.js";
 import { telemetry } from "../../events/index.js";
 import { eventCliSession } from "../../events/session.js";
 import {