astro 4.4.6 → 4.4.7

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

@@ -19,6 +19,7 @@ import type { AstroDevToolbar, DevToolbarCanvas } from '../runtime/client/dev-to
 import type { Icon } from '../runtime/client/dev-toolbar/ui-library/icons.js';
 import type { DevToolbarBadge, DevToolbarButton, DevToolbarCard, DevToolbarHighlight, DevToolbarIcon, DevToolbarToggle, DevToolbarTooltip, DevToolbarWindow } from '../runtime/client/dev-toolbar/ui-library/index.js';
 import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server/index.js';
+import type { TransitionBeforePreparationEvent, TransitionBeforeSwapEvent } from '../transitions/events.js';
 import type { DeepPartial, OmitIndexSignature, Simplify } from '../type-utils.js';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export { type AstroIntegrationLogger };
@@ -2520,9 +2521,14 @@ declare global {
         'astro-dev-overlay-icon': DevToolbarIcon;
         'astro-dev-overlay-card': DevToolbarCard;
     }
-}
-declare global {
     namespace Config {
         type Database = Record<string, any>;
     }
+    interface DocumentEventMap {
+        'astro:before-preparation': TransitionBeforePreparationEvent;
+        'astro:after-preparation': Event;
+        'astro:before-swap': TransitionBeforeSwapEvent;
+        'astro:after-swap': Event;
+        'astro:page-load': Event;
+    }
 }

package/dist/assets/endpoint/node.js

@@ -1,22 +1,43 @@
-import os from "os";
+import os from "node:os";
+import { isAbsolute } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
 import { readFile } from "fs/promises";
 import mime from "mime/lite.js";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
 import { isRemoteAllowed } from "../utils/remotePattern.js";
-import { assetsDir, imageConfig } from "astro:assets";
+import { assetsDir, imageConfig, outDir } from "astro:assets";
 function replaceFileSystemReferences(src) {
   return os.platform().includes("win32") ? src.replace(/^\/@fs\//, "") : src.replace(/^\/@fs/, "");
 }
 async function loadLocalImage(src, url) {
-  const filePath = import.meta.env.DEV ? removeQueryString(replaceFileSystemReferences(src)) : new URL("." + src, assetsDir);
+  const assetsDirPath = fileURLToPath(assetsDir);
+  let fileUrl;
+  if (import.meta.env.DEV) {
+    fileUrl = pathToFileURL(removeQueryString(replaceFileSystemReferences(src)));
+  } else {
+    try {
+      fileUrl = new URL("." + src, outDir);
+      const filePath = fileURLToPath(fileUrl);
+      if (!isAbsolute(filePath) || !filePath.startsWith(assetsDirPath)) {
+        return void 0;
+      }
+    } catch (err) {
+      return void 0;
+    }
+  }
   let buffer = void 0;
   try {
-    buffer = await readFile(filePath);
+    buffer = await readFile(fileUrl);
   } catch (e) {
-    const sourceUrl = new URL(src, url.origin);
-    buffer = await loadRemoteImage(sourceUrl);
+    try {
+      const sourceUrl = new URL(src, url.origin);
+      buffer = await loadRemoteImage(sourceUrl);
+    } catch (err) {
+      console.error("Could not process image request:", err);
+      return void 0;
+    }
   }
   return buffer;
 }
@@ -40,7 +61,11 @@ const GET = async ({ request }) => {
     const url = new URL(request.url);
     const transform = await imageService.parseURL(url, imageConfig);
     if (!transform?.src) {
-      throw new Error("Incorrect transform returned by `parseURL`");
+      const err = new Error(
+        "Incorrect transform returned by `parseURL`. Expected a transform with a `src` property."
+      );
+      console.error("Could not parse image transform from URL:", err);
+      return new Response("Internal Server Error", { status: 500 });
     }
     let inputBuffer = void 0;
     if (isRemotePath(transform.src)) {
@@ -52,7 +77,7 @@ const GET = async ({ request }) => {
       inputBuffer = await loadLocalImage(transform.src, url);
     }
     if (!inputBuffer) {
-      return new Response("Not Found", { status: 404 });
+      return new Response("Internal Server Error", { status: 500 });
     }
     const { data, format } = await imageService.transform(inputBuffer, transform, imageConfig);
     return new Response(data, {
@@ -66,7 +91,12 @@ const GET = async ({ request }) => {
     });
   } catch (err) {
     console.error("Could not process image request:", err);
-    return new Response(`Server Error: ${err}`, { status: 500 });
+    return new Response(
+      import.meta.env.DEV ? `Could not process image request: ${err}` : `Internal Server Error`,
+      {
+        status: 500
+      }
+    );
   }
 };
 export {

package/dist/assets/vite-plugin-assets.js

@@ -55,11 +55,12 @@ function assets({
 					export { default as Picture } from "astro/components/Picture.astro";
 
 					export const imageConfig = ${JSON.stringify(settings.config.image)};
-					export const assetsDir = new URL(${JSON.stringify(
+					export const outDir = new URL(${JSON.stringify(
             new URL(
               isServerLikeOutput(settings.config) ? settings.config.build.client : settings.config.outDir
             )
           )});
+					export const assetsDir = new URL(${JSON.stringify(settings.config.build.assets)}, outDir);
 					export const getImage = async (options) => await getImageInternal(options, imageConfig);
 				`;
         }

package/dist/core/build/generate.js

@@ -326,7 +326,7 @@ function getUrlForPath(pathname, base, origin, format, trailingSlash, routeType)
 }
 async function generatePath(pathname, pipeline, gopts, route) {
   const { mod } = gopts;
-  const { config, logger, options, serverLike } = pipeline;
+  const { config, logger, options } = pipeline;
   logger.debug("build", `Generating: ${pathname}`);
   if (route.type === "page") {
     addPageName(pathname, options);
@@ -346,10 +346,11 @@ async function generatePath(pathname, pipeline, gopts, route) {
     route.type
   );
   const request = createRequest({
+    base: config.base,
     url,
     headers: new Headers(),
     logger,
-    ssr: serverLike
+    staticLike: true
   });
   const renderContext = RenderContext.create({ pipeline, pathname, request, routeData: route });
   let body;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.4.6";
+const ASTRO_VERSION = "4.4.7";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const REROUTABLE_STATUS_CODES = [404, 500];

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.4.6";
+  const currentVersion = "4.4.7";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

package/dist/core/request.d.ts

@@ -4,15 +4,22 @@ import type { Logger } from './logger/core.js';
 type HeaderType = Headers | Record<string, any> | IncomingHttpHeaders;
 type RequestBody = ArrayBuffer | Blob | ReadableStream | URLSearchParams | FormData;
 export interface CreateRequestOptions {
+    base: string;
     url: URL | string;
     clientAddress?: string | undefined;
     headers: HeaderType;
     method?: string;
     body?: RequestBody | undefined;
     logger: Logger;
-    ssr: boolean;
     locals?: object | undefined;
-    removeParams?: boolean;
+    /**
+     * Whether the request is being created for a static build or for a prerendered page within a hybrid/SSR build, or for emulating one of those in dev mode.
+     *
+     * When `true`, the request will not include search parameters or body, and warn when headers are accessed.
+     *
+     * @default false
+     */
+    staticLike?: boolean;
 }
-export declare function createRequest({ url, headers, clientAddress, method, body, logger, ssr, locals, removeParams, }: CreateRequestOptions): Request;
+export declare function createRequest({ base, url, headers, clientAddress, method, body, logger, locals, staticLike, }: CreateRequestOptions): Request;
 export {};

package/dist/core/request.js

@@ -1,28 +1,31 @@
+import { appendForwardSlash, prependForwardSlash } from "./path.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 const clientLocalsSymbol = Symbol.for("astro.locals");
 function createRequest({
+  base,
   url,
   headers,
   clientAddress,
   method = "GET",
   body = void 0,
   logger,
-  ssr,
   locals,
-  removeParams = false
+  staticLike = false
 }) {
-  let headersObj = headers instanceof Headers ? headers : new Headers(Object.entries(headers));
+  const headersObj = staticLike ? void 0 : headers instanceof Headers ? headers : new Headers(Object.entries(headers));
   if (typeof url === "string")
     url = new URL(url);
-  if (removeParams && url.pathname !== "/_image") {
+  const imageEndpoint = prependForwardSlash(appendForwardSlash(base)) + "_image";
+  if (staticLike && url.pathname !== imageEndpoint) {
     url.search = "";
   }
   const request = new Request(url, {
     method,
     headers: headersObj,
-    body
+    // body is made available only if the request is for a page that will be on-demand rendered
+    body: staticLike ? null : body
   });
-  if (!ssr) {
+  if (staticLike) {
     const _headers = request.headers;
     const headersDesc = Object.getOwnPropertyDescriptor(request, "headers") || {};
     Object.defineProperty(request, "headers", {

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

@@ -8,7 +8,6 @@ import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
 import { normalizeTheLocale } from "../i18n/index.js";
 import { getSortedPreloadedMatches } from "../prerender/routing.js";
-import { isServerLikeOutput } from "../prerender/utils.js";
 import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
 function isLoggedRequest(url) {
   return url !== "/favicon.ico";
@@ -94,7 +93,6 @@ async function handleRoute({
     }
     return handle404Response(origin, incomingRequest, incomingResponse);
   }
-  const buildingToSSR = isServerLikeOutput(config);
   let request;
   let renderContext;
   let mod = void 0;
@@ -125,10 +123,12 @@ async function handleRoute({
         return handle404Response(origin, incomingRequest, incomingResponse);
       }
       request = createRequest({
+        base: config.base,
         url,
-        headers: buildingToSSR ? incomingRequest.headers : new Headers(),
+        headers: incomingRequest.headers,
         logger,
-        ssr: buildingToSSR
+        // no route found, so we assume the default for rendering the 404 page
+        staticLike: config.output === "static" || config.output === "hybrid"
       });
       route = {
         component: "",
@@ -162,15 +162,14 @@ async function handleRoute({
     route = matchedRoute.route;
     const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
     request = createRequest({
+      base: config.base,
       url,
-      // Headers are only available when using SSR.
-      headers: buildingToSSR ? incomingRequest.headers : new Headers(),
+      headers: incomingRequest.headers,
       method: incomingRequest.method,
       body,
       logger,
-      ssr: buildingToSSR,
-      clientAddress: buildingToSSR ? incomingRequest.socket.remoteAddress : void 0,
-      removeParams: buildingToSSR === false || route.prerender
+      clientAddress: incomingRequest.socket.remoteAddress,
+      staticLike: config.output === "static" || route.prerender
     });
     for (const [name, value] of Object.entries(config.server.headers ?? {})) {
       if (value)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.4.6",
+  "version": "4.4.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -158,7 +158,7 @@
     "tsconfck": "^3.0.0",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "vite": "^5.1.2",
+    "vite": "^5.1.4",
     "vitefu": "^0.2.5",
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",