@tauri-apps/cli 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## \[1.0.3]
+
+- Changed the app template to not set the default app menu as it is now set automatically on macOS which is the platform that needs a menu to function properly.
+  - [91055883](https://www.github.com/tauri-apps/tauri/commit/9105588373cc8401bd9ad79bdef26f509b2d76b7) feat: add implicit default menu for macOS only, closes [#4551](https://www.github.com/tauri-apps/tauri/pull/4551) ([#4570](https://www.github.com/tauri-apps/tauri/pull/4570)) on 2022-07-04
+- Improved bundle identifier validation showing the exact source of the configuration value.
+  - [8e3e7fc6](https://www.github.com/tauri-apps/tauri/commit/8e3e7fc64641afc7a6833bc93205e6f525562545) feat(cli): improve bundle identifier validation, closes [#4589](https://www.github.com/tauri-apps/tauri/pull/4589) ([#4596](https://www.github.com/tauri-apps/tauri/pull/4596)) on 2022-07-05
+- Improve configuration deserialization error messages.
+  - [9170c920](https://www.github.com/tauri-apps/tauri/commit/9170c9207044fa561535f624916dfdbaa41ff79d) feat(core): improve config deserialization error messages ([#4607](https://www.github.com/tauri-apps/tauri/pull/4607)) on 2022-07-06
+- Revert the `run` command to run in a separate thread.
+  - [f65eb4f8](https://www.github.com/tauri-apps/tauri/commit/f65eb4f84d8e511cd30d01d20a8223a297f7e584) fix(cli.js): revert `run` command to be nonblocking on 2022-07-04
+- Skip the static link of the `vcruntime140.dll` if the `STATIC_VCRUNTIME` environment variable is set to `false`.
+  - [2e61abaa](https://www.github.com/tauri-apps/tauri/commit/2e61abaa9ae5d7a41ca1fa6505b5d6c368625ce5) feat(cli): allow dynamic link vcruntime, closes [#4565](https://www.github.com/tauri-apps/tauri/pull/4565) ([#4601](https://www.github.com/tauri-apps/tauri/pull/4601)) on 2022-07-06
+- The `TAURI_CONFIG` environment variable now represents the configuration to be merged instead of the entire JSON.
+  - [fa028ebf](https://www.github.com/tauri-apps/tauri/commit/fa028ebf3c8ca7b43a70d283a01dbea86217594f) refactor: do not pass entire config from CLI to core, send patch instead ([#4598](https://www.github.com/tauri-apps/tauri/pull/4598)) on 2022-07-06
+- Watch for Cargo workspace members in the `dev` file watcher.
+  - [dbb8c87b](https://www.github.com/tauri-apps/tauri/commit/dbb8c87b96dec9942b1bf877b29bafb8246514d4) feat(cli): watch Cargo workspaces in the dev command, closes [#4222](https://www.github.com/tauri-apps/tauri/pull/4222) ([#4572](https://www.github.com/tauri-apps/tauri/pull/4572)) on 2022-07-03
+
 ## \[1.0.2]
 
 - Fixes a crash on the `signer sign` command.

package/Cargo.toml

@@ -8,9 +8,10 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.5", default-features = false, features = ["napi4"] }
-napi-derive = "2.5"
+napi = { version = "2.6", default-features = false, features = ["napi4"] }
+napi-derive = "2.6"
 tauri-cli = { path = ".." }
+log = "0.4.17"
 
 [build-dependencies]
 napi-build = "2.0"

package/index.d.ts

@@ -3,4 +3,5 @@
 
 /* auto-generated by NAPI-RS */
 
-export function run(args: Array<string>, binName?: string | undefined | null): void
+export function run(args: Array<string>, binName: string | undefined | null, callback: (...args: any[]) => any): void
+export function logError(error: string): void

package/index.js

@@ -236,6 +236,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { run } = nativeBinding
+const { run, logError } = nativeBinding
 
 module.exports.run = run
+module.exports.logError = logError

package/main.js

@@ -1,4 +1,4 @@
-const { run } = require('./index')
+const { run, logError } = require('./index')
 
 module.exports.run = (args, binName) => {
   return new Promise((resolve, reject) => {
@@ -11,3 +11,5 @@ module.exports.run = (args, binName) => {
     })
   })
 }
+
+module.exports.logError = logError

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/cli",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Command line interface for building Tauri apps",
   "funding": {
     "type": "opencollective",
@@ -37,7 +37,7 @@
     }
   },
   "devDependencies": {
-    "@napi-rs/cli": "2.10.0",
+    "@napi-rs/cli": "2.10.1",
     "cross-env": "7.0.3",
     "cross-spawn": "7.0.3",
     "fs-extra": "10.1.0",
@@ -64,14 +64,14 @@
     "format:check": "prettier --check ./package.json ./tauri.js"
   },
   "optionalDependencies": {
-    "@tauri-apps/cli-win32-x64-msvc": "1.0.2",
-    "@tauri-apps/cli-darwin-x64": "1.0.2",
-    "@tauri-apps/cli-linux-x64-gnu": "1.0.2",
-    "@tauri-apps/cli-darwin-arm64": "1.0.2",
-    "@tauri-apps/cli-linux-arm64-gnu": "1.0.2",
-    "@tauri-apps/cli-linux-arm64-musl": "1.0.2",
-    "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.2",
-    "@tauri-apps/cli-linux-x64-musl": "1.0.2",
-    "@tauri-apps/cli-win32-ia32-msvc": "1.0.2"
+    "@tauri-apps/cli-win32-x64-msvc": "1.0.3",
+    "@tauri-apps/cli-darwin-x64": "1.0.3",
+    "@tauri-apps/cli-linux-x64-gnu": "1.0.3",
+    "@tauri-apps/cli-darwin-arm64": "1.0.3",
+    "@tauri-apps/cli-linux-arm64-gnu": "1.0.3",
+    "@tauri-apps/cli-linux-arm64-musl": "1.0.3",
+    "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.3",
+    "@tauri-apps/cli-linux-x64-musl": "1.0.3",
+    "@tauri-apps/cli-win32-ia32-msvc": "1.0.3"
   }
 }

package/schema.json

@@ -2409,6 +2409,11 @@
           "description": "A Boolean value that determines whether the image represents a [template](https://developer.apple.com/documentation/appkit/nsimage/1520017-template?language=objc) image on macOS.",
           "default": false,
           "type": "boolean"
+        },
+        "menuOnLeftClick": {
+          "description": "A Boolean value that determines whether the menu should appear when the tray icon receives a left click on macOS.",
+          "default": true,
+          "type": "boolean"
         }
       },
       "additionalProperties": false

package/src/lib.rs

@@ -2,7 +2,30 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
+use napi::{
+  threadsafe_function::{ErrorStrategy, ThreadsafeFunction, ThreadsafeFunctionCallMode},
+  Error, JsFunction, Result, Status,
+};
+
+#[napi_derive::napi]
+pub fn run(args: Vec<String>, bin_name: Option<String>, callback: JsFunction) -> Result<()> {
+  let function: ThreadsafeFunction<bool, ErrorStrategy::CalleeHandled> = callback
+    .create_threadsafe_function(0, |ctx| ctx.env.get_boolean(ctx.value).map(|v| vec![v]))?;
+
+  // we need to run in a separate thread so Node.js (e.g. vue-cli-plugin-tauri) consumers
+  // can do work while `tauri dev` is running.
+  std::thread::spawn(move || match tauri_cli::try_run(args, bin_name) {
+    Ok(_) => function.call(Ok(true), ThreadsafeFunctionCallMode::Blocking),
+    Err(e) => function.call(
+      Err(Error::new(Status::GenericFailure, format!("{:#}", e))),
+      ThreadsafeFunctionCallMode::Blocking,
+    ),
+  });
+
+  Ok(())
+}
+
 #[napi_derive::napi]
-pub fn run(args: Vec<String>, bin_name: Option<String>) {
-  tauri_cli::run(args, bin_name);
+pub fn log_error(error: String) {
+  log::error!("{}", error);
 }

package/tauri.js

@@ -43,4 +43,7 @@ if (binStem === 'node' || binStem === 'nodejs') {
   arguments.unshift(bin)
 }
 
-cli.run(arguments, binName)
+cli.run(arguments, binName).catch((err) => {
+  cli.logError(err.message)
+  process.exit(1)
+})