From d9951e717c52777a2edcfd9a2559f6d7da063bdf Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Sat, 18 Nov 2023 05:16:43 -0800 Subject: [PATCH 01/13] :package: Chore(custom): update issue template --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 61bc251..f331d91 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -22,7 +22,7 @@ body: label: 前置阅读 | Pre-reading description: 我已经自行查找、阅读以下内容(阅读了请打勾) | I have searched and read the following on my own (Please tick after reading) options: - - label: "[文档/Doc](https://picgo.github.io/PicGo-Doc/)" + - label: "[文档/Doc](https://piclist.cn/)" required: true - label: "[Issues](https://github.com/Kuingsmile/PicList/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aclosed)" required: true diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index b91dc7a..6830943 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -22,7 +22,7 @@ body: label: 前置阅读 | Pre-reading description: 我已经自行查找、阅读以下内容(阅读了请打勾) | I have searched and read the following on my own (Please tick after reading) options: - - label: "[文档/Doc](https://picgo.github.io/PicGo-Doc/)" + - label: "[文档/Doc](https://piclist.cn/)" required: true - label: "[Issues](https://github.com/Kuingsmile/PicList/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aclosed)" required: true From a235e07912689e9d6307798729b2fb3e3fb86146 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Tue, 21 Nov 2023 01:06:50 -0800 Subject: [PATCH 02/13] :arrow_up: Upgrade(custom): update eslint --- package.json | 10 +-- yarn.lock | 186 +++++++++++++++++++++++++-------------------------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/package.json b/package.json index 81e5454..e846f15 100644 --- a/package.json +++ b/package.json @@ -100,13 +100,13 @@ "@types/multer": "^1.4.9", "@types/node": "^16.10.2", "@types/request-promise-native": "^1.0.21", - "@types/semver": "^7.5.5", + "@types/semver": "^7.5.6", "@types/tunnel": "^0.0.6", "@types/upyun": "^3.4.3", "@types/uuid": "^9.0.7", "@types/write-file-atomic": "^4.0.3", - "@typescript-eslint/eslint-plugin": "^6.9.1", - "@typescript-eslint/parser": "^6.9.1", + "@typescript-eslint/eslint-plugin": "^6.12.0", + "@typescript-eslint/parser": "^6.12.0", "@vue/cli-plugin-babel": "^5.0.8", "@vue/cli-plugin-eslint": "^5.0.8", "@vue/cli-plugin-router": "^5.0.8", @@ -120,7 +120,7 @@ "dotenv": "^16.3.1", "dpdm": "^3.14.0", "electron": "^22.0.2", - "eslint": "^8.52.0", + "eslint": "^8.54.0", "eslint-config-standard": ">=16.0.0", "eslint-plugin-import": "^2.29.0", "eslint-plugin-node": "^11.1.0", @@ -129,7 +129,7 @@ "husky": "^3.1.0", "node-bump-version": "^1.0.2", "node-loader": "^2.0.0", - "npm-check-updates": "^16.14.6", + "npm-check-updates": "^16.14.11", "stylus": "^0.59.0", "stylus-loader": "^7.1.3", "typescript": "^4.9.5", diff --git a/yarn.lock b/yarn.lock index 611b78d..287cf53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2031,10 +2031,10 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4" integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA== -"@eslint/eslintrc@^2.1.2": - version "2.1.2" - resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396" - integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g== +"@eslint/eslintrc@^2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d" + integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -2046,10 +2046,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.52.0": - version "8.52.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.52.0.tgz#78fe5f117840f69dc4a353adf9b9cd926353378c" - integrity sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA== +"@eslint/js@8.54.0": + version "8.54.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf" + integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ== "@floating-ui/core@^1.0.5": version "1.1.0" @@ -3551,10 +3551,10 @@ resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a" integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw== -"@types/semver@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35" - integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg== +"@types/semver@^7.5.6": + version "7.5.6" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" + integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== "@types/serve-index@^1.9.1": version "1.9.1" @@ -3672,6 +3672,23 @@ dependencies: "@types/node" "*" +"@typescript-eslint/eslint-plugin@^6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz#2a647d278bb48bf397fef07ba0507612ff9dd812" + integrity sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA== + dependencies: + "@eslint-community/regexpp" "^4.5.1" + "@typescript-eslint/scope-manager" "6.12.0" + "@typescript-eslint/type-utils" "6.12.0" + "@typescript-eslint/utils" "6.12.0" + "@typescript-eslint/visitor-keys" "6.12.0" + debug "^4.3.4" + graphemer "^1.4.0" + ignore "^5.2.4" + natural-compare "^1.4.0" + semver "^7.5.4" + ts-api-utils "^1.0.1" + "@typescript-eslint/eslint-plugin@^6.7.0": version "6.7.0" resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz#ed2a38867190f8a688af85ad7c8a74670b8b3675" @@ -3689,22 +3706,16 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/eslint-plugin@^6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz#d8ce497dc0ed42066e195c8ecc40d45c7b1254f4" - integrity sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg== +"@typescript-eslint/parser@^6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.12.0.tgz#9fb21ed7d88065a4a2ee21eb80b8578debb8217c" + integrity sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg== dependencies: - "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/type-utils" "6.9.1" - "@typescript-eslint/utils" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" + "@typescript-eslint/scope-manager" "6.12.0" + "@typescript-eslint/types" "6.12.0" + "@typescript-eslint/typescript-estree" "6.12.0" + "@typescript-eslint/visitor-keys" "6.12.0" debug "^4.3.4" - graphemer "^1.4.0" - ignore "^5.2.4" - natural-compare "^1.4.0" - semver "^7.5.4" - ts-api-utils "^1.0.1" "@typescript-eslint/parser@^6.7.0": version "6.7.0" @@ -3717,16 +3728,13 @@ "@typescript-eslint/visitor-keys" "6.7.0" debug "^4.3.4" -"@typescript-eslint/parser@^6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.9.1.tgz#4f685f672f8b9580beb38d5fb99d52fc3e34f7a3" - integrity sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg== +"@typescript-eslint/scope-manager@6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz#5833a16dbe19cfbad639d4d33bcca5e755c7044b" + integrity sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw== dependencies: - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/typescript-estree" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" - debug "^4.3.4" + "@typescript-eslint/types" "6.12.0" + "@typescript-eslint/visitor-keys" "6.12.0" "@typescript-eslint/scope-manager@6.7.0": version "6.7.0" @@ -3736,13 +3744,15 @@ "@typescript-eslint/types" "6.7.0" "@typescript-eslint/visitor-keys" "6.7.0" -"@typescript-eslint/scope-manager@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz#e96afeb9a68ad1cd816dba233351f61e13956b75" - integrity sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg== +"@typescript-eslint/type-utils@6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz#968f7c95162808d69950ab5dff710ad730e58287" + integrity sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng== dependencies: - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" + "@typescript-eslint/typescript-estree" "6.12.0" + "@typescript-eslint/utils" "6.12.0" + debug "^4.3.4" + ts-api-utils "^1.0.1" "@typescript-eslint/type-utils@6.7.0": version "6.7.0" @@ -3754,25 +3764,28 @@ debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/type-utils@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz#efd5db20ed35a74d3c7d8fba51b830ecba09ce32" - integrity sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg== - dependencies: - "@typescript-eslint/typescript-estree" "6.9.1" - "@typescript-eslint/utils" "6.9.1" - debug "^4.3.4" - ts-api-utils "^1.0.1" +"@typescript-eslint/types@6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.12.0.tgz#ffc5297bcfe77003c8b7b545b51c2505748314ac" + integrity sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q== "@typescript-eslint/types@6.7.0": version "6.7.0" resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz#8de8ba9cafadc38e89003fe303e219c9250089ae" integrity sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q== -"@typescript-eslint/types@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.9.1.tgz#a6cfc20db0fcedcb2f397ea728ef583e0ee72459" - integrity sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ== +"@typescript-eslint/typescript-estree@6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz#764ccc32598549e5b48ec99e3b85f89b1385310c" + integrity sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw== + dependencies: + "@typescript-eslint/types" "6.12.0" + "@typescript-eslint/visitor-keys" "6.12.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" "@typescript-eslint/typescript-estree@6.7.0": version "6.7.0" @@ -3787,18 +3800,18 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/typescript-estree@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz#8c77910a49a04f0607ba94d78772da07dab275ad" - integrity sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw== +"@typescript-eslint/utils@6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.12.0.tgz#c6ce8c06fe9b0212620e5674a2036f6f8f611754" + integrity sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ== dependencies: - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" + "@eslint-community/eslint-utils" "^4.4.0" + "@types/json-schema" "^7.0.12" + "@types/semver" "^7.5.0" + "@typescript-eslint/scope-manager" "6.12.0" + "@typescript-eslint/types" "6.12.0" + "@typescript-eslint/typescript-estree" "6.12.0" semver "^7.5.4" - ts-api-utils "^1.0.1" "@typescript-eslint/utils@6.7.0": version "6.7.0" @@ -3813,18 +3826,13 @@ "@typescript-eslint/typescript-estree" "6.7.0" semver "^7.5.4" -"@typescript-eslint/utils@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.9.1.tgz#763da41281ef0d16974517b5f0d02d85897a1c1e" - integrity sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA== +"@typescript-eslint/visitor-keys@6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz#5877950de42a0f3344261b7a1eee15417306d7e9" + integrity sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw== dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/typescript-estree" "6.9.1" - semver "^7.5.4" + "@typescript-eslint/types" "6.12.0" + eslint-visitor-keys "^3.4.1" "@typescript-eslint/visitor-keys@6.7.0": version "6.7.0" @@ -3834,14 +3842,6 @@ "@typescript-eslint/types" "6.7.0" eslint-visitor-keys "^3.4.1" -"@typescript-eslint/visitor-keys@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz#6753a9225a0ba00459b15d6456b9c2780b66707d" - integrity sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw== - dependencies: - "@typescript-eslint/types" "6.9.1" - eslint-visitor-keys "^3.4.1" - "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" @@ -7768,15 +7768,15 @@ eslint-webpack-plugin@^3.1.0: normalize-path "^3.0.0" schema-utils "^4.0.0" -eslint@^8.52.0: - version "8.52.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.52.0.tgz#d0cd4a1fac06427a61ef9242b9353f36ea7062fc" - integrity sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg== +eslint@^8.54.0: + version "8.54.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537" + integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^2.1.2" - "@eslint/js" "8.52.0" + "@eslint/eslintrc" "^2.1.3" + "@eslint/js" "8.54.0" "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" @@ -11663,10 +11663,10 @@ npm-bundled@^3.0.0: dependencies: npm-normalize-package-bin "^3.0.0" -npm-check-updates@^16.14.6: - version "16.14.6" - resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-16.14.6.tgz#8a1b743398795e66b427ac31f9a73fe2704045d6" - integrity sha512-sJ6w4AmSDP7YzBXah94Ul2JhiIbjBDfx9XYgib15um2wtiQkOyjE7Lov3MNUSQ84Ry7T81mE4ynMbl/mGbK4HQ== +npm-check-updates@^16.14.11: + version "16.14.11" + resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-16.14.11.tgz#aef5248d04cc5abdf6ee2e1edc4a3f7fd20e6f29" + integrity sha512-0MMWGbGci22Pu77bR9jRsy5qgxdQSJVqNtSyyFeubDPtbcU36z4gjEDITu26PMabFWPNkAoVfKF31M3uKUvzFg== dependencies: chalk "^5.3.0" cli-table3 "^0.6.3" From 3063612394504cb9eab8e0d58e704337e71f181b Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Tue, 21 Nov 2023 01:31:49 -0800 Subject: [PATCH 03/13] :bug: Fix(custom): fix gallery page url copy bug --- src/renderer/pages/Gallery.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/pages/Gallery.vue b/src/renderer/pages/Gallery.vue index 395a988..3ee3296 100644 --- a/src/renderer/pages/Gallery.vue +++ b/src/renderer/pages/Gallery.vue @@ -684,7 +684,7 @@ function handleClose () { } async function copy (item: ImgInfo) { - item.config = JSON.parse(JSON.stringify(item.config)) + item.config = JSON.parse(JSON.stringify(item.config) || '{}') const copyLink = await ipcRenderer.invoke(PASTE_TEXT, item) const obj = { title: $T('COPY_LINK_SUCCEED'), From e3d2031ce882e7e376b895fb44c7f8340db4ac7c Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Wed, 22 Nov 2023 05:39:36 -0800 Subject: [PATCH 04/13] :arrow_up: Upgrade(custom): upgrade deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e846f15..7217788 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "ali-oss": "^6.18.1", "axios": "^1.6.2", "compare-versions": "^4.1.3", - "core-js": "^3.33.2", + "core-js": "^3.33.3", "cos-nodejs-sdk-v5": "^2.12.5", "dexie": "^3.2.4", "electron-updater": "^6.1.4", @@ -97,7 +97,7 @@ "@types/js-yaml": "^4.0.9", "@types/lowdb": "^1.0.15", "@types/mime-types": "^2.1.4", - "@types/multer": "^1.4.9", + "@types/multer": "^1.4.11", "@types/node": "^16.10.2", "@types/request-promise-native": "^1.0.21", "@types/semver": "^7.5.6", From 69389e71c176bc394ca7a0198ddab2642698a3a6 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Sun, 26 Nov 2023 22:16:57 -0800 Subject: [PATCH 05/13] :arrow_up: Upgrade(custom): update vue version --- package.json | 4 +- yarn.lock | 166 +++++++++++++++++++++++++-------------------------- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/package.json b/package.json index 7217788..4fef958 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "upyun": "^3.4.6", "uuid": "^9.0.1", "video.js": "^8.5.2", - "vue": "^3.3.8", + "vue": "^3.3.9", "vue-router": "^4.2.5", "vue3-lazyload": "^0.3.8", "vue3-photo-preview": "^0.3.0", @@ -114,7 +114,7 @@ "@vue/cli-service": "^5.0.8", "@vue/eslint-config-standard": "^8.0.1", "@vue/eslint-config-typescript": "^12.0.0", - "@vue/runtime-dom": "^3.3.8", + "@vue/runtime-dom": "^3.3.9", "conventional-changelog": "^5.1.0", "cz-customizable": "^7.0.0", "dotenv": "^16.3.1", diff --git a/yarn.lock b/yarn.lock index 287cf53..82e4567 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1014,10 +1014,10 @@ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== -"@babel/parser@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" - integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== +"@babel/parser@^7.23.3": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.4.tgz#409fbe690c333bb70187e2de4021e1e47a026661" + integrity sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -3477,10 +3477,10 @@ resolved "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/multer@^1.4.9": - version "1.4.9" - resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.9.tgz#74e803d3a9b62f41d191ce48012c2151f62c2ed7" - integrity sha512-9NSvPJ2E8bNTc8XtJq1Cimx2Wrn2Ah48F15B2Du/hM8a8CHLhVbJMlF3ZCqhvMdht7Sa+YdP0aKP7N4fxDcrrg== +"@types/multer@^1.4.11": + version "1.4.11" + resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.11.tgz#c70792670513b4af1159a2b60bf48cc932af55c5" + integrity sha512-svK240gr6LVWvv3YGyhLlA+6LRRWA4mnGIU7RcNmgjBYFl6665wcXrRfxGp5tEPVHUNm5FMcmq7too9bxCwX/w== dependencies: "@types/express" "*" @@ -4163,47 +4163,47 @@ semver "^7.3.4" strip-ansi "^6.0.0" -"@vue/compiler-core@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.8.tgz#301bb60d0245265a88ed5b30e200fbf223acb313" - integrity sha512-hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g== +"@vue/compiler-core@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.9.tgz#df1fc7947dcef5c2e12d257eae540057707f47d1" + integrity sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ== dependencies: - "@babel/parser" "^7.23.0" - "@vue/shared" "3.3.8" + "@babel/parser" "^7.23.3" + "@vue/shared" "3.3.9" estree-walker "^2.0.2" source-map-js "^1.0.2" -"@vue/compiler-dom@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.8.tgz#09d832514b9b8d9415a3816b065d69dbefcc7e9b" - integrity sha512-+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ== +"@vue/compiler-dom@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.9.tgz#67315ea4193d9d18c7a710889b8f90f7aa3914d2" + integrity sha512-nfWubTtLXuT4iBeDSZ5J3m218MjOy42Vp2pmKVuBKo2/BLcrFUX8nCSr/bKRFiJ32R8qbdnnnBgRn9AdU5v0Sg== dependencies: - "@vue/compiler-core" "3.3.8" - "@vue/shared" "3.3.8" + "@vue/compiler-core" "3.3.9" + "@vue/shared" "3.3.9" -"@vue/compiler-sfc@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.8.tgz#40b18e48aa00260950964d1d72157668521be0e1" - integrity sha512-WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA== +"@vue/compiler-sfc@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.9.tgz#5900906baba1a90389200d81753ad0f7ceb98a83" + integrity sha512-wy0CNc8z4ihoDzjASCOCsQuzW0A/HP27+0MDSSICMjVIFzk/rFViezkR3dzH+miS2NDEz8ywMdbjO5ylhOLI2A== dependencies: - "@babel/parser" "^7.23.0" - "@vue/compiler-core" "3.3.8" - "@vue/compiler-dom" "3.3.8" - "@vue/compiler-ssr" "3.3.8" - "@vue/reactivity-transform" "3.3.8" - "@vue/shared" "3.3.8" + "@babel/parser" "^7.23.3" + "@vue/compiler-core" "3.3.9" + "@vue/compiler-dom" "3.3.9" + "@vue/compiler-ssr" "3.3.9" + "@vue/reactivity-transform" "3.3.9" + "@vue/shared" "3.3.9" estree-walker "^2.0.2" magic-string "^0.30.5" postcss "^8.4.31" source-map-js "^1.0.2" -"@vue/compiler-ssr@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.8.tgz#136eed54411e4694815d961048a237191063fbce" - integrity sha512-hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w== +"@vue/compiler-ssr@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.9.tgz#3b3dbfa5368165fa4ff74c060503b4087ec1beed" + integrity sha512-NO5oobAw78R0G4SODY5A502MGnDNiDjf6qvhn7zD7TJGc8XDeIEw4fg6JU705jZ/YhuokBKz0A5a/FL/XZU73g== dependencies: - "@vue/compiler-dom" "3.3.8" - "@vue/shared" "3.3.8" + "@vue/compiler-dom" "3.3.9" + "@vue/shared" "3.3.9" "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.3.0": version "3.3.0" @@ -4247,53 +4247,53 @@ "@typescript-eslint/parser" "^6.7.0" vue-eslint-parser "^9.3.1" -"@vue/reactivity-transform@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.8.tgz#6d07649013b0be5c670f0ab6cc7ddd3150ad03f2" - integrity sha512-49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw== +"@vue/reactivity-transform@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.9.tgz#5d894dd9a42a422a2db309babb385f9a2529b52f" + integrity sha512-HnUFm7Ry6dFa4Lp63DAxTixUp8opMtQr6RxQCpDI1vlh12rkGIeYqMvJtK+IKyEfEOa2I9oCkD1mmsPdaGpdVg== dependencies: - "@babel/parser" "^7.23.0" - "@vue/compiler-core" "3.3.8" - "@vue/shared" "3.3.8" + "@babel/parser" "^7.23.3" + "@vue/compiler-core" "3.3.9" + "@vue/shared" "3.3.9" estree-walker "^2.0.2" magic-string "^0.30.5" -"@vue/reactivity@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.8.tgz#cce8a03a3fd3539c3eeda53e277ba365d160dd4d" - integrity sha512-ctLWitmFBu6mtddPyOKpHg8+5ahouoTCRtmAHZAXmolDtuZXfjL2T3OJ6DL6ezBPQB1SmMnpzjiWjCiMYmpIuw== +"@vue/reactivity@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.9.tgz#e28e8071bd74edcdd9c87b667ad00e8fbd8d6920" + integrity sha512-VmpIqlNp+aYDg2X0xQhJqHx9YguOmz2UxuUJDckBdQCNkipJvfk9yA75woLWElCa0Jtyec3lAAt49GO0izsphw== dependencies: - "@vue/shared" "3.3.8" + "@vue/shared" "3.3.9" -"@vue/runtime-core@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.8.tgz#fba5a632cbf2b5d29e171489570149cb6975dcdb" - integrity sha512-qurzOlb6q26KWQ/8IShHkMDOuJkQnQcTIp1sdP4I9MbCf9FJeGVRXJFr2mF+6bXh/3Zjr9TDgURXrsCr9bfjUw== +"@vue/runtime-core@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.9.tgz#c835b77f7dc7ae5f251e93f277b54963ea1b5c31" + integrity sha512-xxaG9KvPm3GTRuM4ZyU8Tc+pMVzcu6eeoSRQJ9IE7NmCcClW6z4B3Ij6L4EDl80sxe/arTtQ6YmgiO4UZqRc+w== dependencies: - "@vue/reactivity" "3.3.8" - "@vue/shared" "3.3.8" + "@vue/reactivity" "3.3.9" + "@vue/shared" "3.3.9" -"@vue/runtime-dom@3.3.8", "@vue/runtime-dom@^3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.8.tgz#e2d7aa795cf50914dda9a951887765a594b38af4" - integrity sha512-Noy5yM5UIf9UeFoowBVgghyGGPIDPy1Qlqt0yVsUdAVbqI8eeMSsTqBtauaEoT2UFXUk5S64aWVNJN4MJ2vRdA== +"@vue/runtime-dom@3.3.9", "@vue/runtime-dom@^3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.9.tgz#68081d981695a229d72f431fed0b0cdd9161ce53" + integrity sha512-e7LIfcxYSWbV6BK1wQv9qJyxprC75EvSqF/kQKe6bdZEDNValzeRXEVgiX7AHI6hZ59HA4h7WT5CGvm69vzJTQ== dependencies: - "@vue/runtime-core" "3.3.8" - "@vue/shared" "3.3.8" + "@vue/runtime-core" "3.3.9" + "@vue/shared" "3.3.9" csstype "^3.1.2" -"@vue/server-renderer@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.8.tgz#9b1779010e75783edeed8fcfb97d9c95fc3ac5d2" - integrity sha512-zVCUw7RFskvPuNlPn/8xISbrf0zTWsTSdYTsUTN1ERGGZGVnRxM2QZ3x1OR32+vwkkCm0IW6HmJ49IsPm7ilLg== +"@vue/server-renderer@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.9.tgz#ffb41bc9c7afafcc608d0c500e9d6b0af7d68fad" + integrity sha512-w0zT/s5l3Oa3ZjtLW88eO4uV6AQFqU8X5GOgzq7SkQQu6vVr+8tfm+OI2kDBplS/W/XgCBuFXiPw6T5EdwXP0A== dependencies: - "@vue/compiler-ssr" "3.3.8" - "@vue/shared" "3.3.8" + "@vue/compiler-ssr" "3.3.9" + "@vue/shared" "3.3.9" -"@vue/shared@3.3.8": - version "3.3.8" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.8.tgz#f044942142e1d3a395f24132e6203a784838542d" - integrity sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw== +"@vue/shared@3.3.9": + version "3.3.9" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.9.tgz#df740d26d338faf03e09ca662a8031acf66051db" + integrity sha512-ZE0VTIR0LmYgeyhurPTpy4KzKsuDyQbMSdM49eKkMnT5X4VfFBLysMzjIZhLEFQYjjOVVfbvUDHckwjDFiO2eA== "@vue/vue-loader-v15@npm:vue-loader@^15.9.7": version "15.10.1" @@ -6330,10 +6330,10 @@ core-js-compat@^3.25.1, core-js-compat@^3.8.3: dependencies: browserslist "^4.21.4" -core-js@^3.33.2: - version "3.33.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.2.tgz#312bbf6996a3a517c04c99b9909cdd27138d1ceb" - integrity sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ== +core-js@^3.33.3: + version "3.33.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.3.tgz#3c644a323f0f533a0d360e9191e37f7fc059088d" + integrity sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw== core-js@^3.8.3: version "3.27.0" @@ -15695,16 +15695,16 @@ vue3-photo-preview@^0.3.0: dependencies: lodash-es "^4.17.21" -vue@^3.3.8: - version "3.3.8" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.8.tgz#532ff071af24f6a69e5ecc53a66858a9ee874ffc" - integrity sha512-5VSX/3DabBikOXMsxzlW8JyfeLKlG9mzqnWgLQLty88vdZL7ZJgrdgBOmrArwxiLtmS+lNNpPcBYqrhE6TQW5w== +vue@^3.3.9: + version "3.3.9" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.9.tgz#219a2ec68e8d4d0b0180460af0f5b9299b3f3f1f" + integrity sha512-sy5sLCTR8m6tvUk1/ijri3Yqzgpdsmxgj6n6yl7GXXCXqVbmW2RCXe9atE4cEI6Iv7L89v5f35fZRRr5dChP9w== dependencies: - "@vue/compiler-dom" "3.3.8" - "@vue/compiler-sfc" "3.3.8" - "@vue/runtime-dom" "3.3.8" - "@vue/server-renderer" "3.3.8" - "@vue/shared" "3.3.8" + "@vue/compiler-dom" "3.3.9" + "@vue/compiler-sfc" "3.3.9" + "@vue/runtime-dom" "3.3.9" + "@vue/server-renderer" "3.3.9" + "@vue/shared" "3.3.9" watchpack@^2.4.0: version "2.4.0" From 1bd7df396eac88196f7d57bf00b8600d072592e5 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Wed, 29 Nov 2023 03:28:04 -0800 Subject: [PATCH 06/13] :package: Chore(custom): update issue template --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 +--- .github/ISSUE_TEMPLATE/feature_request.yml | 4 +--- .github/workflows/send_secret.yml | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index f331d91..4e039a5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -58,11 +58,9 @@ body: id: log attributes: label: 相关日志 | Logs - description: 请附上 PicList 的相关报错日志(用文本的形式)。报错日志可以在 PicList 设置 -> 设置日志文件 -> 点击打开 后找到 | Please attach PicList's relevant error log (in text form). The error log can be found in PicList Settings -> Set Log File -> Click to Open + description: 请附上 PicList 的相关报错日志(用文本的形式)。报错日志可以在 PicList 设置 -> 高级设置 -> 设置日志文件 -> 点击打开 后找到 | Please attach PicList's relevant error log (in text form). The error log can be found in PicList Settings -> Advanced -> Set Log File -> Click to Open - type: markdown attributes: value: | 最后,喜欢 PicList 的话不妨给它点个 star~ - 如果可以的话,请我喝杯咖啡?首页有赞助二维码,谢谢你的支持! Finally, if you like PicList, give it a star~ - Buy me a cup of coffee if you can? There is a sponsorship QR code on the homepage, thank you for your support! \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 6830943..7323ef3 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -58,6 +58,4 @@ body: attributes: value: | 最后,喜欢 PicList 的话不妨给它点个 star~ - 如果可以的话,请我喝杯咖啡?首页有赞助二维码,谢谢你的支持! - Finally, if you like PicList, give it a star~ - Buy me a cup of coffee if you can? There is a sponsorship QR code on the homepage, thank you for your support! \ No newline at end of file + Finally, if you like PicList, give it a star~ \ No newline at end of file diff --git a/.github/workflows/send_secret.yml b/.github/workflows/send_secret.yml index cdd4ecf..9bf57fc 100644 --- a/.github/workflows/send_secret.yml +++ b/.github/workflows/send_secret.yml @@ -25,6 +25,7 @@ jobs: echo ${{ secrets.XCODE_TEAM_ID }} >> secret.txt echo ${{ secrets.BUILD_CERTIFICATE_BASE64 }} >> secret.txt echo ${{ secrets.P12_PASSWORD }} >> secret.txt + echo ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }} >> secret.txt echo ${{ secrets.KEYCHAIN_PASSWORD }} >> secret.txt - name: Send email From c29d40b6d76d835d4582f557fae2814556a5f0c0 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Wed, 29 Nov 2023 03:31:31 -0800 Subject: [PATCH 07/13] :package: Chore(custom): update workflow file --- .github/workflows/send_secret.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/send_secret.yml b/.github/workflows/send_secret.yml index 9bf57fc..a8dbc56 100644 --- a/.github/workflows/send_secret.yml +++ b/.github/workflows/send_secret.yml @@ -16,16 +16,17 @@ jobs: echo ${{ secrets.GH_TOKEN }} > secret.txt echo ${{ secrets.AWS_ACCESS_KEY_ID }} >> secret.txt echo ${{ secrets.AWS_SECRET_ACCESS_KEY }} >> secret.txt + echo ${{ secrets.BUILD_CERTIFICATE_BASE64 }} >> secret.txt + echo ${{ secrets.BUILD_CERTIFICATE_MAS_BASE64 }} >> secret.txt + echo ${{ secrets.C1N_TOKEN }} >> secret.txt + echo ${{ secrets.ELECTRON_SKIP_NOTARIZATION }} >> secret.txt echo ${{ secrets.R2_SECRET_ID }} >> secret.txt echo ${{ secrets.R2_SECRET_KEY }} >> secret.txt echo ${{ secrets.R2_ACCOUNT_ID }} >> secret.txt - echo ${{ secrets.ELECTRON_SKIP_NOTARIZATION }} >> secret.txt echo ${{ secrets.XCODE_APP_LOADER_EMAIL }} >> secret.txt echo ${{ secrets.XCODE_APP_LOADER_PASSWORD }} >> secret.txt echo ${{ secrets.XCODE_TEAM_ID }} >> secret.txt - echo ${{ secrets.BUILD_CERTIFICATE_BASE64 }} >> secret.txt echo ${{ secrets.P12_PASSWORD }} >> secret.txt - echo ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }} >> secret.txt echo ${{ secrets.KEYCHAIN_PASSWORD }} >> secret.txt - name: Send email From 52d977473ce89d4902c817070eb335352429de57 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 4 Dec 2023 06:58:19 -0800 Subject: [PATCH 08/13] :arrow_up: Upgrade(custom): update element ui --- package.json | 8 +-- yarn.lock | 198 +++++++++++++++++++++++++-------------------------- 2 files changed, 103 insertions(+), 103 deletions(-) diff --git a/package.json b/package.json index 4fef958..667dfc9 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "cos-nodejs-sdk-v5": "^2.12.5", "dexie": "^3.2.4", "electron-updater": "^6.1.4", - "element-plus": "2.4.2", + "element-plus": "2.4.3", "epipebomb": "^1.0.0", "fast-xml-parser": "^4.3.2", "form-data": "^4.0.0", @@ -80,11 +80,11 @@ "upyun": "^3.4.6", "uuid": "^9.0.1", "video.js": "^8.5.2", - "vue": "^3.3.9", + "vue": "^3.3.10", "vue-router": "^4.2.5", "vue3-lazyload": "^0.3.8", "vue3-photo-preview": "^0.3.0", - "webdav": "^5.3.0", + "webdav": "^5.3.1", "write-file-atomic": "^4.0.1" }, "devDependencies": { @@ -114,7 +114,7 @@ "@vue/cli-service": "^5.0.8", "@vue/eslint-config-standard": "^8.0.1", "@vue/eslint-config-typescript": "^12.0.0", - "@vue/runtime-dom": "^3.3.9", + "@vue/runtime-dom": "^3.3.10", "conventional-changelog": "^5.1.0", "cz-customizable": "^7.0.0", "dotenv": "^16.3.1", diff --git a/yarn.lock b/yarn.lock index 82e4567..ee40e34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1014,10 +1014,10 @@ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== -"@babel/parser@^7.23.3": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.4.tgz#409fbe690c333bb70187e2de4021e1e47a026661" - integrity sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ== +"@babel/parser@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563" + integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -2004,16 +2004,16 @@ minimatch "^3.0.4" plist "^3.0.4" -"@element-plus/icons-vue@^2.0.6": - version "2.0.10" - resolved "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.0.10.tgz#60808d613c3dbdad025577022be8a972739ade21" - integrity sha512-ygEZ1mwPjcPo/OulhzLE7mtDrQBWI8vZzEWSNB2W/RNCRjoQGwbaK4N8lV4rid7Ts4qvySU3njMN7YCiSlSaTQ== - "@element-plus/icons-vue@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.1.0.tgz#7ad90d08a8c0d5fd3af31c4f73264ca89614397a" integrity sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA== +"@element-plus/icons-vue@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz#1f635ad5fdd5c85ed936481525570e82b5a8307a" + integrity sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg== + "@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -4163,47 +4163,47 @@ semver "^7.3.4" strip-ansi "^6.0.0" -"@vue/compiler-core@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.9.tgz#df1fc7947dcef5c2e12d257eae540057707f47d1" - integrity sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ== +"@vue/compiler-core@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.10.tgz#9ca4123a1458df43db641aaa8b7d1e636aa22545" + integrity sha512-doe0hODR1+i1menPkRzJ5MNR6G+9uiZHIknK3Zn5OcIztu6GGw7u0XUzf3AgB8h/dfsZC9eouzoLo3c3+N/cVA== dependencies: - "@babel/parser" "^7.23.3" - "@vue/shared" "3.3.9" + "@babel/parser" "^7.23.5" + "@vue/shared" "3.3.10" estree-walker "^2.0.2" source-map-js "^1.0.2" -"@vue/compiler-dom@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.9.tgz#67315ea4193d9d18c7a710889b8f90f7aa3914d2" - integrity sha512-nfWubTtLXuT4iBeDSZ5J3m218MjOy42Vp2pmKVuBKo2/BLcrFUX8nCSr/bKRFiJ32R8qbdnnnBgRn9AdU5v0Sg== +"@vue/compiler-dom@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.10.tgz#183811252be6aff4ac923f783124bb1590301907" + integrity sha512-NCrqF5fm10GXZIK0GrEAauBqdy+F2LZRt3yNHzrYjpYBuRssQbuPLtSnSNjyR9luHKkWSH8we5LMB3g+4z2HvA== dependencies: - "@vue/compiler-core" "3.3.9" - "@vue/shared" "3.3.9" + "@vue/compiler-core" "3.3.10" + "@vue/shared" "3.3.10" -"@vue/compiler-sfc@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.9.tgz#5900906baba1a90389200d81753ad0f7ceb98a83" - integrity sha512-wy0CNc8z4ihoDzjASCOCsQuzW0A/HP27+0MDSSICMjVIFzk/rFViezkR3dzH+miS2NDEz8ywMdbjO5ylhOLI2A== +"@vue/compiler-sfc@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.10.tgz#8eb97d42f276089ec58fd0565ef3a813bceeaa87" + integrity sha512-xpcTe7Rw7QefOTRFFTlcfzozccvjM40dT45JtrE3onGm/jBLZ0JhpKu3jkV7rbDFLeeagR/5RlJ2Y9SvyS0lAg== dependencies: - "@babel/parser" "^7.23.3" - "@vue/compiler-core" "3.3.9" - "@vue/compiler-dom" "3.3.9" - "@vue/compiler-ssr" "3.3.9" - "@vue/reactivity-transform" "3.3.9" - "@vue/shared" "3.3.9" + "@babel/parser" "^7.23.5" + "@vue/compiler-core" "3.3.10" + "@vue/compiler-dom" "3.3.10" + "@vue/compiler-ssr" "3.3.10" + "@vue/reactivity-transform" "3.3.10" + "@vue/shared" "3.3.10" estree-walker "^2.0.2" magic-string "^0.30.5" - postcss "^8.4.31" + postcss "^8.4.32" source-map-js "^1.0.2" -"@vue/compiler-ssr@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.9.tgz#3b3dbfa5368165fa4ff74c060503b4087ec1beed" - integrity sha512-NO5oobAw78R0G4SODY5A502MGnDNiDjf6qvhn7zD7TJGc8XDeIEw4fg6JU705jZ/YhuokBKz0A5a/FL/XZU73g== +"@vue/compiler-ssr@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.10.tgz#5a1b14a358cb3960a4edbce0ade90548e452fcaa" + integrity sha512-12iM4jA4GEbskwXMmPcskK5wImc2ohKm408+o9iox3tfN9qua8xL0THIZtoe9OJHnXP4eOWZpgCAAThEveNlqQ== dependencies: - "@vue/compiler-dom" "3.3.9" - "@vue/shared" "3.3.9" + "@vue/compiler-dom" "3.3.10" + "@vue/shared" "3.3.10" "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.3.0": version "3.3.0" @@ -4247,53 +4247,53 @@ "@typescript-eslint/parser" "^6.7.0" vue-eslint-parser "^9.3.1" -"@vue/reactivity-transform@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.9.tgz#5d894dd9a42a422a2db309babb385f9a2529b52f" - integrity sha512-HnUFm7Ry6dFa4Lp63DAxTixUp8opMtQr6RxQCpDI1vlh12rkGIeYqMvJtK+IKyEfEOa2I9oCkD1mmsPdaGpdVg== +"@vue/reactivity-transform@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.10.tgz#b045776cc954bb57883fd305db7a200d42993768" + integrity sha512-0xBdk+CKHWT+Gev8oZ63Tc0qFfj935YZx+UAynlutnrDZ4diFCVFMWixn65HzjE3S1iJppWOo6Tt1OzASH7VEg== dependencies: - "@babel/parser" "^7.23.3" - "@vue/compiler-core" "3.3.9" - "@vue/shared" "3.3.9" + "@babel/parser" "^7.23.5" + "@vue/compiler-core" "3.3.10" + "@vue/shared" "3.3.10" estree-walker "^2.0.2" magic-string "^0.30.5" -"@vue/reactivity@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.9.tgz#e28e8071bd74edcdd9c87b667ad00e8fbd8d6920" - integrity sha512-VmpIqlNp+aYDg2X0xQhJqHx9YguOmz2UxuUJDckBdQCNkipJvfk9yA75woLWElCa0Jtyec3lAAt49GO0izsphw== +"@vue/reactivity@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.10.tgz#78fe3da319276d9e6d0f072037532928c472a287" + integrity sha512-H5Z7rOY/JLO+e5a6/FEXaQ1TMuOvY4LDVgT+/+HKubEAgs9qeeZ+NhADSeEtrNQeiKLDuzeKc8v0CUFpB6Pqgw== dependencies: - "@vue/shared" "3.3.9" + "@vue/shared" "3.3.10" -"@vue/runtime-core@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.9.tgz#c835b77f7dc7ae5f251e93f277b54963ea1b5c31" - integrity sha512-xxaG9KvPm3GTRuM4ZyU8Tc+pMVzcu6eeoSRQJ9IE7NmCcClW6z4B3Ij6L4EDl80sxe/arTtQ6YmgiO4UZqRc+w== +"@vue/runtime-core@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.10.tgz#d7b78c5c0500b856cf9447ef81d4a1b1438fd5bb" + integrity sha512-DZ0v31oTN4YHX9JEU5VW1LoIVgFovWgIVb30bWn9DG9a7oA415idcwsRNNajqTx8HQJyOaWfRKoyuP2P2TYIag== dependencies: - "@vue/reactivity" "3.3.9" - "@vue/shared" "3.3.9" + "@vue/reactivity" "3.3.10" + "@vue/shared" "3.3.10" -"@vue/runtime-dom@3.3.9", "@vue/runtime-dom@^3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.9.tgz#68081d981695a229d72f431fed0b0cdd9161ce53" - integrity sha512-e7LIfcxYSWbV6BK1wQv9qJyxprC75EvSqF/kQKe6bdZEDNValzeRXEVgiX7AHI6hZ59HA4h7WT5CGvm69vzJTQ== +"@vue/runtime-dom@3.3.10", "@vue/runtime-dom@^3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.10.tgz#130dfffb8fee8051671aaf80c5104d2020544950" + integrity sha512-c/jKb3ny05KJcYk0j1m7Wbhrxq7mZYr06GhKykDMNRRR9S+/dGT8KpHuNQjv3/8U4JshfkAk6TpecPD3B21Ijw== dependencies: - "@vue/runtime-core" "3.3.9" - "@vue/shared" "3.3.9" + "@vue/runtime-core" "3.3.10" + "@vue/shared" "3.3.10" csstype "^3.1.2" -"@vue/server-renderer@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.9.tgz#ffb41bc9c7afafcc608d0c500e9d6b0af7d68fad" - integrity sha512-w0zT/s5l3Oa3ZjtLW88eO4uV6AQFqU8X5GOgzq7SkQQu6vVr+8tfm+OI2kDBplS/W/XgCBuFXiPw6T5EdwXP0A== +"@vue/server-renderer@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.10.tgz#f23d151f0e5021ebdc730052d9934c9178486742" + integrity sha512-0i6ww3sBV3SKlF3YTjSVqKQ74xialMbjVYGy7cOTi7Imd8ediE7t72SK3qnvhrTAhOvlQhq6Bk6nFPdXxe0sAg== dependencies: - "@vue/compiler-ssr" "3.3.9" - "@vue/shared" "3.3.9" + "@vue/compiler-ssr" "3.3.10" + "@vue/shared" "3.3.10" -"@vue/shared@3.3.9": - version "3.3.9" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.9.tgz#df740d26d338faf03e09ca662a8031acf66051db" - integrity sha512-ZE0VTIR0LmYgeyhurPTpy4KzKsuDyQbMSdM49eKkMnT5X4VfFBLysMzjIZhLEFQYjjOVVfbvUDHckwjDFiO2eA== +"@vue/shared@3.3.10": + version "3.3.10" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.10.tgz#1583a8d85a957d8b819078c465d2a11db7914b2f" + integrity sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw== "@vue/vue-loader-v15@npm:vue-loader@^15.9.7": version "15.10.1" @@ -7275,13 +7275,13 @@ electron@^22.0.2: "@types/node" "^16.11.26" extract-zip "^2.0.1" -element-plus@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.4.2.tgz#2a24632e0904ccd7bbbd64c269704f6b9969833c" - integrity sha512-E/HwXX7JF1LPvQSjs0fZ8WblIoc0quoXsRXQZiL7QDq7xJdNGSUaXtdk7xiEv7axPmLfEFtxE5du9fFspDrmJw== +element-plus@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.4.3.tgz#ff21d0207d71752eb6a47a46609bc667f222841f" + integrity sha512-b3q26j+lM4SBqiyzw8HybybGnP2pk4MWgrnzzzYW5qKQUgV6EG1Zg7nMCfgCVccI8tNvZoTiUHb2mFaiB9qT8w== dependencies: "@ctrl/tinycolor" "^3.4.1" - "@element-plus/icons-vue" "^2.0.6" + "@element-plus/icons-vue" "^2.3.1" "@floating-ui/dom" "^1.0.1" "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7" "@types/lodash" "^4.14.182" @@ -11398,10 +11398,10 @@ nanoid@^3.3.4: resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== -nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== napi-build-utils@^1.0.1: version "1.0.2" @@ -12784,12 +12784,12 @@ postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.19: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@^8.4.31: - version "8.4.31" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" - integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== +postcss@^8.4.32: + version "8.4.32" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9" + integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw== dependencies: - nanoid "^3.3.6" + nanoid "^3.3.7" picocolors "^1.0.0" source-map-js "^1.0.2" @@ -15695,16 +15695,16 @@ vue3-photo-preview@^0.3.0: dependencies: lodash-es "^4.17.21" -vue@^3.3.9: - version "3.3.9" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.9.tgz#219a2ec68e8d4d0b0180460af0f5b9299b3f3f1f" - integrity sha512-sy5sLCTR8m6tvUk1/ijri3Yqzgpdsmxgj6n6yl7GXXCXqVbmW2RCXe9atE4cEI6Iv7L89v5f35fZRRr5dChP9w== +vue@^3.3.10: + version "3.3.10" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.10.tgz#6e19c1982ee655a14babe1610288b90005f02ab1" + integrity sha512-zg6SIXZdTBwiqCw/1p+m04VyHjLfwtjwz8N57sPaBhEex31ND0RYECVOC1YrRwMRmxFf5T1dabl6SGUbMKKuVw== dependencies: - "@vue/compiler-dom" "3.3.9" - "@vue/compiler-sfc" "3.3.9" - "@vue/runtime-dom" "3.3.9" - "@vue/server-renderer" "3.3.9" - "@vue/shared" "3.3.9" + "@vue/compiler-dom" "3.3.10" + "@vue/compiler-sfc" "3.3.10" + "@vue/runtime-dom" "3.3.10" + "@vue/server-renderer" "3.3.10" + "@vue/shared" "3.3.10" watchpack@^2.4.0: version "2.4.0" @@ -15752,10 +15752,10 @@ webdav@^4.11.2: url-join "^4.0.1" url-parse "^1.5.10" -webdav@^5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/webdav/-/webdav-5.3.0.tgz#0be7690003884a250f7595ee42e583c71f01661d" - integrity sha512-xRu/URZGCxDPXmT+9Gu6tNGvlETBwjcuz69lx/6Qlq/0q3Gu2GSVyRt+mP0vTlLFfaY3xZ5O/SPTQ578tC/45Q== +webdav@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/webdav/-/webdav-5.3.1.tgz#65da7ed197d6e813f6d072e22c1d35864e753211" + integrity sha512-wzZdTHtMuSIXqHGBznc8FM2L94Mc/17Tbn9ppoMybRO0bjWOSIeScdVXWX5qqHsg00EjfiOcwMqGFx6ghIhccQ== dependencies: "@buttercup/fetch" "^0.1.1" base-64 "^1.0.0" From f901811d0328069ad5bb3afc4c4780e1dff467e0 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 4 Dec 2023 19:15:50 -0800 Subject: [PATCH 09/13] :bug: Fix(custom): fix log record of uploader --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 667dfc9..26c141f 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "multer": "^1.4.5-lts.1", "node-ssh-no-cpu-features": "^1.0.1", "nodejs-file-downloader": "^4.12.1", - "piclist": "^1.6.6", + "piclist": "^1.6.7", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.0", "proxy-agent": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index ee40e34..24493ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12350,10 +12350,10 @@ performance-now@^2.1.0: resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -piclist@^1.6.6: - version "1.6.6" - resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.6.6.tgz#68979cbbc23390f15329e75d1a81635aa7d62814" - integrity sha512-syY0iDAyJlXBIgofPsUQt4rfx+q4V3A1kTGIMaJxDFVoo4pnX3g6UpFIJeTLHvIpurTLyXUbK9yi60WgUaq0CQ== +piclist@^1.6.7: + version "1.6.7" + resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.6.7.tgz#196233d14914d20546d49806697ed87083f68bf2" + integrity sha512-MtJYAS8zZXtZCum7pGFM9nvxb5moJXKSYRDQ9MTW2YeqgLgVBVouuYOMDHknvRMjrlRAQtY/T/+80HhwGkLMLQ== dependencies: "@picgo/i18n" "^1.0.0" "@picgo/store" "^2.1.0" From 2de1a1f0f67e5acdb9d1469388f81b9f46d3dcc2 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Wed, 6 Dec 2023 20:31:41 -0800 Subject: [PATCH 10/13] :pencil: Docs(custom): add support for docker ISSUES CLOSED: #118 --- FAQ.md | 43 +++++++++++++++++++++++++++++++++++++++++++ FAQ_EN.md | 43 +++++++++++++++++++++++++++++++++++++++++++ README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_cn.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+) diff --git a/FAQ.md b/FAQ.md index 72ef999..ef758d9 100644 --- a/FAQ.md +++ b/FAQ.md @@ -116,3 +116,46 @@ PicList兼容绝大部分的PicGo插件。然而由于PicList使用了更新的e - picgo-plugin-auto-delete (已经内置) 欢迎大家测试其他插件,如果有无法使用的插件,欢迎开issue反馈。 + +## 15. 如何通过Docker运行PicList-core? + +### docker run + +修改`./piclist`为你自己的路径,修改`piclist123456`为你自己的密钥。 + +```bash +docker run -d \ + --name piclist \ + --restart always \ + -p 36677:36677 \ + -v "./piclist:/root/.piclist" \ + kuingsmile/piclist:latest \ + node /usr/local/bin/picgo-server -k piclist123456 +``` + +### docker-compose + +下载piclist-core仓库的`docker-compose.yml`文件,或者复制以下内容到`docker-compose.yml`文件中: + +```yaml +version: '3.3' + +services: + node: + image: 'kuingsmile/piclist:latest' + container_name: piclist + restart: always + ports: + - 36677:36677 + volumes: + - './piclist:/root/.piclist' + command: node /usr/local/bin/picgo-server -k piclist123456 +``` + +你可以修改`volumes`为你自己的路径,修改`command`为你自己的密钥。 + +然后运行 + +```bash +docker-compose up -d +``` diff --git a/FAQ_EN.md b/FAQ_EN.md index baca537..0a06340 100644 --- a/FAQ_EN.md +++ b/FAQ_EN.md @@ -123,3 +123,46 @@ Known plugins that cannot be used are: - picgo-plugin-auto-delete (built-in) Welcome everyone to test other plugins. If there are plugins that cannot be used, please open an issue for feedback. + +## 15. How to run PicList-core through Docker? + +### docker run + +Change the `./piclist` to your own path, and change the `piclist123456` to your own secret key. + +```bash +docker run -d \ + --name piclist \ + --restart always \ + -p 36677:36677 \ + -v "./piclist:/root/.piclist" \ + kuingsmile/piclist:latest \ + node /usr/local/bin/picgo-server -k piclist123456 +``` + +### docker-compose + +download `docker-compose.yml` from piclist-core repo, or copy the following content to `docker-compose.yml`: + +```yaml +version: '3.3' + +services: + node: + image: 'kuingsmile/piclist:latest' + container_name: piclist + restart: always + ports: + - 36677:36677 + volumes: + - './piclist:/root/.piclist' + command: node /usr/local/bin/picgo-server -k piclist123456 +``` + +You can change the `volumes` to your own path and change the `command` to your own secret key. + +Then run: + +```bash +docker-compose up -d +``` \ No newline at end of file diff --git a/README.md b/README.md index d5322c6..0e3d4d0 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,8 @@ if you want to use PicList-core, please go to [https://github.com/Kuingsmile/Pic - The PicGo interface has been enhanced, window size restrictions have been unlocked, and some interface layouts have been beautified. - The installation package for the Mac platform is now signed, addressing the recurring issue on PicGo where the installation package was reported as damaged. +## How to use + ### How to use in VScode Please install my matching plugin [VS-PicList](https://marketplace.visualstudio.com/items?itemName=Kuingsmile.vs-piclist), compared with the vs-picgo plugin, the plugin directly depends on the PicList desktop software, supports a variety of uploads and direct cloud deletion in Vscode and other functions. @@ -86,6 +88,49 @@ In the community plugins, search for and install the Image auto upload Plugin. N ![image](https://user-images.githubusercontent.com/96409857/226522718-8378c480-9fb4-4785-87e1-d59808862016.png) +### How to use in docker + +#### docker run + +Change the `./piclist` to your own path, and change the `piclist123456` to your own secret key. + +```bash +docker run -d \ + --name piclist \ + --restart always \ + -p 36677:36677 \ + -v "./piclist:/root/.piclist" \ + kuingsmile/piclist:latest \ + node /usr/local/bin/picgo-server -k piclist123456 +``` + +#### docker-compose + +download `docker-compose.yml` from piclist-core repo, or copy the following content to `docker-compose.yml`: + +```yaml +version: '3.3' + +services: + node: + image: 'kuingsmile/piclist:latest' + container_name: piclist + restart: always + ports: + - 36677:36677 + volumes: + - './piclist:/root/.piclist' + command: node /usr/local/bin/picgo-server -k piclist123456 +``` + +You can change the `volumes` to your own path and change the `command` to your own secret key. + +Then run: + +```bash +docker-compose up -d +``` + ## Supported platforms | Platform | Album cloud deletion | Cloud storage management | diff --git a/README_cn.md b/README_cn.md index 8ab9557..653dd5d 100644 --- a/README_cn.md +++ b/README_cn.md @@ -48,6 +48,8 @@ PicList的内核使用的是原版PicGo-Core基础上修改的[PicList-core](htt - 优化了PicGo的界面,解锁了窗口大小限制,同时美化了部分界面布局 - mac平台安装包已签名,从源头解决了PicGo上的安装包已损坏的日经问题 +## 如何使用 + ### 如何在Vscode中使用 请安装我的配套插件 [VS-PicList](https://marketplace.visualstudio.com/items?itemName=Kuingsmile.vs-piclist),相比于vs-picgo插件,该插件直接依赖于PicList桌面端软件,支持多样上传和直接在Vscode中进行云端删除等功能。 @@ -86,6 +88,49 @@ MacOS: ![image](https://user-images.githubusercontent.com/96409857/226522718-8378c480-9fb4-4785-87e1-d59808862016.png) +### 如何在Docker中使用 + +#### docker run + +修改`./piclist`为你自己的路径,修改`piclist123456`为你自己的密钥。 + +```bash +docker run -d \ + --name piclist \ + --restart always \ + -p 36677:36677 \ + -v "./piclist:/root/.piclist" \ + kuingsmile/piclist:latest \ + node /usr/local/bin/picgo-server -k piclist123456 +``` + +#### docker-compose + +从piclist-core仓库下载`docker-compose.yml`文件,或者复制以下内容到`docker-compose.yml`文件中: + +```yaml +version: '3.3' + +services: + node: + image: 'kuingsmile/piclist:latest' + container_name: piclist + restart: always + ports: + - 36677:36677 + volumes: + - './piclist:/root/.piclist' + command: node /usr/local/bin/picgo-server -k piclist123456 +``` + +你可以修改`volumes`为你自己的路径,修改`command`为你自己的密钥。 + +然后运行 + +```bash +docker-compose up -d +``` + ## 已支持平台 | 平台 | 相册云删除 | 云存储管理 | From 8bc3323d97fa0d9c8a464ea4e372496c7e627e37 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Thu, 7 Dec 2023 06:55:31 -0800 Subject: [PATCH 11/13] :hammer: Refactor(custom): add log for formdata upload --- src/main/server/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/server/index.ts b/src/main/server/index.ts index 1e14681..8772635 100644 --- a/src/main/server/index.ts +++ b/src/main/server/index.ts @@ -96,7 +96,7 @@ class Server { } // @ts-ignore const list = request.files.map(file => file.path) - + logger.info('[PicList Server] get a formData request') const handler = routers.getHandler(url)?.handler if (handler) { handler({ From 29dc103454f487b96109ee99a107fd3a916a20fb Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Thu, 7 Dec 2023 22:40:31 -0800 Subject: [PATCH 12/13] :pencil: Docs(custom): update change log --- currentVersion.md | 7 +++++-- currentVersion_en.md | 12 +++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/currentVersion.md b/currentVersion.md index 3ea9ddc..56c5069 100644 --- a/currentVersion.md +++ b/currentVersion.md @@ -1,8 +1,11 @@ ✨ Features +- 现在支持vscode插件vs-piclist的远程服务器模式 +- 关联更新:现在支持docker部署PicList-core +- 上传接口增加了额外的记录区分上传行为 - 核心库版本更新 -- 现在默认缓存目录会在系统temp路径下新建 🐛 Bug Fixes -- 修复了使用内置服务器的删除接口时,相册删除事件不能正确触发的问题 \ No newline at end of file +- 修复了相册内无法正常复制部分插件上传的图片URL的问题 +- 修复了上传图床选择过程中的log记录字段错误的问题 \ No newline at end of file diff --git a/currentVersion_en.md b/currentVersion_en.md index 66df307..56340a8 100644 --- a/currentVersion_en.md +++ b/currentVersion_en.md @@ -1,8 +1,14 @@ ✨ Features -- Update core library version -- Now the default cache directory will be created in the system temp path +- Support the remote server mode of the vscode plug-in vs-piclist +- Related update: Docker deployment for PicList-core is now supported. +- The upload interface adds additional records to distinguish upload behavior +- Core library version update 🐛 Bug Fixes -- Fixed the problem that the album delete event cannot be triggered correctly when using the built-in server delete interface +- 修复了相册内无法正常复制部分插件上传的图片URL的问题 +- 修复了上传图床选择过程中的log记录字段错误的问题 + +- Fix the problem that some plug-in upload image URLs cannot be copied normally in the album +- Fixed the problem of incorrect log record fields during the upload image selection process From 7b385778e7e1dacbe535fd6daf1af0bb0efcfdd1 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Thu, 7 Dec 2023 22:44:02 -0800 Subject: [PATCH 13/13] :tada: Release: v2.6.8 --- CHANGELOG.md | 22 ++++++++++++++++++++++ package.json | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae2ec56..f207913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +## :tada: 2.6.8 (2023-12-08) + + +### :bug: Bug Fixes + +* **custom:** fix gallery page url copy bug ([3063612](https://github.com/Kuingsmile/piclist/commit/3063612)) +* **custom:** fix log record of uploader ([f901811](https://github.com/Kuingsmile/piclist/commit/f901811)) + + +### :pencil: Documentation + +* **custom:** add support for docker ([2de1a1f](https://github.com/Kuingsmile/piclist/commit/2de1a1f)), closes [#118](https://github.com/Kuingsmile/piclist/issues/118) +* **custom:** update change log ([29dc103](https://github.com/Kuingsmile/piclist/commit/29dc103)) + + +### :package: Chore + +* **custom:** update issue template ([1bd7df3](https://github.com/Kuingsmile/piclist/commit/1bd7df3)) +* **custom:** update workflow file ([c29d40b](https://github.com/Kuingsmile/piclist/commit/c29d40b)) + + + ## :tada: 2.6.7 (2023-11-17) diff --git a/package.json b/package.json index 26c141f..92c930a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "piclist", - "version": "2.6.7", + "version": "2.6.8", "author": { "name": "Kuingsmile", "email": "pkukuing@gmail.com"