Merge pull request #25 from terwer/dev

fix: #22 优化去除链接规则

Author: terwer

.gitignore

@@ -2,4 +2,5 @@
 .DS_Store
 node_modules
 dist
-build
+build
+__pycache__

src/api/kernel-api.ts

@@ -88,7 +88,7 @@ class KernelApi extends BaseApi {
    * @param to - 转换后的文件名，不包括路径，路径相对于 /temp/convert/pandoc
    */
   public async convertPandoc(type: string, from: string, to: string): Promise<SiyuanData> {
-    const toMediaDir = [mediaDir, shortHash(to)].join("/")
+    const toMediaDir = [mediaDir, shortHash(to).toLowerCase()].join("/")
     const args = {
       args: ["--to", type, from, "-o", to, "--extract-media", toMediaDir],
     }

src/utils/utils.ts

@@ -24,7 +24,7 @@
  */
 
 import KernelApi from "../api/kernel-api"
-import {dataDir} from "../Constants"
+import { dataDir } from "../Constants"
 
 /**
  * 文件是否存在
@@ -75,40 +75,40 @@ export const removeEmptyLines = (str: string): string => str.replace(/^#+\s*\n|\
  */
 function convertPathToUnixStyle(path) {
   // 使用 replace() 函数将所有反斜杠替换为斜杠
-  return path.replace(/\\/g, '/');
+  return path.replace(/\\/g, "/")
 }
 
 export function replaceImagePath(mdText) {
-  const regex = /!\[(.*?)\]\(([^\s]*?)\)/g;
+  const regex = /!\[(.*?)\]\(([^\s]*?)\)/g
   return mdText.replace(regex, (match, p1, p2) => {
-    let imagePath = p2;
+    const imagePath = p2
 
     if (!imagePath.startsWith(dataDir)) {
-      return match;
+      return match
     }
 
-    const relativePath = convertPathToUnixStyle(
-        imagePath.substring(dataDir.length)
-    );
+    const relativePath = convertPathToUnixStyle(imagePath.substring(dataDir.length))
 
-    return `![${p1}](${relativePath})`;
-  });
+    return `![${p1}](${relativePath})`
+  })
 }
 
 // 将字符串中形如"xxx^yyy"的部分替换成"xxx"
 export function removeFootnotes(text) {
-  const regex = /\^\(\[.*[0-9].*\]\(\#.*\#.*\)\)/g; // 匹配格式为 ^[[数字]](#链接) 的脚注
-  return text.replace(regex, ''); // 使用空字符串替换匹配到的脚注
+  const regex = /\^\(\[.*[0-9].*]\(#.*#.*\)\)/g // 匹配格式为 ^[[数字]](#链接) 的脚注
+  return text.replace(regex, "") // 使用空字符串替换匹配到的脚注
 }
 
 // 删除目录中的内部链接
 export function removeLinks(text) {
   const regex = /\[([^\]]+)]\(([^)]+)\)/g
-  return  text.replace(regex, (match, p1, p2) => {
-    if (p2.includes('./Text')) {
+  return text.replace(regex, (match, p1, p2) => {
+    console.log(p2)
+    console.log(typeof p2)
+    if (p2.includes("./Text") || p2.includes("#") || p2.includes("kindle:")) {
       return p1
     } else {
       return match
     }
   })
-}
+}

vite.config.ts

@@ -1,12 +1,12 @@
 /// <reference types="vitest" />
 
-import {resolve} from "path"
-import {defineConfig, loadEnv} from "vite"
+import { resolve } from "path"
+import { defineConfig } from "vite"
 import minimist from "minimist"
-import {viteStaticCopy} from "vite-plugin-static-copy"
+import { viteStaticCopy } from "vite-plugin-static-copy"
 import livereload from "rollup-plugin-livereload"
-import {svelte} from "@sveltejs/vite-plugin-svelte"
-import fg from 'fast-glob'
+import { svelte } from "@sveltejs/vite-plugin-svelte"
+import fg from "fast-glob"
 
 const args = minimist(process.argv.slice(2))
 const isWatch = args.watch || args.w || false
@@ -66,7 +66,7 @@ export default defineConfig({
     // 或是用来指定是应用哪种混淆器
     // boolean | 'terser' | 'esbuild'
     // 不压缩，用于调试
-    minify: isWatch,
+    minify: !isWatch,
 
     lib: {
       // Could also be a dictionary or array of multiple entry points
@@ -76,20 +76,23 @@ export default defineConfig({
       formats: ["cjs"],
     },
     rollupOptions: {
-      plugins: [...(isWatch ? [livereload(devDistDir), {
-        //监听静态资源文件
-        name: 'watch-external',
-        async buildStart() {
-          const files = await fg([
-            'src/i18n/*.json',
-            './README*.md',
-            './plugin.json'
-          ]);
-          for (let file of files) {
-            this.addWatchFile(file);
-          }
-        }
-      }] : [])] as Plugin[],
+      plugins: [
+        ...(isWatch
+          ? [
+              livereload(devDistDir),
+              {
+                //监听静态资源文件
+                name: "watch-external",
+                async buildStart() {
+                  const files = await fg(["src/i18n/*.json", "./README*.md", "./plugin.json"])
+                  for (const file of files) {
+                    this.addWatchFile(file)
+                  }
+                },
+              },
+            ]
+          : []),
+      ] as Plugin[],
 
       // make sure to externalize deps that shouldn't be bundled
       // into your library