astro 2.6.3 → 2.6.5

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/core/build/generate.js

@@ -12,6 +12,7 @@ import {
   hasPrerenderedPages
 } from "../../core/build/internal.js";
 import {
+  isRelativePath,
   prependForwardSlash,
   removeLeadingForwardSlash,
   removeTrailingForwardSlash
@@ -181,7 +182,11 @@ async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
     renderers
   };
   const icon = pageData.route.type === "page" ? green("\u25B6") : magenta("\u03BB");
-  info(opts.logging, null, `${icon} ${pageData.route.component}`);
+  if (isRelativePath(pageData.route.component)) {
+    info(opts.logging, null, `${icon} ${pageData.route.route}`);
+  } else {
+    info(opts.logging, null, `${icon} ${pageData.route.component}`);
+  }
   const paths = await getPathsForRoute(pageData, pageModule, opts, builtPaths);
   for (let i = 0; i < paths.length; i++) {
     const path = paths[i];

package/dist/core/build/static-build.js

@@ -102,7 +102,7 @@ ${bgMagenta(black(" finalizing server assets "))}
 }
 async function ssrBuild(opts, internals, input, container) {
   var _a, _b, _c, _d, _e;
-  const { settings, viteConfig } = opts;
+  const { allPages, settings, viteConfig } = opts;
   const ssr = isServerLikeOutput(settings.config);
   const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir);
   const { lastVitePlugins, vitePlugins } = container.runBeforeHook("ssr", input);
@@ -133,7 +133,7 @@ async function ssrBuild(opts, internals, input, container) {
           entryFileNames(chunkInfo) {
             var _a2;
             if ((_a2 = chunkInfo.facadeModuleId) == null ? void 0 : _a2.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) {
-              return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId);
+              return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId, allPages);
             } else if (
               // checks if the path of the module we have middleware, e.g. middleware.js / middleware/index.js
               chunkInfo.moduleIds.find((m) => m.includes("middleware")) !== void 0 && // checks if the file actually export the `onRequest` function
@@ -324,8 +324,13 @@ async function ssrMoveAssets(opts) {
     removeEmptyDirs(serverAssets);
   }
 }
-function makeAstroPageEntryPointFileName(facadeModuleId) {
-  return `${facadeModuleId.replace(ASTRO_PAGE_RESOLVED_MODULE_ID, "").replace("src/", "").replaceAll("[", "_").replaceAll("]", "_").replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".")}.mjs`;
+function makeAstroPageEntryPointFileName(facadeModuleId, pages) {
+  var _a, _b;
+  const pageModuleId = facadeModuleId.replace(ASTRO_PAGE_RESOLVED_MODULE_ID, "").replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".");
+  let name = ((_b = (_a = pages[pageModuleId]) == null ? void 0 : _a.route) == null ? void 0 : _b.route) ?? pageModuleId;
+  if (name.endsWith("/"))
+    name += "index";
+  return `pages${name.replaceAll("[", "_").replaceAll("]", "_").replaceAll("...", "---")}.mjs`;
 }
 export {
   staticBuild,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.6.3";
+const ASTRO_VERSION = "2.6.5";
 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.3";
+  const currentVersion = "2.6.5";
   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

@@ -913,9 +913,9 @@ export declare const AstroErrorData: {
     /**
      * @docs
      * @see
-     * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/)
+     * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/#defining-custom-slugs)
      * @description
-     * A content collection schema should not contain the `slug` field. This is reserved by Astro for generating entry slugs. Remove the `slug` field from your schema, or choose a different name.
+     * A content collection schema should not contain the `slug` field. This is reserved by Astro for generating entry slugs. Remove `slug` from your schema. You can still use custom slugs in your frontmatter.
      */
     readonly ContentSchemaContainsSlugError: {
         readonly title: "Content Schema should not contain `slug`.";
@@ -976,6 +976,7 @@ export declare const AstroErrorData: {
     };
     /**
      * @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.
      */

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

@@ -965,9 +965,9 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
   /**
    * @docs
    * @see
-   * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/)
+   * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/#defining-custom-slugs)
    * @description
-   * A content collection schema should not contain the `slug` field. This is reserved by Astro for generating entry slugs. Remove the `slug` field from your schema, or choose a different name.
+   * A content collection schema should not contain the `slug` field. This is reserved by Astro for generating entry slugs. Remove `slug` from your schema. You can still use custom slugs in your frontmatter.
    */
   ContentSchemaContainsSlugError: {
     title: "Content Schema should not contain `slug`.",
@@ -1034,6 +1034,7 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
   },
   /**
    * @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.
    */

package/dist/core/messages.js

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

package/dist/events/index.js

@@ -1,18 +1,9 @@
 import { AstroTelemetry } from "@astrojs/telemetry";
-import { createRequire } from "module";
+import { version as viteVersion } from "vite";
 import { ASTRO_VERSION } from "../core/constants.js";
-const require2 = createRequire(import.meta.url);
-function getViteVersion() {
-  try {
-    const { version } = require2("vite/package.json");
-    return version;
-  } catch (e) {
-  }
-  return void 0;
-}
 const telemetry = new AstroTelemetry({
   astroVersion: ASTRO_VERSION,
-  viteVersion: getViteVersion()
+  viteVersion
 });
 export * from "./error.js";
 export * from "./session.js";

package/package.json

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