astro 6.4.4 → 6.4.6

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.4.4";
+  version = "6.4.6";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

@@ -197,7 +197,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.4.4") {
+    if (previousAstroVersion && previousAstroVersion !== "6.4.6") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -205,8 +205,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.4.4") {
-      this.#store.metaStore().set("astro-version", "6.4.4");
+    if ("6.4.6") {
+      this.#store.metaStore().set("astro-version", "6.4.6");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -23,6 +23,25 @@ import {
 } from "./consts.js";
 import { getDataStoreFile } from "./content-layer.js";
 import { getContentPaths, isDeferredModule } from "./utils.js";
+function invalidateAssetImports(viteServer, filePath) {
+  const timestamp = Date.now();
+  for (const environment of Object.values(viteServer.environments)) {
+    const modules = environment.moduleGraph.getModulesByFile(filePath);
+    if (modules) {
+      for (const module of modules) {
+        environment.moduleGraph.invalidateModule(module, void 0, timestamp, true);
+      }
+    }
+    if (isRunnableDevEnvironment(environment)) {
+      const runnerModules = environment.runner.evaluatedModules.getModulesByFile(filePath);
+      if (runnerModules) {
+        for (const runnerModule of runnerModules) {
+          environment.runner.evaluatedModules.invalidateModule(runnerModule);
+        }
+      }
+    }
+  }
+}
 function invalidateDataStore(viteServer) {
   const environment = viteServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
   const module = environment.moduleGraph.getModuleById(RESOLVED_DATA_STORE_VIRTUAL_ID);
@@ -67,8 +86,11 @@ function astroContentVirtualModPlugin({
     },
     buildStart() {
       if (devServer) {
+        const assetImportsPath = fileURLToPath(new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir));
         devServer.watcher.add(fileURLToPath(dataStoreFile));
+        devServer.watcher.add(assetImportsPath);
         invalidateDataStore(devServer);
+        invalidateAssetImports(devServer, assetImportsPath);
       }
     },
     resolveId: {
@@ -175,14 +197,19 @@ function astroContentVirtualModPlugin({
     configureServer(server) {
       devServer = server;
       const dataStorePath = fileURLToPath(dataStoreFile);
+      const assetImportsPath = fileURLToPath(new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir));
       server.watcher.on("add", (addedPath) => {
         if (addedPath === dataStorePath) {
           invalidateDataStore(server);
+          invalidateAssetImports(server, assetImportsPath);
         }
       });
       server.watcher.on("change", (changedPath) => {
         if (changedPath === dataStorePath) {
           invalidateDataStore(server);
+          invalidateAssetImports(server, assetImportsPath);
+        } else if (changedPath === assetImportsPath) {
+          invalidateAssetImports(server, assetImportsPath);
         }
       });
     }

package/dist/core/app/base.js

@@ -44,11 +44,9 @@ class BaseApp {
     return this.pipeline.logger;
   }
   get adapterLogger() {
-    if (!this.#adapterLogger) {
-      this.#adapterLogger = new AstroIntegrationLogger(
-        this.logger.options,
-        this.manifest.adapterName
-      );
+    const currentOptions = this.logger.options;
+    if (!this.#adapterLogger || this.#adapterLogger.options !== currentOptions) {
+      this.#adapterLogger = new AstroIntegrationLogger(currentOptions, this.manifest.adapterName);
     }
     return this.#adapterLogger;
   }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.4.4";
+const ASTRO_VERSION = "6.4.6";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

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

package/dist/core/errors/default-handler.js

@@ -6,6 +6,7 @@ import { AstroMiddleware } from "../middleware/astro-middleware.js";
 import { PagesHandler } from "../pages/handler.js";
 import { matchRoute } from "../routing/match.js";
 import { provideSession } from "../session/handler.js";
+import { validateHost } from "../app/validate-headers.js";
 class DefaultErrorHandler {
   #app;
   #astroMiddleware;
@@ -31,15 +32,27 @@ class DefaultErrorHandler {
     if (errorRouteData) {
       if (errorRouteData.prerender) {
         const maybeDotHtml = errorRouteData.route.endsWith(`/${status}`) ? ".html" : "";
-        const statusURL = new URL(`${app.baseWithoutTrailingSlash}/${status}${maybeDotHtml}`, url);
+        const allowedDomains = app.manifest.allowedDomains;
+        const validatedHost = validateHost(url.host, url.protocol.replace(":", ""), allowedDomains);
+        const safeOrigin = validatedHost ? url.origin : `${url.protocol}//localhost`;
+        const statusURL = new URL(
+          `${app.baseWithoutTrailingSlash}/${status}${maybeDotHtml}`,
+          safeOrigin
+        );
         if (statusURL.toString() !== request.url && resolvedRenderOptions.prerenderedErrorPageFetch) {
-          const response2 = await resolvedRenderOptions.prerenderedErrorPageFetch(
-            statusURL.toString()
-          );
-          const override = { status, removeContentEncodingHeaders: true };
-          const newResponse = mergeResponses(response2, originalResponse, override);
-          prepareResponse(newResponse, resolvedRenderOptions);
-          return newResponse;
+          try {
+            const response2 = await resolvedRenderOptions.prerenderedErrorPageFetch(
+              statusURL.toString()
+            );
+            const override = { status, removeContentEncodingHeaders: true };
+            const newResponse = mergeResponses(response2, originalResponse, override);
+            prepareResponse(newResponse, resolvedRenderOptions);
+            return newResponse;
+          } catch {
+            const response2 = mergeResponses(new Response(null, { status }), originalResponse);
+            prepareResponse(response2, resolvedRenderOptions);
+            return response2;
+          }
         }
       }
       const mod = await app.pipeline.getComponentByRoute(errorRouteData);

package/dist/core/errors/errors-data.d.ts

@@ -185,8 +185,8 @@ export declare const NoClientOnlyHint: {
  * ---
  * export async function getStaticPaths() {
  *	return [
- *		{ params: { slug: "blog" } },
- * 		{ params: { slug: "about" } }
+ *		{ params: { id: "blog" } },
+ * 		{ params: { id: "about" } }
  * 	];
  *}
  *---
@@ -208,8 +208,8 @@ export declare const InvalidGetStaticPathParam: {
  * ```ts title="pages/blog/[id].astro"
  * export async function getStaticPaths() {
  *	return [ // <-- Array
- *		{ params: { slug: "blog" } }, // <-- Object
- * 		{ params: { slug: "about" } }
+ *		{ params: { id: "blog" } }, // <-- Object
+ * 		{ params: { id: "about" } }
  * 	];
  *}
  * ```
@@ -231,8 +231,8 @@ export declare const InvalidGetStaticPathsEntry: {
  * ```ts title="pages/blog/[id].astro"
  * export async function getStaticPaths() {
  *	return [ // <-- Array
- *		{ params: { slug: "blog" } },
- * 		{ params: { slug: "about" } }
+ *		{ params: { id: "blog" } },
+ * 		{ params: { id: "about" } }
  * 	];
  *}
  * ```

package/dist/core/fetch/fetch-state.js

@@ -9,6 +9,7 @@ import { createCallAction, createGetActionResult, hasActionPayload } from "../..
 import { AstroCookies } from "../cookies/index.js";
 import { Slots } from "../render/index.js";
 import {
+  appSymbol,
   ASTRO_GENERATOR,
   fetchStateSymbol,
   originPathnameSymbol,
@@ -192,9 +193,9 @@ class FetchState {
     if (pipeline.manifest.allowedDomains && pipeline.manifest.allowedDomains.length > 0) {
       this.#applyForwardedHeaders();
     }
-    if (!Reflect.get(request, originPathnameSymbol)) {
+    if (!Reflect.get(this.request, originPathnameSymbol)) {
       setOriginPathname(
-        request,
+        this.request,
         this.pathname,
         pipeline.manifest.trailingSlash,
         pipeline.manifest.buildFormat
@@ -727,6 +728,12 @@ class FetchState {
         this.clientAddress = forwardedFor;
       }
     }
+    const oldRequest = this.request;
+    this.request = new Request(this.url, oldRequest);
+    const app = Reflect.get(oldRequest, appSymbol);
+    if (app !== void 0) {
+      Reflect.set(this.request, appSymbol, app);
+    }
   }
   /**
    * Returns the resolved `props` for this render, computing them lazily

package/dist/core/messages/runtime.js

@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.4.4"}`
+        `v${"6.4.6"}`
       )} ${headline}`
     );
   }

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

@@ -6,6 +6,7 @@ const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|chec
 const AMPERSAND_REGEX = /&/g;
 const DOUBLE_QUOTE_REGEX = /"/g;
 const STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);
+const INVALID_ATTR_NAME_CHAR = /[\s"'>/=]/;
 const toIdent = (k) => k.trim().replace(/(?!^)\b\w|\s+|\W+/g, (match, index) => {
   if (/\W/.test(match)) return "";
   return index === 0 ? match : match.toUpperCase();
@@ -43,6 +44,9 @@ function addAttribute(value, key, shouldEscape = true, tagName = "") {
   if (value == null) {
     return "";
   }
+  if (INVALID_ATTR_NAME_CHAR.test(key)) {
+    return "";
+  }
   if (STATIC_DIRECTIVES.has(key)) {
     console.warn(`[astro] The "${key}" directive cannot be applied dynamically at runtime. It will not be rendered as an attribute.
 
@@ -149,7 +153,7 @@ class BufferedRenderer {
 function createBufferedRenderer(destination, renderFunction) {
   return new BufferedRenderer(destination, renderFunction);
 }
-const isNode = typeof process !== "undefined" && Object.prototype.toString.call(process) === "[object process]" && !(typeof navigator !== "undefined" && navigator.userAgent === "Cloudflare-Workers");
+const isNode = typeof process !== "undefined" && Object.prototype.toString.call(process) === "[object process]";
 const isDeno = typeof Deno !== "undefined";
 function promiseWithResolvers() {
   let resolve, reject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.4.4",
+  "version": "6.4.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -166,8 +166,8 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.10.0",
-    "@astrojs/markdown-remark": "7.2.0",
-    "@astrojs/telemetry": "3.3.2"
+    "@astrojs/telemetry": "3.3.2",
+    "@astrojs/markdown-remark": "7.2.0"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -203,8 +203,8 @@
     "undici": "^7.22.0",
     "unified": "^11.0.5",
     "vitest": "^4.1.0",
-    "@astrojs/check": "0.9.9",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "@astrojs/check": "0.9.9"
   },
   "engines": {
     "node": ">=22.12.0",