astro 4.2.7 → 4.2.8

package/dist/content/utils.d.ts

@@ -119,7 +119,7 @@ export declare function getContentEntryIdAndSlug({ entry, contentDir, collection
 };
 export declare function getEntryType(entryPath: string, paths: Pick<ContentPaths, 'config' | 'contentDir'>, contentFileExts: string[], dataFileExts: string[]): 'content' | 'data' | 'config' | 'ignored';
 export declare function hasUnderscoreBelowContentDirectoryPath(fileUrl: URL, contentDir: ContentPaths['contentDir']): boolean;
-export declare function parseFrontmatter(fileContents: string): matter.GrayMatterFile<string>;
+export declare function safeParseFrontmatter(source: string, id?: string): matter.GrayMatterFile<string>;
 /**
  * The content config is loaded separately from other `src/` files.
  * This global observable lets dependent plugins (like the content flag plugin)

package/dist/content/utils.js

@@ -6,7 +6,8 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
 import { z } from "zod";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
-import { formatYAMLException, isYAMLException } from "../core/errors/utils.js";
+import { MarkdownError } from "../core/errors/index.js";
+import { isYAMLException } from "../core/errors/utils.js";
 import { CONTENT_FLAGS, CONTENT_TYPES_FILE } from "./consts.js";
 import { errorMap } from "./error-map.js";
 import { createImage } from "./runtime-assets.js";
@@ -199,16 +200,27 @@ function getYAMLErrorLine(rawData, objectKey) {
   const numNewlinesBeforeKey = dataBeforeKey.split("\n").length;
   return numNewlinesBeforeKey;
 }
-function parseFrontmatter(fileContents) {
+function safeParseFrontmatter(source, id) {
   try {
-    matter.clearCache();
-    return matter(fileContents);
-  } catch (e) {
-    if (isYAMLException(e)) {
-      throw formatYAMLException(e);
-    } else {
-      throw e;
+    return matter(source);
+  } catch (err) {
+    const markdownError = new MarkdownError({
+      name: "MarkdownError",
+      message: err.message,
+      stack: err.stack,
+      location: id ? {
+        file: id
+      } : void 0
+    });
+    if (isYAMLException(err)) {
+      markdownError.setLocation({
+        file: id,
+        line: err.mark.line,
+        column: err.mark.column
+      });
+      markdownError.setMessage(err.reason);
     }
+    throw markdownError;
   }
 }
 const globalContentConfigObserver = contentObservable({ status: "init" });
@@ -356,6 +368,6 @@ export {
   loadContentConfig,
   msg,
   parseEntrySlug,
-  parseFrontmatter,
-  reloadContentConfigObserver
+  reloadContentConfigObserver,
+  safeParseFrontmatter
 };

package/dist/core/build/generate.js

@@ -334,8 +334,8 @@ function addPageName(pathname, opts) {
   const pageName = shouldAppendForwardSlash(trailingSlash, buildFormat) ? pathname.replace(/\/?$/, "/").replace(/^\//, "") : pathname.replace(/^\//, "");
   opts.pageNames.push(pageName);
 }
-function getUrlForPath(pathname, base, origin, format, routeType) {
-  const ending = format === "directory" ? "/" : ".html";
+function getUrlForPath(pathname, base, origin, format, trailingSlash, routeType) {
+  const ending = format === "directory" ? trailingSlash === "never" ? "" : "/" : ".html";
   let buildPathname;
   if (pathname === "/" || pathname === "") {
     buildPathname = base;
@@ -389,6 +389,7 @@ async function generatePath(pathname, pipeline, gopts, route) {
     pipeline.getConfig().base,
     pipeline.getStaticBuildOptions().origin,
     pipeline.getConfig().build.format,
+    pipeline.getConfig().trailingSlash,
     route.type
   );
   const request = createRequest({

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.2.7";
+  const currentVersion = "4.2.8";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.2.7";
+  const version = "4.2.8";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -258,7 +258,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.2.7"}`
+        `v${"4.2.8"}`
       )} ${headline}`
     );
   }

package/dist/runtime/server/endpoint.js

@@ -23,7 +23,9 @@ Found handlers: ${Object.keys(mod).map((exp) => JSON.stringify(exp)).join(", ")}
     return new Response(null, { status: 404 });
   }
   const response = await handler.call(mod, context);
-  response.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+  if (response.status === 404 || response.status === 500) {
+    response.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+  }
   return response;
 }
 export {

package/dist/vite-plugin-astro-server/response.js

@@ -44,11 +44,7 @@ async function writeWebResponse(res, webResponse) {
   }
   const _headers = Object.fromEntries(headers.entries());
   if (headers.has("set-cookie")) {
-    if ("getSetCookie" in headers && typeof headers.getSetCookie === "function") {
-      _headers["set-cookie"] = headers.getSetCookie().toString();
-    } else {
-      _headers["set-cookie"] = headers.get("set-cookie");
-    }
+    _headers["set-cookie"] = headers.getSetCookie();
   }
   res.writeHead(status, _headers);
   if (body) {

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

@@ -1,8 +1,9 @@
-import { parseFrontmatter } from "../content/utils.js";
+import { fileURLToPath } from "node:url";
+import { safeParseFrontmatter } from "../content/utils.js";
 const markdownContentEntryType = {
   extensions: [".md"],
-  async getEntryInfo({ contents }) {
-    const parsed = parseFrontmatter(contents);
+  async getEntryInfo({ contents, fileUrl }) {
+    const parsed = safeParseFrontmatter(contents, fileURLToPath(fileUrl));
     return {
       data: parsed.data,
       body: parsed.content,

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

@@ -2,39 +2,16 @@ import {
   createMarkdownProcessor,
   InvalidAstroDataError
 } from "@astrojs/markdown-remark";
-import matter from "gray-matter";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
-import { AstroError, AstroErrorData, MarkdownError } from "../core/errors/index.js";
+import { AstroError, AstroErrorData } from "../core/errors/index.js";
+import { safeParseFrontmatter } from "../content/utils.js";
 import { isMarkdownFile } from "../core/util.js";
 import { shorthash } from "../runtime/server/shorthash.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
 import { getMarkdownCodeForImages } from "./images.js";
-function safeMatter(source, id) {
-  try {
-    return matter(source);
-  } catch (err) {
-    const markdownError = new MarkdownError({
-      name: "MarkdownError",
-      message: err.message,
-      stack: err.stack,
-      location: {
-        file: id
-      }
-    });
-    if (err.name === "YAMLException") {
-      markdownError.setLocation({
-        file: id,
-        line: err.mark.line,
-        column: err.mark.column
-      });
-      markdownError.setMessage(err.reason);
-    }
-    throw markdownError;
-  }
-}
 const astroServerRuntimeModulePath = normalizePath(
   fileURLToPath(new URL("../runtime/server/index.js", import.meta.url))
 );
@@ -57,7 +34,7 @@ function markdown({ settings, logger }) {
       if (isMarkdownFile(id)) {
         const { fileId, fileUrl } = getFileInfo(id, settings.config);
         const rawFile = await fs.promises.readFile(fileId, "utf-8");
-        const raw = safeMatter(rawFile, id);
+        const raw = safeParseFrontmatter(rawFile, id);
         const fileURL = pathToFileURL(fileId);
         const renderResult = await processor.render(raw.content, {
           // @ts-expect-error passing internal prop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.2.7",
+  "version": "4.2.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -163,8 +163,8 @@
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
     "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/markdown-remark": "4.2.1",
-    "@astrojs/telemetry": "3.0.4"
+    "@astrojs/telemetry": "3.0.4",
+    "@astrojs/markdown-remark": "4.2.1"
   },
   "optionalDependencies": {
     "sharp": "^0.32.6"