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

package/dist/{build-5AFXNUEB.mjs → build-LKM3MI3R.mjs}

@@ -2,7 +2,7 @@ import {
   ViteSlidevPlugin,
   getIndexHtml,
   mergeViteConfigs
-} from "./chunk-O56CS6WQ.mjs";
+} from "./chunk-ADTW2LD4.mjs";
 import "./chunk-O6TYYGU6.mjs";
 import "./chunk-CV7OWJOF.mjs";
 
@@ -62,7 +62,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-65BQ7S5F.mjs");
+    const { exportSlides, getExportOptions } = await import("./export-QZQV5HQF.mjs");
     const port = 12445;
     const app = connect();
     const server = http.createServer(app);

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

@@ -7,7 +7,7 @@ import {
 } from "./chunk-CV7OWJOF.mjs";
 
 // package.json
-var version = "0.48.0-beta.20";
+var version = "0.48.0-beta.22";
 
 // node/common.ts
 import { existsSync, promises as fs } from "node:fs";
@@ -146,15 +146,16 @@ 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",
   "@shikijs/vitepress-twoslash": "^1.1.7",
   "@slidev/parser": "workspace:*",
   "@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",
@@ -172,22 +173,29 @@ 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.20",
+  vue: "^3.4.21",
   "vue-router": "^4.3.0"
 };
 
 // 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",
@@ -454,13 +462,10 @@ function startsWithTodoMarkdown(token) {
   return checkboxRegex.test(token.content);
 }
 
-// ../../node_modules/.pnpm/@hedgedoc+markdown-it-plugins@2.1.4_patch_hash=tuyuxytl56b2vxulpkzt2wf4o4_markdown-it@14.0.0/node_modules/@hedgedoc/markdown-it-plugins/dist/esm/toc/plugin.js
-import { Optional } from "@mrdrogdrog/optional";
-
 // 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";
@@ -981,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)}' />`;
     }
   );
 }
@@ -1012,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 `
@@ -1026,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;
@@ -1176,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();
@@ -1205,25 +1209,25 @@ function createSlidesLoader({ data, clientRoot, roots, remote, mode, userRoot },
           return [];
         const moduleIds = /* @__PURE__ */ new Set();
         if (data.slides.length !== newData.slides.length) {
-          moduleIds.add("/@slidev/routes");
+          moduleIds.add("/@slidev/slides");
           range(newData.slides.length).map((i) => hmrPages.add(i));
         }
         if (!equal(data.headmatter.defaults, newData.headmatter.defaults)) {
-          moduleIds.add("/@slidev/routes");
+          moduleIds.add("/@slidev/slides");
           range(data.slides.length).map((i) => hmrPages.add(i));
         }
         if (!equal(data.config, newData.config))
           moduleIds.add("/@slidev/configs");
         if (!equal(data.features, newData.features)) {
           setTimeout(() => {
-            ctx.server.ws.send({ type: "full-reload" });
+            ctx.server.hot.send({ type: "full-reload" });
           }, 1);
         }
-        const length = Math.max(data.slides.length, newData.slides.length);
+        const length = Math.min(data.slides.length, newData.slides.length);
         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() && equal(a.frontmatter, b.frontmatter) && Object.entries(a.snippetsUsed ?? {}).every(([file, oldContent]) => {
+          if (a.content.trim() === b.content.trim() && a.title?.trim() === b.title?.trim() && equal(a.frontmatter, b.frontmatter) && Object.entries(a.snippetsUsed ?? {}).every(([file, oldContent]) => {
             try {
               const newContent = fs5.readFileSync(file, "utf-8");
               return oldContent === newContent;
@@ -1231,27 +1235,25 @@ function createSlidesLoader({ data, clientRoot, roots, remote, mode, userRoot },
               return false;
             }
           })) {
-            if (a?.note !== b?.note) {
-              ctx.server.ws.send({
-                type: "custom",
-                event: "slidev-update-note",
-                data: {
+            if (a.note !== b.note) {
+              ctx.server.hot.send(
+                "slidev:update-note",
+                {
                   id: i,
                   note: b.note || "",
                   noteHTML: renderNote(b.note || "")
                 }
-              });
+              );
             }
             continue;
           }
-          ctx.server.ws.send({
-            type: "custom",
-            event: "slidev-update",
-            data: {
+          ctx.server.hot.send(
+            "slidev:update-slide",
+            {
               id: i,
               data: withRenderedNote(newData.slides[i])
             }
-          });
+          );
           hmrPages.add(i);
         }
         Object.assign(data, newData);
@@ -1275,8 +1277,10 @@ function createSlidesLoader({ data, clientRoot, roots, remote, mode, userRoot },
         return null;
       },
       load(id) {
+        if (id === "/@slidev/slides")
+          return generateSlideRoutes();
         if (id === "/@slidev/routes")
-          return generateRoutes();
+          return generateDummyRoutes();
         if (id === "/@slidev/layouts")
           return generateLayouts();
         if (id === "/@slidev/styles")
@@ -1672,31 +1676,46 @@ ${Object.entries(layouts).map(([k, v]) => `"${k}": ${v}`).join(",\n")}
 }`
     ].join("\n\n");
   }
-  async function generateRoutes() {
-    const imports = [];
-    const redirects = [];
+  async function generateSlideRoutes() {
     const layouts = await getLayouts();
-    imports.push(
-      `import { markRaw } from 'vue'`,
-      `import __layout__end from '${layouts.end}'`
-    );
-    let no = 1;
-    const routes = data.slides.map((i, idx) => {
-      imports.push(`import n${no} from '${slidePrefix}${idx + 1}.md'`);
-      imports.push(`import { meta as f${no} } from '${slidePrefix}${idx + 1}.frontmatter'`);
-      const route = `{ path: '${no}', name: 'page-${no}', component: n${no}, meta: f${no} }`;
-      if (i.frontmatter?.routeAlias)
-        redirects.push(`{ path: '${i.frontmatter?.routeAlias}', redirect: { path: '${no}' } }`);
-      no += 1;
-      return route;
+    const imports = [
+      `import { shallowRef } from 'vue'`,
+      `import * as __layout__error from '${layouts.error}'`
+    ];
+    const slides = data.slides.map((_, idx) => {
+      const no = idx + 1;
+      imports.push(`import { meta as f${no} } from '${slidePrefix}${no}.frontmatter'`);
+      return `{
+          no: ${no},
+          meta: f${no},
+          component: async () => {
+            try {
+              return await import('${slidePrefix}${no}.md')
+            }
+            catch {
+              return __layout__error
+            }
+          },
+        }`;
     });
-    const routesStr = `export const rawRoutes = [
-${routes.join(",\n")}
-].map(markRaw)`;
-    const redirectsStr = `export const redirects = [
-${redirects.join(",\n")}
-].map(markRaw)`;
-    return [...imports, routesStr, redirectsStr].join("\n");
+    return [
+      ...imports,
+      `const data = [
+${slides.join(",\n")}
+]`,
+      `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()`,
+      `}`
+    ].join("\n");
+  }
+  function generateDummyRoutes() {
+    return [
+      `export { slides } from '#slidev/slides'`,
+      `console.warn('[slidev] #slidev/routes is deprecated, use #slidev/slides instead')`
+    ].join("\n");
   }
   function getTitle() {
     if (isString(data.config.title)) {

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

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

package/dist/cli.mjs

@@ -5,10 +5,10 @@ import {
   resolveAddons,
   resolveOptions,
   resolveTheme
-} from "./chunk-KNY3KC45.mjs";
+} from "./chunk-BUGWF6XJ.mjs";
 import {
   version
-} from "./chunk-O56CS6WQ.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-5AFXNUEB.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)
@@ -351,7 +351,7 @@ cli.command(
   (args) => exportOptions(commonOptions(args)).strict().help(),
   async (args) => {
     const { entry, theme } = args;
-    const { exportSlides, getExportOptions } = await import("./export-65BQ7S5F.mjs");
+    const { exportSlides, getExportOptions } = await import("./export-QZQV5HQF.mjs");
     const port = await getPort(12445);
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile, theme }, "export");
@@ -395,7 +395,7 @@ cli.command(
     output,
     timeout
   }) => {
-    const { exportNotes } = await import("./export-65BQ7S5F.mjs");
+    const { exportNotes } = await import("./export-QZQV5HQF.mjs");
     const port = await getPort(12445);
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile }, "export");

package/dist/{export-65BQ7S5F.mjs → export-QZQV5HQF.mjs}

@@ -19,6 +19,7 @@ function addToTree(tree, info, slideIndexes, level = 1) {
     addToTree(tree[tree.length - 1].children, info, slideIndexes, level + 1);
   } else {
     tree.push({
+      no: info.index,
       children: [],
       level,
       path: String(slideIndexes[info.index + 1]),

package/dist/index.mjs

@@ -2,10 +2,10 @@ import {
   createServer,
   parser,
   resolveOptions
-} from "./chunk-KNY3KC45.mjs";
+} from "./chunk-BUGWF6XJ.mjs";
 import {
   ViteSlidevPlugin
-} from "./chunk-O56CS6WQ.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.20",
+  "version": "0.48.0-beta.22",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -44,10 +44,10 @@
   "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",
-    "@mrdrogdrog/optional": "^1.2.1",
     "@shikijs/markdown-it": "^1.1.7",
     "@shikijs/twoslash": "^1.1.7",
     "@shikijs/vitepress-twoslash": "^1.1.7",
@@ -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",
@@ -103,11 +103,11 @@
     "vite-plugin-static-copy": "^1.0.1",
     "vite-plugin-vue-server-ref": "^0.4.2",
     "vitefu": "^0.2.5",
-    "vue": "^3.4.20",
+    "vue": "^3.4.21",
     "yargs": "^17.7.2",
-    "@slidev/client": "0.48.0-beta.20",
-    "@slidev/parser": "0.48.0-beta.20",
-    "@slidev/types": "0.48.0-beta.20"
+    "@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",