@slidev/cli 0.33.1 → 0.34.2

package/dist/{chunk-DGFMEJWT.mjs → chunk-4NHF5SPM.mjs}

@@ -2,8 +2,6 @@ import {
   __commonJS,
   __filename,
   __require,
-  __spreadProps,
-  __spreadValues,
   __toESM,
   generateGoogleFontsUrl,
   init_esm_shims,
@@ -11,7 +9,7 @@ import {
   resolveImportPath,
   stringifyMarkdownTokens,
   toAtFS
-} from "./chunk-IWKTUAXD.mjs";
+} from "./chunk-GVA336JI.mjs";
 
 // ../../node_modules/.pnpm/fast-deep-equal@3.1.3/node_modules/fast-deep-equal/index.js
 var require_fast_deep_equal = __commonJS({
@@ -118,7 +116,6 @@ init_esm_shims();
 import { dirname, resolve as resolve2 } from "path";
 import { existsSync as existsSync3 } from "fs";
 import { slash, uniq as uniq2 } from "@antfu/utils";
-import WindiCSS, { defaultConfigureFiles } from "vite-plugin-windicss";
 import jiti2 from "jiti";
 
 // node/plugins/setupNode.ts
@@ -128,7 +125,7 @@ import { existsSync as existsSync2 } from "fs-extra";
 import { isObject } from "@antfu/utils";
 import jiti from "jiti";
 function deepMerge(a, b, rootPath = "") {
-  a = __spreadValues({}, a);
+  a = { ...a };
   Object.keys(b).forEach((key) => {
     if (isObject(a[key]))
       a[key] = deepMerge(a[key], b[key], rootPath ? `${rootPath}.${key}` : key);
@@ -156,6 +153,7 @@ async function loadSetups(roots, name, arg, initial, merge = true) {
 
 // node/plugins/windicss.ts
 async function createWindiCSSPlugin({ themeRoots, addonRoots, clientRoot, userRoot, roots, data }, { windicss: windiOptions }) {
+  const { default: WindiCSS, defaultConfigureFiles } = await Promise.resolve().then(() => __toESM(__require("vite-plugin-windicss")));
   const configFiles = uniq2([
     ...defaultConfigureFiles.map((i) => resolve2(userRoot, i)),
     ...themeRoots.map((i) => `${i}/windi.config.ts`),
@@ -167,7 +165,7 @@ async function createWindiCSSPlugin({ themeRoots, addonRoots, clientRoot, userRo
   if (config.default)
     config = config.default;
   config = await loadSetups(roots, "windicss.ts", {}, config, true);
-  return WindiCSS(__spreadValues({
+  return WindiCSS({
     configFiles: [configFile],
     config,
     onConfigResolved(config2) {
@@ -196,12 +194,14 @@ async function createWindiCSSPlugin({ themeRoots, addonRoots, clientRoot, userRo
       config2.scanOptions.exclude.push(dirname(resolveImportPath("monaco-editor/package.json", true)));
       config2.scanOptions.exclude.push(dirname(resolveImportPath("katex/package.json", true)));
       config2.scanOptions.exclude.push(dirname(resolveImportPath("prettier/package.json", true)));
-    }
-  }, windiOptions));
+    },
+    ...windiOptions
+  });
 }
 
 // node/plugins/preset.ts
 init_esm_shims();
+import { join as join8 } from "path";
 import Vue from "@vitejs/plugin-vue";
 import Icons from "unplugin-icons/vite";
 import IconsResolver from "unplugin-icons/resolver";
@@ -268,7 +268,8 @@ var dependencies = {
   "@antfu/utils": "^0.5.2",
   "@slidev/parser": "workspace:*",
   "@slidev/types": "workspace:*",
-  "@vueuse/core": "^8.7.4",
+  "@unocss/reset": "^0.42.0",
+  "@vueuse/core": "^8.7.5",
   "@vueuse/head": "^0.7.6",
   "@vueuse/motion": "^2.0.0-beta.18",
   codemirror: "^5.65.5",
@@ -278,17 +279,18 @@ var dependencies = {
   "js-base64": "^3.7.2",
   "js-yaml": "^4.1.0",
   katex: "^0.16.0",
-  mermaid: "^9.1.2",
+  mermaid: "^9.1.3",
   "monaco-editor": "^0.33.0",
   nanoid: "^4.0.0",
   prettier: "^2.7.1",
   recordrtc: "^5.6.2",
   resolve: "^1.22.1",
-  "vite-plugin-windicss": "^1.8.4",
-  vue: "^3.2.36",
+  unocss: "^0.42.0",
+  "vite-plugin-windicss": "^1.8.6",
+  vue: "^3.2.37",
   "vue-router": "^4.0.16",
   "vue-starport": "^0.3.0",
-  windicss: "^3.5.4"
+  windicss: "^3.5.5"
 };
 
 // node/vite/searchRoot.ts
@@ -340,6 +342,8 @@ var EXCLUDE = [
   "@slidev/types",
   "@vueuse/core",
   "@vueuse/shared",
+  "@unocss/reset",
+  "unocss",
   "mermaid",
   "vite-plugin-windicss",
   "vue-demi"
@@ -347,7 +351,7 @@ var EXCLUDE = [
 function createConfigPlugin(options) {
   return {
     name: "slidev:config",
-    config(config) {
+    async config(config) {
       const injection = {
         define: getDefine(options),
         resolve: {
@@ -373,6 +377,13 @@ function createConfigPlugin(options) {
           ],
           exclude: EXCLUDE
         },
+        css: options.data.config.css === "unocss" ? {
+          postcss: {
+            plugins: [
+              await Promise.resolve().then(() => __toESM(__require("postcss-nested"))).then((r) => r.default())
+            ]
+          }
+        } : {},
         server: {
           fs: {
             strict: true,
@@ -431,13 +442,13 @@ import * as parser from "@slidev/parser/fs";
 var regexId = /^\/\@slidev\/slide\/(\d+)\.(md|json)(?:\?import)?$/;
 var regexIdQuery = /(\d+?)\.(md|json)$/;
 function getBodyJson(req) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     let body = "";
     req.on("data", (chunk) => body += chunk);
     req.on("error", reject);
     req.on("end", () => {
       try {
-        resolve5(JSON.parse(body) || {});
+        resolve6(JSON.parse(body) || {});
       } catch (e) {
         reject(e);
       }
@@ -452,9 +463,10 @@ md.use(mila, {
   }
 });
 function prepareSlideInfo(data) {
-  return __spreadProps(__spreadValues({}, data), {
+  return {
+    ...data,
     notesHTML: md.render((data == null ? void 0 : data.note) || "")
-  });
+  };
 }
 function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, userRoot, roots, remote }, pluginOptions, serverOptions, VuePlugin, MarkdownPlugin) {
   const slidePrefix = "/@slidev/slides/";
@@ -543,13 +555,14 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
           const file = `${slidePrefix}${i + 1}.md`;
           try {
             const md2 = await transformMarkdown(await MarkdownPlugin.transform((_a2 = newData.slides[i]) == null ? void 0 : _a2.content, file), i, newData);
-            return await VuePlugin.handleHotUpdate(__spreadProps(__spreadValues({}, ctx), {
+            return await VuePlugin.handleHotUpdate({
+              ...ctx,
               modules: Array.from(ctx.server.moduleGraph.getModulesByFile(file) || []),
               file,
               read() {
                 return md2;
               }
-            }));
+            });
           } catch {
           }
         }))).flatMap((i) => i || []);
@@ -592,7 +605,7 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
             code: data.slides.map(({ title }, i) => {
               return `<template ${i === 0 ? "v-if" : "v-else-if"}="+no === ${i + 1}">${title}</template>`;
             }).join(""),
-            map: {}
+            map: { mappings: "" }
           };
         }
         if (id.startsWith(slidePrefix)) {
@@ -604,13 +617,13 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
             if (type === "md") {
               return {
                 code: (_a = data.slides[pageNo]) == null ? void 0 : _a.content,
-                map: {}
+                map: { mappings: "" }
               };
             }
           }
           return {
             code: "",
-            map: {}
+            map: { mappings: "" }
           };
         }
       }
@@ -660,7 +673,10 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
   async function transformMarkdown(code, pageNo, data2) {
     var _a, _b;
     const layouts = await getLayouts();
-    const frontmatter = __spreadValues(__spreadValues({}, ((_a = data2.headmatter) == null ? void 0 : _a.defaults) || {}), ((_b = data2.slides[pageNo]) == null ? void 0 : _b.frontmatter) || {});
+    const frontmatter = {
+      ...((_a = data2.headmatter) == null ? void 0 : _a.defaults) || {},
+      ...((_b = data2.slides[pageNo]) == null ? void 0 : _b.frontmatter) || {}
+    };
     const layoutName = (frontmatter == null ? void 0 : frontmatter.layout) || (pageNo === 0 ? "cover" : "default");
     if (!layouts[layoutName])
       throw new Error(`Unknown layout "${layoutName}"`);
@@ -797,6 +813,13 @@ defineProps<{ no: number | string }>()`);
     }
     if (data.features.katex)
       imports.push(`import "${toAtFS(resolveImportPath("katex/dist/katex.min.css", true))}"`);
+    if (data.config.css === "unocss") {
+      imports.unshift('import "@unocss/reset/tailwind.css"', 'import "uno:preflights.css"', 'import "uno:typography.css"', 'import "uno:shortcuts.css"');
+      imports.push('import "uno.css"');
+    } else {
+      imports.unshift('import "virtual:windi-components.css"', 'import "virtual:windi-base.css"');
+      imports.push('import "virtual:windi-utilities.css"', 'import "virtual:windi-devtools"');
+    }
     return imports.join("\n");
   }
   async function generateMonacoTypes() {
@@ -827,11 +850,12 @@ ${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: __spreadProps(__spreadValues({}, prepareSlideInfo(i)), {
+          slide: {
+            ...prepareSlideInfo(i),
             filepath: ((_b = i.source) == null ? void 0 : _b.filepath) || entry,
             id: idx,
             no
-          }),
+          },
           __clicksElements: [],
           __preloaded: false
         };
@@ -849,7 +873,7 @@ ${routes.join(",\n")}
     return [...imports, routesStr].join("\n");
   }
   function generateConfigs() {
-    const config = __spreadProps(__spreadValues({}, data.config), { remote });
+    const config = { ...data.config, remote };
     if (isString(config.title)) {
       const tokens = md.parseInline(config.title, {});
       config.title = stringifyMarkdownTokens(tokens);
@@ -1234,13 +1258,14 @@ function resolveShikiOptions(options) {
       themes.push(options.theme);
     }
   }
-  return __spreadProps(__spreadValues({}, options), {
+  return {
+    ...options,
     themes,
     darkModeThemes: darkModeThemes ? {
       dark: getThemeName(darkModeThemes.dark),
       light: getThemeName(darkModeThemes.light)
     } : void 0
-  });
+  };
 }
 function trimEndNewLine(code) {
   return code.replace(/\n$/, "");
@@ -1251,11 +1276,11 @@ var MarkdownItShiki = (markdownit, options = {}) => {
   markdownit.options.highlight = (code, lang) => {
     if (darkModeThemes) {
       const trimmed = trimEndNewLine(code);
-      const dark = _highlighter.codeToHtml(trimmed, lang || "text", darkModeThemes.dark).replace('<pre class="shiki"', '<pre class="slidev-code shiki shiki-dark"');
-      const light = _highlighter.codeToHtml(trimmed, lang || "text", darkModeThemes.light).replace('<pre class="shiki"', '<pre class="slidev-code shiki shiki-light"');
+      const dark = _highlighter.codeToHtml(trimmed, { lang: lang || "text", theme: darkModeThemes.dark }).replace('<pre class="shiki"', '<pre class="slidev-code shiki shiki-dark"');
+      const light = _highlighter.codeToHtml(trimmed, { lang: lang || "text", theme: darkModeThemes.light }).replace('<pre class="shiki"', '<pre class="slidev-code shiki shiki-light"');
       return escapeVueInCode(`<pre class="shiki-container">${dark}${light}</pre>`);
     } else {
-      return escapeVueInCode(_highlighter.codeToHtml(code, lang || "text").replace('<pre class="shiki"', '<pre class="slidev-code shiki"'));
+      return escapeVueInCode(_highlighter.codeToHtml(code, { lang: lang || "text" }).replace('<pre class="shiki"', '<pre class="slidev-code shiki"'));
     }
   };
 };
@@ -1281,17 +1306,18 @@ async function createMarkdownPlugin({ data: { config }, roots, mode, entry }, {
     setups.push((md2) => md2.use(markdownItPrism));
   }
   const KatexOptions = await loadSetups(roots, "katex.ts", {}, { strict: false }, false);
-  return Markdown2(__spreadProps(__spreadValues({
+  return Markdown2({
     wrapperClasses: "",
     headEnabled: false,
     frontmatter: false,
-    markdownItOptions: __spreadValues({
+    markdownItOptions: {
       quotes: `""''`,
       html: true,
       xhtmlOut: true,
-      linkify: true
-    }, mdOptions == null ? void 0 : mdOptions.markdownItOptions)
-  }, mdOptions), {
+      linkify: true,
+      ...mdOptions == null ? void 0 : mdOptions.markdownItOptions
+    },
+    ...mdOptions,
     markdownItSetup(md2) {
       var _a;
       md2.use(mila2, {
@@ -1319,7 +1345,7 @@ async function createMarkdownPlugin({ data: { config }, roots, mode, entry }, {
         return code;
       }
     }
-  }));
+  });
 }
 function transformMarkdownMonaco(md2) {
   md2 = md2.replace(/^```(\w+?)\s*{monaco}\s*?({.*?})?\s*?\n([\s\S]+?)^```/mg, (full, lang = "ts", options = "{}", code) => {
@@ -1352,18 +1378,18 @@ function transformSlotSugar(md2) {
   return lines.join("\n");
 }
 function transformHighlighter(md2) {
-  return md2.replace(/^```(\w+?)\s*{([\d\w*,\|-]+)}\s*?({.*?})?\s*?\n([\s\S]+?)^```/mg, (full, lang = "", rangeStr, options = "", code) => {
+  return md2.replace(/^```(\w+?)(?:\s*{([\d\w*,\|-]+)}\s*?({.*?})?\s*?)?\n([\s\S]+?)^```/mg, (full, lang = "", rangeStr = "", options = "", code) => {
     const ranges = rangeStr.split(/\|/g).map((i) => i.trim());
     code = code.trimEnd();
     options = options.trim() || "{}";
     return `
-<CodeHighlightController v-bind="${options}" :ranges='${JSON.stringify(ranges)}'>
+<CodeBlockWrapper v-bind="${options}" :ranges='${JSON.stringify(ranges)}'>
 
 \`\`\`${lang}
 ${code}
 \`\`\`
 
-</CodeHighlightController>`;
+</CodeBlockWrapper>`;
   });
 }
 function getCodeBlocks(md2) {
@@ -1441,6 +1467,36 @@ function createFixPlugins(options) {
   ];
 }
 
+// node/plugins/unocss.ts
+init_esm_shims();
+import { resolve as resolve5 } from "path";
+import { existsSync as existsSync6 } from "fs";
+import { deepMerge as deepMerge2, uniq as uniq6 } from "@antfu/utils";
+import jiti3 from "jiti";
+async function createUnocssPlugin({ themeRoots, addonRoots, clientRoot, roots, data }, { unocss: unoOptions }) {
+  var _a, _b, _c, _d;
+  const UnoCSS = await Promise.resolve().then(() => __toESM(__require("unocss/vite"))).then((r) => r.default);
+  const configFiles = uniq6([
+    ...themeRoots.map((i) => `${i}/uno.config.ts`),
+    ...addonRoots.map((i) => `${i}/uno.config.ts`),
+    resolve5(clientRoot, "uno.config.ts")
+  ]);
+  const configFile = configFiles.find((i) => existsSync6(i));
+  let config = jiti3(__filename)(configFile);
+  if ("default" in config)
+    config = config.default;
+  config = await loadSetups(roots, "unocss.ts", {}, config, true);
+  config.theme || (config.theme = {});
+  (_a = config.theme).fontFamily || (_a.fontFamily = {});
+  (_b = config.theme.fontFamily).sans || (_b.sans = data.config.fonts.sans.join(","));
+  (_c = config.theme.fontFamily).mono || (_c.mono = data.config.fonts.mono.join(","));
+  (_d = config.theme.fontFamily).serif || (_d.serif = data.config.fonts.serif.join(","));
+  return UnoCSS({
+    configFile: false,
+    ...deepMerge2(config, unoOptions || {})
+  });
+}
+
 // node/plugins/preset.ts
 var customElements = /* @__PURE__ */ new Set([
   "annotation",
@@ -1486,31 +1542,33 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
     clientRoot,
     data: { config }
   } = options;
-  const VuePlugin = Vue(__spreadValues({
+  const VuePlugin = Vue({
     include: [/\.vue$/, /\.md$/],
     exclude: [],
-    template: __spreadValues({
+    template: {
       compilerOptions: {
         isCustomElement(tag) {
           return customElements.has(tag);
         }
-      }
-    }, vueOptions == null ? void 0 : vueOptions.template)
-  }, vueOptions));
+      },
+      ...vueOptions == null ? void 0 : vueOptions.template
+    },
+    ...vueOptions
+  });
   const MarkdownPlugin = await createMarkdownPlugin(options, pluginOptions);
   const drawingData = await loadDrawings(options);
   return [
-    await createWindiCSSPlugin(options, pluginOptions),
+    config.css === "unocss" ? await createUnocssPlugin(options, pluginOptions) : await createWindiCSSPlugin(options, pluginOptions),
     MarkdownPlugin,
     VuePlugin,
     createSlidesLoader(options, pluginOptions, serverOptions, VuePlugin, MarkdownPlugin),
-    Components(__spreadValues({
+    Components({
       extensions: ["vue", "md", "ts"],
       dirs: [
-        `${clientRoot}/builtin`,
-        `${clientRoot}/components`,
-        ...themeRoots.map((i) => `${i}/components`),
-        ...addonRoots.map((i) => `${i}/components`),
+        join8(clientRoot, "builtin"),
+        join8(clientRoot, "components"),
+        ...themeRoots.map((i) => join8(i, "components")),
+        ...addonRoots.map((i) => join8(i, "components")),
         "src/components",
         "components"
       ],
@@ -1521,13 +1579,15 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
           prefix: "",
           customCollections: Object.keys(iconsOptions.customCollections || [])
         })
-      ]
-    }, componentsOptions)),
-    Icons(__spreadValues({
+      ],
+      ...componentsOptions
+    }),
+    Icons({
       defaultClass: "slidev-icon",
-      autoInstall: true
-    }, iconsOptions)),
-    config.remoteAssets === true || config.remoteAssets === mode ? RemoteAssets(__spreadValues({
+      autoInstall: true,
+      ...iconsOptions
+    }),
+    config.remoteAssets === true || config.remoteAssets === mode ? RemoteAssets({
       rules: [
         ...DefaultRules,
         {
@@ -1536,18 +1596,20 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
         }
       ],
       resolveMode: (id) => id.endsWith("index.html") ? "relative" : "@fs",
-      awaitDownload: mode === "build"
-    }, remoteAssetsOptions)) : null,
+      awaitDownload: mode === "build",
+      ...remoteAssetsOptions
+    }) : null,
     ServerRef({
       debug: process.env.NODE_ENV === "development",
-      state: __spreadValues({
+      state: {
         sync: false,
         nav: {
           page: 0,
           clicks: 0
         },
-        drawings: drawingData
-      }, serverRefOptions.state),
+        drawings: drawingData,
+        ...serverRefOptions.state
+      },
       onChanged(key, data, patch, timestamp) {
         serverRefOptions.onChanged && serverRefOptions.onChanged(key, data, patch, timestamp);
         if (!options.data.config.drawings.persist)