astro 3.0.12 → 3.1.0

package/README.md

@@ -34,10 +34,10 @@ Having trouble? Get help in the official [Astro Discord](https://astro.build/cha
 
 **New contributors welcome!** Check out our [Contributors Guide](/CONTRIBUTING.md) for help getting started.
 
-Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll help you get your first contribution in no time!
+Join us on [Discord](https://astro.build/chat) to meet other contributors. We'll help you get your first contribution in no time!
 
 ## Sponsors
 
-Astro is generously supported by [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), and several other amazing organizations [listed here.](https://astro.build/)
+Astro is generously supported by [Vercel](https://vercel.com/), [storyblok](https://storyblok.com/), and several other amazing organizations [listed here.](https://opencollective.com/astrodotbuild)
 
 [❤️ Sponsor Astro! ❤️](https://github.com/withastro/.github/blob/main/FUNDING.md)

package/astro-jsx.d.ts

@@ -471,6 +471,33 @@ declare namespace astroHTML.JSX {
 		| 'treegrid'
 		| 'treeitem';
 
+	type CssProperty = keyof Omit<
+		CSSStyleDeclaration,
+		| 'item'
+		| 'setProperty'
+		| 'removeProperty'
+		| 'getPropertyValue'
+		| 'getPropertyPriority'
+		| 'parentRule'
+		| 'length'
+		| 'cssFloat'
+		| 'cssText'
+		| typeof Symbol.iterator
+		| number
+	>;
+
+	type KebabCSSDOMProperties = import('./dist/type-utils.js').KebabKeys<DOMCSSProperties>;
+
+	type DOMCSSProperties = {
+		[key in CssProperty]?: string | number | null | undefined;
+	};
+	type AllCSSProperties = {
+		[key: string]: string | number | null | undefined;
+	};
+	type StyleObject = import('./dist/type-utils.js').Simplify<
+		KebabCSSDOMProperties & DOMCSSProperties & AllCSSProperties
+	>;
+
 	interface HTMLAttributes extends AriaAttributes, DOMAttributes, AstroBuiltinAttributes {
 		// Standard HTML Attributes
 		accesskey?: string | undefined | null;
@@ -513,7 +540,7 @@ declare namespace astroHTML.JSX {
 		lang?: string | undefined | null;
 		slot?: string | undefined | null;
 		spellcheck?: 'true' | 'false' | boolean | undefined | null;
-		style?: string | Record<string, any> | undefined | null;
+		style?: string | StyleObject | undefined | null;
 		tabindex?: number | string | undefined | null;
 		title?: string | undefined | null;
 		translate?: 'yes' | 'no' | undefined | null;

package/client.d.ts

@@ -52,7 +52,7 @@ declare module 'astro:assets' {
 				| import('./dist/assets/types.js').ImageTransform
 				| import('./dist/assets/types.js').UnresolvedImageTransform
 		) => Promise<import('./dist/assets/types.js').GetImageResult>;
-		imageConfig: import('./dist/@types/astro').AstroConfig['image'];
+		imageConfig: import('./dist/@types/astro.js').AstroConfig['image'];
 		getConfiguredImageService: typeof import('./dist/assets/index.js').getConfiguredImageService;
 		Image: typeof import('./components/Image.astro').default;
 	};
@@ -108,6 +108,10 @@ declare module '*.svg' {
 	const metadata: ImageMetadata;
 	export default metadata;
 }
+declare module '*.avif' {
+	const metadata: ImageMetadata;
+	export default metadata;
+}
 
 declare module 'astro:transitions' {
 	type TransitionModule = typeof import('./dist/transitions/index.js');
@@ -126,7 +130,7 @@ declare module 'astro:components' {
 	export * from 'astro/components';
 }
 
-type MD = import('./dist/@types/astro').MarkdownInstance<Record<string, any>>;
+type MD = import('./dist/@types/astro.js').MarkdownInstance<Record<string, any>>;
 interface ExportedMarkdownModuleEntities {
 	frontmatter: MD['frontmatter'];
 	file: MD['file'];
@@ -231,7 +235,7 @@ declare module '*.mdown' {
 }
 
 declare module '*.mdx' {
-	type MDX = import('./dist/@types/astro').MDXInstance<Record<string, any>>;
+	type MDX = import('./dist/@types/astro.js').MDXInstance<Record<string, any>>;
 
 	export const frontmatter: MDX['frontmatter'];
 	export const file: MDX['file'];
@@ -244,7 +248,7 @@ declare module '*.mdx' {
 }
 
 declare module 'astro:ssr-manifest' {
-	export const manifest: import('./dist/@types/astro').SSRManifest;
+	export const manifest: import('./dist/@types/astro.js').SSRManifest;
 }
 
 // Everything below are Vite's types (apart from image types, which are in `client.d.ts`)

package/components/ViewTransitions.astro

@@ -15,6 +15,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 	type Direction = 'forward' | 'back';
 	type State = {
 		index: number;
+		scrollX: number;
 		scrollY: number;
 	};
 	type Events = 'astro:page-load' | 'astro:after-swap';
@@ -37,9 +38,9 @@ const { fallback = 'animate' } = Astro.props as Props;
 		// we reloaded a page with history state
 		// (e.g. history navigation from non-transition page or browser reload)
 		currentHistoryIndex = history.state.index;
-		scrollTo({ left: 0, top: history.state.scrollY });
+		scrollTo({ left: history.state.scrollX, top: history.state.scrollY });
 	} else if (transitionEnabledOnThisPage()) {
-		history.replaceState({ index: currentHistoryIndex, scrollY }, '');
+		history.replaceState({ index: currentHistoryIndex, scrollX, scrollY }, '');
 	}
 	const throttle = (cb: (...args: any[]) => any, delay: number) => {
 		let wait = false;
@@ -64,9 +65,19 @@ const { fallback = 'animate' } = Astro.props as Props;
 	};
 
 	async function getHTML(href: string) {
-		const res = await fetch(href);
-		const html = await res.text();
-		return { ok: res.ok, html };
+		try {
+			const res = await fetch(href);
+			const html = await res.text();
+			return {
+				ok: res.ok,
+				html,
+				redirected: res.redirected ? res.url : undefined,
+				// drop potential charset (+ other name/value pairs) as parser needs the mediaType
+				mediaType: res.headers.get('content-type')?.replace(/;.*$/, ''),
+			};
+		} catch (err) {
+			return { ok: false };
+		}
 	}
 
 	function getFallback(): Fallback {
@@ -113,10 +124,15 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 	const parser = new DOMParser();
 
+	// A noop element used to prevent styles from being removed
+	if (import.meta.env.DEV) {
+		var noopEl = document.createElement('div');
+	}
+
 	async function updateDOM(doc: Document, loc: URL, state?: State, fallback?: Fallback) {
 		// Check for a head element that should persist, either because it has the data
 		// attribute or is a link el.
-		const persistedHeadElement = (el: Element): Element | null => {
+		const persistedHeadElement = (el: HTMLElement): Element | null => {
 			const id = el.getAttribute(PERSIST_ATTR);
 			const newEl = id && doc.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
 			if (newEl) {
@@ -139,6 +155,18 @@ const { fallback = 'animate' } = Astro.props as Props;
 					}
 				}
 			}
+			// Only run this in dev. This will get stripped from production builds and is not needed.
+			if (import.meta.env.DEV) {
+				if (el.tagName === 'STYLE' && el.dataset.viteDevId) {
+					const devId = el.dataset.viteDevId;
+					// If this same style tag exists, remove it from the new page
+					return (
+						doc.querySelector(`style[data-astro-dev-id="${devId}"]`) ||
+						// Otherwise, keep it anyways. This is client:only styles.
+						noopEl
+					);
+				}
+			}
 			return null;
 		};
 
@@ -161,7 +189,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 			// Swap head
 			for (const el of Array.from(document.head.children)) {
-				const newEl = persistedHeadElement(el);
+				const newEl = persistedHeadElement(el as HTMLElement);
 				// If the element exists in the document already, remove it
 				// from the new document and leave the current node alone
 				if (newEl) {
@@ -191,17 +219,29 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// Chromium based browsers (Chrome, Edge, Opera, ...)
 			scrollTo({ left: 0, top: 0, behavior: 'instant' });
 
+			let initialScrollX = 0;
 			let initialScrollY = 0;
 			if (!state && loc.hash) {
 				const id = decodeURIComponent(loc.hash.slice(1));
 				const elem = document.getElementById(id);
 				// prefer scrollIntoView() over scrollTo() because it takes scroll-padding into account
-				elem && (initialScrollY = elem.offsetTop) && elem.scrollIntoView();
-			} else if (state && state.scrollY !== 0) {
-				scrollTo(0, state.scrollY); // usings default scrollBehavior
+				if (elem) {
+					elem.scrollIntoView();
+					initialScrollX = Math.max(
+						0,
+						elem.offsetLeft + elem.offsetWidth - document.documentElement.clientWidth
+					);
+					initialScrollY = elem.offsetTop;
+				}
+			} else if (state) {
+				scrollTo(state.scrollX, state.scrollY); // usings default scrollBehavior
 			}
 			!state &&
-				history.pushState({ index: ++currentHistoryIndex, scrollY: initialScrollY }, '', loc.href);
+				history.pushState(
+					{ index: ++currentHistoryIndex, scrollX: initialScrollX, scrollY: initialScrollY },
+					'',
+					loc.href
+				);
 			triggerEvent('astro:after-swap');
 		};
 
@@ -250,18 +290,24 @@ const { fallback = 'animate' } = Astro.props as Props;
 	async function navigate(dir: Direction, loc: URL, state?: State) {
 		let finished: Promise<void>;
 		const href = loc.href;
-		const { html, ok } = await getHTML(href);
+		const { html, ok, mediaType, redirected } = await getHTML(href);
+		// if there was a redirection, show the final URL in the browser's address bar
+		redirected && (loc = new URL(redirected));
 		// If there is a problem fetching the new page, just do an MPA navigation to it.
-		if (!ok) {
+		if (!ok || !(mediaType === 'text/html' || mediaType === 'application/xhtml+xml')) {
 			location.href = href;
 			return;
 		}
-		const doc = parser.parseFromString(html, 'text/html');
+
+		const doc = parser.parseFromString(html, mediaType);
 		if (!doc.querySelector('[name="astro-view-transitions-enabled"]')) {
 			location.href = href;
 			return;
 		}
 
+		// Now we are sure that we will push state, and it is time to create a state if it is still missing.
+		!state && history.replaceState({ index: currentHistoryIndex, scrollX, scrollY }, '');
+
 		document.documentElement.dataset.astroTransition = dir;
 		if (supportsViewTransitions) {
 			finished = document.startViewTransition(() => updateDOM(doc, loc, state)).finished;
@@ -335,28 +381,31 @@ const { fallback = 'animate' } = Astro.props as Props;
 					// But we want to handle it like any other same page navigation
 					// So we scroll to the top of the page but do not start page transitions
 					ev.preventDefault();
-					persistState({ ...history.state, scrollY });
-					scrollTo({ left: 0, top: 0, behavior: 'instant' });
+					// push state on the first navigation but not if we were here already
 					if (location.hash) {
-						// last target was different
-						const newState: State = { index: ++currentHistoryIndex, scrollY: 0 };
+						history.replaceState(
+							{ index: currentHistoryIndex, scrollX, scrollY: -(scrollY + 1) },
+							''
+						);
+						const newState: State = { index: ++currentHistoryIndex, scrollX: 0, scrollY: 0 };
 						history.pushState(newState, '', link.href);
 					}
+					scrollTo({ left: 0, top: 0, behavior: 'instant' });
 					return;
 				}
 			}
 
 			// these are the cases we will handle: same origin, different page
 			ev.preventDefault();
-			persistState({ index: currentHistoryIndex, scrollY });
 			navigate('forward', new URL(link.href));
 		});
 
 		addEventListener('popstate', (ev) => {
 			if (!transitionEnabledOnThisPage() && ev.state) {
-				// The current page doesn't haven't View Transitions,
-				// respect that with a full page reload
-				// -- but only for transition managed by us (ev.state is set)
+				// The current page doesn't have View Transitions enabled
+				// but the page we navigate to does (because it set the state).
+				// Do a full page refresh to reload the client-side router from the new page.
+				// Scroll restauration will then happen during the reload when the router's code is re-executed
 				history.scrollRestoration && (history.scrollRestoration = 'manual');
 				location.reload();
 				return;
@@ -383,7 +432,11 @@ const { fallback = 'animate' } = Astro.props as Props;
 			const nextIndex = state.index;
 			const direction: Direction = nextIndex > currentHistoryIndex ? 'forward' : 'back';
 			currentHistoryIndex = nextIndex;
-			navigate(direction, new URL(location.href), state);
+			if (state.scrollY < 0) {
+				scrollTo(state.scrollX, -(state.scrollY + 1));
+			} else {
+				navigate(direction, new URL(location.href), state);
+			}
 		});
 
 		['mouseenter', 'touchstart', 'focus'].forEach((evName) => {
@@ -408,7 +461,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 		// There's not a good way to record scroll position before a back button.
 		// So the way we do it is by listening to scrollend if supported, and if not continuously record the scroll position.
 		const updateState = () => {
-			persistState({ ...history.state, scrollY });
+			persistState({ ...history.state, scrollX, scrollY });
 		};
 
 		if ('onscrollend' in window) addEventListener('scrollend', updateState);

package/content-types.template.d.ts

@@ -12,7 +12,12 @@ declare module 'astro:content' {
 	export { z } from 'astro/zod';
 
 	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
-	export type CollectionEntry<C extends keyof AnyEntryMap> = Flatten<AnyEntryMap[C]>;
+
+	export type CollectionKey = keyof AnyEntryMap;
+	export type CollectionEntry<C extends CollectionKey> = Flatten<AnyEntryMap[C]>;
+
+	export type ContentCollectionKey = keyof ContentEntryMap;
+	export type DataCollectionKey = keyof DataEntryMap;
 
 	// This needs to be in sync with ImageMetadata
 	export type ImageFunction = () => import('astro/zod').ZodObject<{

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

@@ -1,6 +1,6 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';
 import type * as babel from '@babel/core';
 import type { OutgoingHttpHeaders } from 'node:http';
@@ -8,24 +8,24 @@ import type { AddressInfo } from 'node:net';
 import type * as rollup from 'rollup';
 import type { TsConfigJson } from 'tsconfig-resolver';
 import type * as vite from 'vite';
-import type { RemotePattern } from '../assets/utils/remotePattern';
-import type { SerializedSSRManifest } from '../core/app/types';
-import type { PageBuildData } from '../core/build/types';
-import type { AstroConfigType } from '../core/config';
-import type { AstroTimer } from '../core/config/timer';
-import type { AstroCookies } from '../core/cookies';
+import type { RemotePattern } from '../assets/utils/remotePattern.js';
+import type { SerializedSSRManifest } from '../core/app/types.js';
+import type { PageBuildData } from '../core/build/types.js';
+import type { AstroConfigType } from '../core/config/index.js';
+import type { AstroTimer } from '../core/config/timer.js';
+import type { AstroCookies } from '../core/cookies/index.js';
 import type { ResponseWithEncoding } from '../core/endpoint/index.js';
-import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger/core';
-import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server';
-import type { OmitIndexSignature, Simplify } from '../type-utils';
+import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger/core.js';
+import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server/index.js';
+import type { OmitIndexSignature, Simplify } from '../type-utils.js';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export { type AstroIntegrationLogger };
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
-export type { ExternalImageService, ImageService, LocalImageService, } from '../assets/services/service';
-export type { GetImageResult, ImageInputFormat, ImageMetadata, ImageOutputFormat, ImageQuality, ImageQualityPreset, ImageTransform, } from '../assets/types';
-export type { RemotePattern } from '../assets/utils/remotePattern';
-export type { SSRManifest } from '../core/app/types';
-export type { AstroCookies } from '../core/cookies';
+export type { ExternalImageService, ImageService, LocalImageService, } from '../assets/services/service.js';
+export type { GetImageResult, ImageInputFormat, ImageMetadata, ImageOutputFormat, ImageQuality, ImageQualityPreset, ImageTransform, } from '../assets/types.js';
+export type { RemotePattern } from '../assets/utils/remotePattern.js';
+export type { SSRManifest } from '../core/app/types.js';
+export type { AstroCookies } from '../core/cookies/index.js';
 export interface AstroBuiltinProps {
     'client:load'?: boolean;
     'client:idle'?: boolean;
@@ -543,12 +543,12 @@ export interface AstroUserConfig {
      * @description
      *
      * Specify the strategy used for scoping styles within Astro components. Choose from:
-     *   - `'where'` 		- Use `:where` selectors, causing no specifity increase.
-     *   - `'class'` 		- Use class-based selectors, causing a +1 specifity increase.
-     *   - `'attribute'` 	- Use `data-` attributes, causing no specifity increase.
+     *   - `'where'` 		- Use `:where` selectors, causing no specificity increase.
+     *   - `'class'` 		- Use class-based selectors, causing a +1 specificity increase.
+     *   - `'attribute'` 	- Use `data-` attributes, causing a +1 specificity increase.
      *
      * Using `'class'` is helpful when you want to ensure that element selectors within an Astro component override global style defaults (e.g. from a global stylesheet).
-     * Using `'where'` gives you more control over specifity, but requires that you use higher-specifity selectors, layers, and other tools to control which selectors are applied.
+     * Using `'where'` gives you more control over specificity, but requires that you use higher-specificity selectors, layers, and other tools to control which selectors are applied.
      * Using `'attribute'` is useful when you are manipulating the `class` attribute of elements and need to avoid conflicts between your own styling logic and Astro's application of styles.
      */
     scopedStyleStrategy?: 'where' | 'class' | 'attribute';
@@ -889,6 +889,27 @@ export interface AstroUserConfig {
      * @name Image Options
      */
     image?: {
+        /**
+         * @docs
+         * @name image.endpoint
+         * @type {string}
+         * @default `undefined`
+         * @version 3.1.0
+         * @description
+         * Set the endpoint to use for image optimization in dev and SSR. Set to `undefined` to use the default endpoint.
+         *
+         * The endpoint will always be injected at `/_image`.
+         *
+         * ```js
+         * {
+         *   image: {
+         *     // Example: Use a custom image endpoint
+         *     endpoint: './src/image-endpoint.ts',
+         *   },
+         * }
+         * ```
+         */
+        endpoint?: string;
         /**
          * @docs
          * @name image.service
@@ -911,7 +932,7 @@ export interface AstroUserConfig {
          * }
          * ```
          */
-        service: ImageServiceConfig;
+        service?: ImageServiceConfig;
         /**
          * @docs
          * @name image.domains

package/dist/assets/build/generate.d.ts

@@ -1,4 +1,4 @@
-import type { BuildPipeline } from '../../core/build/buildPipeline';
+import type { BuildPipeline } from '../../core/build/buildPipeline.js';
 import type { ImageTransform } from '../types.js';
 interface GenerationDataUncached {
     cached: false;

package/dist/assets/build/remote.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 export type RemoteCacheEntry = {
     data: string;
     expires: number;

package/dist/assets/consts.d.ts

@@ -1,9 +1,9 @@
 export declare const VIRTUAL_MODULE_ID = "astro:assets";
 export declare const VIRTUAL_SERVICE_ID = "virtual:image-service";
-export declare const VALID_INPUT_FORMATS: readonly ["jpeg", "jpg", "png", "tiff", "webp", "gif", "svg"];
+export declare const VALID_INPUT_FORMATS: readonly ["jpeg", "jpg", "png", "tiff", "webp", "gif", "svg", "avif"];
 /**
  * Valid formats that our base services support.
  * Certain formats can be imported (namely SVGs) but will not be processed.
  */
-export declare const VALID_SUPPORTED_FORMATS: readonly ["jpeg", "jpg", "png", "tiff", "webp", "gif", "svg"];
+export declare const VALID_SUPPORTED_FORMATS: readonly ["jpeg", "jpg", "png", "tiff", "webp", "gif", "svg", "avif"];
 export declare const VALID_OUTPUT_FORMATS: readonly ["avif", "png", "webp", "jpeg", "jpg", "svg"];

package/dist/assets/consts.js

@@ -1,21 +1,14 @@
 const VIRTUAL_MODULE_ID = "astro:assets";
 const VIRTUAL_SERVICE_ID = "virtual:image-service";
 const VALID_INPUT_FORMATS = [
-  // TODO: `image-size` does not support the following formats, so users can't import them.
-  // However, it would be immensely useful to add, for three reasons:
-  // - `heic` and `heif` are common formats, especially among Apple users.
-  // - AVIF is a common format on the web that's bound to become more and more common.
-  // - It's totally reasonable for an user's provided image service to want to support more image types.
-  //'heic',
-  //'heif',
-  //'avif',
   "jpeg",
   "jpg",
   "png",
   "tiff",
   "webp",
   "gif",
-  "svg"
+  "svg",
+  "avif"
 ];
 const VALID_SUPPORTED_FORMATS = [
   "jpeg",
@@ -24,7 +17,8 @@ const VALID_SUPPORTED_FORMATS = [
   "tiff",
   "webp",
   "gif",
-  "svg"
+  "svg",
+  "avif"
 ];
 const VALID_OUTPUT_FORMATS = ["avif", "png", "webp", "jpeg", "jpg", "svg"];
 export {

package/dist/assets/internal.js

@@ -3,9 +3,10 @@ import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { isLocalService } from "./services/service.js";
 import { matchHostname, matchPattern } from "./utils/remotePattern.js";
 function injectImageEndpoint(settings) {
+  const endpointEntrypoint = settings.config.image.endpoint ?? "astro/assets/image-endpoint";
   settings.injectedRoutes.push({
     pattern: "/_image",
-    entryPoint: "astro/assets/image-endpoint",
+    entryPoint: endpointEntrypoint,
     prerender: false
   });
   return settings;
@@ -52,7 +53,7 @@ async function getImage(options, imageConfig) {
   const service = await getConfiguredImageService();
   const resolvedOptions = {
     ...options,
-    src: typeof options.src === "object" && "then" in options.src ? (await options.src).default : options.src
+    src: typeof options.src === "object" && "then" in options.src ? (await options.src).default ?? await options.src : options.src
   };
   const validatedOptions = service.validateOptions ? await service.validateOptions(resolvedOptions, imageConfig) : resolvedOptions;
   let imageURL = await service.getURL(validatedOptions, imageConfig);

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

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import type { AstroConfig } from '../../@types/astro.js';
 import type { ImageOutputFormat, ImageTransform } from '../types.js';
 export type ImageService = LocalImageService | ExternalImageService;

package/dist/assets/services/service.js

@@ -1,5 +1,5 @@
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
-import { joinPaths } from "../../core/path.js";
+import { isRemotePath, joinPaths } from "../../core/path.js";
 import { VALID_SUPPORTED_FORMATS } from "../consts.js";
 import { isESMImportedImage, isRemoteAllowed } from "../internal.js";
 function isLocalService(service) {
@@ -20,11 +20,15 @@ const baseService = {
     if (!options.src || typeof options.src !== "string" && typeof options.src !== "object") {
       throw new AstroError({
         ...AstroErrorData.ExpectedImage,
-        message: AstroErrorData.ExpectedImage.message(JSON.stringify(options.src))
+        message: AstroErrorData.ExpectedImage.message(
+          JSON.stringify(options.src),
+          typeof options.src,
+          JSON.stringify(options, (_, v) => v === void 0 ? null : v)
+        )
       });
     }
     if (!isESMImportedImage(options.src)) {
-      if (options.src.startsWith("/@fs/")) {
+      if (options.src.startsWith("/@fs/") || !isRemotePath(options.src) && !options.src.startsWith("/")) {
         throw new AstroError({
           ...AstroErrorData.LocalImageUsedWrongly,
           message: AstroErrorData.LocalImageUsedWrongly.message(options.src)

package/dist/assets/services/vendor/squoosh/avif/avif_node_dec.wasm.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/avif/avif_node_enc.wasm.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/codecs.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 interface DecodeModule extends EmscriptenWasm.Module {
     decode: (data: Uint8Array) => ImageData;
 }
@@ -12,9 +12,9 @@ export interface ResizeOptions {
 export interface RotateOptions {
     numRotations: number;
 }
-import type { MozJPEGModule as MozJPEGEncodeModule } from './mozjpeg/mozjpeg_enc';
-import type { WebPModule as WebPEncodeModule } from './webp/webp_enc';
-import type { AVIFModule as AVIFEncodeModule } from './avif/avif_enc';
+import type { MozJPEGModule as MozJPEGEncodeModule } from './mozjpeg/mozjpeg_enc.js';
+import type { WebPModule as WebPEncodeModule } from './webp/webp_enc.js';
+import type { AVIFModule as AVIFEncodeModule } from './avif/avif_enc.js';
 import ImageData from './image_data.js';
 export declare const preprocessors: {
     readonly resize: {

package/dist/assets/services/vendor/squoosh/image-pool.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import type { ImageOutputFormat } from '../../../types.js';
 import type { Operation } from './image.js';
 export declare function processBuffer(buffer: Buffer, operations: Operation[], encoding: ImageOutputFormat, quality?: number): Promise<Uint8Array>;

package/dist/assets/services/vendor/squoosh/image.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import type { ImageOutputFormat } from '../../../types.js';
 type RotateOperation = {
     type: 'rotate';

package/dist/assets/services/vendor/squoosh/image_data.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 export default class ImageData {
     static from(input: ImageData): ImageData;
     private _data;

package/dist/assets/services/vendor/squoosh/impl.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import ImageData from './image_data.js';
 export declare function decodeBuffer(_buffer: Buffer | Uint8Array): Promise<ImageData>;
 export declare function rotate(image: ImageData, numRotations: number): Promise<ImageData>;

package/dist/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_dec.wasm.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_enc.wasm.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/png/squoosh_oxipng_bg.wasm.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/png/squoosh_png_bg.wasm.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/resize/squoosh_resize_bg.wasm.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;