tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-12-25 19:54:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor!: remove skip_webview_install option (#9864)

Browse Source
This commit is contained in:
Amr Bashir 2024-05-24 16:13:55 +03:00 committed by GitHub
parent 1df5cdeb06
commit fc1543c65e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.changes/skip-webview-install-mod.md Normal file
View File

@ -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.

5
core/tauri-config-schema/schema.json
View File

@ -2154,11 +2154,6 @@
"type": "string" "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": { "enableElevatedUpdateTask": {
"description": "Create an elevated update task within Windows Task Scheduler.", "description": "Create an elevated update task within Windows Task Scheduler.",
"default": false, "default": false,

5
core/tauri-utils/src/config.rs
View File

@ -657,11 +657,6 @@ pub struct WixConfig {
/// The Merge element ids you want to reference from the fragments. /// The Merge element ids you want to reference from the fragments.
#[serde(default, alias = "merge-refs")] #[serde(default, alias = "merge-refs")]
pub merge_refs: Vec<String>, 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. /// Create an elevated update task within Windows Task Scheduler.
#[serde(default, alias = "enable-elevated-update-task")] #[serde(default, alias = "enable-elevated-update-task")]
pub enable_elevated_update_task: bool, pub enable_elevated_update_task: bool,

2
tooling/bundler/src/bundle/settings.rs
View File

@ -362,8 +362,6 @@ pub struct WixSettings {
pub feature_refs: Vec<String>, pub feature_refs: Vec<String>,
/// The Merge element ids you want to reference from the fragments. /// The Merge element ids you want to reference from the fragments.
pub merge_refs: Vec<String>, 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. /// Create an elevated update task within Windows Task Scheduler.
pub enable_elevated_update_task: bool, pub enable_elevated_update_task: bool,
/// Path to a bitmap file to use as the installation user interface banner. /// Path to a bitmap file to use as the installation user interface banner.

4
tooling/bundler/src/bundle/windows/msi/wix.rs
View File

@ -437,10 +437,6 @@ pub fn build_wix_app_installer(
webview_install_mode = WebviewInstallMode::FixedRuntime { webview_install_mode = WebviewInstallMode::FixedRuntime {
path: fixed_runtime_path, 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 webview_install_mode
}; };

4
tooling/bundler/src/bundle/windows/nsis.rs
View File

@ -391,10 +391,6 @@ fn build_nsis_app_installer(
webview_install_mode = WebviewInstallMode::FixedRuntime { webview_install_mode = WebviewInstallMode::FixedRuntime {
path: fixed_runtime_path, 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 webview_install_mode
}; };

5
tooling/cli/schema.json
View File

@ -2154,11 +2154,6 @@
"type": "string" "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": { "enableElevatedUpdateTask": {
"description": "Create an elevated update task within Windows Task Scheduler.", "description": "Create an elevated update task within Windows Task Scheduler.",
"default": false, "default": false,

1
tooling/cli/src/helpers/config.rs
View File

@ -87,7 +87,6 @@ pub fn wix_settings(config: WixConfig) -> tauri_bundler::WixSettings {
feature_group_refs: config.feature_group_refs, feature_group_refs: config.feature_group_refs,
feature_refs: config.feature_refs, feature_refs: config.feature_refs,
merge_refs: config.merge_refs, merge_refs: config.merge_refs,
skip_webview_install: config.skip_webview_install,
enable_elevated_update_task: config.enable_elevated_update_task, enable_elevated_update_task: config.enable_elevated_update_task,
banner_path: config.banner_path, banner_path: config.banner_path,
dialog_image_path: config.dialog_image_path, dialog_image_path: config.dialog_image_path,