refactor!: remove skip_webview_install option (#9864)

tauri-apps · May 24, 2024 · fc1543c · fc1543c
1 parent 1df5cde
commit fc1543c
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 26 deletions.
diff --git a/.changes/skip-webview-install-mod.md b/.changes/skip-webview-install-mod.md
@@ -0,0 +1,7 @@
+---
+"tauri-utils": "major:breaking"
+"tauri-bundler": "major:breaking"
+---
+
+Removed `skip_webview_install` (`skipWebviewInstall`) option from config, which has been deprecated for a while now and planned to be removed in v2. Use `webview_install_mode` (`webviewInstallMode`) instead.
+
diff --git a/core/tauri-config-schema/schema.json b/core/tauri-config-schema/schema.json
@@ -2154,11 +2154,6 @@
             "type": "string"
           }
         },
-        "skipWebviewInstall": {
-          "description": "Disables the Webview2 runtime installation after app install.\n\nWill be removed in v2, prefer the [`WindowsConfig::webview_install_mode`] option.",
-          "default": false,
-          "type": "boolean"
-        },
         "enableElevatedUpdateTask": {
           "description": "Create an elevated update task within Windows Task Scheduler.",
           "default": false,

diff --git a/core/tauri-utils/src/config.rs b/core/tauri-utils/src/config.rs
@@ -657,11 +657,6 @@ pub struct WixConfig {
   /// The Merge element ids you want to reference from the fragments.
   #[serde(default, alias = "merge-refs")]
   pub merge_refs: Vec<String>,
-  /// Disables the Webview2 runtime installation after app install.
-  ///
-  /// Will be removed in v2, prefer the [`WindowsConfig::webview_install_mode`] option.
-  #[serde(default, alias = "skip-webview-install")]
-  pub skip_webview_install: bool,
   /// Create an elevated update task within Windows Task Scheduler.
   #[serde(default, alias = "enable-elevated-update-task")]
   pub enable_elevated_update_task: bool,

diff --git a/tooling/bundler/src/bundle/settings.rs b/tooling/bundler/src/bundle/settings.rs
@@ -362,8 +362,6 @@ pub struct WixSettings {
   pub feature_refs: Vec<String>,
   /// The Merge element ids you want to reference from the fragments.
   pub merge_refs: Vec<String>,
-  /// Disables the Webview2 runtime installation after app install. Will be removed in v2, use [`WindowsSettings::webview_install_mode`] instead.
-  pub skip_webview_install: bool,
   /// Create an elevated update task within Windows Task Scheduler.
   pub enable_elevated_update_task: bool,
   /// Path to a bitmap file to use as the installation user interface banner.

diff --git a/tooling/bundler/src/bundle/windows/msi/wix.rs b/tooling/bundler/src/bundle/windows/msi/wix.rs
@@ -437,10 +437,6 @@ pub fn build_wix_app_installer(
       webview_install_mode = WebviewInstallMode::FixedRuntime {
         path: fixed_runtime_path,
       };
-    } else if let Some(wix) = &settings.windows().wix {
-      if wix.skip_webview_install {
-        webview_install_mode = WebviewInstallMode::Skip;
-      }
     }
     webview_install_mode
   };

diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs
@@ -391,10 +391,6 @@ fn build_nsis_app_installer(
       webview_install_mode = WebviewInstallMode::FixedRuntime {
         path: fixed_runtime_path,
       };
-    } else if let Some(wix) = &settings.windows().wix {
-      if wix.skip_webview_install {
-        webview_install_mode = WebviewInstallMode::Skip;
-      }
     }
     webview_install_mode
   };

diff --git a/tooling/cli/schema.json b/tooling/cli/schema.json
@@ -2154,11 +2154,6 @@
             "type": "string"
           }
         },
-        "skipWebviewInstall": {
-          "description": "Disables the Webview2 runtime installation after app install.\n\nWill be removed in v2, prefer the [`WindowsConfig::webview_install_mode`] option.",
-          "default": false,
-          "type": "boolean"
-        },
         "enableElevatedUpdateTask": {
           "description": "Create an elevated update task within Windows Task Scheduler.",
           "default": false,

diff --git a/tooling/cli/src/helpers/config.rs b/tooling/cli/src/helpers/config.rs
@@ -87,7 +87,6 @@ pub fn wix_settings(config: WixConfig) -> tauri_bundler::WixSettings {
     feature_group_refs: config.feature_group_refs,
     feature_refs: config.feature_refs,
     merge_refs: config.merge_refs,
-    skip_webview_install: config.skip_webview_install,
     enable_elevated_update_task: config.enable_elevated_update_task,
     banner_path: config.banner_path,
     dialog_image_path: config.dialog_image_path,