@slidev/cli 0.48.0-beta.1 → 0.48.0-beta.10

package/dist/chunk-W4YOBANG.mjs

@@ -0,0 +1,155 @@
+import {
+  ViteSlidevPlugin,
+  checkEngine,
+  mergeViteConfigs,
+  require_semver,
+  version
+} from "./chunk-VRC67DBV.mjs";
+import {
+  createResolver,
+  getRoots,
+  resolveEntry
+} from "./chunk-7HOZGSL4.mjs";
+import {
+  __toESM
+} from "./chunk-BXO7ZPPU.mjs";
+
+// node/server.ts
+import { join } from "node:path";
+import process from "node:process";
+import { createServer as createViteServer, mergeConfig } from "vite";
+async function createServer(options, viteConfig = {}, serverOptions = {}) {
+  process.env.EDITOR = process.env.EDITOR || "code";
+  const config = await mergeViteConfigs(
+    options,
+    viteConfig,
+    {
+      root: options.userRoot,
+      optimizeDeps: {
+        entries: [
+          join(options.clientRoot, "main.ts")
+        ]
+      }
+    },
+    "serve"
+  );
+  const server = await createViteServer(
+    mergeConfig(
+      config,
+      {
+        plugins: [
+          await ViteSlidevPlugin(options, config.slidev || {}, serverOptions)
+        ],
+        define: {
+          // Fixes Vue production mode breaking PDF Export #1245
+          __VUE_PROD_DEVTOOLS__: JSON.stringify(true)
+        }
+      }
+    )
+  );
+  return server;
+}
+
+// node/parser.ts
+import * as parser from "@slidev/parser/fs";
+
+// node/themes.ts
+var import_semver = __toESM(require_semver());
+import { join as join2 } from "node:path";
+import fs from "fs-extra";
+var officialThemes = {
+  "none": "",
+  "default": "@slidev/theme-default",
+  "seriph": "@slidev/theme-seriph",
+  "apple-basic": "@slidev/theme-apple-basic",
+  "shibainu": "@slidev/theme-shibainu",
+  "bricks": "@slidev/theme-bricks"
+};
+var resolveTheme = createResolver("theme", officialThemes);
+async function getThemeMeta(name, root) {
+  const path = join2(root, "package.json");
+  if (!fs.existsSync(path))
+    return {};
+  const { slidev = {}, engines = {} } = await fs.readJSON(path);
+  if (engines.slidev && !(0, import_semver.satisfies)(version, engines.slidev, { includePrerelease: true }))
+    throw new Error(`[slidev] theme "${name}" requires Slidev version range "${engines.slidev}" but found "${version}"`);
+  return slidev;
+}
+
+// node/addons.ts
+import { resolve } from "node:path";
+import fs2 from "fs-extra";
+async function resolveAddons(addonsInConfig) {
+  const { userRoot, userPkgJson } = await getRoots();
+  const resolved = [];
+  const resolveAddonNameAndRoot = createResolver("addon", {});
+  async function resolveAddon(name, parent) {
+    const [, pkgRoot] = await resolveAddonNameAndRoot(name, parent);
+    if (!pkgRoot)
+      return;
+    resolved.push(pkgRoot);
+    const { slidev, engines } = await fs2.readJSON(resolve(pkgRoot, "package.json"));
+    checkEngine(name, engines);
+    if (Array.isArray(slidev?.addons))
+      await Promise.all(slidev.addons.map((addon) => resolveAddon(addon, pkgRoot)));
+  }
+  if (Array.isArray(addonsInConfig))
+    await Promise.all(addonsInConfig.map((addon) => resolveAddon(addon, userRoot)));
+  if (Array.isArray(userPkgJson.slidev?.addons))
+    await Promise.all(userPkgJson.slidev.addons.map((addon) => resolveAddon(addon, userRoot)));
+  return resolved;
+}
+
+// node/options.ts
+import { uniq } from "@antfu/utils";
+import _debug from "debug";
+var debug = _debug("slidev:options");
+async function resolveOptions(options, mode) {
+  const rootsInfo = await getRoots();
+  const entry = await resolveEntry(options.entry || "slides.md", rootsInfo);
+  const loaded = await parser.load(rootsInfo.userRoot, entry);
+  const themeRaw = options.theme || loaded.headmatter.theme || "default";
+  const [theme, themeRoot] = await resolveTheme(themeRaw, entry);
+  const themeRoots = themeRoot ? [themeRoot] : [];
+  const themeMeta = themeRoot ? await getThemeMeta(theme, themeRoot) : void 0;
+  const config = parser.resolveConfig(loaded.headmatter, themeMeta, options.entry);
+  const addonRoots = await resolveAddons(config.addons);
+  const roots = uniq([...themeRoots, ...addonRoots, rootsInfo.userRoot]);
+  debug({
+    ...rootsInfo,
+    ...options,
+    config,
+    mode,
+    entry,
+    themeRaw,
+    theme,
+    themeRoots,
+    addonRoots,
+    roots
+  });
+  return {
+    ...rootsInfo,
+    ...options,
+    data: {
+      ...loaded,
+      config,
+      themeMeta
+    },
+    mode,
+    entry,
+    themeRaw,
+    theme,
+    themeRoots,
+    addonRoots,
+    roots
+  };
+}
+
+export {
+  createServer,
+  parser,
+  resolveTheme,
+  getThemeMeta,
+  resolveAddons,
+  resolveOptions
+};

package/dist/cli.mjs

@@ -1,20 +1,20 @@
 import {
   createServer,
-  getAddonRoots,
-  getClientRoot,
-  getThemeRoots,
-  getUserRoot,
-  isPath,
+  getThemeMeta,
   parser,
+  resolveAddons,
   resolveOptions,
-  resolveThemeName,
+  resolveTheme
+} from "./chunk-W4YOBANG.mjs";
+import {
   version
-} from "./chunk-MFKPLZWW.mjs";
-import "./chunk-JHZKCONU.mjs";
+} from "./chunk-VRC67DBV.mjs";
 import {
   loadSetups
-} from "./chunk-CTBVOVLQ.mjs";
-import "./chunk-DWXI5WEO.mjs";
+} from "./chunk-O6TYYGU6.mjs";
+import {
+  getRoots
+} from "./chunk-7HOZGSL4.mjs";
 import "./chunk-BXO7ZPPU.mjs";
 
 // node/cli.ts
@@ -26,13 +26,13 @@ import process from "node:process";
 import fs from "fs-extra";
 import openBrowser from "open";
 import yargs from "yargs";
-import prompts from "prompts";
 import { blue, bold, cyan, dim, gray, green, underline, yellow } from "kolorist";
 import isInstalledGlobally from "is-installed-globally";
 import equal from "fast-deep-equal";
 import { verifyConfig } from "@slidev/parser";
 import { injectPreparserExtensionLoader } from "@slidev/parser/fs";
-import { checkPort } from "get-port-please";
+import { uniq } from "@antfu/utils";
+import { getPort } from "get-port-please";
 var CONFIG_RESTART_FIELDS = [
   "highlighter",
   "monaco",
@@ -40,20 +40,19 @@ var CONFIG_RESTART_FIELDS = [
   "fonts",
   "css",
   "mdc",
-  "editor"
+  "editor",
+  "theme"
 ];
 injectPreparserExtensionLoader(async (headmatter, filepath) => {
   const addons = headmatter?.addons ?? [];
-  const roots = (
-    /* uniq */
-    [
-      getUserRoot({}).userRoot,
-      ...await getAddonRoots(addons, ""),
-      await getClientRoot()
-    ]
-  );
+  const { clientRoot, userRoot } = await getRoots();
+  const roots = uniq([
+    clientRoot,
+    userRoot,
+    ...await resolveAddons(addons)
+  ]);
   const mergeArrays = (a, b) => a.concat(b);
-  return await loadSetups(roots, "preparser.ts", { filepath, headmatter }, [], mergeArrays);
+  return await loadSetups(clientRoot, roots, "preparser.ts", { filepath, headmatter }, [], mergeArrays);
 });
 var cli = yargs(process.argv.slice(2)).scriptName("slidev").usage("$0 [args]").version(version).strict().showHelpOnFail(false).alias("h", "help").alias("v", "version");
 cli.command(
@@ -89,22 +88,12 @@ cli.command(
     default: false,
     type: "boolean",
     describe: "force the optimizer to ignore the cache and re-bundle  "
+  }).option("bind", {
+    type: "string",
+    default: "0.0.0.0",
+    describe: "specify which IP addresses the server should listen on in remote mode"
   }).strict().help(),
-  async ({ entry, theme, port: userPort, open, log, remote, tunnel, force, inspect }) => {
-    if (!fs.existsSync(entry) && !entry.endsWith(".md"))
-      entry = `${entry}.md`;
-    if (!fs.existsSync(entry)) {
-      const { create } = await prompts({
-        name: "create",
-        type: "confirm",
-        initial: "Y",
-        message: `Entry file ${yellow(`"${entry}"`)} does not exist, do you want to create it?`
-      });
-      if (create)
-        await fs.copyFile(new URL("../template.md", import.meta.url), entry);
-      else
-        process.exit(0);
-    }
+  async ({ entry, theme, port: userPort, open, log, remote, tunnel, force, inspect, bind }) => {
     let server;
     let port = 3030;
     let lastRemoteUrl;
@@ -112,7 +101,13 @@ cli.command(
       if (server)
         await server.close();
       const options = await resolveOptions({ entry, remote, theme, inspect }, "dev");
-      port = userPort || await findFreePort(3030);
+      const host = remote !== void 0 ? bind : "localhost";
+      port = userPort || await getPort({
+        port: 3030,
+        random: false,
+        portRange: [3030, 4e3],
+        host
+      });
       server = await createServer(
         options,
         {
@@ -120,7 +115,7 @@ cli.command(
             port,
             strictPort: true,
             open,
-            host: remote !== void 0 ? "0.0.0.0" : "localhost",
+            host,
             // @ts-expect-error Vite <= 4
             force
           },
@@ -131,14 +126,27 @@ cli.command(
           logLevel: log
         },
         {
-          async onDataReload(newData, data) {
-            if (!theme && await resolveThemeName(newData.config.theme) !== await resolveThemeName(data.config.theme)) {
+          async loadData() {
+            const { data: oldData, entry: entry2 } = options;
+            const loaded = await parser.load(options.userRoot, entry2);
+            const themeRaw = theme || loaded.headmatter.theme || "default";
+            if (options.themeRaw !== themeRaw) {
               console.log(yellow("\n  restarting on theme change\n"));
               initServer();
-            } else if (CONFIG_RESTART_FIELDS.some((i) => !equal(newData.config[i], data.config[i]))) {
+              return false;
+            }
+            const themeMeta = options.themeRoots[0] ? await getThemeMeta(themeRaw, options.themeRoots[0]) : void 0;
+            const newData = {
+              ...loaded,
+              themeMeta,
+              config: parser.resolveConfig(loaded.headmatter, themeMeta, entry2)
+            };
+            if (CONFIG_RESTART_FIELDS.some((i) => !equal(newData.config[i], oldData.config[i]))) {
               console.log(yellow("\n  restarting on config change\n"));
               initServer();
+              return false;
             }
+            return newData;
           }
         }
       );
@@ -269,7 +277,7 @@ cli.command(
   }).strict().help(),
   async (args) => {
     const { entry, theme, watch, base, download, out, inspect } = args;
-    const { build } = await import("./build-M6ETMXB4.mjs");
+    const { build } = await import("./build-3Z2FXQKW.mjs");
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile, theme, inspect }, "build");
       if (download && !options.data.config.download)
@@ -291,9 +299,9 @@ cli.command(
   (args) => commonOptions(args).strict().help(),
   async ({ entry }) => {
     for (const entryFile of entry) {
-      const data = await parser.load(entryFile);
-      parser.prettify(data);
-      await parser.save(data);
+      const md = await parser.parse(await fs.readFile(entryFile, "utf-8"), entryFile);
+      parser.prettify(md);
+      await parser.save(md);
     }
   }
 );
@@ -309,30 +317,27 @@ cli.command(
         default: "theme"
       }),
       async ({ entry, dir, theme: themeInput }) => {
-        const data = await parser.load(entry);
-        const theme = await resolveThemeName(themeInput || data.config.theme);
-        if (theme === "none") {
+        const roots = await getRoots();
+        const data = await parser.load(roots.userRoot, entry);
+        const themeRaw = themeInput || data.headmatter.theme || "default";
+        if (themeRaw === "none") {
           console.error('Cannot eject theme "none"');
           process.exit(1);
         }
-        if (isPath(theme)) {
+        if ("/.".includes(themeRaw[0]) || themeRaw[0] !== "@" && themeRaw.includes("/")) {
           console.error("Theme is already ejected");
           process.exit(1);
         }
-        const roots = await getThemeRoots(theme, entry);
-        if (!roots.length) {
-          console.error(`Could not find theme "${theme}"`);
-          process.exit(1);
-        }
-        const root = roots[0];
+        const [name, root] = await resolveTheme(themeRaw, entry);
         await fs.copy(root, path.resolve(dir), {
           filter: (i) => !/node_modules|.git/.test(path.relative(root, i))
         });
         const dirPath = `./${dir}`;
-        data.slides[0].frontmatter.theme = dirPath;
-        data.slides[0].raw = null;
-        await parser.save(data);
-        console.log(`Theme "${theme}" ejected successfully to "${dirPath}"`);
+        const firstSlide = data.entry.slides[0];
+        firstSlide.frontmatter.theme = dirPath;
+        parser.prettifySlide(firstSlide);
+        await parser.save(data.entry);
+        console.log(`Theme "${name}" ejected successfully to "${dirPath}"`);
       }
     );
   },
@@ -347,9 +352,8 @@ cli.command(
   (args) => exportOptions(commonOptions(args)).strict().help(),
   async (args) => {
     const { entry, theme } = args;
-    process.env.NODE_ENV = "production";
-    const { exportSlides, getExportOptions } = await import("./export-MLH55TH5.mjs");
-    const port = await findFreePort(12445);
+    const { exportSlides, getExportOptions } = await import("./export-SM2ZATWB.mjs");
+    const port = await getPort(12445);
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile, theme }, "export");
       const server = await createServer(
@@ -361,7 +365,6 @@ cli.command(
       );
       await server.listen(port);
       printInfo(options);
-      parser.filterDisabled(options.data);
       const result = await exportSlides({
         port,
         ...getExportOptions({ ...args, entry: entryFile }, options)
@@ -393,9 +396,8 @@ cli.command(
     output,
     timeout
   }) => {
-    process.env.NODE_ENV = "production";
-    const { exportNotes } = await import("./export-MLH55TH5.mjs");
-    const port = await findFreePort(12445);
+    const { exportNotes } = await import("./export-SM2ZATWB.mjs");
+    const port = await getPort(12445);
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile }, "export");
       const server = await createServer(
@@ -407,7 +409,6 @@ cli.command(
       );
       await server.listen(port);
       printInfo(options);
-      parser.filterDisabled(options.data);
       const result = await exportNotes({
         port,
         output: output || (options.data.config.exportFilename ? `${options.data.config.exportFilename}-notes` : `${path.basename(entryFile, ".md")}-export-notes`),
@@ -510,8 +511,3 @@ function printInfo(options, port, remote, tunnelUrl, publicIp) {
     return lastRemoteUrl;
   }
 }
-async function findFreePort(start) {
-  if (await checkPort(start) !== false)
-    return start;
-  return findFreePort(start + 1);
-}

package/dist/{export-MLH55TH5.mjs → export-SM2ZATWB.mjs}

@@ -1,7 +1,6 @@
 import {
-  packageExists,
-  resolveGlobalImportPath
-} from "./chunk-DWXI5WEO.mjs";
+  getRoots
+} from "./chunk-7HOZGSL4.mjs";
 import "./chunk-BXO7ZPPU.mjs";
 
 // node/export.ts
@@ -14,7 +13,7 @@ import { parseRangeString } from "@slidev/parser/core";
 import { outlinePdfFactory } from "@lillallol/outline-pdf";
 import * as pdfLib from "pdf-lib";
 import { PDFDocument } from "pdf-lib";
-import isInstalledGlobally from "is-installed-globally";
+import { resolve } from "mlly";
 function addToTree(tree, info, slideIndexes, level = 1) {
   const titleLevel = info.level;
   if (titleLevel && titleLevel > level && tree.length > 0) {
@@ -384,18 +383,27 @@ function getExportOptions(args, options, outDir, outFilename) {
   };
 }
 async function importPlaywright() {
-  if (await packageExists("playwright-chromium"))
-    return await import("playwright-chromium");
-  let globalPath = isInstalledGlobally ? await resolveGlobalImportPath("playwright-chromium") : void 0;
-  if (globalPath)
-    return await import(globalPath);
+  const { userRoot, userWorkspaceRoot } = await getRoots();
+  try {
+    return await import(await resolve("playwright-chromium", { url: userRoot }));
+  } catch {
+  }
+  if (userWorkspaceRoot !== userRoot) {
+    try {
+      return await import(await resolve("playwright-chromium", { url: userWorkspaceRoot }));
+    } catch {
+    }
+  }
   const { resolveGlobal } = await import("resolve-global");
   try {
-    globalPath = resolveGlobal("playwright-chromium");
+    const imported = await import(resolveGlobal("playwright-chromium"));
+    return imported.default ?? imported;
+  } catch {
+  }
+  try {
+    return await import("playwright-chromium");
   } catch {
   }
-  if (globalPath)
-    return await import(globalPath);
   throw new Error("The exporting for Slidev is powered by Playwright, please install it via `npm i -D playwright-chromium`");
 }
 export {

package/dist/index.d.mts

@@ -7,12 +7,20 @@ import { VitePluginConfig } from 'unocss/vite';
 import RemoteAssets from 'vite-plugin-remote-assets';
 import ServerRef from 'vite-plugin-vue-server-ref';
 import { ArgumentsType } from '@antfu/utils';
-import { SlidevMarkdown } from '@slidev/types';
+import { SlidevData } from '@slidev/types';
 import * as vite from 'vite';
 import { InlineConfig, Plugin } from 'vite';
 import * as fs from '@slidev/parser/fs';
 export { fs as parser };
 
+interface RootsInfo {
+    cliRoot: string;
+    clientRoot: string;
+    userRoot: string;
+    userPkgJson: Record<string, any>;
+    userWorkspaceRoot: string;
+}
+
 interface SlidevEntryOptions {
     /**
      * Markdown entry
@@ -28,26 +36,21 @@ interface SlidevEntryOptions {
      * Remote password
      */
     remote?: string;
-    /**
-     * Root path
-     *
-     * @default process.cwd()
-     */
-    userRoot?: string;
     /**
      * Enable inspect plugin
      */
     inspect?: boolean;
 }
-interface ResolvedSlidevOptions {
-    data: SlidevMarkdown;
+interface ResolvedSlidevOptions extends RootsInfo {
+    data: SlidevData;
     entry: string;
-    userRoot: string;
-    cliRoot: string;
-    clientRoot: string;
+    themeRaw: string;
     theme: string;
     themeRoots: string[];
     addonRoots: string[];
+    /**
+     * =`[...themeRoots, ...addonRoots, userRoot]` (`clientRoot` excluded)
+     */
     roots: string[];
     mode: 'dev' | 'build' | 'export';
     remote?: string;
@@ -64,19 +67,12 @@ interface SlidevPluginOptions extends SlidevEntryOptions {
     unocss?: VitePluginConfig;
 }
 interface SlidevServerOptions {
-    onDataReload?: (newData: SlidevMarkdown, data: SlidevMarkdown) => void;
+    /**
+     * @returns `false` if server should be restarted
+     */
+    loadData?: () => Promise<SlidevData | false>;
 }
-declare function getClientRoot(): Promise<string>;
-declare function getCLIRoot(): string;
-declare function isPath(name: string): boolean;
-declare function getThemeRoots(name: string, entry: string): Promise<string[]>;
-declare function getAddonRoots(addons: string[], entry: string): Promise<string[]>;
-declare function getRoot(name: string, entry: string): Promise<string>;
-declare function getUserRoot(options: SlidevEntryOptions): {
-    entry: string;
-    userRoot: string;
-};
-declare function resolveOptions(options: SlidevEntryOptions, mode: ResolvedSlidevOptions['mode'], promptForInstallation?: boolean): Promise<ResolvedSlidevOptions>;
+declare function resolveOptions(options: SlidevEntryOptions, mode: ResolvedSlidevOptions['mode']): Promise<ResolvedSlidevOptions>;
 
 declare module 'vite' {
     interface UserConfig {
@@ -93,4 +89,4 @@ declare function createServer(options: ResolvedSlidevOptions, viteConfig?: Inlin
 
 declare function ViteSlidevPlugin(options: ResolvedSlidevOptions, pluginOptions: SlidevPluginOptions, serverOptions?: SlidevServerOptions): Promise<Plugin[]>;
 
-export { type ResolvedSlidevOptions, type SlidevEntryOptions, type SlidevPluginOptions, type SlidevServerOptions, ViteSlidevPlugin, createServer, getAddonRoots, getCLIRoot, getClientRoot, getRoot, getThemeRoots, getUserRoot, isPath, resolveOptions };
+export { type ResolvedSlidevOptions, type SlidevEntryOptions, type SlidevPluginOptions, type SlidevServerOptions, ViteSlidevPlugin, createServer, resolveOptions };

package/dist/index.mjs

@@ -1,31 +1,17 @@
 import {
   createServer,
-  getAddonRoots,
-  getCLIRoot,
-  getClientRoot,
-  getRoot,
-  getThemeRoots,
-  getUserRoot,
-  isPath,
   parser,
   resolveOptions
-} from "./chunk-MFKPLZWW.mjs";
+} from "./chunk-W4YOBANG.mjs";
 import {
   ViteSlidevPlugin
-} from "./chunk-JHZKCONU.mjs";
-import "./chunk-CTBVOVLQ.mjs";
-import "./chunk-DWXI5WEO.mjs";
+} from "./chunk-VRC67DBV.mjs";
+import "./chunk-O6TYYGU6.mjs";
+import "./chunk-7HOZGSL4.mjs";
 import "./chunk-BXO7ZPPU.mjs";
 export {
   ViteSlidevPlugin,
   createServer,
-  getAddonRoots,
-  getCLIRoot,
-  getClientRoot,
-  getRoot,
-  getThemeRoots,
-  getUserRoot,
-  isPath,
   parser,
   resolveOptions
 };

package/dist/{unocss-6IVIFJMZ.mjs → unocss-XALM635U.mjs}

@@ -1,6 +1,6 @@
 import {
   loadSetups
-} from "./chunk-CTBVOVLQ.mjs";
+} from "./chunk-O6TYYGU6.mjs";
 import "./chunk-BXO7ZPPU.mjs";
 
 // node/plugins/unocss.ts
@@ -11,7 +11,7 @@ import { uniq } from "@antfu/utils";
 import { mergeConfigs } from "unocss";
 import jiti from "jiti";
 import UnoCSS from "unocss/vite";
-async function createUnocssPlugin({ themeRoots, addonRoots, clientRoot, roots, userRoot, data }, { unocss: unoOptions = {} }) {
+async function createUnocssPlugin({ themeRoots, addonRoots, clientRoot, roots, data, userRoot }, { unocss: unoOptions = {} }) {
   const configFiles = uniq([
     resolve(userRoot, "uno.config.ts"),
     resolve(userRoot, "unocss.config.ts"),
@@ -29,7 +29,7 @@ async function createUnocssPlugin({ themeRoots, addonRoots, clientRoot, roots, u
   }).filter(Boolean);
   configs.reverse();
   let config = mergeConfigs([...configs, unoOptions]);
-  config = await loadSetups(roots, "unocss.ts", {}, config, (a, b) => mergeConfigs([a, b]));
+  config = await loadSetups(clientRoot, roots, "unocss.ts", {}, config, (a, b) => mergeConfigs([a, b]));
   config.theme ||= {};
   config.theme.fontFamily ||= {};
   config.theme.fontFamily.sans ||= data.config.fonts.sans.join(",");