astro 2.0.4 → 2.0.5

package/dist/content/internal.js

@@ -1,3 +1,4 @@
+import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { prependForwardSlash } from "../core/path.js";
 import {
   createComponent,
@@ -97,25 +98,44 @@ async function render({
   collectionToRenderEntryMap
 }) {
   var _a;
+  const UnexpectedRenderError = new AstroError({
+    ...AstroErrorData.UnknownContentCollectionError,
+    message: `Unexpected error while rendering ${String(collection)} \u2192 ${String(id)}.`
+  });
   const lazyImport = (_a = collectionToRenderEntryMap[collection]) == null ? void 0 : _a[id];
-  if (!lazyImport)
-    throw new Error(`${String(collection)} \u2192 ${String(id)} does not exist.`);
-  const mod = await lazyImport();
+  if (typeof lazyImport !== "function")
+    throw UnexpectedRenderError;
+  const baseMod = await lazyImport();
+  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")
+    throw UnexpectedRenderError;
   const Content = createComponent({
-    factory(result, props, slots) {
+    factory(result, baseProps, slots) {
       let styles = "", links = "", scripts = "";
-      if (Array.isArray(mod == null ? void 0 : mod.collectedStyles)) {
-        styles = mod.collectedStyles.map((style) => renderStyleElement(style)).join("");
+      if (Array.isArray(collectedStyles)) {
+        styles = collectedStyles.map((style) => renderStyleElement(style)).join("");
       }
-      if (Array.isArray(mod == null ? void 0 : mod.collectedLinks)) {
-        links = mod.collectedLinks.map((link) => {
+      if (Array.isArray(collectedLinks)) {
+        links = collectedLinks.map((link) => {
           return renderUniqueStylesheet(result, {
             href: prependForwardSlash(link)
           });
         }).join("");
       }
-      if (Array.isArray(mod == null ? void 0 : mod.collectedScripts)) {
-        scripts = mod.collectedScripts.map((script) => renderScriptElement(script)).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),

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

@@ -29,7 +29,9 @@ function astroContentAssetPropagationPlugin({ mode }) {
       if (isPropagatedAsset(id)) {
         const basePath = id.split("?")[0];
         const code = `
-					export { Content, getHeadings, frontmatter } from ${JSON.stringify(basePath)};
+					export async function getMod() {
+						return import(${JSON.stringify(basePath)});
+					}
 					export const collectedLinks = ${JSON.stringify(LINKS_PLACEHOLDER)};
 					export const collectedStyles = ${JSON.stringify(STYLES_PLACEHOLDER)};
 					export const collectedScripts = ${JSON.stringify(SCRIPTS_PLACEHOLDER)};

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

package/dist/core/errors/dev/vite.d.ts

@@ -21,6 +21,7 @@ export interface AstroErrorPayload {
             line?: number;
             column?: number;
         };
+        cause?: unknown;
     };
 }
 /**

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

@@ -108,7 +108,8 @@ async function getViteErrorPayload(err) {
         column: (_f = err.loc) == null ? void 0 : _f.column
       },
       plugin,
-      stack: err.stack
+      stack: err.stack,
+      cause: err.cause
     }
   };
   function getKebabErrorName(errorName) {

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

@@ -363,7 +363,7 @@ export declare const AstroErrorData: {
      * @docs
      * @message
      * **Example error messages:**<br/>
-     * InvalidComponentArgs: Invalid arguments passed to <MyAstroComponent> component.
+     * InvalidComponentArgs: Invalid arguments passed to `<MyAstroComponent>` component.
      * @description
      * Astro components cannot be rendered manually via a function call, such as `Component()` or `{items.map(Component)}`. Prefer the component syntax `<Component />` or `{items.map(item => <Component {...item} />)}`.
      */
@@ -558,6 +558,7 @@ export declare const AstroErrorData: {
     };
     /**
      * @docs
+     * @message `COLLECTION_NAME` → `ENTRY_ID` has an invalid slug. `slug` must be a string.
      * @see
      * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/)
      * @description
@@ -571,6 +572,7 @@ export declare const AstroErrorData: {
     };
     /**
      * @docs
+     * @message A content collection schema should not contain `slug` since it is reserved for slug generation. Remove this from your `COLLECTION_NAME` collection schema.
      * @see
      * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/)
      * @description

package/dist/core/errors/overlay.js

@@ -318,7 +318,8 @@ const style = `
 
 #message-hints,
 #stack,
-#code {
+#code,
+#cause {
   border-radius: var(--roundiness);
   background-color: var(--box-background);
 }
@@ -468,7 +469,8 @@ const style = `
   color: var(--error-text);
 }
 
-#stack h2 {
+#stack h2,
+#cause h2 {
   color: var(--title-text);
   font-family: var(--font-normal);
   font-size: 22px;
@@ -477,7 +479,8 @@ const style = `
   border-bottom: 1px solid var(--border);
 }
 
-#stack-content {
+#stack-content,
+#cause-content {
   font-size: 14px;
   white-space: pre;
   line-height: 21px;
@@ -485,6 +488,10 @@ const style = `
   padding: 24px;
   color: var(--stack-text);
 }
+
+#cause {
+  display: none;
+}
 `;
 const overlayTemplate = `
 <style>
@@ -548,6 +555,11 @@ ${style.trim()}
       <h2>Stack Trace</h2>
       <div id="stack-content"></div>
     </section>
+
+    <section id="cause">
+      <h2>Cause</h2>
+      <div id="cause-content"></div>
+    </section>
   </div>
 </div>
 `;
@@ -575,6 +587,16 @@ class ErrorOverlay extends HTMLElement {
     this.text("#name", err.name);
     this.text("#title", err.title);
     this.text("#message-content", err.message, true);
+    const cause = this.root.querySelector("#cause");
+    if (cause && err.cause) {
+      if (typeof err.cause === "string") {
+        this.text("#cause-content", err.cause);
+        cause.style.display = "block";
+      } else {
+        this.text("#cause-content", JSON.stringify(err.cause, null, 2));
+        cause.style.display = "block";
+      }
+    }
     const hint = this.root.querySelector("#hint");
     if (hint && err.hint) {
       this.text("#hint-content", err.hint, true);

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.4";
+  const version = "2.0.5";
   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.0.4"}`
+        `v${"2.0.5"}`
       )} ${headline}`
     );
   }

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

@@ -70,7 +70,8 @@ function chunkToByteArray(result, chunk) {
   if (chunk instanceof Uint8Array) {
     return chunk;
   }
-  return encoder.encode(stringifyChunk(result, chunk));
+  let stringified = stringifyChunk(result, chunk);
+  return encoder.encode(stringified.toString());
 }
 export {
   Fragment,

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

@@ -206,8 +206,10 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
       }
       if (isPage || (renderer == null ? void 0 : renderer.name) === "astro:jsx") {
         yield html;
-      } else {
+      } else if (html && html.length > 0) {
         yield markHTMLString(html.replace(/\<\/?astro-slot\>/g, ""));
+      } else {
+        yield "";
       }
     }();
   }

package/package.json

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