vuepress-plugin-md-power 1.0.0-rc.103 → 1.0.0-rc.105

package/lib/client/components/CodeEditor.vue

@@ -2,6 +2,7 @@
 import type { HighlighterCore } from 'shiki/core'
 import editorData from '@internal/md-power/replEditorData'
 import { createHighlighterCore } from 'shiki/core'
+import { createOnigurumaEngine } from 'shiki/engine/oniguruma'
 import { onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
 import { resolveCodeInfo } from '../composables/codeRepl.js'
 
@@ -20,7 +21,7 @@ async function init() {
   highlighter = await createHighlighterCore({
     themes: 'light' in theme && 'dark' in theme ? [theme.light, theme.dark] : [theme],
     langs: Object.keys(grammars).map(key => grammars[key]),
-    loadWasm: () => import('shiki/wasm'),
+    engine: createOnigurumaEngine(() => import('shiki/wasm')),
   })
 }
 

package/lib/client/components/Tabs.vue

@@ -248,30 +248,30 @@ function onTabNavClick(index: number): void {
 }
 
 .vp-doc .hint-container.info .vp-tabs .vp-tabs-nav {
-  background: var(--vp-custom-block-info-code-bg);
+  --vp-code-tab-bg: var(--vp-custom-block-info-code-bg);
 }
 
 .vp-doc .hint-container.note .vp-tabs .vp-tabs-nav {
-  background: var(--vp-custom-block-note-code-bg);
+  --vp-code-tab-bg: var(--vp-custom-block-note-code-bg);
 }
 
 .vp-doc .hint-container.tip .vp-tabs .vp-tabs-nav {
-  background: var(--vp-custom-block-tip-code-bg);
+  --vp-code-tab-bg: var(--vp-custom-block-tip-code-bg);
 }
 
 .vp-doc .hint-container.warning .vp-tabs .vp-tabs-nav {
-  background: var(--vp-custom-block-warning-code-bg);
+  --vp-code-tab-bg: var(--vp-custom-block-warning-code-bg);
 }
 
 .vp-doc .hint-container.danger .vp-tabs .vp-tabs-nav {
-  background: var(--vp-custom-block-danger-code-bg);
+  --vp-code-tab-bg: var(--vp-custom-block-danger-code-bg);
 }
 
 .vp-doc .hint-container.caution .vp-tabs .vp-tabs-nav {
-  background: var(--vp-custom-block-caution-code-bg);
+  --vp-code-tab-bg: var(--vp-custom-block-caution-code-bg);
 }
 
 .vp-doc .hint-container.important .vp-tabs .vp-tabs-nav {
-  background: var(--vp-custom-block-important-code-bg);
+  --vp-code-tab-bg: var(--vp-custom-block-important-code-bg);
 }
 </style>

package/lib/node/index.js

@@ -4,7 +4,7 @@ import http from "node:https";
 import { URL } from "node:url";
 import { isLinkExternal, isLinkHttp } from "@vuepress/helper";
 import imageSize from "image-size";
-import { fs, path } from "vuepress/utils";
+import { fs, logger, path } from "vuepress/utils";
 
 // src/node/utils/resolveAttrs.ts
 var RE_ATTR_VALUE = /(?:^|\s+)(?<attr>[\w-]+)(?:=\s*(?<quote>['"])(?<value>.+?)\k<quote>)?(?:\s+|$)/;
@@ -52,10 +52,14 @@ async function imageSizePlugin(app, md, type2 = false) {
   if (!app.env.isBuild || !type2)
     return;
   if (type2 === "all") {
+    const start = performance.now();
     try {
       await scanRemoteImageSize(app);
     } catch {
     }
+    if (app.env.isDebug) {
+      logger.info(`[vuepress-plugin-md-power] imageSizePlugin: scan all images time spent: ${performance.now() - start}ms`);
+    }
   }
   const imageRule = md.renderer.rules.image;
   md.renderer.rules.image = (tokens, idx, options, env, self) => {
@@ -1164,8 +1168,6 @@ var closeType = `container_${type}_close`;
 var componentName = "FileTreeItem";
 var itemOpen = "file_tree_item_open";
 var itemClose = "file_tree_item_close";
-var RE_SIMPLE_ICON = /:simple-icon\b/;
-var RE_COLORED_ICON = /:colored-icon\b/;
 function fileTreePlugin(md, options = {}) {
   const getIcon = (filename, type2, mode) => {
     mode ||= options.icon || "colored";
@@ -1175,7 +1177,7 @@ function fileTreePlugin(md, options = {}) {
   };
   const validate = (info) => info.trim().startsWith(type);
   const render = (tokens, idx) => {
-    const mode = getFileIconMode(tokens[idx].info);
+    const { attrs: attrs2 } = resolveAttrs(tokens[idx].info.slice(type.length - 1));
     if (tokens[idx].nesting === 1) {
       const hasRes = [];
       for (let i = idx + 1; !(tokens[i].nesting === -1 && tokens[i].type === closeType); ++i) {
@@ -1186,7 +1188,7 @@ function fileTreePlugin(md, options = {}) {
             hasRes.push(token.level);
             const [info, inline] = result;
             const { filename, type: type2, expanded, empty } = info;
-            const icon = getIcon(filename, type2, mode);
+            const icon = getIcon(filename, type2, attrs2.icon);
             token.type = itemOpen;
             token.tag = componentName;
             token.attrSet("type", type2);
@@ -1203,7 +1205,7 @@ function fileTreePlugin(md, options = {}) {
           }
         }
       }
-      const title = resolveTitle(tokens[idx].info);
+      const title = attrs2.title;
       return `<div class="vp-file-tree">${title ? `<p class="vp-file-tree-title">${title}</p>` : ""}`;
     } else {
       return "</div>";
@@ -1211,18 +1213,6 @@ function fileTreePlugin(md, options = {}) {
   };
   md.use(container2, type, { validate, render });
 }
-function getFileIconMode(info) {
-  if (RE_SIMPLE_ICON.test(info))
-    return "simple";
-  if (RE_COLORED_ICON.test(info))
-    return "colored";
-  return void 0;
-}
-function resolveTitle(info) {
-  info = info.trim().slice(type.length).trim();
-  info = info.replace(RE_SIMPLE_ICON, "").replace(RE_COLORED_ICON, "");
-  return info.trim();
-}
 function resolveTreeNodeInfo(tokens, current, idx) {
   let hasInline = false;
   let hasChildren = false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuepress-plugin-md-power",
   "type": "module",
-  "version": "1.0.0-rc.103",
+  "version": "1.0.0-rc.105",
   "description": "The Plugin for VuePress 2 - markdown power",
   "author": "pengzhanbo <volodymyr@foxmail.com>",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "lib"
   ],
   "peerDependencies": {
-    "vuepress": "2.0.0-rc.15"
+    "vuepress": "2.0.0-rc.17"
   },
   "dependencies": {
     "@mdit/plugin-attrs": "^0.13.1",
@@ -41,15 +41,15 @@
     "@mdit/plugin-sup": "^0.13.1",
     "@mdit/plugin-tab": "^0.13.2",
     "@mdit/plugin-tasklist": "^0.13.1",
-    "@vuepress/helper": "2.0.0-rc.47",
+    "@vuepress/helper": "2.0.0-rc.52",
     "@vueuse/core": "^11.1.0",
     "image-size": "^1.1.1",
     "markdown-it-container": "^4.0.0",
     "nanoid": "^5.0.7",
-    "shiki": "^1.18.0",
-    "tm-grammars": "^1.17.25",
-    "tm-themes": "^1.8.4",
-    "vue": "^3.5.8"
+    "shiki": "^1.21.0",
+    "tm-grammars": "^1.17.28",
+    "tm-themes": "^1.8.6",
+    "vue": "^3.5.10"
   },
   "devDependencies": {
     "@types/markdown-it": "^14.1.2"