@slidev/cli 0.29.2 → 0.30.2

package/dist/cli.js

@@ -1,6 +1,6 @@
 "use strict"; function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkXI447TZRjs = require('./chunk-XI447TZR.js');
+var _chunkE4IOOAKNjs = require('./chunk-E4IOOAKN.js');
 
 
 
@@ -8,19 +8,19 @@ var _chunkXI447TZRjs = require('./chunk-XI447TZR.js');
 
 
 
-var _chunkZ6YPUFV4js = require('./chunk-Z6YPUFV4.js');
+var _chunk2LNCAUCDjs = require('./chunk-2LNCAUCD.js');
 
 
-var _chunkNPCPO6ETjs = require('./chunk-NPCPO6ET.js');
+var _chunkRSHUQSN4js = require('./chunk-RSHUQSN4.js');
 
 
 
 
-var _chunk7QXPSYEZjs = require('./chunk-7QXPSYEZ.js');
+var _chunkIXNT7VMKjs = require('./chunk-IXNT7VMK.js');
 
 // node/cli.ts
-_chunk7QXPSYEZjs.init_cjs_shims.call(void 0, );
-var import_fast_deep_equal = _chunk7QXPSYEZjs.__toModule.call(void 0, _chunkNPCPO6ETjs.require_fast_deep_equal.call(void 0, ));
+_chunkIXNT7VMKjs.init_cjs_shims.call(void 0, );
+var import_fast_deep_equal = _chunkIXNT7VMKjs.__toESM.call(void 0, _chunkRSHUQSN4js.require_fast_deep_equal.call(void 0, ));
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _net = require('net'); var _net2 = _interopRequireDefault(_net);
 var _os = require('os'); var _os2 = _interopRequireDefault(_os);
@@ -38,7 +38,7 @@ var CONFIG_RESTART_FIELDS = [
   "routerMode",
   "fonts"
 ];
-var cli = _yargs2.default.scriptName("slidev").usage("$0 [args]").version(_chunkZ6YPUFV4js.version).strict().showHelpOnFail(false).alias("h", "help").alias("v", "version");
+var cli = _yargs2.default.scriptName("slidev").usage("$0 [args]").version(_chunk2LNCAUCDjs.version).strict().showHelpOnFail(false).alias("h", "help").alias("v", "version");
 cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOptions(args).option("port", {
   alias: "p",
   type: "number",
@@ -82,9 +82,9 @@ cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOpti
   async function initServer() {
     if (server)
       await server.close();
-    const options = await _chunkZ6YPUFV4js.resolveOptions.call(void 0, { entry, theme }, "dev");
+    const options = await _chunk2LNCAUCDjs.resolveOptions.call(void 0, { entry, theme }, "dev");
     port = userPort || await findFreePort(3030);
-    server = await _chunkXI447TZRjs.createServer.call(void 0, options, {
+    server = await _chunkE4IOOAKNjs.createServer.call(void 0, options, {
       server: {
         port,
         strictPort: true,
@@ -95,7 +95,7 @@ cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOpti
       logLevel: log
     }, {
       onDataReload(newData, data) {
-        if (!theme && _chunkZ6YPUFV4js.resolveThemeName.call(void 0, newData.config.theme) !== _chunkZ6YPUFV4js.resolveThemeName.call(void 0, data.config.theme)) {
+        if (!theme && _chunk2LNCAUCDjs.resolveThemeName.call(void 0, newData.config.theme) !== _chunk2LNCAUCDjs.resolveThemeName.call(void 0, data.config.theme)) {
           console.log(_kolorist.yellow.call(void 0, "\n  restarting on theme change\n"));
           initServer();
         } else if (CONFIG_RESTART_FIELDS.some((i) => !(0, import_fast_deep_equal.default)(newData.config[i], data.config[i]))) {
@@ -171,8 +171,8 @@ cli.command("build [entry]", "Build hostable SPA", (args) => commonOptions(args)
   type: "boolean",
   describe: "allow download as PDF"
 }).strict().help(), async ({ entry, theme, watch, base, download, out }) => {
-  const { build } = await Promise.resolve().then(() => _chunk7QXPSYEZjs.__toModule.call(void 0, _chunk7QXPSYEZjs.__require.call(void 0, "./build-IGNJAAON.js")));
-  const options = await _chunkZ6YPUFV4js.resolveOptions.call(void 0, { entry, theme }, "build");
+  const { build } = await Promise.resolve().then(() => _chunkIXNT7VMKjs.__toESM.call(void 0, _chunkIXNT7VMKjs.__require.call(void 0, "./build-23SNLQAJ.js")));
+  const options = await _chunk2LNCAUCDjs.resolveOptions.call(void 0, { entry, theme }, "build");
   if (download && !options.data.config.download)
     options.data.config.download = download;
   printInfo(options);
@@ -185,26 +185,26 @@ cli.command("build [entry]", "Build hostable SPA", (args) => commonOptions(args)
   });
 });
 cli.command("format [entry]", "Format the markdown file", (args) => commonOptions(args).strict().help(), async ({ entry }) => {
-  const data = await _chunkZ6YPUFV4js.fs_exports.load(entry);
-  _chunkZ6YPUFV4js.fs_exports.prettify(data);
-  await _chunkZ6YPUFV4js.fs_exports.save(data);
+  const data = await _chunk2LNCAUCDjs.fs_exports.load(entry);
+  _chunk2LNCAUCDjs.fs_exports.prettify(data);
+  await _chunk2LNCAUCDjs.fs_exports.save(data);
 });
 cli.command("theme [subcommand]", "Theme related operations", (command) => {
   return command.command("eject", "Eject current theme into local file system", (args) => commonOptions(args).option("dir", {
     type: "string",
     default: "theme"
   }), async ({ entry, dir, theme: themeInput }) => {
-    const data = await _chunkZ6YPUFV4js.fs_exports.load(entry);
-    const theme = _chunkZ6YPUFV4js.resolveThemeName.call(void 0, themeInput || data.config.theme);
+    const data = await _chunk2LNCAUCDjs.fs_exports.load(entry);
+    const theme = _chunk2LNCAUCDjs.resolveThemeName.call(void 0, themeInput || data.config.theme);
     if (theme === "none") {
       console.error('Can not eject theme "none"');
       process.exit(1);
     }
-    if (_chunkZ6YPUFV4js.isPath.call(void 0, theme)) {
+    if (_chunk2LNCAUCDjs.isPath.call(void 0, theme)) {
       console.error("Theme is already ejected");
       process.exit(1);
     }
-    const roots = _chunkZ6YPUFV4js.getThemeRoots.call(void 0, theme, entry);
+    const roots = _chunk2LNCAUCDjs.getThemeRoots.call(void 0, theme, entry);
     if (!roots.length) {
       console.error(`Does not found theme "${theme}"`);
       process.exit(1);
@@ -216,7 +216,7 @@ cli.command("theme [subcommand]", "Theme related operations", (command) => {
     const dirPath = `./${dir}`;
     data.slides[0].frontmatter.theme = dirPath;
     data.slides[0].raw = null;
-    await _chunkZ6YPUFV4js.fs_exports.save(data);
+    await _chunk2LNCAUCDjs.fs_exports.save(data);
     console.log(`Theme "${theme}" ejected successfully to "${dirPath}"`);
   });
 }, () => {
@@ -229,12 +229,12 @@ cli.command("export [entry]", "Export slides to PDF", (args) => commonOptions(ar
 }).option("format", {
   default: "pdf",
   type: "string",
-  choices: ["pdf", "png"],
+  choices: ["pdf", "png", "md"],
   describe: "output format"
 }).option("timeout", {
-  default: 100,
+  default: 3e4,
   type: "number",
-  describe: "timeout for rendering each page"
+  describe: "timeout for rendering the print page"
 }).option("range", {
   type: "string",
   describe: 'page ranges to export, for example "1,4-5,6"'
@@ -257,22 +257,23 @@ cli.command("export [entry]", "Export slides to PDF", (args) => commonOptions(ar
   dark,
   "with-clicks": withClicks
 }) => {
-  output = output || `${_path2.default.basename(entry, ".md")}-export`;
   process.env.NODE_ENV = "production";
-  const { exportSlides } = await Promise.resolve().then(() => _chunk7QXPSYEZjs.__toModule.call(void 0, _chunk7QXPSYEZjs.__require.call(void 0, "./export-XA3FQNS5.js")));
+  const { exportSlides } = await Promise.resolve().then(() => _chunkIXNT7VMKjs.__toESM.call(void 0, _chunkIXNT7VMKjs.__require.call(void 0, "./export-AKEY52VC.js")));
   const port = await findFreePort(12445);
-  const options = await _chunkZ6YPUFV4js.resolveOptions.call(void 0, { entry, theme }, "build");
-  const server = await _chunkXI447TZRjs.createServer.call(void 0, options, {
+  const options = await _chunk2LNCAUCDjs.resolveOptions.call(void 0, { entry, theme }, "build");
+  output = output || options.data.config.exportFilename || `${_path2.default.basename(entry, ".md")}-export`;
+  const server = await _chunkE4IOOAKNjs.createServer.call(void 0, options, {
     server: { port },
     clearScreen: false
   });
   await server.listen(port);
   printInfo(options);
-  _chunkZ6YPUFV4js.fs_exports.filterDisabled(options.data);
-  const width = 1920;
+  _chunk2LNCAUCDjs.fs_exports.filterDisabled(options.data);
+  const width = options.data.config.canvasWidth;
   const height = Math.round(width / options.data.config.aspectRatio);
   output = await exportSlides({
     port,
+    slides: options.data.slides,
     total: options.data.slides.length,
     range,
     format,
@@ -305,7 +306,7 @@ function printInfo(options, port, remote) {
   console.log();
   console.log();
   console.log(`  ${_kolorist.cyan.call(void 0, "\u25CF") + _kolorist.blue.call(void 0, "\u25A0") + _kolorist.yellow.call(void 0, "\u25B2")}`);
-  console.log(`${_kolorist.bold.call(void 0, "  Slidev")}  ${_kolorist.blue.call(void 0, `v${_chunkZ6YPUFV4js.version}`)} ${_isinstalledglobally2.default ? _kolorist.yellow.call(void 0, "(global)") : ""}`);
+  console.log(`${_kolorist.bold.call(void 0, "  Slidev")}  ${_kolorist.blue.call(void 0, `v${_chunk2LNCAUCDjs.version}`)} ${_isinstalledglobally2.default ? _kolorist.yellow.call(void 0, "(global)") : ""}`);
   console.log();
   console.log(_kolorist.dim.call(void 0, "  theme   ") + (options.theme ? _kolorist.green.call(void 0, options.theme) : _kolorist.gray.call(void 0, "none")));
   console.log(_kolorist.dim.call(void 0, "  entry   ") + _kolorist.dim.call(void 0, _path2.default.dirname(options.entry) + _path2.default.sep) + _path2.default.basename(options.entry));

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import {
   createServer
-} from "./chunk-XMJRAMYY.mjs";
+} from "./chunk-O57F34AM.mjs";
 import {
   fs_exports,
   getThemeRoots,
@@ -8,20 +8,20 @@ import {
   resolveOptions,
   resolveThemeName,
   version
-} from "./chunk-XDEB4KBK.mjs";
+} from "./chunk-OII7IQD2.mjs";
 import {
   require_fast_deep_equal
-} from "./chunk-NQIXBLV4.mjs";
+} from "./chunk-MBZTOLHN.mjs";
 import {
   __dirname,
   __require,
-  __toModule,
+  __toESM,
   init_esm_shims
-} from "./chunk-VYBQLH2X.mjs";
+} from "./chunk-XMETW2MS.mjs";
 
 // node/cli.ts
 init_esm_shims();
-var import_fast_deep_equal = __toModule(require_fast_deep_equal());
+var import_fast_deep_equal = __toESM(require_fast_deep_equal());
 import path from "path";
 import net from "net";
 import os from "os";
@@ -172,7 +172,7 @@ cli.command("build [entry]", "Build hostable SPA", (args) => commonOptions(args)
   type: "boolean",
   describe: "allow download as PDF"
 }).strict().help(), async ({ entry, theme, watch, base, download, out }) => {
-  const { build } = await Promise.resolve().then(() => __toModule(__require("./build-RNBUEMO5.mjs")));
+  const { build } = await Promise.resolve().then(() => __toESM(__require("./build-YFDGZUAK.mjs")));
   const options = await resolveOptions({ entry, theme }, "build");
   if (download && !options.data.config.download)
     options.data.config.download = download;
@@ -230,12 +230,12 @@ cli.command("export [entry]", "Export slides to PDF", (args) => commonOptions(ar
 }).option("format", {
   default: "pdf",
   type: "string",
-  choices: ["pdf", "png"],
+  choices: ["pdf", "png", "md"],
   describe: "output format"
 }).option("timeout", {
-  default: 100,
+  default: 3e4,
   type: "number",
-  describe: "timeout for rendering each page"
+  describe: "timeout for rendering the print page"
 }).option("range", {
   type: "string",
   describe: 'page ranges to export, for example "1,4-5,6"'
@@ -258,11 +258,11 @@ cli.command("export [entry]", "Export slides to PDF", (args) => commonOptions(ar
   dark,
   "with-clicks": withClicks
 }) => {
-  output = output || `${path.basename(entry, ".md")}-export`;
   process.env.NODE_ENV = "production";
-  const { exportSlides } = await Promise.resolve().then(() => __toModule(__require("./export-4MUQJ4DB.mjs")));
+  const { exportSlides } = await Promise.resolve().then(() => __toESM(__require("./export-RFCVIBYE.mjs")));
   const port = await findFreePort(12445);
   const options = await resolveOptions({ entry, theme }, "build");
+  output = output || options.data.config.exportFilename || `${path.basename(entry, ".md")}-export`;
   const server = await createServer(options, {
     server: { port },
     clearScreen: false
@@ -270,10 +270,11 @@ cli.command("export [entry]", "Export slides to PDF", (args) => commonOptions(ar
   await server.listen(port);
   printInfo(options);
   fs_exports.filterDisabled(options.data);
-  const width = 1920;
+  const width = options.data.config.canvasWidth;
   const height = Math.round(width / options.data.config.aspectRatio);
   output = await exportSlides({
     port,
+    slides: options.data.slides,
     total: options.data.slides.length,
     range,
     format,

package/dist/{export-XA3FQNS5.js → export-AKEY52VC.js}

@@ -1,21 +1,20 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkZ6YPUFV4js = require('./chunk-Z6YPUFV4.js');
+var _chunk2LNCAUCDjs = require('./chunk-2LNCAUCD.js');
 
 
 
 
-var _chunk7QXPSYEZjs = require('./chunk-7QXPSYEZ.js');
+var _chunkIXNT7VMKjs = require('./chunk-IXNT7VMK.js');
 
 // node/export.ts
-_chunk7QXPSYEZjs.init_cjs_shims.call(void 0, );
+_chunkIXNT7VMKjs.init_cjs_shims.call(void 0, );
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _fsextra = require('fs-extra'); var _fsextra2 = _interopRequireDefault(_fsextra);
-var _pdflib = require('pdf-lib');
 var _kolorist = require('kolorist');
 var _cliprogress = require('cli-progress');
 var _core = require('@slidev/parser/core');
-function createSlidevProgress() {
+function createSlidevProgress(indeterminate = false) {
   function getSpinner(n = 0) {
     return [_kolorist.cyan.call(void 0, "\u25CF"), _kolorist.green.call(void 0, "\u25C6"), _kolorist.blue.call(void 0, "\u25A0"), _kolorist.yellow.call(void 0, "\u25B2")][n % 4];
   }
@@ -25,7 +24,7 @@ function createSlidevProgress() {
   const progress = new (0, _cliprogress.SingleBar)({
     clearOnComplete: true,
     hideCursor: true,
-    format: `  {spin} ${_kolorist.yellow.call(void 0, "rendering")} {bar} {value}/{total}`,
+    format: `  {spin} ${_kolorist.yellow.call(void 0, "rendering")}${indeterminate ? _kolorist.dim.call(void 0, _kolorist.yellow.call(void 0, "...")) : " {bar} {value}/{total}"}`,
     linewrap: false,
     barsize: 30
   }, _cliprogress.Presets.shades_grey);
@@ -54,96 +53,102 @@ async function exportSlides({
   range,
   format = "pdf",
   output = "slides",
+  slides,
   base = "/",
-  timeout = 500,
+  timeout = 3e4,
   dark = false,
   routerMode = "history",
   width = 1920,
   height = 1080,
   withClicks = false
 }) {
-  if (!_chunkZ6YPUFV4js.packageExists.call(void 0, "playwright-chromium"))
+  if (!_chunk2LNCAUCDjs.packageExists.call(void 0, "playwright-chromium"))
     throw new Error("The exporting for Slidev is powered by Playwright, please installed it via `npm i -D playwright-chromium`");
-  const { chromium } = await Promise.resolve().then(() => _chunk7QXPSYEZjs.__toModule.call(void 0, _chunk7QXPSYEZjs.__require.call(void 0, "playwright-chromium")));
+  const pages = _core.parseRangeString.call(void 0, total, range);
+  const { chromium } = await Promise.resolve().then(() => _chunkIXNT7VMKjs.__toESM.call(void 0, _chunkIXNT7VMKjs.__require.call(void 0, "playwright-chromium")));
   const browser = await chromium.launch();
   const context = await browser.newContext({
     viewport: {
       width,
-      height
+      height: height * pages.length
     },
     deviceScaleFactor: 1
   });
   const page = await context.newPage();
-  const progress = createSlidevProgress();
+  const progress = createSlidevProgress(true);
   async function go(no, clicks) {
-    progress.update(no);
     const path2 = `${no}?print${withClicks ? "=clicks" : ""}${clicks ? `&clicks=${clicks}` : ""}`;
     const url = routerMode === "hash" ? `http://localhost:${port}${base}#${path2}` : `http://localhost:${port}${base}${path2}`;
     await page.goto(url, {
-      waitUntil: "networkidle"
+      waitUntil: "networkidle",
+      timeout
     });
-    await page.waitForTimeout(timeout);
     await page.waitForLoadState("networkidle");
     await page.emulateMedia({ colorScheme: dark ? "dark" : "light", media: "screen" });
+    const elements = await page.locator("[data-waitfor]");
+    const count = await elements.count();
+    for (let index = 0; index < count; index++) {
+      const element = await elements.nth(index);
+      const attribute = await element.getAttribute("data-waitfor");
+      if (attribute)
+        await element.locator(attribute).waitFor();
+    }
+    const frames = await page.frames();
+    await Promise.all(frames.map((frame) => frame.waitForLoadState()));
   }
-  function getClicks(url) {
-    var _a;
-    return (_a = url.match(/clicks=([1-9][0-9]*)/)) == null ? void 0 : _a[1];
+  async function genPagePdf() {
+    if (!output.endsWith(".pdf"))
+      output = `${output}.pdf`;
+    await go("print");
+    await page.pdf({
+      path: output,
+      width,
+      height,
+      margin: {
+        left: 0,
+        top: 0,
+        right: 0,
+        bottom: 0
+      },
+      printBackground: true,
+      preferCSSPageSize: true
+    });
   }
-  async function genPageWithClicks(fn, i, clicks) {
-    await fn(i, clicks);
-    if (withClicks) {
-      await page.keyboard.press("ArrowRight", { delay: 100 });
-      const _clicks = getClicks(page.url());
-      if (_clicks && clicks !== _clicks)
-        await genPageWithClicks(fn, i, _clicks);
+  async function genPagePng() {
+    await go("print");
+    const slides2 = await page.locator(".slide-container");
+    const count = await slides2.count();
+    for (let i = 0; i < count; i++) {
+      progress.update(i + 1);
+      const buffer = await slides2.nth(i).screenshot();
+      await _fsextra2.default.ensureDir(output);
+      await _fsextra2.default.writeFile(_path2.default.join(output, `${(i + 1).toString().padStart(2, "0")}.png`), buffer);
     }
   }
-  const pages = _core.parseRangeString.call(void 0, total, range);
+  async function genPageMd(pages2, slides2) {
+    var _a, _b, _c;
+    const mds = [];
+    for (const i of pages2) {
+      const mdImg = `![${(_a = slides2[i - 1]) == null ? void 0 : _a.title}](./${output}/${i.toString().padStart(2, "0")}.png)
+
+`;
+      const mdNote = ((_b = slides2[i - 1]) == null ? void 0 : _b.note) ? `${(_c = slides2[i - 1]) == null ? void 0 : _c.note}
+
+` : "";
+      mds.push(`${mdImg}${mdNote}`);
+    }
+    if (!output.endsWith(".md"))
+      output = `${output}.md`;
+    await _fsextra2.default.writeFile(output, mds.join(""));
+  }
   progress.start(pages.length);
   if (format === "pdf") {
-    const buffers = [];
-    const genPdfBuffer = async (i, clicks) => {
-      await go(i, clicks);
-      const pdf = await page.pdf({
-        width,
-        height,
-        margin: {
-          left: 0,
-          top: 0,
-          right: 0,
-          bottom: 0
-        },
-        pageRanges: "1",
-        printBackground: true,
-        preferCSSPageSize: true
-      });
-      buffers.push(pdf);
-    };
-    for (const i of pages)
-      await genPageWithClicks(genPdfBuffer, i);
-    const mergedPdf = await _pdflib.PDFDocument.create({});
-    for (const pdfBytes of buffers) {
-      const pdf = await _pdflib.PDFDocument.load(pdfBytes);
-      const copiedPages = await mergedPdf.copyPages(pdf, pdf.getPageIndices());
-      copiedPages.forEach((page2) => {
-        mergedPdf.addPage(page2);
-      });
-    }
-    const buffer = await mergedPdf.save();
-    if (!output.endsWith(".pdf"))
-      output = `${output}.pdf`;
-    await _fsextra2.default.writeFile(output, buffer);
+    await genPagePdf();
   } else if (format === "png") {
-    const genScreenshot = async (i, clicks) => {
-      await go(i, clicks);
-      await page.screenshot({
-        omitBackground: false,
-        path: _path2.default.join(output, `${i.toString().padStart(2, "0")}${clicks ? `-${clicks}` : ""}.png`)
-      });
-    };
-    for (const i of pages)
-      await genPageWithClicks(genScreenshot, i);
+    await genPagePng();
+  } else if (format === "md") {
+    await genPagePng();
+    await genPageMd(pages, slides);
   } else {
     throw new Error(`Unsupported exporting format "${format}"`);
   }

package/dist/{export-4MUQJ4DB.mjs → export-RFCVIBYE.mjs}

@@ -1,21 +1,20 @@
 import {
   packageExists
-} from "./chunk-XDEB4KBK.mjs";
+} from "./chunk-OII7IQD2.mjs";
 import {
   __require,
-  __toModule,
+  __toESM,
   init_esm_shims
-} from "./chunk-VYBQLH2X.mjs";
+} from "./chunk-XMETW2MS.mjs";
 
 // node/export.ts
 init_esm_shims();
 import path from "path";
 import fs from "fs-extra";
-import { PDFDocument } from "pdf-lib";
-import { blue, cyan, green, yellow } from "kolorist";
+import { blue, cyan, dim, green, yellow } from "kolorist";
 import { Presets, SingleBar } from "cli-progress";
 import { parseRangeString } from "@slidev/parser/core";
-function createSlidevProgress() {
+function createSlidevProgress(indeterminate = false) {
   function getSpinner(n = 0) {
     return [cyan("\u25CF"), green("\u25C6"), blue("\u25A0"), yellow("\u25B2")][n % 4];
   }
@@ -25,7 +24,7 @@ function createSlidevProgress() {
   const progress = new SingleBar({
     clearOnComplete: true,
     hideCursor: true,
-    format: `  {spin} ${yellow("rendering")} {bar} {value}/{total}`,
+    format: `  {spin} ${yellow("rendering")}${indeterminate ? dim(yellow("...")) : " {bar} {value}/{total}"}`,
     linewrap: false,
     barsize: 30
   }, Presets.shades_grey);
@@ -54,8 +53,9 @@ async function exportSlides({
   range,
   format = "pdf",
   output = "slides",
+  slides,
   base = "/",
-  timeout = 500,
+  timeout = 3e4,
   dark = false,
   routerMode = "history",
   width = 1920,
@@ -64,86 +64,91 @@ async function exportSlides({
 }) {
   if (!packageExists("playwright-chromium"))
     throw new Error("The exporting for Slidev is powered by Playwright, please installed it via `npm i -D playwright-chromium`");
-  const { chromium } = await Promise.resolve().then(() => __toModule(__require("playwright-chromium")));
+  const pages = parseRangeString(total, range);
+  const { chromium } = await Promise.resolve().then(() => __toESM(__require("playwright-chromium")));
   const browser = await chromium.launch();
   const context = await browser.newContext({
     viewport: {
       width,
-      height
+      height: height * pages.length
     },
     deviceScaleFactor: 1
   });
   const page = await context.newPage();
-  const progress = createSlidevProgress();
+  const progress = createSlidevProgress(true);
   async function go(no, clicks) {
-    progress.update(no);
     const path2 = `${no}?print${withClicks ? "=clicks" : ""}${clicks ? `&clicks=${clicks}` : ""}`;
     const url = routerMode === "hash" ? `http://localhost:${port}${base}#${path2}` : `http://localhost:${port}${base}${path2}`;
     await page.goto(url, {
-      waitUntil: "networkidle"
+      waitUntil: "networkidle",
+      timeout
     });
-    await page.waitForTimeout(timeout);
     await page.waitForLoadState("networkidle");
     await page.emulateMedia({ colorScheme: dark ? "dark" : "light", media: "screen" });
+    const elements = await page.locator("[data-waitfor]");
+    const count = await elements.count();
+    for (let index = 0; index < count; index++) {
+      const element = await elements.nth(index);
+      const attribute = await element.getAttribute("data-waitfor");
+      if (attribute)
+        await element.locator(attribute).waitFor();
+    }
+    const frames = await page.frames();
+    await Promise.all(frames.map((frame) => frame.waitForLoadState()));
   }
-  function getClicks(url) {
-    var _a;
-    return (_a = url.match(/clicks=([1-9][0-9]*)/)) == null ? void 0 : _a[1];
+  async function genPagePdf() {
+    if (!output.endsWith(".pdf"))
+      output = `${output}.pdf`;
+    await go("print");
+    await page.pdf({
+      path: output,
+      width,
+      height,
+      margin: {
+        left: 0,
+        top: 0,
+        right: 0,
+        bottom: 0
+      },
+      printBackground: true,
+      preferCSSPageSize: true
+    });
   }
-  async function genPageWithClicks(fn, i, clicks) {
-    await fn(i, clicks);
-    if (withClicks) {
-      await page.keyboard.press("ArrowRight", { delay: 100 });
-      const _clicks = getClicks(page.url());
-      if (_clicks && clicks !== _clicks)
-        await genPageWithClicks(fn, i, _clicks);
+  async function genPagePng() {
+    await go("print");
+    const slides2 = await page.locator(".slide-container");
+    const count = await slides2.count();
+    for (let i = 0; i < count; i++) {
+      progress.update(i + 1);
+      const buffer = await slides2.nth(i).screenshot();
+      await fs.ensureDir(output);
+      await fs.writeFile(path.join(output, `${(i + 1).toString().padStart(2, "0")}.png`), buffer);
     }
   }
-  const pages = parseRangeString(total, range);
+  async function genPageMd(pages2, slides2) {
+    var _a, _b, _c;
+    const mds = [];
+    for (const i of pages2) {
+      const mdImg = `![${(_a = slides2[i - 1]) == null ? void 0 : _a.title}](./${output}/${i.toString().padStart(2, "0")}.png)
+
+`;
+      const mdNote = ((_b = slides2[i - 1]) == null ? void 0 : _b.note) ? `${(_c = slides2[i - 1]) == null ? void 0 : _c.note}
+
+` : "";
+      mds.push(`${mdImg}${mdNote}`);
+    }
+    if (!output.endsWith(".md"))
+      output = `${output}.md`;
+    await fs.writeFile(output, mds.join(""));
+  }
   progress.start(pages.length);
   if (format === "pdf") {
-    const buffers = [];
-    const genPdfBuffer = async (i, clicks) => {
-      await go(i, clicks);
-      const pdf = await page.pdf({
-        width,
-        height,
-        margin: {
-          left: 0,
-          top: 0,
-          right: 0,
-          bottom: 0
-        },
-        pageRanges: "1",
-        printBackground: true,
-        preferCSSPageSize: true
-      });
-      buffers.push(pdf);
-    };
-    for (const i of pages)
-      await genPageWithClicks(genPdfBuffer, i);
-    const mergedPdf = await PDFDocument.create({});
-    for (const pdfBytes of buffers) {
-      const pdf = await PDFDocument.load(pdfBytes);
-      const copiedPages = await mergedPdf.copyPages(pdf, pdf.getPageIndices());
-      copiedPages.forEach((page2) => {
-        mergedPdf.addPage(page2);
-      });
-    }
-    const buffer = await mergedPdf.save();
-    if (!output.endsWith(".pdf"))
-      output = `${output}.pdf`;
-    await fs.writeFile(output, buffer);
+    await genPagePdf();
   } else if (format === "png") {
-    const genScreenshot = async (i, clicks) => {
-      await go(i, clicks);
-      await page.screenshot({
-        omitBackground: false,
-        path: path.join(output, `${i.toString().padStart(2, "0")}${clicks ? `-${clicks}` : ""}.png`)
-      });
-    };
-    for (const i of pages)
-      await genPageWithClicks(genScreenshot, i);
+    await genPagePng();
+  } else if (format === "md") {
+    await genPagePng();
+    await genPageMd(pages, slides);
   } else {
     throw new Error(`Unsupported exporting format "${format}"`);
   }