chore(cli): update clap to 3.1 (#3568)

examples/api/yarn.lock

@@ -23,9 +23,9 @@
     svelte-hmr "^0.14.7"
 
 "@tauri-apps/api@../../tooling/api/dist":
-  version "1.0.0-rc.0"
+  version "1.0.0-rc.1"
   dependencies:
-    type-fest "2.8.0"
+    type-fest "2.12.0"
 
 debug@^4.3.2:
   version "4.3.3"
@@ -262,10 +262,10 @@ svelte@3.35.0:
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.35.0.tgz#e0d0ba60c4852181c2b4fd851194be6fda493e65"
   integrity sha512-gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g==
 
-type-fest@2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.8.0.tgz#39d7c9f9c508df8d6ce1cf5a966b0e6568dcc50d"
-  integrity sha512-O+V9pAshf9C6loGaH0idwsmugI2LxVNR7DtS40gVo2EXZVYFgz9OuNtOhgHLdHdapOEWNdvz9Ob/eeuaWwwlxA==
+type-fest@2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.12.0.tgz#ce342f58cab9114912f54b493d60ab39c3fc82b6"
+  integrity sha512-Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA==
 
 vite@^2.6.4:
   version "2.6.14"

tooling/bundler/Cargo.toml

@@ -26,6 +26,7 @@ tauri-utils = { version = "1.0.0-rc.2", path = "../../core/tauri-utils", feature
 ar = "0.9.0"
 icns = "0.3"
 image = "0.24.1"
+png = "=0.17.3"
 libflate = "1.1"
 md5 = "0.7.0"
 anyhow = "1.0"

tooling/cli/Cargo.toml

@@ -27,7 +27,7 @@ name = "cargo-tauri"
 path = "src/main.rs"
 
 [dependencies]
-clap = { version = "3", features = [ "derive" ] }
+clap = { version = "3.1", features = [ "derive" ] }
 anyhow = "1.0"
 tauri-bundler = { version = "1.0.0-rc.2", path = "../bundler" }
 colored = "2.0"

tooling/cli/node/index.d.ts

@@ -3,10 +3,4 @@
 
 /* auto-generated by NAPI-RS */
 
-export class ExternalObject<T> {
-  readonly '': {
-    readonly '': unique symbol
-    [K: symbol]: T
-  }
-}
 export function run(args: Array<string>, binName: string | undefined | null, callback: (...args: any[]) => any): void

tooling/cli/src/dev.rs

@@ -12,7 +12,7 @@ use crate::{
   },
   CommandExt, Result,
 };
-use clap::{AppSettings, Parser};
+use clap::Parser;
 
 use anyhow::Context;
 use notify::{watcher, DebouncedEvent, RecursiveMode, Watcher};
@@ -33,8 +33,7 @@ use std::{
 static BEFORE_DEV: OnceCell<Mutex<Arc<SharedChild>>> = OnceCell::new();
 
 #[derive(Debug, Parser)]
-#[clap(about = "Tauri dev")]
-#[clap(setting(AppSettings::TrailingVarArg))]
+#[clap(about = "Tauri dev", trailing_var_arg(true))]
 pub struct Options {
   /// Binary to use to run the application
   #[clap(short, long)]

tooling/cli/src/lib.rs

@@ -13,7 +13,7 @@ mod interface;
 mod plugin;
 mod signer;
 
-use clap::{AppSettings, FromArgMatches, IntoApp, Parser, Subcommand};
+use clap::{FromArgMatches, IntoApp, Parser, Subcommand};
 
 use std::ffi::OsString;
 
@@ -37,11 +37,16 @@ pub struct VersionMetadata {
 }
 
 #[derive(Parser)]
-#[clap(author, version, about, bin_name("cargo-tauri"))]
-#[clap(global_setting(AppSettings::PropagateVersion))]
-#[clap(global_setting(AppSettings::UseLongFormatForHelpSubcommand))]
-#[clap(global_setting(AppSettings::NoBinaryName))]
-#[clap(setting(AppSettings::SubcommandRequiredElseHelp))]
+#[clap(
+  author,
+  version,
+  about,
+  bin_name("cargo-tauri"),
+  subcommand_required(true),
+  arg_required_else_help(true),
+  propagate_version(true),
+  no_binary_name(true)
+)]
 struct Cli {
   #[clap(subcommand)]
   command: Commands,
@@ -58,7 +63,7 @@ enum Commands {
 }
 
 fn format_error<I: IntoApp>(err: clap::Error) -> clap::Error {
-  let mut app = I::into_app();
+  let mut app = I::command();
   err.format(&mut app)
 }
 
@@ -80,8 +85,8 @@ where
   A: Into<OsString> + Clone,
 {
   let matches = match bin_name {
-    Some(bin_name) => Cli::into_app().bin_name(bin_name),
-    None => Cli::into_app(),
+    Some(bin_name) => Cli::command().bin_name(bin_name),
+    None => Cli::command(),
   }
   .get_matches_from(args);
 

tooling/cli/src/main.rs

@@ -8,7 +8,7 @@ use std::path::Path;
 use std::process::exit;
 
 fn main() -> tauri_cli::Result<()> {
-  let mut args = args_os();
+  let mut args = args_os().peekable();
   let bin_name = match args
     .next()
     .as_deref()
@@ -17,7 +17,9 @@ fn main() -> tauri_cli::Result<()> {
     .and_then(OsStr::to_str)
   {
     Some("cargo-tauri") => {
-      if args.by_ref().peekable().peek().and_then(|s| s.to_str()) == Some("tauri") {
+      if args.peek().and_then(|s| s.to_str()) == Some("tauri") {
+        // remove the extra cargo subcommand
+        args.next();
         Some("cargo tauri".into())
       } else {
         Some("cargo-tauri".into())

tooling/cli/src/plugin.rs

@@ -2,15 +2,20 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use clap::{AppSettings, Parser, Subcommand};
+use clap::{Parser, Subcommand};
 
 use crate::Result;
 
 mod init;
 
 #[derive(Parser)]
-#[clap(author, version, about = "Manage Tauri plugins")]
-#[clap(setting(AppSettings::SubcommandRequiredElseHelp))]
+#[clap(
+  author,
+  version,
+  about = "Manage Tauri plugins",
+  subcommand_required(true),
+  arg_required_else_help(true)
+)]
 pub struct Cli {
   #[clap(subcommand)]
   command: Commands,

tooling/cli/src/plugin/init.rs

@@ -8,7 +8,7 @@ use crate::{
   VersionMetadata,
 };
 use anyhow::Context;
-use clap::{ArgSettings, Parser};
+use clap::Parser;
 use handlebars::{to_json, Handlebars};
 use heck::{ToKebabCase, ToSnakeCase};
 use include_dir::{include_dir, Dir};
@@ -28,7 +28,6 @@ pub struct Options {
   api: bool,
   /// Initializes a Tauri core plugin (internal usage)
   #[clap(long, hide(true))]
-  #[clap(setting(ArgSettings::Hidden))]
   tauri: bool,
   /// Set target directory for init
   #[clap(short, long)]