@slidev/cli 0.49.5 → 0.49.6

package/dist/{build-KJ6XT4WV.mjs → build-F3OEADD3.mjs}

@@ -2,7 +2,7 @@ import {
   ViteSlidevPlugin,
   getIndexHtml,
   mergeViteConfigs
-} from "./chunk-TQT222QW.mjs";
+} from "./chunk-4Y3EWPMH.mjs";
 import "./chunk-LOUKLO2C.mjs";
 import "./chunk-RG2EEPCO.mjs";
 import "./chunk-BXO7ZPPU.mjs";

package/dist/{chunk-TQT222QW.mjs → chunk-4Y3EWPMH.mjs}

@@ -7143,7 +7143,7 @@ var require_dist = __commonJS({
 });
 
 // package.json
-var version = "0.49.5";
+var version = "0.49.6";
 
 // node/commands/shared.ts
 import { existsSync, promises as fs } from "node:fs";
@@ -7287,8 +7287,8 @@ async function mergeViteConfigs({ roots, entry }, viteConfig, config, command) {
 }
 
 // node/vite/index.ts
-import { join as join8 } from "node:path";
-import { existsSync as existsSync5 } from "node:fs";
+import { join as join9 } from "node:path";
+import { existsSync as existsSync6 } from "node:fs";
 import process2 from "node:process";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import Icons from "unplugin-icons/vite";
@@ -7604,65 +7604,57 @@ console.warn('/@slidev/titles.md is deprecated, import from #slidev/title-render
   }
 };
 
-// node/virtual/global-components.ts
+// node/virtual/global-layers.ts
 import { existsSync as existsSync2 } from "node:fs";
 import { join as join4 } from "node:path";
-function createGlobalComponentTemplate(layer) {
-  return {
-    id: `/@slidev/global-components/${layer}`,
-    getContent({ roots }) {
-      const components = roots.flatMap((root) => {
-        if (layer === "top") {
-          return [
-            join4(root, "global.vue"),
-            join4(root, "global-top.vue"),
-            join4(root, "GlobalTop.vue")
-          ];
-        } else {
-          return [
-            join4(root, "global-bottom.vue"),
-            join4(root, "GlobalBottom.vue")
-          ];
-        }
-      }).filter((i) => existsSync2(i));
-      const imports = components.map((i, idx) => `import __n${idx} from '${toAtFS(i)}'`).join("\n");
-      const render = components.map((i, idx) => `h(__n${idx})`).join(",");
-      return `
-${imports}
-import { h } from 'vue'
-export default {
-render() {
-  return [${render}]
-}
-}
-`;
-    }
-  };
-}
+var templateGlobalLayers = {
+  id: `/@slidev/global-layers`,
+  getContent({ roots }) {
+    const imports = [];
+    let n = 0;
+    function getComponent(names) {
+      const components = roots.flatMap((root) => names.map((name) => join4(root, name))).filter((i) => existsSync2(i));
+      imports.push(components.map((path4, i) => `import __n${n}_${i} from '${toAtFS(path4)}'`).join("\n"));
+      const render = components.map((_, i) => `h(__n${n}_${i})`).join(",");
+      n++;
+      return `{ render: () => [${render}] }`;
+    }
+    const globalTop = getComponent(["global.vue", "global-top.vue", "GlobalTop.vue"]);
+    const globalBottom = getComponent(["global-bottom.vue", "GlobalBottom.vue"]);
+    const slideTop = getComponent(["slide-top.vue", "SlideTop.vue"]);
+    const slideBottom = getComponent(["slide-bottom.vue", "SlideBottom.vue"]);
+    return [
+      imports.join("\n"),
+      `import { h } from 'vue'`,
+      `export const GlobalTop = ${globalTop}`,
+      `export const GlobalBottom = ${globalBottom}`,
+      `export const SlideTop = ${slideTop}`,
+      `export const SlideBottom = ${slideBottom}`
+    ].join("\n");
+  }
+};
+
+// node/virtual/nav-controls.ts
+import { existsSync as existsSync3 } from "node:fs";
+import { join as join5 } from "node:path";
 var templateNavControls = {
   id: "/@slidev/custom-nav-controls",
   getContent({ roots }) {
     const components = roots.flatMap((root) => {
       return [
-        join4(root, "custom-nav-controls.vue"),
-        join4(root, "CustomNavControls.vue")
+        join5(root, "custom-nav-controls.vue"),
+        join5(root, "CustomNavControls.vue")
       ];
-    }).filter((i) => existsSync2(i));
+    }).filter((i) => existsSync3(i));
     const imports = components.map((i, idx) => `import __n${idx} from '${toAtFS(i)}'`).join("\n");
     const render = components.map((i, idx) => `h(__n${idx})`).join(",");
-    return `
-${imports}
+    return `${imports}
 import { h } from 'vue'
 export default {
-render() {
-  return [${render}]
-}
-}
-`;
+  render: () => [${render}],
+}`;
   }
 };
-var templateGlobalTop = createGlobalComponentTemplate("top");
-var templateGlobalBottom = createGlobalComponentTemplate("bottom");
 
 // node/virtual/layouts.ts
 import { objectMap } from "@antfu/utils";
@@ -7716,7 +7708,7 @@ var templateMonacoRunDeps = {
 
 // node/virtual/monaco-types.ts
 import { builtinModules } from "node:module";
-import { join as join5, resolve as resolve3 } from "node:path";
+import { join as join6, resolve as resolve3 } from "node:path";
 import fg2 from "fast-glob";
 import { uniq as uniq3 } from "@antfu/utils";
 var templateMonacoTypes = {
@@ -7724,7 +7716,7 @@ var templateMonacoTypes = {
   getContent: async ({ userRoot, data }) => {
     if (!data.features.monaco)
       return "";
-    const typesRoot = join5(userRoot, "snippets");
+    const typesRoot = join6(userRoot, "snippets");
     const files = await fg2(["**/*.ts", "**/*.mts", "**/*.cts"], { cwd: typesRoot });
     let result = 'import { addFile } from "@slidev/client/setup/monaco.ts"\n';
     for (const file of files) {
@@ -7759,16 +7751,16 @@ var templateMonacoTypes = {
 };
 
 // node/virtual/setups.ts
-import { existsSync as existsSync3 } from "node:fs";
-import { join as join6 } from "node:path";
+import { existsSync as existsSync4 } from "node:fs";
+import { join as join7 } from "node:path";
 function createSetupTemplate(name) {
   return {
     id: `/@slidev/setups/${name}`,
     getContent({ roots }) {
       const setups = roots.flatMap((i) => {
-        const path4 = join6(i, "setup", name);
+        const path4 = join7(i, "setup", name);
         return [".ts", ".mts", ".js", ".mjs"].map((ext) => path4 + ext);
-      }).filter((i) => existsSync3(i));
+      }).filter((i) => existsSync4(i));
       const imports = [];
       setups.forEach((path4, idx) => {
         imports.push(`import __n${idx} from '${toAtFS(path4)}'`);
@@ -7905,13 +7897,13 @@ ${slides.join(",\n")}
 };
 
 // node/virtual/styles.ts
-import { join as join7 } from "node:path";
-import { existsSync as existsSync4 } from "node:fs";
+import { join as join8 } from "node:path";
+import { existsSync as existsSync5 } from "node:fs";
 var templateStyle = {
   id: "/@slidev/styles",
   getContent: async ({ data, clientRoot, roots }) => {
     function resolveUrlOfClient(name) {
-      return toAtFS(join7(clientRoot, name));
+      return toAtFS(join8(clientRoot, name));
     }
     const imports = [
       `import "${resolveUrlOfClient("styles/vars.css")}"`,
@@ -7922,14 +7914,14 @@ var templateStyle = {
     ];
     for (const root of roots) {
       const styles = [
-        join7(root, "styles", "index.ts"),
-        join7(root, "styles", "index.js"),
-        join7(root, "styles", "index.css"),
-        join7(root, "styles.css"),
-        join7(root, "style.css")
+        join8(root, "styles", "index.ts"),
+        join8(root, "styles", "index.js"),
+        join8(root, "styles", "index.css"),
+        join8(root, "styles.css"),
+        join8(root, "style.css")
       ];
       for (const style of styles) {
-        if (existsSync4(style)) {
+        if (existsSync5(style)) {
           imports.push(`import "${toAtFS(style)}"`);
           continue;
         }
@@ -7991,8 +7983,7 @@ var templates = [
   templateMonacoRunDeps,
   templateConfigs,
   templateStyle,
-  templateGlobalBottom,
-  templateGlobalTop,
+  templateGlobalLayers,
   templateNavControls,
   templateSlides,
   templateLayouts,
@@ -9493,7 +9484,7 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
     data: { config }
   } = options;
   const drawingData = await loadDrawings(options);
-  const publicRoots = [...themeRoots, ...addonRoots].map((i) => join8(i, "public")).filter(existsSync5);
+  const publicRoots = [...themeRoots, ...addonRoots].map((i) => join9(i, "public")).filter(existsSync6);
   const plugins = [
     createMarkdownPlugin(options, pluginOptions),
     createVuePlugin(options, pluginOptions),
@@ -9502,11 +9493,11 @@ async function ViteSlidevPlugin(options, pluginOptions, serverOptions = {}) {
     Components({
       extensions: ["vue", "md", "js", "ts", "jsx", "tsx"],
       dirs: [
-        join8(options.clientRoot, "builtin"),
-        ...roots.map((i) => join8(i, "components")),
+        join9(options.clientRoot, "builtin"),
+        ...roots.map((i) => join9(i, "components")),
         "src/components",
         "components",
-        join8(process2.cwd(), "components")
+        join9(process2.cwd(), "components")
       ],
       include: [/\.vue$/, /\.vue\?vue/, /\.vue\?v=/, /\.md$/, /\.md\?vue/],
       exclude: [],

package/dist/{chunk-5LCF46EH.mjs → chunk-UFFECLAV.mjs}

@@ -2,7 +2,7 @@ import {
   ViteSlidevPlugin,
   mergeViteConfigs,
   version
-} from "./chunk-TQT222QW.mjs";
+} from "./chunk-4Y3EWPMH.mjs";
 import {
   createResolver,
   getRoots,

package/dist/cli.mjs

@@ -5,10 +5,10 @@ import {
   resolveAddons,
   resolveOptions,
   resolveTheme
-} from "./chunk-5LCF46EH.mjs";
+} from "./chunk-UFFECLAV.mjs";
 import {
   version
-} from "./chunk-TQT222QW.mjs";
+} from "./chunk-4Y3EWPMH.mjs";
 import {
   loadSetups
 } from "./chunk-LOUKLO2C.mjs";
@@ -328,7 +328,7 @@ cli.command(
   }).strict().help(),
   async (args) => {
     const { entry, theme, base, download, out, inspect } = args;
-    const { build } = await import("./build-KJ6XT4WV.mjs");
+    const { build } = await import("./build-F3OEADD3.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-5LCF46EH.mjs";
+} from "./chunk-UFFECLAV.mjs";
 import {
   ViteSlidevPlugin
-} from "./chunk-TQT222QW.mjs";
+} from "./chunk-4Y3EWPMH.mjs";
 import "./chunk-LOUKLO2C.mjs";
 import "./chunk-RG2EEPCO.mjs";
 import "./chunk-BXO7ZPPU.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/cli",
-  "version": "0.49.5",
+  "version": "0.49.6",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -109,9 +109,9 @@
     "vitefu": "^0.2.5",
     "vue": "^3.4.27",
     "yargs": "^17.7.2",
-    "@slidev/client": "0.49.5",
-    "@slidev/parser": "0.49.5",
-    "@slidev/types": "0.49.5"
+    "@slidev/client": "0.49.6",
+    "@slidev/types": "0.49.6",
+    "@slidev/parser": "0.49.6"
   },
   "devDependencies": {
     "@hedgedoc/markdown-it-plugins": "^2.1.4",