Skip to content

Commit 30660d0

Browse files
lucasfernoglucasfernog
committed
Merge remote-tracking branch 'origin/dev' into feat/cef
2 parents c93cc96 + b446a85 commit 30660d0

File tree

27 files changed

+368
-439
lines changed

27 files changed

+368
-439
lines changed

‎Cargo.lock‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/tauri-bundler/CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## \[2.7.3]
4+
5+
### Enhancements
6+
7+
- [`22edc65aa`](https://www.github.com/tauri-apps/tauri/commit/22edc65aad0b3e45515008e8e0866112da70c8a1) ([#14408](https://www.github.com/tauri-apps/tauri/pull/14408) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Set user-agent in bundler and cli http requests when fetching build tools.
8+
9+
### Bug Fixes
10+
11+
- [`9a1922636`](https://www.github.com/tauri-apps/tauri/commit/9a192263693d71123a9953e2a6ee60fad07500b4) ([#14410](https://www.github.com/tauri-apps/tauri/pull/14410) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fix uninstall fails if you close the app manually during the 'Click Ok to kill it' dialog
12+
313
## \[2.7.2]
414

515
### Enhancements

‎crates/tauri-bundler/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tauri-bundler"
3-
version = "2.7.2"
3+
version = "2.7.3"
44
authors = [
55
"George Burton <[email protected]>",
66
"Tauri Programme within The Commons Conservancy",

‎crates/tauri-bundler/src/bundle/windows/nsis/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ const NSIS_URL: &str =
4040
#[cfg(target_os = "windows")]
4141
const NSIS_SHA1: &str = "057e83c7d82462ec394af76c87d06733605543d4";
4242
const NSIS_TAURI_UTILS_URL: &str =
43-
"https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.5.1/nsis_tauri_utils.dll";
44-
const NSIS_TAURI_UTILS_SHA1: &str = "B053B2E5FDB97257954C8F935D80964F056520AE";
43+
"https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.5.2/nsis_tauri_utils.dll";
44+
const NSIS_TAURI_UTILS_SHA1: &str = "D0C502F45DF55C0465C9406088FF016C2E7E6817";
4545

4646
#[cfg(target_os = "windows")]
4747
const NSIS_REQUIRED_FILES: &[&str] = &[

‎crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
Pop $R0
4949
Sleep 500
5050
${If} $R0 = 0
51+
${OrIf} $R0 = 2
5152
Goto app_check_done_${UniqueID}
5253
${Else}
5354
IfSilent silent_${UniqueID} ui_${UniqueID}

‎crates/tauri-bundler/src/error.rs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,14 @@ pub enum Error {
9999
#[error("Wrong package type {0} for platform {1}")]
100100
InvalidPackageType(String, String),
101101
/// Bundle type symbol missing in binary
102-
#[cfg(target_os = "linux")]
103-
#[error("__TAURI_BUNDLE_TYPE variable not found in binary. Make sure tauri crate and tauri-cli are up to date and that symbol stripping is disabled (https://doc.rust-lang.org/cargo/reference/profiles.html#strip)")]
104-
MissingBundleTypeVar,
105-
#[cfg(not(target_os = "linux"))]
106-
#[error("__TAURI_BUNDLE_TYPE variable not found in binary. Make sure tauri crate and tauri-cli are up to date")]
102+
#[cfg_attr(
103+
target_os = "linux",
104+
error("__TAURI_BUNDLE_TYPE variable not found in binary. Make sure tauri crate and tauri-cli are up to date and that symbol stripping is disabled (https://doc.rust-lang.org/cargo/reference/profiles.html#strip)")
105+
)]
106+
#[cfg_attr(
107+
not(target_os = "linux"),
108+
error("__TAURI_BUNDLE_TYPE variable not found in binary. Make sure tauri crate and tauri-cli are up to date")
109+
)]
107110
MissingBundleTypeVar,
108111
/// Failed to write binary file changed
109112
#[error("Failed to write binary file changes: `{0}`")]

‎crates/tauri-bundler/src/utils/http_utils.rs‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ use sha2::Digest;
1414
use url::Url;
1515
use zip::ZipArchive;
1616

17+
const BUNDLER_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),);
18+
1719
fn generate_github_mirror_url_from_template(github_url: &str) -> Option<String> {
1820
std::env::var("TAURI_BUNDLER_TOOLS_GITHUB_MIRROR_TEMPLATE")
1921
.ok()
@@ -47,30 +49,37 @@ fn generate_github_alternative_url(url: &str) -> Option<(ureq::Agent, String)> {
4749

4850
generate_github_mirror_url_from_template(url)
4951
.or_else(|| generate_github_mirror_url_from_base(url))
50-
.map(|alt_url| (ureq::agent(), alt_url))
52+
.map(|alt_url| {
53+
(
54+
ureq::Agent::config_builder()
55+
.user_agent(BUNDLER_USER_AGENT)
56+
.build()
57+
.into(),
58+
alt_url,
59+
)
60+
})
5161
}
5262

5363
fn create_agent_and_url(url: &str) -> (ureq::Agent, String) {
5464
generate_github_alternative_url(url).unwrap_or((base_ureq_agent(), url.to_owned()))
5565
}
5666

5767
pub(crate) fn base_ureq_agent() -> ureq::Agent {
68+
#[allow(unused_mut)]
69+
let mut config_builder = ureq::Agent::config_builder()
70+
.user_agent(BUNDLER_USER_AGENT)
71+
.proxy(ureq::Proxy::try_from_env());
72+
5873
#[cfg(feature = "platform-certs")]
59-
let agent: ureq::Agent = ureq::Agent::config_builder()
60-
.tls_config(
74+
{
75+
config_builder = config_builder.tls_config(
6176
ureq::tls::TlsConfig::builder()
6277
.root_certs(ureq::tls::RootCerts::PlatformVerifier)
6378
.build(),
64-
)
65-
.proxy(ureq::Proxy::try_from_env())
66-
.build()
67-
.into();
68-
#[cfg(not(feature = "platform-certs"))]
69-
let agent: ureq::Agent = ureq::Agent::config_builder()
70-
.proxy(ureq::Proxy::try_from_env())
71-
.build()
72-
.into();
73-
agent
79+
);
80+
}
81+
82+
config_builder.build().into()
7483
}
7584

7685
#[allow(dead_code)]

‎crates/tauri-cli/CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## \[2.9.3]
4+
5+
### Enhancements
6+
7+
- [`22edc65aa`](https://www.github.com/tauri-apps/tauri/commit/22edc65aad0b3e45515008e8e0866112da70c8a1) ([#14408](https://www.github.com/tauri-apps/tauri/pull/14408) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Set user-agent in bundler and cli http requests when fetching build tools.
8+
- [`779612ac8`](https://www.github.com/tauri-apps/tauri/commit/779612ac8425a787626da4cefdb9eaf7d63bea18) ([#14379](https://www.github.com/tauri-apps/tauri/pull/14379) by [@moubctez](https://www.github.com/tauri-apps/tauri/../../moubctez)) Properly read the `required-features` field of binaries in Cargo.toml to prevent bundling issues when the features weren't enabled.
9+
10+
### Bug Fixes
11+
12+
- [`fd8c30b4f`](https://www.github.com/tauri-apps/tauri/commit/fd8c30b4f1bca8dd7165c5c0ebe7fbfd17662153) ([#14353](https://www.github.com/tauri-apps/tauri/pull/14353) by [@ChaseKnowlden](https://www.github.com/tauri-apps/tauri/../../ChaseKnowlden)) Premultiply Alpha before Resizing which gets rid of the gray fringe around the icons.
13+
14+
### Dependencies
15+
16+
- Upgraded to `[email protected]`
17+
318
## \[2.9.2]
419

520
### Dependencies

‎crates/tauri-cli/Cargo.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tauri-cli"
3-
version = "2.9.2"
3+
version = "2.9.3"
44
authors = ["Tauri Programme within The Commons Conservancy"]
55
edition = "2021"
66
rust-version = "1.77.2"
@@ -47,7 +47,7 @@ sublime_fuzzy = "0.7"
4747
clap_complete = "4"
4848
clap = { version = "4", features = ["derive", "env"] }
4949
thiserror = "2"
50-
tauri-bundler = { version = "2.7.2", default-features = false, path = "../tauri-bundler" }
50+
tauri-bundler = { version = "2.7.3", default-features = false, path = "../tauri-bundler" }
5151
colored = "2"
5252
serde = { version = "1", features = ["derive"] }
5353
serde_json = { version = "1", features = ["preserve_order"] }
@@ -113,6 +113,7 @@ uuid = { version = "1", features = ["v5"] }
113113
rand = "0.9"
114114
zip = { version = "4", default-features = false, features = ["deflate"] }
115115
which = "8"
116+
rayon = "1.10"
116117
download-cef = "2.2"
117118

118119
[dev-dependencies]

‎crates/tauri-cli/metadata-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cli.js": {
3-
"version": "2.9.2",
3+
"version": "2.9.3",
44
"node": ">= 10.0.0"
55
},
66
"tauri": "2.9.2",

0 commit comments

Comments
 (0)