@slidev/cli 0.35.4 → 0.36.0

package/dist/{chunk-54NZDFOD.mjs → chunk-PIEUNXTX.mjs}

@@ -9,7 +9,7 @@ import {
   resolveImportPath,
   stringifyMarkdownTokens,
   toAtFS
-} from "./chunk-GVA336JI.mjs";
+} from "./chunk-IAMILGBS.mjs";
 
 // ../../node_modules/.pnpm/fast-deep-equal@3.1.3/node_modules/fast-deep-equal/index.js
 var require_fast_deep_equal = __commonJS({
@@ -165,38 +165,40 @@ async function createWindiCSSPlugin({ themeRoots, addonRoots, clientRoot, userRo
   if (config.default)
     config = config.default;
   config = await loadSetups(roots, "windicss.ts", {}, config, true);
-  return WindiCSS({
-    configFiles: [configFile],
-    config,
-    onConfigResolved(config2) {
-      if (!config2.theme)
-        config2.theme = {};
-      if (!config2.theme.extend)
-        config2.theme.extend = {};
-      if (!config2.theme.extend.fontFamily)
-        config2.theme.extend.fontFamily = {};
-      const fontFamily = config2.theme.extend.fontFamily;
-      fontFamily.sans || (fontFamily.sans = data.config.fonts.sans.join(","));
-      fontFamily.mono || (fontFamily.mono = data.config.fonts.mono.join(","));
-      fontFamily.serif || (fontFamily.serif = data.config.fonts.serif.join(","));
-      return config2;
-    },
-    onOptionsResolved(config2) {
-      themeRoots.forEach((i) => {
-        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(`!${slash(resolve2(userRoot, "node_modules"))}`);
-      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
-  });
+  return WindiCSS(
+    {
+      configFiles: [configFile],
+      config,
+      onConfigResolved(config2) {
+        if (!config2.theme)
+          config2.theme = {};
+        if (!config2.theme.extend)
+          config2.theme.extend = {};
+        if (!config2.theme.extend.fontFamily)
+          config2.theme.extend.fontFamily = {};
+        const fontFamily = config2.theme.extend.fontFamily;
+        fontFamily.sans || (fontFamily.sans = data.config.fonts.sans.join(","));
+        fontFamily.mono || (fontFamily.mono = data.config.fonts.mono.join(","));
+        fontFamily.serif || (fontFamily.serif = data.config.fonts.serif.join(","));
+        return config2;
+      },
+      onOptionsResolved(config2) {
+        themeRoots.forEach((i) => {
+          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(`!${slash(resolve2(userRoot, "node_modules"))}`);
+        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
+    }
+  );
 }
 
 // node/plugins/preset.ts
@@ -216,7 +218,10 @@ import { basename, dirname as dirname2, join as join2, resolve as resolve3 } fro
 import fs2 from "fs-extra";
 import fg from "fast-glob";
 function resolveDrawingsDir(options) {
-  return options.data.config.drawings.persist ? resolve3(dirname2(options.entry), options.data.config.drawings.persist) : void 0;
+  return options.data.config.drawings.persist ? resolve3(
+    dirname2(options.entry),
+    options.data.config.drawings.persist
+  ) : void 0;
 }
 async function loadDrawings(options) {
   const dir = resolveDrawingsDir(options);
@@ -247,14 +252,16 @@ async function writeDrawings(options, drawing) {
   const height = Math.round(width / options.data.config.aspectRatio);
   const SVG_HEAD = `<svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">`;
   await fs2.ensureDir(dir);
-  return Promise.all(Object.entries(drawing).map(async ([key, value]) => {
-    if (!value)
-      return;
-    const svg = `${SVG_HEAD}
+  return Promise.all(
+    Object.entries(drawing).map(async ([key, value]) => {
+      if (!value)
+        return;
+      const svg = `${SVG_HEAD}
 ${value}
 </svg>`;
-    await fs2.writeFile(join2(dir, `${key}.svg`), svg, "utf-8");
-  }));
+      await fs2.writeFile(join2(dir, `${key}.svg`), svg, "utf-8");
+    })
+  );
 }
 
 // node/plugins/extendConfig.ts
@@ -269,28 +276,28 @@ var dependencies = {
   "@antfu/utils": "^0.5.2",
   "@slidev/parser": "workspace:*",
   "@slidev/types": "workspace:*",
-  "@unocss/reset": "^0.45.1",
-  "@vueuse/core": "^9.0.1",
-  "@vueuse/head": "^0.7.8",
-  "@vueuse/math": "^9.0.1",
-  "@vueuse/motion": "^2.0.0-beta.18",
+  "@unocss/reset": "^0.45.20",
+  "@vueuse/core": "^9.2.0",
+  "@vueuse/head": "^0.7.10",
+  "@vueuse/math": "^9.2.0",
+  "@vueuse/motion": "^2.0.0-beta.22",
   codemirror: "^5.65.5",
-  defu: "^6.0.0",
-  drauu: "^0.3.0",
+  defu: "^6.1.0",
+  drauu: "^0.3.1",
   "file-saver": "^2.0.5",
   "js-base64": "^3.7.2",
   "js-yaml": "^4.1.0",
-  katex: "^0.16.0",
-  mermaid: "^9.1.3",
+  katex: "^0.16.2",
+  mermaid: "^9.1.6",
   "monaco-editor": "^0.33.0",
   nanoid: "^4.0.0",
   prettier: "^2.7.1",
   recordrtc: "^5.6.2",
   resolve: "^1.22.1",
-  unocss: "^0.45.1",
-  "vite-plugin-windicss": "^1.8.7",
-  vue: "^3.2.37",
-  "vue-router": "^4.1.3",
+  unocss: "^0.45.20",
+  "vite-plugin-windicss": "^1.8.8",
+  vue: "^3.2.39",
+  "vue-router": "^4.1.5",
   "vue-starport": "^0.3.0",
   windicss: "^3.5.6"
 };
@@ -342,6 +349,9 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
 var EXCLUDE = [
   "@slidev/shared",
   "@slidev/types",
+  "@slidev/client",
+  "@slidev/client/constants",
+  "@slidev/client/logic/dark",
   "@vueuse/core",
   "@vueuse/shared",
   "@unocss/reset",
@@ -552,22 +562,25 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
         Object.assign(data, newData);
         if (hmrPages.size > 0)
           moduleIds.add("/@slidev/titles.md");
-        const vueModules = (await Promise.all(Array.from(hmrPages).map(async (i) => {
-          var _a2;
-          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({
-              ...ctx,
-              modules: Array.from(ctx.server.moduleGraph.getModulesByFile(file) || []),
-              file,
-              read() {
-                return md2;
-              }
-            });
-          } catch {
-          }
-        }))).flatMap((i) => i || []);
+        const vueModules = (await Promise.all(
+          Array.from(hmrPages).map(async (i) => {
+            var _a2;
+            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);
+              const handleHotUpdate = "handler" in VuePlugin.handleHotUpdate ? VuePlugin.handleHotUpdate.handler : VuePlugin.handleHotUpdate;
+              return await handleHotUpdate({
+                ...ctx,
+                modules: Array.from(ctx.server.moduleGraph.getModulesByFile(file) || []),
+                file,
+                read() {
+                  return md2;
+                }
+              });
+            } catch {
+            }
+          })
+        )).flatMap((i) => i || []);
         hmrPages.clear();
         const moduleEntries = [
           ...vueModules,
@@ -817,11 +830,22 @@ 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.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"');
+      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");
   }
@@ -830,10 +854,13 @@ defineProps<{ no: number | string }>()`);
   }
   async function generateLayouts() {
     const imports = [];
-    const layouts = objectMap(await getLayouts(), (k, v) => {
-      imports.push(`import __layout_${k} from "${toAtFS(v)}"`);
-      return [k, `__layout_${k}`];
-    });
+    const layouts = objectMap(
+      await getLayouts(),
+      (k, v) => {
+        imports.push(`import __layout_${k} from "${toAtFS(v)}"`);
+        return [k, `__layout_${k}`];
+      }
+    );
     return [
       imports.join("\n"),
       `export default {
@@ -979,10 +1006,13 @@ function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot
     enforce: "pre",
     async transform(code, id) {
       if (id.startsWith(setupEntry)) {
+        let getInjections2 = function(isAwait = false, isChained = false) {
+          return injections.join("\n").replace(/:AWAIT:/g, isAwait ? "await " : "").replace(/(,\s*)?:LAST:/g, isChained ? "$1injection_return" : "");
+        };
+        var getInjections = getInjections2;
         const name = id.slice(setupEntry.length + 1);
         const imports = [];
         const injections = [];
-        const asyncInjections = [];
         const setups = uniq5([
           ...themeRoots,
           ...addonRoots,
@@ -992,35 +1022,28 @@ function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot
           if (!existsSync5(path))
             return;
           imports.push(`import __n${idx} from '${toAtFS(path)}'`);
-          let fn = `__n${idx}`;
-          let awaitFn = `await __n${idx}`;
-          if (/\binjection_return\b/g.test(code)) {
+          let fn = `:AWAIT:__n${idx}`;
+          if (/\binjection_return\b/g.test(code))
             fn = `injection_return = ${fn}`;
-            awaitFn = `injection_return = ${awaitFn}`;
-          }
           if (/\binjection_arg\b/g.test(code)) {
             fn += "(";
-            awaitFn += "(";
             const matches = Array.from(code.matchAll(/\binjection_arg(_\d+)?\b/g));
             const dedupedMatches = Array.from(new Set(matches.map((m) => m[0])));
-            dedupedMatches.forEach((key, index) => {
-              const isLast = index === dedupedMatches.length - 1;
-              const arg = key + (isLast ? "" : ",");
-              fn += arg;
-              awaitFn += arg;
-            });
-            fn += ")";
-            awaitFn += ")";
+            fn += dedupedMatches.join(", ");
+            fn += ", :LAST:)";
           } else {
-            fn += "()";
-            awaitFn += "()";
+            fn += "(:LAST:)";
           }
-          injections.push(`// ${path}`, fn);
-          asyncInjections.push(`// ${path}`, awaitFn);
+          injections.push(
+            `// ${path}`,
+            fn
+          );
         });
         code = code.replace("/* __imports__ */", imports.join("\n"));
-        code = code.replace("/* __injections__ */", injections.join("\n"));
-        code = code.replace("/* __async_injections__ */", asyncInjections.join("\n"));
+        code = code.replace("/* __injections__ */", getInjections2());
+        code = code.replace("/* __async_injections__ */", getInjections2(true));
+        code = code.replace("/* __chained_injections__ */", getInjections2(false, true));
+        code = code.replace("/* __chained_async_injections__ */", getInjections2(true, true));
         return code;
       }
       return null;
@@ -1294,7 +1317,9 @@ var MarkdownItShiki = (markdownit, options = {}) => {
       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: 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"')
+      );
     }
   };
 };
@@ -1432,14 +1457,17 @@ function transformPageCSS(md2, id) {
   if (!page)
     return md2;
   const { isInsideCodeblocks } = getCodeBlocks(md2);
-  const result = md2.replace(/(\n<style[^>]*?>)([\s\S]+?)(<\/style>)/g, (full, start, css, end, index) => {
-    if (index < 0 || isInsideCodeblocks(index))
-      return full;
-    if (!start.includes("scoped"))
-      start = start.replace("<style", "<style scoped");
-    return `${start}
+  const result = md2.replace(
+    /(\n<style[^>]*?>)([\s\S]+?)(<\/style>)/g,
+    (full, start, css, end, index) => {
+      if (index < 0 || isInsideCodeblocks(index))
+        return full;
+      if (!start.includes("scoped"))
+        start = start.replace("<style", "<style scoped");
+      return `${start}
 ${css}${end}`;
-  });
+    }
+  );
   return result;
 }
 function transformMermaid(md2) {