@slidev/cli 0.48.0-beta.21 → 0.48.0-beta.22

package/dist/{build-LAWVABFK.mjs → build-LKM3MI3R.mjs}

@@ -2,7 +2,7 @@ import {
   ViteSlidevPlugin,
   getIndexHtml,
   mergeViteConfigs
-} from "./chunk-NSAYO3FG.mjs";
+} from "./chunk-ADTW2LD4.mjs";
 import "./chunk-O6TYYGU6.mjs";
 import "./chunk-CV7OWJOF.mjs";
 

package/dist/{chunk-NSAYO3FG.mjs → chunk-ADTW2LD4.mjs}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-CV7OWJOF.mjs";
 
 // package.json
-var version = "0.48.0-beta.21";
+var version = "0.48.0-beta.22";
 
 // node/common.ts
 import { existsSync, promises as fs } from "node:fs";
@@ -146,7 +146,7 @@ import { uniq } from "@antfu/utils";
 // ../client/package.json
 var dependencies = {
   "@antfu/utils": "^0.7.7",
-  "@iconify-json/carbon": "^1.1.30",
+  "@iconify-json/carbon": "^1.1.31",
   "@iconify-json/ph": "^1.1.11",
   "@iconify-json/svg-spinners": "^1.1.2",
   "@shikijs/monaco": "^1.1.7",
@@ -155,7 +155,7 @@ var dependencies = {
   "@slidev/rough-notation": "^0.1.0",
   "@slidev/types": "workspace:*",
   "@typescript/ata": "^0.9.4",
-  "@unhead/vue": "^1.8.10",
+  "@unhead/vue": "^1.8.11",
   "@unocss/reset": "^0.58.5",
   "@vueuse/core": "^10.9.0",
   "@vueuse/math": "^10.9.0",
@@ -173,7 +173,7 @@ var dependencies = {
   prettier: "^3.2.5",
   recordrtc: "^5.6.2",
   shiki: "^1.1.7",
-  "shiki-magic-move": "^0.1.0",
+  "shiki-magic-move": "^0.3.0",
   typescript: "^5.3.3",
   unocss: "^0.58.5",
   vue: "^3.4.21",
@@ -183,12 +183,19 @@ var dependencies = {
 // node/plugins/extendConfig.ts
 var INCLUDE = [
   ...Object.keys(dependencies),
+  // CodeMirror
   "codemirror/mode/javascript/javascript",
   "codemirror/mode/css/css",
   "codemirror/mode/markdown/markdown",
   "codemirror/mode/xml/xml",
   "codemirror/mode/htmlmixed/htmlmixed",
-  "codemirror/addon/display/placeholder"
+  "codemirror/addon/display/placeholder",
+  // Monaco
+  "monaco-editor/esm/vs/editor/standalone/browser/standaloneServices",
+  "monaco-editor/esm/vs/platform/contextview/browser/contextViewService",
+  "monaco-editor/esm/vs/platform/instantiation/common/descriptors",
+  // Others
+  "shiki-magic-move/vue"
 ];
 var EXCLUDE = [
   "@slidev/shared",
@@ -458,7 +465,7 @@ function startsWithTodoMarkdown(token) {
 // node/plugins/markdown.ts
 import { encode as encodePlantUml } from "plantuml-encoder";
 import Mdc from "markdown-it-mdc";
-import { codeToKeyedTokens, createMagicMoveMachine } from "shiki-magic-move/core";
+import { codeToKeyedTokens } from "shiki-magic-move/core";
 import mila from "markdown-it-link-attributes";
 import mif from "markdown-it-footnote";
 import lz from "lz-string";
@@ -979,30 +986,26 @@ function transformSlotSugar(md2) {
     lines[lines.length - 1] += "\n\n</template>";
   return lines.join("\n");
 }
-var reMagicMoveBlock = /^````(?:md|markdown) magic-move(?:[ ]*?({.*?})?([^\n]*?))?\n([\s\S]+?)^````$/mg;
+var reMagicMoveBlock = /^````(?:md|markdown) magic-move(?:[ ]*(\{.*?\})?([^\n]*?))?\n([\s\S]+?)^````$/mg;
 var reCodeBlock = /^```(\w+?)(?:\s*{([\d\w*,\|-]+)}\s*?({.*?})?(.*?))?\n([\s\S]+?)^```$/mg;
 function transformMagicMove(md2, shiki2, shikiOptions2) {
   return md2.replace(
     reMagicMoveBlock,
-    (full, _options = "", _attrs = "", body) => {
+    (full, options = "{}", _attrs = "", body) => {
       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));
       if (!matches.length)
         throw new Error("Magic Move block must contain at least one code block");
-      const langs = new Set(matches.map((i) => i[1]));
-      if (langs.size > 1)
-        throw new Error(`Magic Move block must contain code blocks with the same language, got ${Array.from(langs).join(", ")}`);
-      const lang = Array.from(langs)[0];
-      const magicMove = createMagicMoveMachine(
-        (code) => codeToKeyedTokens(shiki2, code, {
+      const ranges = matches.map((i) => normalizeRangeStr(i[2]));
+      const steps = matches.map(
+        (i) => codeToKeyedTokens(shiki2, i[5].trimEnd(), {
           ...shikiOptions2,
-          lang
+          lang: i[1]
         })
       );
-      const steps = matches.map((i) => magicMove.commit((i[5] || "").trimEnd()));
       const compressed = lz.compressToBase64(JSON.stringify(steps));
-      return `<ShikiMagicMove steps-lz="${compressed}" />`;
+      return `<ShikiMagicMove v-bind="${options}" steps-lz="${compressed}" :step-ranges='${JSON.stringify(ranges)}' />`;
     }
   );
 }
@@ -1010,7 +1013,7 @@ function transformHighlighter(md2) {
   return md2.replace(
     reCodeBlock,
     (full, lang = "", rangeStr = "", options = "", attrs = "", code) => {
-      const ranges = !rangeStr.trim() ? [] : rangeStr.trim().split(/\|/g).map((i) => i.trim());
+      const ranges = normalizeRangeStr(rangeStr);
       code = code.trimEnd();
       options = options.trim() || "{}";
       return `
@@ -1024,6 +1027,9 @@ ${code}
     }
   );
 }
+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;
@@ -1174,7 +1180,7 @@ function createSlidesLoader({ data, clientRoot, roots, remote, mode, userRoot },
           if (!match)
             return next();
           const [, no, type] = match;
-          const idx = Number.parseInt(no);
+          const idx = Number.parseInt(no) - 1;
           if (type === "json" && req.method === "GET") {
             res.write(JSON.stringify(withRenderedNote(data.slides[idx])));
             return res.end();
@@ -1697,16 +1703,11 @@ ${Object.entries(layouts).map(([k, v]) => `"${k}": ${v}`).join(",\n")}
       `const data = [
 ${slides.join(",\n")}
 ]`,
-      `export const slides = shallowRef([...data])`,
-      `let oldRef = slides`,
-      `export function update(old) {`,
-      `  oldRef = old`,
-      `  old.value = data`,
-      `}`,
+      `import.meta.hot.data.slides ??= shallowRef()`,
+      `import.meta.hot.data.slides.value = data`,
+      `export const slides = import.meta.hot.data.slides`,
       `if (import.meta.hot) {`,
-      `  import.meta.hot.accept(({ update }) => {`,
-      `    update(oldRef)`,
-      `  })`,
+      `  import.meta.hot.accept()`,
       `}`
     ].join("\n");
   }

package/dist/{chunk-AUSTPPCJ.mjs → chunk-BUGWF6XJ.mjs}

@@ -3,7 +3,7 @@ import {
   checkEngine,
   mergeViteConfigs,
   version
-} from "./chunk-NSAYO3FG.mjs";
+} from "./chunk-ADTW2LD4.mjs";
 import {
   createResolver,
   getRoots,

package/dist/cli.mjs

@@ -5,10 +5,10 @@ import {
   resolveAddons,
   resolveOptions,
   resolveTheme
-} from "./chunk-AUSTPPCJ.mjs";
+} from "./chunk-BUGWF6XJ.mjs";
 import {
   version
-} from "./chunk-NSAYO3FG.mjs";
+} from "./chunk-ADTW2LD4.mjs";
 import {
   loadSetups
 } from "./chunk-O6TYYGU6.mjs";
@@ -276,7 +276,7 @@ cli.command(
   }).strict().help(),
   async (args) => {
     const { entry, theme, watch, base, download, out, inspect } = args;
-    const { build } = await import("./build-LAWVABFK.mjs");
+    const { build } = await import("./build-LKM3MI3R.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-AUSTPPCJ.mjs";
+} from "./chunk-BUGWF6XJ.mjs";
 import {
   ViteSlidevPlugin
-} from "./chunk-NSAYO3FG.mjs";
+} from "./chunk-ADTW2LD4.mjs";
 import "./chunk-O6TYYGU6.mjs";
 import "./chunk-CV7OWJOF.mjs";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/cli",
-  "version": "0.48.0-beta.21",
+  "version": "0.48.0-beta.22",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -44,7 +44,7 @@
   "dependencies": {
     "@antfu/ni": "^0.21.12",
     "@antfu/utils": "^0.7.7",
-    "@iconify-json/carbon": "^1.1.30",
+    "@iconify-json/carbon": "^1.1.31",
     "@iconify-json/ph": "^1.1.11",
     "@iconify-json/svg-spinners": "^1.1.2",
     "@lillallol/outline-pdf": "^4.0.0",
@@ -88,7 +88,7 @@
     "resolve-global": "^2.0.0",
     "semver": "^7.6.0",
     "shiki": "^1.1.7",
-    "shiki-magic-move": "^0.1.0",
+    "shiki-magic-move": "^0.3.0",
     "sirv": "^2.0.4",
     "typescript": "^5.3.3",
     "unocss": "^0.58.5",
@@ -105,9 +105,9 @@
     "vitefu": "^0.2.5",
     "vue": "^3.4.21",
     "yargs": "^17.7.2",
-    "@slidev/parser": "0.48.0-beta.21",
-    "@slidev/client": "0.48.0-beta.21",
-    "@slidev/types": "0.48.0-beta.21"
+    "@slidev/types": "0.48.0-beta.22",
+    "@slidev/parser": "0.48.0-beta.22",
+    "@slidev/client": "0.48.0-beta.22"
   },
   "devDependencies": {
     "@hedgedoc/markdown-it-plugins": "^2.1.4",