cherry-muse 1.0.1 → 1.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cherry-muse",
   "license": "Apache-2.0",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Lightweight Cherry Markdown fork with 83% smaller bundle size (800KB vs 4.8MB)",
   "repository": {
     "type": "git",
@@ -46,8 +46,6 @@
     "lint": "eslint --plugin file-progress --rule \"file-progress/activate: 1\" --ext .js .",
     "lint:fix": "yarn lint --fix",
     "lint:ci": "eslint --max-warnings=0 --ext .js .",
-    "prepare": "husky install",
-    "publish": "git push --follow-tags origin main",
     "examples": "serve -p 3000 ."
   },
   "keywords": [
@@ -84,6 +82,8 @@
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-replace": "^2.3.1",
     "@rollup/plugin-terser": "^0.4.3",
+    "@types/codemirror": "^0.0.108",
+    "@types/dompurify": "^2.2.3",
     "@types/echarts": "4.9.15",
     "@types/glob": "^7.2.0",
     "@types/jest": "^27.0.3",
@@ -117,6 +117,9 @@
     "husky": "~7.0.4",
     "jest": "^27.5.1",
     "jest-diff": "^27.5.1",
+    "js-base64": "^3.7.7",
+    "js-yaml": "^4.1.0",
+    "jsdom": "~19.0.0",
     "lint-staged": "~12.5.0",
     "lodash": "^4.17.20",
     "md5": "^2.2.1",
@@ -141,13 +144,7 @@
     "standard-version": "^9.3.2",
     "virtual-dom": "^2.1.1"
   },
-  "dependencies": {
-    "@types/codemirror": "^0.0.108",
-    "@types/dompurify": "^2.2.3",
-    "js-base64": "^3.7.7",
-    "js-yaml": "^4.1.0",
-    "jsdom": "~19.0.0"
-  },
+  "dependencies": {},
   "resolutions": {
     "glob-parent": "5.1.2",
     "set-value": "4.0.1",

package/src/core/hooks/CodeBlock.js

@@ -15,7 +15,7 @@
  */
 import ParagraphBase from '@/core/ParagraphBase';
 import Prism from 'prismjs';
-import { escapeHTMLSpecialChar, unescapeHTMLSpecialChar } from '@/utils/sanitize';
+import { escapeHTMLSpecialChar } from '@/utils/sanitize';
 import { getTableRule, getCodeBlockRule } from '@/utils/regexp';
 import { prependLineFeedForParagraph } from '@/utils/lineFeed';
 
@@ -625,33 +625,30 @@ export default class CodeBlock extends ParagraphBase {
 
   $highlightCodeBlock(code, lang, clazz) {
     const language = lang;
-    let cacheCode = Prism.highlight(unescapeHTMLSpecialChar(code), Prism.languages[language], language);
+    // 直接使用原始代码，不做 unescapeHTMLSpecialChar，避免破坏代码完整性
+    let cacheCode = Prism.highlight(code, Prism.languages[language], language);
     cacheCode = this.renderLineNumber(cacheCode);
     cacheCode = this.wrapCode(cacheCode, language);
     const cherry = this.$engine.$cherry;
-    // 查找指定id
-    setTimeout(function () {
-      console.log(clazz, cherry.wrapperDom.querySelectorAll(clazz), document.querySelectorAll(clazz));
-    }, 20000);
-    this.$waitElement(clazz, 0, function (elements) {
+    this.$waitElement(cherry.wrapperDom, clazz, 0, (elements) => {
       elements.forEach((codeBlock) => {
         codeBlock.innerHTML = cacheCode;
       });
     });
   }
 
-  $waitElement(clazz, times, cb) {
-    const that = this;
+  $waitElement(container, clazz, times, cb) {
     if (times > 100) {
-      console.warn(`times ${times} milliseconds, clazz ${clazz} not found`);
+      console.warn(`${clazz} not found after ${times} retries`);
       return;
     }
-    if (document.querySelectorAll(clazz).length === 0) {
-      setTimeout(function () {
-        that.$waitElement(clazz, times + 1, cb);
+    const elements = container.querySelectorAll(clazz);
+    if (elements.length === 0) {
+      setTimeout(() => {
+        this.$waitElement(container, clazz, times + 1, cb);
       }, 500);
     } else {
-      cb(document.querySelectorAll(clazz));
+      cb(elements);
     }
   }