Merge branch '1.x' into feat/notification-sound

.changes/api-formAsync.md

@@ -0,0 +1,5 @@
+---
+'@tauri-apps/api': 'patch:bug'
+---
+
+Fix `Body.form` static not reading and sending entries of type `Blob` (including subclasses such as `File`)

.changes/bundler-bundle-order.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:bug'
+---
+
+Fix bundler skipping updater artifacts if `updater` target shows before other updater-enabled targets in the list, see [#7349](https://github.com/tauri-apps/tauri/issues/7349).

.changes/bundler-macos-updater-dmg-only-fix.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:bug'
+---
+
+Fix bundler skipping updater artifacts if only a macOS DMG bundle target is specified.

.changes/bundler-nsis-sign-uninstaller.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'minor:enhance'
+---
+
+Sign NSIS uninstaller as well.

.changes/cli-disable-version-check.md

@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:bug'
+'@tauri-apps/cli': 'patch:bug'
+---
+
+Removed the automatic version check of the CLI that ran after `tauri` commands which caused various issues.

.changes/core-base-links-target.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'minor:enhance'
+---
+
+Open links externally when `<base target="_blank" />` exists

.changes/enhance-read-dir-error.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch:enhance
+---
+
+Enhance `readDir` API error with path information.

.changes/fix-nsis-legal-copyright.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:bug'
+---
+
+On Windows, fix installation packages not showing correct copyright information.

.changes/fix-nsis-previous-installation-method.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:bug'
+---
+
+On Windows, fix NSIS installer identifying a previous NSIS-installed app as WiX-installed app and then fails to uninstall it.

.changes/fix-nsis-uninstall-previous-version.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:bug'
+---
+
+On Windows, fix NSIS installer showing an error dialog even when the previous version was uninstalled sucessfully.

.changes/fix-nsis-webview2-installer-use-tempdir.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:enhance'
+---
+
+On Windows, NSIS installer will write webview2 installer file to the well-known temp dir instead of the install dir, so we don't pollute the install dir.

.changes/kuchikiki.md

@@ -0,0 +1,5 @@
+---
+"tauri-utils": patch:sec
+---
+
+Changed HTML implementation from unmaintained `kuchiki` to `kuchikiki`.

.changes/nsis-start-menu-shortcut.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:bug'
+---
+
+On Windows, fix NSIS uninstaller failing to remove Start Menu shortcut if `perMachine` mode is used.

.changes/plugin-custom-protocol.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'minor:feat'
+---
+
+Add `tauri::plugin::Builder::register_uri_scheme_protocol`

.changes/remove-bitness.md

@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:deps'
+---
+
+Removed the `bitness` dependency to speed up compile time.

.changes/resources-map-bundler.md

@@ -0,0 +1,5 @@
+---
+"tauri-bundler": minor:feat
+---
+
+Allow using a resource map instead of a simple array in `BundleSettings::resources_map`.

.changes/resources-map.md

@@ -0,0 +1,5 @@
+---
+"tauri-utils": minor:feat
+---
+
+Allow specifying resources as a map specifying source and target paths.

.changes/tauri-build-copy-webview2-runtime.md

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

.changes/updater-redirect.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:bug'
+---
+
+Fix updater not following endpoint redirects.

.github/workflows/audit.yml

@@ -10,6 +10,7 @@ on:
     - cron: '0 0 * * *'
   push:
     paths:
+      - '.github/workflows/audit.yml'
       - '**/Cargo.lock'
       - '**/Cargo.toml'
       - '**/package.json'
@@ -33,6 +34,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: yarn audit
+      - name: audit workspace
+        run: yarn audit
+      - name: audit @tauri-apps/api
+        working-directory: tooling/api
+        run: yarn audit
+      - name: audit @tauri-apps/cli
         working-directory: tooling/cli/node
         run: yarn audit

.github/workflows/test-core.yml

@@ -85,7 +85,7 @@ jobs:
       - name: Downgrade crates with MSRV conflict
         # The --precise flag can only be used once per invocation.
         run: |
-          cargo update -p toml:0.7.4 --precise 0.7.3
+          cargo update -p toml:0.7.6 --precise 0.7.3
           cargo update -p toml_edit --precise 0.19.8
           cargo update -p toml_datetime --precise 0.6.1
           cargo update -p serde_spanned --precise 0.6.1
@@ -94,6 +94,12 @@ jobs:
           cargo update -p ignore --precise 0.4.18
           cargo update -p raw-window-handle --precise 0.5.0
           cargo update -p cargo_toml:0.15.3 --precise 0.15.2
+          cargo update -p zbus --precise 3.13.0
+          cargo update -p zbus_names --precise 2.5.0
+          cargo update -p is-terminal --precise 0.4.7
+          cargo update -p colored --precise 2.0.2
+          cargo update -p tempfile --precise 3.6.0
+          cargo update -p serde_with:3.1.0 --precise 3.0.0
 
       - name: test
         run: cargo test --target ${{ matrix.platform.target }} ${{ matrix.features.args }}

core/tauri-build/src/lib.rs

@@ -9,8 +9,8 @@ use cargo_toml::Manifest;
 use heck::AsShoutySnakeCase;
 
 use tauri_utils::{
-  config::Config,
-  resources::{external_binaries, resource_relpath, ResourcePaths},
+  config::{BundleResources, Config, WebviewInstallMode},
+  resources::{external_binaries, ResourcePaths},
 };
 
 use std::path::{Path, PathBuf};
@@ -72,11 +72,10 @@ fn copy_binaries(
 
 /// Copies resources to a path.
 fn copy_resources(resources: ResourcePaths<'_>, path: &Path) -> Result<()> {
-  for src in resources {
-    let src = src?;
-    println!("cargo:rerun-if-changed={}", src.display());
-    let dest = path.join(resource_relpath(&src));
-    copy_file(&src, dest)?;
+  for resource in resources.iter() {
+    let resource = resource?;
+    println!("cargo:rerun-if-changed={}", resource.path().display());
+    copy_file(resource.path(), path.join(resource.target()))?;
   }
   Ok(())
 }
@@ -344,15 +343,31 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
   }
 
   #[allow(unused_mut, clippy::redundant_clone)]
-  let mut resources = config.tauri.bundle.resources.clone().unwrap_or_default();
+  let mut resources = config
+    .tauri
+    .bundle
+    .resources
+    .clone()
+    .unwrap_or_else(|| BundleResources::List(Vec::new()));
   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());
     }
   }
-  copy_resources(ResourcePaths::new(resources.as_slice(), true), target_dir)?;
+  match resources {
+    BundleResources::List(res) => {
+      copy_resources(ResourcePaths::new(res.as_slice(), true), target_dir)?
+    }
+    BundleResources::Map(map) => copy_resources(ResourcePaths::from_map(&map, true), target_dir)?,
+  }
 
   if target_triple.contains("darwin") {
     if let Some(version) = &config.tauri.bundle.macos.minimum_system_version {

core/tauri-config-schema/schema.json

@@ -1074,13 +1074,14 @@
         },
         "resources": {
           "description": "App resources to bundle. Each resource is a path to a file or directory. Glob patterns are supported.",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": "string"
-          }
+          "anyOf": [
+            {
+              "$ref": "#/definitions/BundleResources"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "copyright": {
           "description": "A copyright string associated with your application.",
@@ -1258,6 +1259,25 @@
         }
       ]
     },
+    "BundleResources": {
+      "description": "Definition for bundle resources. Can be either a list of paths to include or a map of source to target paths.",
+      "anyOf": [
+        {
+          "description": "A list of paths to include.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        {
+          "description": "A map of source to target paths.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      ]
+    },
     "AppImageConfig": {
       "description": "Configuration for AppImage bundles.\n\nSee more: https://tauri.app/v1/api/config#appimageconfig",
       "type": "object",

core/tauri-runtime-wry/src/lib.rs

@@ -3045,7 +3045,7 @@ fn on_close_requested<'a, T: UserEvent>(
 }
 
 fn on_window_close(window_id: WebviewId, windows: Arc<RefCell<HashMap<WebviewId, WindowWrapper>>>) {
-  if let Some(mut window_wrapper) = windows.borrow_mut().get_mut(&window_id) {
+  if let Some(window_wrapper) = windows.borrow_mut().get_mut(&window_id) {
     window_wrapper.inner = None;
   }
 }

core/tauri-utils/Cargo.toml

@@ -18,8 +18,8 @@ thiserror = "1"
 phf = { version = "0.10", features = [ "macros" ] }
 brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] }
 url = { version = "2", features = [ "serde" ] }
-kuchiki = "0.8"
-html5ever = "0.25"
+html5ever = "0.26"
+kuchiki = { package = "kuchikiki", version = "0.8" }
 proc-macro2 = { version = "1", optional = true }
 quote = { version = "1", optional = true }
 schemars = { version = "0.8", features = [ "url" ], optional = true }

core/tauri-utils/src/config.rs

@@ -624,6 +624,31 @@ impl Default for WindowsConfig {
   }
 }
 
+/// Definition for bundle resources.
+/// Can be either a list of paths to include or a map of source to target paths.
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
+#[cfg_attr(feature = "schema", derive(JsonSchema))]
+#[serde(rename_all = "camelCase", deny_unknown_fields, untagged)]
+pub enum BundleResources {
+  /// A list of paths to include.
+  List(Vec<String>),
+  /// A map of source to target paths.
+  Map(HashMap<String, String>),
+}
+
+impl BundleResources {
+  /// Adds a path to the resource collection.
+  pub fn push(&mut self, path: impl Into<String>) {
+    match self {
+      Self::List(l) => l.push(path.into()),
+      Self::Map(l) => {
+        let path = path.into();
+        l.insert(path.clone(), path);
+      }
+    }
+  }
+}
+
 /// Configuration for tauri-bundler.
 ///
 /// See more: https://tauri.app/v1/api/config#bundleconfig
@@ -653,7 +678,7 @@ pub struct BundleConfig {
   /// App resources to bundle.
   /// Each resource is a path to a file or directory.
   /// Glob patterns are supported.
-  pub resources: Option<Vec<String>>,
+  pub resources: Option<BundleResources>,
   /// A copyright string associated with your application.
   pub copyright: Option<String>,
   /// The application kind.

core/tauri-utils/src/html.rs

@@ -302,7 +302,7 @@ mod tests {
       assert_eq!(
         document.to_string(),
         format!(
-          r#"<html><head><meta content="{}" http-equiv="Content-Security-Policy"></head><body></body></html>"#,
+          r#"<html><head><meta http-equiv="Content-Security-Policy" content="{}"></head><body></body></html>"#,
           super::CSP_TOKEN
         )
       );