@slidev/cli 51.2.2 → 51.3.0

package/dist/{build-CKIPRRXN.js → build-ILXZPI57.js}

@@ -1,13 +1,13 @@
 import {
   resolveViteConfigs
-} from "./chunk-WBOBK5S6.js";
+} from "./chunk-7MVSIUA5.js";
 import "./chunk-TJFRPB4N.js";
 
 // node/commands/build.ts
 import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
 import http from "node:http";
-import { resolve } from "node:path";
+import { join, resolve } from "node:path";
 import connect from "connect";
 import sirv from "sirv";
 import { build as viteBuild } from "vite";
@@ -51,7 +51,7 @@ async function build(options, viteConfig = {}, args) {
     await fs.writeFile(redirectsPath, `${config.base}*    ${config.base}index.html   200
 `, "utf-8");
   if ([true, "true", "auto"].includes(options.data.config.download)) {
-    const { exportSlides, getExportOptions } = await import("./export-VO32FL6K.js");
+    const { exportSlides, getExportOptions } = await import("./export-5TR5BGLG.js");
     const port = 12445;
     const app = connect();
     const server = http.createServer(app);
@@ -67,7 +67,7 @@ async function build(options, viteConfig = {}, args) {
     await exportSlides({
       port,
       base: config.base,
-      ...getExportOptions(args, options, outDir, "slidev-exported.pdf")
+      ...getExportOptions(args, options, join(outDir, "slidev-exported.pdf"))
     });
     server.close();
   }

package/dist/{chunk-T5HJ7VTH.js → chunk-36LVDMJV.js}

@@ -1,6 +1,6 @@
 import {
   resolveViteConfigs
-} from "./chunk-WBOBK5S6.js";
+} from "./chunk-7MVSIUA5.js";
 
 // node/commands/serve.ts
 import { join } from "node:path";

package/dist/{chunk-WBOBK5S6.js → chunk-7MVSIUA5.js}

@@ -9,7 +9,80 @@ import {
 } from "./chunk-TJFRPB4N.js";
 
 // package.json
-var version = "51.2.2";
+var version = "51.3.0";
+
+// node/utils.ts
+import { fileURLToPath } from "node:url";
+import { createJiti } from "jiti";
+import YAML from "yaml";
+var jiti;
+function loadModule(absolutePath) {
+  jiti ??= createJiti(fileURLToPath(import.meta.url), {
+    // Allows changes to take effect
+    moduleCache: false
+  });
+  return jiti.import(absolutePath);
+}
+function stringifyMarkdownTokens(tokens) {
+  return tokens.map((token) => token.children?.filter((t) => ["text", "code_inline"].includes(t.type) && !t.content.match(/^\s*$/)).map((t) => t.content.trim()).join(" ")).filter(Boolean).join(" ");
+}
+function generateFontParams(options) {
+  const weights = options.weights.flatMap((i) => options.italic ? [`0,${i}`, `1,${i}`] : [`${i}`]).sort().join(";");
+  const fontParams = options.webfonts.map((i) => `family=${i.replace(/^(['"])(.*)\1$/, "$1").replace(/\s+/g, "+")}:${options.italic ? "ital," : ""}wght@${weights}`).join("&");
+  return fontParams;
+}
+function generateGoogleFontsUrl(options) {
+  return `https://fonts.googleapis.com/css2?${generateFontParams(options)}&display=swap`;
+}
+function generateCoollabsFontsUrl(options) {
+  return `https://api.fonts.coollabs.io/fonts?${generateFontParams(options)}&display=swap`;
+}
+function updateFrontmatterPatch(source, frontmatter) {
+  let doc = source.frontmatterDoc;
+  if (!doc) {
+    source.frontmatterStyle = "frontmatter";
+    source.frontmatterDoc = doc = new YAML.Document({});
+  }
+  for (const [key, value] of Object.entries(frontmatter)) {
+    source.frontmatter[key] = value;
+    if (value == null) {
+      doc.delete(key);
+    } else {
+      const valueNode = doc.createNode(value);
+      let found = false;
+      YAML.visit(doc.contents, {
+        Pair(_key, node, path4) {
+          if (path4.length === 1 && YAML.isScalar(node.key) && node.key.value === key) {
+            node.value = valueNode;
+            found = true;
+            return YAML.visit.BREAK;
+          }
+        }
+      });
+      if (!found) {
+        if (!YAML.isMap(doc.contents))
+          doc.contents = doc.createNode({});
+        doc.contents.add(
+          doc.createPair(key, valueNode)
+        );
+      }
+    }
+  }
+}
+function getBodyJson(req) {
+  return new Promise((resolve9, reject) => {
+    let body = "";
+    req.on("data", (chunk) => body += chunk);
+    req.on("error", reject);
+    req.on("end", () => {
+      try {
+        resolve9(JSON.parse(body) || {});
+      } catch (e) {
+        reject(e);
+      }
+    });
+  });
+}
 
 // node/integrations/themes.ts
 import { existsSync } from "node:fs";
@@ -108,77 +181,6 @@ function MarkdownItLink(md) {
   };
 }
 
-// node/utils.ts
-import { fileURLToPath } from "node:url";
-import { createJiti } from "jiti";
-import YAML from "yaml";
-var jiti;
-function loadModule(absolutePath) {
-  jiti ??= createJiti(fileURLToPath(import.meta.url));
-  return jiti.import(absolutePath);
-}
-function stringifyMarkdownTokens(tokens) {
-  return tokens.map((token) => token.children?.filter((t) => ["text", "code_inline"].includes(t.type) && !t.content.match(/^\s*$/)).map((t) => t.content.trim()).join(" ")).filter(Boolean).join(" ");
-}
-function generateFontParams(options) {
-  const weights = options.weights.flatMap((i) => options.italic ? [`0,${i}`, `1,${i}`] : [`${i}`]).sort().join(";");
-  const fontParams = options.webfonts.map((i) => `family=${i.replace(/^(['"])(.*)\1$/, "$1").replace(/\s+/g, "+")}:${options.italic ? "ital," : ""}wght@${weights}`).join("&");
-  return fontParams;
-}
-function generateGoogleFontsUrl(options) {
-  return `https://fonts.googleapis.com/css2?${generateFontParams(options)}&display=swap`;
-}
-function generateCoollabsFontsUrl(options) {
-  return `https://api.fonts.coollabs.io/fonts?${generateFontParams(options)}&display=swap`;
-}
-function updateFrontmatterPatch(slide, frontmatter) {
-  const source = slide.source;
-  let doc = source.frontmatterDoc;
-  if (!doc) {
-    source.frontmatterStyle = "frontmatter";
-    source.frontmatterDoc = doc = new YAML.Document({});
-  }
-  for (const [key, value] of Object.entries(frontmatter)) {
-    slide.frontmatter[key] = source.frontmatter[key] = value;
-    if (value == null) {
-      doc.delete(key);
-    } else {
-      const valueNode = doc.createNode(value);
-      let found = false;
-      YAML.visit(doc.contents, {
-        Pair(_key, node, path4) {
-          if (path4.length === 1 && YAML.isScalar(node.key) && node.key.value === key) {
-            node.value = valueNode;
-            found = true;
-            return YAML.visit.BREAK;
-          }
-        }
-      });
-      if (!found) {
-        if (!YAML.isMap(doc.contents))
-          doc.contents = doc.createNode({});
-        doc.contents.add(
-          doc.createPair(key, valueNode)
-        );
-      }
-    }
-  }
-}
-function getBodyJson(req) {
-  return new Promise((resolve9, reject) => {
-    let body = "";
-    req.on("data", (chunk) => body += chunk);
-    req.on("error", reject);
-    req.on("end", () => {
-      try {
-        resolve9(JSON.parse(body) || {});
-      } catch (e) {
-        reject(e);
-      }
-    });
-  });
-}
-
 // node/vite/compilerFlagsVue.ts
 import { objectEntries } from "@antfu/utils";
 function createVueCompilerFlagsPlugin(options) {
@@ -210,6 +212,7 @@ function createComponentsPlugin({ clientRoot, roots }, pluginOptions) {
       join2(clientRoot, "builtin"),
       ...roots.map((i) => join2(i, "components"))
     ],
+    globsExclude: [],
     include: [/\.vue$/, /\.vue\?vue/, /\.vue\?v=/, /\.md$/, /\.md\?vue/],
     exclude: [],
     resolvers: [
@@ -1182,8 +1185,10 @@ function createSlidesLoader(options, serverOptions) {
           }
           if (body.note)
             slide.note = slide.source.note = body.note;
-          if (body.frontmatter)
-            updateFrontmatterPatch(slide, body.frontmatter);
+          if (body.frontmatter) {
+            updateFrontmatterPatch(slide.source, body.frontmatter);
+            Object.assign(slide.frontmatter, body.frontmatter);
+          }
           parser2.prettifySlide(slide.source);
           const fileContent = await parser2.save(data.markdownFiles[slide.source.filepath]);
           if (body.skipHmr) {
@@ -2703,6 +2708,7 @@ function getDefine(options) {
 
 export {
   version,
+  updateFrontmatterPatch,
   resolveAddons,
   resolveTheme,
   getThemeMeta,

package/dist/cli.js

@@ -1,6 +1,6 @@
 import {
   createServer
-} from "./chunk-T5HJ7VTH.js";
+} from "./chunk-36LVDMJV.js";
 import {
   getThemeMeta,
   loadSetups,
@@ -8,8 +8,9 @@ import {
   resolveAddons,
   resolveOptions,
   resolveTheme,
+  updateFrontmatterPatch,
   version
-} from "./chunk-WBOBK5S6.js";
+} from "./chunk-7MVSIUA5.js";
 import {
   getRoots,
   isInstalledGlobally,
@@ -210,7 +211,7 @@ cli.command(
         name: "r",
         fullname: "restart",
         action() {
-          initServer();
+          restartServer();
         }
       },
       {
@@ -337,7 +338,7 @@ cli.command(
   }).strict().help(),
   async (args) => {
     const { entry, theme, base, download, out, inspect } = args;
-    const { build } = await import("./build-CKIPRRXN.js");
+    const { build } = await import("./build-ILXZPI57.js");
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile, theme, inspect, download, base }, "build");
       printInfo(options);
@@ -392,16 +393,18 @@ cli.command(
           process.exit(1);
         }
         const [name, root] = await resolveTheme(themeRaw, entry);
+        await fs.mkdir(path.resolve(dir), { recursive: true });
         await fs.cp(
           root,
           path.resolve(dir),
           {
-            filter: (i) => !/node_modules|.git/.test(path.relative(root, i))
+            recursive: true,
+            filter: (i) => !/node_modules|\.git/.test(path.relative(root, i))
           }
         );
         const dirPath = `./${dir}`;
         const firstSlide = data.entry.slides[0];
-        firstSlide.frontmatter.theme = dirPath;
+        updateFrontmatterPatch(firstSlide, { theme: dirPath });
         parser.prettifySlide(firstSlide);
         await parser.save(data.entry);
         console.log(`Theme "${name}" ejected successfully to "${dirPath}"`);
@@ -419,7 +422,7 @@ cli.command(
   (args) => exportOptions(commonOptions(args)).strict().help(),
   async (args) => {
     const { entry, theme } = args;
-    const { exportSlides, getExportOptions } = await import("./export-VO32FL6K.js");
+    const { exportSlides, getExportOptions } = await import("./export-5TR5BGLG.js");
     const port = await getPort(12445);
     let warned = false;
     for (const entryFile of entry) {
@@ -446,7 +449,7 @@ cli.command(
         port,
         ...getExportOptions({ ...args, entry: entryFile }, options)
       });
-      console.log(`${green("  \u2713 ")}${dim("exported to ")}./${result}
+      console.log(`${green("  \u2713 ")}${dim("exported to ")}${result}
 `);
       server.close();
     }
@@ -478,7 +481,7 @@ cli.command(
     timeout,
     wait
   }) => {
-    const { exportNotes } = await import("./export-VO32FL6K.js");
+    const { exportNotes } = await import("./export-5TR5BGLG.js");
     const port = await getPort(12445);
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile }, "export");
@@ -497,7 +500,7 @@ cli.command(
         timeout,
         wait
       });
-      console.log(`${green("  \u2713 ")}${dim("exported to ")}./${result}
+      console.log(`${green("  \u2713 ")}${dim("exported to ")}${result}
 `);
       server.close();
     }

package/dist/{export-VO32FL6K.js → export-5TR5BGLG.js}

@@ -5,9 +5,9 @@ import {
 // node/commands/export.ts
 import { Buffer } from "node:buffer";
 import fs from "node:fs/promises";
-import path from "node:path";
+import path, { dirname, relative } from "node:path";
 import process from "node:process";
-import { clearUndefined, slash } from "@antfu/utils";
+import { clearUndefined, ensureSuffix, slash } from "@antfu/utils";
 import { outlinePdfFactory } from "@lillallol/outline-pdf";
 import { parseRangeString } from "@slidev/parser/core";
 import { blue, cyan, dim, green, yellow } from "ansis";
@@ -144,6 +144,23 @@ async function exportSlides({
   });
   const page = await context.newPage();
   const progress = createSlidevProgress(!perSlide);
+  progress.start(pages.length);
+  if (format === "pdf") {
+    await genPagePdf();
+  } else if (format === "png") {
+    await genPagePng(output);
+  } else if (format === "md") {
+    await genPageMd();
+  } else if (format === "pptx") {
+    const buffers = await genPagePng(false);
+    await genPagePptx(buffers);
+  } else {
+    throw new Error(`[slidev] Unsupported exporting format "${format}"`);
+  }
+  progress.stop();
+  browser.close();
+  const relativeOutput = slash(relative(".", output));
+  return relativeOutput.startsWith(".") ? relativeOutput : `./${relativeOutput}`;
   async function go(no, clicks) {
     const query = new URLSearchParams();
     if (withClicks)
@@ -303,8 +320,6 @@ async function exportSlides({
   async function genPagePngOnePiece(writeToDisk) {
     const result = [];
     await go("print");
-    await fs.rm(output, { force: true, recursive: true });
-    await fs.mkdir(output, { recursive: true });
     const slideContainers = page.locator(".print-slide-container");
     const count = await slideContainers.count();
     for (let i = 0; i < count; i++) {
@@ -314,9 +329,10 @@ async function exportSlides({
       const buffer = await slideContainers.nth(i).screenshot({
         omitBackground
       });
-      result.push({ slideIndex: slideNo - 1, buffer });
+      const filename = `${withClicks ? id : slideNo}.png`;
+      result.push({ slideIndex: slideNo - 1, buffer, filename });
       if (writeToDisk)
-        await fs.writeFile(path.join(output, `${withClicks ? id : slideNo}.png`), buffer);
+        await fs.writeFile(path.join(writeToDisk, filename), buffer);
     }
     return result;
   }
@@ -327,10 +343,11 @@ async function exportSlides({
       const buffer = await page.screenshot({
         omitBackground
       });
-      result.push({ slideIndex: no - 1, buffer });
+      const filename = `${no.toString().padStart(2, "0")}${clicks ? `-${clicks}` : ""}.png`;
+      result.push({ slideIndex: no - 1, buffer, filename });
       if (writeToDisk) {
         await fs.writeFile(
-          path.join(output, `${no.toString().padStart(2, "0")}${clicks ? `-${clicks}` : ""}.png`),
+          path.join(writeToDisk, filename),
           buffer
         );
       }
@@ -344,25 +361,23 @@ async function exportSlides({
       output = `${output}.pdf`;
     return perSlide ? genPagePdfPerSlide() : genPagePdfOnePiece();
   }
-  function genPagePng(writeToDisk = true) {
+  async function genPagePng(writeToDisk) {
+    if (writeToDisk) {
+      await fs.rm(writeToDisk, { force: true, recursive: true });
+      await fs.mkdir(writeToDisk, { recursive: true });
+    }
     return perSlide ? genPagePngPerSlide(writeToDisk) : genPagePngOnePiece(writeToDisk);
   }
   async function genPageMd() {
-    const files = await fs.readdir(output);
-    const mds = files.map((file, i, files2) => {
-      const slideIndex = getSlideIndex(file);
-      const mdImg = `![${slides[slideIndex]?.title}](./${slash(path.join(output, file))})
+    const pngs = await genPagePng(dirname(output));
+    const content = slides.map(
+      ({ title, index, note }) => pngs.filter(({ slideIndex }) => slideIndex === index).map(({ filename }) => `![${title || index + 1}](./${filename})
 
-`;
-      if ((i + 1 === files2.length || getSlideIndex(files2[i + 1]) !== slideIndex) && slides[slideIndex]?.note)
-        return `${mdImg}${slides[slideIndex]?.note}
+`).join("") + (note ? `${note.trim()}
 
-`;
-      return mdImg;
-    });
-    if (!output.endsWith(".md"))
-      output = `${output}.md`;
-    await fs.writeFile(output, mds.join(""));
+` : "")
+    ).join("---\n\n");
+    await fs.writeFile(ensureSuffix(".md", output), content);
   }
   async function genPagePptx(pngs) {
     const { default: PptxGenJS } = await import("pptxgenjs");
@@ -397,10 +412,6 @@ async function exportSlides({
       output = `${output}.pptx`;
     await fs.writeFile(output, buffer);
   }
-  function getSlideIndex(file) {
-    const slideId = file.substring(0, file.indexOf(".")).split("-")[0];
-    return Number(slideId) - 1;
-  }
   function addPdfMetadata(pdf) {
     const titleSlide = slides[0];
     if (titleSlide?.title)
@@ -426,25 +437,8 @@ async function exportSlides({
     const outline = makeOutline(tocTree);
     return await outlinePdf({ outline, pdf });
   }
-  progress.start(pages.length);
-  if (format === "pdf") {
-    await genPagePdf();
-  } else if (format === "png") {
-    await genPagePng();
-  } else if (format === "md") {
-    await genPagePng();
-    await genPageMd();
-  } else if (format === "pptx") {
-    const buffers = await genPagePng(false);
-    await genPagePptx(buffers);
-  } else {
-    throw new Error(`Unsupported exporting format "${format}"`);
-  }
-  progress.stop();
-  browser.close();
-  return output;
 }
-function getExportOptions(args, options, outDir, outFilename) {
+function getExportOptions(args, options, outFilename) {
   const config = {
     ...options.data.config.export,
     ...args,
@@ -474,8 +468,6 @@ function getExportOptions(args, options, outDir, outFilename) {
     omitBackground
   } = config;
   outFilename = output || options.data.config.exportFilename || outFilename || `${path.basename(entry, ".md")}-export`;
-  if (outDir)
-    outFilename = path.join(outDir, outFilename);
   return {
     output: outFilename,
     slides: options.data.slides,

package/dist/index.js

@@ -1,12 +1,12 @@
 import {
   createServer
-} from "./chunk-T5HJ7VTH.js";
+} from "./chunk-36LVDMJV.js";
 import {
   ViteSlidevPlugin,
   createDataUtils,
   parser,
   resolveOptions
-} from "./chunk-WBOBK5S6.js";
+} from "./chunk-7MVSIUA5.js";
 import "./chunk-TJFRPB4N.js";
 export {
   ViteSlidevPlugin,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@slidev/cli",
   "type": "module",
-  "version": "51.2.2",
+  "version": "51.3.0",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -55,7 +55,7 @@
     "@unocss/reset": "^66.0.0",
     "@vitejs/plugin-vue": "^5.2.1",
     "@vitejs/plugin-vue-jsx": "^4.1.1",
-    "ansis": "^3.15.0",
+    "ansis": "^3.16.0",
     "chokidar": "^4.0.3",
     "cli-progress": "^3.12.0",
     "connect": "^3.7.0",
@@ -100,7 +100,7 @@
     "untun": "^0.1.3",
     "uqr": "^0.1.2",
     "vite": "^6.1.1",
-    "vite-plugin-inspect": "^10.2.1",
+    "vite-plugin-inspect": "^11.0.0",
     "vite-plugin-remote-assets": "^1.0.0",
     "vite-plugin-static-copy": "^2.2.0",
     "vite-plugin-vue-server-ref": "^1.0.0",
@@ -108,9 +108,9 @@
     "vue": "^3.5.13",
     "yaml": "^2.7.0",
     "yargs": "^17.7.2",
-    "@slidev/parser": "51.2.2",
-    "@slidev/client": "51.2.2",
-    "@slidev/types": "51.2.2"
+    "@slidev/client": "51.3.0",
+    "@slidev/parser": "51.3.0",
+    "@slidev/types": "51.3.0"
   },
   "devDependencies": {
     "@hedgedoc/markdown-it-plugins": "^2.1.4",