Skip to content

Commit fc1543c

Browse files
authored
refactor!: remove skip_webview_install option (#9864)
1 parent 1df5cde commit fc1543c

File tree

8 files changed

+7
-26
lines changed

8 files changed

+7
-26
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"tauri-utils": "major:breaking"
3+
"tauri-bundler": "major:breaking"
4+
---
5+
6+
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.
7+

core/tauri-config-schema/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2154,11 +2154,6 @@
21542154
"type": "string"
21552155
}
21562156
},
2157-
"skipWebviewInstall": {
2158-
"description": "Disables the Webview2 runtime installation after app install.\n\nWill be removed in v2, prefer the [`WindowsConfig::webview_install_mode`] option.",
2159-
"default": false,
2160-
"type": "boolean"
2161-
},
21622157
"enableElevatedUpdateTask": {
21632158
"description": "Create an elevated update task within Windows Task Scheduler.",
21642159
"default": false,

core/tauri-utils/src/config.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -657,11 +657,6 @@ pub struct WixConfig {
657657
/// The Merge element ids you want to reference from the fragments.
658658
#[serde(default, alias = "merge-refs")]
659659
pub merge_refs: Vec<String>,
660-
/// Disables the Webview2 runtime installation after app install.
661-
///
662-
/// Will be removed in v2, prefer the [`WindowsConfig::webview_install_mode`] option.
663-
#[serde(default, alias = "skip-webview-install")]
664-
pub skip_webview_install: bool,
665660
/// Create an elevated update task within Windows Task Scheduler.
666661
#[serde(default, alias = "enable-elevated-update-task")]
667662
pub enable_elevated_update_task: bool,

tooling/bundler/src/bundle/settings.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,6 @@ pub struct WixSettings {
362362
pub feature_refs: Vec<String>,
363363
/// The Merge element ids you want to reference from the fragments.
364364
pub merge_refs: Vec<String>,
365-
/// Disables the Webview2 runtime installation after app install. Will be removed in v2, use [`WindowsSettings::webview_install_mode`] instead.
366-
pub skip_webview_install: bool,
367365
/// Create an elevated update task within Windows Task Scheduler.
368366
pub enable_elevated_update_task: bool,
369367
/// Path to a bitmap file to use as the installation user interface banner.

tooling/bundler/src/bundle/windows/msi/wix.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,6 @@ pub fn build_wix_app_installer(
437437
webview_install_mode = WebviewInstallMode::FixedRuntime {
438438
path: fixed_runtime_path,
439439
};
440-
} else if let Some(wix) = &settings.windows().wix {
441-
if wix.skip_webview_install {
442-
webview_install_mode = WebviewInstallMode::Skip;
443-
}
444440
}
445441
webview_install_mode
446442
};

tooling/bundler/src/bundle/windows/nsis.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,6 @@ fn build_nsis_app_installer(
391391
webview_install_mode = WebviewInstallMode::FixedRuntime {
392392
path: fixed_runtime_path,
393393
};
394-
} else if let Some(wix) = &settings.windows().wix {
395-
if wix.skip_webview_install {
396-
webview_install_mode = WebviewInstallMode::Skip;
397-
}
398394
}
399395
webview_install_mode
400396
};

tooling/cli/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2154,11 +2154,6 @@
21542154
"type": "string"
21552155
}
21562156
},
2157-
"skipWebviewInstall": {
2158-
"description": "Disables the Webview2 runtime installation after app install.\n\nWill be removed in v2, prefer the [`WindowsConfig::webview_install_mode`] option.",
2159-
"default": false,
2160-
"type": "boolean"
2161-
},
21622157
"enableElevatedUpdateTask": {
21632158
"description": "Create an elevated update task within Windows Task Scheduler.",
21642159
"default": false,

tooling/cli/src/helpers/config.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ pub fn wix_settings(config: WixConfig) -> tauri_bundler::WixSettings {
8787
feature_group_refs: config.feature_group_refs,
8888
feature_refs: config.feature_refs,
8989
merge_refs: config.merge_refs,
90-
skip_webview_install: config.skip_webview_install,
9190
enable_elevated_update_task: config.enable_elevated_update_task,
9291
banner_path: config.banner_path,
9392
dialog_image_path: config.dialog_image_path,

0 commit comments

Comments
 (0)