@slidev/cli 0.46.3 → 0.47.1

package/dist/{build-XIN6SGB6.mjs → build-MGE5JI2Q.mjs}

@@ -2,9 +2,9 @@ import {
   ViteSlidevPlugin,
   getIndexHtml,
   mergeViteConfigs
-} from "./chunk-BDBBIE6Z.mjs";
+} from "./chunk-SCUI4URK.mjs";
 import "./chunk-CTBVOVLQ.mjs";
-import "./chunk-5L3XKTHL.mjs";
+import "./chunk-O6VUSZMJ.mjs";
 import "./chunk-BXO7ZPPU.mjs";
 
 // node/build.ts
@@ -98,7 +98,7 @@ async function build(options, viteConfig = {}, args) {
     await fs.writeFile(redirectsPath, `${config.base}*    ${config.base}index.html   200
 `, "utf-8");
   if ([true, "true", "auto"].includes(options.data.config.download)) {
-    const { exportSlides, getExportOptions } = await import("./export-WYWYD5MK.mjs");
+    const { exportSlides, getExportOptions } = await import("./export-DBOVADXI.mjs");
     const port = 12445;
     const app = connect();
     const server = http.createServer(app);

package/dist/{chunk-5L3XKTHL.mjs → chunk-O6VUSZMJ.mjs}

@@ -1,21 +1,19 @@
 // node/utils.ts
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { ensurePrefix, slash } from "@antfu/utils";
 import isInstalledGlobally from "is-installed-globally";
-import resolve from "resolve";
+import { resolvePath } from "mlly";
 import globalDirs from "global-directory";
 var require2 = createRequire(import.meta.url);
-var __dirname = dirname(fileURLToPath(import.meta.url));
 function toAtFS(path) {
   return `/@fs${ensurePrefix("/", slash(path))}`;
 }
-function resolveImportPath(importName, ensure = false) {
+async function resolveImportPath(importName, ensure = false) {
   try {
-    return resolve.sync(importName, {
-      preserveSymlinks: false,
-      basedir: __dirname
+    return resolvePath(importName, {
+      url: fileURLToPath(import.meta.url)
     });
   } catch {
   }
@@ -33,11 +31,10 @@ function resolveImportPath(importName, ensure = false) {
     throw new Error(`Failed to resolve package "${importName}"`);
   return void 0;
 }
-function resolveGlobalImportPath(importName) {
+async function resolveGlobalImportPath(importName) {
   try {
-    return resolve.sync(importName, {
-      preserveSymlinks: false,
-      basedir: __dirname
+    return resolvePath(importName, {
+      url: fileURLToPath(import.meta.url)
     });
   } catch {
   }
@@ -59,8 +56,8 @@ function generateGoogleFontsUrl(options) {
   const fonts = options.webfonts.map((i) => `family=${i.replace(/^(['"])(.*)\1$/, "$1").replace(/\s+/g, "+")}:${options.italic ? "ital," : ""}wght@${weights}`).join("&");
   return `https://fonts.googleapis.com/css2?${fonts}&display=swap`;
 }
-function packageExists(name) {
-  if (resolveImportPath(`${name}/package.json`))
+async function packageExists(name) {
+  if (await resolveImportPath(`${name}/package.json`))
     return true;
   return false;
 }

package/dist/{chunk-P5XEHWCU.mjs → chunk-R2UPIVJX.mjs}

@@ -1,11 +1,11 @@
 import {
   ViteSlidevPlugin,
   mergeViteConfigs
-} from "./chunk-BDBBIE6Z.mjs";
+} from "./chunk-SCUI4URK.mjs";
 import {
   packageExists,
   resolveImportPath
-} from "./chunk-5L3XKTHL.mjs";
+} from "./chunk-O6VUSZMJ.mjs";
 import {
   __commonJS,
   __toESM
@@ -2523,7 +2523,7 @@ async function createServer(options2, viteConfig = {}, serverOptions = {}) {
 import * as parser from "@slidev/parser/fs";
 
 // package.json
-var version = "0.46.3";
+var version = "0.47.1";
 
 // node/themes.ts
 import prompts2 from "prompts";
@@ -7911,7 +7911,7 @@ var import_semver = __toESM(require_semver2());
 import fs2 from "fs-extra";
 async function getPackageJson(root) {
   try {
-    const file = resolveImportPath(`${root}/package.json`, true);
+    const file = await resolveImportPath(`${root}/package.json`, true);
     if (file && fs2.existsSync(file))
       return await fs2.readJSON(file);
     return {};
@@ -7923,7 +7923,7 @@ async function getAddons(userRoot, config2) {
   const { slidev = {} } = await getPackageJson(userRoot);
   const configAddons = Array.isArray(config2.addons) ? config2.addons : [];
   const addons = configAddons.concat(Array.isArray(slidev?.addons) ? slidev.addons : []);
-  return (await getRecursivePlugins(addons.map(resolvePluginName), 3)).filter(Boolean);
+  return (await getRecursivePlugins(await Promise.all(addons.map(resolvePluginName)), 3)).filter(Boolean);
 }
 async function getRecursivePlugins(addons, depth) {
   const addonsArray = await Promise.all(addons.map(async (addon) => {
@@ -7941,47 +7941,52 @@ async function checkEngine(name, engines) {
   if (engines.slidev && !(0, import_semver.satisfies)(version, engines.slidev, { includePrerelease: true }))
     throw new Error(`[slidev] addon "${name}" requires Slidev version range "${engines.slidev}" but found "${version}"`);
 }
-function resolvePluginName(name) {
+async function resolvePluginName(name) {
   if (!name)
     return "";
   if (isPath(name))
     return name;
-  if (packageExists(`slidev-addon-${name}`))
+  if (await packageExists(`slidev-addon-${name}`))
     return `slidev-addon-${name}`;
   return name;
 }
 
 // node/options.ts
 var debug = _debug("slidev:options");
-var __dirname = dirname2(fileURLToPath2(import.meta.url));
-function getClientRoot() {
-  return dirname2(resolveImportPath("@slidev/client/package.json", true));
+async function getClientRoot() {
+  return dirname2(await resolveImportPath("@slidev/client/package.json", true));
 }
 function getCLIRoot() {
-  return resolve2(__dirname, "..");
+  return fileURLToPath2(new URL("..", import.meta.url));
 }
 function isPath(name) {
   return name.startsWith("/") || /^\.\.?[\/\\]/.test(name);
 }
-function getThemeRoots(name, entry) {
+async function getThemeRoots(name, entry) {
   if (!name)
     return [];
-  return [getRoot(name, entry)];
+  return [await getRoot(name, entry)];
 }
-function getAddonRoots(addons, entry) {
+async function getAddonRoots(addons, entry) {
   if (addons.length === 0)
     return [];
-  return addons.map((name) => getRoot(name, entry));
+  return await Promise.all(addons.map((name) => getRoot(name, entry)));
 }
-function getRoot(name, entry) {
+async function getRoot(name, entry) {
   if (isPath(name))
     return resolve2(dirname2(entry), name);
-  return dirname2(resolveImportPath(`${name}/package.json`, true));
+  return dirname2(await resolveImportPath(`${name}/package.json`, true));
 }
 function getUserRoot(options2) {
-  const { entry: rawEntry = "slides.md", userRoot = process3.cwd() } = options2;
+  const {
+    entry: rawEntry = "slides.md",
+    userRoot = process3.cwd()
+  } = options2;
   const fullEntry = resolve2(userRoot, rawEntry);
-  return { entry: fullEntry, userRoot: dirname2(fullEntry) };
+  return {
+    entry: fullEntry,
+    userRoot: dirname2(fullEntry)
+  };
 }
 async function resolveOptions(options2, mode2, promptForInstallation = true) {
   const { remote, inspect } = options2;
@@ -7990,21 +7995,21 @@ async function resolveOptions(options2, mode2, promptForInstallation = true) {
     userRoot
   } = getUserRoot(options2);
   const data = await parser.load(entry);
-  const theme = resolveThemeName(options2.theme || data.config.theme);
+  const theme = await resolveThemeName(options2.theme || data.config.theme);
   if (promptForInstallation) {
     if (await promptForThemeInstallation(theme) === false)
       process3.exit(1);
   } else {
-    if (!packageExists(theme)) {
+    if (!await packageExists(theme)) {
       console.error(`Theme "${theme}" not found, have you installed it?`);
       process3.exit(1);
     }
   }
-  const clientRoot = getClientRoot();
+  const clientRoot = await getClientRoot();
   const cliRoot = getCLIRoot();
-  const themeRoots = getThemeRoots(theme, entry);
+  const themeRoots = await getThemeRoots(theme, entry);
   const addons = await getAddons(userRoot, data.config);
-  const addonRoots = getAddonRoots(addons, entry);
+  const addonRoots = await getAddonRoots(addons, entry);
   const roots = uniq([clientRoot, ...themeRoots, ...addonRoots, userRoot]);
   if (themeRoots.length) {
     const themeMeta = await getThemeMeta(theme, join3(themeRoots[0], "package.json"));
@@ -8061,18 +8066,18 @@ async function getThemeMeta(name, path2) {
   }
   return void 0;
 }
-function resolveThemeName(name) {
+async function resolveThemeName(name) {
   if (!name || name === "none")
     return "";
   if (name.startsWith("@slidev/theme-") || name.startsWith("slidev-theme-"))
     return name;
   if (isPath(name))
     return name;
-  if (packageExists(`@slidev/theme-${name}`))
+  if (await packageExists(`@slidev/theme-${name}`))
     return `@slidev/theme-${name}`;
-  if (packageExists(`slidev-theme-${name}`))
+  if (await packageExists(`slidev-theme-${name}`))
     return `slidev-theme-${name}`;
-  if (packageExists(name))
+  if (await packageExists(name))
     return name;
   if (officialThemes[name] != null)
     return officialThemes[name];
@@ -8081,10 +8086,10 @@ function resolveThemeName(name) {
   return `slidev-theme-${name}`;
 }
 async function promptForThemeInstallation(name) {
-  name = resolveThemeName(name);
+  name = await resolveThemeName(name);
   if (!name)
     return name;
-  if (isPath(name) || packageExists(name))
+  if (isPath(name) || await packageExists(name))
     return name;
   const { confirm: confirm2 } = await prompts2({
     name: "confirm",

package/dist/{chunk-BDBBIE6Z.mjs → chunk-SCUI4URK.mjs}

@@ -7,7 +7,7 @@ import {
   resolveImportPath,
   stringifyMarkdownTokens,
   toAtFS
-} from "./chunk-5L3XKTHL.mjs";
+} from "./chunk-O6VUSZMJ.mjs";
 
 // node/common.ts
 import { existsSync, promises as fs } from "node:fs";
@@ -25,10 +25,10 @@ async function getIndexHtml({ clientRoot, themeRoots, addonRoots, data, userRoot
     userRoot
   ]);
   for (const root of roots) {
-    const path = join(root, "index.html");
-    if (!existsSync(path))
+    const path2 = join(root, "index.html");
+    if (!existsSync(path2))
       continue;
-    const index = await fs.readFile(path, "utf-8");
+    const index = await fs.readFile(path2, "utf-8");
     head += `
 ${(index.match(/<head>([\s\S]*?)<\/head>/im)?.[1] || "").trim()}`;
     body += `
@@ -68,7 +68,7 @@ async function mergeViteConfigs({ addonRoots, themeRoots, entry }, viteConfig, c
 // node/plugins/preset.ts
 import { join as join8 } from "node:path";
 import { existsSync as existsSync3 } from "node:fs";
-import process3 from "node:process";
+import process2 from "node:process";
 import Vue from "@vitejs/plugin-vue";
 import VueJsx from "@vitejs/plugin-vue-jsx";
 import Icons from "unplugin-icons/vite";
@@ -98,11 +98,11 @@ async function loadDrawings(options) {
     suppressErrors: true
   });
   const obj = {};
-  await Promise.all(files.map(async (path) => {
-    const num = +basename(path, ".svg");
+  await Promise.all(files.map(async (path2) => {
+    const num = +basename(path2, ".svg");
     if (Number.isNaN(num))
       return;
-    const content = await fs2.readFile(path, "utf8");
+    const content = await fs2.readFile(path2, "utf8");
     const lines = content.split(/\n/g);
     obj[num.toString()] = lines.slice(1, -1).join("\n");
   }));
@@ -134,38 +134,6 @@ import { mergeConfig as mergeConfig2 } from "vite";
 import isInstalledGlobally from "is-installed-globally";
 import { uniq as uniq2 } from "@antfu/utils";
 
-// ../client/package.json
-var dependencies = {
-  "@antfu/utils": "^0.7.7",
-  "@slidev/parser": "workspace:*",
-  "@slidev/types": "workspace:*",
-  "@unhead/vue": "^1.8.10",
-  "@unocss/reset": "^0.58.3",
-  "@vueuse/core": "^10.7.2",
-  "@vueuse/math": "^10.7.2",
-  "@vueuse/motion": "^2.0.0",
-  codemirror: "^5.65.5",
-  defu: "^6.1.4",
-  drauu: "^0.3.7",
-  "file-saver": "^2.0.5",
-  "fuse.js": "^7.0.0",
-  "js-base64": "^3.7.6",
-  "js-yaml": "^4.1.0",
-  katex: "^0.16.9",
-  mermaid: "^10.7.0",
-  "monaco-editor": "^0.37.1",
-  nanoid: "^5.0.4",
-  prettier: "^3.2.4",
-  recordrtc: "^5.6.2",
-  resolve: "^1.22.8",
-  unocss: "^0.58.3",
-  "vite-plugin-windicss": "^1.9.3",
-  vue: "^3.4.15",
-  "vue-router": "^4.2.5",
-  "vue-starport": "^0.4.0",
-  windicss: "^3.5.6"
-};
-
 // node/vite/searchRoot.ts
 import fs3 from "node:fs";
 import { dirname as dirname2, join as join3 } from "node:path";
@@ -180,21 +148,21 @@ var ROOT_FILES = [
   // 'nx.json'
 ];
 function hasWorkspacePackageJSON(root) {
-  const path = join3(root, "package.json");
+  const path2 = join3(root, "package.json");
   try {
-    fs3.accessSync(path, fs3.constants.R_OK);
+    fs3.accessSync(path2, fs3.constants.R_OK);
   } catch {
     return false;
   }
-  const content = JSON.parse(fs3.readFileSync(path, "utf-8")) || {};
+  const content = JSON.parse(fs3.readFileSync(path2, "utf-8")) || {};
   return !!content.workspaces;
 }
 function hasRootFile(root) {
   return ROOT_FILES.some((file) => fs3.existsSync(join3(root, file)));
 }
 function hasPackageJSON(root) {
-  const path = join3(root, "package.json");
-  return fs3.existsSync(path);
+  const path2 = join3(root, "package.json");
+  return fs3.existsSync(path2);
 }
 function searchForPackageRoot(current, root = current) {
   if (hasPackageJSON(current))
@@ -227,7 +195,6 @@ var EXCLUDE = [
   "@unocss/reset",
   "unocss",
   "mermaid",
-  "vite-plugin-windicss",
   "vue-demi",
   "vue"
 ];
@@ -244,21 +211,6 @@ function createConfigPlugin(options) {
           dedupe: ["vue"]
         },
         optimizeDeps: {
-          include: [
-            ...Object.keys(dependencies).filter((i) => !EXCLUDE.includes(i)),
-            "codemirror/mode/javascript/javascript",
-            "codemirror/mode/css/css",
-            "codemirror/mode/markdown/markdown",
-            "codemirror/mode/xml/xml",
-            "codemirror/mode/htmlmixed/htmlmixed",
-            "codemirror/addon/display/placeholder",
-            "prettier/plugins/babel",
-            "prettier/plugins/html",
-            "prettier/plugins/typescript",
-            "mermaid/dist/mermaid.esm.min.mjs",
-            "mermaid/dist/mermaid.esm.mjs",
-            "vite-plugin-vue-server-ref/client"
-          ],
           exclude: EXCLUDE
         },
         css: options.data.config.css === "unocss" ? {
@@ -274,17 +226,22 @@ function createConfigPlugin(options) {
             allow: uniq2([
               searchForWorkspaceRoot(options.userRoot),
               searchForWorkspaceRoot(options.cliRoot),
-              ...isInstalledGlobally ? [dirname3(resolveGlobalImportPath("@slidev/client/package.json")), dirname3(resolveGlobalImportPath("katex/package.json"))] : []
+              ...isInstalledGlobally ? [
+                dirname3(await resolveGlobalImportPath("@slidev/client/package.json")),
+                dirname3(await resolveGlobalImportPath("katex/package.json"))
+              ] : []
             ])
           }
         },
         publicDir: join4(options.userRoot, "public")
       };
+      injection.resolve ||= {};
+      injection.resolve.alias ||= {};
       if (isInstalledGlobally) {
         injection.cacheDir = join4(options.cliRoot, "node_modules/.vite");
         injection.root = options.cliRoot;
-        injection.resolve.alias.vue = `${resolveImportPath("vue/dist/vue.esm-browser.js", true)}`;
       }
+      injection.resolve.alias.vue = await resolveImportPath("vue/dist/vue.esm-browser.js", true);
       return mergeConfig2(injection, config);
     },
     configureServer(server) {
@@ -318,7 +275,6 @@ function getDefine(options) {
 
 // node/plugins/loaders.ts
 import { basename as basename2, join as join5 } from "node:path";
-import process from "node:process";
 import { isString, notNullish, objectMap, range, slash, uniq as uniq3 } from "@antfu/utils";
 import fg2 from "fast-glob";
 import fs4 from "fs-extra";
@@ -330,7 +286,7 @@ import equal from "fast-deep-equal";
 var regexId = /^\/\@slidev\/slide\/(\d+)\.(md|json)(?:\?import)?$/;
 var regexIdQuery = /(\d+?)\.(md|json|frontmatter)$/;
 var vueContextImports = [
-  'import { inject as _vueInject, provide as _vueProvide, toRef as _vueToRef } from "vue"',
+  `import { inject as _vueInject, provide as _vueProvide, toRef as _vueToRef } from "vue"`,
   `import {
     injectionSlidevContext as _injectionSlidevContext, 
     injectionClicks as _injectionClicks,
@@ -345,13 +301,13 @@ var vueContextImports = [
   "const $renderContext = _vueInject(_injectionRenderContext)"
 ];
 function getBodyJson(req) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve3, reject) => {
     let body = "";
     req.on("data", (chunk) => body += chunk);
     req.on("error", reject);
     req.on("end", () => {
       try {
-        resolve4(JSON.parse(body) || {});
+        resolve3(JSON.parse(body) || {});
       } catch (e) {
         reject(e);
       }
@@ -436,7 +392,14 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
         for (let i = 0; i < length; i++) {
           const a = data.slides[i];
           const b = newData.slides[i];
-          if (a?.content.trim() === b?.content.trim() && a?.title?.trim() === b?.title?.trim() && a?.note === b?.note && equal(a.frontmatter, b.frontmatter))
+          if (a?.content.trim() === b?.content.trim() && a?.title?.trim() === b?.title?.trim() && a?.note === b?.note && equal(a.frontmatter, b.frontmatter) && Object.entries(a.snippetsUsed ?? {}).every(([file, oldContent]) => {
+            try {
+              const newContent = fs4.readFileSync(file, "utf-8");
+              return oldContent === newContent;
+            } catch {
+              return false;
+            }
+          }))
             continue;
           ctx.server.ws.send({
             type: "custom",
@@ -511,11 +474,18 @@ ${title}
                 map: { mappings: "" }
               };
             } else if (type === "frontmatter") {
+              const slideBase = {
+                ...prepareSlideInfo(slide),
+                frontmatter: void 0,
+                // remove raw content in build, optimize the bundle size
+                ...mode === "build" ? { raw: "", content: "", note: "" } : {}
+              };
+              const fontmatter = getFrontmatter(pageNo);
               return {
                 code: [
                   "// @unocss-include",
                   'import { reactive, computed } from "vue"',
-                  `export const frontmatter = reactive(${JSON.stringify(slide.frontmatter)})`,
+                  `export const frontmatter = reactive(${JSON.stringify(fontmatter)})`,
                   `export const meta = reactive({
                     layout: computed(() => frontmatter.layout),
                     transition: computed(() => frontmatter.transition),
@@ -524,12 +494,7 @@ ${title}
                     name: computed(() => frontmatter.name),
                     preload: computed(() => frontmatter.preload),
                     slide: {
-                      ...(${JSON.stringify({
-                    ...prepareSlideInfo(slide),
-                    frontmatter: void 0,
-                    // remove raw content in build, optimize the bundle size
-                    ...mode === "build" ? { raw: "", content: "", note: "" } : {}
-                  })}),
+                      ...(${JSON.stringify(slideBase)}),
                       frontmatter,
                       filepath: ${JSON.stringify(slide.source?.filepath || entry)},
                       id: ${pageNo},
@@ -575,7 +540,7 @@ ${title}
         if (type !== "md")
           return;
         const pageNo = Number.parseInt(no) - 1;
-        return transformMarkdown(code, pageNo, data);
+        return transformMarkdown(code, pageNo);
       }
     },
     {
@@ -613,12 +578,15 @@ ${title}
       return;
     server.watcher.add(data.entries?.map(slash) || []);
   }
-  async function transformMarkdown(code, pageNo, data2) {
-    const layouts = await getLayouts();
-    const frontmatter = {
-      ...data2.headmatter?.defaults || {},
-      ...data2.slides[pageNo]?.frontmatter || {}
+  function getFrontmatter(pageNo) {
+    return {
+      ...data.headmatter?.defaults || {},
+      ...data.slides[pageNo]?.frontmatter || {}
     };
+  }
+  async function transformMarkdown(code, pageNo) {
+    const layouts = await getLayouts();
+    const frontmatter = getFrontmatter(pageNo);
     let layoutName = frontmatter?.layout || (pageNo === 0 ? "cover" : "default");
     if (!layouts[layoutName]) {
       console.error(red(`
@@ -741,13 +709,19 @@ defineProps<{ no: number | string }>()`);
     _layouts_cache = layouts;
     return layouts;
   }
+  async function resolveUrl(id) {
+    return toAtFS(await resolveImportPath(id, true));
+  }
+  function resolveUrlOfClient(name) {
+    return toAtFS(join5(clientRoot, name));
+  }
   async function generateUserStyles() {
     const imports = [
-      `import "${toAtFS(join5(clientRoot, "styles/vars.css"))}"`,
-      `import "${toAtFS(join5(clientRoot, "styles/index.css"))}"`,
-      `import "${toAtFS(join5(clientRoot, "styles/code.css"))}"`,
-      `import "${toAtFS(join5(clientRoot, "styles/katex.css"))}"`,
-      `import "${toAtFS(join5(clientRoot, "styles/transitions.css"))}"`
+      `import "${resolveUrlOfClient("styles/vars.css")}"`,
+      `import "${resolveUrlOfClient("styles/index.css")}"`,
+      `import "${resolveUrlOfClient("styles/code.css")}"`,
+      `import "${resolveUrlOfClient("styles/katex.css")}"`,
+      `import "${resolveUrlOfClient("styles/transitions.css")}"`
     ];
     const roots2 = uniq3([
       ...themeRoots,
@@ -770,25 +744,21 @@ defineProps<{ no: number | string }>()`);
       }
     }
     if (data.features.katex)
-      imports.push(`import "${toAtFS(resolveImportPath("katex/dist/katex.min.css", true))}"`);
-    if (data.config.highlighter === "shikiji")
-      imports.push(`import "${toAtFS(resolveImportPath("shikiji-twoslash/style-rich.css", true))}"`);
+      imports.push(`import "${await resolveUrl("katex/dist/katex.min.css")}"`);
+    if (data.config.highlighter === "shiki") {
+      imports.push(
+        `import "${await resolveUrl("@shikijs/vitepress-twoslash/style.css")}"`,
+        `import "${resolveUrlOfClient("styles/shiki-twoslash.css")}"`
+      );
+    }
     if (data.config.css === "unocss") {
       imports.unshift(
-        'import "@unocss/reset/tailwind.css"',
+        `import "${await resolveUrl("@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"');
-      if (process.env.NODE_ENV !== "production")
-        imports.push('import "virtual:windi-devtools"');
     }
     return imports.join("\n");
   }
@@ -895,11 +865,11 @@ export default {
 // node/plugins/monacoTransform.ts
 import { dirname as dirname4, join as join6 } from "node:path";
 import fs5 from "node:fs/promises";
-import process2 from "node:process";
+import process from "node:process";
 import { slash as slash2 } from "@antfu/utils";
 import { findDepPkgJsonPath } from "vitefu";
 async function getPackageData(pkg) {
-  const pkgJsonPath = await findDepPkgJsonPath(pkg, process2.cwd());
+  const pkgJsonPath = await findDepPkgJsonPath(pkg, process.cwd());
   if (!pkgJsonPath)
     return;
   const pkgJson = JSON.parse(await fs5.readFile(pkgJsonPath, "utf-8"));
@@ -958,10 +928,10 @@ function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot
           ...addonRoots,
           userRoot
         ]).map((i) => join7(i, "setup", name));
-        setups.forEach((path, idx) => {
-          if (!existsSync2(path))
+        setups.forEach((path2, idx) => {
+          if (!existsSync2(path2))
             return;
-          imports.push(`import __n${idx} from '${toAtFS(path)}'`);
+          imports.push(`import __n${idx} from '${toAtFS(path2)}'`);
           let fn = `:AWAIT:__n${idx}`;
           if (/\binjection_return\b/g.test(code))
             fn = `injection_return = ${fn}`;
@@ -975,7 +945,7 @@ function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot
             fn += "(:LAST:)";
           }
           injections.push(
-            `// ${path}`,
+            `// ${path2}`,
             fn
           );
         });
@@ -992,7 +962,7 @@ function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot
 }
 
 // node/plugins/markdown.ts
-import { resolve as resolve3 } from "node:path";
+import fs7 from "node:fs/promises";
 import Markdown2 from "unplugin-vue-markdown/vite";
 import * as base64 from "js-base64";
 import { slash as slash4 } from "@antfu/utils";
@@ -1130,8 +1100,6 @@ import { Optional } from "@mrdrogdrog/optional";
 // node/plugins/markdown.ts
 import { encode as encode2 } from "plantuml-encoder";
 import Mdc from "markdown-it-mdc";
-import { addClassToHast } from "shikiji";
-import fs6 from "fs-extra";
 
 // node/plugins/markdown-it-katex.ts
 import katex from "katex";
@@ -1381,97 +1349,121 @@ function markdownItPrism(markdownit, useroptions) {
   markdownit.options.highlight = (text, lang) => highlight(markdownit, options, text, lang);
 }
 
-// node/plugins/markdown-it-shiki.ts
-function getThemeName(theme) {
-  if (typeof theme === "string")
-    return theme;
-  return theme.name;
+// node/plugins/transformSnippet.ts
+import path from "node:path";
+import fs6 from "fs-extra";
+function dedent(text) {
+  const lines = text.split("\n");
+  const minIndentLength = lines.reduce((acc, line) => {
+    for (let i = 0; i < line.length; i++) {
+      if (line[i] !== " " && line[i] !== "	")
+        return Math.min(i, acc);
+    }
+    return acc;
+  }, Number.POSITIVE_INFINITY);
+  if (minIndentLength < Number.POSITIVE_INFINITY)
+    return lines.map((x) => x.slice(minIndentLength)).join("\n");
+  return text;
 }
-function isShikiDarkModeThemes(theme) {
-  return typeof theme === "object" && ("dark" in theme || "light" in theme);
+function testLine(line, regexp, regionName, end = false) {
+  const [full, tag, name] = regexp.exec(line.trim()) || [];
+  return full && tag && name === regionName && tag.match(end ? /^[Ee]nd ?[rR]egion$/ : /^[rR]egion$/);
 }
-function resolveShikiOptions(options) {
-  const themes = [];
-  let darkModeThemes;
-  if (!options.theme) {
-    themes.push("nord");
-  } else if (typeof options.theme === "string") {
-    themes.push(options.theme);
-  } else {
-    if (isShikiDarkModeThemes(options.theme)) {
-      darkModeThemes = options.theme;
-      themes.push(options.theme.dark);
-      themes.push(options.theme.light);
-    } else {
-      themes.push(options.theme);
+function findRegion(lines, regionName) {
+  const regionRegexps = [
+    /^\/\/ ?#?((?:end)?region) ([\w*-]+)$/,
+    // javascript, typescript, java
+    /^\/\* ?#((?:end)?region) ([\w*-]+) ?\*\/$/,
+    // css, less, scss
+    /^#pragma ((?:end)?region) ([\w*-]+)$/,
+    // C, C++
+    /^<!-- #?((?:end)?region) ([\w*-]+) -->$/,
+    // HTML, markdown
+    /^#((?:End )Region) ([\w*-]+)$/,
+    // Visual Basic
+    /^::#((?:end)region) ([\w*-]+)$/,
+    // Bat
+    /^# ?((?:end)?region) ([\w*-]+)$/
+    // C#, PHP, Powershell, Python, perl & misc
+  ];
+  let regexp = null;
+  let start = -1;
+  for (const [lineId, line] of lines.entries()) {
+    if (regexp === null) {
+      for (const reg of regionRegexps) {
+        if (testLine(line, reg, regionName)) {
+          start = lineId + 1;
+          regexp = reg;
+          break;
+        }
+      }
+    } else if (testLine(line, regexp, regionName, true)) {
+      return { start, end: lineId, regexp };
     }
   }
-  return {
-    ...options,
-    themes,
-    darkModeThemes: darkModeThemes ? {
-      dark: getThemeName(darkModeThemes.dark),
-      light: getThemeName(darkModeThemes.light)
-    } : void 0
-  };
-}
-function trimEndNewLine(code) {
-  return code.replace(/\n$/, "");
+  return null;
 }
-var MarkdownItShiki = (markdownit, options = {}) => {
-  const _highlighter = options.highlighter;
-  const { darkModeThemes } = resolveShikiOptions(options);
-  markdownit.options.highlight = (code, lang) => {
-    if (darkModeThemes) {
-      const trimmed = trimEndNewLine(code);
-      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: lang || "text" }).replace('<pre class="shiki"', '<pre class="slidev-code shiki"')
-      );
+function transformSnippet(md2, options, id) {
+  const slideId = id.match(/(\d+)\.md$/)?.[1];
+  if (!slideId)
+    return md2;
+  const data = options.data;
+  const slideInfo = data.slides[+slideId - 1];
+  const dir = path.dirname(slideInfo.source?.filepath ?? options?.entry ?? options.userRoot);
+  return md2.replace(
+    /^<<< *(.+?)(#[\w-]+)? *(?: (\S+?))? *(\{.*)?$/mg,
+    (full, filepath = "", regionName = "", lang = "", meta = "") => {
+      const firstLine = `\`\`\`${lang || path.extname(filepath).slice(1)} ${meta}`;
+      const src = /^\@[\/]/.test(filepath) ? path.resolve(options.userRoot, filepath.slice(2)) : path.resolve(dir, filepath);
+      data.entries.push(src);
+      const isAFile = fs6.statSync(src).isFile();
+      if (!fs6.existsSync(src) || !isAFile) {
+        throw new Error(isAFile ? `Code snippet path not found: ${src}` : `Invalid code snippet option`);
+      }
+      let content = fs6.readFileSync(src, "utf8");
+      slideInfo.snippetsUsed ??= {};
+      slideInfo.snippetsUsed[src] = content;
+      if (regionName) {
+        const lines = content.split(/\r?\n/);
+        const region = findRegion(lines, regionName.slice(1));
+        if (region) {
+          content = dedent(
+            lines.slice(region.start, region.end).filter((line) => !region.regexp.test(line.trim())).join("\n")
+          );
+        }
+      }
+      return `${firstLine}
+${content}
+\`\`\``;
     }
-  };
-};
-var markdown_it_shiki_default = MarkdownItShiki;
+  );
+}
 
 // node/plugins/markdown.ts
-var DEFAULT_SHIKI_OPTIONS = {
-  theme: {
-    dark: "min-dark",
-    light: "min-light"
-  }
-};
-async function createMarkdownPlugin({ data: { config }, roots, mode, entry }, { markdown: mdOptions }) {
+async function createMarkdownPlugin(options, { markdown: mdOptions }) {
+  const { data: { config }, roots, mode, entry } = options;
   const setups = [];
   const entryPath = slash4(entry);
   if (config.highlighter === "shiki") {
-    const Shiki = await import("shiki");
-    const shikiOptions = await loadSetups(roots, "shiki.ts", Shiki, DEFAULT_SHIKI_OPTIONS, false);
-    const { langs, themes } = resolveShikiOptions(shikiOptions);
-    shikiOptions.highlighter = await Shiki.getHighlighter({ themes, langs });
-    setups.push((md2) => md2.use(markdown_it_shiki_default, shikiOptions));
-  } else if (config.highlighter === "shikiji") {
-    const MarkdownItShikiji = await import("markdown-it-shikiji").then((r) => r.default);
-    const { transformerTwoSlash, rendererRich } = await import("shikiji-twoslash");
-    const options = await loadShikijiSetups(roots);
-    const plugin = await MarkdownItShikiji({
-      ...options,
+    const MarkdownItShiki = await import("@shikijs/markdown-it").then((r) => r.default);
+    const { transformerTwoslash } = await import("@shikijs/vitepress-twoslash");
+    const options2 = await loadShikiSetups(roots);
+    const plugin = await MarkdownItShiki({
+      ...options2,
       transformers: [
-        ...options.transformers || [],
-        transformerTwoSlash({
+        ...options2.transformers || [],
+        transformerTwoslash({
           explicitTrigger: true,
-          renderer: rendererRich(),
           twoslashOptions: {
-            defaultOptions: {
+            handbookOptions: {
               noErrorValidation: true
             }
           }
         }),
         {
           pre(pre) {
-            addClassToHast(pre, "slidev-code shikiji");
+            this.addClassToHast(pre, "slidev-code");
+            delete pre.properties.tabindex;
           },
           postprocess(code) {
             return escapeVueInCode(code);
@@ -1491,6 +1483,7 @@ async function createMarkdownPlugin({ data: { config }, roots, mode, entry }, {
     wrapperClasses: "",
     headEnabled: false,
     frontmatter: false,
+    escapeCodeTagInterpolation: false,
     markdownItOptions: {
       quotes: `""''`,
       html: true,
@@ -1518,6 +1511,7 @@ async function createMarkdownPlugin({ data: { config }, roots, mode, entry }, {
           return "";
         const monaco = config.monaco === true || config.monaco === mode ? transformMarkdownMonaco : truncateMancoMark;
         code = transformSlotSugar(code);
+        code = transformSnippet(code, options, id);
         code = transformMermaid(code);
         code = transformPlantUml(code, config.plantUmlServer);
         code = monaco(code);
@@ -1649,12 +1643,23 @@ function transformPlantUml(md2, server) {
 function escapeVueInCode(md2) {
   return md2.replace(/{{(.*?)}}/g, "&lbrace;&lbrace;$1&rbrace;&rbrace;");
 }
-async function loadShikijiSetups(roots) {
-  const anyShikiji = roots.some((root) => fs6.existsSync(resolve3(root, "setup", "shikiji.ts")));
-  const result = anyShikiji ? await loadSetups(roots, "shikiji.ts", void 0, {}, false) : await loadSetups(roots, "shiki.ts", await import("shiki"), {}, false);
+async function loadShikiSetups(roots) {
+  const result = await loadSetups(
+    roots,
+    "shiki.ts",
+    {
+      /** @deprecated */
+      async loadTheme(path2) {
+        console.warn("[slidev] `loadTheme` in `setup/shiki.ts` is deprecated. Pass directly the theme name it's supported by Shiki. For custom themes, load it manually via `JSON.parse(fs.readFileSync(path, 'utf-8'))` and pass the raw JSON object instead.");
+        return JSON.parse(await fs7.readFile(path2, "utf-8"));
+      }
+    },
+    {},
+    false
+  );
   if ("theme" in result && "themes" in result)
     delete result.theme;
-  if (result.theme && typeof result.theme !== "string") {
+  if (result.theme && typeof result.theme !== "string" && !result.theme.name && !result.theme.tokenColors) {
     result.themes = result.theme;
     delete result.theme;
   }
@@ -1769,7 +1774,7 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
         ...addonRoots.map((i) => join8(i, "components")),
         "src/components",
         "components",
-        join8(process3.cwd(), "components")
+        join8(process2.cwd(), "components")
       ],
       include: [/\.vue$/, /\.vue\?vue/, /\.vue\?v=/, /\.md$/],
       exclude: [],
@@ -1800,7 +1805,7 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
       ...remoteAssetsOptions
     })) : null,
     ServerRef({
-      debug: process3.env.NODE_ENV === "development",
+      debug: process2.env.NODE_ENV === "development",
       state: {
         sync: false,
         nav: {
@@ -1833,7 +1838,7 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
       dev: true,
       build: true
     })) : null,
-    config.css === "none" ? null : config.css === "windicss" ? import("./windicss-V4JJMSQI.mjs").then((r) => r.createWindiCSSPlugin(options, pluginOptions)) : import("./unocss-6IVIFJMZ.mjs").then((r) => r.createUnocssPlugin(options, pluginOptions))
+    config.css === "none" ? null : import("./unocss-6IVIFJMZ.mjs").then((r) => r.createUnocssPlugin(options, pluginOptions))
   ];
   return (await Promise.all(plugins)).flat().filter(notNullish2);
 }

package/dist/cli.mjs

@@ -9,12 +9,12 @@ import {
   resolveOptions,
   resolveThemeName,
   version
-} from "./chunk-P5XEHWCU.mjs";
-import "./chunk-BDBBIE6Z.mjs";
+} from "./chunk-R2UPIVJX.mjs";
+import "./chunk-SCUI4URK.mjs";
 import {
   loadSetups
 } from "./chunk-CTBVOVLQ.mjs";
-import "./chunk-5L3XKTHL.mjs";
+import "./chunk-O6VUSZMJ.mjs";
 import "./chunk-BXO7ZPPU.mjs";
 
 // node/cli.ts
@@ -48,8 +48,8 @@ injectPreparserExtensionLoader(async (headmatter, filepath) => {
     /* uniq */
     [
       getUserRoot({}).userRoot,
-      ...getAddonRoots(addons, ""),
-      getClientRoot()
+      ...await getAddonRoots(addons, ""),
+      await getClientRoot()
     ]
   );
   const mergeArrays = (a, b) => a.concat(b);
@@ -101,7 +101,7 @@ cli.command(
         message: `Entry file ${yellow(`"${entry}"`)} does not exist, do you want to create it?`
       });
       if (create)
-        await fs.copyFile(path.resolve(__dirname, "../template.md"), entry);
+        await fs.copyFile(new URL("../template.md", import.meta.url), entry);
       else
         process.exit(0);
     }
@@ -131,8 +131,8 @@ cli.command(
           logLevel: log
         },
         {
-          onDataReload(newData, data) {
-            if (!theme && resolveThemeName(newData.config.theme) !== resolveThemeName(data.config.theme)) {
+          async onDataReload(newData, data) {
+            if (!theme && await resolveThemeName(newData.config.theme) !== await resolveThemeName(data.config.theme)) {
               console.log(yellow("\n  restarting on theme change\n"));
               initServer();
             } else if (CONFIG_RESTART_FIELDS.some((i) => !equal(newData.config[i], data.config[i]))) {
@@ -269,7 +269,7 @@ cli.command(
   }).strict().help(),
   async (args) => {
     const { entry, theme, watch, base, download, out, inspect } = args;
-    const { build } = await import("./build-XIN6SGB6.mjs");
+    const { build } = await import("./build-MGE5JI2Q.mjs");
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile, theme, inspect }, "build");
       if (download && !options.data.config.download)
@@ -310,7 +310,7 @@ cli.command(
       }),
       async ({ entry, dir, theme: themeInput }) => {
         const data = await parser.load(entry);
-        const theme = resolveThemeName(themeInput || data.config.theme);
+        const theme = await resolveThemeName(themeInput || data.config.theme);
         if (theme === "none") {
           console.error('Cannot eject theme "none"');
           process.exit(1);
@@ -319,7 +319,7 @@ cli.command(
           console.error("Theme is already ejected");
           process.exit(1);
         }
-        const roots = getThemeRoots(theme, entry);
+        const roots = await getThemeRoots(theme, entry);
         if (!roots.length) {
           console.error(`Could not find theme "${theme}"`);
           process.exit(1);
@@ -348,7 +348,7 @@ cli.command(
   async (args) => {
     const { entry, theme } = args;
     process.env.NODE_ENV = "production";
-    const { exportSlides, getExportOptions } = await import("./export-WYWYD5MK.mjs");
+    const { exportSlides, getExportOptions } = await import("./export-DBOVADXI.mjs");
     const port = await findFreePort(12445);
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile, theme }, "export");
@@ -394,7 +394,7 @@ cli.command(
     timeout
   }) => {
     process.env.NODE_ENV = "production";
-    const { exportNotes } = await import("./export-WYWYD5MK.mjs");
+    const { exportNotes } = await import("./export-DBOVADXI.mjs");
     const port = await findFreePort(12445);
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile }, "export");

package/dist/{export-WYWYD5MK.mjs → export-DBOVADXI.mjs}

@@ -1,6 +1,7 @@
 import {
-  packageExists
-} from "./chunk-5L3XKTHL.mjs";
+  packageExists,
+  resolveGlobalImportPath
+} from "./chunk-O6VUSZMJ.mjs";
 import "./chunk-BXO7ZPPU.mjs";
 
 // node/export.ts
@@ -13,6 +14,7 @@ import { parseRangeString } from "@slidev/parser/core";
 import { outlinePdfFactory } from "@lillallol/outline-pdf";
 import * as pdfLib from "pdf-lib";
 import { PDFDocument } from "pdf-lib";
+import isInstalledGlobally from "is-installed-globally";
 function addToTree(tree, info, slideIndexes, level = 1) {
   const titleLevel = info.level;
   if (titleLevel && titleLevel > level && tree.length > 0) {
@@ -74,9 +76,7 @@ async function exportNotes({
   output = "notes",
   timeout = 3e4
 }) {
-  if (!packageExists("playwright-chromium"))
-    throw new Error("The exporting for Slidev is powered by Playwright, please install it via `npm i -D playwright-chromium`");
-  const { chromium } = await import("playwright-chromium");
+  const { chromium } = await importPlaywright();
   const browser = await chromium.launch();
   const context = await browser.newContext();
   const page = await context.newPage();
@@ -120,10 +120,8 @@ async function exportSlides({
   withToc = false,
   perSlide = false
 }) {
-  if (!packageExists("playwright-chromium"))
-    throw new Error("The exporting for Slidev is powered by Playwright, please install it via `npm i -D playwright-chromium`");
   const pages = parseRangeString(total, range);
-  const { chromium } = await import("playwright-chromium");
+  const { chromium } = await importPlaywright();
   const browser = await chromium.launch({
     executablePath
   });
@@ -382,6 +380,21 @@ function getExportOptions(args, options, outDir, outFilename) {
     perSlide: perSlide || false
   };
 }
+async function importPlaywright() {
+  if (await packageExists("playwright-chromium"))
+    return await import("playwright-chromium");
+  let globalPath = isInstalledGlobally ? await resolveGlobalImportPath("playwright-chromium") : void 0;
+  if (globalPath)
+    return await import(globalPath);
+  const { resolveGlobal } = await import("resolve-global");
+  try {
+    globalPath = resolveGlobal("playwright-chromium");
+  } catch {
+  }
+  if (globalPath)
+    return await import(globalPath);
+  throw new Error("The exporting for Slidev is powered by Playwright, please install it via `npm i -D playwright-chromium`");
+}
 export {
   exportNotes,
   exportSlides,

package/dist/index.d.mts

@@ -3,7 +3,6 @@ import VueJsx from '@vitejs/plugin-vue-jsx';
 import Icons from 'unplugin-icons/vite';
 import Components from 'unplugin-vue-components/vite';
 import Markdown from 'unplugin-vue-markdown/vite';
-import WindiCSS from 'vite-plugin-windicss';
 import { VitePluginConfig } from 'unocss/vite';
 import RemoteAssets from 'vite-plugin-remote-assets';
 import ServerRef from 'vite-plugin-vue-server-ref';
@@ -59,7 +58,6 @@ interface SlidevPluginOptions extends SlidevEntryOptions {
     vuejsx?: ArgumentsType<typeof VueJsx>[0];
     markdown?: ArgumentsType<typeof Markdown>[0];
     components?: ArgumentsType<typeof Components>[0];
-    windicss?: ArgumentsType<typeof WindiCSS>[0];
     icons?: ArgumentsType<typeof Icons>[0];
     remoteAssets?: ArgumentsType<typeof RemoteAssets>[0];
     serverRef?: ArgumentsType<typeof ServerRef>[0];
@@ -68,12 +66,12 @@ interface SlidevPluginOptions extends SlidevEntryOptions {
 interface SlidevServerOptions {
     onDataReload?: (newData: SlidevMarkdown, data: SlidevMarkdown) => void;
 }
-declare function getClientRoot(): string;
+declare function getClientRoot(): Promise<string>;
 declare function getCLIRoot(): string;
 declare function isPath(name: string): boolean;
-declare function getThemeRoots(name: string, entry: string): string[];
-declare function getAddonRoots(addons: string[], entry: string): string[];
-declare function getRoot(name: string, entry: string): string;
+declare function getThemeRoots(name: string, entry: string): Promise<string[]>;
+declare function getAddonRoots(addons: string[], entry: string): Promise<string[]>;
+declare function getRoot(name: string, entry: string): Promise<string>;
 declare function getUserRoot(options: SlidevEntryOptions): {
     entry: string;
     userRoot: string;
@@ -95,6 +93,4 @@ declare function createServer(options: ResolvedSlidevOptions, viteConfig?: Inlin
 
 declare function ViteSlidevPlugin(options: ResolvedSlidevOptions, pluginOptions: SlidevPluginOptions, serverOptions?: SlidevServerOptions): Promise<Plugin[]>;
 
-declare function createWindiCSSPlugin({ themeRoots, addonRoots, clientRoot, userRoot, roots, data }: ResolvedSlidevOptions, { windicss: windiOptions }: SlidevPluginOptions): Promise<vite.Plugin<any>[]>;
-
-export { type ResolvedSlidevOptions, type SlidevEntryOptions, type SlidevPluginOptions, type SlidevServerOptions, ViteSlidevPlugin, createServer, createWindiCSSPlugin, getAddonRoots, getCLIRoot, getClientRoot, getRoot, getThemeRoots, getUserRoot, isPath, resolveOptions };
+export { type ResolvedSlidevOptions, type SlidevEntryOptions, type SlidevPluginOptions, type SlidevServerOptions, ViteSlidevPlugin, createServer, getAddonRoots, getCLIRoot, getClientRoot, getRoot, getThemeRoots, getUserRoot, isPath, resolveOptions };

package/dist/index.mjs

@@ -9,20 +9,16 @@ import {
   isPath,
   parser,
   resolveOptions
-} from "./chunk-P5XEHWCU.mjs";
-import {
-  createWindiCSSPlugin
-} from "./chunk-GLZC72RJ.mjs";
+} from "./chunk-R2UPIVJX.mjs";
 import {
   ViteSlidevPlugin
-} from "./chunk-BDBBIE6Z.mjs";
+} from "./chunk-SCUI4URK.mjs";
 import "./chunk-CTBVOVLQ.mjs";
-import "./chunk-5L3XKTHL.mjs";
+import "./chunk-O6VUSZMJ.mjs";
 import "./chunk-BXO7ZPPU.mjs";
 export {
   ViteSlidevPlugin,
   createServer,
-  createWindiCSSPlugin,
   getAddonRoots,
   getCLIRoot,
   getClientRoot,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/cli",
-  "version": "0.46.3",
+  "version": "0.47.1",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -44,14 +44,16 @@
   "dependencies": {
     "@antfu/utils": "^0.7.7",
     "@iconify-json/carbon": "^1.1.28",
-    "@iconify-json/ph": "^1.1.10",
+    "@iconify-json/ph": "^1.1.11",
     "@lillallol/outline-pdf": "^4.0.0",
     "@mrdrogdrog/optional": "^1.2.1",
-    "@unocss/extractor-mdc": "^0.58.3",
-    "@unocss/reset": "^0.58.3",
+    "@shikijs/markdown-it": "^1.0.0-beta.3",
+    "@shikijs/twoslash": "^1.0.0-beta.3",
+    "@shikijs/vitepress-twoslash": "1.0.0-beta.3",
+    "@unocss/extractor-mdc": "^0.58.4",
+    "@unocss/reset": "^0.58.4",
     "@vitejs/plugin-vue": "^5.0.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@windicss/config": "^1.9.3",
     "cli-progress": "^3.12.0",
     "codemirror": "^5.65.5",
     "connect": "^3.7.0",
@@ -62,7 +64,6 @@
     "get-port-please": "^3.1.2",
     "global-directory": "^4.0.1",
     "htmlparser2": "^9.1.0",
-    "import-from": "^4.0.0",
     "is-installed-globally": "^1.0.0",
     "jiti": "^1.21.0",
     "js-base64": "^3.7.6",
@@ -74,9 +75,9 @@
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-mdc": "^0.2.1",
-    "markdown-it-shikiji": "^0.9.19",
+    "mlly": "^1.5.0",
     "monaco-editor": "^0.37.1",
-    "nanoid": "^5.0.4",
+    "nanoid": "^5.0.5",
     "open": "^10.0.3",
     "pdf-lib": "^1.17.1",
     "plantuml-encoder": "^1.4.0",
@@ -87,28 +88,24 @@
     "resolve": "^1.22.8",
     "resolve-from": "^5.0.0",
     "resolve-global": "^2.0.0",
-    "shikiji": "^0.9.19",
-    "shiki": "npm:shikiji-compat@^0.9.19",
-    "shikiji-twoslash": "^0.9.19",
+    "shiki": "^1.0.0-beta.3",
     "sirv": "^2.0.4",
-    "unocss": "^0.58.3",
-    "unplugin-icons": "^0.18.2",
+    "unocss": "^0.58.4",
+    "unplugin-icons": "^0.18.3",
     "unplugin-vue-components": "^0.26.0",
     "unplugin-vue-markdown": "^0.25.2",
     "uqr": "^0.1.2",
     "vite": "^5.0.12",
-    "vite-plugin-inspect": "^0.8.1",
+    "vite-plugin-inspect": "^0.8.3",
     "vite-plugin-remote-assets": "^0.4.1",
-    "vite-plugin-static-copy": "^1.0.0",
-    "vite-plugin-vue-server-ref": "^0.4.0",
-    "vite-plugin-windicss": "^1.9.3",
+    "vite-plugin-static-copy": "^1.0.1",
+    "vite-plugin-vue-server-ref": "^0.4.1",
     "vitefu": "^0.2.5",
     "vue": "^3.4.15",
-    "windicss": "^3.5.6",
     "yargs": "^17.7.2",
-    "@slidev/client": "0.46.3",
-    "@slidev/parser": "0.46.3",
-    "@slidev/types": "0.46.3"
+    "@slidev/types": "0.47.1",
+    "@slidev/parser": "0.47.1",
+    "@slidev/client": "0.47.1"
   },
   "devDependencies": {
     "@hedgedoc/markdown-it-plugins": "^2.1.4",

package/template.md

@@ -4,7 +4,7 @@ theme: seriph
 # random image from a curated Unsplash collection by Anthony
 # like them? see https://unsplash.com/collections/94734566/slidev
 background: https://source.unsplash.com/collection/94734566/1920x1080
-# apply any windi css classes to the current slide
+# apply any unocss classes to the current slide
 class: 'text-center'
 # https://sli.dev/custom/highlighters.html
 highlighter: shiki

package/dist/chunk-GLZC72RJ.mjs

@@ -1,66 +0,0 @@
-import {
-  loadSetups
-} from "./chunk-CTBVOVLQ.mjs";
-import {
-  resolveImportPath
-} from "./chunk-5L3XKTHL.mjs";
-
-// node/plugins/windicss.ts
-import { dirname, resolve } from "node:path";
-import { existsSync } from "node:fs";
-import { fileURLToPath } from "node:url";
-import { slash, uniq } from "@antfu/utils";
-import jiti from "jiti";
-async function createWindiCSSPlugin({ themeRoots, addonRoots, clientRoot, userRoot, roots, data }, { windicss: windiOptions }) {
-  const { default: WindiCSS } = await import("vite-plugin-windicss");
-  const { defaultConfigureFiles } = await import("@windicss/config");
-  const configFiles = uniq([
-    ...defaultConfigureFiles.map((i) => resolve(userRoot, i)),
-    ...themeRoots.map((i) => `${i}/windi.config.ts`),
-    ...addonRoots.map((i) => `${i}/windi.config.ts`),
-    resolve(clientRoot, "windi.config.ts")
-  ]);
-  const configFile = configFiles.find((i) => existsSync(i));
-  let config = jiti(fileURLToPath(import.meta.url))(configFile);
-  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 ||= data.config.fonts.sans.join(",");
-        fontFamily.mono ||= data.config.fonts.mono.join(",");
-        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(resolve(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
-    }
-  );
-}
-
-export {
-  createWindiCSSPlugin
-};

package/dist/windicss-V4JJMSQI.mjs

@@ -1,9 +0,0 @@
-import {
-  createWindiCSSPlugin
-} from "./chunk-GLZC72RJ.mjs";
-import "./chunk-CTBVOVLQ.mjs";
-import "./chunk-5L3XKTHL.mjs";
-import "./chunk-BXO7ZPPU.mjs";
-export {
-  createWindiCSSPlugin
-};