Merge pull request #1149 from terwer/feature/1.20.2

fix: support use picgo

.eslintrc.cjs

@@ -15,6 +15,7 @@ module.exports = {
 
   plugins: ["@typescript-eslint", "vue", "prettier"],
 
+  // custom rules
   rules: {
     // Note: you must disable the base rule as it can report incorrect errors
     semi: "off",

.github/workflows/release-please.yml

@@ -79,7 +79,7 @@ jobs:
         run: pnpm package
         if: ${{ steps.release.outputs.release_created }}
 
-      # Upload package to release
+      # Upload package for release
       # https://github.com/philips-labs/terraform-aws-github-runner/blob/main/.github/workflows/release.yml#L46
       - name: Upload package.zip to the release
         env:

.gitignore

@@ -1,6 +1,7 @@
 # idea
 .idea
 .DS_Store
+.turbo
 
 # build
 dist

.prettierignore

@@ -3,6 +3,7 @@
 # Ignore artifacts:
 dist
 node_modules
+temp
 
 # Ignore all dts files:
 *.d.ts

.prettierrc.cjs

@@ -23,6 +23,9 @@
  * questions.
  */
 
+/**
+ * Prettier 配置
+ */
 module.exports = {
     semi: false,
     singleQuote: false,

DEVELOPMENT.md

@@ -48,6 +48,12 @@ serve -l 9000 -C
 
 ## Build
 
+```bash
+pnpm build
+```
+
+## Package
+
 ```bash
 pnpm package
 ```

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Terwer
+Copyright (c) 2023-2024 Terwer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cross/crossPageUtils.spec.ts → common/pageUtils.spec.ts

@@ -24,11 +24,11 @@
  */
 
 import { describe, it } from "vitest"
-import CrossPageUtils from "./crossPageUtils"
+import PageUtils from "./pageUtils"
 
-describe("test crossPageUtils", () => {
+describe("test pageUtils", () => {
   it("test subPlatformName", () => {
-    const result = CrossPageUtils.subPlatformName("Gitlabvuepress2", 11)
+    const result = PageUtils.subPlatformName("Gitlabvuepress2", 11)
     console.log(result)
   })
 })

cross/crossPageUtils.ts → common/pageUtils.ts

@@ -31,7 +31,7 @@ import { StrUtil } from "zhi-common"
  * @author terwer
  * @since 1.18.0
  */
-class CrossPageUtils {
+class PageUtils {
   /**
    * 缩略展示平台名称
    *
@@ -79,4 +79,4 @@ class CrossPageUtils {
   }
 }
 
-export default CrossPageUtils
+export default PageUtils

custom.d.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Terwer . All rights reserved.
+ * Copyright (c) 2023-2024, Terwer . All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

docs/插件开发.md

@@ -57,4 +57,5 @@
    YAML适配器(不一定有)
 6. 开启配置页面
    在 src/components/set/publish/singleplatform/SingleSettingIndex.vue 注册配置
-7. 修改图片上传逻辑，可选
+7. 修改图片上传逻辑，可选
+8. docker 代理适配，可选

env.d.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Terwer . All rights reserved.
+ * Copyright (c) 2023-2024, Terwer . All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

esbuild.config.cjs

@@ -1,25 +1,26 @@
 /*
- * MIT License
+ * Copyright (c) 2023-2024, Terwer . All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright (c) 2023. Terwer
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Terwer designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Terwer in the LICENSE file that accompanied this code.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com
+ * or visit www.terwer.space if you need additional information or have any
+ * questions.
  */
 
 const path = require("path")

index.html

@@ -5,7 +5,6 @@
     <link rel="icon" href="/favicon.ico"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>思源笔记发布工具</title>
-    <%- injectScript %>
 </head>
 <body>
 <div id="app"></div>

package.json

@@ -26,72 +26,72 @@
     "syncWidgetRepo": "python scripts/sync_widget_repo.py"
   },
   "devDependencies": {
-    "@halo-dev/api-client": "^2.13.0",
+    "@halo-dev/api-client": "^2.14.0",
     "@terwer/esbuild-config-custom": "2.0.0",
     "@terwer/eslint-config-custom": "^1.3.6",
     "@types/crypto-js": "^4.2.2",
     "@types/iframe-resizer": "^3.5.13",
     "@types/katex": "^0.16.7",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^18.19.22",
+    "@types/node": "^18.19.30",
     "@vitejs/plugin-vue": "^5.0.4",
-    "@vitest/coverage-v8": "^1.3.1",
-    "@vue/test-utils": "^2.4.4",
+    "@vitest/coverage-v8": "^1.4.0",
+    "@vue/test-utils": "^2.4.5",
     "esbuild-plugin-copy": "^2.1.1",
     "esbuild-style-plugin": "^1.6.3",
     "fast-glob": "^3.3.2",
     "jsdom": "^24.0.0",
     "minimist": "^1.2.8",
     "rollup-plugin-livereload": "^2.0.5",
     "stylus": "^0.63.0",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.4",
     "unplugin-auto-import": "^0.17.5",
     "unplugin-vue-components": "^0.26.0",
-    "vercel": "^33.5.5",
-    "vite": "^5.1.6",
+    "vercel": "^33.7.0",
+    "vite": "^5.2.8",
     "vite-plugin-html": "^3.2.2",
     "vite-plugin-node-polyfills": "^0.21.0",
-    "vitest": "^1.3.1",
-    "vue-tsc": "^2.0.6"
+    "vitest": "^1.4.0",
+    "vue-tsc": "^2.0.11"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@iconify/json": "^2.2.191",
+    "@iconify/json": "^2.2.198",
     "@vueuse/components": "^10.9.0",
     "@vueuse/core": "^10.9.0",
     "chatgpt": "^5.2.5",
     "cheerio": "1.0.0-rc.12",
     "cookie-parse": "^0.4.0",
     "cross-fetch": "^3.1.8",
     "crypto-js": "^4.2.0",
-    "element-plus": "^2.6.1",
+    "element-plus": "^2.6.3",
     "gray-matter": "^4.0.3",
     "iframe-resizer": "^4.3.9",
     "js-base64": "^3.7.7",
     "js-yaml": "^4.1.0",
-    "katex": "^0.16.9",
+    "katex": "^0.16.10",
     "lodash-es": "^4.17.21",
     "pinia": "^2.1.7",
     "shorthash2": "^1.0.3",
     "simple-xmlrpc": "^1.4.2",
-    "siyuan": "^0.9.5",
-    "siyuan-plugin-picgo": "^1.4.4",
+    "siyuan": "^0.9.7",
     "telegraph.md": "^0.0.1",
     "unplugin-icons": "^0.18.5",
     "uuid": "^9.0.1",
     "vue": "^3.4.21",
-    "vue-i18n": "^9.10.1",
+    "vue-i18n": "^9.11.0",
     "vue-router": "^4.3.0",
     "xmlbuilder2": "^3.1.1",
-    "zhi-blog-api": "^1.56.2",
-    "zhi-common": "^1.31.0",
+    "zhi-blog-api": "^1.65.0",
+    "zhi-common": "^1.33.0",
     "zhi-device": "^2.11.0",
-    "zhi-fetch-middleware": "^0.8.0",
-    "zhi-github-middleware": "^0.4.15",
-    "zhi-gitlab-middleware": "^0.6.26",
+    "zhi-fetch-middleware": "^0.12.0",
+    "zhi-github-middleware": "^0.5.0",
+    "zhi-gitlab-middleware": "^0.10.0",
     "zhi-lib-base": "^0.8.0",
     "zhi-notion-markdown": "^0.1.4",
-    "zhi-siyuan-api": "^2.18.6",
-    "zhi-xmlrpc-middleware": "^0.6.19"
+    "zhi-siyuan-api": "^2.20.9",
+    "zhi-siyuan-picgo": "1.9.0",
+    "zhi-xmlrpc-middleware": "^0.6.21"
   }
 }