astro 3.0.0-beta.4 → 3.0.0-rc.6

package/components/ViewTransitions.astro

@@ -17,25 +17,24 @@ const { fallback = 'animate' } = Astro.props as Props;
 		index: number;
 		scrollY: number;
 	};
-	type Events = 'astro:load' | 'astro:beforeload';
+	type Events = 'astro:page-load' | 'astro:after-swap';
 
 	const persistState = (state: State) => history.replaceState(state, '');
+	const supportsViewTransitions = !!document.startViewTransition;
+	const transitionEnabledOnThisPage = () =>
+		!!document.querySelector('[name="astro-view-transitions-enabled"]');
+	const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));
+	const onPageLoad = () => triggerEvent('astro:page-load');
+	const PERSIST_ATTR = 'data-astro-transition-persist';
 
 	// The History API does not tell you if navigation is forward or back, so
 	// you can figure it using an index. On pushState the index is incremented so you
 	// can use that to determine popstate if going forward or back.
 	let currentHistoryIndex = history.state?.index || 0;
-	if (!history.state) {
+	if (!history.state && transitionEnabledOnThisPage()) {
 		persistState({ index: currentHistoryIndex, scrollY: 0 });
 	}
 
-	const supportsViewTransitions = !!document.startViewTransition;
-	const transitionEnabledOnThisPage = () =>
-		!!document.querySelector('[name="astro-view-transitions-enabled"]');
-	const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));
-	const onload = () => triggerEvent('astro:load');
-	const PERSIST_ATTR = 'data-astro-transition-persist';
-
 	const throttle = (cb: (...args: any[]) => any, delay: number) => {
 		let wait = false;
 		// During the waiting time additional events are lost.
@@ -101,9 +100,8 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 	const parser = new DOMParser();
 
-	async function updateDOM(dir: Direction, html: string, state?: State, fallback?: Fallback) {
+	async function updateDOM(html: string, state?: State, fallback?: Fallback) {
 		const doc = parser.parseFromString(html, 'text/html');
-		doc.documentElement.dataset.astroTransition = dir;
 
 		// Check for a head element that should persist, either because it has the data
 		// attribute or is a link el.
@@ -138,6 +136,18 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// Remove them before swapping.
 			doc.querySelectorAll('head noscript').forEach((el) => el.remove());
 
+			// swap attributes of the html element
+			// - delete all attributes from the current document
+			// - insert all attributes from doc
+			// - reinsert all original attributes that are named 'data-astro-*'
+			const html = document.documentElement;
+			const astro = [...html.attributes].filter(
+				({ name }) => (html.removeAttribute(name), name.startsWith('data-astro-'))
+			);
+			[...doc.documentElement.attributes, ...astro].forEach(({ name, value }) =>
+				html.setAttribute(name, value)
+			);
+
 			// Swap head
 			for (const el of Array.from(document.head.children)) {
 				const newEl = persistedHeadElement(el);
@@ -166,17 +176,24 @@ const { fallback = 'animate' } = Astro.props as Props;
 				}
 			}
 
+			// Simulate scroll behavior of Safari and
+			// Chromium based browsers (Chrome, Edge, Opera, ...)
+			scrollTo({ left: 0, top: 0, behavior: 'instant' });
+
 			if (state?.scrollY === 0 && location.hash) {
 				const id = decodeURIComponent(location.hash.slice(1));
-				state.scrollY = document.getElementById(id)?.offsetTop || 0;
-			}
-			if (state?.scrollY != null) {
-				scrollTo(0, state.scrollY);
-				// Overwrite erroneous updates by the scroll handler during transition
-				persistState(state);
+				const elem = document.getElementById(id);
+				// prefer scrollIntoView() over scrollTo() because it takes scroll-padding into account
+				if (elem) {
+					state.scrollY = elem.offsetTop;
+					persistState(state); // first guess, later updated by scroll handler
+					elem.scrollIntoView(); // for Firefox, this should better be {behavior: 'instant'}
+				}
+			} else if (state && state.scrollY !== 0) {
+				scrollTo(0, state.scrollY); // usings default scrollBehavior
 			}
 
-			triggerEvent('astro:beforeload');
+			triggerEvent('astro:after-swap');
 		};
 
 		// Wait on links to finish, to prevent FOUC
@@ -233,18 +250,20 @@ const { fallback = 'animate' } = Astro.props as Props;
 			location.href = href;
 			return;
 		}
+		document.documentElement.dataset.astroTransition = dir;
 		if (supportsViewTransitions) {
-			finished = document.startViewTransition(() => updateDOM(dir, html, state)).finished;
+			finished = document.startViewTransition(() => updateDOM(html, state)).finished;
 		} else {
-			finished = updateDOM(dir, html, state, getFallback());
+			finished = updateDOM(html, state, getFallback());
 		}
 		try {
 			await finished;
 		} finally {
-			document.documentElement.removeAttribute('data-astro-transition');
+			// skip this for the moment as it tends to stop fallback animations
+			// document.documentElement.removeAttribute('data-astro-transition');
 			await runScripts();
 			markScriptsExec();
-			onload();
+			onPageLoad();
 		}
 	}
 
@@ -273,43 +292,69 @@ const { fallback = 'animate' } = Astro.props as Props;
 			// that is going to another page within the same origin. Basically it determines
 			// same-origin navigation, but omits special key combos for new tabs, etc.
 			if (
-				link &&
-				link instanceof HTMLAnchorElement &&
-				link.href &&
-				(!link.target || link.target === '_self') &&
-				link.origin === location.origin &&
-				!(
-					// Same page means same path and same query params
-					(location.pathname === link.pathname && location.search === link.search)
-				) &&
-				ev.button === 0 && // left clicks only
-				!ev.metaKey && // new tab (mac)
-				!ev.ctrlKey && // new tab (windows)
-				!ev.altKey && // download
-				!ev.shiftKey &&
-				!ev.defaultPrevented &&
-				transitionEnabledOnThisPage()
-			) {
-				ev.preventDefault();
-				navigate('forward', link.href, { index: currentHistoryIndex, scrollY: 0 });
-				currentHistoryIndex++;
-				const newState: State = { index: currentHistoryIndex, scrollY };
-				persistState({ index: currentHistoryIndex - 1, scrollY });
-				history.pushState(newState, '', link.href);
+				!link ||
+				!(link instanceof HTMLAnchorElement) ||
+				link.dataset.astroReload !== undefined ||
+				!link.href ||
+				(link.target && link.target !== '_self') ||
+				link.origin !== location.origin ||
+				ev.button !== 0 || // left clicks only
+				ev.metaKey || // new tab (mac)
+				ev.ctrlKey || // new tab (windows)
+				ev.altKey || // download
+				ev.shiftKey || // new window
+				ev.defaultPrevented ||
+				!transitionEnabledOnThisPage()
+			)
+				// No page transitions in these cases,
+				// Let the browser standard action handle this
+				return;
+
+			// We do not need to handle same page links because there are no page transitions
+			// Same page means same path and same query params (but different hash)
+			if (location.pathname === link.pathname && location.search === link.search) {
+				if (link.hash) {
+					// The browser default action will handle navigations with hash fragments
+					return;
+				} else {
+					// Special case: self link without hash
+					// If handed to the browser it will reload the page
+					// 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' });
+					if (location.hash) {
+						// last target was different
+						const newState: State = { index: ++currentHistoryIndex, scrollY: 0 };
+						history.pushState(newState, '', link.href);
+					}
+					return;
+				}
 			}
+
+			// these are the cases we will handle: same origin, different page
+			ev.preventDefault();
+			navigate('forward', link.href, { index: ++currentHistoryIndex, scrollY: 0 });
+			const newState: State = { index: currentHistoryIndex, scrollY };
+			persistState({ index: currentHistoryIndex - 1, scrollY });
+			history.pushState(newState, '', link.href);
 		});
+
 		addEventListener('popstate', (ev) => {
-			if (!transitionEnabledOnThisPage()) {
+			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)
 				location.reload();
 				return;
 			}
 
-			// hash change creates no state.
+			// History entries without state are created by the browser (e.g. for hash links)
+			// Our view transition entries always have state.
+			// Just ignore stateless entries.
+			// The browser will handle navigation fine without our help
 			if (ev.state === null) {
-				persistState({ index: currentHistoryIndex, scrollY });
-				ev.preventDefault();
 				return;
 			}
 
@@ -338,17 +383,17 @@ const { fallback = 'animate' } = Astro.props as Props;
 				{ passive: true, capture: true }
 			);
 		});
-		addEventListener('load', onload);
+		addEventListener('load', onPageLoad);
 		// There's not a good way to record scroll position before a back button.
-		// So the way we do it is by listening to scroll and just continuously recording it.
-		addEventListener(
-			'scroll',
-			throttle(() => {
-				if (history.state) {
-					persistState({ ...history.state, scrollY });
-				}
-			}, 300),
-			{ passive: true }
-		);
+		// So the way we do it is by listening to scrollend if supported, and if not continuously record the scroll position.
+    const updateState = () => {
+			// only update history entries that are managed by us
+			// leave other entries alone and do not accidently add state.
+			if (history.state) {
+				persistState({ ...history.state, scrollY });
+			}
+		}
+		if ('onscrollend' in window) addEventListener('scrollend', updateState);
+		else addEventListener('scroll', throttle(updateState, 300));
 	}
 </script>

package/components/shiki-themes.js

@@ -34,10 +34,4 @@ export const themes = {
 	'solarized-light': () => import('shiki/themes/solarized-light.json').then(mod => mod.default),
 	'vitesse-dark': () => import('shiki/themes/vitesse-dark.json').then(mod => mod.default),
 	'vitesse-light': () => import('shiki/themes/vitesse-light.json').then(mod => mod.default),
-	// old theme names for compat
-	'material-darker': () => import('shiki/themes/material-theme-darker').then(mod => mod.default),
-	'material-default': () => import('shiki/themes/material-theme').then(mod => mod.default),
-	'material-lighter': () => import('shiki/themes/material-theme-lighter').then(mod => mod.default),
-	'material-ocean': () => import('shiki/themes/material-theme-ocean').then(mod => mod.default),
-	'material-palenight': () => import('shiki/themes/material-theme-palenight').then(mod => mod.default),
 };

package/content-types.template.d.ts

@@ -14,25 +14,6 @@ declare module 'astro:content' {
 	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
 	export type CollectionEntry<C extends keyof AnyEntryMap> = Flatten<AnyEntryMap[C]>;
 
-	// TODO: Remove this when having this fallback is no longer relevant. 2.3? 3.0? - erika, 2023-04-04
-	/**
-	 * @deprecated
-	 * `astro:content` no longer provide `image()`.
-	 *
-	 * Please use it through `schema`, like such:
-	 * ```ts
-	 * import { defineCollection, z } from "astro:content";
-	 *
-	 * defineCollection({
-	 *   schema: ({ image }) =>
-	 *     z.object({
-	 *       image: image(),
-	 *     }),
-	 * });
-	 * ```
-	 */
-	export const image: never;
-
 	// This needs to be in sync with ImageMetadata
 	export type ImageFunction = () => import('astro/zod').ZodObject<{
 		src: import('astro/zod').ZodString;
@@ -53,12 +34,9 @@ declare module 'astro:content' {
 
 	type BaseSchemaWithoutEffects =
 		| import('astro/zod').AnyZodObject
-		| import('astro/zod').ZodUnion<import('astro/zod').AnyZodObject[]>
+		| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
 		| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
-		| import('astro/zod').ZodIntersection<
-				import('astro/zod').AnyZodObject,
-				import('astro/zod').AnyZodObject
-		  >;
+		| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;
 
 	type BaseSchema =
 		| BaseSchemaWithoutEffects

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

@@ -14,8 +14,8 @@ 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 { LogOptions, LoggerLevel } from '../core/logger/core';
-import type { AstroIntegrationLogger } from '../core/logger/core';
+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 { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
@@ -47,7 +47,7 @@ export interface TransitionDirectionalAnimations {
     forwards: TransitionAnimationPair;
     backwards: TransitionAnimationPair;
 }
-export type TransitionAnimationValue = 'morph' | 'slide' | 'fade' | TransitionDirectionalAnimations;
+export type TransitionAnimationValue = 'initial' | 'slide' | 'fade' | 'none' | TransitionDirectionalAnimations;
 export interface AstroClientDirectives {
 }
 export interface AstroBuiltinAttributes {
@@ -55,7 +55,7 @@ export interface AstroBuiltinAttributes {
     'set:html'?: any;
     'set:text'?: any;
     'is:raw'?: boolean;
-    'transition:animate'?: 'morph' | 'slide' | 'fade' | TransitionDirectionalAnimations;
+    'transition:animate'?: TransitionAnimationValue;
     'transition:name'?: string;
     'transition:persist'?: boolean | string;
 }
@@ -63,14 +63,10 @@ export interface AstroDefineVarsAttribute {
     'define:vars'?: any;
 }
 export interface AstroStyleAttributes {
-    /** @deprecated Use `is:global` instead */
-    global?: boolean;
     'is:global'?: boolean;
     'is:inline'?: boolean;
 }
 export interface AstroScriptAttributes {
-    /** @deprecated Hoist is now the default behavior */
-    hoist?: boolean;
     'is:inline'?: boolean;
 }
 export interface AstroComponentMetadata {
@@ -540,7 +536,7 @@ export interface AstroUserConfig {
      * @docs
      * @name scopedStyleStrategy
      * @type {('where' | 'class' | 'attribute')}
-     * @default `'where'`
+     * @default `'attribute'`
      * @version 2.4
      * @description
      *
@@ -551,7 +547,7 @@ export interface AstroUserConfig {
      *
      * 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 `'attribute'` is useful in case there's manipulation of the class attributes, so the styling emitted by Astro doesn't go in conflict with the user's business logic.
+     * 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';
     /**
@@ -787,22 +783,12 @@ export interface AstroUserConfig {
          * @name build.split
          * @type {boolean}
          * @default `false`
-         * @version 2.7.0
+         * @deprecated Deprecated since version 3.0.
          * @description
-         * Defines how the SSR code should be bundled when built.
+         * The build config option `build.split` has been replaced by the adapter configuration option [`functionPerRoute`](/en/reference/adapter-reference/#functionperroute).
          *
-         * When `split` is `true`, Astro will emit a file for each page.
-         * Each file emitted will render only one page. The pages will be emitted
-         * inside a `dist/pages/` directory, and the emitted files will keep the same file paths
-         * of the `src/pages` directory.
+         * Please see your [SSR adapter's documentation](/en/guides/integrations-guide/#official-integrations) for using `functionPerRoute` to define how your SSR code is bundled.
          *
-         * ```js
-         * {
-         *   build: {
-         *     split: true
-         *   }
-         * }
-         * ```
          */
         split?: boolean;
         /**
@@ -810,19 +796,11 @@ export interface AstroUserConfig {
          * @name build.excludeMiddleware
          * @type {boolean}
          * @default `false`
-         * @version 2.8.0
+         * @deprecated Deprecated since version 3.0.
          * @description
-         * Defines whether or not any SSR middleware code will be bundled when built.
-         *
-         * When enabled, middleware code is not bundled and imported by all pages during the build. To instead execute and import middleware code manually, set `build.excludeMiddleware: true`:
+         * The build config option `build.excludeMiddleware` has been replaced by the adapter configuration option [`edgeMiddleware`](/en/reference/adapter-reference/#edgemiddleware).
          *
-         * ```js
-         * {
-         *   build: {
-         *     excludeMiddleware: true
-         *   }
-         * }
-         * ```
+         * Please see your [SSR adapter's documentation](/en/guides/integrations-guide/#official-integrations) for using `edgeMiddleware` to define whether or not any SSR middleware code will be bundled when built.
          */
         excludeMiddleware?: boolean;
     };
@@ -1004,6 +982,7 @@ export interface AstroUserConfig {
          * @name markdown.drafts
          * @type {boolean}
          * @default `false`
+         * @deprecated Deprecated since version 3.0. Use content collections instead.
          * @description
          * Control whether Markdown draft pages should be included in the build.
          *
@@ -1142,7 +1121,7 @@ export interface AstroUserConfig {
      * @name Integrations
      * @description
      *
-     * Extend Astro with custom integrations. Integrations are your one-stop-shop for adding framework support (like Solid.js), new features (like sitemaps), and new libraries (like Partytown and Turbolinks).
+     * Extend Astro with custom integrations. Integrations are your one-stop-shop for adding framework support (like Solid.js), new features (like sitemaps), and new libraries (like Partytown).
      *
      * Read our [Integrations Guide](https://docs.astro.build/en/guides/integrations-guide/) for help getting started with Astro Integrations.
      *
@@ -1208,26 +1187,6 @@ export interface AstroUserConfig {
      * These flags are not guaranteed to be stable.
      */
     experimental?: {
-        /**
-         * @docs
-         * @name experimental.viewTransitions
-         * @type {boolean}
-         * @default `false`
-         * @version 2.9.0
-         * @description
-         * Enable experimental support for the `<ViewTransitions / >` component. With this enabled
-         * you can opt-in to [view transitions](https://docs.astro.build/en/guides/view-transitions/) on a per-page basis using this component
-         * and enable animations with the `transition:animate` directive.
-         *
-         * ```js
-         * {
-         * 	experimental: {
-         *		viewTransitions: true,
-         * 	},
-         * }
-         * ```
-         */
-        viewTransitions?: boolean;
         /**
          * @docs
          * @name experimental.optimizeHoistedScript
@@ -1250,26 +1209,6 @@ export interface AstroUserConfig {
          */
         optimizeHoistedScript?: boolean;
     };
-    /** @deprecated - Use "integrations" instead. Run Astro to learn more about migrating. */
-    renderers?: never;
-    /** @deprecated `projectRoot` has been renamed to `root` */
-    projectRoot?: never;
-    /** @deprecated `src` has been renamed to `srcDir` */
-    src?: never;
-    /** @deprecated `pages` has been removed. It is no longer configurable. */
-    pages?: never;
-    /** @deprecated `public` has been renamed to `publicDir` */
-    public?: never;
-    /** @deprecated `dist` has been renamed to `outDir` */
-    dist?: never;
-    /** @deprecated `styleOptions` has been renamed to `style` */
-    styleOptions?: never;
-    /** @deprecated `markdownOptions` has been renamed to `markdown` */
-    markdownOptions?: never;
-    /** @deprecated `buildOptions` has been renamed to `build` */
-    buildOptions?: never;
-    /** @deprecated `devOptions` has been renamed to `server` */
-    devOptions?: never;
 }
 /**
  * IDs for different stages of JS script injection:
@@ -1329,7 +1268,7 @@ export interface AstroInlineOnlyConfig {
     /**
      * @internal for testing only, use `logLevel` instead.
      */
-    logging?: LogOptions;
+    logger?: Logger;
 }
 export type ContentEntryModule = {
     id: string;
@@ -1430,6 +1369,10 @@ export interface ComponentInstance {
     default: AstroComponentFactory;
     css?: string[];
     prerender?: boolean;
+    /**
+     * Only used for logging if deprecated drafts feature is used
+     */
+    frontmatter?: Record<string, any>;
     getStaticPaths?: (options: GetStaticPathsOptions) => GetStaticPathsResult;
 }
 export interface AstroInstance {
@@ -1788,10 +1731,11 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
      * ```
      */
     locals: App.Locals;
+    ResponseWithEncoding: typeof ResponseWithEncoding;
 }
 export type EndpointOutput = {
     body: Body;
-    encoding?: Exclude<BufferEncoding, 'binary'>;
+    encoding?: BufferEncoding;
 } | {
     body: Uint8Array;
     encoding: 'binary';
@@ -1904,7 +1848,7 @@ export type AstroMiddlewareInstance<R> = {
 };
 export interface AstroPluginOptions {
     settings: AstroSettings;
-    logging: LogOptions;
+    logger: Logger;
 }
 export type RouteType = 'page' | 'endpoint' | 'redirect';
 export interface RoutePart {

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

@@ -1,4 +1,4 @@
-import type { StaticBuildOptions } from '../../core/build/types.js';
+import type { BuildPipeline } from '../../core/build/buildPipeline';
 import type { ImageTransform } from '../types.js';
 interface GenerationDataUncached {
     cached: false;
@@ -11,7 +11,7 @@ interface GenerationDataCached {
     cached: true;
 }
 type GenerationData = GenerationDataUncached | GenerationDataCached;
-export declare function generateImage(buildOpts: StaticBuildOptions, options: ImageTransform, filepath: string): Promise<GenerationData | undefined>;
+export declare function generateImage(pipeline: BuildPipeline, options: ImageTransform, filepath: string): Promise<GenerationData | undefined>;
 export declare function getStaticImageList(): Iterable<[
     string,
     {

package/dist/assets/build/generate.js

@@ -1,30 +1,30 @@
 import fs, { readFileSync } from "node:fs";
 import { basename, join } from "node:path/posix";
-import { warn } from "../../core/logger/core.js";
 import { prependForwardSlash } from "../../core/path.js";
 import { isServerLikeOutput } from "../../prerender/utils.js";
 import { getConfiguredImageService, isESMImportedImage } from "../internal.js";
 import { loadRemoteImage } from "./remote.js";
-async function generateImage(buildOpts, options, filepath) {
+async function generateImage(pipeline, options, filepath) {
+  const config = pipeline.getConfig();
+  const logger = pipeline.getLogger();
   let useCache = true;
-  const assetsCacheDir = new URL("assets/", buildOpts.settings.config.cacheDir);
+  const assetsCacheDir = new URL("assets/", config.cacheDir);
   try {
     await fs.promises.mkdir(assetsCacheDir, { recursive: true });
   } catch (err) {
-    warn(
-      buildOpts.logging,
+    logger.warn(
       "astro:assets",
       `An error was encountered while creating the cache directory. Proceeding without caching. Error: ${err}`
     );
     useCache = false;
   }
   let serverRoot, clientRoot;
-  if (isServerLikeOutput(buildOpts.settings.config)) {
-    serverRoot = buildOpts.settings.config.build.server;
-    clientRoot = buildOpts.settings.config.build.client;
+  if (isServerLikeOutput(config)) {
+    serverRoot = config.build.server;
+    clientRoot = config.build.client;
   } else {
-    serverRoot = buildOpts.settings.config.outDir;
-    clientRoot = buildOpts.settings.config.outDir;
+    serverRoot = config.outDir;
+    clientRoot = config.outDir;
   }
   const isLocalImage = isESMImportedImage(options.src);
   const finalFileURL = new URL("." + filepath, clientRoot);
@@ -61,9 +61,7 @@ async function generateImage(buildOpts, options, filepath) {
   if (isLocalImage) {
     imageData = await fs.promises.readFile(
       new URL(
-        "." + prependForwardSlash(
-          join(buildOpts.settings.config.build.assets, basename(originalImagePath))
-        ),
+        "." + prependForwardSlash(join(config.build.assets, basename(originalImagePath))),
         serverRoot
       )
     );
@@ -73,11 +71,7 @@ async function generateImage(buildOpts, options, filepath) {
     imageData = remoteImage.data;
   }
   const imageService = await getConfiguredImageService();
-  resultData.data = (await imageService.transform(
-    imageData,
-    { ...options, src: originalImagePath },
-    buildOpts.settings.config.image
-  )).data;
+  resultData.data = (await imageService.transform(imageData, { ...options, src: originalImagePath }, config.image)).data;
   try {
     if (useCache) {
       if (isLocalImage) {
@@ -93,8 +87,7 @@ async function generateImage(buildOpts, options, filepath) {
       }
     }
   } catch (e) {
-    warn(
-      buildOpts.logging,
+    logger.warn(
       "astro:assets",
       `An error was encountered while creating the cache directory. Proceeding without caching. Error: ${e}`
     );

package/dist/assets/image-endpoint.js

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