From 98dd8d4b74f5d53a0278a707afd806a8122e88e8 Mon Sep 17 00:00:00 2001 From: Mo Huishou <15172509+mohuishou@users.noreply.github.com> Date: Mon, 2 Sep 2024 10:27:33 +0000 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helper/package.json | 2 +- helper/pnpm-lock.yaml | 58 +++++++++++++++++++++++++++++ plugins/vscode/package.json | 8 ++-- plugins/vscode/pnpm-lock.yaml | 70 +++++++++++++++++++++++++++++++++++ readme.md | 16 ++++---- 5 files changed, 141 insertions(+), 13 deletions(-) create mode 100644 helper/pnpm-lock.yaml create mode 100644 plugins/vscode/pnpm-lock.yaml diff --git a/helper/package.json b/helper/package.json index bdc66ad..0646c0f 100644 --- a/helper/package.json +++ b/helper/package.json @@ -27,7 +27,7 @@ "url": "https://github.com/mohuishou/utools.git" }, "devDependencies": { - "@types/node": "^15.12.4", + "@types/node": "v20.16.0", "@types/throttle-debounce": "^2.1.0", "typescript": "^4.2.4", "utools-api-types": "^2.0.3" diff --git a/helper/pnpm-lock.yaml b/helper/pnpm-lock.yaml new file mode 100644 index 0000000..5ecdc04 --- /dev/null +++ b/helper/pnpm-lock.yaml @@ -0,0 +1,58 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: + dependencies: + throttle-debounce: + specifier: ^3.0.1 + version: 3.0.1 + devDependencies: + '@types/node': + specifier: ^15.12.4 + version: 15.14.9 + '@types/throttle-debounce': + specifier: ^2.1.0 + version: 2.1.0 + typescript: + specifier: ^4.2.4 + version: 4.9.5 + utools-api-types: + specifier: ^2.0.3 + version: 2.6.4 + +packages: + + '@types/node@15.14.9': + resolution: {integrity: sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==} + + '@types/throttle-debounce@2.1.0': + resolution: {integrity: sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==} + + throttle-debounce@3.0.1: + resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==} + engines: {node: '>=10'} + + typescript@4.9.5: + resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} + engines: {node: '>=4.2.0'} + hasBin: true + + utools-api-types@2.6.4: + resolution: {integrity: sha512-pJuGvjSScwePuc6F/PVtL6DSCm+XzF78CBKxFUU82FON4vB8MGDXPCp6Y/25T/ndKyiyFj1zCR8ObyxtdikzPg==} + +snapshots: + + '@types/node@15.14.9': {} + + '@types/throttle-debounce@2.1.0': {} + + throttle-debounce@3.0.1: {} + + typescript@4.9.5: {} + + utools-api-types@2.6.4: {} diff --git a/plugins/vscode/package.json b/plugins/vscode/package.json index bb23727..6b5683d 100644 --- a/plugins/vscode/package.json +++ b/plugins/vscode/package.json @@ -4,11 +4,11 @@ "main": "index.js", "license": "MIT", "devDependencies": { - "@types/node": "^15.12.4", - "@types/sql.js": "^1.4.3", - "utools-api-types": "^2.0.3" + "@types/node": "20.16.0", + "@types/sql.js": "^1.4.9", + "utools-api-types": "^2.6.4" }, "dependencies": { - "utools-helper": "^2.0.0" + "utools-helper": "^2.1.0" } } diff --git a/plugins/vscode/pnpm-lock.yaml b/plugins/vscode/pnpm-lock.yaml new file mode 100644 index 0000000..28f04a1 --- /dev/null +++ b/plugins/vscode/pnpm-lock.yaml @@ -0,0 +1,70 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: + dependencies: + utools-helper: + specifier: ^2.1.0 + version: 2.1.0 + devDependencies: + '@types/node': + specifier: 20.16.0 + version: 20.16.0 + '@types/sql.js': + specifier: ^1.4.9 + version: 1.4.9 + utools-api-types: + specifier: ^2.6.4 + version: 2.6.4 + +packages: + + '@types/emscripten@1.39.13': + resolution: {integrity: sha512-cFq+fO/isvhvmuP/+Sl4K4jtU6E23DoivtbO4r50e3odaxAiVdbfSYRDdJ4gCdxx+3aRjhphS5ZMwIH4hFy/Cw==} + + '@types/node@20.16.0': + resolution: {integrity: sha512-vDxceJcoZhIVh67S568bm1UGZO0DX0hpplJZxzeXMKwIPLn190ec5RRxQ69BKhX44SUGIxxgMdDY557lGLKprQ==} + + '@types/sql.js@1.4.9': + resolution: {integrity: sha512-ep8b36RKHlgWPqjNG9ToUrPiwkhwh0AEzy883mO5Xnd+cL6VBH1EvSjBAAuxLUFF2Vn/moE3Me6v9E1Lo+48GQ==} + + throttle-debounce@3.0.1: + resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==} + engines: {node: '>=10'} + + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + + utools-api-types@2.6.4: + resolution: {integrity: sha512-pJuGvjSScwePuc6F/PVtL6DSCm+XzF78CBKxFUU82FON4vB8MGDXPCp6Y/25T/ndKyiyFj1zCR8ObyxtdikzPg==} + + utools-helper@2.1.0: + resolution: {integrity: sha512-SMCtlBvjHlKzVkbHNknQcMdlmzHd9IGnwhCxLri1pYS+GBvp69rT087Wdgvcui6QG97kNn/Ng77AaKLPWckt9w==} + +snapshots: + + '@types/emscripten@1.39.13': {} + + '@types/node@20.16.0': + dependencies: + undici-types: 6.19.8 + + '@types/sql.js@1.4.9': + dependencies: + '@types/emscripten': 1.39.13 + '@types/node': 20.16.0 + + throttle-debounce@3.0.1: {} + + undici-types@6.19.8: {} + + utools-api-types@2.6.4: {} + + utools-helper@2.1.0: + dependencies: + throttle-debounce: 3.0.1 diff --git a/readme.md b/readme.md index c2634fb..9ebc675 100644 --- a/readme.md +++ b/readme.md @@ -14,14 +14,14 @@ | 插件 | 状态 | 说明 | | ------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | -| [iconfont 搜索](./plugins/iconfont) | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mohuishou/utools/build%20iconfont?label=iconfont) | iconfont 图标搜索，支持下载 | -| [vscode 历史搜索](./plugins/vscode) | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mohuishou/utools/build%20vscode?label=vscode) | utools 插件，搜索 vscode 历史项目，点击回车打开 | -| [otp 两步验证](./plugins/otp) | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mohuishou/utools/build%20otp?label=otp) | 保存 TOTP 两步验证，如 Google Auth 等 | -| [chrome-history](./plugins/chrome-history) | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mohuishou/utools/chrome-history?label=chrome-history) | chrome 历史记录搜索插件 | -| [sourcetree 项目搜索](./plugins/sourcetree) | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mohuishou/utools/build%20sourcetree?label=sourcetree) | 搜索并打开 sourcetree 项目 | -| [语雀搜索](./plugins/yuque) | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mohuishou/utools/build%20yuque?label=yuque) | 快速搜索语雀知识库，支持复制为 markdown | -| [视频解析](./plugins/vedio-parse) | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mohuishou/utools/vedio-parse?label=视频解析) | 获取当前浏览器窗口地址，跳转到解析地址 | -| [进程管理](./plugins/process) | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mohuishou/utools/process?label=进程管理) | 进程管理，可以查看、搜索、关闭进程 | +| [iconfont 搜索](./plugins/iconfont) | ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mohuishou/utools/iconfont.yml?branch=master) | iconfont 图标搜索，支持下载 | +| [vscode 历史搜索](./plugins/vscode) | ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mohuishou/utools/vscode.yml?branch=master) | utools 插件，搜索 vscode 历史项目，点击回车打开 | +| [otp 两步验证](./plugins/otp) | ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mohuishou/utools/otp.yml?branch=master) | 保存 TOTP 两步验证，如 Google Auth 等 | +| [chrome-history](./plugins/chrome-history) | ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mohuishou/utools/chrome-history.yml?branch=master) | chrome 历史记录搜索插件 | +| [sourcetree 项目搜索](./plugins/sourcetree) | ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mohuishou/utools/sourcetree.yml?branch=master) | 搜索并打开 sourcetree 项目 | +| [语雀搜索](./plugins/yuque) | ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mohuishou/utools/yuque.yml?branch=master) | 快速搜索语雀知识库，支持复制为 markdown | +| [视频解析](./plugins/vedio-parse) | ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mohuishou/utools/vedio-parse.yml?branch=master) | 获取当前浏览器窗口地址，跳转到解析地址 | +| [进程管理](./plugins/process) | ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/mohuishou/utools/process.yml?branch=master) | 进程管理，可以查看、搜索、关闭进程 | ## 文档插件 From a9c022f09abd2217c9ae62a47b387ea100e9a117 Mon Sep 17 00:00:00 2001 From: corvofeng Date: Fri, 6 Sep 2024 08:36:33 +0800 Subject: [PATCH 2/2] Remove empty _rev settings Follow #108 , remove the default rev settings --- helper/src/config/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper/src/config/config.ts b/helper/src/config/config.ts index d6e5e76..2bfb8c7 100644 --- a/helper/src/config/config.ts +++ b/helper/src/config/config.ts @@ -70,7 +70,7 @@ export abstract class Config implements IConfig { if (data && this.key in data.data) return data.data[this.key]; // 值不存在，初始化，并且保存 - if (!data) data = { _id: "config", _rev: "", data: {} }; + if (!data) data = { _id: "config", data: {} }; data.data[this.key] = this.default; let res = utools.db.put(data); if (!res.ok) throw new Error(res.message);