@slidev/cli 0.48.8 → 0.48.9

package/dist/{build-6U4JAACM.mjs → build-CPSFSDEL.mjs}

@@ -2,7 +2,7 @@ import {
   ViteSlidevPlugin,
   getIndexHtml,
   mergeViteConfigs
-} from "./chunk-D66Q4K5C.mjs";
+} from "./chunk-STSW6326.mjs";
 import "./chunk-LOUKLO2C.mjs";
 import "./chunk-AQQIBD5X.mjs";
 

package/dist/{chunk-4HC3TZOH.mjs → chunk-JGRWIL55.mjs}

@@ -1,7 +1,7 @@
 import {
   ViteSlidevPlugin,
   mergeViteConfigs
-} from "./chunk-D66Q4K5C.mjs";
+} from "./chunk-STSW6326.mjs";
 import {
   createResolver,
   getRoots,
@@ -48,7 +48,7 @@ async function createServer(options, viteConfig = {}, serverOptions = {}) {
 import * as parser from "@slidev/parser/fs";
 
 // package.json
-var version = "0.48.8";
+var version = "0.48.9";
 
 // node/integrations/themes.ts
 import { join as join2 } from "node:path";

package/dist/{chunk-D66Q4K5C.mjs → chunk-STSW6326.mjs}

@@ -140,14 +140,14 @@ var dependencies = {
   "@iconify-json/carbon": "^1.1.31",
   "@iconify-json/ph": "^1.1.11",
   "@iconify-json/svg-spinners": "^1.1.2",
-  "@shikijs/monaco": "^1.2.1",
-  "@shikijs/vitepress-twoslash": "^1.2.1",
+  "@shikijs/monaco": "^1.2.3",
+  "@shikijs/vitepress-twoslash": "^1.2.3",
   "@slidev/parser": "workspace:*",
   "@slidev/rough-notation": "^0.1.0",
   "@slidev/types": "workspace:*",
   "@typescript/ata": "^0.9.4",
-  "@unhead/vue": "^1.9.3",
-  "@unocss/reset": "^0.58.8",
+  "@unhead/vue": "^1.9.4",
+  "@unocss/reset": "^0.58.9",
   "@vueuse/core": "^10.9.0",
   "@vueuse/math": "^10.9.0",
   "@vueuse/motion": "^2.1.0",
@@ -163,10 +163,10 @@ var dependencies = {
   "monaco-editor": "^0.47.0",
   prettier: "^3.2.5",
   recordrtc: "^5.6.2",
-  shiki: "^1.2.1",
-  "shiki-magic-move": "^0.3.4",
+  shiki: "^1.2.3",
+  "shiki-magic-move": "^0.3.5",
   typescript: "^5.4.3",
-  unocss: "^0.58.8",
+  unocss: "^0.58.9",
   vue: "^3.4.21",
   "vue-demi": "^0.14.7",
   "vue-router": "^4.3.0"
@@ -476,38 +476,42 @@ import { uniq as uniq2 } from "@antfu/utils";
 // node/syntax/transform/monaco.ts
 import { isTruthy } from "@antfu/utils";
 import lz from "lz-string";
-function transformMonaco(md2, enabled = true) {
-  if (!enabled)
-    return truncateMancoMark(md2);
-  md2 = md2.replace(
+function transformMonaco(ctx, enabled = true) {
+  if (!enabled) {
+    ctx.s.replace(/{monaco([\w:,-]*)}/g, "");
+    return;
+  }
+  ctx.s.replace(
     /^```(\w+?)\s*{monaco-diff}\s*?({.*?})?\s*?\n([\s\S]+?)^~~~\s*?\n([\s\S]+?)^```/mg,
-    (full, lang = "ts", options = "{}", code, diff) => {
+    (full, lang = "ts", options = "{}", code, diff, index) => {
       lang = lang.trim();
       options = options.trim() || "{}";
       const encoded = lz.compressToBase64(code);
       const encodedDiff = lz.compressToBase64(diff);
+      ctx.ignores.push([index, index + full.length]);
       return `<Monaco code-lz="${encoded}" diff-lz="${encodedDiff}" lang="${lang}" v-bind="${options}" />`;
     }
   );
-  md2 = md2.replace(
+  ctx.s.replace(
     /^```(\w+?)\s*{monaco}\s*?({.*?})?\s*?\n([\s\S]+?)^```/mg,
-    (full, lang = "ts", options = "{}", code) => {
+    (full, lang = "ts", options = "{}", code, index) => {
       lang = lang.trim();
       options = options.trim() || "{}";
       const encoded = lz.compressToBase64(code);
+      ctx.ignores.push([index, index + full.length]);
       return `<Monaco code-lz="${encoded}" lang="${lang}" v-bind="${options}" />`;
     }
   );
-  md2 = md2.replace(
+  ctx.s.replace(
     /^```(\w+?)\s*{monaco-run}\s*?({.*?})?\s*?\n([\s\S]+?)^```/mg,
-    (full, lang = "ts", options = "{}", code) => {
+    (full, lang = "ts", options = "{}", code, index) => {
       lang = lang.trim();
       options = options.trim() || "{}";
       const encoded = lz.compressToBase64(code);
+      ctx.ignores.push([index, index + full.length]);
       return `<Monaco runnable code-lz="${encoded}" lang="${lang}" v-bind="${options}" />`;
     }
   );
-  return md2;
 }
 function scanMonacoModules(md2) {
   const typeModules = /* @__PURE__ */ new Set();
@@ -524,9 +528,6 @@ function scanMonacoModules(md2) {
   );
   return Array.from(typeModules);
 }
-function truncateMancoMark(md2) {
-  return md2.replace(/{monaco([\w:,-]*)}/g, "");
-}
 
 // node/virtual/monaco-types.ts
 var templateMonacoTypes = {
@@ -919,6 +920,16 @@ function createSlidesLoader(options, pluginOptions, serverOptions) {
           }
           next();
         });
+        server.middlewares.use(async (req, res, next) => {
+          const match = req.url?.match(/^\/\@slidev\/resolve-id\/(.*)$/);
+          if (!match)
+            return next();
+          const [, specifier] = match;
+          const resolved = await server.pluginContainer.resolveId(specifier);
+          res.statusCode = 200;
+          res.write(resolved?.id ?? "");
+          return res.end();
+        });
       },
       async handleHotUpdate(ctx) {
         if (!data.watchFiles.includes(ctx.file))
@@ -1380,6 +1391,7 @@ function startsWithTodoMarkdown(token) {
 
 // node/vite/markdown.ts
 import MarkdownItMdc from "markdown-it-mdc";
+import MagicString from "magic-string";
 import MarkdownItAttrs from "markdown-it-link-attributes";
 import MarkdownItFootnote from "markdown-it-footnote";
 
@@ -1540,24 +1552,6 @@ import * as htmlparser2 from "htmlparser2";
 function normalizeRangeStr(rangeStr = "") {
   return !rangeStr.trim() ? [] : rangeStr.trim().split(/\|/g).map((i) => i.trim());
 }
-function getCodeBlocks(md2) {
-  const codeblocks = Array.from(md2.matchAll(/^```[\s\S]*?^```/mg)).map((m) => {
-    const start = m.index;
-    const end = m.index + m[0].length;
-    const startLine = md2.slice(0, start).match(/\n/g)?.length || 0;
-    const endLine = md2.slice(0, end).match(/\n/g)?.length || 0;
-    return [start, end, startLine, endLine];
-  });
-  return {
-    codeblocks,
-    isInsideCodeblocks(idx) {
-      return codeblocks.some(([s, e]) => s <= idx && idx <= e);
-    },
-    isLineInsideCodeblocks(line) {
-      return codeblocks.some(([, , s, e]) => s <= line && line <= e);
-    }
-  };
-}
 function escapeVueInCode(md2) {
   return md2.replace(/{{/g, "&lbrace;&lbrace;");
 }
@@ -1661,13 +1655,16 @@ function markdownItPrism(markdownit, useroptions) {
 
 // node/syntax/transform/code-wrapper.ts
 var reCodeBlock = /^```([\w'-]+?)(?:\s*{([\d\w*,\|-]+)}\s*?({.*?})?(.*?))?\n([\s\S]+?)^```$/mg;
-function transformCodeWrapper(md2) {
-  return md2.replace(
+function transformCodeWrapper(ctx) {
+  ctx.s.replace(
     reCodeBlock,
-    (full, lang = "", rangeStr = "", options = "", attrs = "", code) => {
+    (full, lang = "", rangeStr = "", options = "", attrs = "", code, index) => {
+      if (ctx.isIgnored(index))
+        return full;
       const ranges = normalizeRangeStr(rangeStr);
       code = code.trimEnd();
       options = options.trim() || "{}";
+      ctx.ignores.push([index, index + full.length]);
       return `
 <CodeBlockWrapper v-bind="${options}" :ranges='${JSON.stringify(ranges)}'>
 
@@ -1684,10 +1681,10 @@ ${code}
 import { codeToKeyedTokens } from "shiki-magic-move/core";
 import lz2 from "lz-string";
 var reMagicMoveBlock = /^````(?:md|markdown) magic-move(?:[ ]*(\{.*?\})?([^\n]*?))?\n([\s\S]+?)^````$/mg;
-function transformMagicMove(md2, shiki2, shikiOptions2) {
-  return md2.replace(
+function transformMagicMove(ctx, shiki2, shikiOptions2) {
+  ctx.s.replace(
     reMagicMoveBlock,
-    (full, options = "{}", _attrs = "", body) => {
+    (full, options = "{}", _attrs = "", body, index) => {
       if (!shiki2 || !shikiOptions2)
         throw new Error("Shiki is required for Magic Move. You may need to set `highlighter: shiki` in your Slidev config.");
       const matches = Array.from(body.matchAll(reCodeBlock));
@@ -1701,6 +1698,7 @@ function transformMagicMove(md2, shiki2, shikiOptions2) {
         })
       );
       const compressed = lz2.compressToBase64(JSON.stringify(steps));
+      ctx.ignores.push([index, index + full.length]);
       return `<ShikiMagicMove v-bind="${options}" steps-lz="${compressed}" :step-ranges='${JSON.stringify(ranges)}' />`;
     }
   );
@@ -1708,21 +1706,23 @@ function transformMagicMove(md2, shiki2, shikiOptions2) {
 
 // node/syntax/transform/mermaid.ts
 import lz3 from "lz-string";
-function transformMermaid(md2) {
-  return md2.replace(/^```mermaid\s*?({.*?})?\n([\s\S]+?)\n```/mg, (full, options = "", code = "") => {
+function transformMermaid(ctx) {
+  ctx.s.replace(/^```mermaid\s*?({.*?})?\n([\s\S]+?)\n```/mg, (full, options = "", code = "", index) => {
     code = code.trim();
     options = options.trim() || "{}";
     const encoded = lz3.compressToBase64(code);
+    ctx.ignores.push([index, index + full.length]);
     return `<Mermaid code-lz="${encoded}" v-bind="${options}" />`;
   });
 }
 
 // node/syntax/transform/plant-uml.ts
 import { encode as encodePlantUml } from "plantuml-encoder";
-function transformPlantUml(md2, server) {
-  return md2.replace(/^```plantuml\s*?({.*?})?\n([\s\S]+?)\n```/mg, (full, options = "", content = "") => {
+function transformPlantUml(ctx, server) {
+  ctx.s.replace(/^```plantuml\s*?({.*?})?\n([\s\S]+?)\n```/mg, (full, options = "", content = "", index) => {
     const code = encodePlantUml(content.trim());
     options = options.trim() || "{}";
+    ctx.ignores.push([index, index + full.length]);
     return `<PlantUml :code="'${code}'" :server="'${server}'" v-bind="${options}" />`;
   });
 }
@@ -1781,14 +1781,14 @@ function findRegion(lines, regionName) {
   }
   return null;
 }
-function transformSnippet(md2, options, id) {
+function transformSnippet(ctx, options, id) {
   const slideId = id.match(/(\d+)\.md$/)?.[1];
   if (!slideId)
-    return md2;
+    return;
   const data = options.data;
   const slideInfo = data.slides[+slideId - 1];
   const dir = path.dirname(slideInfo.source?.filepath ?? options.entry ?? options.userRoot);
-  return md2.replace(
+  ctx.s.replace(
     /^<<< *(.+?)(#[\w-]+)? *(?: (\S+?))? *(\{.*)?$/mg,
     (full, filepath = "", regionName = "", lang = "", meta = "") => {
       const firstLine = `\`\`\`${lang || path.extname(filepath).slice(1)} ${meta}`;
@@ -1818,35 +1818,41 @@ ${content}
 }
 
 // node/syntax/transform/slot-sugar.ts
-function transformSlotSugar(md2) {
-  const lines = md2.split(/\r?\n/g);
+function transformSlotSugar(ctx) {
+  const linesWithNewline = ctx.s.original.split(/(\r?\n)/g);
+  const lines = [];
+  for (let i = 0; i < linesWithNewline.length; i += 2) {
+    const line = linesWithNewline[i];
+    const newline = linesWithNewline[i + 1] || "";
+    lines.push(line + newline);
+  }
   let prevSlot = false;
-  const { isLineInsideCodeblocks } = getCodeBlocks(md2);
-  lines.forEach((line, idx) => {
-    if (isLineInsideCodeblocks(idx))
+  let offset = 0;
+  lines.forEach((line) => {
+    const start = offset;
+    offset += line.length;
+    if (ctx.isIgnored(start))
       return;
-    const match = line.trimEnd().match(/^::\s*([\w\.\-\:]+)\s*::$/);
+    const match = line.match(/^::\s*([\w\.\-\:]+)\s*::(\s*)?$/);
     if (match) {
-      lines[idx] = `${prevSlot ? "\n\n</template>\n" : "\n"}<template v-slot:${match[1]}="slotProps">
-`;
+      ctx.s.overwrite(start, offset - match[2].length, `${prevSlot ? "\n\n</template>\n" : "\n"}<template v-slot:${match[1]}="slotProps">
+`);
       prevSlot = true;
     }
   });
   if (prevSlot)
-    lines[lines.length - 1] += "\n\n</template>";
-  return lines.join("\n");
+    ctx.s.append("\n\n</template>");
 }
 
 // node/syntax/transform/in-page-css.ts
-function transformPageCSS(md2, id) {
+function transformPageCSS(ctx, id) {
   const page = id.match(/(\d+)\.md$/)?.[1];
   if (!page)
-    return md2;
-  const { isInsideCodeblocks } = getCodeBlocks(md2);
-  const result = md2.replace(
+    return;
+  ctx.s.replace(
     /(\n<style[^>]*?>)([\s\S]+?)(<\/style>)/g,
     (full, start, css, end, index) => {
-      if (index < 0 || isInsideCodeblocks(index))
+      if (ctx.isIgnored(index))
         return full;
       if (!start.includes("scoped"))
         start = start.replace("<style", "<style scoped");
@@ -1854,17 +1860,17 @@ function transformPageCSS(md2, id) {
 ${css}${end}`;
     }
   );
-  return result;
 }
 
 // node/syntax/transform/katex-wrapper.ts
-function transformKaTexWrapper(md2) {
-  return md2.replace(
+function transformKaTexWrapper(ctx) {
+  ctx.s.replace(
     /^\$\$(?:\s*{([\d\w*,\|-]+)}\s*?({.*?})?\s*?)?\n([\s\S]+?)^\$\$/mg,
-    (full, rangeStr = "", options = "", code) => {
+    (full, rangeStr = "", options = "", code, index) => {
       const ranges = !rangeStr.trim() ? [] : rangeStr.trim().split(/\|/g).map((i) => i.trim());
       code = code.trimEnd();
       options = options.trim() || "{}";
+      ctx.ignores.push([index, index + full.length]);
       return `<KaTexBlockWrapper v-bind="${options}" :ranges='${JSON.stringify(ranges)}'>
 
 $$
@@ -1965,17 +1971,24 @@ async function createMarkdownPlugin(options, { markdown: mdOptions }) {
         if (id === entryPath)
           return "";
         const monacoEnabled = config.monaco === true || config.monaco === mode;
+        const ctx = {
+          s: new MagicString(code),
+          ignores: [],
+          isIgnored(index) {
+            return index < 0 || ctx.ignores.some(([start, end]) => start <= index && index < end);
+          }
+        };
+        transformSnippet(ctx, options, id);
         if (config.highlighter === "shiki")
-          code = transformMagicMove(code, shiki, shikiOptions);
-        code = transformSlotSugar(code);
-        code = transformSnippet(code, options, id);
-        code = transformMermaid(code);
-        code = transformPlantUml(code, config.plantUmlServer);
-        code = transformMonaco(code, monacoEnabled);
-        code = transformCodeWrapper(code);
-        code = transformPageCSS(code, id);
-        code = transformKaTexWrapper(code);
-        return code;
+          transformMagicMove(ctx, shiki, shikiOptions);
+        transformMermaid(ctx);
+        transformPlantUml(ctx, config.plantUmlServer);
+        transformMonaco(ctx, monacoEnabled);
+        transformCodeWrapper(ctx);
+        transformKaTexWrapper(ctx);
+        transformPageCSS(ctx, id);
+        transformSlotSugar(ctx);
+        return ctx.s.toString();
       }
     }
   });

package/dist/cli.mjs

@@ -6,8 +6,8 @@ import {
   resolveOptions,
   resolveTheme,
   version
-} from "./chunk-4HC3TZOH.mjs";
-import "./chunk-D66Q4K5C.mjs";
+} from "./chunk-JGRWIL55.mjs";
+import "./chunk-STSW6326.mjs";
 import {
   loadSetups
 } from "./chunk-LOUKLO2C.mjs";
@@ -325,7 +325,7 @@ cli.command(
   }).strict().help(),
   async (args) => {
     const { entry, theme, watch, base, download, out, inspect } = args;
-    const { build } = await import("./build-6U4JAACM.mjs");
+    const { build } = await import("./build-CPSFSDEL.mjs");
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile, theme, inspect }, "build");
       if (download && !options.data.config.download)

package/dist/index.mjs

@@ -2,10 +2,10 @@ import {
   createServer,
   parser,
   resolveOptions
-} from "./chunk-4HC3TZOH.mjs";
+} from "./chunk-JGRWIL55.mjs";
 import {
   ViteSlidevPlugin
-} from "./chunk-D66Q4K5C.mjs";
+} from "./chunk-STSW6326.mjs";
 import "./chunk-LOUKLO2C.mjs";
 import "./chunk-AQQIBD5X.mjs";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/cli",
-  "version": "0.48.8",
+  "version": "0.48.9",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -48,11 +48,11 @@
     "@iconify-json/ph": "^1.1.11",
     "@iconify-json/svg-spinners": "^1.1.2",
     "@lillallol/outline-pdf": "^4.0.0",
-    "@shikijs/markdown-it": "^1.2.1",
-    "@shikijs/twoslash": "^1.2.1",
-    "@shikijs/vitepress-twoslash": "^1.2.1",
-    "@unocss/extractor-mdc": "^0.58.8",
-    "@unocss/reset": "^0.58.8",
+    "@shikijs/markdown-it": "^1.2.3",
+    "@shikijs/twoslash": "^1.2.3",
+    "@shikijs/vitepress-twoslash": "^1.2.3",
+    "@unocss/extractor-mdc": "^0.58.9",
+    "@unocss/reset": "^0.58.9",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "chokidar": "^3.6.0",
@@ -72,6 +72,7 @@
     "kolorist": "^1.8.0",
     "local-pkg": "^0.5.0",
     "lz-string": "^1.5.0",
+    "magic-string": "^0.30.9",
     "markdown-it": "^14.1.0",
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-link-attributes": "^4.0.1",
@@ -88,11 +89,11 @@
     "resolve-from": "^5.0.0",
     "resolve-global": "^2.0.0",
     "semver": "^7.6.0",
-    "shiki": "^1.2.1",
-    "shiki-magic-move": "^0.3.4",
+    "shiki": "^1.2.3",
+    "shiki-magic-move": "^0.3.5",
     "sirv": "^2.0.4",
     "typescript": "^5.4.3",
-    "unocss": "^0.58.8",
+    "unocss": "^0.58.9",
     "unplugin-icons": "^0.18.5",
     "unplugin-vue-components": "^0.26.0",
     "unplugin-vue-markdown": "^0.26.0",
@@ -106,9 +107,9 @@
     "vitefu": "^0.2.5",
     "vue": "^3.4.21",
     "yargs": "^17.7.2",
-    "@slidev/parser": "0.48.8",
-    "@slidev/types": "0.48.8",
-    "@slidev/client": "0.48.8"
+    "@slidev/client": "0.48.9",
+    "@slidev/parser": "0.48.9",
+    "@slidev/types": "0.48.9"
   },
   "devDependencies": {
     "@hedgedoc/markdown-it-plugins": "^2.1.4",