@slidev/cli 0.48.0-beta.2 → 0.48.0-beta.3

package/dist/{build-BVDM4ZAC.mjs → build-VKH7FQSN.mjs}

@@ -2,7 +2,7 @@ import {
   ViteSlidevPlugin,
   getIndexHtml,
   mergeViteConfigs
-} from "./chunk-FIXL4WBO.mjs";
+} from "./chunk-JORVSTMS.mjs";
 import "./chunk-CTBVOVLQ.mjs";
 import "./chunk-DWXI5WEO.mjs";
 import "./chunk-BXO7ZPPU.mjs";

package/dist/{chunk-PDMXU2K7.mjs → chunk-HESHEOWV.mjs}

@@ -1,7 +1,7 @@
 import {
   ViteSlidevPlugin,
   mergeViteConfigs
-} from "./chunk-FIXL4WBO.mjs";
+} from "./chunk-JORVSTMS.mjs";
 import {
   packageExists,
   resolveImportPath
@@ -2536,7 +2536,7 @@ async function createServer(options2, viteConfig = {}, serverOptions = {}) {
 import * as parser from "@slidev/parser/fs";
 
 // package.json
-var version = "0.48.0-beta.2";
+var version = "0.48.0-beta.3";
 
 // node/themes.ts
 import prompts2 from "prompts";
@@ -8007,7 +8007,7 @@ async function resolveOptions(options2, mode2, promptForInstallation = true) {
     entry,
     userRoot
   } = getUserRoot(options2);
-  const data = await parser.load(entry);
+  const data = await parser.load(userRoot, entry);
   const theme = await resolveThemeName(options2.theme || data.config.theme);
   if (promptForInstallation) {
     if (await promptForThemeInstallation(theme) === false)

package/dist/{chunk-FIXL4WBO.mjs → chunk-JORVSTMS.mjs}

@@ -276,7 +276,7 @@ function getDefine(options) {
 
 // node/plugins/loaders.ts
 import { basename as basename2, join as join5 } from "node:path";
-import { isString, isTruthy, notNullish, objectMap, range, slash, uniq as uniq3 } from "@antfu/utils";
+import { isString, isTruthy, notNullish, objectMap, range, uniq as uniq3 } from "@antfu/utils";
 import fg2 from "fast-glob";
 import fs4 from "fs-extra";
 import Markdown from "markdown-it";
@@ -323,7 +323,7 @@ md.use(mila, {
     rel: "noopener"
   }
 });
-function prepareSlideInfo(data) {
+function renderNoteHTML(data) {
   return {
     ...data,
     noteHTML: md.render(data?.note || "")
@@ -348,7 +348,7 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
           const [, no, type] = match;
           const idx = Number.parseInt(no);
           if (type === "json" && req.method === "GET") {
-            res.write(JSON.stringify(prepareSlideInfo(data.slides[idx])));
+            res.write(JSON.stringify(renderNoteHTML(data.slides[idx])));
             return res.end();
           }
           if (type === "json" && req.method === "POST") {
@@ -357,25 +357,21 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
             const onlyNoteChanged = Object.keys(body).length === 2 && "note" in body && body.raw === null;
             if (!onlyNoteChanged)
               hmrPages.add(idx);
-            if (slide.source) {
-              Object.assign(slide.source, body);
-              await parser.saveExternalSlide(data, slide.source.filepath);
-            } else {
-              Object.assign(slide, body);
-              await parser.save(data, entry);
-            }
+            Object.assign(slide.source, body);
+            parser.prettifySlide(slide.source);
+            await parser.save(data.markdownFiles[slide.source.filepath]);
             res.statusCode = 200;
-            res.write(JSON.stringify(prepareSlideInfo(slide)));
+            res.write(JSON.stringify(renderNoteHTML(slide)));
             return res.end();
           }
           next();
         });
       },
       async handleHotUpdate(ctx) {
-        if (!data.entries.some((i) => slash(i) === ctx.file))
+        if (!data.watchFiles.includes(ctx.file))
           return;
         await ctx.read();
-        const newData = await parser.load(entry, data.themeMeta);
+        const newData = await parser.load(userRoot, entry, data.themeMeta);
         const moduleIds = /* @__PURE__ */ new Set();
         if (data.slides.length !== newData.slides.length) {
           moduleIds.add("/@slidev/routes");
@@ -422,7 +418,7 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
             event: "slidev-update",
             data: {
               id: i,
-              data: prepareSlideInfo(newData.slides[i])
+              data: renderNoteHTML(newData.slides[i])
             }
           });
           hmrPages.add(i);
@@ -467,7 +463,7 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
           return generateCustomNavControls();
         if (id === "/@slidev/titles.md") {
           return {
-            code: data.slides.filter(({ frontmatter }) => !frontmatter?.disabled).map(({ title }, i) => `<template ${i === 0 ? "v-if" : "v-else-if"}="+no === ${i + 1}">
+            code: data.slides.map(({ title }, i) => `<template ${i === 0 ? "v-if" : "v-else-if"}="+no === ${i + 1}">
 
 ${title}
 
@@ -491,7 +487,7 @@ ${title}
               };
             } else if (type === "frontmatter") {
               const slideBase = {
-                ...prepareSlideInfo(slide),
+                ...renderNoteHTML(slide),
                 frontmatter: void 0,
                 // remove raw content in build, optimize the bundle size
                 ...mode === "build" ? { raw: "", content: "", note: "" } : {}
@@ -625,7 +621,7 @@ ${title}
   function updateServerWatcher() {
     if (!server)
       return;
-    server.watcher.add(data.entries?.map(slash) || []);
+    server.watcher.add(data.watchFiles);
   }
   function getFrontmatter(pageNo) {
     return {
@@ -812,7 +808,7 @@ defineProps<{ no: number | string }>()`);
     return imports.join("\n");
   }
   async function generateMonacoTypes() {
-    return `void 0; ${parser.scanMonacoModules(data.raw).map((i) => `import('/@slidev-monaco-types/${i}')`).join("\n")}`;
+    return `void 0; ${parser.scanMonacoModules(data.slides.map((s) => s.source.raw).join()).map((i) => `import('/@slidev-monaco-types/${i}')`).join("\n")}`;
   }
   async function generateLayouts() {
     const imports = [];
@@ -836,7 +832,7 @@ ${Object.entries(layouts).map(([k, v]) => `"${k}": ${v}`).join(",\n")}
     const layouts = await getLayouts();
     imports.push(`import __layout__end from '${layouts.end}'`);
     let no = 1;
-    const routes = data.slides.filter(({ frontmatter }) => !frontmatter?.disabled).map((i, idx) => {
+    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} }`;
@@ -922,7 +918,7 @@ export default {
 import { dirname as dirname4, join as join6 } from "node:path";
 import fs5 from "node:fs/promises";
 import process from "node:process";
-import { slash as slash2 } from "@antfu/utils";
+import { slash } from "@antfu/utils";
 import { findDepPkgJsonPath } from "vitefu";
 async function getPackageData(pkg) {
   const pkgJsonPath = await findDepPkgJsonPath(pkg, process.cwd());
@@ -952,7 +948,7 @@ function createMonacoTypesLoader() {
         const [pkgDir, pkgJson, typePath] = packageData;
         return [
           "import * as monaco from 'monaco-editor'",
-          `import Type from "${slash2(join6(pkgDir, typePath))}?raw"`,
+          `import Type from "${slash(join6(pkgDir, typePath))}?raw"`,
           ...Object.keys(pkgJson.dependencies || {}).map((i) => `import "/@slidev-monaco-types/${i}"`),
           `monaco.languages.typescript.typescriptDefaults.addExtraLib(\`declare module "${pkg}" { \${Type} }\`)`
         ].join("\n");
@@ -964,9 +960,9 @@ function createMonacoTypesLoader() {
 // node/plugins/setupClient.ts
 import { existsSync as existsSync2 } from "node:fs";
 import { join as join7, resolve as resolve2 } from "node:path";
-import { slash as slash3, uniq as uniq4 } from "@antfu/utils";
+import { slash as slash2, uniq as uniq4 } from "@antfu/utils";
 function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot }) {
-  const setupEntry = slash3(resolve2(clientRoot, "setup"));
+  const setupEntry = slash2(resolve2(clientRoot, "setup"));
   return {
     name: "slidev:setup",
     enforce: "pre",
@@ -1021,7 +1017,7 @@ function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot
 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";
+import { slash as slash3 } from "@antfu/utils";
 import mila2 from "markdown-it-link-attributes";
 import mif from "markdown-it-footnote";
 
@@ -1471,7 +1467,7 @@ function transformSnippet(md2, options, id) {
     (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);
+      data.watchFiles.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`);
@@ -1499,7 +1495,7 @@ ${content}
 async function createMarkdownPlugin(options, { markdown: mdOptions }) {
   const { data: { config }, roots, mode, entry } = options;
   const setups = [];
-  const entryPath = slash4(entry);
+  const entryPath = slash3(entry);
   if (config.highlighter === "shiki") {
     const MarkdownItShiki = await import("@shikijs/markdown-it").then((r) => r.default);
     const { transformerTwoslash } = await import("@shikijs/vitepress-twoslash");

package/dist/cli.mjs

@@ -9,8 +9,8 @@ import {
   resolveOptions,
   resolveThemeName,
   version
-} from "./chunk-PDMXU2K7.mjs";
-import "./chunk-FIXL4WBO.mjs";
+} from "./chunk-HESHEOWV.mjs";
+import "./chunk-JORVSTMS.mjs";
 import {
   loadSetups
 } from "./chunk-CTBVOVLQ.mjs";
@@ -89,8 +89,12 @@ cli.command(
     default: false,
     type: "boolean",
     describe: "force the optimizer to ignore the cache and re-bundle  "
+  }).option("bind", {
+    type: "string",
+    default: "0.0.0.0",
+    describe: "specify which IP addresses the server should listen on in remote mode"
   }).strict().help(),
-  async ({ entry, theme, port: userPort, open, log, remote, tunnel, force, inspect }) => {
+  async ({ entry, theme, port: userPort, open, log, remote, tunnel, force, inspect, bind }) => {
     if (!fs.existsSync(entry) && !entry.endsWith(".md"))
       entry = `${entry}.md`;
     if (!fs.existsSync(entry)) {
@@ -120,7 +124,7 @@ cli.command(
             port,
             strictPort: true,
             open,
-            host: remote !== void 0 ? "0.0.0.0" : "localhost",
+            host: remote !== void 0 ? bind : "localhost",
             // @ts-expect-error Vite <= 4
             force
           },
@@ -269,7 +273,7 @@ cli.command(
   }).strict().help(),
   async (args) => {
     const { entry, theme, watch, base, download, out, inspect } = args;
-    const { build } = await import("./build-BVDM4ZAC.mjs");
+    const { build } = await import("./build-VKH7FQSN.mjs");
     for (const entryFile of entry) {
       const options = await resolveOptions({ entry: entryFile, theme, inspect }, "build");
       if (download && !options.data.config.download)
@@ -291,9 +295,9 @@ cli.command(
   (args) => commonOptions(args).strict().help(),
   async ({ entry }) => {
     for (const entryFile of entry) {
-      const data = await parser.load(entryFile);
-      parser.prettify(data);
-      await parser.save(data);
+      const md = await parser.parse(await fs.readFile(entryFile, "utf-8"), entryFile);
+      parser.prettify(md);
+      await parser.save(md);
     }
   }
 );
@@ -309,7 +313,8 @@ cli.command(
         default: "theme"
       }),
       async ({ entry, dir, theme: themeInput }) => {
-        const data = await parser.load(entry);
+        const { userRoot } = getUserRoot({ entry });
+        const data = await parser.load(userRoot, entry);
         const theme = await resolveThemeName(themeInput || data.config.theme);
         if (theme === "none") {
           console.error('Cannot eject theme "none"');
@@ -329,9 +334,10 @@ cli.command(
           filter: (i) => !/node_modules|.git/.test(path.relative(root, i))
         });
         const dirPath = `./${dir}`;
-        data.slides[0].frontmatter.theme = dirPath;
-        data.slides[0].raw = null;
-        await parser.save(data);
+        const firstSlide = data.entry.slides[0];
+        firstSlide.frontmatter.theme = dirPath;
+        parser.prettifySlide(firstSlide);
+        await parser.save(data.entry);
         console.log(`Theme "${theme}" ejected successfully to "${dirPath}"`);
       }
     );
@@ -360,7 +366,6 @@ cli.command(
       );
       await server.listen(port);
       printInfo(options);
-      parser.filterDisabled(options.data);
       const result = await exportSlides({
         port,
         ...getExportOptions({ ...args, entry: entryFile }, options)
@@ -405,7 +410,6 @@ cli.command(
       );
       await server.listen(port);
       printInfo(options);
-      parser.filterDisabled(options.data);
       const result = await exportNotes({
         port,
         output: output || (options.data.config.exportFilename ? `${options.data.config.exportFilename}-notes` : `${path.basename(entryFile, ".md")}-export-notes`),

package/dist/index.d.mts

@@ -7,7 +7,7 @@ import { VitePluginConfig } from 'unocss/vite';
 import RemoteAssets from 'vite-plugin-remote-assets';
 import ServerRef from 'vite-plugin-vue-server-ref';
 import { ArgumentsType } from '@antfu/utils';
-import { SlidevMarkdown } from '@slidev/types';
+import { SlidevData } from '@slidev/types';
 import * as vite from 'vite';
 import { InlineConfig, Plugin } from 'vite';
 import * as fs from '@slidev/parser/fs';
@@ -40,7 +40,7 @@ interface SlidevEntryOptions {
     inspect?: boolean;
 }
 interface ResolvedSlidevOptions {
-    data: SlidevMarkdown;
+    data: SlidevData;
     entry: string;
     userRoot: string;
     cliRoot: string;
@@ -64,7 +64,7 @@ interface SlidevPluginOptions extends SlidevEntryOptions {
     unocss?: VitePluginConfig;
 }
 interface SlidevServerOptions {
-    onDataReload?: (newData: SlidevMarkdown, data: SlidevMarkdown) => void;
+    onDataReload?: (newData: SlidevData, data: SlidevData) => void;
 }
 declare function getClientRoot(): Promise<string>;
 declare function getCLIRoot(): string;

package/dist/index.mjs

@@ -9,10 +9,10 @@ import {
   isPath,
   parser,
   resolveOptions
-} from "./chunk-PDMXU2K7.mjs";
+} from "./chunk-HESHEOWV.mjs";
 import {
   ViteSlidevPlugin
-} from "./chunk-FIXL4WBO.mjs";
+} from "./chunk-JORVSTMS.mjs";
 import "./chunk-CTBVOVLQ.mjs";
 import "./chunk-DWXI5WEO.mjs";
 import "./chunk-BXO7ZPPU.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/cli",
-  "version": "0.48.0-beta.2",
+  "version": "0.48.0-beta.3",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -47,9 +47,9 @@
     "@iconify-json/ph": "^1.1.11",
     "@lillallol/outline-pdf": "^4.0.0",
     "@mrdrogdrog/optional": "^1.2.1",
-    "@shikijs/markdown-it": "^1.1.3",
-    "@shikijs/twoslash": "^1.1.3",
-    "@shikijs/vitepress-twoslash": "^1.1.3",
+    "@shikijs/markdown-it": "^1.1.5",
+    "@shikijs/twoslash": "^1.1.5",
+    "@shikijs/vitepress-twoslash": "^1.1.5",
     "@unocss/extractor-mdc": "^0.58.5",
     "@unocss/reset": "^0.58.5",
     "@vitejs/plugin-vue": "^5.0.4",
@@ -87,7 +87,7 @@
     "resolve": "^1.22.8",
     "resolve-from": "^5.0.0",
     "resolve-global": "^2.0.0",
-    "shiki": "^1.1.3",
+    "shiki": "^1.1.5",
     "sirv": "^2.0.4",
     "typescript": "^5.3.3",
     "unocss": "^0.58.5",
@@ -104,9 +104,9 @@
     "vitefu": "^0.2.5",
     "vue": "^3.4.19",
     "yargs": "^17.7.2",
-    "@slidev/client": "0.48.0-beta.2",
-    "@slidev/types": "0.48.0-beta.2",
-    "@slidev/parser": "0.48.0-beta.2"
+    "@slidev/client": "0.48.0-beta.3",
+    "@slidev/parser": "0.48.0-beta.3",
+    "@slidev/types": "0.48.0-beta.3"
   },
   "devDependencies": {
     "@hedgedoc/markdown-it-plugins": "^2.1.4",