From d05ead9cddbd9f18c013c2ed7cfc93e48aadc125 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Thu, 21 May 2026 12:16:17 +0800 Subject: [PATCH] chore: track tauri-plugin-mihomo main updates --- Cargo.lock | 25 +++++++------------------ package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ renovate.json | 28 +++++++++++++++++++++++++++- src-tauri/Cargo.toml | 2 +- 5 files changed, 42 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9e17bb7dd..09ee9c537 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1360,7 +1360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -3614,7 +3614,7 @@ dependencies = [ "tokio", "tower-service", "tracing", - "windows-registry 0.6.1", + "windows-registry", ] [[package]] @@ -5165,7 +5165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] @@ -7884,7 +7884,7 @@ dependencies = [ "thiserror 2.0.18", "tracing", "url", - "windows-registry 0.5.3", + "windows-registry", "windows-result 0.3.4", ] @@ -7998,8 +7998,8 @@ dependencies = [ [[package]] name = "tauri-plugin-mihomo" -version = "0.1.5" -source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo?branch=revert#1cc80bc0fbe1245315617f4cecd93710a152325b" +version = "0.2.0" +source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo?rev=66a2b5d50520cae46cddfe456a0d334c094fd05b#66a2b5d50520cae46cddfe456a0d334c094fd05b" dependencies = [ "base64 0.22.1", "bytes", @@ -9730,7 +9730,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] @@ -9910,17 +9910,6 @@ dependencies = [ "windows-strings 0.4.2", ] -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -dependencies = [ - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", -] - [[package]] name = "windows-result" version = "0.3.4" diff --git a/package.json b/package.json index c8d17811f..6ac2a289b 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "react-markdown": "10.1.0", "react-router": "^7.13.1", "rehype-raw": "^7.0.0", - "tauri-plugin-mihomo-api": "github:clash-verge-rev/tauri-plugin-mihomo", + "tauri-plugin-mihomo-api": "github:clash-verge-rev/tauri-plugin-mihomo#66a2b5d50520cae46cddfe456a0d334c094fd05b", "types-pac": "^1.0.3", "validator": "^13.15.26" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 19329f696..f2fbb9f8b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,8 +132,8 @@ importers: specifier: ^7.0.0 version: 7.0.0 tauri-plugin-mihomo-api: - specifier: github:clash-verge-rev/tauri-plugin-mihomo - version: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/a185fe1a8802367d0b3d50d402cb823759d2c57e + specifier: github:clash-verge-rev/tauri-plugin-mihomo#66a2b5d50520cae46cddfe456a0d334c094fd05b + version: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/66a2b5d50520cae46cddfe456a0d334c094fd05b types-pac: specifier: ^1.0.3 version: 1.0.3 @@ -3398,9 +3398,9 @@ packages: resolution: {integrity: sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==} engines: {node: '>=18'} - tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/a185fe1a8802367d0b3d50d402cb823759d2c57e: - resolution: {tarball: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/a185fe1a8802367d0b3d50d402cb823759d2c57e} - version: 0.1.9 + tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/66a2b5d50520cae46cddfe456a0d334c094fd05b: + resolution: {tarball: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/66a2b5d50520cae46cddfe456a0d334c094fd05b} + version: 0.1.5 terser@5.46.2: resolution: {integrity: sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==} @@ -7139,7 +7139,7 @@ snapshots: minizlib: 3.1.0 yallist: 5.0.0 - tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/a185fe1a8802367d0b3d50d402cb823759d2c57e: + tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/66a2b5d50520cae46cddfe456a0d334c094fd05b: dependencies: '@tauri-apps/api': 2.11.0 diff --git a/renovate.json b/renovate.json index e59c8a9ea..0f5c2f1df 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,33 @@ { "extends": ["config:recommended", ":disableDependencyDashboard"], "baseBranchPatterns": ["dev"], - "enabledManagers": ["cargo", "npm", "github-actions"], + "enabledManagers": ["cargo", "npm", "github-actions", "custom.regex"], + "customManagers": [ + { + "customType": "regex", + "description": "Track tauri-plugin-mihomo Cargo git revision on main", + "fileMatch": ["(^|/)src-tauri/Cargo\\.toml$"], + "matchStrings": [ + "tauri-plugin-mihomo\\s*=\\s*\\{[^}]*git\\s*=\\s*\"https://github\\.com/clash-verge-rev/tauri-plugin-mihomo\"[^}]*rev\\s*=\\s*\"(?[a-f0-9]{40})\"[^}]*\\}" + ], + "depNameTemplate": "tauri-plugin-mihomo", + "packageNameTemplate": "https://github.com/clash-verge-rev/tauri-plugin-mihomo", + "currentValueTemplate": "main", + "datasourceTemplate": "git-refs" + }, + { + "customType": "regex", + "description": "Track tauri-plugin-mihomo npm API git revision on main", + "fileMatch": ["(^|/)package\\.json$"], + "matchStrings": [ + "\"tauri-plugin-mihomo-api\"\\s*:\\s*\"github:clash-verge-rev/tauri-plugin-mihomo#(?[a-f0-9]{40})\"" + ], + "depNameTemplate": "tauri-plugin-mihomo-api", + "packageNameTemplate": "https://github.com/clash-verge-rev/tauri-plugin-mihomo", + "currentValueTemplate": "main", + "datasourceTemplate": "git-refs" + } + ], "labels": ["dependencies"], "ignorePaths": [ "**/node_modules/**", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index f082f2d65..30f69863d 100755 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -95,7 +95,7 @@ backon = { version = "1.6.0", features = ["tokio-sleep"] } tauri-plugin-http = "2.5.9" console-subscriber = { version = "0.5.0", optional = true } tauri-plugin-devtools = { version = "2.1.0" } -tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", branch = "revert" } +tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", rev = "66a2b5d50520cae46cddfe456a0d334c094fd05b" } clash_verge_logger = { git = "https://github.com/clash-verge-rev/clash-verge-logger" } async-trait = "0.1.89" clash_verge_service_ipc = { version = "2.3.0", features = [