@slidev/cli 0.35.6 → 0.36.0

package/dist/{build-JJPJN7L3.mjs → build-3YQL2K7P.mjs}

@@ -2,12 +2,12 @@ import {
   ViteSlidevPlugin,
   getIndexHtml,
   mergeViteConfigs
-} from "./chunk-IY7QSYZ2.mjs";
+} from "./chunk-PIEUNXTX.mjs";
 import {
   __require,
   __toESM,
   init_esm_shims
-} from "./chunk-57E5R3IA.mjs";
+} from "./chunk-IAMILGBS.mjs";
 
 // node/build.ts
 init_esm_shims();
@@ -650,7 +650,7 @@ function build_default(dir, opts = {}) {
 import { blue, yellow } from "kolorist";
 async function build(options, viteConfig = {}) {
   const indexPath = resolve3(options.userRoot, "index.html");
-  const rawConfig = await resolveConfig({}, "build");
+  const rawConfig = await resolveConfig({}, "build", options.entry);
   const pluginOptions = rawConfig.slidev || {};
   let originalIndexHTML;
   if (fs2.existsSync(indexPath))
@@ -725,7 +725,7 @@ async function build(options, viteConfig = {}) {
     await fs2.writeFile(redirectsPath, `${config.base}*    ${config.base}index.html   200
 `, "utf-8");
   if ([true, "true", "auto"].includes(options.data.config.download)) {
-    const { exportSlides } = await Promise.resolve().then(() => __toESM(__require("./export-I2KYMDHO.mjs")));
+    const { exportSlides } = await Promise.resolve().then(() => __toESM(__require("./export-26FXNM7P.mjs")));
     const port = 12445;
     const app = connect();
     const server = http.createServer(app);

package/dist/{build-3OBKYP4E.js → build-DIGRXRLK.js}

@@ -2,15 +2,15 @@
 
 
 
-var _chunkYUXTNPKAjs = require('./chunk-YUXTNPKA.js');
+var _chunkS74C6Q74js = require('./chunk-S74C6Q74.js');
 
 
 
 
-var _chunkAW7KQET4js = require('./chunk-AW7KQET4.js');
+var _chunk74QPSS6Tjs = require('./chunk-74QPSS6T.js');
 
 // node/build.ts
-_chunkAW7KQET4js.init_cjs_shims.call(void 0, );
+_chunk74QPSS6Tjs.init_cjs_shims.call(void 0, );
 var _path = require('path');
 var _http = require('http'); var _http2 = _interopRequireDefault(_http);
 var _fsextra = require('fs-extra'); var _fsextra2 = _interopRequireDefault(_fsextra);
@@ -18,12 +18,12 @@ var _vite = require('vite');
 var _connect = require('connect'); var _connect2 = _interopRequireDefault(_connect);
 
 // ../../node_modules/.pnpm/sirv@2.0.2/node_modules/sirv/build.mjs
-_chunkAW7KQET4js.init_cjs_shims.call(void 0, );
+_chunk74QPSS6Tjs.init_cjs_shims.call(void 0, );
 var _fs = require('fs'); var fs = _interopRequireWildcard(_fs);
 
 
 // ../../node_modules/.pnpm/totalist@3.0.0/node_modules/totalist/sync/index.mjs
-_chunkAW7KQET4js.init_cjs_shims.call(void 0, );
+_chunk74QPSS6Tjs.init_cjs_shims.call(void 0, );
 
 
 function totalist(dir, callback, pre = "") {
@@ -38,7 +38,7 @@ function totalist(dir, callback, pre = "") {
 }
 
 // ../../node_modules/.pnpm/@polka+url@1.0.0-next.21/node_modules/@polka/url/build.mjs
-_chunkAW7KQET4js.init_cjs_shims.call(void 0, );
+_chunk74QPSS6Tjs.init_cjs_shims.call(void 0, );
 var _querystring = require('querystring'); var qs = _interopRequireWildcard(_querystring);
 function parse2(req) {
   let raw = req.url;
@@ -62,7 +62,7 @@ function parse2(req) {
 }
 
 // ../../node_modules/.pnpm/mrmime@1.0.0/node_modules/mrmime/index.mjs
-_chunkAW7KQET4js.init_cjs_shims.call(void 0, );
+_chunk74QPSS6Tjs.init_cjs_shims.call(void 0, );
 var mimes = {
   "ez": "application/andrew-inset",
   "aw": "application/applixware",
@@ -650,21 +650,21 @@ function build_default(dir, opts = {}) {
 var _kolorist = require('kolorist');
 async function build(options, viteConfig = {}) {
   const indexPath = _path.resolve.call(void 0, options.userRoot, "index.html");
-  const rawConfig = await _vite.resolveConfig.call(void 0, {}, "build");
+  const rawConfig = await _vite.resolveConfig.call(void 0, {}, "build", options.entry);
   const pluginOptions = rawConfig.slidev || {};
   let originalIndexHTML;
   if (_fsextra2.default.existsSync(indexPath))
     originalIndexHTML = await _fsextra2.default.readFile(indexPath, "utf-8");
-  await _fsextra2.default.writeFile(indexPath, await _chunkYUXTNPKAjs.getIndexHtml.call(void 0, options), "utf-8");
+  await _fsextra2.default.writeFile(indexPath, await _chunkS74C6Q74js.getIndexHtml.call(void 0, options), "utf-8");
   let config = void 0;
   try {
-    const inlineConfig = await _chunkYUXTNPKAjs.mergeViteConfigs.call(void 0, 
+    const inlineConfig = await _chunkS74C6Q74js.mergeViteConfigs.call(void 0, 
       options,
       viteConfig,
       {
         root: options.userRoot,
         plugins: [
-          await _chunkYUXTNPKAjs.ViteSlidevPlugin.call(void 0, options, pluginOptions),
+          await _chunkS74C6Q74js.ViteSlidevPlugin.call(void 0, options, pluginOptions),
           {
             name: "resolve-config",
             configResolved(_config) {
@@ -685,7 +685,7 @@ async function build(options, viteConfig = {}) {
       } else {
         console.log(_kolorist.blue.call(void 0, "  building for Monaco...\n"));
         await _vite.build.call(void 0, 
-          await _chunkYUXTNPKAjs.mergeViteConfigs.call(void 0, 
+          await _chunkS74C6Q74js.mergeViteConfigs.call(void 0, 
             options,
             inlineConfig,
             {
@@ -725,7 +725,7 @@ async function build(options, viteConfig = {}) {
     await _fsextra2.default.writeFile(redirectsPath, `${config.base}*    ${config.base}index.html   200
 `, "utf-8");
   if ([true, "true", "auto"].includes(options.data.config.download)) {
-    const { exportSlides } = await Promise.resolve().then(() => _chunkAW7KQET4js.__toESM.call(void 0, _chunkAW7KQET4js.__require.call(void 0, "./export-3CTBMUMP.js")));
+    const { exportSlides } = await Promise.resolve().then(() => _chunk74QPSS6Tjs.__toESM.call(void 0, _chunk74QPSS6Tjs.__require.call(void 0, "./export-WKFHZNBT.js")));
     const port = 12445;
     const app = _connect2.default.call(void 0, );
     const server = _http2.default.createServer(app);

package/dist/{chunk-AW7KQET4.js → chunk-74QPSS6T.js}

@@ -58,9 +58,9 @@ var __privateWrapper = (obj, member, setter, getter) => {
   };
 };
 
-// ../../node_modules/.pnpm/tsup@5.12.9_typescript@4.8.2/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@5.12.9_typescript@4.8.3/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@5.12.9_typescript@4.8.2/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@5.12.9_typescript@4.8.3/node_modules/tsup/assets/cjs_shims.js"() {
   }
 });
 

package/dist/{chunk-57E5R3IA.mjs → chunk-IAMILGBS.mjs}

@@ -58,12 +58,12 @@ var __privateWrapper = (obj, member, setter, getter) => {
   };
 };
 
-// ../../node_modules/.pnpm/tsup@5.12.9_typescript@4.8.2/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@5.12.9_typescript@4.8.3/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename, getDirname, __dirname, __filename;
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@5.12.9_typescript@4.8.2/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@5.12.9_typescript@4.8.3/node_modules/tsup/assets/esm_shims.js"() {
     getFilename = () => fileURLToPath(import.meta.url);
     getDirname = () => path.dirname(getFilename());
     __dirname = /* @__PURE__ */ getDirname();

package/dist/{chunk-3VPTNK23.mjs → chunk-MTVLPZ5A.mjs}

@@ -1,7 +1,7 @@
 import {
   ViteSlidevPlugin,
   mergeViteConfigs
-} from "./chunk-IY7QSYZ2.mjs";
+} from "./chunk-PIEUNXTX.mjs";
 import {
   __commonJS,
   __dirname,
@@ -13,7 +13,7 @@ import {
   init_esm_shims,
   packageExists,
   resolveImportPath
-} from "./chunk-57E5R3IA.mjs";
+} from "./chunk-IAMILGBS.mjs";
 
 // ../../node_modules/.pnpm/semver@7.3.7/node_modules/semver/internal/constants.js
 var require_constants = __commonJS({
@@ -2383,7 +2383,7 @@ init_esm_shims();
 import { join } from "path";
 import { createServer as createViteServer, resolveConfig } from "vite";
 async function createServer(options, viteConfig = {}, serverOptions = {}) {
-  const rawConfig = await resolveConfig({}, "serve");
+  const rawConfig = await resolveConfig({}, "serve", options.entry);
   const pluginOptions = rawConfig.slidev || {};
   process.env.EDITOR = process.env.EDITOR || "code";
   const server = await createViteServer(
@@ -2411,7 +2411,7 @@ init_esm_shims();
 import * as parser from "@slidev/parser/fs";
 
 // package.json
-var version = "0.35.6";
+var version = "0.36.0";
 
 // node/themes.ts
 init_esm_shims();
@@ -9660,7 +9660,7 @@ async function resolveOptions(options, mode2, promptForInstallation = true) {
     const themeMeta = await getThemeMeta(theme, join2(themeRoots[0], "package.json"));
     data.themeMeta = themeMeta;
     if (themeMeta)
-      data.config = parser.resolveConfig(data.headmatter, themeMeta);
+      data.config = parser.resolveConfig(data.headmatter, themeMeta, options.entry);
   }
   debug({
     config: data.config,

package/dist/{chunk-IY7QSYZ2.mjs → chunk-PIEUNXTX.mjs}

@@ -9,7 +9,7 @@ import {
   resolveImportPath,
   stringifyMarkdownTokens,
   toAtFS
-} from "./chunk-57E5R3IA.mjs";
+} from "./chunk-IAMILGBS.mjs";
 
 // ../../node_modules/.pnpm/fast-deep-equal@3.1.3/node_modules/fast-deep-equal/index.js
 var require_fast_deep_equal = __commonJS({
@@ -218,7 +218,10 @@ import { basename, dirname as dirname2, join as join2, resolve as resolve3 } fro
 import fs2 from "fs-extra";
 import fg from "fast-glob";
 function resolveDrawingsDir(options) {
-  return options.data.config.drawings.persist ? resolve3(dirname2(options.entry), options.data.config.drawings.persist) : void 0;
+  return options.data.config.drawings.persist ? resolve3(
+    dirname2(options.entry),
+    options.data.config.drawings.persist
+  ) : void 0;
 }
 async function loadDrawings(options) {
   const dir = resolveDrawingsDir(options);
@@ -273,11 +276,11 @@ var dependencies = {
   "@antfu/utils": "^0.5.2",
   "@slidev/parser": "workspace:*",
   "@slidev/types": "workspace:*",
-  "@unocss/reset": "^0.45.14",
-  "@vueuse/core": "^9.1.1",
-  "@vueuse/head": "^0.7.9",
-  "@vueuse/math": "^9.1.1",
-  "@vueuse/motion": "^2.0.0-beta.18",
+  "@unocss/reset": "^0.45.20",
+  "@vueuse/core": "^9.2.0",
+  "@vueuse/head": "^0.7.10",
+  "@vueuse/math": "^9.2.0",
+  "@vueuse/motion": "^2.0.0-beta.22",
   codemirror: "^5.65.5",
   defu: "^6.1.0",
   drauu: "^0.3.1",
@@ -291,9 +294,9 @@ var dependencies = {
   prettier: "^2.7.1",
   recordrtc: "^5.6.2",
   resolve: "^1.22.1",
-  unocss: "^0.45.14",
-  "vite-plugin-windicss": "^1.8.7",
-  vue: "^3.2.38",
+  unocss: "^0.45.20",
+  "vite-plugin-windicss": "^1.8.8",
+  vue: "^3.2.39",
   "vue-router": "^4.1.5",
   "vue-starport": "^0.3.0",
   windicss: "^3.5.6"
@@ -565,7 +568,8 @@ function createSlidesLoader({ data, entry, clientRoot, themeRoots, addonRoots, u
             const file = `${slidePrefix}${i + 1}.md`;
             try {
               const md2 = await transformMarkdown(await MarkdownPlugin.transform((_a2 = newData.slides[i]) == null ? void 0 : _a2.content, file), i, newData);
-              return await VuePlugin.handleHotUpdate({
+              const handleHotUpdate = "handler" in VuePlugin.handleHotUpdate ? VuePlugin.handleHotUpdate.handler : VuePlugin.handleHotUpdate;
+              return await handleHotUpdate({
                 ...ctx,
                 modules: Array.from(ctx.server.moduleGraph.getModulesByFile(file) || []),
                 file,
@@ -1002,10 +1006,13 @@ function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot
     enforce: "pre",
     async transform(code, id) {
       if (id.startsWith(setupEntry)) {
+        let getInjections2 = function(isAwait = false, isChained = false) {
+          return injections.join("\n").replace(/:AWAIT:/g, isAwait ? "await " : "").replace(/(,\s*)?:LAST:/g, isChained ? "$1injection_return" : "");
+        };
+        var getInjections = getInjections2;
         const name = id.slice(setupEntry.length + 1);
         const imports = [];
         const injections = [];
-        const asyncInjections = [];
         const setups = uniq5([
           ...themeRoots,
           ...addonRoots,
@@ -1015,41 +1022,28 @@ function createClientSetupPlugin({ clientRoot, themeRoots, addonRoots, userRoot
           if (!existsSync5(path))
             return;
           imports.push(`import __n${idx} from '${toAtFS(path)}'`);
-          let fn = `__n${idx}`;
-          let awaitFn = `await __n${idx}`;
-          if (/\binjection_return\b/g.test(code)) {
+          let fn = `:AWAIT:__n${idx}`;
+          if (/\binjection_return\b/g.test(code))
             fn = `injection_return = ${fn}`;
-            awaitFn = `injection_return = ${awaitFn}`;
-          }
           if (/\binjection_arg\b/g.test(code)) {
             fn += "(";
-            awaitFn += "(";
             const matches = Array.from(code.matchAll(/\binjection_arg(_\d+)?\b/g));
             const dedupedMatches = Array.from(new Set(matches.map((m) => m[0])));
-            dedupedMatches.forEach((key, index) => {
-              const isLast = index === dedupedMatches.length - 1;
-              const arg = key + (isLast ? "" : ",");
-              fn += arg;
-              awaitFn += arg;
-            });
-            fn += ")";
-            awaitFn += ")";
+            fn += dedupedMatches.join(", ");
+            fn += ", :LAST:)";
           } else {
-            fn += "()";
-            awaitFn += "()";
+            fn += "(:LAST:)";
           }
           injections.push(
             `// ${path}`,
             fn
           );
-          asyncInjections.push(
-            `// ${path}`,
-            awaitFn
-          );
         });
         code = code.replace("/* __imports__ */", imports.join("\n"));
-        code = code.replace("/* __injections__ */", injections.join("\n"));
-        code = code.replace("/* __async_injections__ */", asyncInjections.join("\n"));
+        code = code.replace("/* __injections__ */", getInjections2());
+        code = code.replace("/* __async_injections__ */", getInjections2(true));
+        code = code.replace("/* __chained_injections__ */", getInjections2(false, true));
+        code = code.replace("/* __chained_async_injections__ */", getInjections2(true, true));
         return code;
       }
       return null;