astro 7.2.8 → 7.2.9

package/client.d.ts

@@ -282,6 +282,11 @@ declare module '*.mdx' {
 	export default load;
 }
 
+declare module '*.html' {
+	const Component: (opts?: { slots?: Record<string, string> }) => string;
+	export default Component;
+}
+
 declare module 'astro:static-paths' {
 	export const StaticPaths: typeof import('./dist/runtime/prerender/static-paths.js').StaticPaths;
 }

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

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

package/dist/content/content-layer.js

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

package/dist/core/build/internal.d.ts

@@ -25,6 +25,14 @@ export interface BuildInternals {
      */
     inlinedScripts: Map<string, string>;
     entrySpecifierToBundleMap: Map<string, string>;
+    /**
+     * Specifiers written to `entrySpecifierToBundleMap` by the prerender environment
+     * that have not been overwritten by the SSR or client environments. These point
+     * to chunk files inside the prerender output directory, which is deleted after
+     * page generation. They must be stripped from the SSR manifest to avoid dangling
+     * references.
+     */
+    prerenderOnlyEntrySpecifiers: Set<string>;
     /**
      * A map for page-specific information.
      */

package/dist/core/build/internal.js

@@ -7,6 +7,7 @@ function createBuildInternals() {
     prerenderCssAssetByModuleKey: /* @__PURE__ */ new Map(),
     inlinedScripts: /* @__PURE__ */ new Map(),
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
+    prerenderOnlyEntrySpecifiers: /* @__PURE__ */ new Set(),
     pagesByKeys: /* @__PURE__ */ new Map(),
     pagesByViteID: /* @__PURE__ */ new Map(),
     pagesByClientOnly: /* @__PURE__ */ new Map(),

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

@@ -56,6 +56,7 @@ function pluginInternals(options, internals) {
         );
       }
       await Promise.all(promises);
+      const isPrerender = this.environment?.name === ASTRO_VITE_ENVIRONMENT_NAMES.prerender;
       for (const [_, chunk] of Object.entries(bundle)) {
         if (chunk.fileName.startsWith(options.settings.config.build.assets)) {
           internals.clientChunksAndAssets.add(chunk.fileName);
@@ -63,7 +64,13 @@ function pluginInternals(options, internals) {
         if (chunk.type === "chunk" && chunk.facadeModuleId) {
           const specifiers = mapping.get(chunk.facadeModuleId) || /* @__PURE__ */ new Set([chunk.facadeModuleId]);
           for (const specifier of specifiers) {
-            internals.entrySpecifierToBundleMap.set(normalizeEntryId(specifier), chunk.fileName);
+            const normalizedId = normalizeEntryId(specifier);
+            internals.entrySpecifierToBundleMap.set(normalizedId, chunk.fileName);
+            if (isPrerender) {
+              internals.prerenderOnlyEntrySpecifiers.add(normalizedId);
+            } else {
+              internals.prerenderOnlyEntrySpecifiers.delete(normalizedId);
+            }
           }
         }
       }

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

@@ -49,7 +49,8 @@ async function manifestBuildPostHook(options, internals, {
       logger: options.logger,
       middlewareEntryPoint: shouldPassMiddlewareEntryPoint ? internals.middlewareEntryPoint : void 0
     });
-    const ssrManifest = stripPrerenderedRouteStyles(manifest);
+    let ssrManifest = stripPrerenderedRouteStyles(manifest);
+    ssrManifest = stripPrerenderOnlyEntryModules(ssrManifest, internals);
     const code = injectManifest(ssrManifest, ssrManifestChunk.code);
     mutate(ssrManifestChunk.fileName, code, false);
   }
@@ -94,6 +95,15 @@ function stripPrerenderedRouteStyles(manifest) {
   });
   return stripped ? { ...manifest, routes } : manifest;
 }
+function stripPrerenderOnlyEntryModules(manifest, internals) {
+  if (internals.prerenderOnlyEntrySpecifiers.size === 0) return manifest;
+  const filtered = Object.fromEntries(
+    Object.entries(manifest.entryModules).filter(
+      ([key]) => !internals.prerenderOnlyEntrySpecifiers.has(key)
+    )
+  );
+  return { ...manifest, entryModules: filtered };
+}
 async function buildManifest(opts, internals, staticFiles, encodedKey) {
   const { settings } = opts;
   const routes = [];

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.2.8";
+const ASTRO_VERSION = "7.2.9";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const ASTRO_ERROR_HEADER = "X-Astro-Error";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

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 = "7.2.8";
+  const currentVersion = "7.2.9";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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

@@ -722,10 +722,14 @@ class FetchState {
    */
   #stripHtmlExtension() {
     if (this.routeData && this.routeData.type === "page" && !routeHasHtmlExtension(this.routeData)) {
+      const original = this.pathname;
       this.pathname = this.pathname.replace(/\/index\.html$/, "/").replace(/\.html$/, "");
       if (this.manifest.trailingSlash === "always" && this.pathname !== "" && !this.pathname.endsWith("/")) {
         this.pathname += "/";
       }
+      if (this.pathname !== original && this.routeData.pattern.test(original) && !this.routeData.pattern.test(this.pathname)) {
+        this.pathname = original;
+      }
     }
   }
   #resolveRouteData() {

package/dist/core/messages/runtime.js

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

package/dist/jsx-runtime/index.js

@@ -1,4 +1,4 @@
-import { Fragment, markHTMLString, Renderer } from "../runtime/server/index.js";
+import { escapeHTML, Fragment, markHTMLString, Renderer } from "../runtime/server/index.js";
 const AstroJSX = "astro:jsx";
 const Empty = /* @__PURE__ */ Symbol("empty");
 const toSlotName = (slotAttr) => slotAttr;
@@ -48,7 +48,8 @@ function transformSetDirectives(vnode) {
     return;
   }
   if ("set:text" in vnode.props) {
-    const children = vnode.props["set:text"];
+    const value = vnode.props["set:text"];
+    const children = typeof value === "string" ? markHTMLString(escapeHTML(value)) : value;
     delete vnode.props["set:text"];
     Object.assign(vnode.props, { children });
     return;

package/env.d.ts

@@ -16,8 +16,3 @@ type Astro = import('./dist/types/public/context.js').AstroGlobal;
 declare const Astro: Readonly<Astro>;
 
 declare const Fragment: any;
-
-declare module '*.html' {
-	const Component: (opts?: { slots?: Record<string, string> }) => string;
-	export default Component;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.2.8",
+  "version": "7.2.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",