CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): Copy wv2 runtime in dev, fixes #7373 (#7419)

Browse Source
This commit is contained in:
Fabian-Lars
2023-07-13 19:34:31 +02:00
committed by GitHub
parent c98273387c
commit 290e366ae9
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/tauri-build-copy-webview2-runtime.md Normal file
View File

@@ -0,0 +1,5 @@
---
'tauri-build': 'patch:bug'
---
Correctly copy the WebView2 runtime in development when `webviewInstallMode` is used instead of `webviewFixedRuntimePath`.

10
core/tauri-build/src/lib.rs
View File

@@ -9,7 +9,7 @@ use cargo_toml::Manifest;
use heck::AsShoutySnakeCase;
use tauri_utils::{
config::Config,
config::{Config, WebviewInstallMode},
resources::{external_binaries, resource_relpath, ResourcePaths},
};
@@ -347,7 +347,13 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
let mut resources = config.tauri.bundle.resources.clone().unwrap_or_default();
if target_triple.contains("windows") {
if let Some(fixed_webview2_runtime_path) =
&config.tauri.bundle.windows.webview_fixed_runtime_path
match &config.tauri.bundle.windows.webview_fixed_runtime_path {
Some(path) => Some(path),
None => match &config.tauri.bundle.windows.webview_install_mode {
WebviewInstallMode::FixedRuntime { path } => Some(path),
_ => None,
},
}
{
resources.push(fixed_webview2_runtime_path.display().to_string());
}