@tauri-apps/cli 2.6.2 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## \[2.7.0]
+
+### New Features
+
+- [`33d079392`](https://www.github.com/tauri-apps/tauri/commit/33d079392ac4a5a153b7d8a6d82fefd6f54a2bdf) ([#13811](https://www.github.com/tauri-apps/tauri/pull/13811) by [@mhbagheri-99](https://www.github.com/tauri-apps/tauri/../../mhbagheri-99)) Allow runner configuration to be an object with cmd, cwd, and args properties. The runner can now be configured as `{ "cmd": "my_runner", "cwd": "/path", "args": ["--quiet"] }` while maintaining backwards compatibility with the existing string format.
+
+### Enhancements
+
+- [`232265c70`](https://www.github.com/tauri-apps/tauri/commit/232265c70e1c213bbb3f84b5541ddc07d330fce1) ([#13209](https://www.github.com/tauri-apps/tauri/pull/13209) by [@kandrelczyk](https://www.github.com/tauri-apps/tauri/../../kandrelczyk)) Binaries are patched before bundling to add the type of a bundle they will placed in. This information will be used during update process to select the correct target.
+
+### Bug Fixes
+
+- [`916aeaa48`](https://www.github.com/tauri-apps/tauri/commit/916aeaa48646a483a78e51cfe1633800ee62c37c) ([#13781](https://www.github.com/tauri-apps/tauri/pull/13781) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Fixes Android dev and build commands reading `tauri.ios.conf.json` instead of `tauri.android.conf.json` to merge platform-specific configuration.
+- [`0f248b111`](https://www.github.com/tauri-apps/tauri/commit/0f248b111ffb8af934eaf64bd8f4591e628da786) ([#13799](https://www.github.com/tauri-apps/tauri/pull/13799) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Install iOS dependencies when needed.
+- [`7a6fd5b75`](https://www.github.com/tauri-apps/tauri/commit/7a6fd5b75d61071e2771f6277c0376ec206d302a) ([#13863](https://www.github.com/tauri-apps/tauri/pull/13863) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) The AppImage bundler now pulls the AppRun binaries from our GitHub mirror, fixing 404 errors.
+- [`bda830410`](https://www.github.com/tauri-apps/tauri/commit/bda8304107da7ca60caaba5674faa793491898c6) ([#13833](https://www.github.com/tauri-apps/tauri/pull/13833) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fail with an error when trying to migrate from v2 alpha
+- [`bda830410`](https://www.github.com/tauri-apps/tauri/commit/bda8304107da7ca60caaba5674faa793491898c6) ([#13833](https://www.github.com/tauri-apps/tauri/pull/13833) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Use v2 stable instead of v2-rc when migrating from v2-beta
+
+### Dependencies
+
+- Upgraded to `tauri-cli@2.7.0`
+
 ## \[2.6.2]
 
 ### Bug Fixes

package/config.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://schema.tauri.app/config/2.6.2",
+  "$id": "https://schema.tauri.app/config/2.7.0",
   "title": "Config",
   "description": "The Tauri configuration object.\n It is read from a file where you can define your frontend assets,\n configure the bundler and define a tray icon.\n\n The configuration file is generated by the\n [`tauri init`](https://v2.tauri.app/reference/cli/#init) command that lives in\n your Tauri application source directory (src-tauri).\n\n Once generated, you may modify it at will to customize your Tauri application.\n\n ## File Formats\n\n By default, the configuration is defined as a JSON file named `tauri.conf.json`.\n\n Tauri also supports JSON5 and TOML files via the `config-json5` and `config-toml` Cargo features, respectively.\n The JSON5 file name must be either `tauri.conf.json` or `tauri.conf.json5`.\n The TOML file name is `Tauri.toml`.\n\n ## Platform-Specific Configuration\n\n In addition to the default configuration file, Tauri can\n read a platform-specific configuration from `tauri.linux.conf.json`,\n `tauri.windows.conf.json`, `tauri.macos.conf.json`, `tauri.android.conf.json` and `tauri.ios.conf.json`\n (or `Tauri.linux.toml`, `Tauri.windows.toml`, `Tauri.macos.toml`, `Tauri.android.toml` and `Tauri.ios.toml` if the `Tauri.toml` format is used),\n which gets merged with the main configuration object.\n\n ## Configuration Structure\n\n The configuration is composed of the following objects:\n\n - [`app`](#appconfig): The Tauri configuration\n - [`build`](#buildconfig): The build configuration\n - [`bundle`](#bundleconfig): The bundle configurations\n - [`plugins`](#pluginconfig): The plugins configuration\n\n Example tauri.config.json file:\n\n ```json\n {\n   \"productName\": \"tauri-app\",\n   \"version\": \"0.1.0\",\n   \"build\": {\n     \"beforeBuildCommand\": \"\",\n     \"beforeDevCommand\": \"\",\n     \"devUrl\": \"http://localhost:3000\",\n     \"frontendDist\": \"../dist\"\n   },\n   \"app\": {\n     \"security\": {\n       \"csp\": null\n     },\n     \"windows\": [\n       {\n         \"fullscreen\": false,\n         \"height\": 600,\n         \"resizable\": true,\n         \"title\": \"Tauri App\",\n         \"width\": 800\n       }\n     ]\n   },\n   \"bundle\": {},\n   \"plugins\": {}\n }\n ```",
   "type": "object",
@@ -1805,9 +1805,13 @@
       "properties": {
         "runner": {
           "description": "The binary used to build and run the application.",
-          "type": [
-            "string",
-            "null"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RunnerConfig"
+            },
+            {
+              "type": "null"
+            }
           ]
         },
         "devUrl": {
@@ -1880,6 +1884,45 @@
       },
       "additionalProperties": false
     },
+    "RunnerConfig": {
+      "description": "The runner configuration.",
+      "anyOf": [
+        {
+          "description": "A string specifying the binary to run.",
+          "type": "string"
+        },
+        {
+          "description": "An object with advanced configuration options.",
+          "type": "object",
+          "required": [
+            "cmd"
+          ],
+          "properties": {
+            "cmd": {
+              "description": "The binary to run.",
+              "type": "string"
+            },
+            "cwd": {
+              "description": "The current working directory to run the command from.",
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "args": {
+              "description": "Arguments to pass to the command.",
+              "type": [
+                "array",
+                "null"
+              ],
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      ]
+    },
     "FrontendDist": {
       "description": "Defines the URL or assets to embed in the application.",
       "anyOf": [

package/index.d.ts

@@ -2,10 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-/* tslint:disable */
-/* eslint-disable */
-
 /* auto-generated by NAPI-RS */
-
-export declare function run(args: Array<string>, binName: string | undefined | null, callback: (...args: any[]) => any): void
+/* eslint-disable */
 export declare function logError(error: string): void
+
+export declare function run(args: Array<string>, binName: string | undefined | null, callback: ((err: Error | null, arg: boolean) => any)): void

package/index.js

@@ -2,319 +2,400 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-/* tslint:disable */
+// prettier-ignore
 /* eslint-disable */
-/* prettier-ignore */
-
+// @ts-nocheck
 /* auto-generated by NAPI-RS */
 
-const { existsSync, readFileSync } = require('fs')
-const { join } = require('path')
-
-const { platform, arch } = process
+const { createRequire } = require('node:module')
+require = createRequire(__filename)
 
+const { readFileSync } = require('node:fs')
 let nativeBinding = null
-let localFileExisted = false
-let loadError = null
+const loadErrors = []
 
-function isMusl() {
-  // For Node 10
-  if (!process.report || typeof process.report.getReport !== 'function') {
-    try {
-      const lddPath = require('child_process').execSync('which ldd').toString().trim()
-      return readFileSync(lddPath, 'utf8').includes('musl')
-    } catch (e) {
+const isMusl = () => {
+  let musl = false
+  if (process.platform === 'linux') {
+    musl = isMuslFromFilesystem()
+    if (musl === null) {
+      musl = isMuslFromReport()
+    }
+    if (musl === null) {
+      musl = isMuslFromChildProcess()
+    }
+  }
+  return musl
+}
+
+const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
+
+const isMuslFromFilesystem = () => {
+  try {
+    return readFileSync('/usr/bin/ldd', 'utf-8').includes('musl')
+  } catch {
+    return null
+  }
+}
+
+const isMuslFromReport = () => {
+  let report = null
+  if (typeof process.report?.getReport === 'function') {
+    process.report.excludeNetwork = true
+    report = process.report.getReport()
+  }
+  if (!report) {
+    return null
+  }
+  if (report.header && report.header.glibcVersionRuntime) {
+    return false
+  }
+  if (Array.isArray(report.sharedObjects)) {
+    if (report.sharedObjects.some(isFileMusl)) {
       return true
     }
-  } else {
-    const { glibcVersionRuntime } = process.report.getReport().header
-    return !glibcVersionRuntime
   }
+  return false
 }
 
-switch (platform) {
-  case 'android':
-    switch (arch) {
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'cli.android-arm64.node'))
+const isMuslFromChildProcess = () => {
+  try {
+    return require('child_process').execSync('ldd --version', { encoding: 'utf8' }).includes('musl')
+  } catch (e) {
+    // If we reach this case, we don't know if the system is musl or not, so is better to just fallback to false
+    return false
+  }
+}
+
+function requireNative() {
+  if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
+    try {
+      nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
+    } catch (err) {
+      loadErrors.push(err)
+    }
+  } else if (process.platform === 'android') {
+    if (process.arch === 'arm64') {
+      try {
+        return require('./cli.android-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-android-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else if (process.arch === 'arm') {
+      try {
+        return require('./cli.android-arm-eabi.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-android-arm-eabi')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
+    }
+  } else if (process.platform === 'win32') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./cli.win32-x64-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-win32-x64-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else if (process.arch === 'ia32') {
+      try {
+        return require('./cli.win32-ia32-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-win32-ia32-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./cli.win32-arm64-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-win32-arm64-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Windows: ${process.arch}`))
+    }
+  } else if (process.platform === 'darwin') {
+    try {
+      return require('./cli.darwin-universal.node')
+    } catch (e) {
+      loadErrors.push(e)
+    }
+    try {
+      return require('@tauri-apps/cli-darwin-universal')
+    } catch (e) {
+      loadErrors.push(e)
+    }
+    if (process.arch === 'x64') {
+      try {
+        return require('./cli.darwin-x64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-darwin-x64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./cli.darwin-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-darwin-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on macOS: ${process.arch}`))
+    }
+  } else if (process.platform === 'freebsd') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./cli.freebsd-x64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-freebsd-x64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./cli.freebsd-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-freebsd-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on FreeBSD: ${process.arch}`))
+    }
+  } else if (process.platform === 'linux') {
+    if (process.arch === 'x64') {
+      if (isMusl()) {
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./cli.android-arm64.node')
-          } else {
-            nativeBinding = require('@tauri-apps/cli-android-arm64')
-          }
+          return require('./cli.linux-x64-musl.node')
         } catch (e) {
-          loadError = e
+          loadErrors.push(e)
         }
-        break
-      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'cli.android-arm-eabi.node'))
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./cli.android-arm-eabi.node')
-          } else {
-            nativeBinding = require('@tauri-apps/cli-android-arm-eabi')
-          }
+          return require('@tauri-apps/cli-linux-x64-musl')
         } catch (e) {
-          loadError = e
+          loadErrors.push(e)
         }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Android ${arch}`)
-    }
-    break
-  case 'win32':
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(
-          join(__dirname, 'cli.win32-x64-msvc.node')
-        )
+      } else {
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./cli.win32-x64-msvc.node')
-          } else {
-            nativeBinding = require('@tauri-apps/cli-win32-x64-msvc')
-          }
+          return require('./cli.linux-x64-gnu.node')
         } catch (e) {
-          loadError = e
+          loadErrors.push(e)
         }
-        break
-      case 'ia32':
-        localFileExisted = existsSync(
-          join(__dirname, 'cli.win32-ia32-msvc.node')
-        )
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./cli.win32-ia32-msvc.node')
-          } else {
-            nativeBinding = require('@tauri-apps/cli-win32-ia32-msvc')
-          }
+          return require('@tauri-apps/cli-linux-x64-gnu')
         } catch (e) {
-          loadError = e
+          loadErrors.push(e)
         }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'cli.win32-arm64-msvc.node')
-        )
+      }
+    } else if (process.arch === 'arm64') {
+      if (isMusl()) {
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./cli.win32-arm64-msvc.node')
-          } else {
-            nativeBinding = require('@tauri-apps/cli-win32-arm64-msvc')
-          }
+          return require('./cli.linux-arm64-musl.node')
         } catch (e) {
-          loadError = e
+          loadErrors.push(e)
+        }
+        try {
+          return require('@tauri-apps/cli-linux-arm64-musl')
+        } catch (e) {
+          loadErrors.push(e)
         }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`)
-    }
-    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')
+        try {
+          return require('./cli.linux-arm64-gnu.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@tauri-apps/cli-linux-arm64-gnu')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       }
-      break
-    } catch {}
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'cli.darwin-x64.node'))
+    } else if (process.arch === 'arm') {
+      if (isMusl()) {
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./cli.darwin-x64.node')
-          } else {
-            nativeBinding = require('@tauri-apps/cli-darwin-x64')
-          }
+          return require('./cli.linux-arm-musleabihf.node')
         } catch (e) {
-          loadError = e
+          loadErrors.push(e)
         }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'cli.darwin-arm64.node')
-        )
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./cli.darwin-arm64.node')
-          } else {
-            nativeBinding = require('@tauri-apps/cli-darwin-arm64')
-          }
+          return require('@tauri-apps/cli-linux-arm-musleabihf')
         } catch (e) {
-          loadError = e
+          loadErrors.push(e)
         }
-        break
-      default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`)
-    }
-    break
-  case 'freebsd':
-    if (arch !== 'x64') {
-      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
-    }
-    localFileExisted = existsSync(join(__dirname, 'cli.freebsd-x64.node'))
-    try {
-      if (localFileExisted) {
-        nativeBinding = require('./cli.freebsd-x64.node')
       } else {
-        nativeBinding = require('@tauri-apps/cli-freebsd-x64')
-      }
-    } catch (e) {
-      loadError = e
-    }
-    break
-  case 'linux':
-    switch (arch) {
-      case 'x64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'cli.linux-x64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./cli.linux-x64-musl.node')
-            } else {
-              nativeBinding = require('@tauri-apps/cli-linux-x64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'cli.linux-x64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./cli.linux-x64-gnu.node')
-            } else {
-              nativeBinding = require('@tauri-apps/cli-linux-x64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
+        try {
+          return require('./cli.linux-arm-gnueabihf.node')
+        } catch (e) {
+          loadErrors.push(e)
         }
-        break
-      case 'arm64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'cli.linux-arm64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./cli.linux-arm64-musl.node')
-            } else {
-              nativeBinding = require('@tauri-apps/cli-linux-arm64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'cli.linux-arm64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./cli.linux-arm64-gnu.node')
-            } else {
-              nativeBinding = require('@tauri-apps/cli-linux-arm64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
+        try {
+          return require('@tauri-apps/cli-linux-arm-gnueabihf')
+        } catch (e) {
+          loadErrors.push(e)
         }
-        break
-      case 'arm':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'cli.linux-arm-musleabihf.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./cli.linux-arm-musleabihf.node')
-            } else {
-              nativeBinding = require('@tauri-apps/cli-linux-arm-musleabihf')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'cli.linux-arm-gnueabihf.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./cli.linux-arm-gnueabihf.node')
-            } else {
-              nativeBinding = require('@tauri-apps/cli-linux-arm-gnueabihf')
-            }
-          } catch (e) {
-            loadError = e
-          }
+      }
+    } else if (process.arch === 'riscv64') {
+      if (isMusl()) {
+        try {
+          return require('./cli.linux-riscv64-musl.node')
+        } catch (e) {
+          loadErrors.push(e)
         }
-        break
-      case 'riscv64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'cli.linux-riscv64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./cli.linux-riscv64-musl.node')
-            } else {
-              nativeBinding = require('@tauri-apps/cli-linux-riscv64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'cli.linux-riscv64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./cli.linux-riscv64-gnu.node')
-            } else {
-              nativeBinding = require('@tauri-apps/cli-linux-riscv64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
+        try {
+          return require('@tauri-apps/cli-linux-riscv64-musl')
+        } catch (e) {
+          loadErrors.push(e)
         }
-        break
-      case 's390x':
-        localFileExisted = existsSync(
-          join(__dirname, 'cli.linux-s390x-gnu.node')
-        )
+      } else {
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./cli.linux-s390x-gnu.node')
-          } else {
-            nativeBinding = require('@tauri-apps/cli-linux-s390x-gnu')
-          }
+          return require('./cli.linux-riscv64-gnu.node')
         } catch (e) {
-          loadError = e
+          loadErrors.push(e)
         }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`)
+        try {
+          return require('@tauri-apps/cli-linux-riscv64-gnu')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+      }
+    } else if (process.arch === 'ppc64') {
+      try {
+        return require('./cli.linux-ppc64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-linux-ppc64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else if (process.arch === 's390x') {
+      try {
+        return require('./cli.linux-s390x-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-linux-s390x-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
+    }
+  } else if (process.platform === 'openharmony') {
+    if (process.arch === 'arm64') {
+      try {
+        return require('./cli.linux-arm64-ohos.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-linux-arm64-ohos')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else if (process.arch === 'x64') {
+      try {
+        return require('./cli.linux-x64-ohos.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-linux-x64-ohos')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else if (process.arch === 'arm') {
+      try {
+        return require('./cli.linux-arm-ohos.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@tauri-apps/cli-linux-arm-ohos')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on OpenHarmony: ${process.arch}`))
     }
-    break
-  default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
+  } else {
+    loadErrors.push(new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`))
+  }
+}
+
+nativeBinding = requireNative()
+
+if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
+  try {
+    nativeBinding = require('./cli.wasi.cjs')
+  } catch (err) {
+    if (process.env.NAPI_RS_FORCE_WASI) {
+      loadErrors.push(err)
+    }
+  }
+  if (!nativeBinding) {
+    try {
+      nativeBinding = require('@tauri-apps/cli-wasm32-wasi')
+    } catch (err) {
+      if (process.env.NAPI_RS_FORCE_WASI) {
+        loadErrors.push(err)
+      }
+    }
+  }
 }
 
 if (!nativeBinding) {
-  if (loadError) {
-    throw loadError
+  if (loadErrors.length > 0) {
+    throw new Error(
+      `Cannot find native binding. ` +
+        `npm has a bug related to optional dependencies (https://github.com/npm/cli/issues/4828). ` +
+        'Please try `npm i` again after removing both package-lock.json and node_modules directory.',
+      { cause: loadErrors }
+    )
   }
   throw new Error(`Failed to load native binding`)
 }
 
-const { run, logError } = nativeBinding
-
-module.exports.run = run
-module.exports.logError = logError
+module.exports = nativeBinding
+module.exports.logError = nativeBinding.logError
+module.exports.run = nativeBinding.run

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/cli",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "description": "Command line interface for building Tauri apps",
   "funding": {
     "type": "opencollective",
@@ -24,22 +24,23 @@
   "main": "main.js",
   "types": "main.d.ts",
   "napi": {
-    "name": "cli",
-    "triples": {
-      "additional": [
-        "aarch64-apple-darwin",
-        "aarch64-unknown-linux-gnu",
-        "aarch64-unknown-linux-musl",
-        "armv7-unknown-linux-gnueabihf",
-        "x86_64-unknown-linux-musl",
-        "riscv64gc-unknown-linux-gnu",
-        "i686-pc-windows-msvc",
-        "aarch64-pc-windows-msvc"
-      ]
-    }
+    "binaryName": "cli",
+    "targets": [
+      "x86_64-unknown-linux-gnu",
+      "x86_64-pc-windows-msvc",
+      "x86_64-apple-darwin",
+      "aarch64-apple-darwin",
+      "aarch64-unknown-linux-gnu",
+      "aarch64-unknown-linux-musl",
+      "armv7-unknown-linux-gnueabihf",
+      "x86_64-unknown-linux-musl",
+      "riscv64gc-unknown-linux-gnu",
+      "i686-pc-windows-msvc",
+      "aarch64-pc-windows-msvc"
+    ]
   },
   "devDependencies": {
-    "@napi-rs/cli": "2.18.4",
+    "@napi-rs/cli": "^3.0.0",
     "@types/node": "^22.15.32",
     "cross-env": "7.0.3",
     "vitest": "^3.2.4"
@@ -63,16 +64,16 @@
     "tauri": "node ./tauri.js"
   },
   "optionalDependencies": {
-    "@tauri-apps/cli-win32-x64-msvc": "2.6.2",
-    "@tauri-apps/cli-darwin-x64": "2.6.2",
-    "@tauri-apps/cli-linux-x64-gnu": "2.6.2",
-    "@tauri-apps/cli-darwin-arm64": "2.6.2",
-    "@tauri-apps/cli-linux-arm64-gnu": "2.6.2",
-    "@tauri-apps/cli-linux-arm64-musl": "2.6.2",
-    "@tauri-apps/cli-linux-arm-gnueabihf": "2.6.2",
-    "@tauri-apps/cli-linux-x64-musl": "2.6.2",
-    "@tauri-apps/cli-linux-riscv64-gnu": "2.6.2",
-    "@tauri-apps/cli-win32-ia32-msvc": "2.6.2",
-    "@tauri-apps/cli-win32-arm64-msvc": "2.6.2"
+    "@tauri-apps/cli-linux-x64-gnu": "2.7.0",
+    "@tauri-apps/cli-win32-x64-msvc": "2.7.0",
+    "@tauri-apps/cli-darwin-x64": "2.7.0",
+    "@tauri-apps/cli-darwin-arm64": "2.7.0",
+    "@tauri-apps/cli-linux-arm64-gnu": "2.7.0",
+    "@tauri-apps/cli-linux-arm64-musl": "2.7.0",
+    "@tauri-apps/cli-linux-arm-gnueabihf": "2.7.0",
+    "@tauri-apps/cli-linux-x64-musl": "2.7.0",
+    "@tauri-apps/cli-linux-riscv64-gnu": "2.7.0",
+    "@tauri-apps/cli-win32-ia32-msvc": "2.7.0",
+    "@tauri-apps/cli-win32-arm64-msvc": "2.7.0"
   }
 }

package/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-edition = "2021"
-name = "tauri-cli-node"
-version = "0.0.0"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.16", default-features = false, features = ["napi4"] }
-napi-derive = "2.16"
-tauri-cli = { path = "../../crates/tauri-cli", default-features = false }
-log = "0.4.21"
-
-[build-dependencies]
-napi-build = "2.1"
-
-[features]
-default = ["tauri-cli/default"]
-native-tls = ["tauri-cli/native-tls"]
-native-tls-vendored = ["tauri-cli/native-tls-vendored"]

package/__tests__/fixtures/empty/dist/index.html

@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <body>
-    <div></div>
-  </body>
-</html>

package/__tests__/fixtures/empty/package.json

@@ -1,5 +0,0 @@
-{
-  "scripts": {
-    "build": ""
-  }
-}

package/__tests__/template.spec.ts

@@ -1,89 +0,0 @@
-// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-import { resolve } from 'node:path'
-import { spawnSync } from 'node:child_process'
-import {
-  existsSync,
-  readFileSync,
-  writeFileSync,
-  rmSync,
-  renameSync
-} from 'node:fs'
-import { beforeAll, describe, it } from 'vitest'
-
-// Build CLI before tests, for local usage only.
-// CI builds the CLI on different platforms and architectures
-if (!process.env.CI) {
-  beforeAll(() => {
-    const cliDir = resolve(__dirname, '..')
-    exec('pnpm', ['build:debug'], { cwd: cliDir })
-  })
-}
-
-describe('[CLI] @tauri-apps/cli template', () => {
-  it('init a project and builds it', { timeout: 15 * 60 * 1000 }, async () => {
-    const cwd = process.cwd()
-    const fixturePath = resolve(__dirname, './fixtures/empty')
-    const tauriFixturePath = resolve(fixturePath, 'src-tauri')
-    const outPath = resolve(tauriFixturePath, 'target')
-    const cacheOutPath = resolve(fixturePath, 'target')
-
-    process.chdir(fixturePath)
-
-    const outExists = existsSync(outPath)
-    if (outExists) {
-      if (existsSync(cacheOutPath)) {
-        rmSync(cacheOutPath, { recursive: true, force: true })
-      }
-      renameSync(outPath, cacheOutPath)
-    }
-
-    const cli = await import('../main.js')
-
-    await cli.run([
-      'init',
-      '-vvv',
-      '--directory',
-      process.cwd(),
-      '--force',
-      '--tauri-path',
-      resolve(__dirname, '../../..'),
-      '--before-build-command',
-      '',
-      '--before-dev-command',
-      '',
-      '--ci'
-    ])
-
-    if (outExists) {
-      renameSync(cacheOutPath, outPath)
-    }
-
-    process.chdir(tauriFixturePath)
-
-    const manifestPath = resolve(tauriFixturePath, 'Cargo.toml')
-    const manifestFile = readFileSync(manifestPath).toString()
-    writeFileSync(manifestPath, `workspace = { }\n${manifestFile}`)
-
-    const configPath = resolve(tauriFixturePath, 'tauri.conf.json')
-    const config = readFileSync(configPath).toString()
-    writeFileSync(configPath, config.replace('com.tauri.dev', 'com.tauri.test'))
-
-    await cli.run(['build', '-vvv'])
-    process.chdir(cwd)
-  })
-})
-
-function exec(
-  bin: string,
-  args?: string[],
-  opts?: {
-    cwd?: string
-  }
-) {
-  process.platform === 'win32'
-    ? spawnSync('cmd', ['/c', bin, ...(args ?? [])], { cwd: opts?.cwd })
-    : spawnSync(bin, args, { cwd: opts?.cwd })
-}

package/build.rs

@@ -1,7 +0,0 @@
-// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-fn main() {
-  ::napi_build::setup();
-}

package/src/lib.rs

@@ -1,50 +0,0 @@
-// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-#![cfg(any(target_os = "macos", target_os = "linux", windows))]
-
-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 consumers
-  // can do work while `tauri dev` is running.
-  std::thread::spawn(move || {
-    let res = match std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-      tauri_cli::try_run(args, bin_name).inspect_err(|e| eprintln!("{e:#}"))
-    })) {
-      Ok(t) => t,
-      Err(_) => {
-        return function.call(
-          Err(Error::new(
-            Status::GenericFailure,
-            "Tauri CLI unexpected panic",
-          )),
-          ThreadsafeFunctionCallMode::Blocking,
-        );
-      }
-    };
-
-    match res {
-      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 log_error(error: String) {
-  log::error!("{}", error);
-}