@slidev/cli 0.42.3 → 0.42.5

package/dist/{chunk-QL6EDWJQ.js → chunk-GPOP6RE3.js}

@@ -183,13 +183,13 @@ var _isinstalledglobally = require('is-installed-globally'); var _isinstalledglo
 
 // ../client/package.json
 var dependencies = {
-  "@antfu/utils": "^0.7.2",
+  "@antfu/utils": "^0.7.4",
   "@slidev/parser": "workspace:*",
   "@slidev/types": "workspace:*",
-  "@unocss/reset": "^0.52.4",
-  "@vueuse/core": "^10.1.2",
+  "@unocss/reset": "^0.53.1",
+  "@vueuse/core": "^10.2.0",
   "@vueuse/head": "^1.1.26",
-  "@vueuse/math": "^10.1.2",
+  "@vueuse/math": "^10.2.0",
   "@vueuse/motion": "^2.0.0",
   codemirror: "^5.65.5",
   defu: "^6.1.2",
@@ -199,13 +199,13 @@ var dependencies = {
   "js-base64": "^3.7.5",
   "js-yaml": "^4.1.0",
   katex: "^0.16.7",
-  mermaid: "^10.2.0",
+  mermaid: "^10.2.3",
   "monaco-editor": "^0.37.1",
   nanoid: "^4.0.2",
   prettier: "^2.8.8",
   recordrtc: "^5.6.2",
   resolve: "^1.22.2",
-  unocss: "^0.52.4",
+  unocss: "^0.53.1",
   "vite-plugin-windicss": "^1.9.0",
   vue: "^3.3.4",
   "vue-router": "^4.2.2",
@@ -418,7 +418,7 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
           if (!match)
             return next();
           const [, no, type] = match;
-          const idx = parseInt(no);
+          const idx = Number.parseInt(no);
           if (type === "json" && req.method === "GET") {
             res.write(JSON.stringify(prepareSlideInfo(data.slides[idx])));
             return res.end();
@@ -538,7 +538,7 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
           return generateCustomNavControls();
         if (id === "/@slidev/titles.md") {
           return {
-            code: data.slides.map(({ title }, i) => {
+            code: data.slides.filter(({ frontmatter }) => !(frontmatter == null ? void 0 : frontmatter.disabled)).map(({ title }, i) => {
               return `<template ${i === 0 ? "v-if" : "v-else-if"}="+no === ${i + 1}">
 
 ${title}
@@ -553,7 +553,7 @@ ${title}
           const match = remaning.match(regexIdQuery);
           if (match) {
             const [, no, type] = match;
-            const pageNo = parseInt(no) - 1;
+            const pageNo = Number.parseInt(no) - 1;
             if (type === "md") {
               return {
                 code: (_a = data.slides[pageNo]) == null ? void 0 : _a.content,
@@ -581,7 +581,7 @@ ${title}
         const [, no, type] = match;
         if (type !== "md")
           return;
-        const pageNo = parseInt(no) - 1;
+        const pageNo = Number.parseInt(no) - 1;
         return transformMarkdown(code, pageNo, data);
       }
     },
@@ -804,36 +804,39 @@ ${Object.entries(layouts).map(([k, v]) => `"${k}": ${v}`).join(",\n")}
   }
   async function generateRoutes() {
     const imports = [];
+    const redirects = [];
     const layouts = await getLayouts();
     imports.push(`import __layout__end from '${layouts.end}'`);
     let no = 1;
-    const routes = [
-      ...data.slides.map((i, idx) => {
-        var _a, _b, _c, _d;
-        if ((_a = i.frontmatter) == null ? void 0 : _a.disabled)
-          return void 0;
-        imports.push(`import n${no} from '${slidePrefix}${idx + 1}.md'`);
-        const additions = {
-          slide: {
-            ...prepareSlideInfo(i),
-            filepath: ((_b = i.source) == null ? void 0 : _b.filepath) || entry,
-            id: idx,
-            no
-          },
-          __clicksElements: [],
-          __preloaded: false
-        };
-        const meta = Object.assign({}, i.frontmatter, additions);
-        const route = `{ path: '${no}', name: 'page-${no}', component: n${no}, meta: ${JSON.stringify(meta)} }`;
-        const redirect = ((_c = i.frontmatter) == null ? void 0 : _c.routeAlias) ? `{ path: '${(_d = i.frontmatter) == null ? void 0 : _d.routeAlias}', redirect: { path: '${no}' } }` : null;
-        no += 1;
-        return [route, redirect];
-      }).flat().filter(_utils.notNullish)
-    ];
+    const routes = data.slides.map((i, idx) => {
+      var _a, _b, _c, _d;
+      if ((_a = i.frontmatter) == null ? void 0 : _a.disabled)
+        return void 0;
+      imports.push(`import n${no} from '${slidePrefix}${idx + 1}.md'`);
+      const additions = {
+        slide: {
+          ...prepareSlideInfo(i),
+          filepath: ((_b = i.source) == null ? void 0 : _b.filepath) || entry,
+          id: idx,
+          no
+        },
+        __clicksElements: [],
+        __preloaded: false
+      };
+      const meta = Object.assign({}, i.frontmatter, additions);
+      const route = `{ path: '${no}', name: 'page-${no}', component: n${no}, meta: ${JSON.stringify(meta)} }`;
+      if ((_c = i.frontmatter) == null ? void 0 : _c.routeAlias)
+        redirects.push(`{ path: '${(_d = i.frontmatter) == null ? void 0 : _d.routeAlias}', redirect: { path: '${no}' } }`);
+      no += 1;
+      return route;
+    });
     const routesStr = `export default [
 ${routes.join(",\n")}
 ]`;
-    return [...imports, routesStr].join("\n");
+    const redirectsStr = `export const redirects = [
+${redirects.join(",\n")}
+]`;
+    return [...imports, routesStr, redirectsStr].join("\n");
   }
   function generateConfigs() {
     const config = { ...data.config, remote };
@@ -1149,6 +1152,19 @@ function math_plugin(md2, options) {
 // node/plugins/markdown-it-prism.ts
 var _prismjs = require('prismjs'); var _prismjs2 = _interopRequireDefault(_prismjs);
 var _ = require('prismjs/components/'); var _2 = _interopRequireDefault(_);
+var _htmlparser2 = require('htmlparser2'); var htmlparser2 = _interopRequireWildcard(_htmlparser2);
+var Tag = class {
+  constructor(tagname, attributes) {
+    this.tagname = tagname;
+    this.attributes = attributes;
+  }
+  asOpen() {
+    return `<${this.tagname} ${Object.entries(this.attributes).map(([key, value]) => `${key}="${value}"`).join(" ")}>`;
+  }
+  asClosed() {
+    return `</${this.tagname}>`;
+  }
+};
 var DEFAULTS = {
   plugins: [],
   init: () => {
@@ -1187,10 +1203,32 @@ function selectLanguage(options, lang) {
 }
 function highlight(markdownit, options, text, lang) {
   const [langToUse, prismLang] = selectLanguage(options, lang);
-  const code = text.trimEnd().split(/\r?\n/g).map((line) => prismLang ? _prismjs2.default.highlight(line, prismLang, langToUse) : markdownit.utils.escapeHtml(line)).map((line) => `<span class="line">${line}</span>`).join("\n");
+  let code = text.trimEnd();
+  code = prismLang ? highlightPrism(code, prismLang, langToUse) : markdownit.utils.escapeHtml(code);
+  code = code.split(/\r?\n/g).map((line) => `<span class="line">${line}</span>`).join("\n");
   const classAttribute = langToUse ? ` class="slidev-code ${markdownit.options.langPrefix}${markdownit.utils.escapeHtml(langToUse)}"` : "";
   return escapeVueInCode(`<pre${classAttribute}><code>${code}</code></pre>`);
 }
+function highlightPrism(code, prismLang, langToUse) {
+  const openTags = [];
+  const parser2 = new htmlparser2.Parser({
+    onopentag(tagname, attributes) {
+      openTags.push(new Tag(tagname, attributes));
+    },
+    onclosetag() {
+      openTags.pop();
+    }
+  });
+  code = _prismjs2.default.highlight(code, prismLang, langToUse);
+  code = code.split(/\r?\n/g).map((line) => {
+    const prefix = openTags.map((tag) => tag.asOpen()).join("");
+    parser2.write(line);
+    const postfix = openTags.reverse().map((tag) => tag.asClosed()).join("");
+    return prefix + line + postfix;
+  }).join("\n");
+  parser2.end();
+  return code;
+}
 function checkLanguageOption(options, optionName) {
   const language = options[optionName];
   if (language !== void 0 && loadPrismLang(language) === void 0)

package/dist/{chunk-EQTZCSMP.mjs → chunk-Q3TKTGHS.mjs}

@@ -183,13 +183,13 @@ import { uniq as uniq2 } from "@antfu/utils";
 
 // ../client/package.json
 var dependencies = {
-  "@antfu/utils": "^0.7.2",
+  "@antfu/utils": "^0.7.4",
   "@slidev/parser": "workspace:*",
   "@slidev/types": "workspace:*",
-  "@unocss/reset": "^0.52.4",
-  "@vueuse/core": "^10.1.2",
+  "@unocss/reset": "^0.53.1",
+  "@vueuse/core": "^10.2.0",
   "@vueuse/head": "^1.1.26",
-  "@vueuse/math": "^10.1.2",
+  "@vueuse/math": "^10.2.0",
   "@vueuse/motion": "^2.0.0",
   codemirror: "^5.65.5",
   defu: "^6.1.2",
@@ -199,13 +199,13 @@ var dependencies = {
   "js-base64": "^3.7.5",
   "js-yaml": "^4.1.0",
   katex: "^0.16.7",
-  mermaid: "^10.2.0",
+  mermaid: "^10.2.3",
   "monaco-editor": "^0.37.1",
   nanoid: "^4.0.2",
   prettier: "^2.8.8",
   recordrtc: "^5.6.2",
   resolve: "^1.22.2",
-  unocss: "^0.52.4",
+  unocss: "^0.53.1",
   "vite-plugin-windicss": "^1.9.0",
   vue: "^3.3.4",
   "vue-router": "^4.2.2",
@@ -418,7 +418,7 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
           if (!match)
             return next();
           const [, no, type] = match;
-          const idx = parseInt(no);
+          const idx = Number.parseInt(no);
           if (type === "json" && req.method === "GET") {
             res.write(JSON.stringify(prepareSlideInfo(data.slides[idx])));
             return res.end();
@@ -538,7 +538,7 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
           return generateCustomNavControls();
         if (id === "/@slidev/titles.md") {
           return {
-            code: data.slides.map(({ title }, i) => {
+            code: data.slides.filter(({ frontmatter }) => !(frontmatter == null ? void 0 : frontmatter.disabled)).map(({ title }, i) => {
               return `<template ${i === 0 ? "v-if" : "v-else-if"}="+no === ${i + 1}">
 
 ${title}
@@ -553,7 +553,7 @@ ${title}
           const match = remaning.match(regexIdQuery);
           if (match) {
             const [, no, type] = match;
-            const pageNo = parseInt(no) - 1;
+            const pageNo = Number.parseInt(no) - 1;
             if (type === "md") {
               return {
                 code: (_a = data.slides[pageNo]) == null ? void 0 : _a.content,
@@ -581,7 +581,7 @@ ${title}
         const [, no, type] = match;
         if (type !== "md")
           return;
-        const pageNo = parseInt(no) - 1;
+        const pageNo = Number.parseInt(no) - 1;
         return transformMarkdown(code, pageNo, data);
       }
     },
@@ -804,36 +804,39 @@ ${Object.entries(layouts).map(([k, v]) => `"${k}": ${v}`).join(",\n")}
   }
   async function generateRoutes() {
     const imports = [];
+    const redirects = [];
     const layouts = await getLayouts();
     imports.push(`import __layout__end from '${layouts.end}'`);
     let no = 1;
-    const routes = [
-      ...data.slides.map((i, idx) => {
-        var _a, _b, _c, _d;
-        if ((_a = i.frontmatter) == null ? void 0 : _a.disabled)
-          return void 0;
-        imports.push(`import n${no} from '${slidePrefix}${idx + 1}.md'`);
-        const additions = {
-          slide: {
-            ...prepareSlideInfo(i),
-            filepath: ((_b = i.source) == null ? void 0 : _b.filepath) || entry,
-            id: idx,
-            no
-          },
-          __clicksElements: [],
-          __preloaded: false
-        };
-        const meta = Object.assign({}, i.frontmatter, additions);
-        const route = `{ path: '${no}', name: 'page-${no}', component: n${no}, meta: ${JSON.stringify(meta)} }`;
-        const redirect = ((_c = i.frontmatter) == null ? void 0 : _c.routeAlias) ? `{ path: '${(_d = i.frontmatter) == null ? void 0 : _d.routeAlias}', redirect: { path: '${no}' } }` : null;
-        no += 1;
-        return [route, redirect];
-      }).flat().filter(notNullish)
-    ];
+    const routes = data.slides.map((i, idx) => {
+      var _a, _b, _c, _d;
+      if ((_a = i.frontmatter) == null ? void 0 : _a.disabled)
+        return void 0;
+      imports.push(`import n${no} from '${slidePrefix}${idx + 1}.md'`);
+      const additions = {
+        slide: {
+          ...prepareSlideInfo(i),
+          filepath: ((_b = i.source) == null ? void 0 : _b.filepath) || entry,
+          id: idx,
+          no
+        },
+        __clicksElements: [],
+        __preloaded: false
+      };
+      const meta = Object.assign({}, i.frontmatter, additions);
+      const route = `{ path: '${no}', name: 'page-${no}', component: n${no}, meta: ${JSON.stringify(meta)} }`;
+      if ((_c = i.frontmatter) == null ? void 0 : _c.routeAlias)
+        redirects.push(`{ path: '${(_d = i.frontmatter) == null ? void 0 : _d.routeAlias}', redirect: { path: '${no}' } }`);
+      no += 1;
+      return route;
+    });
     const routesStr = `export default [
 ${routes.join(",\n")}
 ]`;
-    return [...imports, routesStr].join("\n");
+    const redirectsStr = `export const redirects = [
+${redirects.join(",\n")}
+]`;
+    return [...imports, routesStr, redirectsStr].join("\n");
   }
   function generateConfigs() {
     const config = { ...data.config, remote };
@@ -1149,6 +1152,19 @@ function math_plugin(md2, options) {
 // node/plugins/markdown-it-prism.ts
 import Prism from "prismjs";
 import loadLanguages from "prismjs/components/";
+import * as htmlparser2 from "htmlparser2";
+var Tag = class {
+  constructor(tagname, attributes) {
+    this.tagname = tagname;
+    this.attributes = attributes;
+  }
+  asOpen() {
+    return `<${this.tagname} ${Object.entries(this.attributes).map(([key, value]) => `${key}="${value}"`).join(" ")}>`;
+  }
+  asClosed() {
+    return `</${this.tagname}>`;
+  }
+};
 var DEFAULTS = {
   plugins: [],
   init: () => {
@@ -1187,10 +1203,32 @@ function selectLanguage(options, lang) {
 }
 function highlight(markdownit, options, text, lang) {
   const [langToUse, prismLang] = selectLanguage(options, lang);
-  const code = text.trimEnd().split(/\r?\n/g).map((line) => prismLang ? Prism.highlight(line, prismLang, langToUse) : markdownit.utils.escapeHtml(line)).map((line) => `<span class="line">${line}</span>`).join("\n");
+  let code = text.trimEnd();
+  code = prismLang ? highlightPrism(code, prismLang, langToUse) : markdownit.utils.escapeHtml(code);
+  code = code.split(/\r?\n/g).map((line) => `<span class="line">${line}</span>`).join("\n");
   const classAttribute = langToUse ? ` class="slidev-code ${markdownit.options.langPrefix}${markdownit.utils.escapeHtml(langToUse)}"` : "";
   return escapeVueInCode(`<pre${classAttribute}><code>${code}</code></pre>`);
 }
+function highlightPrism(code, prismLang, langToUse) {
+  const openTags = [];
+  const parser2 = new htmlparser2.Parser({
+    onopentag(tagname, attributes) {
+      openTags.push(new Tag(tagname, attributes));
+    },
+    onclosetag() {
+      openTags.pop();
+    }
+  });
+  code = Prism.highlight(code, prismLang, langToUse);
+  code = code.split(/\r?\n/g).map((line) => {
+    const prefix = openTags.map((tag) => tag.asOpen()).join("");
+    parser2.write(line);
+    const postfix = openTags.reverse().map((tag) => tag.asClosed()).join("");
+    return prefix + line + postfix;
+  }).join("\n");
+  parser2.end();
+  return code;
+}
 function checkLanguageOption(options, optionName) {
   const language = options[optionName];
   if (language !== void 0 && loadPrismLang(language) === void 0)