astro 2.5.4 → 2.5.6

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

@@ -1166,16 +1166,11 @@ export interface ContentEntryType {
         contents: string;
     }): GetContentEntryInfoReturnType | Promise<GetContentEntryInfoReturnType>;
     getRenderModule?(this: rollup.PluginContext, params: {
+        contents: string;
+        fileUrl: URL;
         viteId: string;
-        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>;
@@ -1534,7 +1529,7 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
      *
      * export const onRequest = defineMiddleware((context, next) => {
      *   context.locals.greeting = "Hello!";
-     *   next();
+     *   return next();
      * });
      * ```
      * Inside a `.astro` file:

package/dist/assets/services/service.js

@@ -24,6 +24,12 @@ const baseService = {
       });
     }
     if (!isESMImportedImage(options.src)) {
+      if (options.src.startsWith("/@fs/")) {
+        throw new AstroError({
+          ...AstroErrorData.LocalImageUsedWrongly,
+          message: AstroErrorData.LocalImageUsedWrongly.message(options.src)
+        });
+      }
       let missingDimension;
       if (!options.width && !options.height) {
         missingDimension = "both";

package/dist/assets/utils/emitAsset.d.ts

@@ -1,4 +1,2 @@
-import type { AstroSettings } from '../../@types/astro';
 import { type Metadata } from './metadata.js';
-export declare function emitESMImage(id: string | undefined, watchMode: boolean, fileEmitter: any, settings: Pick<AstroSettings, 'config'>): Promise<Metadata | undefined>;
-export declare function emoji(char: string, fallback: string): string;
+export declare function emitESMImage(id: string | undefined, watchMode: boolean, fileEmitter: any): Promise<Metadata | undefined>;

package/dist/assets/utils/emitAsset.js

@@ -2,8 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import slash from "slash";
+import { prependForwardSlash } from "../../core/path.js";
 import { imageMetadata } from "./metadata.js";
-async function emitESMImage(id, watchMode, fileEmitter, settings) {
+async function emitESMImage(id, watchMode, fileEmitter) {
   if (!id) {
     return void 0;
   }
@@ -25,25 +26,13 @@ async function emitESMImage(id, watchMode, fileEmitter, settings) {
     url.searchParams.append("origWidth", meta.width.toString());
     url.searchParams.append("origHeight", meta.height.toString());
     url.searchParams.append("origFormat", meta.format);
-    meta.src = rootRelativePath(settings.config, url);
+    meta.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
   }
   return meta;
 }
-function rootRelativePath(config, url) {
-  const basePath = fileURLToNormalizedPath(url);
-  const rootPath = fileURLToNormalizedPath(config.root);
-  return prependForwardSlash(basePath.slice(rootPath.length));
-}
-function prependForwardSlash(filePath) {
-  return filePath[0] === "/" ? filePath : "/" + filePath;
-}
 function fileURLToNormalizedPath(filePath) {
   return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, "/");
 }
-function emoji(char, fallback) {
-  return process.platform !== "win32" ? char : fallback;
-}
 export {
-  emitESMImage,
-  emoji
+  emitESMImage
 };

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

@@ -87,17 +87,17 @@ function assets({
       // Handle serving images during development
       configureServer(server) {
         server.middlewares.use(async (req, res, next) => {
-          var _a2;
+          var _a2, _b;
           if ((_a2 = req.url) == null ? void 0 : _a2.startsWith("/_image")) {
             if (!isLocalService(globalThis.astroAsset.imageService)) {
               return next();
             }
             const url = new URL(req.url, "file:");
-            const filePath = url.searchParams.get("href");
-            if (!filePath) {
+            if (!url.searchParams.has("href")) {
               return next();
             }
-            const filePathURL = new URL("." + filePath, settings.config.root);
+            const filePath = (_b = url.searchParams.get("href")) == null ? void 0 : _b.slice("/@fs".length);
+            const filePathURL = new URL("." + filePath, "file:");
             const file = await fs.readFile(filePathURL);
             let meta = getOrigQueryParams(filePathURL.searchParams);
             if (!meta) {
@@ -196,7 +196,7 @@ function assets({
         }
         const cleanedUrl = removeQueryString(id);
         if (/\.(jpeg|jpg|png|tiff|webp|gif|svg)$/.test(cleanedUrl)) {
-          const meta = await emitESMImage(id, this.meta.watchMode, this.emitFile, settings);
+          const meta = await emitESMImage(id, this.meta.watchMode, this.emitFile);
           return `export default ${JSON.stringify(meta)}`;
         }
       }

package/dist/content/consts.d.ts

@@ -1,10 +1,9 @@
 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,22 +1,15 @@
 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-assets.d.ts

@@ -1,4 +1,3 @@
 import type { PluginContext } from 'rollup';
 import { z } from 'zod';
-import type { AstroSettings } from '../@types/astro.js';
-export declare function createImage(settings: Pick<AstroSettings, 'config'>, pluginContext: PluginContext, entryFilePath: string): () => z.ZodEffects<z.ZodString, import("../assets/utils/metadata.js").Metadata | z.ZodNever, string>;
+export declare function createImage(pluginContext: PluginContext, entryFilePath: string): () => z.ZodEffects<z.ZodString, import("../assets/utils/metadata.js").Metadata | z.ZodNever, string>;

package/dist/content/runtime-assets.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { emitESMImage } from "../assets/index.js";
-function createImage(settings, pluginContext, entryFilePath) {
+function createImage(pluginContext, entryFilePath) {
   return () => {
     return z.string().transform(async (imagePath, ctx) => {
       var _a;
@@ -8,8 +8,7 @@ function createImage(settings, pluginContext, entryFilePath) {
       const metadata = await emitESMImage(
         resolvedFilePath,
         pluginContext.meta.watchMode,
-        pluginContext.emitFile,
-        settings
+        pluginContext.emitFile
       );
       if (!metadata) {
         ctx.addIssue({

package/dist/content/runtime.js

@@ -184,7 +184,7 @@ async function render({
   id,
   renderEntryImport
 }) {
-  var _a, _b;
+  var _a;
   const UnexpectedRenderError = new AstroError({
     ...AstroErrorData.UnknownContentCollectionError,
     message: `Unexpected error while rendering ${String(collection)} \u2192 ${String(id)}.`
@@ -194,69 +194,53 @@ async function render({
   const baseMod = await renderEntryImport();
   if (baseMod == null || typeof baseMod !== "object")
     throw UnexpectedRenderError;
-  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 {
+  const { collectedStyles, collectedLinks, collectedScripts, getMod } = baseMod;
+  if (typeof getMod !== "function")
     throw UnexpectedRenderError;
-  }
+  const mod = await getMod();
+  if (mod == null || typeof mod !== "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: 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/types-generator.js

@@ -9,12 +9,12 @@ import { info, warn } from "../core/logger/core.js";
 import { isRelativePath } from "../core/path.js";
 import { CONTENT_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
 import {
-  getContentEntryConfigByExtMap,
   getContentEntryIdAndSlug,
   getContentPaths,
   getDataEntryExts,
   getDataEntryId,
   getEntryCollectionName,
+  getEntryConfigByExtMap,
   getEntrySlug,
   getEntryType,
   reloadContentConfigObserver
@@ -30,7 +30,7 @@ async function createContentTypesGenerator({
 }) {
   const collectionEntryMap = {};
   const contentPaths = getContentPaths(settings.config, fs);
-  const contentEntryConfigByExt = getContentEntryConfigByExtMap(settings);
+  const contentEntryConfigByExt = getEntryConfigByExtMap(settings.contentEntryTypes);
   const contentEntryExts = [...contentEntryConfigByExt.keys()];
   const dataEntryExts = getDataEntryExts(settings);
   let events = [];
@@ -327,7 +327,7 @@ async function writeContentFiles({
   for (const collectionKey of Object.keys(collectionEntryMap).sort()) {
     const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[JSON.parse(collectionKey)];
     const collection = collectionEntryMap[collectionKey];
-    if ((collectionConfig == null ? void 0 : collectionConfig.type) && collection.type !== collectionConfig.type) {
+    if ((collectionConfig == null ? void 0 : collectionConfig.type) && collection.type !== "unknown" && collection.type !== collectionConfig.type) {
       viteServer.ws.send({
         type: "error",
         err: new AstroError({
@@ -346,7 +346,12 @@ async function writeContentFiles({
       });
       return;
     }
-    switch (collection.type) {
+    const resolvedType = collection.type === "unknown" ? (
+      // Add empty / unknown collections to the data type map by default
+      // This ensures `getCollection('empty-collection')` doesn't raise a type error
+      (collectionConfig == null ? void 0 : collectionConfig.type) ?? "data"
+    ) : collection.type;
+    switch (resolvedType) {
       case "content":
         contentTypesStr += `${collectionKey}: {
 `;
@@ -370,7 +375,6 @@ async function writeContentFiles({
 `;
         break;
       case "data":
-      case "unknown":
         dataTypesStr += `${collectionKey}: {
 `;
         for (const entryKey of Object.keys(collection.entries).sort()) {

package/dist/content/utils.d.ts

@@ -4,7 +4,7 @@ import fsMod from 'node:fs';
 import type { PluginContext } from 'rollup';
 import { type ViteDevServer } from 'vite';
 import { z } from 'zod';
-import type { AstroConfig, AstroSettings, ContentEntryType } from '../@types/astro.js';
+import type { AstroConfig, AstroSettings, ContentEntryType, DataEntryType } from '../@types/astro.js';
 import { CONTENT_FLAGS } from './consts.js';
 /**
  * Amap from a collection + slug to the local file path.
@@ -102,7 +102,7 @@ export declare function getEntryData(entry: {
 }, collectionConfig: CollectionConfig, pluginContext: PluginContext, config: AstroConfig): Promise<any>;
 export declare function getContentEntryExts(settings: Pick<AstroSettings, 'contentEntryTypes'>): string[];
 export declare function getDataEntryExts(settings: Pick<AstroSettings, 'dataEntryTypes'>): string[];
-export declare function getContentEntryConfigByExtMap(settings: Pick<AstroSettings, 'contentEntryTypes'>): Map<string, ContentEntryType>;
+export declare function getEntryConfigByExtMap<TEntryType extends ContentEntryType | DataEntryType>(entryTypes: TEntryType[]): Map<string, TEntryType>;
 export declare function getEntryCollectionName({ contentDir, entry, }: Pick<ContentPaths, 'contentDir'> & {
     entry: string | URL;
 }): string | undefined;

package/dist/content/utils.js

@@ -65,7 +65,7 @@ async function getEntryData(entry, collectionConfig, pluginContext, config) {
       );
     }
     schema = schema({
-      image: createImage({ config }, pluginContext, entry._internal.filePath)
+      image: createImage(pluginContext, entry._internal.filePath)
     });
   }
   if (schema) {
@@ -114,9 +114,9 @@ function getContentEntryExts(settings) {
 function getDataEntryExts(settings) {
   return settings.dataEntryTypes.map((t) => t.extensions).flat();
 }
-function getContentEntryConfigByExtMap(settings) {
+function getEntryConfigByExtMap(entryTypes) {
   const map = /* @__PURE__ */ new Map();
-  for (const entryType of settings.contentEntryTypes) {
+  for (const entryType of entryTypes) {
     for (const ext of entryType.extensions) {
       map.set(ext, entryType);
     }
@@ -340,7 +340,6 @@ export {
   collectionConfigParser,
   contentConfigParser,
   contentObservable,
-  getContentEntryConfigByExtMap,
   getContentEntryExts,
   getContentEntryIdAndSlug,
   getContentPaths,
@@ -348,6 +347,7 @@ export {
   getDataEntryId,
   getDotAstroTypeReference,
   getEntryCollectionName,
+  getEntryConfigByExtMap,
   getEntryData,
   getEntrySlug,
   getEntryType,

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

@@ -1,5 +1,4 @@
-import { extname } from "node:path";
-import { pathToFileURL } from "node:url";
+import { pathToFileURL } from "url";
 import { moduleIsTopLevelPage, walkParentInfos } from "../core/build/graph.js";
 import { getPageDataByViteID } from "../core/build/internal.js";
 import { createViteLoader } from "../core/module-loader/vite.js";
@@ -7,13 +6,15 @@ 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";
-import { hasContentFlag } from "./utils.js";
+function isPropagatedAsset(viteId) {
+  const flags = new URLSearchParams(viteId.split("?")[1]);
+  return flags.has(PROPAGATED_ASSET_FLAG);
+}
 function astroContentAssetPropagationPlugin({
   mode,
   settings
@@ -21,21 +22,6 @@ 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);
@@ -43,7 +29,7 @@ function astroContentAssetPropagationPlugin({
     },
     async transform(_, id, options) {
       var _a;
-      if (hasContentFlag(id, PROPAGATED_ASSET_FLAG)) {
+      if (isPropagatedAsset(id)) {
         const basePath = id.split("?")[0];
         let stringifiedLinks, stringifiedStyles, stringifiedScripts;
         if ((options == null ? void 0 : options.ssr) && devModuleLoader) {
@@ -69,14 +55,12 @@ function astroContentAssetPropagationPlugin({
           stringifiedScripts = JSON.stringify(SCRIPTS_PLACEHOLDER);
         }
         const code = `
-					async function getMod() {
+					export async function getMod() {
 						return import(${JSON.stringify(basePath)});
 					}
-					const collectedLinks = ${stringifiedLinks};
-					const collectedStyles = ${stringifiedStyles};
-					const collectedScripts = ${stringifiedScripts};
-					const defaultMod = { __astroPropagation: true, getMod, collectedLinks, collectedStyles, collectedScripts };
-					export default defaultMod;
+					export const collectedLinks = ${stringifiedLinks};
+					export const collectedStyles = ${stringifiedStyles};
+					export const collectedScripts = ${stringifiedScripts};
 				`;
         return { code, map: { mappings: "" } };
       }