@slidev/cli 0.29.1 → 0.30.1

package/dist/{export-7OOFII75.js → export-X3EA2DO6.js}

@@ -1,21 +1,20 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkNLYVEPP6js = require('./chunk-NLYVEPP6.js');
+var _chunk3GNNQ2GUjs = require('./chunk-3GNNQ2GU.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 (!_chunkNLYVEPP6js.packageExists.call(void 0, "playwright-chromium"))
+  if (!_chunk3GNNQ2GUjs.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/index.js

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk5BL2KALHjs = require('./chunk-5BL2KALH.js');
+var _chunkHBDQZUZKjs = require('./chunk-HBDQZUZK.js');
 
 
 
@@ -9,20 +9,20 @@ var _chunk5BL2KALHjs = require('./chunk-5BL2KALH.js');
 
 
 
-var _chunkNLYVEPP6js = require('./chunk-NLYVEPP6.js');
+var _chunk3GNNQ2GUjs = require('./chunk-3GNNQ2GU.js');
 
 
 
-var _chunk7F2QYO53js = require('./chunk-7F2QYO53.js');
+var _chunk7FQD47HMjs = require('./chunk-7FQD47HM.js');
 
 
-var _chunk7QXPSYEZjs = require('./chunk-7QXPSYEZ.js');
+var _chunkIXNT7VMKjs = require('./chunk-IXNT7VMK.js');
 
 // node/index.ts
-_chunk7QXPSYEZjs.init_cjs_shims.call(void 0, );
+_chunkIXNT7VMKjs.init_cjs_shims.call(void 0, );
 
 // node/declare.ts
-_chunk7QXPSYEZjs.init_cjs_shims.call(void 0, );
+_chunkIXNT7VMKjs.init_cjs_shims.call(void 0, );
 
 
 
@@ -34,4 +34,4 @@ _chunk7QXPSYEZjs.init_cjs_shims.call(void 0, );
 
 
 
-exports.ViteSlidevPlugin = _chunk7F2QYO53js.ViteSlidevPlugin; exports.createServer = _chunk5BL2KALHjs.createServer; exports.createWindiCSSPlugin = _chunk7F2QYO53js.createWindiCSSPlugin; exports.getCLIRoot = _chunkNLYVEPP6js.getCLIRoot; exports.getClientRoot = _chunkNLYVEPP6js.getClientRoot; exports.getThemeRoots = _chunkNLYVEPP6js.getThemeRoots; exports.getUserRoot = _chunkNLYVEPP6js.getUserRoot; exports.isPath = _chunkNLYVEPP6js.isPath; exports.parser = _chunkNLYVEPP6js.fs_exports; exports.resolveOptions = _chunkNLYVEPP6js.resolveOptions;
+exports.ViteSlidevPlugin = _chunk7FQD47HMjs.ViteSlidevPlugin; exports.createServer = _chunkHBDQZUZKjs.createServer; exports.createWindiCSSPlugin = _chunk7FQD47HMjs.createWindiCSSPlugin; exports.getCLIRoot = _chunk3GNNQ2GUjs.getCLIRoot; exports.getClientRoot = _chunk3GNNQ2GUjs.getClientRoot; exports.getThemeRoots = _chunk3GNNQ2GUjs.getThemeRoots; exports.getUserRoot = _chunk3GNNQ2GUjs.getUserRoot; exports.isPath = _chunk3GNNQ2GUjs.isPath; exports.parser = _chunk3GNNQ2GUjs.fs_exports; exports.resolveOptions = _chunk3GNNQ2GUjs.resolveOptions;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import {
   createServer
-} from "./chunk-G22DGVU7.mjs";
+} from "./chunk-46RYGQQC.mjs";
 import {
   fs_exports,
   getCLIRoot,
@@ -9,14 +9,14 @@ import {
   getUserRoot,
   isPath,
   resolveOptions
-} from "./chunk-OJT6Z67R.mjs";
+} from "./chunk-HJCTB5CG.mjs";
 import {
   ViteSlidevPlugin,
   createWindiCSSPlugin
-} from "./chunk-UEIFQWPY.mjs";
+} from "./chunk-4AVLCCHB.mjs";
 import {
   init_esm_shims
-} from "./chunk-VYBQLH2X.mjs";
+} from "./chunk-XMETW2MS.mjs";
 
 // node/index.ts
 init_esm_shims();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/cli",
-  "version": "0.29.1",
+  "version": "0.30.1",
   "description": "Presentation slides for developers",
   "homepage": "https://sli.dev",
   "bugs": "https://github.com/slidevjs/slidev/issues",
@@ -39,14 +39,14 @@
     }
   },
   "dependencies": {
-    "@antfu/utils": "^0.5.0",
-    "@iconify-json/carbon": "^1.1.2",
+    "@antfu/utils": "^0.5.1",
+    "@iconify-json/carbon": "^1.1.3",
     "@iconify-json/ph": "^1.1.1",
-    "@slidev/client": "0.29.1",
-    "@slidev/parser": "0.29.1",
-    "@slidev/types": "0.29.1",
-    "@vitejs/plugin-vue": "^2.2.4",
-    "@vue/compiler-sfc": "^3.2.31",
+    "@slidev/client": "0.30.1",
+    "@slidev/parser": "0.30.1",
+    "@slidev/types": "0.30.1",
+    "@vitejs/plugin-vue": "^2.3.1",
+    "@vue/compiler-sfc": "^3.2.32",
     "cli-progress": "^3.10.0",
     "codemirror": "^5.65.2",
     "connect": "^3.7.0",
@@ -64,9 +64,8 @@
     "markdown-it-footnote": "^3.0.3",
     "markdown-it-link-attributes": "^4.0.0",
     "monaco-editor": "^0.33.0",
-    "nanoid": "^3.3.1",
+    "nanoid": "^3.3.2",
     "open": "^8.4.0",
-    "pdf-lib": "^1.17.1",
     "plantuml-encoder": "^1.4.0",
     "prismjs": "^1.27.0",
     "prompts": "^2.4.2",
@@ -74,21 +73,21 @@
     "resolve-from": "^5.0.0",
     "resolve-global": "^1.0.0",
     "shiki": "^0.10.1",
-    "unplugin-icons": "^0.14.0",
-    "unplugin-vue-components": "^0.18.3",
-    "vite": "^2.8.6",
-    "vite-plugin-md": "^0.12.3",
+    "unplugin-icons": "^0.14.1",
+    "unplugin-vue-components": "^0.19.2",
+    "vite": "^2.9.1",
+    "vite-plugin-md": "^0.12.4",
     "vite-plugin-remote-assets": "^0.2.2",
     "vite-plugin-vue-server-ref": "^0.2.4",
-    "vite-plugin-windicss": "^1.8.3",
-    "vue": "^3.2.31",
+    "vite-plugin-windicss": "^1.8.4",
+    "vue": "^3.2.32",
     "windicss": "^3.5.1",
-    "yargs": "^17.4.0"
+    "yargs": "^17.4.1"
   },
   "devDependencies": {
     "@types/plantuml-encoder": "^1.4.0",
     "fast-deep-equal": "^3.1.3",
-    "semver": "^7.3.5",
+    "semver": "^7.3.7",
     "sirv": "^2.0.2"
   },
   "engines": {