astro 1.0.0-beta.43 → 1.0.0-beta.44

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.43";
+  const version = "1.0.0-beta.44";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.43" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.44" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.43",
+          astroVersion: "1.0.0-beta.44",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -108,7 +108,7 @@ async function cli(args) {
     case "dev": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.43", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.44", cliCommand: "dev" }, userConfig, flags));
         await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
@@ -119,7 +119,7 @@ async function cli(args) {
     case "build": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.43", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.44", cliCommand: "build" }, userConfig, flags));
         return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
@@ -127,14 +127,14 @@ async function cli(args) {
     }
     case "check": {
       const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.43", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.44", cliCommand: "check" }, userConfig, flags));
       const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.43", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.44", cliCommand: "preview" }, userConfig, flags));
         const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.43",
+          astroVersion: "1.0.0-beta.44",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/dev/index.js

@@ -1,5 +1,3 @@
-import glob from "fast-glob";
-import path from "path";
 import { performance } from "perf_hooks";
 import * as vite from "vite";
 import {
@@ -20,13 +18,19 @@ async function dev(config, options) {
   await options.telemetry.record([]);
   config = await runHookConfigSetup({ config, command: "dev" });
   const { host, port } = config.server;
-  const clientRuntimeScripts = await glob(new URL("../../runtime/client/*.js", import.meta.url).pathname);
-  const clientRuntimeFilePaths = clientRuntimeScripts.map((script) => `astro/client/${path.basename(script)}`).filter((filePath) => filePath !== "astro/client/hmr.js");
+  const rendererClientEntries = config._ctx.renderers.map((r) => r.clientEntrypoint).filter(Boolean);
   const viteConfig = await createVite({
     mode: "development",
     server: { host },
     optimizeDeps: {
-      include: clientRuntimeFilePaths
+      include: [
+        "astro/client/idle.js",
+        "astro/client/load.js",
+        "astro/client/visible.js",
+        "astro/client/media.js",
+        "astro/client/only.js",
+        ...rendererClientEntries
+      ]
     }
   }, { astroConfig: config, logging: options.logging, mode: "dev" });
   await runHookConfigDone({ config });
@@ -43,7 +47,7 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.43";
+  const currentVersion = "1.0.0-beta.44";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/errors.js

@@ -32,6 +32,18 @@ function collectErrorMetadata(e) {
   if (e.stack) {
     e.stack = eol.lf(e.stack);
   }
+  if (e.name === "YAMLException") {
+    const err = e;
+    err.loc = { file: e.id, line: e.mark.line, column: e.mark.column };
+    err.message = e.reason;
+    if (!err.frame) {
+      try {
+        const fileContents = fs.readFileSync(err.loc.file, "utf8");
+        err.frame = codeFrame(fileContents, err.loc);
+      } catch {
+      }
+    }
+  }
   if (Array.isArray(e.errors)) {
     const { location, pluginName, text } = e.errors[0];
     const err = e;

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.0-beta.43";
+  const version = "1.0.0-beta.44";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -207,7 +207,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.43"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.44"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

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

@@ -254,7 +254,7 @@ export interface AstroUserConfig {
      * @type {string}
      * @default `"."` (current working directory)
      * @summary Set the project root. The project root is the directory where your Astro project (and all `src`, `public` and `package.json` files) live.
-     * @description  You should only provide this option if you run the `astro` CLI commands in a directory other than the project root directory. Usually, this option is provided via the CLI instead of the `astro.config.js` file, since Astro needs to know your project root before it can locate your config file.
+     * @description  You should only provide this option if you run the `astro` CLI commands in a directory other than the project root directory. Usually, this option is provided via the CLI instead of the [Astro config file](https://docs.astro.build/en/guides/configuring-astro/#supported-config-file-types), since Astro needs to know your project root before it can locate your config file.
      *
      * If you provide a relative path (ex: `--root: './my-project'`) Astro will resolve it against your current working directory.
      *

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

@@ -37,12 +37,21 @@ import fs from "fs";
 import matter from "gray-matter";
 import { fileURLToPath } from "url";
 import { pagesVirtualModuleId } from "../core/app/index.js";
+import { collectErrorMetadata } from "../core/errors.js";
 import { prependForwardSlash } from "../core/path.js";
 import { resolvePages, viteID } from "../core/util.js";
 import { PAGE_SSR_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
 const MARKDOWN_IMPORT_FLAG = "?mdImport";
 const MARKDOWN_CONTENT_FLAG = "?content";
+function safeMatter(source, id) {
+  try {
+    return matter(source);
+  } catch (e) {
+    e.id = id;
+    throw collectErrorMetadata(e);
+  }
+}
 function markdown({ config }) {
   function normalizeFilename(filename) {
     if (filename.startsWith("/@fs")) {
@@ -85,7 +94,7 @@ function markdown({ config }) {
       if (id.endsWith(`.md${MARKDOWN_IMPORT_FLAG}`)) {
         const { fileId, fileUrl } = getFileInfo(id, config);
         const source = await fs.promises.readFile(fileId, "utf8");
-        const { data: frontmatter, content: rawContent } = matter(source);
+        const { data: frontmatter, content: rawContent } = safeMatter(source, fileId);
         return {
           code: `
 						// Static
@@ -123,7 +132,7 @@ function markdown({ config }) {
         const fileUrl = new URL(`file://${filename}`);
         const isPage = fileUrl.pathname.startsWith(resolvePages(config).pathname);
         const hasInjectedScript = isPage && config._ctx.scripts.some((s) => s.stage === "page-ssr");
-        let { data: frontmatter, content: markdownContent } = matter(source);
+        let { data: frontmatter, content: markdownContent } = safeMatter(source, filename);
         markdownContent = markdownContent.replace(/<\s*!--([^-->]*)(.*?)-->/gs, (whole) => `{/*${whole.replace(/\*\//g, "*\u200B/")}*/}`);
         let renderResult = await renderMarkdown(markdownContent, __spreadProps(__spreadValues({}, renderOpts), {
           fileURL: fileUrl

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.43",
+  "version": "1.0.0-beta.44",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -68,7 +68,7 @@
   "dependencies": {
     "@astrojs/compiler": "^0.15.2",
     "@astrojs/language-server": "^0.13.4",
-    "@astrojs/markdown-remark": "^0.11.1",
+    "@astrojs/markdown-remark": "^0.11.2",
     "@astrojs/prism": "0.4.1",
     "@astrojs/telemetry": "^0.1.2",
     "@astrojs/webapi": "^0.12.0",
@@ -119,7 +119,7 @@
     "strip-ansi": "^7.0.1",
     "supports-esm": "^1.0.0",
     "tsconfig-resolver": "^3.0.1",
-    "vite": "^2.9.10",
+    "vite": "^2.9.12",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },