@tauri-apps/cli 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## \[1.2.0]
+
+- Detect JSON5 and TOML configuration files in the dev watcher.
+  - [e7ccbd85](https://www.github.com/tauri-apps/tauri/commit/e7ccbd8573f6b9124e80c0b67fa2365729c3c196) feat(cli): detect JSON5 and TOML configuration files in the dev watcher ([#5439](https://www.github.com/tauri-apps/tauri/pull/5439)) on 2022-10-19
+- Log dev watcher file change detection.
+  - [9076d5d2](https://www.github.com/tauri-apps/tauri/commit/9076d5d2e76d432aef475ba403e9ab5bd3b9d2b0) feat(cli): add prompt information when file changing detected, closes [#5417](https://www.github.com/tauri-apps/tauri/pull/5417) ([#5428](https://www.github.com/tauri-apps/tauri/pull/5428)) on 2022-10-19
+- Fix crash when nodejs binary has the version in its name, for example `node18` or when running through deno.
+  - [7a231cd1](https://www.github.com/tauri-apps/tauri/commit/7a231cd1c99101f63354b13bb36223568d2f0a11) fix(cli): detect deno ([#5475](https://www.github.com/tauri-apps/tauri/pull/5475)) on 2022-10-28
+- Changed the project template to not enable all APIs by default.
+  - [582c25a0](https://www.github.com/tauri-apps/tauri/commit/582c25a0f0fa2725d786ec4edd0defe7811ad6e8) refactor(cli): disable api-all on templates ([#5538](https://www.github.com/tauri-apps/tauri/pull/5538)) on 2022-11-03
+
+## \[1.1.1]
+
+- Fix wrong cli metadata that caused new projects (created through `tauri init`) fail to build
+  - [db26aaf2](https://www.github.com/tauri-apps/tauri/commit/db26aaf2b44ce5335c9223c571ef2b2175e0cd6d) fix: fix wrong cli metadata ([#5214](https://www.github.com/tauri-apps/tauri/pull/5214)) on 2022-09-16
+
 ## \[1.1.0]
 
 - Allow adding `build > beforeBundleCommand` in tauri.conf.json to run a shell command before the bundling phase.

package/Cargo.toml

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/cli",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Command line interface for building Tauri apps",
   "funding": {
     "type": "opencollective",
@@ -37,11 +37,11 @@
     }
   },
   "devDependencies": {
-    "@napi-rs/cli": "2.11.4",
+    "@napi-rs/cli": "2.12.0",
     "cross-env": "7.0.3",
     "cross-spawn": "7.0.3",
     "fs-extra": "10.1.0",
-    "jest": "28.1.3",
+    "jest": "29.2.2",
     "jest-transform-toml": "1.0.0",
     "prettier": "2.7.1"
   },
@@ -64,14 +64,14 @@
     "format:check": "prettier --check ./package.json ./tauri.js"
   },
   "optionalDependencies": {
-    "@tauri-apps/cli-win32-x64-msvc": "1.1.0",
-    "@tauri-apps/cli-darwin-x64": "1.1.0",
-    "@tauri-apps/cli-linux-x64-gnu": "1.1.0",
-    "@tauri-apps/cli-darwin-arm64": "1.1.0",
-    "@tauri-apps/cli-linux-arm64-gnu": "1.1.0",
-    "@tauri-apps/cli-linux-arm64-musl": "1.1.0",
-    "@tauri-apps/cli-linux-arm-gnueabihf": "1.1.0",
-    "@tauri-apps/cli-linux-x64-musl": "1.1.0",
-    "@tauri-apps/cli-win32-ia32-msvc": "1.1.0"
+    "@tauri-apps/cli-win32-x64-msvc": "1.2.0",
+    "@tauri-apps/cli-darwin-x64": "1.2.0",
+    "@tauri-apps/cli-linux-x64-gnu": "1.2.0",
+    "@tauri-apps/cli-darwin-arm64": "1.2.0",
+    "@tauri-apps/cli-linux-arm64-gnu": "1.2.0",
+    "@tauri-apps/cli-linux-arm64-musl": "1.2.0",
+    "@tauri-apps/cli-linux-arm-gnueabihf": "1.2.0",
+    "@tauri-apps/cli-linux-x64-musl": "1.2.0",
+    "@tauri-apps/cli-win32-ia32-msvc": "1.2.0"
   }
 }

package/schema.json

@@ -28,6 +28,11 @@
       "default": {
         "allowlist": {
           "all": false,
+          "app": {
+            "all": false,
+            "hide": false,
+            "show": false
+          },
           "clipboard": {
             "all": false,
             "readText": false,
@@ -100,10 +105,15 @@
             "print": false,
             "requestUserAttention": false,
             "setAlwaysOnTop": false,
+            "setCursorGrab": false,
+            "setCursorIcon": false,
+            "setCursorPosition": false,
+            "setCursorVisible": false,
             "setDecorations": false,
             "setFocus": false,
             "setFullscreen": false,
             "setIcon": false,
+            "setIgnoreCursorEvents": false,
             "setMaxSize": false,
             "setMinSize": false,
             "setPosition": false,
@@ -203,7 +213,8 @@
           "type": [
             "string",
             "null"
-          ]
+          ],
+          "pattern": "^[^/\\:*?\"<>|]+$"
         },
         "version": {
           "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field.",
@@ -290,6 +301,11 @@
           "description": "The allowlist configuration.",
           "default": {
             "all": false,
+            "app": {
+              "all": false,
+              "hide": false,
+              "show": false
+            },
             "clipboard": {
               "all": false,
               "readText": false,
@@ -362,10 +378,15 @@
               "print": false,
               "requestUserAttention": false,
               "setAlwaysOnTop": false,
+              "setCursorGrab": false,
+              "setCursorIcon": false,
+              "setCursorPosition": false,
+              "setCursorVisible": false,
               "setDecorations": false,
               "setFocus": false,
               "setFullscreen": false,
               "setIcon": false,
+              "setIgnoreCursorEvents": false,
               "setMaxSize": false,
               "setMinSize": false,
               "setPosition": false,
@@ -498,6 +519,13 @@
             }
           ]
         },
+        "userAgent": {
+          "description": "The user agent for the webview",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "fileDropEnabled": {
           "description": "Whether the file drop is enabled or not on the webview. By default it is enabled.\n\nDisabling it is required to use drag and drop on the frontend on Windows.",
           "default": true,
@@ -584,7 +612,7 @@
           "type": "boolean"
         },
         "focus": {
-          "description": "Whether the window will be initially hidden or focused.",
+          "description": "Whether the window will be initially focused or not.",
           "default": true,
           "type": "boolean"
         },
@@ -628,6 +656,32 @@
               "type": "null"
             }
           ]
+        },
+        "titleBarStyle": {
+          "description": "The style of the macOS title bar.",
+          "default": "Visible",
+          "allOf": [
+            {
+              "$ref": "#/definitions/TitleBarStyle"
+            }
+          ]
+        },
+        "hiddenTitle": {
+          "description": "If `true`, sets the window title to be hidden on macOS.",
+          "default": false,
+          "type": "boolean"
+        },
+        "acceptFirstMouse": {
+          "description": "Whether clicking an inactive window also clicks through to the webview.",
+          "default": false,
+          "type": "boolean"
+        },
+        "tabbingIdentifier": {
+          "description": "Defines the window [tabbing identifier] for macOS.\n\nWindows with matching tabbing identifiers will be grouped together. If the tabbing identifier is not set, automatic tabbing will be disabled.\n\n[tabbing identifier]: <https://developer.apple.com/documentation/appkit/nswindow/1644704-tabbingidentifier>",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "additionalProperties": false
@@ -648,10 +702,47 @@
     },
     "Theme": {
       "description": "System theme.",
-      "type": "string",
-      "enum": [
-        "Light",
-        "Dark"
+      "oneOf": [
+        {
+          "description": "Light theme.",
+          "type": "string",
+          "enum": [
+            "Light"
+          ]
+        },
+        {
+          "description": "Dark theme.",
+          "type": "string",
+          "enum": [
+            "Dark"
+          ]
+        }
+      ]
+    },
+    "TitleBarStyle": {
+      "description": "How the window title bar should be displayed.",
+      "oneOf": [
+        {
+          "description": "A normal title bar.",
+          "type": "string",
+          "enum": [
+            "Visible"
+          ]
+        },
+        {
+          "description": "Makes the title bar transparent, so the window background color is shown instead.\n\nUseful if you don't need to have actual HTML under the title bar. This lets you avoid the caveats of using `TitleBarStyle::Overlay`. Will be more useful when Tauri lets you set a custom window background color.",
+          "type": "string",
+          "enum": [
+            "Transparent"
+          ]
+        },
+        {
+          "description": "Shows the title bar as a transparent overlay over the window's content.\n\nKeep in mind: - The height of the title bar is different on different OS versions, which can lead to window the controls and title not being where you don't expect. - You need to define a custom drag region to make your window draggable, however due to a limitation you can't drag the window when it's not in focus (https://github.com/tauri-apps/tauri/issues/4316). - The color of the window title depends on the system theme.",
+          "type": "string",
+          "enum": [
+            "Overlay"
+          ]
+        }
       ]
     },
     "CliConfig": {
@@ -925,6 +1016,13 @@
           "description": "The application identifier in reverse domain name notation (e.g. `com.tauri.example`). This string must be unique across applications since it is used in system configurations like the bundle ID and path to the webview data directory. This string must contain only alphanumeric characters (A–Z, a–z, and 0–9), hyphens (-), and periods (.).",
           "type": "string"
         },
+        "publisher": {
+          "description": "The application's publisher. Defaults to the second element in the identifier string. Currently maps to the Manufacturer property of the Windows Installer.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "icon": {
           "description": "The app's icons",
           "default": [],
@@ -1066,14 +1164,49 @@
     },
     "BundleType": {
       "description": "A bundle referenced by tauri-bundler.",
-      "type": "string",
-      "enum": [
-        "deb",
-        "appimage",
-        "msi",
-        "app",
-        "dmg",
-        "updater"
+      "oneOf": [
+        {
+          "description": "The debian bundle (.deb).",
+          "type": "string",
+          "enum": [
+            "deb"
+          ]
+        },
+        {
+          "description": "The AppImage bundle (.appimage).",
+          "type": "string",
+          "enum": [
+            "appimage"
+          ]
+        },
+        {
+          "description": "The Microsoft Installer bundle (.msi).",
+          "type": "string",
+          "enum": [
+            "msi"
+          ]
+        },
+        {
+          "description": "The macOS application bundle (.app).",
+          "type": "string",
+          "enum": [
+            "app"
+          ]
+        },
+        {
+          "description": "The Apple Disk Image bundle (.dmg).",
+          "type": "string",
+          "enum": [
+            "dmg"
+          ]
+        },
+        {
+          "description": "The Tauri updater bundle.",
+          "type": "string",
+          "enum": [
+            "updater"
+          ]
+        }
       ]
     },
     "AppImageConfig": {
@@ -1528,10 +1661,15 @@
             "print": false,
             "requestUserAttention": false,
             "setAlwaysOnTop": false,
+            "setCursorGrab": false,
+            "setCursorIcon": false,
+            "setCursorPosition": false,
+            "setCursorVisible": false,
             "setDecorations": false,
             "setFocus": false,
             "setFullscreen": false,
             "setIcon": false,
+            "setIgnoreCursorEvents": false,
             "setMaxSize": false,
             "setMinSize": false,
             "setPosition": false,
@@ -1677,6 +1815,19 @@
               "$ref": "#/definitions/ClipboardAllowlistConfig"
             }
           ]
+        },
+        "app": {
+          "description": "App APIs allowlist.",
+          "default": {
+            "all": false,
+            "hide": false,
+            "show": false
+          },
+          "allOf": [
+            {
+              "$ref": "#/definitions/AppAllowlistConfig"
+            }
+          ]
         }
       },
       "additionalProperties": false
@@ -1748,7 +1899,7 @@
       "additionalProperties": false
     },
     "FsAllowlistScope": {
-      "description": "Filesystem scope definition. It is a list of glob patterns that restrict the API access from the webview.\n\nEach pattern can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$APP`, `$LOG`, `$TEMP`.",
+      "description": "Filesystem scope definition. It is a list of glob patterns that restrict the API access from the webview.\n\nEach pattern can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$APP`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
       "anyOf": [
         {
           "description": "A list of paths that are allowed by this scope.",
@@ -1900,6 +2051,31 @@
           "default": false,
           "type": "boolean"
         },
+        "setCursorGrab": {
+          "description": "Allows grabbing the cursor.",
+          "default": false,
+          "type": "boolean"
+        },
+        "setCursorVisible": {
+          "description": "Allows setting the cursor visibility.",
+          "default": false,
+          "type": "boolean"
+        },
+        "setCursorIcon": {
+          "description": "Allows changing the cursor icon.",
+          "default": false,
+          "type": "boolean"
+        },
+        "setCursorPosition": {
+          "description": "Allows setting the cursor position.",
+          "default": false,
+          "type": "boolean"
+        },
+        "setIgnoreCursorEvents": {
+          "description": "Allows ignoring cursor events.",
+          "default": false,
+          "type": "boolean"
+        },
         "startDragging": {
           "description": "Allows start dragging on the window.",
           "default": false,
@@ -1972,7 +2148,7 @@
           "type": "string"
         },
         "cmd": {
-          "description": "The command name. It can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$APP`, `$LOG`, `$TEMP`.",
+          "description": "The command name. It can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$APP`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
           "default": "",
           "type": "string"
         },
@@ -2238,6 +2414,28 @@
       },
       "additionalProperties": false
     },
+    "AppAllowlistConfig": {
+      "description": "Allowlist for the app APIs.",
+      "type": "object",
+      "properties": {
+        "all": {
+          "description": "Use this flag to enable all app APIs.",
+          "default": false,
+          "type": "boolean"
+        },
+        "show": {
+          "description": "Enables the app's `show` API.",
+          "default": false,
+          "type": "boolean"
+        },
+        "hide": {
+          "description": "Enables the app's `hide` API.",
+          "default": false,
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    },
     "SecurityConfig": {
       "description": "Security configuration.",
       "type": "object",
@@ -2395,11 +2593,28 @@
     },
     "WindowsUpdateInstallMode": {
       "description": "Install modes for the Windows update.",
-      "type": "string",
-      "enum": [
-        "basicUi",
-        "quiet",
-        "passive"
+      "oneOf": [
+        {
+          "description": "Specifies there's a basic UI during the installation process, including a final dialog box at the end.",
+          "type": "string",
+          "enum": [
+            "basicUi"
+          ]
+        },
+        {
+          "description": "The quiet mode means there's no user interaction required. Requires admin privileges if the installer does.",
+          "type": "string",
+          "enum": [
+            "quiet"
+          ]
+        },
+        {
+          "description": "Specifies unattended mode, which means the installation only shows a progress bar.",
+          "type": "string",
+          "enum": [
+            "passive"
+          ]
+        }
       ]
     },
     "SystemTrayConfig": {
@@ -2422,6 +2637,13 @@
           "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"
+        },
+        "title": {
+          "description": "Title for MacOS tray",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "additionalProperties": false

package/tauri.js

@@ -10,9 +10,13 @@ const binStem = path.parse(bin).name.toLowerCase()
 // can successfully detect what command likely started the execution.
 let binName
 
+// deno run -A --unstable --node-modules-dir npm:@tauri-apps/cli
+if (bin === '@tauri-apps/cli') {
+  binName = '@tauri-apps/cli'
+}
 // Even if started by a package manager, the binary will be NodeJS.
 // Some distribution still use "nodejs" as the binary name.
-if (binStem === 'node' || binStem === 'nodejs') {
+else if (binStem.match(/(nodejs|node)([1-9]*)*$/g)) {
   const managerStem = process.env.npm_execpath
     ? path.parse(process.env.npm_execpath).name.toLowerCase()
     : null