diff --git a/.gitmodules b/.gitmodules index 9f34582b..58ab3330 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "packages/js-mdict"] path = packages/js-mdict url = https://github.com/readest/js-mdict.git +[submodule "apps/readest-app/src-tauri/plugins/tauri-plugin-webview-upgrade"] + path = apps/readest-app/src-tauri/plugins/tauri-plugin-webview-upgrade + url = https://github.com/readest/tauri-plugin-webview-upgrade.git diff --git a/Cargo.lock b/Cargo.lock index a876f0e2..d674f1a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,6 +55,7 @@ dependencies = [ "tauri-plugin-updater", "tauri-plugin-webdriver", "tauri-plugin-websocket", + "tauri-plugin-webview-upgrade", "tauri-plugin-window-state", "thiserror 2.0.18", "tokio", @@ -7866,6 +7867,14 @@ dependencies = [ "tokio-tungstenite", ] +[[package]] +name = "tauri-plugin-webview-upgrade" +version = "0.1.0" +dependencies = [ + "tauri", + "tauri-plugin", +] + [[package]] name = "tauri-plugin-window-state" version = "2.4.1" diff --git a/apps/readest-app/src-tauri/Cargo.toml b/apps/readest-app/src-tauri/Cargo.toml index d261e8b8..58fe5a41 100644 --- a/apps/readest-app/src-tauri/Cargo.toml +++ b/apps/readest-app/src-tauri/Cargo.toml @@ -56,6 +56,7 @@ tauri-plugin-haptics = "2" tauri-plugin-persisted-scope = "2" tauri-plugin-native-bridge = { path = "./plugins/tauri-plugin-native-bridge" } tauri-plugin-native-tts = { path = "./plugins/tauri-plugin-native-tts" } +tauri-plugin-webview-upgrade = { path = "./plugins/tauri-plugin-webview-upgrade" } tauri-plugin-websocket = "2" tauri-plugin-sharekit = "0.3" tauri-plugin-device-info = "1.0.1" diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-webview-upgrade b/apps/readest-app/src-tauri/plugins/tauri-plugin-webview-upgrade new file mode 160000 index 00000000..9cc25bd7 --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-webview-upgrade @@ -0,0 +1 @@ +Subproject commit 9cc25bd77da2287ce5c61ffce2e6154fdd1dbf4e diff --git a/apps/readest-app/src-tauri/src/lib.rs b/apps/readest-app/src-tauri/src/lib.rs index 8e9b707a..9f9a9c2b 100644 --- a/apps/readest-app/src-tauri/src/lib.rs +++ b/apps/readest-app/src-tauri/src/lib.rs @@ -191,7 +191,8 @@ pub fn run() { .plugin(tauri_plugin_device_info::init()) .plugin(tauri_plugin_turso::init()) .plugin(tauri_plugin_native_bridge::init()) - .plugin(tauri_plugin_native_tts::init()); + .plugin(tauri_plugin_native_tts::init()) + .plugin(tauri_plugin_webview_upgrade::init()); #[cfg(desktop)] let builder = builder.plugin( diff --git a/apps/readest-app/src-tauri/tauri.conf.json b/apps/readest-app/src-tauri/tauri.conf.json index ba49df36..02d83d26 100644 --- a/apps/readest-app/src-tauri/tauri.conf.json +++ b/apps/readest-app/src-tauri/tauri.conf.json @@ -172,6 +172,10 @@ "https://download.readest.com/releases/latest.json", "https://github.com/readest/readest/releases/latest/download/latest.json" ] + }, + "webview-upgrade": { + "minUpgradeMajor": 121, + "minSupportedMajor": 92 } } }