@slidev/cli 0.48.0-beta.16 → 0.48.0-beta.17

package/dist/{build-BFCSVURA.mjs → build-TRJ6GBCA.mjs}

@@ -2,7 +2,7 @@ import {
   ViteSlidevPlugin,
   getIndexHtml,
   mergeViteConfigs
-} from "./chunk-TMXTXTYI.mjs";
+} from "./chunk-I5ZCLMQU.mjs";
 import "./chunk-O6TYYGU6.mjs";
 import "./chunk-G3BP3FUT.mjs";
 import "./chunk-BXO7ZPPU.mjs";

package/dist/{chunk-TMXTXTYI.mjs → chunk-I5ZCLMQU.mjs}

@@ -2496,7 +2496,7 @@ var require_semver2 = __commonJS({
 });
 
 // package.json
-var version = "0.48.0-beta.16";
+var version = "0.48.0-beta.17";
 
 // node/common.ts
 import { existsSync, promises as fs } from "node:fs";
@@ -2690,24 +2690,22 @@ function createConfigPlugin(options) {
           rollupOptions: {
             output: {
               chunkFileNames(chunkInfo) {
-                const DEFAULT = "[name]-[hash].js";
-                if (chunkInfo.name.includes("/") || chunkInfo.name === "entry")
+                const DEFAULT = "assets/[name]-[hash].js";
+                if (chunkInfo.name.includes("/"))
                   return DEFAULT;
                 if (chunkInfo.moduleIds.filter((i) => isSlidevClient(i)).length > chunkInfo.moduleIds.length * 0.6)
-                  return "slidev/[name]-[hash].js";
-                if (chunkInfo.moduleIds.filter((i) => i.includes("/monaco-editor/")).length > chunkInfo.moduleIds.length * 0.6)
-                  return "monaco/[name]-[hash].js";
+                  return "assets/slidev/[name]-[hash].js";
+                if (chunkInfo.moduleIds.filter((i) => i.match(/\/monaco-editor(-core)?\//)).length > chunkInfo.moduleIds.length * 0.6)
+                  return "assets/monaco/[name]-[hash].js";
                 return DEFAULT;
               },
               manualChunks(id) {
-                if (id.startsWith("/@slidev-monaco-types/") || id.includes("/@slidev/monaco-types") || id.match(/(\.d\.[mc]?ts|package.json)\?raw$/))
+                if (id.startsWith("/@slidev-monaco-types/") || id.includes("/@slidev/monaco-types") || id.endsWith("?monaco-types&raw"))
                   return "monaco/bundled-types";
                 if (id.includes("/shiki/") || id.includes("/@shikijs/"))
                   return `modules/shiki`;
                 if (id.startsWith("~icons/"))
                   return "modules/unplugin-icons";
-                if (id.includes("/client/main.ts"))
-                  return "entry";
                 const matchedAsyncModule = ASYNC_MODULES.find((i) => id.includes(`/node_modules/${i}`));
                 if (matchedAsyncModule)
                   return `modules/${matchedAsyncModule.replace("@", "").replace("/", "-")}`;
@@ -2757,7 +2755,7 @@ function getDefine(options) {
 // node/plugins/loaders.ts
 import { basename as basename2, join as join4, resolve as resolve2 } from "node:path";
 import { builtinModules } from "node:module";
-import { isString, isTruthy as isTruthy2, notNullish, objectMap, range } from "@antfu/utils";
+import { isString, isTruthy as isTruthy2, notNullish, objectMap, range, uniq as uniq2 } from "@antfu/utils";
 import fg2 from "fast-glob";
 import fs5 from "fs-extra";
 import Markdown2 from "markdown-it";
@@ -3454,7 +3452,7 @@ function transformHighlighter(md2) {
   return md2.replace(
     reCodeBlock,
     (full, lang = "", rangeStr = "", options = "", attrs = "", code) => {
-      const ranges = rangeStr.split(/\|/g).map((i) => i.trim());
+      const ranges = !rangeStr.trim() ? [] : rangeStr.trim().split(/\|/g).map((i) => i.trim());
       code = code.trimEnd();
       options = options.trim() || "{}";
       return `
@@ -4077,7 +4075,7 @@ defineProps<{ no: number | string }>()`);
       "}"
     ].join("\n");
     for (const file of files) {
-      const url = `${toAtFS(resolve2(typesRoot, file))}?raw`;
+      const url = `${toAtFS(resolve2(typesRoot, file))}?monaco-types&raw`;
       result += `addFile(import(${JSON.stringify(url)}), ${JSON.stringify(file)})
 `;
     }
@@ -4096,11 +4094,11 @@ defineProps<{ no: number | string }>()`);
       const moduleName = a.startsWith("@") ? `${a}/${b}` : a;
       return moduleName;
     }
-    for (const specifier of deps) {
+    for (const specifier of uniq2(deps)) {
       if (specifier[0] === ".")
         continue;
       const moduleName = mapModuleNameToModule(specifier);
-      result += `import(${JSON.stringify(`/@slidev-monaco-types/resolve/${moduleName}`)})
+      result += `import(${JSON.stringify(`/@slidev-monaco-types/resolve?pkg=${moduleName}`)})
 `;
     }
     return result;
@@ -4257,7 +4255,7 @@ export default {
 // node/plugins/setupClient.ts
 import { existsSync as existsSync2 } from "node:fs";
 import { join as join5, resolve as resolve3 } from "node:path";
-import { slash as slash2, uniq as uniq2 } from "@antfu/utils";
+import { slash as slash2, uniq as uniq3 } from "@antfu/utils";
 function createClientSetupPlugin({ themeRoots, addonRoots, userRoot, clientRoot }) {
   const setupEntry = slash2(resolve3(clientRoot, "setup"));
   return {
@@ -4272,7 +4270,7 @@ function createClientSetupPlugin({ themeRoots, addonRoots, userRoot, clientRoot
         const name = id.slice(setupEntry.length + 1).replace(/\?.*$/, "");
         const imports = [];
         const injections = [];
-        const setups = uniq2([
+        const setups = uniq3([
           ...themeRoots,
           ...addonRoots,
           userRoot
@@ -4348,7 +4346,7 @@ function createMonacoTypesLoader({ userRoot }) {
       return null;
     },
     async load(id) {
-      const matchResolve = id.match(/^\/\@slidev-monaco-types\/resolve\/(.*?)(?:\?importer=(.*))?$/);
+      const matchResolve = id.match(/^\/\@slidev-monaco-types\/resolve\?pkg=(.*?)(?:&importer=(.*))?$/);
       if (matchResolve) {
         const [_, pkg, importer = userRoot] = matchResolve;
         const resolvedDeps = resolvedDepsMap[importer] ??= /* @__PURE__ */ new Set();
@@ -4362,23 +4360,24 @@ function createMonacoTypesLoader({ userRoot }) {
         const pkgJson = JSON.parse(await fs6.readFile(pkgJsonPath, "utf-8"));
         const deps = pkgJson.dependencies ?? {};
         return [
-          `import "/@slidev-monaco-types/load/${slash3(root)}&name=${pkgJson.name}"`,
-          ...Object.keys(deps).map((dep) => `import "/@slidev-monaco-types/resolve/${dep}?importer=${slash3(root)}"`)
+          `import "/@slidev-monaco-types/load?root=${slash3(root)}&name=${pkgJson.name}"`,
+          ...Object.keys(deps).map((dep) => `import "/@slidev-monaco-types/resolve?pkg=${dep}&importer=${slash3(root)}"`)
         ].join("\n");
       }
-      const matchLoad = id.match(/^\/\@slidev-monaco-types\/load(\/.*?)&name=(.*)$/);
+      const matchLoad = id.match(/^\/\@slidev-monaco-types\/load\?root=(.*?)&name=(.*)$/);
       if (matchLoad) {
         const [_, root, name] = matchLoad;
         const files = await fg3(
           [
-            "**/*.d.ts",
-            "**/*.d.mts",
-            "**/*.d.cts",
+            "**/*.ts",
+            "**/*.mts",
+            "**/*.cts",
             "package.json"
           ],
           {
             cwd: root,
-            followSymbolicLinks: true
+            followSymbolicLinks: true,
+            ignore: ["**/node_modules/**"]
           }
         );
         if (!files.length)
@@ -4391,7 +4390,7 @@ function createMonacoTypesLoader({ userRoot }) {
           '  monaco.languages.typescript.typescriptDefaults.addExtraLib(code, "file://" + path)',
           '  monaco.editor.createModel(code, "javascript", monaco.Uri.file(path))',
           "}",
-          ...files.map((file) => `addFile(import(${JSON.stringify(`${toAtFS(resolve4(root, file))}?raw`)}), ${JSON.stringify(file)})`)
+          ...files.map((file) => `addFile(import(${JSON.stringify(`${toAtFS(resolve4(root, file))}?monaco-types&raw`)}), ${JSON.stringify(file)})`)
         ].join("\n");
       }
     }

package/dist/{chunk-6SJIO2WJ.mjs → chunk-M42N6HWT.mjs}

@@ -4,7 +4,7 @@ import {
   mergeViteConfigs,
   require_semver,
   version
-} from "./chunk-TMXTXTYI.mjs";
+} from "./chunk-I5ZCLMQU.mjs";
 import {
   createResolver,
   getRoots,

package/dist/cli.mjs

@@ -5,10 +5,10 @@ import {
   resolveAddons,
   resolveOptions,
   resolveTheme
-} from "./chunk-6SJIO2WJ.mjs";
+} from "./chunk-M42N6HWT.mjs";
 import {
   version
-} from "./chunk-TMXTXTYI.mjs";
+} from "./chunk-I5ZCLMQU.mjs";
 import {
   loadSetups
 } from "./chunk-O6TYYGU6.mjs";
@@ -277,7 +277,7 @@ cli.command(
   }).strict().help(),
   async (args) => {
     const { entry, theme, watch, base, download, out, inspect } = args;
-    const { build } = await import("./build-BFCSVURA.mjs");
+    const { build } = await import("./build-TRJ6GBCA.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-6SJIO2WJ.mjs";
+} from "./chunk-M42N6HWT.mjs";
 import {
   ViteSlidevPlugin
-} from "./chunk-TMXTXTYI.mjs";
+} from "./chunk-I5ZCLMQU.mjs";
 import "./chunk-O6TYYGU6.mjs";
 import "./chunk-G3BP3FUT.mjs";
 import "./chunk-BXO7ZPPU.mjs";

package/package.json

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