astro 2.0.17 → 2.1.0

package/dist/core/build/generate.js

@@ -3,7 +3,10 @@ import * as colors from "kleur/colors";
 import { bgGreen, black, cyan, dim, green, magenta } from "kleur/colors";
 import npath from "path";
 import { fileURLToPath } from "url";
-import { getContentPaths } from "../../content/index.js";
+import {
+  generateImage as generateImageInternal,
+  getStaticImageList
+} from "../../assets/internal.js";
 import { hasPrerenderedPages } from "../../core/build/internal.js";
 import {
   prependForwardSlash,
@@ -71,6 +74,14 @@ ${bgGreen(black(` ${verb} static routes `))}`);
       await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
     }
   }
+  if (opts.settings.config.experimental.assets) {
+    info(opts.logging, null, `
+${bgGreen(black(` generating optimized images `))}`);
+    for (const imageData of getStaticImageList()) {
+      await generateImage(opts, imageData[0], imageData[1]);
+    }
+    delete globalThis.astroAsset.addStaticImage;
+  }
   await runHookBuildGenerated({
     config: opts.settings.config,
     buildConfig: opts.buildConfig,
@@ -79,6 +90,23 @@ ${bgGreen(black(` ${verb} static routes `))}`);
   info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.
 `));
 }
+async function generateImage(opts, transform, path) {
+  let timeStart = performance.now();
+  const generationData = await generateImageInternal(opts, transform, path);
+  if (!generationData) {
+    return;
+  }
+  const timeEnd = performance.now();
+  const timeChange = getTimeStat(timeStart, timeEnd);
+  const timeIncrease = `(+${timeChange})`;
+  info(
+    opts.logging,
+    null,
+    `  ${green("\u25B6")} ${path} ${dim(
+      `(before: ${generationData.weight.before}kb, after: ${generationData.weight.after}kb)`
+    )} ${dim(timeIncrease)}`
+  );
+}
 async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
   var _a;
   let timeStart = performance.now();
@@ -237,10 +265,7 @@ async function generatePath(pathname, opts, gopts) {
   const env = createEnvironment({
     adapterName: void 0,
     logging,
-    markdown: {
-      ...settings.config.markdown,
-      contentDir: getContentPaths(settings.config).contentDir
-    },
+    markdown: settings.config.markdown,
     mode: opts.mode,
     renderers,
     async resolve(specifier) {

package/dist/core/build/index.d.ts

@@ -1,6 +1,7 @@
 import type { AstroTelemetry } from '@astrojs/telemetry';
 import type { AstroSettings, RuntimeMode } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
+import yargs from 'yargs-parser';
 export interface BuildOptions {
     mode?: RuntimeMode;
     logging: LogOptions;
@@ -10,6 +11,7 @@ export interface BuildOptions {
      * building once, but may cause a performance hit if building multiple times in a row.
      */
     teardownCompiler?: boolean;
+    flags?: yargs.Arguments;
 }
 /** `astro build` */
 export default function build(settings: AstroSettings, options: BuildOptions): Promise<void>;

package/dist/core/build/index.js

@@ -9,6 +9,7 @@ import {
 } from "../../integrations/index.js";
 import { createVite } from "../create-vite.js";
 import { debug, info, levels, timerMessage } from "../logger/core.js";
+import { printHelp } from "../messages.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { RouteCache } from "../render/route-cache.js";
 import { createRouteManifest } from "../routing/index.js";
@@ -16,7 +17,22 @@ import { collectPagesData } from "./page-data.js";
 import { staticBuild, viteBuild } from "./static-build.js";
 import { getTimeStat } from "./util.js";
 async function build(settings, options) {
+  var _a, _b;
   applyPolyfill();
+  if (((_a = options.flags) == null ? void 0 : _a.help) || ((_b = options.flags) == null ? void 0 : _b.h)) {
+    printHelp({
+      commandName: "astro build",
+      usage: "[...flags]",
+      tables: {
+        Flags: [
+          ["--drafts", `Include Markdown draft pages in the build.`],
+          ["--help (-h)", "See all available flags."]
+        ]
+      },
+      description: `Builds your site for deployment.`
+    });
+    return;
+  }
   const builder = new AstroBuilder(settings, options);
   await builder.run();
 }

package/dist/core/build/plugins/plugin-ssr.js

@@ -1,6 +1,5 @@
 import glob from "fast-glob";
 import { fileURLToPath } from "url";
-import { getContentPaths } from "../../../content/index.js";
 import { runHookBuildSsr } from "../../../integrations/index.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { pagesVirtualModuleId } from "../../app/index.js";
@@ -30,10 +29,12 @@ function vitePluginSSR(internals, adapter) {
         return `import * as adapter from '${adapter.serverEntrypoint}';
 import * as _main from '${pagesVirtualModuleId}';
 import { deserializeManifest as _deserializeManifest } from 'astro/app';
+import { _privateSetManifestDontUseThis } from 'astro:ssr-manifest';
 const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
 	pageMap: _main.pageMap,
 	renderers: _main.renderers
 });
+_privateSetManifestDontUseThis(_manifest);
 const _args = ${adapter.args ? JSON.stringify(adapter.args) : "undefined"};
 export * from '${pagesVirtualModuleId}';
 ${adapter.exports ? `const _exports = adapter.createExports(_manifest, _args);
@@ -165,10 +166,7 @@ function buildManifest(opts, internals, staticFiles) {
     routes,
     site: settings.config.site,
     base: settings.config.base,
-    markdown: {
-      ...settings.config.markdown,
-      contentDir: getContentPaths(settings.config).contentDir
-    },
+    markdown: settings.config.markdown,
     pageMap: null,
     propagation: Array.from(internals.propagation),
     renderers: [],

package/dist/core/config/config.js

@@ -73,7 +73,8 @@ function resolveFlags(flags) {
     port: typeof flags.port === "number" ? flags.port : void 0,
     config: typeof flags.config === "string" ? flags.config : void 0,
     host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
-    drafts: typeof flags.drafts === "boolean" ? flags.drafts : void 0
+    drafts: typeof flags.drafts === "boolean" ? flags.drafts : void 0,
+    experimentalAssets: typeof flags.experimentalAssets === "boolean" ? flags.experimentalAssets : void 0
   };
 }
 function resolveRoot(cwd) {

package/dist/core/config/schema.d.ts

@@ -72,6 +72,13 @@ export declare const AstroConfigSchema: z.ZodObject<{
         host: string | boolean;
         port: number;
     }, unknown>;
+    image: z.ZodDefault<z.ZodObject<{
+        service: z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodLiteral<"astro/assets/services/squoosh">, z.ZodIntersection<z.ZodString, z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>]>;
+    }, "strip", z.ZodTypeAny, {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    }, {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    }>>;
     markdown: z.ZodDefault<z.ZodObject<{
         drafts: z.ZodDefault<z.ZodBoolean>;
         syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
@@ -121,7 +128,13 @@ export declare const AstroConfigSchema: z.ZodObject<{
         smartypants?: boolean | undefined;
     }>>;
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
-    experimental: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
+    experimental: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        assets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        assets: boolean;
+    }, {
+        assets?: boolean | undefined;
+    }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
 }, "strip", z.ZodTypeAny, {
     site?: string | undefined;
@@ -166,8 +179,13 @@ export declare const AstroConfigSchema: z.ZodObject<{
         client: URL;
         serverEntry: string;
     };
+    image: {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    };
     vite: ViteUserConfig;
-    experimental: {};
+    experimental: {
+        assets: boolean;
+    };
     legacy: {};
 }, {
     site?: string | undefined;
@@ -205,8 +223,13 @@ export declare const AstroConfigSchema: z.ZodObject<{
         client?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
+    image?: {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    } | undefined;
     vite?: ViteUserConfig | undefined;
-    experimental?: {} | undefined;
+    experimental?: {
+        assets?: boolean | undefined;
+    } | undefined;
     legacy?: {} | undefined;
 }>;
 export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL): z.ZodEffects<z.ZodObject<{
@@ -285,8 +308,21 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         name: string;
         hooks: {};
     }[], unknown>;
+    image: z.ZodDefault<z.ZodObject<{
+        service: z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodLiteral<"astro/assets/services/squoosh">, z.ZodIntersection<z.ZodString, z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>]>;
+    }, "strip", z.ZodTypeAny, {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    }, {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    }>>;
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
-    experimental: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
+    experimental: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        assets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        assets: boolean;
+    }, {
+        assets?: boolean | undefined;
+    }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
     root: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
     srcDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
@@ -376,8 +412,13 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         client: URL;
         serverEntry: string;
     };
+    image: {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    };
     vite: ViteUserConfig;
-    experimental: {};
+    experimental: {
+        assets: boolean;
+    };
     legacy: {};
 }, {
     site?: string | undefined;
@@ -415,8 +456,13 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         client?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
+    image?: {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    } | undefined;
     vite?: ViteUserConfig | undefined;
-    experimental?: {} | undefined;
+    experimental?: {
+        assets?: boolean | undefined;
+    } | undefined;
     legacy?: {} | undefined;
 }>, {
     site?: string | undefined;
@@ -462,8 +508,13 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         client: URL;
         serverEntry: string;
     };
+    image: {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    };
     vite: ViteUserConfig;
-    experimental: {};
+    experimental: {
+        assets: boolean;
+    };
     legacy: {};
 }, {
     site?: string | undefined;
@@ -501,7 +552,12 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         client?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
+    image?: {
+        service: "astro/assets/services/sharp" | "astro/assets/services/squoosh" | (string & {});
+    } | undefined;
     vite?: ViteUserConfig | undefined;
-    experimental?: {} | undefined;
+    experimental?: {
+        assets?: boolean | undefined;
+    } | undefined;
     legacy?: {} | undefined;
 }>;

package/dist/core/config/schema.js

@@ -27,7 +27,10 @@ const ASTRO_CONFIG_DEFAULTS = {
     ...markdownConfigDefaults
   },
   vite: {},
-  legacy: {}
+  legacy: {},
+  experimental: {
+    assets: false
+  }
 };
 const AstroConfigSchema = z.object({
   root: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.root).transform((val) => new URL(val)),
@@ -58,6 +61,15 @@ const AstroConfigSchema = z.object({
       headers: z.custom().optional()
     }).optional().default({})
   ),
+  image: z.object({
+    service: z.union([
+      z.literal("astro/assets/services/sharp"),
+      z.literal("astro/assets/services/squoosh"),
+      z.string().and(z.object({}))
+    ])
+  }).default({
+    service: "astro/assets/services/squoosh"
+  }),
   markdown: z.object({
     drafts: z.boolean().default(false),
     syntaxHighlight: z.union([z.literal("shiki"), z.literal("prism"), z.literal(false)]).default(ASTRO_CONFIG_DEFAULTS.markdown.syntaxHighlight),
@@ -83,7 +95,9 @@ const AstroConfigSchema = z.object({
     smartypants: z.boolean().default(ASTRO_CONFIG_DEFAULTS.markdown.smartypants)
   }).default({}),
   vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.vite),
-  experimental: z.object({}).optional().default({}),
+  experimental: z.object({
+    assets: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.assets)
+  }).optional().default({}),
   legacy: z.object({}).optional().default({})
 });
 function createRelativeSchema(cmd, fileProtocolRoot) {
@@ -131,7 +145,7 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
     if (!trimmedBase.length && sitePathname && sitePathname !== "/") {
       config.base = sitePathname;
       console.warn(`The site configuration value includes a pathname of ${sitePathname} but there is no base configuration.
-			
+
 A future version of Astro will stop using the site pathname when producing <link> and <script> tags. Set your site's base with the base configuration.`);
     }
     if (trimmedBase.length && config.trailingSlash === "never") {

package/dist/core/config/settings.js

@@ -1,17 +1,19 @@
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
 import { fileURLToPath, pathToFileURL } from "url";
 import jsxRenderer from "../../jsx/renderer.js";
+import { markdownContentEntryType } from "../../vite-plugin-markdown/content-entry-type.js";
 import { createDefaultDevConfig } from "./config.js";
-import { loadTSConfig } from "./tsconfig.js";
 import { AstroTimer } from "./timer.js";
+import { loadTSConfig } from "./tsconfig.js";
 function createBaseSettings(config) {
   return {
     config,
     tsConfig: void 0,
     tsConfigPath: void 0,
     adapter: void 0,
-    injectedRoutes: [],
+    injectedRoutes: config.experimental.assets && config.output === "server" ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint" }] : [],
     pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
+    contentEntryTypes: [markdownContentEntryType],
     renderers: [jsxRenderer],
     scripts: [],
     watchFiles: [],

package/dist/core/constants.js

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

package/dist/core/cookies/cookies.js

@@ -1,26 +1,3 @@
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateSet = (obj, member, value, setter) => {
-  __accessCheck(obj, member, "write to private field");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
-};
-var __privateMethod = (obj, member, method) => {
-  __accessCheck(obj, member, "access private method");
-  return method;
-};
-var _request, _requestValues, _outgoing, _ensureParsed, ensureParsed_fn, _ensureOutgoingMap, ensureOutgoingMap_fn, _parse, parse_fn;
 import { parse, serialize } from "cookie";
 const DELETED_EXPIRATION = new Date(0);
 const DELETED_VALUE = "deleted";
@@ -46,16 +23,13 @@ class AstroCookie {
   }
 }
 class AstroCookies {
+  #request;
+  #requestValues;
+  #outgoing;
   constructor(request) {
-    __privateAdd(this, _ensureParsed);
-    __privateAdd(this, _ensureOutgoingMap);
-    __privateAdd(this, _parse);
-    __privateAdd(this, _request, void 0);
-    __privateAdd(this, _requestValues, void 0);
-    __privateAdd(this, _outgoing, void 0);
-    __privateSet(this, _request, request);
-    __privateSet(this, _requestValues, null);
-    __privateSet(this, _outgoing, null);
+    this.#request = request;
+    this.#requestValues = null;
+    this.#outgoing = null;
   }
   delete(key, options) {
     const serializeOptions = {
@@ -67,31 +41,31 @@ class AstroCookies {
     if (options == null ? void 0 : options.path) {
       serializeOptions.path = options.path;
     }
-    __privateMethod(this, _ensureOutgoingMap, ensureOutgoingMap_fn).call(this).set(key, [
+    this.#ensureOutgoingMap().set(key, [
       DELETED_VALUE,
       serialize(key, DELETED_VALUE, serializeOptions),
       false
     ]);
   }
   get(key) {
-    if (__privateGet(this, _outgoing) !== null && __privateGet(this, _outgoing).has(key)) {
-      let [serializedValue, , isSetValue] = __privateGet(this, _outgoing).get(key);
+    if (this.#outgoing !== null && this.#outgoing.has(key)) {
+      let [serializedValue, , isSetValue] = this.#outgoing.get(key);
       if (isSetValue) {
         return new AstroCookie(serializedValue);
       } else {
         return new AstroCookie(void 0);
       }
     }
-    const values = __privateMethod(this, _ensureParsed, ensureParsed_fn).call(this);
+    const values = this.#ensureParsed();
     const value = values[key];
     return new AstroCookie(value);
   }
   has(key) {
-    if (__privateGet(this, _outgoing) !== null && __privateGet(this, _outgoing).has(key)) {
-      let [, , isSetValue] = __privateGet(this, _outgoing).get(key);
+    if (this.#outgoing !== null && this.#outgoing.has(key)) {
+      let [, , isSetValue] = this.#outgoing.get(key);
       return isSetValue;
     }
-    const values = __privateMethod(this, _ensureParsed, ensureParsed_fn).call(this);
+    const values = this.#ensureParsed();
     return !!values[key];
   }
   set(key, value, options) {
@@ -110,48 +84,42 @@ class AstroCookies {
     if (options) {
       Object.assign(serializeOptions, options);
     }
-    __privateMethod(this, _ensureOutgoingMap, ensureOutgoingMap_fn).call(this).set(key, [
+    this.#ensureOutgoingMap().set(key, [
       serializedValue,
       serialize(key, serializedValue, serializeOptions),
       true
     ]);
   }
   *headers() {
-    if (__privateGet(this, _outgoing) == null)
+    if (this.#outgoing == null)
       return;
-    for (const [, value] of __privateGet(this, _outgoing)) {
+    for (const [, value] of this.#outgoing) {
       yield value[1];
     }
   }
-}
-_request = new WeakMap();
-_requestValues = new WeakMap();
-_outgoing = new WeakMap();
-_ensureParsed = new WeakSet();
-ensureParsed_fn = function() {
-  if (!__privateGet(this, _requestValues)) {
-    __privateMethod(this, _parse, parse_fn).call(this);
-  }
-  if (!__privateGet(this, _requestValues)) {
-    __privateSet(this, _requestValues, {});
+  #ensureParsed() {
+    if (!this.#requestValues) {
+      this.#parse();
+    }
+    if (!this.#requestValues) {
+      this.#requestValues = {};
+    }
+    return this.#requestValues;
   }
-  return __privateGet(this, _requestValues);
-};
-_ensureOutgoingMap = new WeakSet();
-ensureOutgoingMap_fn = function() {
-  if (!__privateGet(this, _outgoing)) {
-    __privateSet(this, _outgoing, /* @__PURE__ */ new Map());
+  #ensureOutgoingMap() {
+    if (!this.#outgoing) {
+      this.#outgoing = /* @__PURE__ */ new Map();
+    }
+    return this.#outgoing;
   }
-  return __privateGet(this, _outgoing);
-};
-_parse = new WeakSet();
-parse_fn = function() {
-  const raw = __privateGet(this, _request).headers.get("cookie");
-  if (!raw) {
-    return;
+  #parse() {
+    const raw = this.#request.headers.get("cookie");
+    if (!raw) {
+      return;
+    }
+    this.#requestValues = parse(raw);
   }
-  __privateSet(this, _requestValues, parse(raw));
-};
+}
 export {
   AstroCookies
 };

package/dist/core/create-vite.js

@@ -2,6 +2,7 @@ import nodeFs from "fs";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
+import astroAssetsPlugin from "../assets/vite-plugin-assets.js";
 import {
   astroContentAssetPropagationPlugin,
   astroContentImportPlugin,
@@ -22,6 +23,7 @@ import markdownVitePlugin from "../vite-plugin-markdown/index.js";
 import astroScannerPlugin from "../vite-plugin-scanner/index.js";
 import astroScriptsPlugin from "../vite-plugin-scripts/index.js";
 import astroScriptsPageSSRPlugin from "../vite-plugin-scripts/page-ssr.js";
+import { vitePluginSSRManifest } from "../vite-plugin-ssr-manifest/index.js";
 const ALWAYS_NOEXTERNAL = [
   "astro",
   "astro/components",
@@ -77,7 +79,9 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
       astroInjectEnvTsPlugin({ settings, logging, fs }),
       astroContentVirtualModPlugin({ settings }),
       astroContentImportPlugin({ fs, settings }),
-      astroContentAssetPropagationPlugin({ mode })
+      astroContentAssetPropagationPlugin({ mode, settings }),
+      vitePluginSSRManifest(),
+      settings.config.experimental.assets ? [astroAssetsPlugin({ settings, logging, mode })] : []
     ],
     publicDir: fileURLToPath(settings.config.publicDir),
     root: fileURLToPath(settings.config.root),

package/dist/core/dev/dev.d.ts

@@ -10,7 +10,7 @@ import { LogOptions } from '../logger/core.js';
 export interface DevOptions {
     configFlag: string | undefined;
     configFlagPath: string | undefined;
-    flags: yargs.Arguments | undefined;
+    flags?: yargs.Arguments;
     logging: LogOptions;
     telemetry: AstroTelemetry;
     handleConfigError: (error: Error) => void;
@@ -23,4 +23,4 @@ export interface DevServer {
     stop(): Promise<void>;
 }
 /** `astro dev` */
-export default function dev(settings: AstroSettings, options: DevOptions): Promise<DevServer>;
+export default function dev(settings: AstroSettings, options: DevOptions): Promise<DevServer | undefined>;

package/dist/core/dev/dev.js

@@ -1,11 +1,31 @@
+import { cyan } from "kleur/colors";
 import { performance } from "perf_hooks";
 import { attachContentServerListeners } from "../../content/index.js";
 import { info, warn } from "../logger/core.js";
 import * as msg from "../messages.js";
+import { printHelp } from "../messages.js";
 import { startContainer } from "./container.js";
 import { createContainerWithAutomaticRestart } from "./restart.js";
 async function dev(settings, options) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
+  if (((_a = options.flags) == null ? void 0 : _a.help) || ((_b = options.flags) == null ? void 0 : _b.h)) {
+    printHelp({
+      commandName: "astro dev",
+      usage: "[...flags]",
+      tables: {
+        Flags: [
+          ["--port", `Specify which port to run on. Defaults to 3000.`],
+          ["--host", `Listen on all addresses, including LAN and public addresses.`],
+          ["--host <custom-address>", `Expose on a network IP address at <custom-address>`],
+          ["--help (-h)", "See all available flags."]
+        ]
+      },
+      description: `Check ${cyan(
+        "https://docs.astro.build/en/reference/cli-reference/#astro-dev"
+      )} for more information.`
+    });
+    return;
+  }
   const devStart = performance.now();
   await options.telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({
@@ -14,7 +34,7 @@ async function dev(settings, options) {
     beforeRestart: () => console.clear(),
     params: {
       settings,
-      root: (_a = options.flags) == null ? void 0 : _a.root,
+      root: (_c = options.flags) == null ? void 0 : _c.root,
       logging: options.logging,
       isRestart: options.isRestart
     }
@@ -31,11 +51,11 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.0.17";
+  const currentVersion = "2.1.0";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }
-  if (((_c = (_b = restart.container.viteConfig.server) == null ? void 0 : _b.fs) == null ? void 0 : _c.strict) === false) {
+  if (((_e = (_d = restart.container.viteConfig.server) == null ? void 0 : _d.fs) == null ? void 0 : _e.strict) === false) {
     warn(options.logging, null, msg.fsStrictWarning());
   }
   await attachContentServerListeners(restart.container);

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

@@ -71,6 +71,7 @@ function enhanceViteSSRError({
   }
   return safeError;
 }
+const ALTERNATIVE_JS_EXTS = ["cjs", "mjs"];
 async function getViteErrorPayload(err) {
   var _a, _b, _c, _d, _e, _f;
   let plugin = err.plugin;
@@ -87,8 +88,12 @@ async function getViteErrorPayload(err) {
   ] || ["FailedToLoadModuleSSR", "InvalidGlob"].includes(err.name);
   const docslink = hasDocs ? `https://docs.astro.build/en/reference/errors/${getKebabErrorName(err.name)}/` : void 0;
   const highlighter = await getHighlighter({ theme: "css-variables" });
+  let highlighterLang = (_b = (_a = err.loc) == null ? void 0 : _a.file) == null ? void 0 : _b.split(".").pop();
+  if (ALTERNATIVE_JS_EXTS.includes(highlighterLang ?? "")) {
+    highlighterLang = "js";
+  }
   const highlightedCode = err.fullCode ? highlighter.codeToHtml(err.fullCode, {
-    lang: (_b = (_a = err.loc) == null ? void 0 : _a.file) == null ? void 0 : _b.split(".").pop(),
+    lang: highlighterLang,
     lineOptions: ((_c = err.loc) == null ? void 0 : _c.line) ? [{ line: err.loc.line, classes: ["error-line"] }] : void 0
   }) : void 0;
   return {