astro 6.0.5 → 6.0.6

package/bin/astro.mjs

@@ -8,12 +8,9 @@ const CI_INSTRUCTIONS = {
 	VERCEL: 'https://vercel.com/docs/runtimes#official-runtimes/node-js/node-js-version',
 };
 
-// TODO: remove once Stackblitz supports Node 22
-const IS_STACKBLITZ = !!process.versions.webcontainer;
-
 // Hardcode supported Node.js version so we don't have to read differently in CJS & ESM.
-const engines = IS_STACKBLITZ ? '>=20.19.1' : '>=22.12.0';
-const skipSemverCheckIfAbove = IS_STACKBLITZ ? 21 : 23;
+const engines = '>=22.12.0';
+const skipSemverCheckIfAbove = 23;
 
 /** `astro *` */
 async function main() {

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.0.5";
+  version = "6.0.6";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

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

package/dist/core/app/base.js

@@ -32,6 +32,7 @@ import { AstroIntegrationLogger, Logger } from "../logger/core.js";
 import { RenderContext } from "../render-context.js";
 import { redirectTemplate } from "../routing/3xx.js";
 import { ensure404Route } from "../routing/astro-designed-error-pages.js";
+import { routeHasHtmlExtension } from "../routing/helpers.js";
 import { matchRoute } from "../routing/match.js";
 import { applyCacheHeaders } from "../cache/runtime/cache.js";
 import { Router } from "../routing/router.js";
@@ -303,7 +304,7 @@ class BaseApp {
       });
     }
     let pathname = this.getPathnameFromRequest(request);
-    if (this.isDev()) {
+    if (this.isDev() && !routeHasHtmlExtension(routeData)) {
       pathname = pathname.replace(/\/index\.html$/, "/").replace(/\.html$/, "");
     }
     const defaultStatus = this.getDefaultStatusCode(routeData, pathname);

package/dist/core/build/plugins/plugin-manifest.js

@@ -81,13 +81,19 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
   const { settings } = opts;
   const routes = [];
   const domainLookupTable = {};
-  const entryModules = Object.fromEntries(internals.entrySpecifierToBundleMap.entries());
-  if (settings.scripts.some((script) => script.stage === "page")) {
-    staticFiles.push(entryModules[PAGE_SCRIPT_ID]);
-  }
+  const rawEntryModules = Object.fromEntries(internals.entrySpecifierToBundleMap.entries());
   const assetQueryParams = settings.adapter?.client?.assetQueryParams;
   const assetQueryString = assetQueryParams ? assetQueryParams.toString() : void 0;
   const appendAssetQuery = (pth) => assetQueryString ? `${pth}?${assetQueryString}` : pth;
+  const entryModules = Object.fromEntries(
+    Object.entries(rawEntryModules).map(([key, value]) => [
+      key,
+      value ? appendAssetQuery(value) : value
+    ])
+  );
+  if (settings.scripts.some((script) => script.stage === "page")) {
+    staticFiles.push(rawEntryModules[PAGE_SCRIPT_ID]);
+  }
   const prefixAssetPath = (pth) => {
     let result = "";
     if (settings.config.build.assetsPrefix) {
@@ -118,7 +124,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     if (!pageData) continue;
     const scripts = [];
     if (settings.scripts.some((script) => script.stage === "page")) {
-      const src = entryModules[PAGE_SCRIPT_ID];
+      const src = rawEntryModules[PAGE_SCRIPT_ID];
       scripts.push({
         type: "external",
         value: appendAssetQuery(src)

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.0.5";
+const ASTRO_VERSION = "6.0.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

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

package/dist/core/messages/runtime.js

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

package/dist/core/render/params-and-props.js

@@ -1,6 +1,6 @@
 import { DEFAULT_404_COMPONENT } from "../constants.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
-import { routeIsFallback, routeIsRedirect } from "../routing/helpers.js";
+import { routeHasHtmlExtension, routeIsFallback, routeIsRedirect } from "../routing/helpers.js";
 import { callGetStaticPaths, findPathItemByKey } from "./route-cache.js";
 async function getProps(opts) {
   const {
@@ -44,11 +44,9 @@ async function getProps(opts) {
 }
 function getParams(route, pathname) {
   if (!route.params.length) return {};
-  let path = pathname;
-  if (pathname.endsWith(".html")) {
-    path = path.slice(0, -5);
-  }
-  const paramsMatch = route.pattern.exec(path) || route.fallbackRoutes.map((fallbackRoute) => fallbackRoute.pattern.exec(path)).find((x) => x);
+  const path = pathname.endsWith(".html") && !routeHasHtmlExtension(route) ? pathname.slice(0, -5) : pathname;
+  const allPatterns = [route, ...route.fallbackRoutes].map((r) => r.pattern);
+  const paramsMatch = allPatterns.map((pattern) => pattern.exec(path)).find((x) => x);
   if (!paramsMatch) return {};
   const params = {};
   route.params.forEach((key, i) => {

package/dist/core/render/ssr-element.js

@@ -1,17 +1,39 @@
 import { getAssetsPrefix } from "../../assets/utils/getAssetsPrefix.js";
 import { fileExtension, joinPaths, prependForwardSlash, slash } from "../../core/path.js";
+const URL_PARSE_BASE = "https://astro.build";
+function splitAssetPath(path) {
+  const parsed = new URL(path, URL_PARSE_BASE);
+  const isAbsolute = URL.canParse(path);
+  const pathname = !isAbsolute && !path.startsWith("/") ? parsed.pathname.slice(1) : parsed.pathname;
+  return {
+    pathname,
+    suffix: `${parsed.search}${parsed.hash}`
+  };
+}
+function appendQueryParams(path, queryParams) {
+  const queryString = queryParams.toString();
+  if (!queryString) {
+    return path;
+  }
+  const hashIndex = path.indexOf("#");
+  const basePath = hashIndex === -1 ? path : path.slice(0, hashIndex);
+  const hash = hashIndex === -1 ? "" : path.slice(hashIndex);
+  const separator = basePath.includes("?") ? "&" : "?";
+  return `${basePath}${separator}${queryString}${hash}`;
+}
 function createAssetLink(href, base, assetsPrefix, queryParams) {
+  const { pathname, suffix } = splitAssetPath(href);
   let url = "";
   if (assetsPrefix) {
-    const pf = getAssetsPrefix(fileExtension(href), assetsPrefix);
-    url = joinPaths(pf, slash(href));
+    const pf = getAssetsPrefix(fileExtension(pathname), assetsPrefix);
+    url = joinPaths(pf, slash(pathname)) + suffix;
   } else if (base) {
-    url = prependForwardSlash(joinPaths(base, slash(href)));
+    url = prependForwardSlash(joinPaths(base, slash(pathname))) + suffix;
   } else {
     url = href;
   }
   if (queryParams) {
-    url += "?" + queryParams.toString();
+    url = appendQueryParams(url, queryParams);
   }
   return url;
 }

package/dist/core/routing/helpers.d.ts

@@ -32,6 +32,12 @@ export declare function getCustom404Route(manifestData: RoutesList): RouteData |
  * Return a user-provided 500 route if one exists.
  */
 export declare function getCustom500Route(manifestData: RoutesList): RouteData | undefined;
+/**
+ * Returns true if the route definition contains `.html` as a static segment part,
+ * as is the case for routes like `[slug].html.astro`. Used to avoid stripping the
+ * `.html` suffix from pathnames that intentionally include it.
+ */
+export declare function routeHasHtmlExtension(route: RouteData): boolean;
 export declare function hasNonPrerenderedProjectRoute(routes: Array<Pick<RouteData, 'type' | 'origin' | 'prerender'>>, options?: {
     includeEndpoints?: boolean;
 }): boolean;

package/dist/core/routing/helpers.js

@@ -25,6 +25,11 @@ function getCustom404Route(manifestData) {
 function getCustom500Route(manifestData) {
   return manifestData.routes.find((r) => isRoute500(r.route));
 }
+function routeHasHtmlExtension(route) {
+  return route.segments.some(
+    (segment) => segment.some((part) => !part.dynamic && part.content.includes(".html"))
+  );
+}
 function hasNonPrerenderedProjectRoute(routes, options) {
   const includeEndpoints = options?.includeEndpoints ?? true;
   const routeTypes = includeEndpoints ? ["page", "endpoint"] : ["page"];
@@ -38,6 +43,7 @@ export {
   getCustom500Route,
   getFallbackRoute,
   hasNonPrerenderedProjectRoute,
+  routeHasHtmlExtension,
   routeIsFallback,
   routeIsRedirect
 };

package/dist/core/viteUtils.d.ts

@@ -4,7 +4,13 @@ import type { ModuleLoader } from './module-loader/index.js';
  */
 export declare function normalizePath(id: string): string;
 /**
- * Resolve the hydration paths so that it can be imported in the client
+ * Resolve island component specifiers to stable paths for hydration metadata.
+ *
+ * Examples:
+ * - `./components/Button.jsx` from `/app/src/pages/index.astro`
+ *   -> `/app/src/pages/components/Button.tsx` (when `.tsx` exists)
+ * - `#components/react/Counter.tsx`
+ *   -> `/app/src/components/react/Counter.tsx` via package `imports`
  */
 export declare function resolvePath(specifier: string, importer: string): string;
 export declare function rootRelativePath(root: URL, idOrUrl: URL | string, shouldPrependForwardSlash?: boolean): string;

package/dist/core/viteUtils.js

@@ -1,5 +1,6 @@
+import { createRequire } from "node:module";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { prependForwardSlash, slash } from "../core/path.js";
 import { resolveJsToTs, unwrapId, VALID_ID_PREFIX, viteID } from "./util.js";
 const isWindows = typeof process !== "undefined" && process.platform === "win32";
@@ -10,6 +11,22 @@ function resolvePath(specifier, importer) {
   if (specifier.startsWith(".")) {
     const absoluteSpecifier = path.resolve(path.dirname(importer), specifier);
     return resolveJsToTs(normalizePath(absoluteSpecifier));
+  } else if (specifier.startsWith("#")) {
+    try {
+      const resolved = createRequire(pathToFileURL(importer)).resolve(specifier);
+      return resolveJsToTs(normalizePath(resolved));
+    } catch {
+      try {
+        const importerURL = pathToFileURL(importer).toString();
+        const resolved = import.meta.resolve(specifier, importerURL);
+        const resolvedUrl = new URL(resolved);
+        if (resolvedUrl.protocol === "file:") {
+          return resolveJsToTs(normalizePath(fileURLToPath(resolvedUrl)));
+        }
+      } catch {
+      }
+    }
+    return specifier;
   } else {
     return specifier;
   }

package/dist/manifest/serialized.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from 'vite';
+import { type Plugin } from 'vite';
 import type { AstroSettings } from '../types/astro.js';
 export declare const SERIALIZED_MANIFEST_ID = "virtual:astro:manifest";
 export declare const SERIALIZED_MANIFEST_RESOLVED_ID: string;

package/dist/manifest/serialized.js

@@ -1,3 +1,5 @@
+import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
 import { ACTIONS_ENTRYPOINT_VIRTUAL_MODULE_ID } from "../actions/consts.js";
 import { toFallbackType } from "../core/app/common.js";
 import { toRoutingStrategy } from "../core/app/entrypoints/index.js";
@@ -31,8 +33,9 @@ function serializedManifestPlugin({
   command,
   sync
 }) {
+  const normalizedSrcDir = normalizePath(fileURLToPath(settings.config.srcDir));
   function reloadManifest(path, server) {
-    if (path != null && path.startsWith(settings.config.srcDir.pathname)) {
+    if (path != null && normalizePath(path).startsWith(normalizedSrcDir)) {
       const environment = server.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
       const virtualMod = environment.moduleGraph.getModuleById(SERIALIZED_MANIFEST_RESOLVED_ID);
       if (!virtualMod) return;

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

@@ -1,10 +1,12 @@
 import type { HmrContext } from 'vite';
 import type { Logger } from '../core/logger/core.js';
+import type { CompileAstroResult } from './compile.js';
 import type { CompileMetadata } from './types.js';
 interface HandleHotUpdateOptions {
     logger: Logger;
+    compile: (code: string, filename: string) => Promise<CompileAstroResult>;
     astroFileToCompileMetadata: Map<string, CompileMetadata>;
 }
-export declare function handleHotUpdate(ctx: HmrContext, { logger, astroFileToCompileMetadata }: HandleHotUpdateOptions): Promise<import("vite").ModuleNode[] | undefined>;
+export declare function handleHotUpdate(ctx: HmrContext, { logger, compile, astroFileToCompileMetadata }: HandleHotUpdateOptions): Promise<import("vite").ModuleNode[] | undefined>;
 export declare function isStyleOnlyChanged(oldCode: string, newCode: string): boolean;
 export {};

package/dist/vite-plugin-astro/hmr.js

@@ -1,6 +1,6 @@
 import { parseAstroRequest } from "./query.js";
 import { frontmatterRE } from "./utils.js";
-async function handleHotUpdate(ctx, { logger, astroFileToCompileMetadata }) {
+async function handleHotUpdate(ctx, { logger, compile, astroFileToCompileMetadata }) {
   for (const [astroFile, compileData] of astroFileToCompileMetadata) {
     const isUpdatedFileCssDep = compileData.css.some((css) => css.dependencies?.includes(ctx.file));
     if (isUpdatedFileCssDep) {
@@ -12,7 +12,11 @@ async function handleHotUpdate(ctx, { logger, astroFileToCompileMetadata }) {
   const newCode = await ctx.read();
   if (isStyleOnlyChanged(oldCode, newCode)) {
     logger.debug("watch", "style-only change");
-    astroFileToCompileMetadata.delete(ctx.file);
+    try {
+      await compile(newCode, ctx.file);
+    } catch {
+      astroFileToCompileMetadata.delete(ctx.file);
+    }
     return ctx.modules.filter((mod) => {
       if (!mod.id) {
         return false;

package/dist/vite-plugin-astro/index.js

@@ -246,7 +246,7 @@ File: ${id}`
         }
       },
       async handleHotUpdate(ctx) {
-        return handleHotUpdate(ctx, { logger, astroFileToCompileMetadata });
+        return handleHotUpdate(ctx, { logger, compile, astroFileToCompileMetadata });
       }
     },
     {

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

@@ -45,9 +45,6 @@ function createVitePluginAstroServer({
       const prerenderEnvironment = viteServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.prerender];
       const runnableSsrEnvironment = isRunnableDevEnvironment(ssrEnvironment) ? ssrEnvironment : void 0;
       const runnablePrerenderEnvironment = isRunnableDevEnvironment(prerenderEnvironment) ? prerenderEnvironment : void 0;
-      if (!runnableSsrEnvironment && !runnablePrerenderEnvironment) {
-        return;
-      }
       async function createHandler(environment) {
         const loader = createViteLoader(viteServer, environment);
         const { default: createAstroServerApp } = await environment.runner.import(ASTRO_DEV_SERVER_APP_ID);
@@ -84,17 +81,16 @@ function createVitePluginAstroServer({
           );
         }
       }
-      process.on("unhandledRejection", handleUnhandledRejection);
-      viteServer.httpServer?.on("close", () => {
-        process.off("unhandledRejection", handleUnhandledRejection);
-      });
+      if (ssrHandler || prerenderHandler) {
+        process.on("unhandledRejection", handleUnhandledRejection);
+        viteServer.httpServer?.on("close", () => {
+          process.off("unhandledRejection", handleUnhandledRejection);
+        });
+      }
       return () => {
         const shouldHandlePrerenderInCore = Boolean(
           viteServer[devPrerenderMiddlewareSymbol]
         );
-        if (!ssrHandler && !(prerenderHandler && shouldHandlePrerenderInCore)) {
-          return;
-        }
         viteServer.middlewares.stack.unshift({
           route: "",
           handle: baseMiddleware(settings, logger)

package/dist/vite-plugin-routes/index.js

@@ -52,11 +52,12 @@ async function astroPluginRoutes({
       };
     }
   );
+  const normalizedSrcDir = normalizePath(fileURLToPath(settings.config.srcDir));
   async function rebuildRoutes(path = null, server) {
-    if (path != null && path.startsWith(settings.config.srcDir.pathname)) {
+    if (path != null && normalizePath(path).startsWith(normalizedSrcDir)) {
       logger.debug(
         "update",
-        `Re-calculating routes for ${path.slice(settings.config.srcDir.pathname.length)}`
+        `Re-calculating routes for ${normalizePath(path).slice(normalizedSrcDir.length)}`
       );
       const file = pathToFileURL(normalizePath(path));
       const newRoutesList = await createRoutesList(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -153,8 +153,8 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
-    "@astrojs/markdown-remark": "7.0.0",
     "@astrojs/internal-helpers": "0.8.0",
+    "@astrojs/markdown-remark": "7.0.1",
     "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
@@ -194,7 +194,7 @@
     "astro-scripts": "0.0.14"
   },
   "engines": {
-    "node": "^20.19.1 || >=22.12.0",
+    "node": ">=22.12.0",
     "npm": ">=9.6.5",
     "pnpm": ">=7.1.0"
   },

package/templates/content/types.d.ts

@@ -111,11 +111,12 @@ declare module 'astro:content' {
 	type InferEntrySchema<C extends keyof DataEntryMap> = import('astro/zod').infer<
 		ReturnTypeOrOriginal<Required<ContentConfig['collections'][C]>['schema']>
 	>;
+	type ExtractLoaderConfig<T> = T extends { loader: infer L } ? L : never;
 	type InferLoaderSchema<
 		C extends keyof DataEntryMap,
-		L = Required<ContentConfig['collections'][C]>['loader'],
+		L = ExtractLoaderConfig<ContentConfig['collections'][C]>,
 	> = L extends { schema: import('astro/zod').ZodSchema }
-		? import('astro/zod').infer<Required<ContentConfig['collections'][C]>['loader']['schema']>
+		? import('astro/zod').infer<L['schema']>
 		: any;
 
 	type DataEntryMap = {