astro 2.9.3 → 2.9.5

package/components/ViewTransitions.astro

@@ -13,19 +13,40 @@ const { fallback = 'animate' } = Astro.props as Props;
 <script>
 	type Fallback = 'none' | 'animate' | 'swap';
 	type Direction = 'forward' | 'back';
+	type State = {
+		index: number;
+		scrollY: number;
+	};
+	type Events = 'astro:load' | 'astro:beforeload';
+
+	const persistState = (state: State) => history.replaceState(state, '');
 
 	// 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) {
-		history.replaceState({ index: currentHistoryIndex }, document.title);
+		persistState({ index: currentHistoryIndex, scrollY: 0 });
 	}
 
 	const supportsViewTransitions = !!document.startViewTransition;
 	const transitionEnabledOnThisPage = () =>
 		!!document.querySelector('[name="astro-view-transitions-enabled"]');
-	const onload = () => document.dispatchEvent(new Event('astro:load'));
+	const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));
+	const onload = () => triggerEvent('astro:load');
+
+	const throttle = (cb: (...args: any[]) => any, delay: number) => {
+		let wait = false;
+		return (...args: any[]) => {
+			if (wait) return;
+
+			cb(...args);
+			wait = true;
+			setTimeout(() => {
+				wait = false;
+			}, delay);
+		};
+	};
 
 	async function getHTML(href: string) {
 		const res = await fetch(href);
@@ -62,10 +83,18 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 	const parser = new DOMParser();
 
-	async function updateDOM(dir: Direction, html: string, fallback?: Fallback) {
+	async function updateDOM(dir: Direction, html: string, state?: State, fallback?: Fallback) {
 		const doc = parser.parseFromString(html, 'text/html');
 		doc.documentElement.dataset.astroTransition = dir;
-		const swap = () => document.documentElement.replaceWith(doc.documentElement);
+		const swap = () => {
+			document.documentElement.replaceWith(doc.documentElement);
+
+			if (state?.scrollY != null) {
+				scrollTo(0, state.scrollY);
+			}
+
+			triggerEvent('astro:beforeload');
+		};
 
 		// Wait on links to finish, to prevent FOUC
 		const links = Array.from(doc.querySelectorAll('head link[rel=stylesheet]')).map(
@@ -98,7 +127,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 		}
 	}
 
-	async function navigate(dir: Direction, href: string) {
+	async function navigate(dir: Direction, href: string, state?: State) {
 		let finished: Promise<void>;
 		const { html, ok } = await getHTML(href);
 		// If there is a problem fetching the new page, just do an MPA navigation to it.
@@ -107,9 +136,9 @@ const { fallback = 'animate' } = Astro.props as Props;
 			return;
 		}
 		if (supportsViewTransitions) {
-			finished = document.startViewTransition(() => updateDOM(dir, html)).finished;
+			finished = document.startViewTransition(() => updateDOM(dir, html, state)).finished;
 		} else {
-			finished = updateDOM(dir, html, getFallback());
+			finished = updateDOM(dir, html, state, getFallback());
 		}
 		try {
 			await finished;
@@ -148,6 +177,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				link.href &&
 				(!link.target || link.target === '_self') &&
 				link.origin === location.origin &&
+				!link.hash &&
 				ev.button === 0 && // left clicks only
 				!ev.metaKey && // new tab (mac)
 				!ev.ctrlKey && // new tab (windows)
@@ -159,19 +189,30 @@ const { fallback = 'animate' } = Astro.props as Props;
 				ev.preventDefault();
 				navigate('forward', link.href);
 				currentHistoryIndex++;
-				history.pushState({ index: currentHistoryIndex }, '', link.href);
+				const newState: State = { index: currentHistoryIndex, scrollY };
+				persistState({ index: currentHistoryIndex - 1, scrollY });
+				history.pushState(newState, '', link.href);
 			}
 		});
-		window.addEventListener('popstate', () => {
+		addEventListener('popstate', (ev) => {
 			if (!transitionEnabledOnThisPage()) {
 				// The current page doesn't haven't View Transitions,
 				// respect that with a full page reload
 				location.reload();
 				return;
 			}
-			const nextIndex = history.state?.index ?? currentHistoryIndex + 1;
+
+			// hash change creates no state.
+			if (ev.state === null) {
+				persistState({ index: currentHistoryIndex, scrollY });
+				ev.preventDefault();
+				return;
+			}
+
+			const state: State | undefined = history.state;
+			const nextIndex = state?.index ?? currentHistoryIndex + 1;
 			const direction: Direction = nextIndex > currentHistoryIndex ? 'forward' : 'back';
-			navigate(direction, location.href);
+			navigate(direction, location.href, state);
 			currentHistoryIndex = nextIndex;
 		});
 
@@ -194,5 +235,16 @@ const { fallback = 'animate' } = Astro.props as Props;
 			);
 		});
 		addEventListener('load', onload);
+		// 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 }
+		);
 	}
 </script>

package/dist/assets/internal.d.ts

@@ -1,5 +1,7 @@
+import type { AstroSettings } from '../@types/astro.js';
 import { type ImageService } from './services/service.js';
 import type { GetImageResult, ImageMetadata, ImageTransform } from './types.js';
+export declare function injectImageEndpoint(settings: AstroSettings): AstroSettings;
 export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
 export declare function getConfiguredImageService(): Promise<ImageService>;
 export declare function getImage(options: ImageTransform, serviceConfig: Record<string, any>): Promise<GetImageResult>;

package/dist/assets/internal.js

@@ -1,5 +1,13 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { isLocalService } from "./services/service.js";
+function injectImageEndpoint(settings) {
+  settings.injectedRoutes.push({
+    pattern: "/_image",
+    entryPoint: "astro/assets/image-endpoint",
+    prerender: false
+  });
+  return settings;
+}
 function isESMImportedImage(src) {
   return typeof src === "object";
 }
@@ -44,5 +52,6 @@ async function getImage(options, serviceConfig) {
 export {
   getConfiguredImageService,
   getImage,
+  injectImageEndpoint,
   isESMImportedImage
 };

package/dist/assets/services/squoosh.js

@@ -18,10 +18,8 @@ const qualityTable = {
   webp: baseQuality
   // Squoosh's PNG encoder does not support a quality setting, so we can skip that here
 };
-async function getRotationForEXIF(transform, inputBuffer) {
-  const filePath = transform.src.slice("/@fs".length);
-  const filePathURL = new URL("." + filePath, "file:");
-  const meta = await imageMetadata(filePathURL, inputBuffer);
+async function getRotationForEXIF(inputBuffer) {
+  const meta = await imageMetadata(inputBuffer);
   if (!meta)
     return void 0;
   switch (meta.orientation) {
@@ -47,7 +45,7 @@ const service = {
     if (format === "svg")
       return { data: inputBuffer, format: "svg" };
     const operations = [];
-    const rotation = await getRotationForEXIF(transform, inputBuffer);
+    const rotation = await getRotationForEXIF(inputBuffer);
     if (rotation) {
       operations.push(rotation);
     }

package/dist/assets/types.d.ts

@@ -15,7 +15,7 @@ declare global {
     };
 }
 /**
- * Type returned by ESM imports of images and direct calls to imageMetadata
+ * Type returned by ESM imports of images
  */
 export interface ImageMetadata {
     src: string;

package/dist/assets/utils/emitAsset.js

@@ -1,4 +1,4 @@
-import fs from "node:fs";
+import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { prependForwardSlash, slash } from "../../core/path.js";
@@ -8,26 +8,36 @@ async function emitESMImage(id, watchMode, fileEmitter) {
     return void 0;
   }
   const url = pathToFileURL(id);
-  const meta = await imageMetadata(url);
-  if (!meta) {
+  let fileData;
+  try {
+    fileData = await fs.readFile(url);
+  } catch (err) {
     return void 0;
   }
+  const fileMetadata = await imageMetadata(fileData);
+  if (!fileMetadata) {
+    return void 0;
+  }
+  const emittedImage = {
+    src: "",
+    ...fileMetadata
+  };
   if (!watchMode) {
     const pathname = decodeURI(url.pathname);
-    const filename = path.basename(pathname, path.extname(pathname) + `.${meta.format}`);
+    const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
     const handle = fileEmitter({
       name: filename,
-      source: await fs.promises.readFile(url),
+      source: await fs.readFile(url),
       type: "asset"
     });
-    meta.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
+    emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
   } else {
-    url.searchParams.append("origWidth", meta.width.toString());
-    url.searchParams.append("origHeight", meta.height.toString());
-    url.searchParams.append("origFormat", meta.format);
-    meta.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
+    url.searchParams.append("origWidth", fileMetadata.width.toString());
+    url.searchParams.append("origHeight", fileMetadata.height.toString());
+    url.searchParams.append("origFormat", fileMetadata.format);
+    emittedImage.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
   }
-  return meta;
+  return emittedImage;
 }
 function fileURLToNormalizedPath(filePath) {
   return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, "/");

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

@@ -1,3 +1,3 @@
 /// <reference types="node" />
 import type { ImageMetadata } from '../types.js';
-export declare function imageMetadata(src: URL | string, data?: Buffer): Promise<ImageMetadata | undefined>;
+export declare function imageMetadata(data: Buffer): Promise<Omit<ImageMetadata, 'src'> | undefined>;

package/dist/assets/utils/metadata.js

@@ -1,22 +1,11 @@
-import fs from "node:fs/promises";
-import { fileURLToPath } from "node:url";
 import imageSize from "../vendor/image-size/index.js";
-async function imageMetadata(src, data) {
-  let file = data;
-  if (!file) {
-    try {
-      file = await fs.readFile(src);
-    } catch (e) {
-      return void 0;
-    }
-  }
-  const { width, height, type, orientation } = imageSize(file);
+async function imageMetadata(data) {
+  const { width, height, type, orientation } = imageSize(data);
   const isPortrait = (orientation || 0) >= 5;
   if (!width || !height || !type) {
     return void 0;
   }
   return {
-    src: fileURLToPath(src),
     width: isPortrait ? height : width,
     height: isPortrait ? width : height,
     format: type,

package/dist/cli/add/index.js

@@ -86,7 +86,7 @@ async function add(names, { flags, logging }) {
           ["svelte", "astro add svelte"],
           ["solid-js", "astro add solid-js"],
           ["lit", "astro add lit"],
-          ["alpine", "astro add alpine"]
+          ["alpinejs", "astro add alpinejs"]
         ],
         "SSR Adapters": [
           ["netlify", "astro add netlify"],

package/dist/cli/load-settings.js

@@ -17,11 +17,10 @@ async function loadSettings({ cmd, flags, logging }) {
     await handleConfigError(e, { cmd, cwd: root, flags, logging });
     return {};
   });
-  const mode = cmd === "build" ? "build" : "dev";
   if (!initialAstroConfig)
     return;
   telemetry.record(event.eventCliSession(cmd, initialUserConfig, flags));
-  return createSettings(initialAstroConfig, mode, root);
+  return createSettings(initialAstroConfig, root);
 }
 async function handleConfigError(e, { cmd, cwd, flags, logging }) {
   const path = await resolveConfigPath({ cwd, flags, fs });

package/dist/config/index.js

@@ -26,7 +26,7 @@ function getViteConfig(inlineConfig) {
       level: "info"
     };
     const { astroConfig: config } = await openConfig({ cmd });
-    const settings = createSettings(config, cmd, inlineConfig.root);
+    const settings = createSettings(config, inlineConfig.root);
     await runHookConfigSetup({ settings, command: cmd, logging });
     const viteConfig = await createVite(
       {

package/dist/core/build/generate.js

@@ -84,11 +84,14 @@ function chunkIsPage(settings, output, internals) {
   return false;
 }
 async function generatePages(opts, internals) {
+  var _a, _b;
   const timer = performance.now();
   const ssr = isServerLikeOutput(opts.settings.config);
   const outFolder = ssr ? opts.settings.config.build.server : getOutDirWithinCwd(opts.settings.config.outDir);
-  if (ssr && !hasPrerenderedPages(internals))
+  if (ssr && !hasPrerenderedPages(internals)) {
+    (_a = globalThis == null ? void 0 : globalThis.astroAsset) == null ? true : delete _a.addStaticImage;
     return;
+  }
   const verb = ssr ? "prerendering" : "generating";
   info(opts.logging, null, `
 ${bgGreen(black(` ${verb} static routes `))}`);
@@ -139,7 +142,7 @@ ${bgGreen(black(` generating optimized images `))}`);
     for (const imageData of getStaticImageList()) {
       await generateImage(opts, imageData[1].options, imageData[1].path);
     }
-    delete globalThis.astroAsset.addStaticImage;
+    (_b = globalThis == null ? void 0 : globalThis.astroAsset) == null ? true : delete _b.addStaticImage;
   }
   await runHookBuildGenerated({
     config: opts.settings.config,

package/dist/core/build/index.js

@@ -1,12 +1,14 @@
 import * as colors from "kleur/colors";
 import fs from "node:fs";
 import { performance } from "node:perf_hooks";
+import { injectImageEndpoint } from "../../assets/internal.js";
 import {
   runHookBuildDone,
   runHookBuildStart,
   runHookConfigDone,
   runHookConfigSetup
 } from "../../integrations/index.js";
+import { isServerLikeOutput } from "../../prerender/utils.js";
 import { createVite } from "../create-vite.js";
 import { debug, info, levels, timerMessage, warn } from "../logger/core.js";
 import { printHelp } from "../messages.js";
@@ -60,6 +62,9 @@ class AstroBuilder {
       command: "build",
       logging
     });
+    if (this.settings.config.experimental.assets && isServerLikeOutput(this.settings.config)) {
+      this.settings = injectImageEndpoint(this.settings);
+    }
     this.manifest = createRouteManifest({ settings: this.settings }, this.logging);
     const viteConfig = await createVite(
       {

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

@@ -1,4 +1,4 @@
 import type { AstroConfig, AstroSettings, AstroUserConfig } from '../../@types/astro';
-export declare function createBaseSettings(config: AstroConfig, mode: 'build' | 'dev'): AstroSettings;
-export declare function createSettings(config: AstroConfig, mode: 'build' | 'dev', cwd?: string): AstroSettings;
+export declare function createBaseSettings(config: AstroConfig): AstroSettings;
+export declare function createSettings(config: AstroConfig, cwd?: string): AstroSettings;
 export declare function createDefaultDevSettings(userConfig?: AstroUserConfig, root?: string | URL): Promise<AstroSettings>;

package/dist/core/config/settings.js

@@ -3,7 +3,6 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { getContentPaths } from "../../content/index.js";
 import jsxRenderer from "../../jsx/renderer.js";
-import { isServerLikeOutput } from "../../prerender/utils.js";
 import { markdownContentEntryType } from "../../vite-plugin-markdown/content-entry-type.js";
 import { getDefaultClientDirectives } from "../client-directive/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
@@ -12,14 +11,14 @@ import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
 import { createDefaultDevConfig } from "./config.js";
 import { AstroTimer } from "./timer.js";
 import { loadTSConfig } from "./tsconfig.js";
-function createBaseSettings(config, mode) {
+function createBaseSettings(config) {
   const { contentDir } = getContentPaths(config);
   return {
     config,
     tsConfig: void 0,
     tsConfigPath: void 0,
     adapter: void 0,
-    injectedRoutes: config.experimental.assets && (isServerLikeOutput(config) || mode === "dev") ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint", prerender: false }] : [],
+    injectedRoutes: [],
     pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
     contentEntryTypes: [markdownContentEntryType],
     dataEntryTypes: [
@@ -92,9 +91,9 @@ function createBaseSettings(config, mode) {
     timer: new AstroTimer()
   };
 }
-function createSettings(config, mode, cwd) {
+function createSettings(config, cwd) {
   const tsconfig = loadTSConfig(cwd);
-  const settings = createBaseSettings(config, mode);
+  const settings = createBaseSettings(config);
   const watchFiles = (tsconfig == null ? void 0 : tsconfig.exists) ? [tsconfig.path, ...tsconfig.extendedPaths] : [];
   if (cwd) {
     watchFiles.push(fileURLToPath(new URL("./package.json", pathToFileURL(cwd))));
@@ -109,7 +108,7 @@ async function createDefaultDevSettings(userConfig = {}, root) {
     root = fileURLToPath(root);
   }
   const config = await createDefaultDevConfig(userConfig, root);
-  return createBaseSettings(config, "dev");
+  return createBaseSettings(config);
 }
 export {
   createBaseSettings,

package/dist/core/constants.js

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

package/dist/core/dev/container.js

@@ -1,5 +1,6 @@
 import nodeFs from "node:fs";
 import * as vite from "vite";
+import { injectImageEndpoint } from "../../assets/internal.js";
 import {
   runHookConfigDone,
   runHookConfigSetup,
@@ -29,6 +30,9 @@ async function createContainer(params = {}) {
     logging,
     isRestart
   });
+  if (settings.config.experimental.assets) {
+    settings = injectImageEndpoint(settings);
+  }
   const { host, headers, open } = settings.config.server;
   const rendererClientEntries = settings.renderers.map((r) => r.clientEntrypoint).filter(Boolean);
   const viteConfig = await createVite(

package/dist/core/dev/dev.js

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

package/dist/core/dev/restart.js

@@ -62,7 +62,7 @@ async function restartContainer({
     });
     info(logging, "astro", logMsg + "\n");
     let astroConfig = newConfig.astroConfig;
-    const settings = createSettings(astroConfig, "dev", resolvedRoot);
+    const settings = createSettings(astroConfig, resolvedRoot);
     await close();
     return {
       container: await createRestartedContainer(container, settings, needsStart),

package/dist/core/messages.js

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

package/dist/runtime/server/render/astro/instance.d.ts

@@ -15,6 +15,6 @@ export declare class AstroComponentInstance {
     init(result: SSRResult): Promise<AstroFactoryReturnValue>;
     render(destination: RenderDestination): Promise<void>;
 }
-export declare function createAstroComponentInstance(result: SSRResult, displayName: string, factory: AstroComponentFactory, props: ComponentProps, slots?: any): Promise<AstroComponentInstance>;
+export declare function createAstroComponentInstance(result: SSRResult, displayName: string, factory: AstroComponentFactory, props: ComponentProps, slots?: any): AstroComponentInstance;
 export declare function isAstroComponentInstance(obj: unknown): obj is AstroComponentInstance;
 export {};

package/dist/runtime/server/render/astro/instance.js

@@ -17,6 +17,8 @@ class AstroComponentInstance {
     }
   }
   async init(result) {
+    if (this.returnValue !== void 0)
+      return this.returnValue;
     this.returnValue = this.factory(result, this.props, this.slotValues);
     return this.returnValue;
   }
@@ -47,15 +49,11 @@ function validateComponentProps(props, displayName) {
     }
   }
 }
-async function createAstroComponentInstance(result, displayName, factory, props, slots = {}) {
+function createAstroComponentInstance(result, displayName, factory, props, slots = {}) {
   validateComponentProps(props, displayName);
   const instance = new AstroComponentInstance(result, props, slots, factory);
   if (isAPropagatingComponent(result, factory) && !result._metadata.propagators.has(factory)) {
     result._metadata.propagators.set(factory, instance);
-    const returnValue = await instance.init(result);
-    if (isHeadAndContent(returnValue)) {
-      result._metadata.extraHead.push(returnValue.head);
-    }
   }
   return instance;
 }

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

@@ -42,6 +42,9 @@ async function renderToReadableStream(result, componentFactory, props, children,
   if (templateResult instanceof Response)
     return templateResult;
   let renderedFirstPageChunk = false;
+  if (isPage) {
+    await bufferHeadContent(result);
+  }
   return new ReadableStream({
     start(controller) {
       const destination = {
@@ -93,6 +96,19 @@ async function callComponentAsTemplateResultOrResponse(result, componentFactory,
   }
   return isHeadAndContent(factoryResult) ? factoryResult.content : factoryResult;
 }
+async function bufferHeadContent(result) {
+  const iterator = result._metadata.propagators.values();
+  while (true) {
+    const { value, done } = iterator.next();
+    if (done) {
+      break;
+    }
+    const returnValue = await value.init(result);
+    if (isHeadAndContent(returnValue)) {
+      result._metadata.extraHead.push(returnValue.head);
+    }
+  }
+}
 export {
   renderToReadableStream,
   renderToString

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

@@ -320,7 +320,7 @@ async function renderHTMLComponent(result, Component, _props, slots = {}) {
   };
 }
 async function renderAstroComponent(result, displayName, Component, props, slots = {}) {
-  const instance = await createAstroComponentInstance(result, displayName, Component, props, slots);
+  const instance = createAstroComponentInstance(result, displayName, Component, props, slots);
   const chunks = [];
   const temporaryDestination = {
     write: (chunk) => chunks.push(chunk)

package/dist/vite-plugin-astro-server/route.d.ts

@@ -22,7 +22,7 @@ type HandleRoute = {
     incomingRequest: http.IncomingMessage;
     incomingResponse: http.ServerResponse;
     manifest: SSRManifest;
-    status?: number;
+    status?: 404 | 500;
 };
 export declare function handleRoute({ matchedRoute, url, pathname, status, body, origin, env, manifestData, incomingRequest, incomingResponse, manifest, }: HandleRoute): Promise<void>;
 export {};

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

@@ -3,6 +3,7 @@ import { attachToResponse } from "../core/cookies/index.js";
 import { AstroErrorData, isAstroError } from "../core/errors/index.js";
 import { warn } from "../core/logger/core.js";
 import { loadMiddleware } from "../core/middleware/loadMiddleware.js";
+import { isEndpointResult } from "../core/render/core.js";
 import {
   createRenderContext,
   getParamsAndProps,
@@ -151,7 +152,7 @@ async function handleRoute({
   });
   const onRequest = (_a = options.middleware) == null ? void 0 : _a.onRequest;
   const result = await tryRenderRoute(route.type, renderContext, env, mod, onRequest);
-  if (route.type === "endpoint" && !(result instanceof Response)) {
+  if (isEndpointResult(result, route.type)) {
     if (result.type === "response") {
       if (result.response.headers.get("X-Astro-Response") === "Not-Found") {
         const fourOhFourRoute = await matchRoute("/404", env, manifestData);
@@ -186,7 +187,7 @@ async function handleRoute({
       attachToResponse(response, result.cookies);
       await writeWebResponse(incomingResponse, response);
     }
-  } else if (result instanceof Response) {
+  } else {
     if (result.status === 404) {
       const fourOhFourRoute = await matchRoute("/404", env, manifestData);
       return handleRoute({
@@ -204,7 +205,17 @@ async function handleRoute({
       });
     }
     let response = result;
-    if (status && response.status !== status) {
+    if (
+      // We are in a recursion, and it's possible that this function is called itself with a status code
+      // By default, the status code passed via parameters is computed by the matched route.
+      //
+      // By default, we should give priority to the status code passed, although it's possible that
+      // the `Response` emitted by the user is a redirect. If so, then return the returned response.
+      response.status < 400 && response.status >= 300
+    ) {
+      await writeSSRResult(request, response, incomingResponse);
+      return;
+    } else if (status && response.status !== status && (status === 404 || status === 500)) {
       response = new Response(result.body, { ...result, status });
     }
     await writeSSRResult(request, response, incomingResponse);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.9.3",
+  "version": "2.9.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -102,7 +102,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.6.0",
+    "@astrojs/compiler": "^1.6.3",
     "@astrojs/internal-helpers": "^0.1.1",
     "@astrojs/language-server": "^1.0.0",
     "@astrojs/markdown-remark": "^2.2.1",