@slidev/cli 0.32.2 → 0.33.0

package/bin/slidev.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 'use strict'
-/* eslint-disable @typescript-eslint/no-var-requires */
+
 const path = require('path')
 const resolveFrom = require('resolve-from')
 

package/dist/{build-M2QTEV63.js → build-JMQRM5SA.js}

@@ -1,16 +1,17 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); 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 _chunkIW3TSLZFjs = require('./chunk-IW3TSLZF.js');
 
+var _chunkUNBXPUSGjs = require('./chunk-UNBXPUSG.js');
 
 
 
 
-var _chunkJWGORJY6js = require('./chunk-JWGORJY6.js');
+
+var _chunkFFZLS6QKjs = require('./chunk-FFZLS6QK.js');
 
 // node/build.ts
-_chunkJWGORJY6js.init_cjs_shims.call(void 0, );
+_chunkFFZLS6QKjs.init_cjs_shims.call(void 0, );
 var _path = require('path');
 var _http = require('http'); var _http2 = _interopRequireDefault(_http);
 var _fsextra = require('fs-extra'); var _fsextra2 = _interopRequireDefault(_fsextra);
@@ -18,12 +19,12 @@ var _vite = require('vite');
 var _connect = require('connect'); var _connect2 = _interopRequireDefault(_connect);
 
 // ../../node_modules/.pnpm/sirv@2.0.2/node_modules/sirv/build.mjs
-_chunkJWGORJY6js.init_cjs_shims.call(void 0, );
+_chunkFFZLS6QKjs.init_cjs_shims.call(void 0, );
 var _fs = require('fs'); var fs = _interopRequireWildcard(_fs);
 
 
 // ../../node_modules/.pnpm/totalist@3.0.0/node_modules/totalist/sync/index.mjs
-_chunkJWGORJY6js.init_cjs_shims.call(void 0, );
+_chunkFFZLS6QKjs.init_cjs_shims.call(void 0, );
 
 
 function totalist(dir, callback, pre = "") {
@@ -38,7 +39,7 @@ function totalist(dir, callback, pre = "") {
 }
 
 // ../../node_modules/.pnpm/@polka+url@1.0.0-next.21/node_modules/@polka/url/build.mjs
-_chunkJWGORJY6js.init_cjs_shims.call(void 0, );
+_chunkFFZLS6QKjs.init_cjs_shims.call(void 0, );
 var _querystring = require('querystring'); var qs = _interopRequireWildcard(_querystring);
 function parse2(req) {
   let raw = req.url;
@@ -62,7 +63,7 @@ function parse2(req) {
 }
 
 // ../../node_modules/.pnpm/mrmime@1.0.0/node_modules/mrmime/index.mjs
-_chunkJWGORJY6js.init_cjs_shims.call(void 0, );
+_chunkFFZLS6QKjs.init_cjs_shims.call(void 0, );
 var mimes = {
   "ez": "application/andrew-inset",
   "aw": "application/applixware",
@@ -527,7 +528,7 @@ function is404(req, res) {
 }
 function send(req, res, file, stats, headers) {
   let code = 200, tmp, opts = {};
-  headers = _chunkJWGORJY6js.__spreadValues.call(void 0, {}, headers);
+  headers = _chunkFFZLS6QKjs.__spreadValues.call(void 0, {}, headers);
   for (let key in headers) {
     tmp = res.getHeader(key);
     if (tmp)
@@ -655,13 +656,13 @@ async function build(options, viteConfig = {}) {
   let originalIndexHTML;
   if (_fsextra2.default.existsSync(indexPath))
     originalIndexHTML = await _fsextra2.default.readFile(indexPath, "utf-8");
-  await _fsextra2.default.writeFile(indexPath, await _chunkIW3TSLZFjs.getIndexHtml.call(void 0, options), "utf-8");
+  await _fsextra2.default.writeFile(indexPath, await _chunkUNBXPUSGjs.getIndexHtml.call(void 0, options), "utf-8");
   let config = void 0;
   try {
-    const inlineConfig = _vite.mergeConfig.call(void 0, viteConfig, {
+    const inlineConfig = await _chunkUNBXPUSGjs.mergeViteConfigs.call(void 0, options, viteConfig, {
       root: options.userRoot,
       plugins: [
-        await _chunkIW3TSLZFjs.ViteSlidevPlugin.call(void 0, options, pluginOptions),
+        await _chunkUNBXPUSGjs.ViteSlidevPlugin.call(void 0, options, pluginOptions),
         {
           name: "resolve-config",
           configResolved(_config) {
@@ -672,14 +673,14 @@ async function build(options, viteConfig = {}) {
       build: {
         chunkSizeWarningLimit: 2e3
       }
-    });
+    }, "build");
     await _vite.build.call(void 0, inlineConfig);
     if (options.data.features.monaco) {
       if (options.data.config.monaco === "dev") {
         console.log(_kolorist.yellow.call(void 0, "  Monaco is disabled in the build, to enabled it, set `monaco: true` in the frontmatter"));
       } else {
         console.log(_kolorist.blue.call(void 0, "  building for Monaco...\n"));
-        await _vite.build.call(void 0, _vite.mergeConfig.call(void 0, inlineConfig, {
+        await _vite.build.call(void 0, await _chunkUNBXPUSGjs.mergeViteConfigs.call(void 0, options, inlineConfig, {
           root: _path.join.call(void 0, options.clientRoot, "iframes/monaco"),
           base: `${config.base}iframes/monaco/`,
           build: {
@@ -696,7 +697,7 @@ async function build(options, viteConfig = {}) {
               }
             }
           }
-        }));
+        }, "build"));
       }
     }
   } finally {
@@ -713,7 +714,7 @@ async function build(options, viteConfig = {}) {
     await _fsextra2.default.writeFile(redirectsPath, `${config.base}*    ${config.base}index.html   200
 `, "utf-8");
   if ([true, "true", "auto"].includes(options.data.config.download)) {
-    const { exportSlides } = await Promise.resolve().then(() => _chunkJWGORJY6js.__toESM.call(void 0, _chunkJWGORJY6js.__require.call(void 0, "./export-M6HJUIFY.js")));
+    const { exportSlides } = await Promise.resolve().then(() => _chunkFFZLS6QKjs.__toESM.call(void 0, _chunkFFZLS6QKjs.__require.call(void 0, "./export-LOKLMK66.js")));
     const port = 12445;
     const app = _connect2.default.call(void 0, );
     const server = _http2.default.createServer(app);
@@ -725,13 +726,14 @@ async function build(options, viteConfig = {}) {
     server.listen(port);
     await exportSlides({
       port,
+      slides: options.data.slides,
       total: options.data.slides.length,
       format: "pdf",
       output: _path.join.call(void 0, outDir, outFilename),
       base: config.base,
       dark: options.data.config.colorSchema === "dark",
-      width: 1920,
-      height: Math.round(1920 / options.data.config.aspectRatio),
+      width: options.data.config.canvasWidth,
+      height: Math.round(options.data.config.canvasWidth / options.data.config.aspectRatio),
       routerMode: options.data.config.routerMode
     });
     server.close();

package/dist/{build-YVXTTUTD.mjs → build-P4Q57V2J.mjs}

@@ -1,20 +1,21 @@
 import {
   ViteSlidevPlugin,
-  getIndexHtml
-} from "./chunk-WZ6OPJJF.mjs";
+  getIndexHtml,
+  mergeViteConfigs
+} from "./chunk-C7GPMAIX.mjs";
 import {
   __require,
   __spreadValues,
   __toESM,
   init_esm_shims
-} from "./chunk-NOFZO6W4.mjs";
+} from "./chunk-ZWCVPYOA.mjs";
 
 // node/build.ts
 init_esm_shims();
 import { join as join3, resolve as resolve3 } from "path";
 import http from "http";
 import fs2 from "fs-extra";
-import { mergeConfig, resolveConfig, build as viteBuild } from "vite";
+import { resolveConfig, build as viteBuild } from "vite";
 import connect from "connect";
 
 // ../../node_modules/.pnpm/sirv@2.0.2/node_modules/sirv/build.mjs
@@ -658,7 +659,7 @@ async function build(options, viteConfig = {}) {
   await fs2.writeFile(indexPath, await getIndexHtml(options), "utf-8");
   let config = void 0;
   try {
-    const inlineConfig = mergeConfig(viteConfig, {
+    const inlineConfig = await mergeViteConfigs(options, viteConfig, {
       root: options.userRoot,
       plugins: [
         await ViteSlidevPlugin(options, pluginOptions),
@@ -672,14 +673,14 @@ async function build(options, viteConfig = {}) {
       build: {
         chunkSizeWarningLimit: 2e3
       }
-    });
+    }, "build");
     await viteBuild(inlineConfig);
     if (options.data.features.monaco) {
       if (options.data.config.monaco === "dev") {
         console.log(yellow("  Monaco is disabled in the build, to enabled it, set `monaco: true` in the frontmatter"));
       } else {
         console.log(blue("  building for Monaco...\n"));
-        await viteBuild(mergeConfig(inlineConfig, {
+        await viteBuild(await mergeViteConfigs(options, inlineConfig, {
           root: join3(options.clientRoot, "iframes/monaco"),
           base: `${config.base}iframes/monaco/`,
           build: {
@@ -696,7 +697,7 @@ async function build(options, viteConfig = {}) {
               }
             }
           }
-        }));
+        }, "build"));
       }
     }
   } finally {
@@ -713,7 +714,7 @@ async function build(options, viteConfig = {}) {
     await fs2.writeFile(redirectsPath, `${config.base}*    ${config.base}index.html   200
 `, "utf-8");
   if ([true, "true", "auto"].includes(options.data.config.download)) {
-    const { exportSlides } = await Promise.resolve().then(() => __toESM(__require("./export-GIPHUNUX.mjs")));
+    const { exportSlides } = await Promise.resolve().then(() => __toESM(__require("./export-5R6FV775.mjs")));
     const port = 12445;
     const app = connect();
     const server = http.createServer(app);
@@ -725,13 +726,14 @@ async function build(options, viteConfig = {}) {
     server.listen(port);
     await exportSlides({
       port,
+      slides: options.data.slides,
       total: options.data.slides.length,
       format: "pdf",
       output: join3(outDir, outFilename),
       base: config.base,
       dark: options.data.config.colorSchema === "dark",
-      width: 1920,
-      height: Math.round(1920 / options.data.config.aspectRatio),
+      width: options.data.config.canvasWidth,
+      height: Math.round(options.data.config.canvasWidth / options.data.config.aspectRatio),
       routerMode: options.data.config.routerMode
     });
     server.close();

package/dist/{chunk-WZ6OPJJF.mjs → chunk-C7GPMAIX.mjs}

@@ -11,7 +11,7 @@ import {
   resolveImportPath,
   stringifyMarkdownTokens,
   toAtFS
-} from "./chunk-NOFZO6W4.mjs";
+} from "./chunk-ZWCVPYOA.mjs";
 
 // ../../node_modules/.pnpm/fast-deep-equal@3.1.3/node_modules/fast-deep-equal/index.js
 var require_fast_deep_equal = __commonJS({
@@ -64,6 +64,7 @@ init_esm_shims();
 import { existsSync, promises as fs } from "fs";
 import { join } from "path";
 import { uniq } from "@antfu/utils";
+import { loadConfigFromFile, mergeConfig } from "vite";
 async function getIndexHtml({ clientRoot, themeRoots, data, userRoot }) {
   var _a, _b;
   let main = await fs.readFile(join(clientRoot, "index.html"), "utf-8");
@@ -92,6 +93,25 @@ ${(((_b = index.match(/<body>([\s\S]*?)<\/body>/im)) == null ? void 0 : _b[1]) |
   main = main.replace("__ENTRY__", toAtFS(join(clientRoot, "main.ts"))).replace("<!-- head -->", head).replace("<!-- body -->", body);
   return main;
 }
+async function mergeViteConfigs({ addonRoots, themeRoots }, viteConfig, config, command) {
+  const configEnv = {
+    mode: "development",
+    command
+  };
+  const files = uniq([
+    ...themeRoots,
+    ...addonRoots
+  ]).map((i) => join(i, "vite.config.ts"));
+  for await (const file of files) {
+    if (!existsSync(file))
+      continue;
+    const viteConfig2 = await loadConfigFromFile(configEnv, file);
+    if (!(viteConfig2 == null ? void 0 : viteConfig2.config))
+      continue;
+    config = mergeConfig(config, viteConfig2.config);
+  }
+  return mergeConfig(viteConfig, config);
+}
 
 // node/plugins/windicss.ts
 init_esm_shims();
@@ -165,12 +185,12 @@ async function createWindiCSSPlugin({ themeRoots, addonRoots, clientRoot, userRo
     },
     onOptionsResolved(config2) {
       themeRoots.forEach((i) => {
-        config2.scanOptions.include.push(`${i}/components/*.{vue,ts}`);
-        config2.scanOptions.include.push(`${i}/layouts/*.{vue,ts}`);
+        config2.scanOptions.include.push(`${i}/components/**/*.{vue,ts}`);
+        config2.scanOptions.include.push(`${i}/layouts/**/*.{vue,ts}`);
       });
       addonRoots.forEach((i) => {
-        config2.scanOptions.include.push(`${i}/components/*.{vue,ts}`);
-        config2.scanOptions.include.push(`${i}/layouts/*.{vue,ts}`);
+        config2.scanOptions.include.push(`${i}/components/**/*.{vue,ts}`);
+        config2.scanOptions.include.push(`${i}/layouts/**/*.{vue,ts}`);
       });
       config2.scanOptions.include.push(`!${slash(resolve2(userRoot, "node_modules"))}`);
       config2.scanOptions.exclude.push(dirname(resolveImportPath("monaco-editor/package.json", true)));
@@ -239,7 +259,7 @@ ${value}
 // node/plugins/extendConfig.ts
 init_esm_shims();
 import { dirname as dirname4, join as join4 } from "path";
-import { mergeConfig } from "vite";
+import { mergeConfig as mergeConfig2 } from "vite";
 import isInstalledGlobally from "is-installed-globally";
 import { uniq as uniq3 } from "@antfu/utils";
 
@@ -248,10 +268,10 @@ var dependencies = {
   "@antfu/utils": "^0.5.2",
   "@slidev/parser": "workspace:*",
   "@slidev/types": "workspace:*",
-  "@vueuse/core": "^8.5.0",
+  "@vueuse/core": "^8.6.0",
   "@vueuse/head": "^0.7.6",
   "@vueuse/motion": "^2.0.0-beta.18",
-  codemirror: "^5.65.4",
+  codemirror: "^5.65.5",
   defu: "^6.0.0",
   drauu: "^0.3.0",
   "file-saver": "^2.0.5",
@@ -265,9 +285,9 @@ var dependencies = {
   recordrtc: "^5.6.2",
   resolve: "^1.22.0",
   "vite-plugin-windicss": "^1.8.4",
-  vue: "^3.2.35",
+  vue: "^3.2.36",
   "vue-router": "^4.0.15",
-  "vue-starport": "^0.2.10",
+  "vue-starport": "^0.2.11",
   windicss: "^3.5.4"
 };
 
@@ -370,7 +390,7 @@ function createConfigPlugin(options) {
         injection.root = options.cliRoot;
         injection.resolve.alias.vue = `${resolveImportPath("vue/dist/vue.esm-browser.js", true)}`;
       }
-      return mergeConfig(config, injection);
+      return mergeConfig2(config, injection);
     },
     configureServer(server) {
       return () => {
@@ -734,7 +754,7 @@ defineProps<{ no: number | string }>()`);
       clientRoot
     ]);
     for (const root of roots2) {
-      const layoutPaths = await fg2("layouts/*.{vue,ts}", {
+      const layoutPaths = await fg2("layouts/**/*.{vue,ts}", {
         cwd: root,
         absolute: true
       });
@@ -807,16 +827,11 @@ ${Object.entries(layouts).map(([k, v]) => `"${k}": ${v}`).join(",\n")}
           return void 0;
         imports.push(`import n${no} from '${slidePrefix}${idx + 1}.md'`);
         const additions = {
-          slide: {
-            start: i.start,
-            end: i.end,
-            note: i.note,
+          slide: __spreadProps(__spreadValues({}, prepareSlideInfo(i)), {
             filepath: ((_b = i.source) == null ? void 0 : _b.filepath) || entry,
             id: idx,
-            no,
-            title: i.title,
-            level: i.level
-          },
+            no
+          }),
           __clicksElements: [],
           __preloaded: false
         };
@@ -1550,6 +1565,7 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
 
 export {
   getIndexHtml,
+  mergeViteConfigs,
   require_fast_deep_equal,
   createWindiCSSPlugin,
   ViteSlidevPlugin

package/dist/{chunk-JWGORJY6.js → chunk-FFZLS6QK.js}

@@ -84,9 +84,9 @@ var __privateWrapper = (obj, member, setter, getter) => {
   };
 };
 
-// ../../node_modules/.pnpm/tsup@5.12.5_typescript@4.6.4/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@5.12.9_typescript@4.7.2/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@5.12.5_typescript@4.6.4/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@5.12.9_typescript@4.7.2/node_modules/tsup/assets/cjs_shims.js"() {
   }
 });