astro 4.8.4 → 4.8.5

package/dist/actions/runtime/middleware.js

@@ -4,11 +4,13 @@ import { formContentTypes, getAction, hasContentType } from "./utils.js";
 import { callSafely } from "./virtual/shared.js";
 const onRequest = defineMiddleware(async (context, next) => {
   const locals = context.locals;
+  if (locals._actionsInternal) return next();
   const { request, url } = context;
   const contentType = request.headers.get("Content-Type");
   if (url.pathname.startsWith("/_actions")) return nextWithLocalsStub(next, locals);
-  if (!contentType || !hasContentType(contentType, formContentTypes))
+  if (!contentType || !hasContentType(contentType, formContentTypes)) {
     return nextWithLocalsStub(next, locals);
+  }
   const formData = await request.clone().formData();
   const actionPath = formData.get("_astroAction");
   if (typeof actionPath !== "string") return nextWithLocalsStub(next, locals);

package/dist/assets/utils/metadata.js

@@ -1,21 +1,28 @@
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { lookup as probe } from "../utils/vendor/image-size/lookup.js";
 async function imageMetadata(data, src) {
-  const result = probe(data);
-  if (!result.height || !result.width || !result.type) {
+  try {
+    const result = probe(data);
+    if (!result.height || !result.width || !result.type) {
+      throw new AstroError({
+        ...AstroErrorData.NoImageMetadata,
+        message: AstroErrorData.NoImageMetadata.message(src)
+      });
+    }
+    const { width, height, type, orientation } = result;
+    const isPortrait = (orientation || 0) >= 5;
+    return {
+      width: isPortrait ? height : width,
+      height: isPortrait ? width : height,
+      format: type,
+      orientation
+    };
+  } catch (e) {
     throw new AstroError({
       ...AstroErrorData.NoImageMetadata,
       message: AstroErrorData.NoImageMetadata.message(src)
     });
   }
-  const { width, height, type, orientation } = result;
-  const isPortrait = (orientation || 0) >= 5;
-  return {
-    width: isPortrait ? height : width,
-    height: isPortrait ? width : height,
-    format: type,
-    orientation
-  };
 }
 export {
   imageMetadata

package/dist/core/app/index.js

@@ -186,6 +186,14 @@ class App {
         this.#logRenderOptionsDeprecationWarning();
       }
     }
+    if (routeData) {
+      this.#logger.debug(
+        "router",
+        "The adapter " + this.#manifest.adapterName + " provided a custom RouteData for ",
+        request.url
+      );
+      this.#logger.debug("router", "RouteData:\n" + routeData);
+    }
     if (locals) {
       if (typeof locals !== "object") {
         this.#logger.error(null, new AstroError(AstroErrorData.LocalsNotAnObject).stack);
@@ -201,8 +209,12 @@ class App {
     }
     if (!routeData) {
       routeData = this.match(request);
+      this.#logger.debug("router", "Astro matched the following route for " + request.url);
+      this.#logger.debug("router", "RouteData:\n" + routeData);
     }
     if (!routeData) {
+      this.#logger.debug("router", "Astro hasn't found routes that match " + request.url);
+      this.#logger.debug("router", "Here's the available routes:\n", this.#manifestData);
       return this.#renderError(request, { locals, status: 404 });
     }
     const pathname = this.#getPathnameFromRequest(request);

package/dist/core/app/pipeline.d.ts

@@ -7,6 +7,6 @@ export declare class AppPipeline extends Pipeline {
     headElements(routeData: RouteData): Pick<SSRResult, 'scripts' | 'styles' | 'links'>;
     componentMetadata(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
     getModuleForRoute(route: RouteData): Promise<SinglePageBuiltModule>;
 }

package/dist/core/app/pipeline.js

@@ -50,7 +50,7 @@ class AppPipeline extends Pipeline {
     const module = await this.getModuleForRoute(routeData);
     return module.page();
   }
-  async tryRewrite(payload) {
+  async tryRewrite(payload, request) {
     let foundRoute;
     for (const route of this.#manifestData.routes) {
       if (payload instanceof URL) {
@@ -64,9 +64,12 @@ class AppPipeline extends Pipeline {
           foundRoute = route;
           break;
         }
-      } else if (route.pattern.test(decodeURI(payload))) {
-        foundRoute = route;
-        break;
+      } else {
+        const newUrl = new URL(payload, new URL(request.url).origin);
+        if (route.pattern.test(decodeURI(newUrl.pathname))) {
+          foundRoute = route;
+          break;
+        }
       }
     }
     if (foundRoute) {

package/dist/core/base-pipeline.d.ts

@@ -64,7 +64,7 @@ export declare abstract class Pipeline {
      *
      * @param {RewritePayload} rewritePayload
      */
-    abstract tryRewrite(rewritePayload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    abstract tryRewrite(rewritePayload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
     /**
      * Tells the pipeline how to retrieve a component give a `RouteData`
      * @param routeData

package/dist/core/build/pipeline.d.ts

@@ -38,6 +38,6 @@ export declare class BuildPipeline extends Pipeline {
      */
     retrieveRoutesToGenerate(): Map<PageBuildData, string>;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
     retrieveSsrEntry(route: RouteData, filePath: string): Promise<SinglePageBuiltModule>;
 }

package/dist/core/build/pipeline.js

@@ -206,7 +206,7 @@ class BuildPipeline extends Pipeline {
       return module.page();
     }
   }
-  async tryRewrite(payload) {
+  async tryRewrite(payload, request) {
     let foundRoute;
     for (const route of this.options.manifest.routes) {
       if (payload instanceof URL) {
@@ -220,9 +220,12 @@ class BuildPipeline extends Pipeline {
           foundRoute = route;
           break;
         }
-      } else if (route.pattern.test(decodeURI(payload))) {
-        foundRoute = route;
-        break;
+      } else {
+        const newUrl = new URL(payload, new URL(request.url).origin);
+        if (route.pattern.test(decodeURI(newUrl.pathname))) {
+          foundRoute = route;
+          break;
+        }
       }
     }
     if (foundRoute) {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.8.4";
+const ASTRO_VERSION = "4.8.5";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404";

package/dist/core/dev/dev.js

@@ -19,7 +19,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.8.4";
+  const currentVersion = "4.8.5";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.8.4";
+  const version = "4.8.5";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.8.4"}`
+        `v${"4.8.5"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -95,7 +95,7 @@ class RenderContext {
       if (payload) {
         if (this.pipeline.manifest.rewritingEnabled) {
           try {
-            const [routeData, component] = await pipeline.tryRewrite(payload);
+            const [routeData, component] = await pipeline.tryRewrite(payload, this.request);
             this.routeData = routeData;
             componentInstance = component;
           } catch (e) {
@@ -173,7 +173,7 @@ class RenderContext {
     const rewrite = async (reroutePayload) => {
       pipeline.logger.debug("router", "Called rewriting to:", reroutePayload);
       try {
-        const [routeData, component] = await pipeline.tryRewrite(reroutePayload);
+        const [routeData, component] = await pipeline.tryRewrite(reroutePayload, this.request);
         this.routeData = routeData;
         if (reroutePayload instanceof Request) {
           this.request = reroutePayload;
@@ -328,7 +328,7 @@ class RenderContext {
     const rewrite = async (reroutePayload) => {
       try {
         pipeline.logger.debug("router", "Calling rewrite: ", reroutePayload);
-        const [routeData, component] = await pipeline.tryRewrite(reroutePayload);
+        const [routeData, component] = await pipeline.tryRewrite(reroutePayload, this.request);
         this.routeData = routeData;
         if (reroutePayload instanceof Request) {
           this.request = reroutePayload;

package/dist/core/routing/manifest/generator.d.ts

@@ -1,2 +1,2 @@
 import type { AstroConfig, RoutePart } from '../../../@types/astro.js';
-export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): (params: object) => string;
+export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): (params: Record<string, string | number | undefined>) => string;

package/dist/core/routing/manifest/generator.js

@@ -1,4 +1,14 @@
 import { compile } from "path-to-regexp";
+function sanitizeParams(params) {
+  return Object.fromEntries(
+    Object.entries(params).map(([key, value]) => {
+      if (typeof value === "string") {
+        return [key, value.normalize().replace(/#/g, "%23").replace(/\?/g, "%3F")];
+      }
+      return [key, value];
+    })
+  );
+}
 function getRouteGenerator(segments, addTrailingSlash) {
   const template = segments.map((segment) => {
     return "/" + segment.map((part) => {
@@ -17,7 +27,8 @@ function getRouteGenerator(segments, addTrailingSlash) {
   }
   const toPath = compile(template + trailing);
   return (params) => {
-    const path = toPath(params);
+    const sanitizedParams = sanitizeParams(params);
+    const path = toPath(sanitizedParams);
     return path || "/";
   };
 }

package/dist/i18n/index.d.ts

@@ -1,6 +1,7 @@
 import type { APIContext, AstroConfig, Locales, SSRManifest, ValidRedirectStatus } from '../@types/astro.js';
 import type { RoutingStrategies } from './utils.js';
 export declare function requestHasLocale(locales: Locales): (context: APIContext) => boolean;
+export declare function requestIs404Or500(request: Request, base?: string): boolean;
 export declare function pathHasLocale(path: string, locales: Locales): boolean;
 type GetLocaleRelativeUrl = GetLocaleOptions & {
     locale: string;

package/dist/i18n/index.js

@@ -9,6 +9,10 @@ function requestHasLocale(locales) {
     return pathHasLocale(context.url.pathname, locales);
   };
 }
+function requestIs404Or500(request, base = "") {
+  const url = new URL(request.url);
+  return url.pathname.startsWith(`${base}/404`) || url.pathname.startsWith(`${base}/500`);
+}
 function pathHasLocale(path, locales) {
   const segments = path.split("/");
   for (const segment of segments) {
@@ -188,7 +192,7 @@ function notFound({ base, locales }) {
     if (!(isRoot || pathHasLocale(url.pathname, locales))) {
       if (response) {
         response.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
-        return new Response(null, {
+        return new Response(response.body, {
           status: 404,
           headers: response.headers
         });
@@ -263,6 +267,7 @@ export {
   redirectToDefaultLocale,
   redirectToFallback,
   requestHasLocale,
+  requestIs404Or500,
   toCodes,
   toPaths
 };

package/dist/i18n/middleware.js

@@ -4,7 +4,8 @@ import {
   notFound,
   redirectToDefaultLocale,
   redirectToFallback,
-  requestHasLocale
+  requestHasLocale,
+  requestIs404Or500
 } from "./index.js";
 function createI18nMiddleware(i18n, base, trailingSlash, format) {
   if (!i18n) return (_, next) => next();
@@ -50,6 +51,9 @@ function createI18nMiddleware(i18n, base, trailingSlash, format) {
     if (type !== "page" && type !== "fallback") {
       return response;
     }
+    if (requestIs404Or500(context.request, base)) {
+      return response;
+    }
     const { currentLocale } = context;
     switch (i18n.strategy) {
       case "manual": {

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

@@ -128,12 +128,18 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
     await bufferHeadContent(result);
   }
   let error = null;
-  let next = promiseWithResolvers();
+  let next = null;
   const buffer = [];
+  let renderingComplete = false;
   const iterator = {
     async next() {
       if (result.cancelled) return { done: true, value: void 0 };
-      await next.promise;
+      if (next !== null) {
+        await next.promise;
+      }
+      if (!renderingComplete) {
+        next = promiseWithResolvers();
+      }
       if (error) {
         throw error;
       }
@@ -176,17 +182,18 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       const bytes = chunkToByteArray(result, chunk);
       if (bytes.length > 0) {
         buffer.push(bytes);
-        next.resolve();
-        next = promiseWithResolvers();
+        next?.resolve();
       }
     }
   };
   const renderPromise = templateResult.render(destination);
   renderPromise.then(() => {
-    next.resolve();
+    renderingComplete = true;
+    next?.resolve();
   }).catch((err) => {
     error = err;
-    next.resolve();
+    renderingComplete = true;
+    next?.resolve();
   });
   return {
     [Symbol.asyncIterator]() {

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

@@ -19,6 +19,6 @@ export declare class DevPipeline extends Pipeline {
     preload(routeData: RouteData, filePath: URL): Promise<ComponentInstance>;
     clearRouteCache(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
     setManifestData(manifestData: ManifestData): void;
 }

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

@@ -132,7 +132,7 @@ class DevPipeline extends Pipeline {
       return await this.preload(routeData, filePath);
     }
   }
-  async tryRewrite(payload) {
+  async tryRewrite(payload, request) {
     let foundRoute;
     if (!this.manifestData) {
       throw new Error("Missing manifest data. This is an internal error, please file an issue.");
@@ -149,9 +149,12 @@ class DevPipeline extends Pipeline {
           foundRoute = route;
           break;
         }
-      } else if (route.pattern.test(decodeURI(payload))) {
-        foundRoute = route;
-        break;
+      } else {
+        const newUrl = new URL(payload, new URL(request.url).origin);
+        if (route.pattern.test(decodeURI(newUrl.pathname))) {
+          foundRoute = route;
+          break;
+        }
       }
     }
     if (foundRoute) {

package/package.json

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