astro 2.1.8 → 2.1.9

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

@@ -1086,11 +1086,13 @@ export type GetStaticPaths = (options: GetStaticPathsOptions) => Promise<GetStat
  *
  * @example
  * ```ts
- * export async function getStaticPaths() {
+ * import type { GetStaticPaths } from 'astro';
+ *
+ * export const getStaticPaths = (() => {
  *   return results.map((entry) => ({
  *     params: { slug: entry.slug },
  *   }));
- * }
+ * }) satisfies GetStaticPaths;
  *
  * type Params = InferGetStaticParamsType<typeof getStaticPaths>;
  * //   ^? { slug: string; }
@@ -1098,7 +1100,7 @@ export type GetStaticPaths = (options: GetStaticPathsOptions) => Promise<GetStat
  * const { slug } = Astro.params as Params;
  * ```
  */
-export type InferGetStaticParamsType<T> = T extends () => Promise<infer R> ? R extends Array<infer U> ? U extends {
+export type InferGetStaticParamsType<T> = T extends () => infer R | Promise<infer R> ? R extends Array<infer U> ? U extends {
     params: infer P;
 } ? P : never : never : never;
 /**
@@ -1106,7 +1108,9 @@ export type InferGetStaticParamsType<T> = T extends () => Promise<infer R> ? R e
  *
  * @example
  * ```ts
- * export async function getStaticPaths() {
+ * import type { GetStaticPaths } from 'astro';
+ *
+ * export const getStaticPaths = (() => {
  *   return results.map((entry) => ({
  *     params: { slug: entry.slug },
  *     props: {
@@ -1114,15 +1118,15 @@ export type InferGetStaticParamsType<T> = T extends () => Promise<infer R> ? R e
  *       propB: 42
  *     },
  *   }));
- * }
+ * }) satisfies GetStaticPaths;
  *
  * type Props = InferGetStaticPropsType<typeof getStaticPaths>;
  * //   ^? { propA: boolean; propB: number; }
  *
- * const { propA, propB } = Astro.props as Props;
+ * const { propA, propB } = Astro.props;
  * ```
  */
-export type InferGetStaticPropsType<T> = T extends () => Promise<infer R> ? R extends Array<infer U> ? U extends {
+export type InferGetStaticPropsType<T> = T extends () => infer R | Promise<infer R> ? R extends Array<infer U> ? U extends {
     props: infer P;
 } ? P : never : never : never;
 export interface HydrateOptions {

package/dist/assets/internal.d.ts

@@ -26,7 +26,13 @@ interface GetImageResult {
  * 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 getStaticImageList(): Iterable<[ImageTransform, string]>;
+export declare function getStaticImageList(): Iterable<[
+    string,
+    {
+        path: string;
+        options: ImageTransform;
+    }
+]>;
 interface GenerationData {
     weight: {
         before: number;

package/dist/assets/internal.js

@@ -7,7 +7,8 @@ function isESMImportedImage(src) {
   return typeof src === "object";
 }
 async function getConfiguredImageService() {
-  if (!globalThis.astroAsset.imageService) {
+  var _a;
+  if (!((_a = globalThis == null ? void 0 : globalThis.astroAsset) == null ? void 0 : _a.imageService)) {
     const { default: service } = await import(
       // @ts-expect-error
       "virtual:image-service"
@@ -16,12 +17,20 @@ async function getConfiguredImageService() {
       error.cause = e;
       throw error;
     });
+    if (!globalThis.astroAsset)
+      globalThis.astroAsset = {};
     globalThis.astroAsset.imageService = service;
     return service;
   }
   return globalThis.astroAsset.imageService;
 }
 async function getImage(options) {
+  if (!options || typeof options !== "object") {
+    throw new AstroError({
+      ...AstroErrorData.ExpectedImageOptions,
+      message: AstroErrorData.ExpectedImageOptions.message(JSON.stringify(options))
+    });
+  }
   const service = await getConfiguredImageService();
   const validatedOptions = service.validateOptions ? service.validateOptions(options) : options;
   let imageURL = service.getURL(validatedOptions);

package/dist/assets/services/service.js

@@ -16,6 +16,12 @@ function parseQuality(quality) {
 }
 const baseService = {
   validateOptions(options) {
+    if (!options.src || typeof options.src !== "string" && typeof options.src !== "object") {
+      throw new AstroError({
+        ...AstroErrorData.ExpectedImage,
+        message: AstroErrorData.ExpectedImage.message(JSON.stringify(options.src))
+      });
+    }
     if (!isESMImportedImage(options.src)) {
       let missingDimension;
       if (!options.width && !options.height) {

package/dist/assets/services/vendor/squoosh/copy-wasm.d.ts

@@ -1 +1,2 @@
 export declare function copyWasmFiles(dir: URL): Promise<void>;
+export declare function deleteWasmFiles(dir: URL): Promise<void>;

package/dist/assets/services/vendor/squoosh/copy-wasm.js

@@ -3,22 +3,35 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 async function copyWasmFiles(dir) {
   const src = new URL("./", import.meta.url);
-  await copyDir(fileURLToPath(src), fileURLToPath(dir));
+  const fileList = await listFiles(fileURLToPath(src), fileURLToPath(dir));
+  for (let file of fileList) {
+    await fs.mkdir(path.dirname(file.dest), { recursive: true });
+    await fs.copyFile(file.src, file.dest);
+  }
 }
-async function copyDir(src, dest) {
+async function deleteWasmFiles(dir) {
+  const src = new URL("./", import.meta.url);
+  const fileList = await listFiles(fileURLToPath(src), fileURLToPath(dir));
+  for (let file of fileList) {
+    await fs.rm(file.dest);
+  }
+}
+async function listFiles(src, dest) {
   const itemNames = await fs.readdir(src);
+  const copiedFiles = [];
   await Promise.all(itemNames.map(async (srcName) => {
     const srcPath = path.join(src, srcName);
     const destPath = path.join(dest, srcName);
     const s = await fs.stat(srcPath);
     if (s.isFile() && /.wasm$/.test(srcPath)) {
-      await fs.mkdir(path.dirname(destPath), { recursive: true });
-      await fs.copyFile(srcPath, destPath);
+      copiedFiles.push({ src: srcPath, dest: destPath });
     } else if (s.isDirectory()) {
-      await copyDir(srcPath, destPath);
+      copiedFiles.push(...await listFiles(srcPath, destPath));
     }
   }));
+  return copiedFiles;
 }
 export {
-  copyWasmFiles
+  copyWasmFiles,
+  deleteWasmFiles
 };

package/dist/assets/types.d.ts

@@ -8,7 +8,10 @@ declare global {
     var astroAsset: {
         imageService?: ImageService;
         addStaticImage?: ((options: ImageTransform) => string) | undefined;
-        staticImages?: Map<ImageTransform, string>;
+        staticImages?: Map<string, {
+            path: string;
+            options: ImageTransform;
+        }>;
     };
 }
 /**

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

@@ -1,2 +1,3 @@
 import type { ImageTransform } from '../types.js';
-export declare function propsToFilename(transform: ImageTransform, imageService: string): string;
+export declare function propsToFilename(transform: ImageTransform, hash: string): string;
+export declare function hashTransform(transform: ImageTransform, imageService: string): string;

package/dist/assets/utils/transformToPath.js

@@ -2,18 +2,22 @@ import { basename, extname } from "path";
 import { removeQueryString } from "../../core/path.js";
 import { shorthash } from "../../runtime/server/shorthash.js";
 import { isESMImportedImage } from "../internal.js";
-function propsToFilename(transform, imageService) {
+function propsToFilename(transform, hash) {
   if (!isESMImportedImage(transform.src)) {
     return transform.src;
   }
   let filename = removeQueryString(transform.src.src);
   const ext = extname(filename);
   filename = basename(filename, ext);
+  const outputExt = transform.format ? `.${transform.format}` : ext;
+  return `/${filename}_${hash}${outputExt}`;
+}
+function hashTransform(transform, imageService) {
   const { alt, ...rest } = transform;
   const hashFields = { ...rest, imageService };
-  const outputExt = transform.format ? `.${transform.format}` : ext;
-  return `/${filename}_${shorthash(JSON.stringify(hashFields))}${outputExt}`;
+  return shorthash(JSON.stringify(hashFields));
 }
 export {
+  hashTransform,
   propsToFilename
 };

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

@@ -14,7 +14,7 @@ import { copyWasmFiles } from "./services/vendor/squoosh/copy-wasm.js";
 import { emitESMImage } from "./utils/emitAsset.js";
 import { imageMetadata } from "./utils/metadata.js";
 import { getOrigQueryParams } from "./utils/queryParams.js";
-import { propsToFilename } from "./utils/transformToPath.js";
+import { hashTransform, propsToFilename } from "./utils/transformToPath.js";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
 function assets({
   settings,
@@ -126,20 +126,18 @@ function assets({
           if (!globalThis.astroAsset.staticImages) {
             globalThis.astroAsset.staticImages = /* @__PURE__ */ new Map();
           }
+          const hash = hashTransform(options, settings.config.image.service);
           let filePath;
-          if (globalThis.astroAsset.staticImages.has(options)) {
-            filePath = globalThis.astroAsset.staticImages.get(options);
+          if (globalThis.astroAsset.staticImages.has(hash)) {
+            filePath = globalThis.astroAsset.staticImages.get(hash).path;
           } else {
             if (!isESMImportedImage(options.src)) {
               return options.src;
             }
             filePath = prependForwardSlash(
-              joinPaths(
-                settings.config.build.assets,
-                propsToFilename(options, settings.config.image.service)
-              )
+              joinPaths(settings.config.build.assets, propsToFilename(options, hash))
             );
-            globalThis.astroAsset.staticImages.set(options, filePath);
+            globalThis.astroAsset.staticImages.set(hash, { path: filePath, options });
           }
           return prependForwardSlash(joinPaths(settings.config.base, filePath));
         };
@@ -148,8 +146,10 @@ function assets({
         if (mode != "build") {
           return;
         }
-        const dir = settings.config.output === "server" ? settings.config.build.server : settings.config.outDir;
-        await copyWasmFiles(new URL("./chunks", dir));
+        if (settings.config.image.service === "astro/assets/services/squoosh") {
+          const dir = settings.config.output === "server" ? settings.config.build.server : settings.config.outDir;
+          await copyWasmFiles(new URL("./chunks", dir));
+        }
       },
       // In build, rewrite paths to ESM imported images in code to their final location
       async renderChunk(code) {

package/dist/cli/index.js

@@ -16,7 +16,6 @@ import { enableVerboseLogging, nodeLogDestination } from "../core/logger/node.js
 import { formatConfigErrorMessage, formatErrorMessage, printHelp } from "../core/messages.js";
 import * as event from "../events/index.js";
 import { eventConfigError, eventError, telemetry } from "../events/index.js";
-import { check } from "./check/index.js";
 import { openInBrowser } from "./open.js";
 function printAstroHelp() {
   printHelp({
@@ -174,6 +173,7 @@ async function runCommand(cmd, flags) {
       });
     }
     case "check": {
+      const { check } = await import("./check/index.js");
       const checkServer = await check(settings, { flags, logging });
       if (checkServer) {
         if (checkServer.isWatchMode) {

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

@@ -3,6 +3,6 @@ import { type Metadata } from '../assets/utils/metadata.js';
 export declare function createImage(options: {
     assetsDir: string;
     relAssetsDir: string;
-}): () => z.ZodEffects<z.ZodString, (Metadata & {
+}): () => z.ZodEffects<z.ZodString, Metadata & {
     __astro_asset: true;
-}) | undefined, string>;
+}, string>;

package/dist/content/runtime-assets.js

@@ -1,18 +1,29 @@
 import { pathToFileURL } from "url";
 import { z } from "zod";
-import { imageMetadata } from "../assets/utils/metadata.js";
+import {
+  imageMetadata as internalGetImageMetadata
+} from "../assets/utils/metadata.js";
 function createImage(options) {
   return () => {
     if (options.assetsDir === "undefined") {
       throw new Error("Enable `experimental.assets` in your Astro config to use image()");
     }
-    return z.string({ description: "__image" }).transform(async (imagePath) => {
-      return await getImageMetadata(pathToFileURL(imagePath));
+    return z.string({ description: "__image" }).transform(async (imagePath, ctx) => {
+      const imageMetadata = await getImageMetadata(pathToFileURL(imagePath));
+      if (!imageMetadata) {
+        ctx.addIssue({
+          code: "custom",
+          message: `Image ${imagePath} does not exist. Is the path correct?`,
+          fatal: true
+        });
+        return z.NEVER;
+      }
+      return imageMetadata;
     });
   };
 }
 async function getImageMetadata(imagePath) {
-  const meta = await imageMetadata(imagePath);
+  const meta = await internalGetImageMetadata(imagePath);
   if (!meta) {
     return void 0;
   }

package/dist/content/utils.js

@@ -83,10 +83,10 @@ async function getEntryData(entry, collectionConfig, resolver) {
               var _a;
               if (!value || typeof value !== "string")
                 return value;
-              return (_a = await resolver(value)) == null ? void 0 : _a.id;
+              return ((_a = await resolver(value)) == null ? void 0 : _a.id) ?? path.join(path.dirname(entry._internal.filePath), value);
             },
             schema,
-            { description: void 0 }
+            { description: "__image" }
           );
         } else if ("shape" in schema) {
           await preprocessAssetPaths(schema.shape);

package/dist/core/build/generate.js

@@ -7,6 +7,7 @@ import {
   generateImage as generateImageInternal,
   getStaticImageList
 } from "../../assets/internal.js";
+import { deleteWasmFiles } from "../../assets/services/vendor/squoosh/copy-wasm.js";
 import { hasPrerenderedPages } from "../../core/build/internal.js";
 import {
   prependForwardSlash,
@@ -82,7 +83,10 @@ ${bgGreen(black(` ${verb} static routes `))}`);
     info(opts.logging, null, `
 ${bgGreen(black(` generating optimized images `))}`);
     for (const imageData of getStaticImageList()) {
-      await generateImage(opts, imageData[0], imageData[1]);
+      await generateImage(opts, imageData[1].options, imageData[1].path);
+    }
+    if (opts.settings.config.image.service === "astro/assets/services/squoosh" && opts.settings.config.output === "static") {
+      await deleteWasmFiles(new URL("./chunks", opts.settings.config.outDir));
     }
     delete globalThis.astroAsset.addStaticImage;
   }

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -16,7 +16,6 @@ import envVitePlugin from "../vite-plugin-env/index.js";
 import astroHeadPlugin from "../vite-plugin-head/index.js";
 import htmlVitePlugin from "../vite-plugin-html/index.js";
 import { astroInjectEnvTsPlugin } from "../vite-plugin-inject-env-ts/index.js";
-import astroIntegrationsContainerPlugin from "../vite-plugin-integrations-container/index.js";
 import jsxVitePlugin from "../vite-plugin-jsx/index.js";
 import astroLoadFallbackPlugin from "../vite-plugin-load-fallback/index.js";
 import markdownVitePlugin from "../vite-plugin-markdown/index.js";
@@ -93,7 +92,6 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
       htmlVitePlugin(),
       jsxVitePlugin({ settings, logging }),
       astroPostprocessVitePlugin({ settings }),
-      astroIntegrationsContainerPlugin({ settings, logging }),
       astroScriptsPageSSRPlugin({ settings }),
       astroHeadPlugin({ settings }),
       astroScannerPlugin({ settings }),

package/dist/core/dev/dev.js

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

package/dist/core/errors/dev/utils.js

@@ -4,17 +4,21 @@ import * as fs from "node:fs";
 import { isAbsolute, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import stripAnsi from "strip-ansi";
+import { normalizePath } from "vite";
+import { removeLeadingForwardSlashWindows } from "../../path.js";
 import { AggregateError } from "../errors.js";
 import { codeFrame } from "../printer.js";
 import { normalizeLF } from "../utils.js";
 function collectErrorMetadata(e, rootFolder) {
   const err = AggregateError.is(e) || Array.isArray(e.errors) ? e.errors : [e];
   err.forEach((error) => {
-    var _a;
+    var _a, _b;
     if (error.stack) {
       error = collectInfoFromStacktrace(e);
     }
-    if (((_a = error.loc) == null ? void 0 : _a.file) && rootFolder && (!error.loc.file.startsWith(rootFolder.pathname) || !isAbsolute(error.loc.file))) {
+    const normalizedFile = normalizePath(((_a = error.loc) == null ? void 0 : _a.file) || "");
+    const normalizedRootFolder = removeLeadingForwardSlashWindows((rootFolder == null ? void 0 : rootFolder.pathname) || "");
+    if (((_b = error.loc) == null ? void 0 : _b.file) && rootFolder && (!(normalizedFile == null ? void 0 : normalizedFile.startsWith(normalizedRootFolder)) || !isAbsolute(normalizedFile))) {
       error.loc.file = join(fileURLToPath(rootFolder), error.loc.file);
     }
     if (error.loc && (!error.frame || !error.fullCode)) {

package/dist/core/errors/errors-data.d.ts

@@ -409,7 +409,7 @@ export declare const AstroErrorData: {
      * If the image is merely decorative (i.e. doesn’t contribute to the understanding of the page), set `alt=""` so that screen readers know to ignore the image.
      */
     readonly ImageMissingAlt: {
-        readonly title: "Missing alt property";
+        readonly title: "Missing alt property.";
         readonly code: 3022;
         readonly message: "The alt property is required.";
         readonly hint: "The `alt` property is important for the purpose of accessibility, without it users using screen readers or other assistive technologies won't be able to understand what your image is supposed to represent. See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attr-alt for more information.";
@@ -424,7 +424,7 @@ export declare const AstroErrorData: {
      * If you believe that your service is properly configured and this error is wrong, please [open an issue](https://astro.build/issues/).
      */
     readonly InvalidImageService: {
-        readonly title: "Error while loading image service";
+        readonly title: "Error while loading image service.";
         readonly code: 3023;
         readonly message: "There was an error loading the configured image service. Please see the stack trace for more information.";
     };
@@ -482,6 +482,69 @@ export declare const AstroErrorData: {
         readonly message: (pathname: string) => string;
         readonly hint: (filename: string) => string;
     };
+    /**
+     * @docs
+     * @see
+     * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+     * @description
+     * An image's `src` property is not valid. The Image component requires the `src` attribute to be either an image that has been ESM imported or a string. This is also true for the first parameter of `getImage()`.
+     *
+     * ```astro
+     * ---
+     * import { Image } from "astro:assets";
+     * import myImage from "../assets/my_image.png";
+     * ---
+     *
+     * <Image src={myImage} alt="..." />
+     * <Image src="https://example.com/logo.png" width={300} height={300} alt="..." />
+     * ```
+     *
+     * In most cases, this error happens when the value passed to `src` is undefined.
+     */
+    readonly ExpectedImage: {
+        readonly title: "Expected src to be an image.";
+        readonly code: 3027;
+        readonly message: (options: string) => string;
+        readonly hint: "This error can often happen because of a wrong path. Make sure the path to your image is correct.";
+    };
+    /**
+     * @docs
+     * @see
+     * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+     * @description
+     * `getImage()`'s first parameter should be an object with the different properties to apply to your image.
+     *
+     * ```ts
+     * import { getImage } from "astro:assets";
+     * import myImage from "../assets/my_image.png";
+     *
+     * const optimizedImage = await getImage({src: myImage, width: 300, height: 300});
+     * ```
+     *
+     * In most cases, this error happens because parameters were passed directly instead of inside an object.
+     */
+    readonly ExpectedImageOptions: {
+        readonly title: "Expected image options.";
+        readonly code: 3028;
+        readonly message: (options: string) => string;
+    };
+    /**
+     * @docs
+     * @message
+     * Could not find requested image `IMAGE_PATH` at `FULL_IMAGE_PATH`.
+     * @see
+     * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+     * @description
+     * Astro could not find an image you included in your Markdown content. Usually, this is simply caused by a typo in the path.
+     *
+     * Images in Markdown are relative to the current file. To refer to an image that is located in the same folder as the `.md` file, the path should start with `./`
+     */
+    readonly MarkdownImageNotFound: {
+        readonly title: "Image not found.";
+        readonly code: 3029;
+        readonly message: (imagePath: string, fullImagePath: string | undefined) => string;
+        readonly hint: "This is often caused by a typo in the image path. Please make sure the file exists, and is spelled correctly.";
+    };
     /**
      * @docs
      * @see

package/dist/core/errors/errors-data.js

@@ -420,7 +420,7 @@ Expected \`true\` value but got \`${suffix}\`.`;
    * If the image is merely decorative (i.e. doesn’t contribute to the understanding of the page), set `alt=""` so that screen readers know to ignore the image.
    */
   ImageMissingAlt: {
-    title: "Missing alt property",
+    title: "Missing alt property.",
     code: 3022,
     message: "The alt property is required.",
     hint: "The `alt` property is important for the purpose of accessibility, without it users using screen readers or other assistive technologies won't be able to understand what your image is supposed to represent. See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attr-alt for more information."
@@ -435,7 +435,7 @@ Expected \`true\` value but got \`${suffix}\`.`;
    * If you believe that your service is properly configured and this error is wrong, please [open an issue](https://astro.build/issues/).
    */
   InvalidImageService: {
-    title: "Error while loading image service",
+    title: "Error while loading image service.",
     code: 3023,
     message: "There was an error loading the configured image service. Please see the stack trace for more information."
   },
@@ -495,6 +495,69 @@ Expected \`true\` value but got \`${suffix}\`.`;
     message: (pathname) => `Could not render \`${pathname}\` with an \`undefined\` param as the generated path will collide during prerendering. Prevent passing \`undefined\` as \`params\` for the endpoint's \`getStaticPaths()\` function, or add an additional extension to the endpoint's filename.`,
     hint: (filename) => `Rename \`${filename}\` to \`${filename.replace(/\.(js|ts)/, (m) => `.json` + m)}\``
   },
+  /**
+   * @docs
+   * @see
+   * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+   * @description
+   * An image's `src` property is not valid. The Image component requires the `src` attribute to be either an image that has been ESM imported or a string. This is also true for the first parameter of `getImage()`.
+   *
+   * ```astro
+   * ---
+   * import { Image } from "astro:assets";
+   * import myImage from "../assets/my_image.png";
+   * ---
+   *
+   * <Image src={myImage} alt="..." />
+   * <Image src="https://example.com/logo.png" width={300} height={300} alt="..." />
+   * ```
+   *
+   * In most cases, this error happens when the value passed to `src` is undefined.
+   */
+  ExpectedImage: {
+    title: "Expected src to be an image.",
+    code: 3027,
+    message: (options) => `Expected \`src\` property to be either an ESM imported image or a string with the path of a remote image. Received \`${options}\`.`,
+    hint: "This error can often happen because of a wrong path. Make sure the path to your image is correct."
+  },
+  /**
+   * @docs
+   * @see
+   * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+   * @description
+   * `getImage()`'s first parameter should be an object with the different properties to apply to your image.
+   *
+   * ```ts
+   * import { getImage } from "astro:assets";
+   * import myImage from "../assets/my_image.png";
+   *
+   * const optimizedImage = await getImage({src: myImage, width: 300, height: 300});
+   * ```
+   *
+   * In most cases, this error happens because parameters were passed directly instead of inside an object.
+   */
+  ExpectedImageOptions: {
+    title: "Expected image options.",
+    code: 3028,
+    message: (options) => `Expected getImage() parameter to be an object. Received \`${options}\`.`
+  },
+  /**
+   * @docs
+   * @message
+   * Could not find requested image `IMAGE_PATH` at `FULL_IMAGE_PATH`.
+   * @see
+   * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+   * @description
+   * Astro could not find an image you included in your Markdown content. Usually, this is simply caused by a typo in the path.
+   *
+   * Images in Markdown are relative to the current file. To refer to an image that is located in the same folder as the `.md` file, the path should start with `./`
+   */
+  MarkdownImageNotFound: {
+    title: "Image not found.",
+    code: 3029,
+    message: (imagePath, fullImagePath) => `Could not find requested image \`${imagePath}\`${fullImagePath ? ` at \`${fullImagePath}\`.` : "."}`,
+    hint: "This is often caused by a typo in the image path. Please make sure the file exists, and is spelled correctly."
+  },
   // No headings here, that way Vite errors are merged with Astro ones in the docs, which makes more sense to users.
   // Vite Errors - 4xxx
   /**

package/dist/core/errors/overlay.js

@@ -77,7 +77,7 @@ const style = (
   --shiki-token-function: #4ca48f;
   --shiki-token-string-expression: #9f722a;
   --shiki-token-punctuation: #ffffff;
-  --shiki-token-link: #ee0000;
+  --shiki-token-link: #9f722a;
 }
 
 :host(.astro-dark) {
@@ -130,9 +130,9 @@ const style = (
   --shiki-token-function: #90f4e3;
   --shiki-token-string-expression: #f4cf90;
   --shiki-token-punctuation: #ffffff;
-  --shiki-token-link: #ee0000;
+  --shiki-token-link: #f4cf90;
 }
-  
+
 #theme-toggle-wrapper{
   position: relative;
   display: inline-block
@@ -143,7 +143,7 @@ const style = (
   right: 3px;
   margin-top: 3px;
 }
-  
+
 .theme-toggle-checkbox {
 	opacity: 0;
 	position: absolute;
@@ -249,7 +249,7 @@ const style = (
     padding: 12px;
     margin-top: 12px;
   }
-  
+
   #theme-toggle-wrapper > div{
     position: absolute;
     right: 22px;
@@ -371,6 +371,7 @@ const style = (
   background-color: var(--border);
   padding: 4px;
   border-radius: var(--roundiness);
+	white-space: nowrap;
 }
 
 .link {
@@ -623,7 +624,8 @@ class ErrorOverlay extends HTMLElement {
       const codeHeader = code.querySelector("#code header");
       const codeContent = code.querySelector("#code-content");
       if (codeHeader) {
-        const cleanFile = err.loc.file.split("/").slice(-2).join("/");
+        const separator = err.loc.file.includes("/") ? "/" : "\\";
+        const cleanFile = err.loc.file.split(separator).slice(-2).join("/");
         const fileLocation = [cleanFile, err.loc.line, err.loc.column].filter(Boolean).join(":");
         const absoluteFileLocation = [err.loc.file, err.loc.line, err.loc.column].filter(Boolean).join(":");
         const codeFile = codeHeader.getElementsByTagName("h2")[0];

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.1.8";
+  const version = "2.1.9";
   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.1.8"}`
+        `v${"2.1.9"}`
       )} ${headline}`
     );
   }

package/dist/core/render/paginate.js

@@ -26,6 +26,14 @@ function generatePaginateFunction(routeMatch) {
         ...additionalParams,
         [paramName]: includesFirstPageNumber || pageNum > 1 ? String(pageNum) : void 0
       };
+      const current = correctIndexRoute(routeMatch.generate({ ...params }));
+      const next = pageNum === lastPage ? void 0 : correctIndexRoute(routeMatch.generate({ ...params, page: String(pageNum + 1) }));
+      const prev = pageNum === 1 ? void 0 : correctIndexRoute(
+        routeMatch.generate({
+          ...params,
+          page: !includesFirstPageNumber && pageNum - 1 === 1 ? void 0 : String(pageNum - 1)
+        })
+      );
       return {
         params,
         props: {
@@ -38,14 +46,7 @@ function generatePaginateFunction(routeMatch) {
             total: data.length,
             currentPage: pageNum,
             lastPage,
-            url: {
-              current: routeMatch.generate({ ...params }),
-              next: pageNum === lastPage ? void 0 : routeMatch.generate({ ...params, page: String(pageNum + 1) }),
-              prev: pageNum === 1 ? void 0 : routeMatch.generate({
-                ...params,
-                page: !includesFirstPageNumber && pageNum - 1 === 1 ? "" : String(pageNum - 1)
-              })
-            }
+            url: { current, next, prev }
           }
         }
       };
@@ -53,6 +54,12 @@ function generatePaginateFunction(routeMatch) {
     return result;
   };
 }
+function correctIndexRoute(route) {
+  if (route === "") {
+    return "/";
+  }
+  return route;
+}
 export {
   generatePaginateFunction
 };

package/dist/vite-plugin-markdown/index.js

@@ -3,13 +3,14 @@ import {
   InvalidAstroDataError,
   safelyGetAstroData
 } from "@astrojs/markdown-remark/dist/internal.js";
-import fs from "fs";
 import matter from "gray-matter";
+import fs from "node:fs";
+import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
 import { AstroError, AstroErrorData, MarkdownError } from "../core/errors/index.js";
 import { warn } from "../core/logger/core.js";
-import { isMarkdownFile } from "../core/util.js";
+import { isMarkdownFile, rootRelativePath } from "../core/util.js";
 import { escapeViteEnvReferences, getFileInfo } from "../vite-plugin-utils/index.js";
 function safeMatter(source, id) {
   try {
@@ -41,6 +42,9 @@ const astroJsxRuntimeModulePath = normalizePath(
 const astroServerRuntimeModulePath = normalizePath(
   fileURLToPath(new URL("../runtime/server/index.js", import.meta.url))
 );
+const astroErrorModulePath = normalizePath(
+  fileURLToPath(new URL("../core/errors/index.js", import.meta.url))
+);
 function markdown({ settings, logging }) {
   return {
     enforce: "pre",
@@ -70,7 +74,7 @@ function markdown({ settings, logging }) {
               var _a;
               return {
                 raw: imagePath,
-                absolute: ((_a = await this.resolve(imagePath, id)) == null ? void 0 : _a.id) ?? imagePath
+                resolved: ((_a = await this.resolve(imagePath, id)) == null ? void 0 : _a.id) ?? path.join(path.dirname(id), imagePath)
               };
             })
           );
@@ -91,16 +95,32 @@ function markdown({ settings, logging }) {
         const code = escapeViteEnvReferences(`
 				import { Fragment, jsx as h } from ${JSON.stringify(astroJsxRuntimeModulePath)};
 				import { spreadAttributes } from ${JSON.stringify(astroServerRuntimeModulePath)};
+				import { AstroError, AstroErrorData } from ${JSON.stringify(astroErrorModulePath)};
 
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
 				${settings.config.experimental.assets ? 'import { getImage } from "astro:assets";' : ""}
 
 				export const images = {
 					${imagePaths.map(
-          (entry) => `'${entry.raw}': await getImage({src: (await import("${entry.absolute}")).default})`
+          (entry) => `'${entry.raw}': await getImageSafely((await import("${entry.raw}")).default, "${entry.raw}", "${rootRelativePath(settings.config, entry.resolved)}")`
         )}
 				}
 
+				async function getImageSafely(imageSrc, imagePath, resolvedImagePath) {
+					if (!imageSrc) {
+						throw new AstroError({
+							...AstroErrorData.MarkdownImageNotFound,
+							message: AstroErrorData.MarkdownImageNotFound.message(
+								imagePath,
+								resolvedImagePath
+							),
+							location: { file: "${id}" },
+						});
+					}
+
+					return await getImage({src: imageSrc})
+				}
+
 				function updateImageReferences(html) {
 					return html.replaceAll(
 						/__ASTRO_IMAGE_="(.+)"/gm,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

package/dist/vite-plugin-integrations-container/index.d.ts

@@ -1,8 +0,0 @@
-import type { Plugin as VitePlugin } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
-import type { LogOptions } from '../core/logger/core.js';
-/** Connect Astro integrations into Vite, as needed. */
-export default function astroIntegrationsContainerPlugin({ settings, logging, }: {
-    settings: AstroSettings;
-    logging: LogOptions;
-}): VitePlugin;

package/dist/vite-plugin-integrations-container/index.js

@@ -1,15 +0,0 @@
-import { runHookServerSetup } from "../integrations/index.js";
-function astroIntegrationsContainerPlugin({
-  settings,
-  logging
-}) {
-  return {
-    name: "astro:integration-container",
-    configureServer(server) {
-      runHookServerSetup({ config: settings.config, server, logging });
-    }
-  };
-}
-export {
-  astroIntegrationsContainerPlugin as default
-};