astro 2.6.2 → 2.6.4

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

@@ -399,7 +399,7 @@ export interface AstroUserConfig {
     /**
      * @docs
      * @name redirects (Experimental)
-     * @type {RedirectConfig}
+     * @type {Record<string, RedirectConfig>}
      * @default `{}`
      * @version 2.6.0
      * @description Specify a mapping of redirects where the key is the route to match
@@ -439,7 +439,7 @@ export interface AstroUserConfig {
      * }
      * ```
      */
-    redirects?: RedirectConfig;
+    redirects?: Record<string, RedirectConfig>;
     /**
      * @docs
      * @name site

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

@@ -60,7 +60,7 @@ function astroContentImportPlugin({
           const code = escapeViteEnvReferences(`
 export const id = ${JSON.stringify(id)};
 export const collection = ${JSON.stringify(collection)};
-export const data = ${devalue.uneval(data)};
+export const data = ${stringifyEntryData(data)};
 export const _internal = {
 	type: 'data',
 	filePath: ${JSON.stringify(_internal.filePath)},
@@ -83,7 +83,7 @@ export const _internal = {
 						export const collection = ${JSON.stringify(collection)};
 						export const slug = ${JSON.stringify(slug)};
 						export const body = ${JSON.stringify(body)};
-						export const data = ${devalue.uneval(data)};
+						export const data = ${stringifyEntryData(data)};
 						export const _internal = {
 							type: 'content',
 							filePath: ${JSON.stringify(_internal.filePath)},
@@ -261,6 +261,28 @@ async function getContentConfigFromGlobal() {
   }
   return contentConfig;
 }
+function stringifyEntryData(data) {
+  try {
+    return devalue.uneval(data, (value) => {
+      if (value instanceof URL) {
+        return `new URL(${JSON.stringify(value.href)})`;
+      }
+    });
+  } catch (e) {
+    if (e instanceof Error) {
+      throw new AstroError({
+        ...AstroErrorData.UnsupportedConfigTransformError,
+        message: AstroErrorData.UnsupportedConfigTransformError.message(e.message),
+        stack: e.stack
+      });
+    } else {
+      throw new AstroError({
+        code: 99999,
+        message: "Unexpected error processing content collection data."
+      });
+    }
+  }
+}
 export {
   astroContentImportPlugin
 };

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -98,7 +98,7 @@ async function getStringifiedLookupMap({
   for (const filePath of contentGlob) {
     promises.push(
       limit(async () => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const entryType = getEntryType(filePath, contentPaths, contentEntryExts, dataEntryExts);
         if (entryType !== "content" && entryType !== "data")
           return;
@@ -128,10 +128,17 @@ async function getStringifiedLookupMap({
             fileUrl: pathToFileURL(filePath),
             contentEntryType
           });
+          if ((_c = (_b = lookupMap[collection]) == null ? void 0 : _b.entries) == null ? void 0 : _c[slug]) {
+            throw new AstroError({
+              ...AstroErrorData.DuplicateContentEntrySlugError,
+              message: AstroErrorData.DuplicateContentEntrySlugError.message(collection, slug),
+              hint: slug !== generatedSlug ? `Check the \`slug\` frontmatter property in **${id}**.` : void 0
+            });
+          }
           lookupMap[collection] = {
             type: "content",
             entries: {
-              ...(_b = lookupMap[collection]) == null ? void 0 : _b.entries,
+              ...(_d = lookupMap[collection]) == null ? void 0 : _d.entries,
               [slug]: rootRelativePath(root, filePath)
             }
           };
@@ -140,7 +147,7 @@ async function getStringifiedLookupMap({
           lookupMap[collection] = {
             type: "data",
             entries: {
-              ...(_c = lookupMap[collection]) == null ? void 0 : _c.entries,
+              ...(_e = lookupMap[collection]) == null ? void 0 : _e.entries,
               [id]: rootRelativePath(root, filePath)
             }
           };

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.6.2";
+const ASTRO_VERSION = "2.6.4";
 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.6.2";
+  const currentVersion = "2.6.4";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

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

@@ -11,10 +11,14 @@ import { codeFrame } from "../printer.js";
 import { normalizeLF } from "../utils.js";
 function collectErrorMetadata(e, rootFolder) {
   const err = AggregateError.is(e) || Array.isArray(e.errors) ? e.errors : [e];
-  err.forEach((error) => {
+  err.forEach((error, idx) => {
     var _a, _b;
-    if (error.stack) {
-      error = collectInfoFromStacktrace(e);
+    if (e.stack) {
+      const stackInfo = collectInfoFromStacktrace(e);
+      error.stack = stackInfo.stack;
+      error.loc = stackInfo.loc;
+      error.plugin = stackInfo.plugin;
+      error.pluginCode = stackInfo.pluginCode;
     }
     const normalizedFile = normalizePath(((_a = error.loc) == null ? void 0 : _a.file) || "");
     const normalizedRootFolder = removeLeadingForwardSlashWindows((rootFolder == null ? void 0 : rootFolder.pathname) || "");
@@ -91,11 +95,15 @@ See https://docs.astro.build/en/guides/troubleshooting/#document-or-window-is-no
 }
 function collectInfoFromStacktrace(error) {
   var _a, _b, _c;
-  if (!error.stack)
-    return error;
-  error.stack = normalizeLF(error.stack);
+  let stackInfo = {
+    stack: error.stack,
+    plugin: error.plugin,
+    pluginCode: error.pluginCode,
+    loc: error.loc
+  };
+  stackInfo.stack = normalizeLF(error.stack);
   const stackText = stripAnsi(error.stack);
-  if (!error.loc || !error.loc.column && !error.loc.line) {
+  if (!stackInfo.loc || !stackInfo.loc.column && !stackInfo.loc.line) {
     const possibleFilePath = ((_a = error.loc) == null ? void 0 : _a.file) || error.pluginCode || error.id || // TODO: this could be better, `src` might be something else
     stackText.split("\n").find((ln) => ln.includes("src") || ln.includes("node_modules"));
     const source = possibleFilePath == null ? void 0 : possibleFilePath.replace(/^[^(]+\(([^)]+).*$/, "$1").replace(/^\s+at\s+/, "");
@@ -108,18 +116,18 @@ function collectInfoFromStacktrace(error) {
         file = fileURLToPath(file);
       } catch {
       }
-      error.loc = {
+      stackInfo.loc = {
         file,
         line: Number.parseInt(line),
         column: Number.parseInt(column)
       };
     }
   }
-  if (!error.plugin) {
-    error.plugin = ((_b = /withastro\/astro\/packages\/integrations\/([\w-]+)/gim.exec(stackText)) == null ? void 0 : _b.at(1)) || ((_c = /(@astrojs\/[\w-]+)\/(server|client|index)/gim.exec(stackText)) == null ? void 0 : _c.at(1)) || void 0;
+  if (!stackInfo.plugin) {
+    stackInfo.plugin = ((_b = /withastro\/astro\/packages\/integrations\/([\w-]+)/gim.exec(stackText)) == null ? void 0 : _b.at(1)) || ((_c = /(@astrojs\/[\w-]+)\/(server|client|index)/gim.exec(stackText)) == null ? void 0 : _c.at(1)) || void 0;
   }
-  error.stack = cleanErrorStack(error.stack);
-  return error;
+  stackInfo.stack = cleanErrorStack(error.stack);
+  return stackInfo;
 }
 function cleanErrorStack(stack) {
   return stack.split(/\n/g).map((l) => l.replace(/\/@fs\//g, "/")).join("\n");

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

@@ -974,6 +974,30 @@ export declare const AstroErrorData: {
         readonly message: (entryId: string, errorMessage: string) => string;
         readonly hint: "Ensure your data entry is an object with valid JSON (for `.json` entries) or YAML (for `.yaml` entries).";
     };
+    /**
+     * @docs
+     * @message `COLLECTION_NAME` contains multiple entries with the same slug: `SLUG`. Slugs must be unique.
+     * @description
+     * Content collection entries must have unique slugs. Duplicates are often caused by the `slug` frontmatter property.
+     */
+    readonly DuplicateContentEntrySlugError: {
+        readonly title: "Duplicate content entry slug.";
+        readonly code: 9008;
+        readonly message: (collection: string, slug: string) => string;
+    };
+    /**
+     * @docs
+     * @see
+     * - [devalue library](https://github.com/rich-harris/devalue)
+     * @description
+     * `transform()` functions in your content config must return valid JSON, or data types compatible with the devalue library (including Dates, Maps, and Sets).
+     */
+    readonly UnsupportedConfigTransformError: {
+        readonly title: "Unsupported transform in content config.";
+        readonly code: 9008;
+        readonly message: (parseError: string) => string;
+        readonly hint: "See the devalue library for all supported types: https://github.com/rich-harris/devalue";
+    };
     readonly UnknownError: {
         readonly title: "Unknown Error.";
         readonly code: 99999;

package/dist/core/errors/errors-data.js

@@ -1032,6 +1032,33 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
     },
     hint: "Ensure your data entry is an object with valid JSON (for `.json` entries) or YAML (for `.yaml` entries)."
   },
+  /**
+   * @docs
+   * @message `COLLECTION_NAME` contains multiple entries with the same slug: `SLUG`. Slugs must be unique.
+   * @description
+   * Content collection entries must have unique slugs. Duplicates are often caused by the `slug` frontmatter property.
+   */
+  DuplicateContentEntrySlugError: {
+    title: "Duplicate content entry slug.",
+    code: 9008,
+    message: (collection, slug) => {
+      return `**${collection}** contains multiple entries with the same slug: \`${slug}\`. Slugs must be unique.`;
+    }
+  },
+  /**
+   * @docs
+   * @see
+   * - [devalue library](https://github.com/rich-harris/devalue)
+   * @description
+   * `transform()` functions in your content config must return valid JSON, or data types compatible with the devalue library (including Dates, Maps, and Sets).
+   */
+  UnsupportedConfigTransformError: {
+    title: "Unsupported transform in content config.",
+    code: 9008,
+    message: (parseError) => `\`transform()\` functions in your content config must return valid JSON, or data types compatible with the devalue library (including Dates, Maps, and Sets).
+Full error: ${parseError}`,
+    hint: "See the devalue library for all supported types: https://github.com/rich-harris/devalue"
+  },
   // Generic catch-all - Only use this in extreme cases, like if there was a cosmic ray bit flip
   UnknownError: {
     title: "Unknown Error.",

package/dist/core/messages.js

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

package/dist/jsx/server.js

@@ -13,6 +13,16 @@ async function check(Component, props, { default: children = null, ...slotted }
     const result = await Component({ ...props, ...slots, children });
     return result[AstroJSX];
   } catch (e) {
+    const error = e;
+    if (Component[Symbol.for("mdx-component")]) {
+      throw createFormattedError({
+        message: error.message,
+        title: error.name,
+        hint: `This issue often occurs when your MDX component encounters runtime errors.`,
+        name: error.name,
+        stack: error.stack
+      });
+    }
   }
   return false;
 }
@@ -26,6 +36,13 @@ async function renderToStaticMarkup(Component, props = {}, { default: children =
   const html = await renderJSX(result, jsx(Component, { ...props, ...slots, children }));
   return { html };
 }
+function createFormattedError({ message, name, stack, hint }) {
+  const error = new Error(message);
+  error.name = name;
+  error.stack = stack;
+  error.hint = hint;
+  return error;
+}
 var server_default = {
   check,
   renderToStaticMarkup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.6.2",
+  "version": "2.6.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -121,7 +121,7 @@
     "cookie": "^0.5.0",
     "debug": "^4.3.4",
     "deepmerge-ts": "^4.2.2",
-    "devalue": "^4.2.0",
+    "devalue": "^4.3.2",
     "diff": "^5.1.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "^0.17.18",