astro 3.6.4 → 3.6.5

package/dist/assets/endpoint/node.js

@@ -1,21 +1,42 @@
+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 os from "os";
 import { getConfiguredImageService, isRemoteAllowed } from "../internal.js";
 import { etag } from "../utils/etag.js";
-import { assetsDir, imageConfig } from "astro:assets";
+import { assetsDir, outDir, imageConfig } 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;
 }
@@ -39,7 +60,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)) {
@@ -51,7 +76,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, {
@@ -64,7 +89,13 @@ const GET = async ({ request }) => {
       }
     });
   } catch (err) {
-    return new Response(`Server Error: ${err}`, { status: 500 });
+    console.error("Could not process image request:", err);
+    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

@@ -54,11 +54,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/constants.js

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

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.6.4";
+  const currentVersion = "3.6.5";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.6.4";
+  const version = "3.6.5";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.6.4"}`
+        `v${"3.6.5"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -166,9 +166,9 @@
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
-    "@astrojs/markdown-remark": "3.5.0",
     "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/telemetry": "3.0.4"
+    "@astrojs/telemetry": "3.0.4",
+    "@astrojs/markdown-remark": "3.5.0"
   },
   "optionalDependencies": {
     "sharp": "^0.32.5"