astro 4.10.3 → 4.11.1

package/dist/runtime/client/dev-toolbar/helpers.d.ts

@@ -55,7 +55,7 @@ export declare const serverHelpers: {
      * @param callback - The callback to run when the event is received.
      * The payload's content will be passed to the callback as an argument
      */
-    on: <T_1>(event: string, callback: (data: T_1) => void) => void;
+    on: <T>(event: string, callback: (data: T) => void) => void;
 };
 export type ToolbarServerHelpers = typeof serverHelpers;
 export {};

package/dist/runtime/client/dev-toolbar/settings.d.ts

@@ -13,7 +13,7 @@ export declare const settings: {
     readonly config: Settings;
     updateSetting: <Key extends keyof Settings>(key: Key, value: Settings[Key]) => void;
     logger: {
-        log: (message: string, level?: 'log' | 'warn' | 'error') => void;
+        log: (message: string, level?: "log" | "warn" | "error") => void;
         warn: (message: string) => void;
         error: (message: string) => void;
         verboseLog: (message: string) => void;

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

@@ -53,8 +53,17 @@ async function renderPage(result, componentFactory, props, children, streaming,
   if (route?.component.endsWith(".md")) {
     headers.set("Content-Type", "text/html; charset=utf-8");
   }
-  const response = new Response(body, { ...init, headers });
-  return response;
+  let status = init.status;
+  if (route?.route === "/404") {
+    status = 404;
+  } else if (route?.route === "/500") {
+    status = 500;
+  }
+  if (status) {
+    return new Response(body, { ...init, headers, status });
+  } else {
+    return new Response(body, { ...init, headers });
+  }
 }
 export {
   renderPage

package/dist/transitions/events.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@types/dom-view-transitions" />
 import type { Direction, NavigationTypeString } from './types.js';
 export declare const TRANSITION_BEFORE_PREPARATION = "astro:before-preparation";
 export declare const TRANSITION_AFTER_PREPARATION = "astro:after-preparation";

package/dist/transitions/router.js

@@ -268,7 +268,12 @@ async function transition(direction, from, to, options, historyState) {
       return;
     }
     if (response.redirected) {
-      preparationEvent.to = new URL(response.redirected);
+      const redirectedTo = new URL(response.redirected);
+      if (redirectedTo.origin !== preparationEvent.to.origin) {
+        preparationEvent.preventDefault();
+        return;
+      }
+      preparationEvent.to = redirectedTo;
     }
     parser ??= new DOMParser();
     preparationEvent.newDocument = parser.parseFromString(response.html, response.mediaType);

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

@@ -19,7 +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, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
+    tryRewrite(payload: RewritePayload, request: Request, _sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     setManifestData(manifestData: ManifestData): void;
-    rewriteKnownRoute(route: string, sourceRoute: RouteData): ComponentInstance;
 }

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

@@ -1,12 +1,15 @@
 import { fileURLToPath } from "node:url";
 import { getInfoOutput } from "../cli/info/index.js";
 import {} from "../core/base-pipeline.js";
+import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { ASTRO_VERSION, DEFAULT_404_COMPONENT } from "../core/constants.js";
 import { enhanceViteSSRError } from "../core/errors/dev/index.js";
-import { InvalidRewrite404, RewriteEncounteredAnError } from "../core/errors/errors-data.js";
+import { RewriteEncounteredAnError } from "../core/errors/errors-data.js";
 import { AggregateError, AstroError, CSSError, MarkdownError } from "../core/errors/index.js";
+import { prependForwardSlash, removeTrailingForwardSlash } from "../core/path.js";
 import { Pipeline, loadRenderer } from "../core/render/index.js";
 import { DEFAULT_404_ROUTE, default404Page } from "../core/routing/astro-designed-error-pages.js";
+import { findRouteToRewrite } from "../core/routing/rewrite.js";
 import { isPage, isServerLikeOutput, resolveIdToUrl, viteID } from "../core/util.js";
 import { PAGE_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
 import { getStylesForURL } from "./css.js";
@@ -133,54 +136,24 @@ class DevPipeline extends Pipeline {
       return await this.preload(routeData, filePath);
     }
   }
-  async tryRewrite(payload, request, sourceRoute) {
-    let foundRoute;
+  async tryRewrite(payload, request, _sourceRoute) {
     if (!this.manifestData) {
       throw new Error("Missing manifest data. This is an internal error, please file an issue.");
     }
-    let finalUrl = void 0;
-    for (const route of this.manifestData.routes) {
-      if (payload instanceof URL) {
-        finalUrl = payload;
-      } else if (payload instanceof Request) {
-        finalUrl = new URL(payload.url);
-      } else {
-        finalUrl = new URL(payload, new URL(request.url).origin);
-      }
-      if (route.pattern.test(decodeURI(finalUrl.pathname))) {
-        foundRoute = route;
-        break;
-      } else if (finalUrl.pathname === "/404") {
-        foundRoute = DEFAULT_404_ROUTE;
-        break;
-      }
-    }
-    if (foundRoute && finalUrl) {
-      if (foundRoute.pathname === "/404") {
-        const componentInstance = this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      } else {
-        const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      }
-    } else {
-      throw new AstroError({
-        ...RewriteEncounteredAnError,
-        message: RewriteEncounteredAnError.message(payload.toString())
-      });
-    }
+    const [foundRoute, finalUrl] = findRouteToRewrite({
+      payload,
+      request,
+      routes: this.manifestData?.routes,
+      trailingSlash: this.config.trailingSlash,
+      buildFormat: this.config.build.format,
+      base: this.config.base
+    });
+    const componentInstance = await this.getComponentByRoute(foundRoute);
+    return [foundRoute, componentInstance, finalUrl];
   }
   setManifestData(manifestData) {
     this.manifestData = manifestData;
   }
-  rewriteKnownRoute(route, sourceRoute) {
-    if (isServerLikeOutput(this.config) && sourceRoute.prerender) {
-      if (route === "/404") {
-        return { default: default404Page };
-      }
-    }
-    throw new AstroError(InvalidRewrite404);
-  }
 }
 export {
   DevPipeline

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type fs from 'node:fs';
 import type * as vite from 'vite';
 import type { AstroSettings, SSRManifest } from '../@types/astro.js';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type http from 'node:http';
 import type { ManifestData } from '../@types/astro.js';
 import type { DevServerController } from './controller.js';

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

@@ -11,7 +11,7 @@ async function handleRequest({
   incomingResponse
 }) {
   const { config, loader } = pipeline;
-  const origin = `${loader.isHttps() ? "https" : "http"}://${incomingRequest.headers.host}`;
+  const origin = `${loader.isHttps() ? "https" : "http"}://${incomingRequest.headers[":authority"] ?? incomingRequest.headers.host}`;
   const url = new URL(origin + incomingRequest.url);
   let pathname;
   if (config.trailingSlash === "never" && !incomingRequest.url) {

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type http from 'node:http';
 import type { ErrorWithMetadata } from '../core/errors/index.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type http from 'node:http';
 import type { ComponentInstance, ManifestData, RouteData } from '../@types/astro.js';
 import type { DevPipeline } from './pipeline.js';

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

@@ -108,11 +108,8 @@ async function handleRoute({
 }) {
   const timeStart = performance.now();
   const { config, loader, logger } = pipeline;
-  if (!matchedRoute && !config.i18n) {
-    if (isLoggedRequest(pathname)) {
-      logger.info(null, req({ url: pathname, method: incomingRequest.method, statusCode: 404 }));
-    }
-    return handle404Response(origin, incomingRequest, incomingResponse);
+  if (!matchedRoute) {
+    throw new Error("No route matched, and default 404 route was not found.");
   }
   let request;
   let renderContext;
@@ -121,96 +118,40 @@ async function handleRoute({
   let route;
   const middleware = (await loadMiddleware(loader)).onRequest;
   const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
-  if (!matchedRoute) {
-    if (config.i18n) {
-      const locales = config.i18n.locales;
-      const pathNameHasLocale = pathname.split("/").filter(Boolean).some((segment) => {
-        let found = false;
-        for (const locale of locales) {
-          if (typeof locale === "string") {
-            if (normalizeTheLocale(locale) === normalizeTheLocale(segment)) {
-              found = true;
-              break;
-            }
-          } else {
-            if (locale.path === segment) {
-              found = true;
-              break;
-            }
-          }
-        }
-        return found;
-      });
-      if (!pathNameHasLocale && pathname !== "/") {
-        return handle404Response(origin, incomingRequest, incomingResponse);
-      }
-    }
-    request = createRequest({
-      base: config.base,
-      url,
-      headers: incomingRequest.headers,
-      logger,
-      // no route found, so we assume the default for rendering the 404 page
-      staticLike: config.output === "static" || config.output === "hybrid"
-    });
-    route = {
-      component: "",
-      generate(_data) {
-        return "";
-      },
-      params: [],
-      // Disable eslint as we only want to generate an empty RegExp
-      // eslint-disable-next-line prefer-regex-literals
-      pattern: new RegExp(""),
-      prerender: false,
-      segments: [],
-      type: "fallback",
-      route: "",
-      fallbackRoutes: [],
-      isIndex: false
-    };
-    renderContext = RenderContext.create({
-      pipeline,
-      pathname,
-      middleware,
-      request,
-      routeData: route
-    });
-  } else {
-    const filePath = matchedRoute.filePath;
-    const { preloadedComponent } = matchedRoute;
-    route = matchedRoute.route;
-    request = createRequest({
-      base: config.base,
-      url,
-      headers: incomingRequest.headers,
-      method: incomingRequest.method,
-      body,
-      logger,
-      clientAddress: incomingRequest.socket.remoteAddress,
-      staticLike: config.output === "static" || route.prerender
-    });
-    for (const [name, value] of Object.entries(config.server.headers ?? {})) {
-      if (value) incomingResponse.setHeader(name, value);
-    }
-    options = {
-      pipeline,
-      filePath,
-      preload: preloadedComponent,
-      pathname,
-      request,
-      route
-    };
-    mod = preloadedComponent;
-    renderContext = RenderContext.create({
-      locals,
-      pipeline,
-      pathname,
-      middleware,
-      request,
-      routeData: route
-    });
+  const filePath = matchedRoute.filePath;
+  const { preloadedComponent } = matchedRoute;
+  route = matchedRoute.route;
+  request = createRequest({
+    base: config.base,
+    url,
+    headers: incomingRequest.headers,
+    method: incomingRequest.method,
+    body,
+    logger,
+    clientAddress: incomingRequest.socket.remoteAddress,
+    staticLike: config.output === "static" || route.prerender
+  });
+  for (const [name, value] of Object.entries(config.server.headers ?? {})) {
+    if (value) incomingResponse.setHeader(name, value);
   }
+  options = {
+    pipeline,
+    filePath,
+    preload: preloadedComponent,
+    pathname,
+    request,
+    route
+  };
+  mod = preloadedComponent;
+  const isPrerendered404 = matchedRoute.route.route === "/404" && matchedRoute.route.prerender;
+  renderContext = RenderContext.create({
+    locals,
+    pipeline,
+    pathname,
+    middleware: isPrerendered404 ? void 0 : middleware,
+    request,
+    routeData: route
+  });
   let response;
   try {
     response = await renderContext.render(mod);
@@ -220,9 +161,10 @@ async function handleRoute({
       throw err;
     }
     logger.error("router", err.stack || err.message);
-    const filePath = new URL(`./${custom500.component}`, config.root);
-    const preloadedComponent = await pipeline.preload(custom500, filePath);
-    response = await renderContext.render(preloadedComponent);
+    const filePath500 = new URL(`./${custom500.component}`, config.root);
+    const preloaded500Component = await pipeline.preload(custom500, filePath500);
+    renderContext.props.error = err;
+    response = await renderContext.render(preloaded500Component);
     status = 500;
   }
   if (isLoggedRequest(pathname)) {

package/dist/vite-plugin-inject-env-ts/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type fsMod from 'node:fs';
 import { type Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';

package/dist/vite-plugin-load-fallback/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import nodeFs from 'node:fs';
 import type * as vite from 'vite';
 type NodeFileSystemModule = typeof nodeFs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.10.3",
+  "version": "4.11.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -109,7 +109,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.8.0",
+    "@astrojs/compiler": "^2.8.1",
     "@babel/core": "^7.24.7",
     "@babel/generator": "^7.24.7",
     "@babel/parser": "^7.24.7",
@@ -134,7 +134,7 @@
     "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.3",
-    "es-module-lexer": "^1.5.3",
+    "es-module-lexer": "^1.5.4",
     "esbuild": "^0.21.5",
     "estree-walker": "^3.0.3",
     "execa": "^8.0.1",
@@ -157,7 +157,7 @@
     "rehype": "^13.0.1",
     "resolve": "^1.22.8",
     "semver": "^7.6.2",
-    "shiki": "^1.6.5",
+    "shiki": "^1.9.0",
     "string-width": "^7.1.0",
     "strip-ansi": "^7.1.0",
     "tsconfck": "^3.1.0",
@@ -168,10 +168,10 @@
     "which-pm": "^2.2.0",
     "yargs-parser": "^21.1.1",
     "zod": "^3.23.8",
-    "zod-to-json-schema": "^3.23.0",
-    "@astrojs/internal-helpers": "0.4.0",
-    "@astrojs/telemetry": "3.1.0",
-    "@astrojs/markdown-remark": "5.1.0"
+    "zod-to-json-schema": "^3.23.1",
+    "@astrojs/internal-helpers": "0.4.1",
+    "@astrojs/markdown-remark": "5.1.1",
+    "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -205,16 +205,17 @@
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.1.2",
     "memfs": "^4.9.3",
-    "node-mocks-http": "^1.14.1",
+    "node-mocks-http": "^1.15.0",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.18.0",
-    "sass": "^1.77.5",
+    "sass": "^1.77.6",
     "srcset-parse": "^1.1.0",
-    "unified": "^11.0.4",
+    "undici": "^6.19.2",
+    "unified": "^11.0.5",
     "astro-scripts": "0.0.14"
   },
   "engines": {