astro 2.5.2 → 2.5.3

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

@@ -1170,6 +1170,12 @@ export interface ContentEntryType {
         entry: ContentEntryModule;
     }): rollup.LoadResult | Promise<rollup.LoadResult>;
     contentModuleTypes?: string;
+    /**
+     * Handle asset propagation for rendered content to avoid bleed.
+     * Ex. MDX content can import styles and scripts, so `handlePropagation` should be true.
+     * @default true
+     */
+    handlePropagation?: boolean;
 }
 type GetContentEntryInfoReturnType = {
     data: Record<string, unknown>;

package/dist/content/consts.d.ts

@@ -1,9 +1,10 @@
 export declare const PROPAGATED_ASSET_FLAG = "astroPropagatedAssets";
+export declare const CONTENT_RENDER_FLAG = "astroRenderContent";
 export declare const CONTENT_FLAG = "astroContentCollectionEntry";
 export declare const DATA_FLAG = "astroDataCollectionEntry";
-export declare const CONTENT_FLAGS: readonly ["astroContentCollectionEntry", "astroDataCollectionEntry", "astroPropagatedAssets"];
 export declare const VIRTUAL_MODULE_ID = "astro:content";
 export declare const LINKS_PLACEHOLDER = "@@ASTRO-LINKS@@";
 export declare const STYLES_PLACEHOLDER = "@@ASTRO-STYLES@@";
 export declare const SCRIPTS_PLACEHOLDER = "@@ASTRO-SCRIPTS@@";
+export declare const CONTENT_FLAGS: readonly ["astroContentCollectionEntry", "astroRenderContent", "astroDataCollectionEntry", "astroPropagatedAssets"];
 export declare const CONTENT_TYPES_FILE = "types.d.ts";

package/dist/content/consts.js

@@ -1,15 +1,22 @@
 const PROPAGATED_ASSET_FLAG = "astroPropagatedAssets";
+const CONTENT_RENDER_FLAG = "astroRenderContent";
 const CONTENT_FLAG = "astroContentCollectionEntry";
 const DATA_FLAG = "astroDataCollectionEntry";
-const CONTENT_FLAGS = [CONTENT_FLAG, DATA_FLAG, PROPAGATED_ASSET_FLAG];
 const VIRTUAL_MODULE_ID = "astro:content";
 const LINKS_PLACEHOLDER = "@@ASTRO-LINKS@@";
 const STYLES_PLACEHOLDER = "@@ASTRO-STYLES@@";
 const SCRIPTS_PLACEHOLDER = "@@ASTRO-SCRIPTS@@";
+const CONTENT_FLAGS = [
+  CONTENT_FLAG,
+  CONTENT_RENDER_FLAG,
+  DATA_FLAG,
+  PROPAGATED_ASSET_FLAG
+];
 const CONTENT_TYPES_FILE = "types.d.ts";
 export {
   CONTENT_FLAG,
   CONTENT_FLAGS,
+  CONTENT_RENDER_FLAG,
   CONTENT_TYPES_FILE,
   DATA_FLAG,
   LINKS_PLACEHOLDER,

package/dist/content/runtime.js

@@ -184,7 +184,7 @@ async function render({
   id,
   renderEntryImport
 }) {
-  var _a;
+  var _a, _b;
   const UnexpectedRenderError = new AstroError({
     ...AstroErrorData.UnknownContentCollectionError,
     message: `Unexpected error while rendering ${String(collection)} \u2192 ${String(id)}.`
@@ -194,53 +194,69 @@ async function render({
   const baseMod = await renderEntryImport();
   if (baseMod == null || typeof baseMod !== "object")
     throw UnexpectedRenderError;
-  const { collectedStyles, collectedLinks, collectedScripts, getMod } = baseMod;
-  if (typeof getMod !== "function")
-    throw UnexpectedRenderError;
-  const mod = await getMod();
-  if (mod == null || typeof mod !== "object")
+  if (baseMod.default != null && typeof baseMod.default === "object" && baseMod.default.__astroPropagation === true) {
+    const { collectedStyles, collectedLinks, collectedScripts, getMod } = baseMod.default;
+    if (typeof getMod !== "function")
+      throw UnexpectedRenderError;
+    const propagationMod = await getMod();
+    if (propagationMod == null || typeof propagationMod !== "object")
+      throw UnexpectedRenderError;
+    const Content = createComponent({
+      factory(result, baseProps, slots) {
+        let styles = "", links = "", scripts = "";
+        if (Array.isArray(collectedStyles)) {
+          styles = collectedStyles.map((style) => {
+            return renderUniqueStylesheet(result, {
+              type: "inline",
+              content: style
+            });
+          }).join("");
+        }
+        if (Array.isArray(collectedLinks)) {
+          links = collectedLinks.map((link) => {
+            return renderUniqueStylesheet(result, {
+              type: "external",
+              src: prependForwardSlash(link)
+            });
+          }).join("");
+        }
+        if (Array.isArray(collectedScripts)) {
+          scripts = collectedScripts.map((script) => renderScriptElement(script)).join("");
+        }
+        let props = baseProps;
+        if (id.endsWith("mdx")) {
+          props = {
+            components: propagationMod.components ?? {},
+            ...baseProps
+          };
+        }
+        return createHeadAndContent(
+          unescapeHTML(styles + links + scripts),
+          renderTemplate`${renderComponent(
+            result,
+            "Content",
+            propagationMod.Content,
+            props,
+            slots
+          )}`
+        );
+      },
+      propagation: "self"
+    });
+    return {
+      Content,
+      headings: ((_a = propagationMod.getHeadings) == null ? void 0 : _a.call(propagationMod)) ?? [],
+      remarkPluginFrontmatter: propagationMod.frontmatter ?? {}
+    };
+  } else if (baseMod.Content && typeof baseMod.Content === "function") {
+    return {
+      Content: baseMod.Content,
+      headings: ((_b = baseMod.getHeadings) == null ? void 0 : _b.call(baseMod)) ?? [],
+      remarkPluginFrontmatter: baseMod.frontmatter ?? {}
+    };
+  } else {
     throw UnexpectedRenderError;
-  const Content = createComponent({
-    factory(result, baseProps, slots) {
-      let styles = "", links = "", scripts = "";
-      if (Array.isArray(collectedStyles)) {
-        styles = collectedStyles.map((style) => {
-          return renderUniqueStylesheet(result, {
-            type: "inline",
-            content: style
-          });
-        }).join("");
-      }
-      if (Array.isArray(collectedLinks)) {
-        links = collectedLinks.map((link) => {
-          return renderUniqueStylesheet(result, {
-            type: "external",
-            src: prependForwardSlash(link)
-          });
-        }).join("");
-      }
-      if (Array.isArray(collectedScripts)) {
-        scripts = collectedScripts.map((script) => renderScriptElement(script)).join("");
-      }
-      let props = baseProps;
-      if (id.endsWith("mdx")) {
-        props = {
-          components: mod.components ?? {},
-          ...baseProps
-        };
-      }
-      return createHeadAndContent(
-        unescapeHTML(styles + links + scripts),
-        renderTemplate`${renderComponent(result, "Content", mod.Content, props, slots)}`
-      );
-    },
-    propagation: "self"
-  });
-  return {
-    Content,
-    headings: ((_a = mod.getHeadings) == null ? void 0 : _a.call(mod)) ?? [],
-    remarkPluginFrontmatter: mod.frontmatter ?? {}
-  };
+  }
 }
 function createReference({ lookupMap }) {
   return function reference(collection) {

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

@@ -1,4 +1,5 @@
-import { pathToFileURL } from "url";
+import { extname } from "node:path";
+import { pathToFileURL } from "node:url";
 import { moduleIsTopLevelPage, walkParentInfos } from "../core/build/graph.js";
 import { getPageDataByViteID } from "../core/build/internal.js";
 import { createViteLoader } from "../core/module-loader/vite.js";
@@ -6,15 +7,13 @@ import { joinPaths, prependForwardSlash } from "../core/path.js";
 import { getStylesForURL } from "../core/render/dev/css.js";
 import { getScriptsForURL } from "../core/render/dev/scripts.js";
 import {
+  CONTENT_RENDER_FLAG,
   LINKS_PLACEHOLDER,
   PROPAGATED_ASSET_FLAG,
   SCRIPTS_PLACEHOLDER,
   STYLES_PLACEHOLDER
 } from "./consts.js";
-function isPropagatedAsset(viteId) {
-  const flags = new URLSearchParams(viteId.split("?")[1]);
-  return flags.has(PROPAGATED_ASSET_FLAG);
-}
+import { hasContentFlag } from "./utils.js";
 function astroContentAssetPropagationPlugin({
   mode,
   settings
@@ -22,6 +21,21 @@ function astroContentAssetPropagationPlugin({
   let devModuleLoader;
   return {
     name: "astro:content-asset-propagation",
+    enforce: "pre",
+    async resolveId(id, importer, opts) {
+      if (hasContentFlag(id, CONTENT_RENDER_FLAG)) {
+        const base = id.split("?")[0];
+        for (const { extensions, handlePropagation = true } of settings.contentEntryTypes) {
+          if (handlePropagation && extensions.includes(extname(base))) {
+            return this.resolve(`${base}?${PROPAGATED_ASSET_FLAG}`, importer, {
+              skipSelf: true,
+              ...opts
+            });
+          }
+        }
+        return this.resolve(base, importer, { skipSelf: true, ...opts });
+      }
+    },
     configureServer(server) {
       if (mode === "dev") {
         devModuleLoader = createViteLoader(server);
@@ -29,7 +43,7 @@ function astroContentAssetPropagationPlugin({
     },
     async transform(_, id, options) {
       var _a;
-      if (isPropagatedAsset(id)) {
+      if (hasContentFlag(id, PROPAGATED_ASSET_FLAG)) {
         const basePath = id.split("?")[0];
         let stringifiedLinks, stringifiedStyles, stringifiedScripts;
         if ((options == null ? void 0 : options.ssr) && devModuleLoader) {
@@ -55,12 +69,14 @@ function astroContentAssetPropagationPlugin({
           stringifiedScripts = JSON.stringify(SCRIPTS_PLACEHOLDER);
         }
         const code = `
-					export async function getMod() {
+					async function getMod() {
 						return import(${JSON.stringify(basePath)});
 					}
-					export const collectedLinks = ${stringifiedLinks};
-					export const collectedStyles = ${stringifiedStyles};
-					export const collectedScripts = ${stringifiedScripts};
+					const collectedLinks = ${stringifiedLinks};
+					const collectedStyles = ${stringifiedStyles};
+					const collectedScripts = ${stringifiedScripts};
+					const defaultMod = { __astroPropagation: true, getMod, collectedLinks, collectedStyles, collectedScripts };
+					export default defaultMod;
 				`;
         return { code, map: { mappings: "" } };
       }

package/dist/core/app/index.js

@@ -118,18 +118,18 @@ class App {
     let mod = await this.#manifest.pageMap.get(routeData.component)();
     if (routeData.type === "page") {
       let response = await this.#renderPage(request, routeData, mod, defaultStatus);
-      if (response.status === 500) {
-        const fiveHundredRouteData = matchRoute("/500", this.#manifestData);
-        if (fiveHundredRouteData) {
-          mod = await this.#manifest.pageMap.get(fiveHundredRouteData.component)();
+      if (response.status === 500 || response.status === 404) {
+        const errorPageData = matchRoute("/" + response.status, this.#manifestData);
+        if (errorPageData && errorPageData.route !== routeData.route) {
+          mod = await this.#manifest.pageMap.get(errorPageData.component)();
           try {
-            let fiveHundredResponse = await this.#renderPage(
+            let errorResponse = await this.#renderPage(
               request,
-              fiveHundredRouteData,
+              errorPageData,
               mod,
-              500
+              response.status
             );
-            return fiveHundredResponse;
+            return errorResponse;
           } catch {
           }
         }

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.5.2";
+  const currentVersion = "2.5.3";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

package/dist/core/render/dev/vite.js

@@ -1,15 +1,13 @@
 import npath from "path";
-import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
 import { unwrapId } from "../../util.js";
 import { isCSSRequest } from "./util.js";
-const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS]);
+const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ".mdoc", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS]);
 const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;
+const ASTRO_PROPAGATED_ASSET_REGEX = /\?astroPropagatedAssets/;
 async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ new Set()) {
   const id = unwrapId(_id);
   const importedModules = /* @__PURE__ */ new Set();
-  if (new URL(id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG))
-    return;
   const moduleEntriesForId = isRootFile ? (
     // "getModulesByFile" pulls from a delayed module cache (fun implementation detail),
     // So we can get up-to-date info on initial server load.
@@ -33,14 +31,11 @@ async function* crawlGraph(loader, _id, isRootFile, scanned = /* @__PURE__ */ ne
           if (entryIsStyle && !isCSSRequest(importedModulePathname)) {
             continue;
           }
-          if (fileExtensionsToSSR.has(
-            npath.extname(
-              // Use `id` instead of `pathname` to preserve query params.
-              // Should not SSR a module with an unexpected query param,
-              // like "?astroPropagatedAssets"
-              importedModule.id
-            )
-          )) {
+          const isFileTypeNeedingSSR = fileExtensionsToSSR.has(
+            npath.extname(importedModulePathname)
+          );
+          if (isFileTypeNeedingSSR && // Should not SSR a module with ?astroPropagatedAssets
+          !ASTRO_PROPAGATED_ASSET_REGEX.test(importedModule.id)) {
             const mod = loader.getModuleById(importedModule.id);
             if (!(mod == null ? void 0 : mod.ssrModule)) {
               try {

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

@@ -1,6 +1,6 @@
 import { getTopLevelPages, walkParentInfos } from "../core/build/graph.js";
 import { getAstroMetadata } from "../vite-plugin-astro/index.js";
-const injectExp = /^\/\/\s*astro-head-inject/;
+const injectExp = /(^\/\/|\/\/!)\s*astro-head-inject/;
 function configHeadVitePlugin({
   settings
 }) {

package/dist/vite-plugin-markdown/content-entry-type.js

@@ -10,7 +10,9 @@ const markdownContentEntryType = {
       slug: parsed.data.slug,
       rawData: parsed.matter
     };
-  }
+  },
+  // We need to handle propagation for Markdown because they support layouts which will bring in styles.
+  handlePropagation: true
 };
 const mdxContentEntryType = {
   extensions: [".mdx"],
@@ -23,6 +25,9 @@ const mdxContentEntryType = {
       rawData: parsed.matter
     };
   },
+  // MDX can import scripts and styles,
+  // so wrap all MDX files with script / style propagation checks
+  handlePropagation: true,
   contentModuleTypes: `declare module 'astro:content' {
 	interface Render {
 		'.mdx': Promise<{

package/package.json

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

package/src/content/template/virtual-mod.mjs

@@ -46,7 +46,7 @@ function createGlobLookup(glob) {
 }
 
 const renderEntryGlob = import.meta.glob('@@RENDER_ENTRY_GLOB_PATH@@', {
-	query: { astroPropagatedAssets: true },
+	query: { astroRenderContent: true },
 });
 const collectionToRenderEntryMap = createCollectionToGlobResultMap({
 	globResult: renderEntryGlob,