fix: sts error bt import

libs/Universal-PicGo-Core/custom.d.ts

@@ -3,6 +3,9 @@ declare module '*.json' {
   export default value
 }
 
+declare module '*raw'
+
 declare module "ali-oss"
 declare module "arraybuffer-to-buffer"
-declare module "upyun"
+declare module "upyun"
+declare module "js-yaml"

libs/zhi-siyuan-picgo/src/index.ts

@@ -29,9 +29,10 @@ import { copyToClipboardInBrowser, generateUniqueName } from "./lib/utils/utils"
 import { ImageItem } from "./lib/models/ImageItem"
 import { ImageParser } from "./lib/parser/ImageParser"
 import { ParsedImage } from "./lib/models/ParsedImage"
+import { SIYUAN_PICGO_FILE_MAP_KEY } from "./lib/constants"
 
 export { SiyuanPicGo, SiyuanPicgoConfig, SiyuanPicgoPostApi, PicgoHelper }
-export { ImageItem, ImageParser, ParsedImage }
+export { ImageItem, ImageParser, ParsedImage, SIYUAN_PICGO_FILE_MAP_KEY }
 export { retrieveImageFromClipboardAsBlob, copyToClipboardInBrowser, calculateMD5, generateUniqueName }
 export { ConfigDb, PluginLoaderDb, ExternalPicgoConfigDb }
 export { PicgoTypeEnum }

libs/zhi-siyuan-picgo/src/lib/siyuanPicgoPostApi.ts

@@ -9,7 +9,7 @@
 
 import { ILogger, simpleLogger } from "zhi-lib-base"
 import { SiyuanPicGoUploadApi } from "./siyuanPicGoUploadApi"
-import { hasNodeEnv, IPicGo, isFileOrBlob, win } from "universal-picgo"
+import { hasNodeEnv, IImgInfo, IPicGo, isFileOrBlob, win } from "universal-picgo"
 import { ParsedImage } from "./models/ParsedImage"
 import { ImageItem } from "./models/ImageItem"
 import { SIYUAN_PICGO_FILE_MAP_KEY } from "./constants"
@@ -18,7 +18,6 @@ import { SiyuanConfig, SiyuanKernelApi } from "zhi-siyuan-api"
 import { ImageParser } from "./parser/ImageParser"
 import { PicgoPostResult } from "./models/PicgoPostResult"
 import { DeviceDetection, DeviceTypeEnum, SiyuanDevice } from "zhi-device"
-import { IImgInfo } from "universal-picgo/src"
 
 /**
  * Picgo与文章交互的通用方法

packages/picgo-plugin-app/src/components/test/BrowserTest.vue

@@ -28,7 +28,7 @@ const handleTest2 = async () => {
   }
 }
 
-const handleTest5 = async () => {˙
+const handleTest5 = async () => {
   try {
     const picgo = await SiyuanPicGoClient.getInstance()
     logger.debug("picgo =>", picgo)

packages/picgo-plugin-app/src/composables/usePicgoCommon.ts

@@ -10,7 +10,7 @@
 import { useSiyuanDevice } from "$composables/useSiyuanDevice.ts"
 import { reactive } from "vue"
 import { isDev } from "@/utils/Constants.ts"
-import { ImageItem } from "zhi-siyuan-picgo/src/lib/models/ImageItem.ts"
+import { ImageItem } from "zhi-siyuan-picgo"
 
 /**
  * Picgo公共组件

packages/picgo-plugin-app/src/composables/usePicgoManage.ts

@@ -12,7 +12,7 @@ import { useSiyuanApi } from "$composables/useSiyuanApi.ts"
 import { createAppLogger } from "@/utils/appLogger.ts"
 import { reactive } from "vue"
 import { ElMessage, ElMessageBox } from "element-plus"
-import { ImageItem } from "zhi-siyuan-picgo/src/lib/models/ImageItem.ts"
+import { ImageItem } from "zhi-siyuan-picgo"
 import { SiyuanPicGoClient } from "@/utils/SiyuanPicGoClient.ts"
 
 /**
@@ -30,7 +30,7 @@ export const usePicgoManage = (props: any, deps: any) => {
   // public data
   const picgoManageData = reactive({
     dialogImageUrl: "",
-    dialogPreviewVisible: false,
+    dialogPreviewVisible: false
   })
 
   // deps
@@ -86,7 +86,7 @@ export const usePicgoManage = (props: any, deps: any) => {
         ElMessageBox.confirm("已经是远程图片，是否仍然覆盖上传？", t("main.opt.warning"), {
           confirmButtonText: t("main.opt.ok"),
           cancelButtonText: t("main.opt.cancel"),
-          type: "warning",
+          type: "warning"
         })
           .then(async () => {
             try {
@@ -100,7 +100,7 @@ export const usePicgoManage = (props: any, deps: any) => {
 
               ElMessage({
                 type: "error",
-                message: t("main.opt.failure") + "=>" + e,
+                message: t("main.opt.failure") + "=>" + e
               })
               logger.error(t("main.opt.failure") + "=>" + e)
             }
@@ -111,7 +111,7 @@ export const usePicgoManage = (props: any, deps: any) => {
             if (e.toString().indexOf("cancel") <= -1) {
               ElMessage({
                 type: "error",
-                message: t("main.opt.failure") + "，图片上传异常=>" + e,
+                message: t("main.opt.failure") + "，图片上传异常=>" + e
               })
               logger.error(t("main.opt.failure") + "=>" + e)
             }
@@ -127,7 +127,7 @@ export const usePicgoManage = (props: any, deps: any) => {
 
           ElMessage({
             type: "error",
-            message: t("main.opt.failure") + "=>" + e,
+            message: t("main.opt.failure") + "=>" + e
           })
           logger.error(t("main.opt.failure") + "=>" + e)
         }
@@ -156,11 +156,11 @@ export const usePicgoManage = (props: any, deps: any) => {
     handlePictureCardPreview: (url: string) => {
       picgoManageData.dialogImageUrl = url ?? ""
       picgoManageData.dialogPreviewVisible = true
-    },
+    }
   }
 
   return {
     picgoManageData,
-    picgoManageMethods,
+    picgoManageMethods
   }
 }

packages/picgo-plugin-app/src/composables/usePicgoUpload.ts

@@ -11,12 +11,11 @@ import { useRouter } from "vue-router"
 import { createAppLogger } from "@/utils/appLogger.ts"
 import { useVueI18n } from "$composables/useVueI18n.ts"
 import { reactive } from "vue"
-import { ImageItem } from "zhi-siyuan-picgo"
+import { generateUniqueName, ImageItem } from "zhi-siyuan-picgo"
 import { ElMessage } from "element-plus"
 import { useSiyuanApi } from "$composables/useSiyuanApi.ts"
 import { StrUtil } from "zhi-common"
 import { SiyuanPicGoClient } from "@/utils/SiyuanPicGoClient.ts"
-import { generateUniqueName } from "zhi-siyuan-picgo/src"
 
 /**
  * Picgo上传组件

packages/picgo-plugin-bootstrap/src/index.ts

@@ -16,8 +16,7 @@ import { initTopbar } from "./topbar"
 import { showPage } from "./dialog"
 import { PageRoute } from "./pageRoute"
 import { ILogger } from "./appLogger"
-import { generateUniqueName, ImageItem, SiyuanPicGo } from "zhi-siyuan-picgo"
-import { SIYUAN_PICGO_FILE_MAP_KEY } from "zhi-siyuan-picgo/src/lib/constants"
+import { generateUniqueName, ImageItem, SIYUAN_PICGO_FILE_MAP_KEY, SiyuanPicGo } from "zhi-siyuan-picgo"
 
 export default class PicgoPlugin extends Plugin {
   private logger: ILogger
@@ -56,7 +55,8 @@ export default class PicgoPlugin extends Plugin {
   }
 
   private offEvent() {
-    this.eventBus.off("paste", () => {})
+    this.eventBus.off("paste", () => {
+    })
   }
 
   /**
@@ -83,14 +83,14 @@ export default class PicgoPlugin extends Plugin {
 
     const siyuanConfig = {
       apiUrl: siyuanApiUrl,
-      password: siyuanApiToken,
+      password: siyuanApiToken
     }
     const picgoPostApi = await SiyuanPicGo.getInstance(siyuanConfig as any, isDev)
     const siyuanApi = picgoPostApi.siyuanApi
     if (files.length > 1) {
       siyuanApi.pushErrMsg({
         msg: "仅支持一次性上传单张图片",
-        timeout: 7000,
+        timeout: 7000
       })
       return
     }
@@ -99,7 +99,7 @@ export default class PicgoPlugin extends Plugin {
     try {
       siyuanApi.pushMsg({
         msg: "检测到剪贴板图片，正在上传，请勿进行任何操作...",
-        timeout: 1000,
+        timeout: 1000
       })
 
       // pageId: string
@@ -126,7 +126,7 @@ export default class PicgoPlugin extends Plugin {
     } catch (e) {
       siyuanApi.pushErrMsg({
         msg: "剪贴板图片上传失败 =>" + e.toString(),
-        timeout: 7000,
+        timeout: 7000
       })
     }
   }
@@ -135,7 +135,7 @@ export default class PicgoPlugin extends Plugin {
     const WAIT_SECONDS = 10
     siyuanApi.pushMsg({
       msg: `剪贴板图片上传完成。准备延迟${WAIT_SECONDS}秒更新元数据，请勿刷新笔记！`,
-      timeout: 7000,
+      timeout: 7000
     })
     setTimeout(async () => {
       const formData = new FormData()
@@ -168,20 +168,20 @@ export default class PicgoPlugin extends Plugin {
       if (!newImageItem) {
         siyuanApi.pushErrMsg({
           msg: `未找到图片元数据`,
-          timeout: 7000,
+          timeout: 7000
         })
       }
       const newFileMapStr = JSON.stringify(fileMap)
       await siyuanApi.setBlockAttrs(pageId, {
-        [SIYUAN_PICGO_FILE_MAP_KEY]: newFileMapStr,
+        [SIYUAN_PICGO_FILE_MAP_KEY]: newFileMapStr
       })
 
       // 更新块
       const nodeId = this.getDataNodeIdFromImgWithSrc(newImageItem.originUrl)
       if (!nodeId) {
         siyuanApi.pushErrMsg({
           msg: `未找到图片块 ID`,
-          timeout: 7000,
+          timeout: 7000
         })
         return
       }
@@ -198,7 +198,7 @@ export default class PicgoPlugin extends Plugin {
 
       siyuanApi.pushMsg({
         msg: `图片元数据更新成功`,
-        timeout: 7000,
+        timeout: 7000
       })
     }, WAIT_SECONDS * 1000)
   }

scripts/package.py

@@ -9,6 +9,11 @@
     # 获取当前工作空间
     cwd = scriptutils.get_workdir()
 
+    # os.system("find . -name "node_modules" -type d -exec rm -rf {} +")
+    # os.system("find . -name "dist" -type d -exec rm -rf {} +")
+    # os.system("find . -name ".turbo" -type d -exec rm -rf {} +")
+    # os.system("rm -rf ./artifacts")
+    # os.system("rm -rf ./build")
     os.system("pnpm build -F picgo-plugin-app")
     os.system("pnpm build -F picgo-plugin-bootstrap")