fix: adjust feature flags, wrong zip usage (#367)

examples/api/src-tauri/Cargo.toml

@@ -22,7 +22,7 @@ tauri-plugin-log = { path = "../../../plugins/log" }
 tauri-plugin-fs = { path = "../../../plugins/fs" }
 tauri-plugin-clipboard = { path = "../../../plugins/clipboard" }
 tauri-plugin-dialog = { path = "../../../plugins/dialog" }
-tauri-plugin-http = { path = "../../../plugins/http", features = [ "http-multipart" ] }
+tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart" ] }
 tauri-plugin-notification = { path = "../../../plugins/notification", features = [ "windows7-compat" ] }
 tauri-plugin-os = { path = "../../../plugins/os" }
 tauri-plugin-process = { path = "../../../plugins/process" }

plugins/dialog/src/init.js

@@ -3,13 +3,13 @@
 // SPDX-License-Identifier: MIT
 
 window.alert = function (message) {
-  window.__TAURI_INVOKE__('plugin:dialog|message', {
+  window.__TAURI_INVOKE__("plugin:dialog|message", {
-    message: message.toString()
+    message: message.toString(),
-  })
+  });
-}
+};
 
 window.confirm = function (message) {
-  return window.__TAURI_INVOKE__('plugin:dialog|confirm', {
+  return window.__TAURI_INVOKE__("plugin:dialog|confirm", {
-    message: message.toString()
+    message: message.toString(),
-  })
+  });
-}
+};

plugins/http/Cargo.toml

@@ -19,7 +19,7 @@ http = "0.2"
 reqwest = { version = "0.11", default-features = false, features = [ "json", "stream" ] }
 
 [features]
-http-multipart = [ "reqwest/multipart" ]
+multipart = [ "reqwest/multipart" ]
 native-tls = [ "reqwest/native-tls" ]
 native-tls-vendored = [ "reqwest/native-tls-vendored" ]
 rustls-tls = [ "reqwest/rustls-tls" ]

plugins/http/guest-js/index.ts

@@ -103,7 +103,7 @@ class Body {
    * and the value is either a string or a file object.
    *
    * By default it sets the `application/x-www-form-urlencoded` Content-Type header,
-   * but you can set it to `multipart/form-data` if the Cargo feature `http-multipart` is enabled.
+   * but you can set it to `multipart/form-data` if the Cargo feature `multipart` is enabled.
    *
    * Note that a file path must be allowed in the `fs` allowlist scope.
    * @example

plugins/http/src/commands/client.rs

@@ -91,7 +91,7 @@ impl Client {
                         headers: &mut Option<HeaderMap>,
                         form_body: FormBody,
                     ) -> crate::Result<reqwest::RequestBuilder> {
-                        #[cfg(feature = "http-multipart")]
+                        #[cfg(feature = "multipart")]
                         if matches!(
                             headers
                                 .as_ref()

plugins/shell/src/init.js

@@ -2,39 +2,38 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-;(function () {
+(function () {
   // open <a href="..."> links with the API
   function openLinks() {
-    document.querySelector('body').addEventListener(
+    document.querySelector("body").addEventListener("click", function (e) {
-      'click',
+      var target = e.target;
-      function (e) {
-        var target = e.target
       while (target != null) {
-          if (target.matches('a')) {
+        if (target.matches("a")) {
           if (
             target.href &&
-              (['http://', 'https://', 'mailto:', 'tel:'].some(v => target.href.startsWith(v))) &&
+            ["http://", "https://", "mailto:", "tel:"].some((v) =>
-              target.target === '_blank'
+              target.href.startsWith(v)
+            ) &&
+            target.target === "_blank"
           ) {
-              window.__TAURI_INVOKE__('plugin:shell|open', {
+            window.__TAURI_INVOKE__("plugin:shell|open", {
-                path: target.href
+              path: target.href,
-              })
+            });
-              e.preventDefault()
+            e.preventDefault();
           }
-            break
+          break;
         }
-          target = target.parentElement
+        target = target.parentElement;
       }
-      }
+    });
-    )
   }
 
   if (
-    document.readyState === 'complete' ||
+    document.readyState === "complete" ||
-    document.readyState === 'interactive'
+    document.readyState === "interactive"
   ) {
-    openLinks()
+    openLinks();
   } else {
-    window.addEventListener('DOMContentLoaded', openLinks, true)
+    window.addEventListener("DOMContentLoaded", openLinks, true);
   }
-})()
+})();

plugins/updater/Cargo.toml

@@ -26,6 +26,8 @@ tempfile = "3"
 flate2 = "1"
 tar = "0.4"
 ignore = "0.4"
+
+[target."cfg(target_os = \"windows\")".dependencies]
 zip = { version = "0.6", default-features = false }
 
 [dev-dependencies]

plugins/updater/src/error.rs

@@ -84,6 +84,10 @@ pub enum Error {
     /// Ignore error.
     #[error("failed to walkdir: {0}")]
     Ignore(#[from] ignore::Error),
+    /// Zip error.
+    #[cfg(windows)]
+    #[error(transparent)]
+    ZipError(#[from] zip::result::ZipError),
 }
 
 impl Serialize for Error {

plugins/updater/src/updater/extract.rs

@@ -5,8 +5,8 @@
 use std::{
     borrow::Cow,
     fs,
-    io::{self, Cursor, Read, Seek},
+    io::{self, Read, Seek},
-    path::{self, Path, PathBuf},
+    path::{self, Path},
 };
 
 use crate::{Error, Result};
@@ -46,10 +46,20 @@ pub enum ArchiveFormat {
     /// Tar archive.
     Tar(Option<Compression>),
     /// Zip archive.
-    #[allow(dead_code)]
+    #[cfg(windows)]
     Zip,
 }
 
+impl ArchiveFormat {
+    fn compression(self) -> Option<Compression> {
+        match self {
+            Self::Tar(c) => c,
+            #[allow(unreachable_patterns)]
+            _ => None,
+        }
+    }
+}
+
 /// The supported compression types.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[non_exhaustive]
@@ -59,8 +69,9 @@ pub enum Compression {
 }
 
 /// The zip entry.
+#[cfg(windows)]
 pub struct ZipEntry {
-    path: PathBuf,
+    path: std::path::PathBuf,
     is_dir: bool,
     file_contents: Vec<u8>,
 }
@@ -73,7 +84,7 @@ pub enum Entry<'a, R: Read> {
     Tar(Box<tar::Entry<'a, R>>),
     /// An entry of a zip archive.
     #[non_exhaustive]
-    #[allow(dead_code)]
+    #[cfg(windows)]
     Zip(ZipEntry),
 }
 
@@ -82,6 +93,7 @@ impl<'a, R: Read> Entry<'a, R> {
     pub fn path(&self) -> Result<Cow<'_, Path>> {
         match self {
             Self::Tar(e) => e.path().map_err(Into::into),
+            #[cfg(windows)]
             Self::Zip(e) => Ok(Cow::Borrowed(&e.path)),
         }
     }
@@ -113,6 +125,7 @@ impl<'a, R: Read> Entry<'a, R> {
                     }
                 }
             }
+            #[cfg(windows)]
             Self::Zip(entry) => {
                 if entry.is_dir {
                     // this is a directory, lets create it
@@ -126,7 +139,10 @@ impl<'a, R: Read> Entry<'a, R> {
                     }
                 } else {
                     let mut out_file = fs::File::create(into_path)?;
-                    io::copy(&mut Cursor::new(entry.file_contents), &mut out_file)?;
+                    io::copy(
+                        &mut std::io::Cursor::new(entry.file_contents),
+                        &mut out_file,
+                    )?;
                 }
             }
         }
@@ -158,11 +174,7 @@ impl<'a, R: Read + Seek> Extract<'a, R> {
             #[cfg(debug_assertions)]
             eprintln!("Could not seek to start of the file");
         }
-        let compression = if let ArchiveFormat::Tar(compression) = archive_format {
+        let compression = archive_format.compression();
-            compression
-        } else {
-            None
-        };
         Extract {
             reader: match compression {
                 Some(Compression::Gz) => {
@@ -198,9 +210,8 @@ impl<'a, R: Read + Seek> Extract<'a, R> {
                 }
             }
 
+            #[cfg(windows)]
             ArchiveFormat::Zip => {
-                #[cfg(feature = "fs-extract-api")]
-                {
                 let mut archive = zip::ZipArchive::new(self.reader.get_mut())?;
                 let file_names = archive
                     .file_names()
@@ -223,7 +234,6 @@ impl<'a, R: Read + Seek> Extract<'a, R> {
                 }
             }
         }
-        }
 
         Ok(())
     }
@@ -239,9 +249,8 @@ impl<'a, R: Read + Seek> Extract<'a, R> {
                 archive.unpack(into_dir)?;
             }
 
+            #[cfg(windows)]
             ArchiveFormat::Zip => {
-                #[cfg(feature = "fs-extract-api")]
-                {
                 let mut archive = zip::ZipArchive::new(self.reader.get_mut())?;
                 for i in 0..archive.len() {
                     let mut file = archive.by_index(i)?;
@@ -271,7 +280,6 @@ impl<'a, R: Read + Seek> Extract<'a, R> {
                 }
             }
         }
-        }
         Ok(())
     }
 }

plugins/window/guest-js/index.ts

@@ -319,7 +319,7 @@ class WebviewWindowHandle {
   /** The window label. It is a unique identifier for the window, can be used to reference it later. */
   label: WindowLabel;
   /** Local event listeners. */
-  listeners: Record<string, Array<EventCallback<any>>>;
+  listeners: Record<string, Array<EventCallback<unknown>>>;
 
   constructor(label: WindowLabel) {
     this.label = label;

plugins/window/src/scripts/drag.js

@@ -2,16 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-document.addEventListener('mousedown', (e) => {
+document.addEventListener("mousedown", (e) => {
-  if (e.target.hasAttribute('data-tauri-drag-region') && e.buttons === 1) {
+  if (e.target.hasAttribute("data-tauri-drag-region") && e.buttons === 1) {
     // prevents text cursor
-    e.preventDefault()
+    e.preventDefault();
     // fix #2549: double click on drag region edge causes content to maximize without window sizing change
     // https://github.com/tauri-apps/tauri/issues/2549#issuecomment-1250036908
-    e.stopImmediatePropagation()
+    e.stopImmediatePropagation();
 
     // start dragging if the element has a `tauri-drag-region` data attribute and maximize on double-clicking it
-    const cmd = e.detail === 2 ? 'internal_toggle_maximize' : 'start_dragging'
+    const cmd = e.detail === 2 ? "internal_toggle_maximize" : "start_dragging";
-    window.__TAURI_INVOKE__('plugin:window|' + cmd)
+    window.__TAURI_INVOKE__("plugin:window|" + cmd);
   }
-})
+});

plugins/window/src/scripts/print.js

@@ -3,5 +3,5 @@
 // SPDX-License-Identifier: MIT
 
 window.print = function () {
-  return window.__TAURI_INVOKE__('plugin:window|print')
+  return window.__TAURI_INVOKE__("plugin:window|print");
-}
+};

plugins/window/src/scripts/toggle-devtools.js

@@ -2,25 +2,25 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-;(function () {
+(function () {
   function toggleDevtoolsHotkey() {
-    const isHotkey = navigator.appVersion.includes('Mac')
+    const isHotkey = navigator.appVersion.includes("Mac")
-      ? event => event.metaKey && event.altKey && event.key === 'I'
+      ? (event) => event.metaKey && event.altKey && event.key === "I"
-      : event => event.ctrlKey && event.shiftKey && event.key === 'I'
+      : (event) => event.ctrlKey && event.shiftKey && event.key === "I";
 
-    document.addEventListener('keydown', event => {
+    document.addEventListener("keydown", (event) => {
       if (isHotkey(event)) {
-        window.__TAURI_INVOKE__('plugin:window|internal_toggle_devtools');
+        window.__TAURI_INVOKE__("plugin:window|internal_toggle_devtools");
       }
-    })
+    });
   }
 
   if (
-    document.readyState === 'complete' ||
+    document.readyState === "complete" ||
-    document.readyState === 'interactive'
+    document.readyState === "interactive"
   ) {
-    toggleDevtoolsHotkey()
+    toggleDevtoolsHotkey();
   } else {
-    window.addEventListener('DOMContentLoaded', toggleDevtoolsHotkey, true)
+    window.addEventListener("DOMContentLoaded", toggleDevtoolsHotkey, true);
   }
-})()
+})();