@tauri-apps/cli 2.0.0-alpha.3 → 2.0.0-alpha.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## \[2.0.0-alpha.5]
+
+- Fixes the iOS project script to build the Rust library.
+  - [6e3e4c22](https://www.github.com/tauri-apps/tauri/commit/6e3e4c22be51500bec7856d90dcb2e40ef7fe1b4) fix(cli): use correct variable on script to build Rust iOS code ([#6581](https://www.github.com/tauri-apps/tauri/pull/6581)) on 2023-03-29
+- Fix `tauri android build/dev` crashing when used with standalone `pnpm` executable on Windows.
+  - [39df2c98](https://www.github.com/tauri-apps/tauri/commit/39df2c982e5e2ee8617b40f829a2f2e4abfce412) fix(cli/android): fallback to `${program}.cmd` ([#6576](https://www.github.com/tauri-apps/tauri/pull/6576)) on 2023-03-29
+  - [6b469c40](https://www.github.com/tauri-apps/tauri/commit/6b469c40c6244ba773d7478adbb41db6fdc72822) chore(changes): adjust change file for Android script execution fix on 2023-03-29
+
+## \[2.0.0-alpha.4]
+
+- Fix android project build crashing when using `pnpm` caused by extra `--`.
+  - [c787f749](https://www.github.com/tauri-apps/tauri/commit/c787f749de01b79d891615aad8c37b23037fff4c) fix(cli): only add `--` to generated android template for npm ([#6508](https://www.github.com/tauri-apps/tauri/pull/6508)) on 2023-03-21
+- Fixes the Android build gradle plugin implementation on Windows.
+  - [00241fa9](https://www.github.com/tauri-apps/tauri/commit/00241fa92d104870068a701519340633cc35b716) fix(cli): append .cmd on the gradle plugin binary on Windows, fix [#6502](https://www.github.com/tauri-apps/tauri/pull/6502) ([#6503](https://www.github.com/tauri-apps/tauri/pull/6503)) on 2023-03-21
+- Update `napi-rs` dependencies to latest to fix CLI hanging up forever.
+  - [d5ac76b5](https://www.github.com/tauri-apps/tauri/commit/d5ac76b53c7f35253db84ddfbf4ecf975ff6307d) chore(deps): update napi-rs, closes [#6502](https://www.github.com/tauri-apps/tauri/pull/6502) ([#6513](https://www.github.com/tauri-apps/tauri/pull/6513)) on 2023-03-21
+
 ## \[2.0.0-alpha.3]
 
 - Added `plugin android add` and `plugin ios add` commands to add mobile plugin functionality to existing projects.

package/Cargo.toml

@@ -11,8 +11,8 @@ openssl-vendored = ["tauri-cli/openssl-vendored"]
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.10", default-features = false, features = ["napi4"] }
-napi-derive = "2.10"
+napi = { version = "2.12", default-features = false, features = ["napi4"] }
+napi-derive = "2.12"
 tauri-cli = { path = ".." }
 log = "0.4.17"
 

package/index.js

@@ -1,7 +1,3 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
 const { existsSync, readFileSync } = require('fs')
 const { join } = require('path')
 
@@ -15,7 +11,8 @@ function isMusl() {
   // For Node 10
   if (!process.report || typeof process.report.getReport !== 'function') {
     try {
-      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
+      const lddPath = require('child_process').execSync('which ldd').toString().trim();
+      return readFileSync(lddPath, 'utf8').includes('musl')
     } catch (e) {
       return true
     }
@@ -105,6 +102,15 @@ switch (platform) {
     }
     break
   case 'darwin':
+    localFileExisted = existsSync(join(__dirname, 'cli.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./cli.darwin-universal.node')
+      } else {
+        nativeBinding = require('@tauri-apps/cli-darwin-universal')
+      }
+      break
+    } catch {}
     switch (arch) {
       case 'x64':
         localFileExisted = existsSync(join(__dirname, 'cli.darwin-x64.node'))

package/package.json

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