diff --git a/.github/update.log b/.github/update.log index 3c3e252932..1700e1b8d6 100644 --- a/.github/update.log +++ b/.github/update.log @@ -589,3 +589,4 @@ Update On Fri Mar 15 19:26:33 CET 2024 Update On Sat Mar 16 12:46:37 CET 2024 Update On Sat Mar 16 19:29:33 CET 2024 Update On Sun Mar 17 19:25:46 CET 2024 +Update On Mon Mar 18 19:26:37 CET 2024 diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json index 894cb235c6..a0ba54b507 100644 --- a/clash-nyanpasu/package.json +++ b/clash-nyanpasu/package.json @@ -133,7 +133,7 @@ "node-fetch": "3.3.2", "npm-run-all2": "6.1.2", "picocolors": "1.0.0", - "postcss": "8.4.35", + "postcss": "8.4.36", "postcss-html": "1.6.0", "postcss-import": "16.0.1", "postcss-scss": "4.0.9", diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml index a6600a9b85..10795b5955 100644 --- a/clash-nyanpasu/pnpm-lock.yaml +++ b/clash-nyanpasu/pnpm-lock.yaml @@ -147,7 +147,7 @@ devDependencies: version: 0.5.12 autoprefixer: specifier: 10.4.18 - version: 10.4.18(postcss@8.4.35) + version: 10.4.18(postcss@8.4.36) colorize-template: specifier: 1.0.0 version: 1.0.0 @@ -215,17 +215,17 @@ devDependencies: specifier: 1.0.0 version: 1.0.0 postcss: - specifier: 8.4.35 - version: 8.4.35 + specifier: 8.4.36 + version: 8.4.36 postcss-html: specifier: 1.6.0 version: 1.6.0 postcss-import: specifier: 16.0.1 - version: 16.0.1(postcss@8.4.35) + version: 16.0.1(postcss@8.4.36) postcss-scss: specifier: 4.0.9 - version: 4.0.9(postcss@8.4.35) + version: 4.0.9(postcss@8.4.36) prettier: specifier: 3.2.5 version: 3.2.5 @@ -2552,7 +2552,7 @@ packages: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: false - /autoprefixer@10.4.18(postcss@8.4.35): + /autoprefixer@10.4.18(postcss@8.4.36): resolution: {integrity: sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==} engines: {node: ^10 || ^12 || >=14} hasBin: true @@ -2564,7 +2564,7 @@ packages: fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 - postcss: 8.4.35 + postcss: 8.4.36 postcss-value-parser: 4.2.0 dev: true @@ -5764,17 +5764,17 @@ packages: dependencies: htmlparser2: 8.0.2 js-tokens: 8.0.2 - postcss: 8.4.35 - postcss-safe-parser: 6.0.0(postcss@8.4.35) + postcss: 8.4.36 + postcss-safe-parser: 6.0.0(postcss@8.4.36) dev: true - /postcss-import@16.0.1(postcss@8.4.35): + /postcss-import@16.0.1(postcss@8.4.36): resolution: {integrity: sha512-i2Pci0310NaLHr/5JUFSw1j/8hf1CzwMY13g6ZDxgOavmRHQi2ba3PmUHoihO+sjaum+KmCNzskNsw7JDrg03g==} engines: {node: '>=18.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.4.35 + postcss: 8.4.36 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.8 @@ -5788,31 +5788,31 @@ packages: resolution: {integrity: sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==} dev: true - /postcss-safe-parser@6.0.0(postcss@8.4.35): + /postcss-safe-parser@6.0.0(postcss@8.4.36): resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.3.3 dependencies: - postcss: 8.4.35 + postcss: 8.4.36 dev: true - /postcss-safe-parser@7.0.0(postcss@8.4.35): + /postcss-safe-parser@7.0.0(postcss@8.4.36): resolution: {integrity: sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==} engines: {node: '>=18.0'} peerDependencies: postcss: ^8.4.31 dependencies: - postcss: 8.4.35 + postcss: 8.4.36 dev: true - /postcss-scss@4.0.9(postcss@8.4.35): + /postcss-scss@4.0.9(postcss@8.4.36): resolution: {integrity: sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.4.29 dependencies: - postcss: 8.4.35 + postcss: 8.4.36 dev: true /postcss-selector-parser@6.0.15: @@ -5823,25 +5823,25 @@ packages: util-deprecate: 1.0.2 dev: true - /postcss-sorting@8.0.2(postcss@8.4.35): + /postcss-sorting@8.0.2(postcss@8.4.36): resolution: {integrity: sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==} peerDependencies: postcss: ^8.4.20 dependencies: - postcss: 8.4.35 + postcss: 8.4.36 dev: true /postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} dev: true - /postcss@8.4.35: - resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} + /postcss@8.4.36: + resolution: {integrity: sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 picocolors: 1.0.0 - source-map-js: 1.0.2 + source-map-js: 1.1.0 dev: true /prelude-ls@1.2.1: @@ -6451,6 +6451,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /source-map-js@1.1.0: + resolution: {integrity: sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==} + engines: {node: '>=0.10.0'} + dev: true + /source-map@0.5.7: resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==} engines: {node: '>=0.10.0'} @@ -6636,8 +6641,8 @@ packages: peerDependencies: stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1 dependencies: - postcss: 8.4.35 - postcss-sorting: 8.0.2(postcss@8.4.35) + postcss: 8.4.36 + postcss-sorting: 8.0.2(postcss@8.4.36) stylelint: 16.2.1(typescript@5.4.2) dev: true @@ -6686,9 +6691,9 @@ packages: micromatch: 4.0.5 normalize-path: 3.0.0 picocolors: 1.0.0 - postcss: 8.4.35 + postcss: 8.4.36 postcss-resolve-nested-selector: 0.1.1 - postcss-safe-parser: 7.0.0(postcss@8.4.35) + postcss-safe-parser: 7.0.0(postcss@8.4.36) postcss-selector-parser: 6.0.15 postcss-value-parser: 4.2.0 resolve-from: 5.0.0 @@ -7170,7 +7175,7 @@ packages: dependencies: '@types/node': 20.11.28 esbuild: 0.19.10 - postcss: 8.4.35 + postcss: 8.4.36 rollup: 4.9.0 sass: 1.72.0 optionalDependencies: diff --git a/clash-verge-rev/src-tauri/src/core/tray.rs b/clash-verge-rev/src-tauri/src/core/tray.rs index dc8e9f183b..a0e0e1680b 100644 --- a/clash-verge-rev/src-tauri/src/core/tray.rs +++ b/clash-verge-rev/src-tauri/src/core/tray.rs @@ -130,6 +130,44 @@ impl Tray { let _ = tray.get_item("global_mode").set_selected(mode == "global"); let _ = tray.get_item("direct_mode").set_selected(mode == "direct"); + #[cfg(target_os = "linux")] + match mode.as_str() { + "rule" => { + let _ = tray + .get_item("rule_mode") + .set_title(t!("Rule Mode ✔", "规则模式 ✔")); + let _ = tray + .get_item("global_mode") + .set_title(t!("Global Mode", "全局模式")); + let _ = tray + .get_item("direct_mode") + .set_title(t!("Direct Mode", "直连模式")); + } + "global" => { + let _ = tray + .get_item("rule_mode") + .set_title(t!("Rule Mode", "规则模式")); + let _ = tray + .get_item("global_mode") + .set_title(t!("Global Mode ✔", "全局模式 ✔")); + let _ = tray + .get_item("direct_mode") + .set_title(t!("Direct Mode", "直连模式")); + } + "direct" => { + let _ = tray + .get_item("rule_mode") + .set_title(t!("Rule Mode", "规则模式")); + let _ = tray + .get_item("global_mode") + .set_title(t!("Global Mode", "全局模式")); + let _ = tray + .get_item("direct_mode") + .set_title(t!("Direct Mode ✔", "直连模式 ✔")); + } + _ => {} + } + let verge = Config::verge(); let verge = verge.latest(); let system_proxy = verge.enable_system_proxy.as_ref().unwrap_or(&false); @@ -182,6 +220,27 @@ impl Tray { let _ = tray.get_item("system_proxy").set_selected(*system_proxy); let _ = tray.get_item("tun_mode").set_selected(*tun_mode); + #[cfg(target_os = "linux")] + { + if *system_proxy { + let _ = tray + .get_item("system_proxy") + .set_title(t!("System Proxy ✔", "系统代理 ✔")); + } else { + let _ = tray + .get_item("system_proxy") + .set_title(t!("System Proxy", "系统代理")); + } + if *tun_mode { + let _ = tray + .get_item("tun_mode") + .set_title(t!("TUN Mode ✔", "Tun 模式 ✔")); + } else { + let _ = tray + .get_item("tun_mode") + .set_title(t!("TUN Mode", "Tun 模式")); + } + } let switch_map = { let mut map = std::collections::HashMap::new(); diff --git a/clash-verge-rev/src-tauri/src/utils/resolve.rs b/clash-verge-rev/src-tauri/src/utils/resolve.rs index 5ca1eed39b..45243c0c0c 100644 --- a/clash-verge-rev/src-tauri/src/utils/resolve.rs +++ b/clash-verge-rev/src-tauri/src/utils/resolve.rs @@ -35,6 +35,8 @@ pub fn find_unused_port() -> Result { /// handle something when start app pub fn resolve_setup(app: &mut App) { + #[cfg(target_os = "macos")] + app.set_activation_policy(tauri::ActivationPolicy::Accessory); let version = app.package_info().version.to_string(); handle::Handle::global().init(app.app_handle()); VERSION.get_or_init(|| version.clone()); diff --git a/echo/internal/config/config.go b/echo/internal/config/config.go index 2124d6616a..7166ac4d06 100644 --- a/echo/internal/config/config.go +++ b/echo/internal/config/config.go @@ -75,9 +75,6 @@ func (c *Config) readFromFile() error { return err } c.l.Infof("Load Config From File: %s", c.PATH) - if err != nil { - return err - } return json.Unmarshal([]byte(file), &c) } diff --git a/echo/pkg/log/log.go b/echo/pkg/log/log.go index de36519256..bd9469ba0f 100644 --- a/echo/pkg/log/log.go +++ b/echo/pkg/log/log.go @@ -31,7 +31,9 @@ func initLogger(logLevel string, replaceGlobal bool) (*zap.Logger, error) { level, ) l := zap.New(core) - zap.ReplaceGlobals(l) + if replaceGlobal { + zap.ReplaceGlobals(l) + } return l, nil } diff --git a/filebrowser/frontend/src/views/Share.vue b/filebrowser/frontend/src/views/Share.vue index cdcfdf606c..0bbf643638 100644 --- a/filebrowser/frontend/src/views/Share.vue +++ b/filebrowser/frontend/src/views/Share.vue @@ -29,7 +29,7 @@
-

+