astro 1.0.0-beta.40 → 1.0.0-beta.41

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.40";
+  const version = "1.0.0-beta.41";
   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.40" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.41" });
   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.40",
+          astroVersion: "1.0.0-beta.41",
           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.40", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.41", 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.40", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.41", 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.40", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.41", 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.40", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.41", 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.40",
+          astroVersion: "1.0.0-beta.41",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/config.js

@@ -29,6 +29,37 @@ import postcssrc from "postcss-load-config";
 import { arraify, isObject } from "./util.js";
 import { appendForwardSlash, prependForwardSlash, trimSlashes } from "./path.js";
 load.use([loadTypeScript]);
+const ASTRO_CONFIG_DEFAULTS = {
+  root: ".",
+  srcDir: "./src",
+  publicDir: "./public",
+  outDir: "./dist",
+  base: "/",
+  trailingSlash: "ignore",
+  build: { format: "directory" },
+  server: {
+    host: false,
+    port: 3e3
+  },
+  style: { postcss: { options: {}, plugins: [] } },
+  integrations: [],
+  markdown: {
+    drafts: false,
+    syntaxHighlight: "shiki",
+    shikiConfig: {
+      langs: [],
+      theme: "github-dark",
+      wrap: false
+    },
+    remarkPlugins: [],
+    rehypePlugins: []
+  },
+  vite: {},
+  experimental: {
+    ssr: false,
+    integrations: false
+  }
+};
 async function resolvePostcssConfig(inlineOptions, root) {
   if (isObject(inlineOptions)) {
     const options = __spreadValues({}, inlineOptions);
@@ -65,55 +96,55 @@ const LEGACY_ASTRO_CONFIG_KEYS = /* @__PURE__ */ new Set([
 ]);
 const AstroConfigSchema = z.object({
   adapter: z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) }).optional(),
-  root: z.string().optional().default(".").transform((val) => new URL(val)),
-  srcDir: z.string().optional().default("./src").transform((val) => new URL(val)),
-  publicDir: z.string().optional().default("./public").transform((val) => new URL(val)),
-  outDir: z.string().optional().default("./dist").transform((val) => new URL(val)),
+  root: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.root).transform((val) => new URL(val)),
+  srcDir: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.srcDir).transform((val) => new URL(val)),
+  publicDir: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.publicDir).transform((val) => new URL(val)),
+  outDir: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.outDir).transform((val) => new URL(val)),
   site: z.string().url().optional().transform((val) => val ? appendForwardSlash(val) : val).refine((val) => !val || new URL(val).pathname.length <= 1, {
     message: '"site" must be a valid URL origin (ex: "https://example.com") but cannot contain a URL path (ex: "https://example.com/blog"). Use "base" to configure your deployed URL path'
   }),
-  base: z.string().optional().default("/").transform((val) => prependForwardSlash(appendForwardSlash(trimSlashes(val)))),
-  trailingSlash: z.union([z.literal("always"), z.literal("never"), z.literal("ignore")]).optional().default("ignore"),
+  base: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.base).transform((val) => prependForwardSlash(appendForwardSlash(trimSlashes(val)))),
+  trailingSlash: z.union([z.literal("always"), z.literal("never"), z.literal("ignore")]).optional().default(ASTRO_CONFIG_DEFAULTS.trailingSlash),
   build: z.object({
-    format: z.union([z.literal("file"), z.literal("directory")]).optional().default("directory")
+    format: z.union([z.literal("file"), z.literal("directory")]).optional().default(ASTRO_CONFIG_DEFAULTS.build.format)
   }).optional().default({}),
   server: z.preprocess((val) => typeof val === "function" ? val({ command: "error" }) : val, z.object({
-    host: z.union([z.string(), z.boolean()]).optional().default(false),
-    port: z.number().optional().default(3e3)
+    host: z.union([z.string(), z.boolean()]).optional().default(ASTRO_CONFIG_DEFAULTS.server.host),
+    port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port)
   }).optional().default({})),
-  integrations: z.preprocess((val) => Array.isArray(val) ? val.flat(Infinity).filter(Boolean) : val, z.array(z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) })).default([])),
+  integrations: z.preprocess((val) => Array.isArray(val) ? val.flat(Infinity).filter(Boolean) : val, z.array(z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) })).default(ASTRO_CONFIG_DEFAULTS.integrations)),
   style: z.object({
     postcss: z.object({
       options: z.any(),
       plugins: z.array(z.any())
-    }).optional().default({ options: {}, plugins: [] })
+    }).optional().default(ASTRO_CONFIG_DEFAULTS.style.postcss)
   }).optional().default({}),
   markdown: z.object({
     mode: z.enum(["md", "mdx"]).default("mdx"),
     drafts: z.boolean().default(false),
-    syntaxHighlight: z.union([z.literal("shiki"), z.literal("prism"), z.literal(false)]).default("shiki"),
+    syntaxHighlight: z.union([z.literal("shiki"), z.literal("prism"), z.literal(false)]).default(ASTRO_CONFIG_DEFAULTS.markdown.syntaxHighlight),
     shikiConfig: z.object({
       langs: z.custom().array().default([]),
-      theme: z.enum(BUNDLED_THEMES).or(z.custom()).default("github-dark"),
-      wrap: z.boolean().or(z.null()).default(false)
+      theme: z.enum(BUNDLED_THEMES).or(z.custom()).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.theme),
+      wrap: z.boolean().or(z.null()).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.wrap)
     }).default({}),
     remarkPlugins: z.union([
       z.string(),
       z.tuple([z.string(), z.any()]),
       z.custom((data) => typeof data === "function"),
       z.tuple([z.custom((data) => typeof data === "function"), z.any()])
-    ]).array().default([]),
+    ]).array().default(ASTRO_CONFIG_DEFAULTS.markdown.remarkPlugins),
     rehypePlugins: z.union([
       z.string(),
       z.tuple([z.string(), z.any()]),
       z.custom((data) => typeof data === "function"),
       z.tuple([z.custom((data) => typeof data === "function"), z.any()])
-    ]).array().default([])
+    ]).array().default(ASTRO_CONFIG_DEFAULTS.markdown.rehypePlugins)
   }).default({}),
-  vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default({}),
+  vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.vite),
   experimental: z.object({
-    ssr: z.boolean().optional().default(false),
-    integrations: z.boolean().optional().default(false)
+    ssr: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.ssr),
+    integrations: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.integrations)
   }).optional().default({})
 });
 async function validateConfig(userConfig, root, cmd) {
@@ -158,19 +189,19 @@ Please update your configuration to the new format!
 See https://astro.build/config for more information.`);
   }
   const AstroConfigRelativeSchema = AstroConfigSchema.extend({
-    root: z.string().default(".").transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
-    srcDir: z.string().default("./src").transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
-    publicDir: z.string().default("./public").transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
-    outDir: z.string().default("./dist").transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
+    root: z.string().default(ASTRO_CONFIG_DEFAULTS.root).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
+    srcDir: z.string().default(ASTRO_CONFIG_DEFAULTS.srcDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
+    publicDir: z.string().default(ASTRO_CONFIG_DEFAULTS.publicDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
+    outDir: z.string().default(ASTRO_CONFIG_DEFAULTS.outDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
     server: z.preprocess((val) => typeof val === "function" ? val({ command: cmd === "dev" ? "dev" : "preview" }) : val, z.object({
-      host: z.union([z.string(), z.boolean()]).optional().default(false),
-      port: z.number().optional().default(3e3)
+      host: z.union([z.string(), z.boolean()]).optional().default(ASTRO_CONFIG_DEFAULTS.server.host),
+      port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port)
     }).optional().default({})),
     style: z.object({
       postcss: z.preprocess((val) => resolvePostcssConfig(val, fileProtocolRoot), z.object({
         options: z.any(),
         plugins: z.array(z.any())
-      }).optional().default({ options: {}, plugins: [] }))
+      }).optional().default(ASTRO_CONFIG_DEFAULTS.style.postcss))
     }).optional().default({})
   });
   const result = __spreadProps(__spreadValues({}, await AstroConfigRelativeSchema.parseAsync(userConfig)), {

package/dist/core/dev/index.js

@@ -1,3 +1,5 @@
+import glob from "fast-glob";
+import path from "path";
 import { performance } from "perf_hooks";
 import * as vite from "vite";
 import {
@@ -18,9 +20,14 @@ 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 viteConfig = await createVite({
     mode: "development",
-    server: { host }
+    server: { host },
+    optimizeDeps: {
+      include: clientRuntimeFilePaths
+    }
   }, { astroConfig: config, logging: options.logging, mode: "dev" });
   await runHookConfigDone({ config });
   warnIfUsingExperimentalSSR(options.logging, config);
@@ -36,7 +43,7 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.40";
+  const currentVersion = "1.0.0-beta.41";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

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

@@ -172,7 +172,12 @@ import "${PAGE_SSR_SCRIPT_ID}";`;
         }
         return {
           code: `${code}${SUFFIX}`,
-          map
+          map,
+          meta: {
+            vite: {
+              lang: "ts"
+            }
+          }
         };
       } catch (err) {
         const scannedFrontmatter = FRONTMATTER_PARSE_REGEXP.exec(source);

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

@@ -179,7 +179,12 @@ ${tsResult}`;
         });
         return {
           code: escapeViteEnvReferences(code),
-          map: null
+          map: null,
+          meta: {
+            vite: {
+              lang: "ts"
+            }
+          }
         };
       }
       return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.40",
+  "version": "1.0.0-beta.41",
   "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.10.2",
+    "@astrojs/markdown-remark": "^0.11.0",
     "@astrojs/prism": "0.4.1",
     "@astrojs/telemetry": "^0.1.2",
     "@astrojs/webapi": "^0.12.0",
@@ -150,7 +150,7 @@
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
     "mocha": "^9.2.2",
-    "sass": "^1.52.1",
+    "sass": "^1.52.2",
     "srcset-parse": "^1.1.0"
   },
   "engines": {