Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .changes/bundler-user-agent.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/change-pr-14379.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/image-premultiply-fix.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/nsis-uninstall-already-killed.md

This file was deleted.

4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions crates/tauri-bundler/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## \[2.7.3]

### Enhancements

- [`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.

### Bug Fixes

- [`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

## \[2.7.2]

### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-bundler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-bundler"
version = "2.7.2"
version = "2.7.3"
authors = [
"George Burton <burtonageo@gmail.com>",
"Tauri Programme within The Commons Conservancy",
Expand Down
6 changes: 2 additions & 4 deletions crates/tauri-bundler/src/utils/http_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ fn generate_github_alternative_url(url: &str) -> Option<(ureq::Agent, String)> {

generate_github_mirror_url_from_template(url)
.or_else(|| generate_github_mirror_url_from_base(url))
.map(|alt_url| {
.map(|_alt_url| {
(
ureq::Agent::config_builder()
.user_agent(BUNDLER_USER_AGENT)
.build()
.into(),
alt_url,
url.to_owned(),
)
Comment on lines 50 to 59
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Return the mirror URL when available.

The alternative URL is computed but ignored, so mirror env vars won’t work and the original GitHub URL is always used. That’s a regression for users behind blocked/slow GitHub access.

🛠️ Proposed fix
-    .map(|_alt_url| {
+    .map(|alt_url| {
       (
         ureq::Agent::config_builder()
           .user_agent(BUNDLER_USER_AGENT)
           .build()
           .into(),
-        url.to_owned(),
+        alt_url,
       )
     })
🤖 Prompt for AI Agents
In `@crates/tauri-bundler/src/utils/http_utils.rs` around lines 50 - 59, The code
maps the result of
generate_github_mirror_url_from_template(...).or_else(generate_github_mirror_url_from_base(...))
but ignores the computed alternative URL by returning url.to_owned(); change the
mapping to return the alternative URL (_alt_url) when present instead of the
original `url` so mirror env vars are used: update the closure that constructs
the tuple (ureq::Agent::config_builder()... , url.to_owned()) to use the
`_alt_url` (or rename to `alt_url`) as the second element; keep
BUNDLER_USER_AGENT and the Agent construction unchanged.

})
}
Expand Down Expand Up @@ -97,7 +97,6 @@ pub fn download(url: &str) -> crate::Result<Vec<u8>> {
#[allow(dead_code)]
#[derive(Clone, Copy)]
pub enum HashAlgorithm {
#[cfg(target_os = "windows")]
Sha256,
Sha1,
}
Expand All @@ -118,7 +117,6 @@ pub fn download_and_verify(
#[allow(dead_code)]
pub fn verify_hash(data: &[u8], hash: &str, hash_algorithm: HashAlgorithm) -> crate::Result<()> {
match hash_algorithm {
#[cfg(target_os = "windows")]
HashAlgorithm::Sha256 => {
let hasher = sha2::Sha256::new();
verify_data_with_hasher(data, hash, hasher)
Expand Down
15 changes: 15 additions & 0 deletions crates/tauri-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## \[2.9.3]

### Enhancements

- [`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.
- [`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.

### Bug Fixes

- [`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.

### Dependencies

- Upgraded to `tauri-bundler@2.7.3`

## \[2.9.2]

### Dependencies
Expand Down
4 changes: 2 additions & 2 deletions crates/tauri-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-cli"
version = "2.9.2"
version = "2.9.3"
authors = ["Tauri Programme within The Commons Conservancy"]
edition = "2021"
rust-version = "1.77.2"
Expand Down Expand Up @@ -47,7 +47,7 @@ sublime_fuzzy = "0.7"
clap_complete = "4"
clap = { version = "4", features = ["derive", "env"] }
thiserror = "2"
tauri-bundler = { version = "2.7.2", default-features = false, path = "../tauri-bundler" }
tauri-bundler = { version = "2.7.3", default-features = false, path = "../tauri-bundler" }
colored = "2"
serde = { version = "1", features = ["derive"] }
serde_json = { version = "1", features = ["preserve_order"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/tauri-cli/metadata-v2.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"cli.js": {
"version": "2.9.2",
"version": "2.9.3",
"node": ">= 10.0.0"
},
"tauri": "2.9.2",
"tauri": "2.9.3",
"tauri-build": "2.5.1",
"tauri-plugin": "2.5.1"
}
10 changes: 10 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## \[2.9.3]

### Bug Fixes

- [`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.

### Dependencies

- Upgraded to `tauri-cli@2.9.3`

## \[2.9.2]

### Dependencies
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/cli",
"version": "2.9.2",
"version": "2.9.3",
"description": "Command line interface for building Tauri apps",
"type": "commonjs",
"funding": {
Expand Down