astro 2.3.2 → 2.3.3

package/dist/@types/astro.d.ts

@@ -289,6 +289,10 @@ type ServerConfig = {
 export interface ViteUserConfig extends vite.UserConfig {
     ssr?: vite.SSROptions;
 }
+export interface ImageServiceConfig {
+    entrypoint: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | (string & {});
+    config?: Record<string, any>;
+}
 /**
  * Astro User Config
  * Docs: https://docs.astro.build/reference/configuration-reference/
@@ -686,25 +690,26 @@ export interface AstroUserConfig {
         /**
          * @docs
          * @name image.service (Experimental)
-         * @type {'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | string}
-         * @default `'astro/assets/services/squoosh'`
+         * @type {{entrypoint: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | string, config: Record<string, any>}}
+         * @default `{entrypoint: 'astro/assets/services/squoosh', config?: {}}`
          * @version 2.1.0
          * @description
          * Set which image service is used for Astro’s experimental assets support.
          *
-         * The value should be a module specifier for the image service to use:
-         * either one of Astro’s two built-in services, or a third-party implementation.
+         * The value should be an object with an entrypoint for the image service to use and optionally, a config object to pass to the service.
+         *
+         * The service entrypoint can be either one of the included services, or a third-party package.
          *
          * ```js
          * {
          *   image: {
          *     // Example: Enable the Sharp-based image service
-         *     service: 'astro/assets/services/sharp',
+         *     service: { entrypoint: 'astro/assets/services/sharp' },
          *   },
          * }
          * ```
          */
-        service: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | (string & {});
+        service: ImageServiceConfig;
     };
     /**
      * @docs

package/dist/assets/image-endpoint.js

@@ -3,6 +3,7 @@ import { isRemotePath } from "../core/path.js";
 import { getConfiguredImageService } from "./internal.js";
 import { isLocalService } from "./services/service.js";
 import { etag } from "./utils/etag.js";
+import { imageServiceConfig } from "astro:assets";
 async function loadRemoteImage(src) {
   try {
     const res = await fetch(src);
@@ -21,7 +22,7 @@ const get = async ({ request }) => {
       throw new Error("Configured image service is not a local service");
     }
     const url = new URL(request.url);
-    const transform = await imageService.parseURL(url);
+    const transform = await imageService.parseURL(url, imageServiceConfig);
     if (!transform || !transform.src) {
       throw new Error("Incorrect transform returned by `parseURL`");
     }
@@ -31,7 +32,11 @@ const get = async ({ request }) => {
     if (!inputBuffer) {
       return new Response("Not Found", { status: 404 });
     }
-    const { data, format } = await imageService.transform(inputBuffer, transform);
+    const { data, format } = await imageService.transform(
+      inputBuffer,
+      transform,
+      imageServiceConfig
+    );
     return new Response(data, {
       status: 200,
       headers: {

package/dist/assets/index.d.ts

@@ -1,5 +1,8 @@
+import type { ImageServiceConfig } from '../@types/astro.js';
 export { getConfiguredImageService, getImage } from './internal.js';
 export { baseService, isLocalService } from './services/service.js';
 export { type LocalImageProps, type RemoteImageProps } from './types.js';
 export { emitESMImage } from './utils/emitAsset.js';
 export { imageMetadata } from './utils/metadata.js';
+export declare function sharpImageService(): ImageServiceConfig;
+export declare function squooshImageService(): ImageServiceConfig;

package/dist/assets/index.js

@@ -3,11 +3,25 @@ import { baseService, isLocalService } from "./services/service.js";
 import {} from "./types.js";
 import { emitESMImage } from "./utils/emitAsset.js";
 import { imageMetadata } from "./utils/metadata.js";
+function sharpImageService() {
+  return {
+    entrypoint: "astro/assets/services/sharp",
+    config: {}
+  };
+}
+function squooshImageService() {
+  return {
+    entrypoint: "astro/assets/services/squoosh",
+    config: {}
+  };
+}
 export {
   baseService,
   emitESMImage,
   getConfiguredImageService,
   getImage,
   imageMetadata,
-  isLocalService
+  isLocalService,
+  sharpImageService,
+  squooshImageService
 };

package/dist/assets/internal.d.ts

@@ -19,7 +19,7 @@ export declare function getConfiguredImageService(): Promise<ImageService>;
  *
  * This is functionally equivalent to using the `<Image />` component, as the component calls this function internally.
  */
-export declare function getImage(options: ImageTransform): Promise<GetImageResult>;
+export declare function getImage(options: ImageTransform, serviceConfig: Record<string, any>): Promise<GetImageResult>;
 export declare function getStaticImageList(): Iterable<[
     string,
     {

package/dist/assets/internal.js

@@ -24,7 +24,7 @@ async function getConfiguredImageService() {
   }
   return globalThis.astroAsset.imageService;
 }
-async function getImage(options) {
+async function getImage(options, serviceConfig) {
   if (!options || typeof options !== "object") {
     throw new AstroError({
       ...AstroErrorData.ExpectedImageOptions,
@@ -32,8 +32,8 @@ async function getImage(options) {
     });
   }
   const service = await getConfiguredImageService();
-  const validatedOptions = service.validateOptions ? service.validateOptions(options) : options;
-  let imageURL = service.getURL(validatedOptions);
+  const validatedOptions = service.validateOptions ? service.validateOptions(options, serviceConfig) : options;
+  let imageURL = service.getURL(validatedOptions, serviceConfig);
   if (isLocalService(service) && globalThis.astroAsset.addStaticImage) {
     imageURL = globalThis.astroAsset.addStaticImage(validatedOptions);
   }
@@ -41,7 +41,7 @@ async function getImage(options) {
     rawOptions: options,
     options: validatedOptions,
     src: imageURL,
-    attributes: service.getHTMLAttributes !== void 0 ? service.getHTMLAttributes(validatedOptions) : {}
+    attributes: service.getHTMLAttributes !== void 0 ? service.getHTMLAttributes(validatedOptions, serviceConfig) : {}
   };
 }
 function getStaticImageList() {
@@ -73,7 +73,11 @@ async function generateImage(buildOpts, options, filepath) {
       serverRoot
     )
   );
-  const resultData = await imageService.transform(fileData, { ...options, src: originalImagePath });
+  const resultData = await imageService.transform(
+    fileData,
+    { ...options, src: originalImagePath },
+    buildOpts.settings.config.image.service.config
+  );
   const finalFileURL = new URL("." + filepath, clientRoot);
   const finalFolderURL = new URL("./", finalFileURL);
   await fs.promises.mkdir(finalFolderURL, { recursive: true });

package/dist/assets/services/service.d.ts

@@ -12,14 +12,14 @@ interface SharedServiceProps {
      * For external services, this should point to the URL your images are coming from, for instance, `/_vercel/image`
      *
      */
-    getURL: (options: ImageTransform) => string;
+    getURL: (options: ImageTransform, serviceConfig: Record<string, any>) => string;
     /**
      * Return any additional HTML attributes separate from `src` that your service requires to show the image properly.
      *
      * For example, you might want to return the `width` and `height` to avoid CLS, or a particular `class` or `style`.
      * In most cases, you'll want to return directly what your user supplied you, minus the attributes that were used to generate the image.
      */
-    getHTMLAttributes?: (options: ImageTransform) => Record<string, any>;
+    getHTMLAttributes?: (options: ImageTransform, serviceConfig: Record<string, any>) => Record<string, any>;
     /**
      * Validate and return the options passed by the user.
      *
@@ -28,7 +28,7 @@ interface SharedServiceProps {
      *
      * This method should returns options, and can be used to set defaults (ex: a default output format to be used if the user didn't specify one.)
      */
-    validateOptions?: (options: ImageTransform) => ImageTransform;
+    validateOptions?: (options: ImageTransform, serviceConfig: Record<string, any>) => ImageTransform;
 }
 export type ExternalImageService = SharedServiceProps;
 type LocalImageTransform = {
@@ -41,12 +41,12 @@ export interface LocalImageService extends SharedServiceProps {
      *
      * In most cases, this will get query parameters using, for example, `params.get('width')` and return those.
      */
-    parseURL: (url: URL) => LocalImageTransform | undefined;
+    parseURL: (url: URL, serviceConfig: Record<string, any>) => LocalImageTransform | undefined;
     /**
      * Performs the image transformations on the input image and returns both the binary data and
      * final image format of the optimized image.
      */
-    transform: (inputBuffer: Buffer, transform: LocalImageTransform) => Promise<{
+    transform: (inputBuffer: Buffer, transform: LocalImageTransform, serviceConfig: Record<string, any>) => Promise<{
         data: Buffer;
         format: ImageOutputFormat;
     }>;

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

@@ -31,7 +31,7 @@ function assets({
   ]);
   const adapterName = (_a = settings.config.adapter) == null ? void 0 : _a.name;
   if (["astro/assets/services/sharp", "astro/assets/services/squoosh"].includes(
-    settings.config.image.service
+    settings.config.image.service.entrypoint
   ) && adapterName && UNSUPPORTED_ADAPTERS.has(adapterName)) {
     error(
       logging,
@@ -59,7 +59,7 @@ function assets({
       },
       async resolveId(id) {
         if (id === VIRTUAL_SERVICE_ID) {
-          return await this.resolve(settings.config.image.service);
+          return await this.resolve(settings.config.image.service.entrypoint);
         }
         if (id === VIRTUAL_MODULE_ID) {
           return resolvedVirtualModuleId;
@@ -68,8 +68,12 @@ function assets({
       load(id) {
         if (id === resolvedVirtualModuleId) {
           return `
-					export { getImage, getConfiguredImageService, isLocalService } from "astro/assets";
+					export { getConfiguredImageService, isLocalService } from "astro/assets";
+					import { getImage as getImageInternal } from "astro/assets";
 					export { default as Image } from "astro/components/Image.astro";
+
+					export const imageServiceConfig = ${JSON.stringify(settings.config.image.service.config)};
+					export const getImage = async (options) => await getImageInternal(options, imageServiceConfig);
 				`;
         }
       },
@@ -95,14 +99,21 @@ function assets({
                 return next();
               }
             }
-            const transform = await globalThis.astroAsset.imageService.parseURL(url);
+            const transform = await globalThis.astroAsset.imageService.parseURL(
+              url,
+              settings.config.image.service.config
+            );
             if (transform === void 0) {
               error(logging, "image", `Failed to parse transform for ${url}`);
             }
             let data = file;
             let format = meta.format;
             if (transform) {
-              const result = await globalThis.astroAsset.imageService.transform(file, transform);
+              const result = await globalThis.astroAsset.imageService.transform(
+                file,
+                transform,
+                settings.config.image.service.config
+              );
               data = result.data;
               format = result.format;
             }
@@ -122,7 +133,7 @@ function assets({
           if (!globalThis.astroAsset.staticImages) {
             globalThis.astroAsset.staticImages = /* @__PURE__ */ new Map();
           }
-          const hash = hashTransform(options, settings.config.image.service);
+          const hash = hashTransform(options, settings.config.image.service.entrypoint);
           let filePath;
           if (globalThis.astroAsset.staticImages.has(hash)) {
             filePath = globalThis.astroAsset.staticImages.get(hash).path;

package/dist/core/config/schema.d.ts

@@ -80,11 +80,26 @@ export declare const AstroConfigSchema: z.ZodObject<{
         port: number;
     }, unknown>;
     image: z.ZodDefault<z.ZodObject<{
-        service: z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodLiteral<"astro/assets/services/squoosh">, z.ZodString]>;
+        service: z.ZodObject<{
+            entrypoint: z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodLiteral<"astro/assets/services/squoosh">, z.ZodString]>;
+            config: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
+        }, "strip", z.ZodTypeAny, {
+            entrypoint: string;
+            config: Record<string, any>;
+        }, {
+            config?: Record<string, any> | undefined;
+            entrypoint: string;
+        }>;
     }, "strip", z.ZodTypeAny, {
-        service: string;
+        service: {
+            entrypoint: string;
+            config: Record<string, any>;
+        };
     }, {
-        service: string;
+        service: {
+            config?: Record<string, any> | undefined;
+            entrypoint: string;
+        };
     }>>;
     markdown: z.ZodDefault<z.ZodObject<{
         drafts: z.ZodDefault<z.ZodBoolean>;
@@ -189,7 +204,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: string;
     };
     image: {
-        service: string;
+        service: {
+            entrypoint: string;
+            config: Record<string, any>;
+        };
     };
     vite: ViteUserConfig;
     experimental: {
@@ -234,7 +252,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry?: string | undefined;
     } | undefined;
     image?: {
-        service: string;
+        service: {
+            config?: Record<string, any> | undefined;
+            entrypoint: string;
+        };
     } | undefined;
     vite?: ViteUserConfig | undefined;
     experimental?: {
@@ -319,11 +340,26 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         hooks: {};
     }[], unknown>;
     image: z.ZodDefault<z.ZodObject<{
-        service: z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodLiteral<"astro/assets/services/squoosh">, z.ZodString]>;
+        service: z.ZodObject<{
+            entrypoint: z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodLiteral<"astro/assets/services/squoosh">, z.ZodString]>;
+            config: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
+        }, "strip", z.ZodTypeAny, {
+            entrypoint: string;
+            config: Record<string, any>;
+        }, {
+            config?: Record<string, any> | undefined;
+            entrypoint: string;
+        }>;
     }, "strip", z.ZodTypeAny, {
-        service: string;
+        service: {
+            entrypoint: string;
+            config: Record<string, any>;
+        };
     }, {
-        service: string;
+        service: {
+            config?: Record<string, any> | undefined;
+            entrypoint: string;
+        };
     }>>;
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
     experimental: z.ZodDefault<z.ZodOptional<z.ZodObject<{
@@ -432,7 +468,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry: string;
     };
     image: {
-        service: string;
+        service: {
+            entrypoint: string;
+            config: Record<string, any>;
+        };
     };
     vite: ViteUserConfig;
     experimental: {
@@ -477,7 +516,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry?: string | undefined;
     } | undefined;
     image?: {
-        service: string;
+        service: {
+            config?: Record<string, any> | undefined;
+            entrypoint: string;
+        };
     } | undefined;
     vite?: ViteUserConfig | undefined;
     experimental?: {
@@ -531,7 +573,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry: string;
     };
     image: {
-        service: string;
+        service: {
+            entrypoint: string;
+            config: Record<string, any>;
+        };
     };
     vite: ViteUserConfig;
     experimental: {
@@ -576,7 +621,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry?: string | undefined;
     } | undefined;
     image?: {
-        service: string;
+        service: {
+            config?: Record<string, any> | undefined;
+            entrypoint: string;
+        };
     } | undefined;
     vite?: ViteUserConfig | undefined;
     experimental?: {

package/dist/core/config/schema.js

@@ -71,13 +71,16 @@ const AstroConfigSchema = z.object({
     }).optional().default({})
   ),
   image: z.object({
-    service: z.union([
-      z.literal("astro/assets/services/sharp"),
-      z.literal("astro/assets/services/squoosh"),
-      z.string()
-    ])
+    service: z.object({
+      entrypoint: z.union([
+        z.literal("astro/assets/services/sharp"),
+        z.literal("astro/assets/services/squoosh"),
+        z.string()
+      ]),
+      config: z.record(z.any()).default({})
+    })
   }).default({
-    service: "astro/assets/services/squoosh"
+    service: { entrypoint: "astro/assets/services/squoosh", config: {} }
   }),
   markdown: z.object({
     drafts: z.boolean().default(false),

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.3.2";
+const ASTRO_VERSION = "2.3.3";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.3.2";
+  const currentVersion = "2.3.3";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.3.2";
+  const version = "2.3.3";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.3.2"}`
+        `v${"2.3.3"}`
       )} ${headline}`
     );
   }

package/dist/runtime/server/render/component.js

@@ -208,7 +208,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
       if (isPage || (renderer == null ? void 0 : renderer.name) === "astro:jsx") {
         yield html;
       } else if (html && html.length > 0) {
-        yield markHTMLString(html.replace(/\<\/?astro-slot\>/g, ""));
+        yield markHTMLString(html.replace(/\<\/?astro-slot\b[^>]*>/g, ""));
       } else {
         yield "";
       }

package/dist/vite-plugin-astro-server/route.js

@@ -4,18 +4,15 @@ import { call as callEndpoint } from "../core/endpoint/dev/index.js";
 import { throwIfRedirectNotAllowed } from "../core/endpoint/index.js";
 import { AstroErrorData } from "../core/errors/index.js";
 import { warn } from "../core/logger/core.js";
-import { appendForwardSlash } from "../core/path.js";
 import { preload, renderPage } from "../core/render/dev/index.js";
 import { getParamsAndProps, GetParamsAndPropsError } from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
-import { resolvePages } from "../core/util.js";
 import { log404 } from "./common.js";
 import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
-function getCustom404Route({ config }, manifest) {
-  const relPages = resolvePages(config).href.replace(config.root.href, "");
-  const pattern = new RegExp(`${appendForwardSlash(relPages)}404.(astro|md)`);
-  return manifest.routes.find((r) => r.component.match(pattern));
+function getCustom404Route(manifest) {
+  const route404 = /^\/404\/?$/;
+  return manifest.routes.find((r) => route404.test(r.route));
 }
 async function matchRoute(pathname, env, manifest) {
   const { logging, settings, routeCache } = env;
@@ -59,7 +56,7 @@ ${AstroErrorData.NoMatchingStaticPathFound.hint(possibleRoutes)}`
     );
   }
   log404(logging, pathname);
-  const custom404 = getCustom404Route(settings, manifest);
+  const custom404 = getCustom404Route(manifest);
   if (custom404) {
     const filePath = new URL(`./${custom404.component}`, settings.config.root);
     const preloadedComponent = await preload({ env, filePath });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -93,11 +93,11 @@
     "src/content/template"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.3.1",
-    "@astrojs/language-server": "^0.28.3",
+    "@astrojs/compiler": "^1.3.2",
+    "@astrojs/language-server": "^1.0.0",
     "@astrojs/markdown-remark": "^2.1.4",
-    "@astrojs/telemetry": "^2.1.0",
-    "@astrojs/webapi": "^2.1.0",
+    "@astrojs/telemetry": "^2.1.1",
+    "@astrojs/webapi": "^2.1.1",
     "@babel/core": "^7.18.2",
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.4",
@@ -184,7 +184,7 @@
     "sass": "^1.52.2",
     "sharp": "^0.31.3",
     "srcset-parse": "^1.1.0",
-    "undici": "^5.20.0",
+    "undici": "^5.22.0",
     "unified": "^10.1.2",
     "astro-scripts": "0.0.14"
   },