Merge branch 'dev' into feat/core-tracing

.changes/app-bundle-files-config.md

@@ -0,0 +1,7 @@
+---
+"tauri-bundler": patch:feat
+"tauri-cli": patch:feat
+"@tauri-apps/cli": patch:feat
+---
+
+Add `files` object on the `tauri > bundle > macOS` configuration option.

.changes/app-bundle-files.md

@@ -0,0 +1,5 @@
+---
+"tauri-bundler": patch:feat
+---
+
+Add `files` map on the `MacOsSettings` struct to add custom files to the `.app` bundle.

.changes/bundler-rpm.md

@@ -0,0 +1,7 @@
+---
+"tauri-bundler": 'patch:enhance'
+"tauri-cli": 'patch:enhance'
+"@tauri-apps/cli": 'patch:enhance'
+---
+
+Add RPM packaging

.changes/cli-hook-invalid-target-triple-env-vars.md

@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:bug'
+'@tauri-apps/cli': 'patch:bug'
+---
+
+Prevent `Invalid target triple` warnings and correctly set `TAURI_ENV_` vars when target triple contains 4 components.

.changes/cli-hooks-env-vars-breaking.md

@@ -0,0 +1,9 @@
+---
+'tauri-cli': 'patch:breaking'
+'@tauri-apps/cli': 'patch:breaking'
+---
+
+Removed `TAURI_ENV_PLATFORM_TYPE` which will not be set for CLI hook commands anymore, use `TAURI_ENV_PLATFORM` instead. Also Changed value of `TAURI_ENV_PLATFORM` and `TAURI_ENV_ARCH` values to match the target triple more accurately:
+
+- `darwin` and `androideabi` are no longer replaced with `macos` and `android` in `TAURI_ENV_PLATFORM`.
+- `i686` and `i586` are no longer replaced with `x86` in `TAURI_ENV_ARCH`.

.changes/fix-mock-tauri-internals.md

@@ -0,0 +1,5 @@
+---
+'@tauri-apps/api': 'patch:bug'
+---
+
+`mockIPC` and `mockWindows` no longer crash if `window.__TAURI_INTERNALS__` is undefined.

.changes/migrate-tauri-build-version.md

@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:feat
+"@tauri-apps/cli": patch:feat
+---
+
+Include tauri-build on the migration script.

.changes/on-download-hook.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch:feat
+---
+
+Added `WindowBuilder::on_download` to handle download request events.

.changes/runevent-filedrop.md

@@ -0,0 +1,6 @@
+---
+'tauri': 'patch:bug'
+'tauri-runtime-wry': 'patch'
+---
+
+Fix `RunEvent::WindowEvent(event: WindowEvent::FileDrop(FileDropEvent))` never triggered and always prevent default OS behavior when `disable_file_drop_handler` is not used.

.changes/runtime-on-download-hooks.md

@@ -0,0 +1,6 @@
+---
+"tauri-runtime": patch:feat
+"tauri-runtime-wry": patch:feat
+---
+
+Added download event closure via `PendingWindow::download_handler`.

.github/workflows/covector-version-or-publish.yml

@@ -118,8 +118,6 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
-          repository: tauri-apps/tauri
           event-type: publish-js-cli
           client-payload: >-
             {"releaseId": "${{ steps.covector.outputs['-tauri-apps-cli-releaseId'] }}" }
@@ -130,6 +128,4 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, 'tauri-cli')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
-          repository: tauri-apps/tauri
           event-type: publish-clirs

README.md

@@ -31,7 +31,7 @@ npm create tauri-app@latest
 
 The list of Tauri's features includes, but is not limited to:
 
-- Built-in app bundler to create app bundles in formats like `.app`, `.dmg`, `.deb`, `.AppImage` and Windows installers like `.exe` (via NSIS) and `.msi` (via WiX).
+- Built-in app bundler to create app bundles in formats like `.app`, `.dmg`, `.deb`, `.rpm`, `.AppImage` and Windows installers like `.exe` (via NSIS) and `.msi` (via WiX).
 - Built-in self updater (desktop only)
 - System tray icons
 - Native notifications

core/tauri-config-schema/Cargo.toml

@@ -5,9 +5,7 @@ edition = "2021"
 publish = false
 
 [build-dependencies]
-tauri-utils = { version = "2.0.0-alpha.4", features = [
-  "schema",
-], path = "../tauri-utils" }
+tauri-utils = { features = ["schema"], path = "../tauri-utils" }
 schemars = { version = "0.8", features = ["url", "preserve_order"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

core/tauri-config-schema/schema.json

@@ -55,8 +55,14 @@
           "icon": [],
           "identifier": "",
           "macOS": {
+            "files": {},
             "minimumSystemVersion": "10.13"
           },
+          "rpm": {
+            "epoch": 0,
+            "files": {},
+            "release": "1"
+          },
           "targets": "all",
           "updater": {
             "active": false,
@@ -203,8 +209,14 @@
             "icon": [],
             "identifier": "",
             "macOS": {
+              "files": {},
               "minimumSystemVersion": "10.13"
             },
+            "rpm": {
+              "epoch": 0,
+              "files": {},
+              "release": "1"
+            },
             "targets": "all",
             "updater": {
               "active": false,
@@ -933,7 +945,7 @@
           "type": "boolean"
         },
         "targets": {
-          "description": "The bundle targets, currently supports [\"deb\", \"appimage\", \"nsis\", \"msi\", \"app\", \"dmg\", \"updater\"] or \"all\".",
+          "description": "The bundle targets, currently supports [\"deb\", \"rpm\", \"appimage\", \"nsis\", \"msi\", \"app\", \"dmg\", \"updater\"] or \"all\".",
           "default": "all",
           "allOf": [
             {
@@ -1031,6 +1043,19 @@
             }
           ]
         },
+        "rpm": {
+          "description": "Configuration for the RPM bundle.",
+          "default": {
+            "epoch": 0,
+            "files": {},
+            "release": "1"
+          },
+          "allOf": [
+            {
+              "$ref": "#/definitions/RpmConfig"
+            }
+          ]
+        },
         "dmg": {
           "description": "DMG-specific settings.",
           "default": {
@@ -1056,6 +1081,7 @@
         "macOS": {
           "description": "Configuration for the macOS bundles.",
           "default": {
+            "files": {},
             "minimumSystemVersion": "10.13"
           },
           "allOf": [
@@ -1170,6 +1196,13 @@
             "deb"
           ]
         },
+        {
+          "description": "The RPM bundle (.rpm).",
+          "type": "string",
+          "enum": [
+            "rpm"
+          ]
+        },
         {
           "description": "The AppImage bundle (.appimage).",
           "type": "string",
@@ -1368,6 +1401,57 @@
       },
       "additionalProperties": false
     },
+    "RpmConfig": {
+      "description": "Configuration for RPM bundles.",
+      "type": "object",
+      "properties": {
+        "license": {
+          "description": "The package's license identifier. If not set, defaults to the license from the Cargo.toml file.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "depends": {
+          "description": "The list of RPM dependencies your application relies on.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
+        },
+        "release": {
+          "description": "The RPM release tag.",
+          "default": "1",
+          "type": "string"
+        },
+        "epoch": {
+          "description": "The RPM epoch.",
+          "default": 0,
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "files": {
+          "description": "The files to include on the package.",
+          "default": {},
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "desktopTemplate": {
+          "description": "Path to a custom desktop file Handlebars template.\n\nAvailable variables: `categories`, `comment` (optional), `exec`, `icon` and `name`.",
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
     "DmgConfig": {
       "description": "Configuration for Apple Disk Image (.dmg) bundles.\n\nSee more: https://tauri.app/v1/api/config#dmgconfig",
       "type": "object",
@@ -1489,6 +1573,14 @@
             "type": "string"
           }
         },
+        "files": {
+          "description": "The files to include in the application relative to the Contents directory.",
+          "default": {},
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
         "minimumSystemVersion": {
           "description": "A version string indicating the minimum macOS X version that the bundled application supports. Defaults to `10.13`.\n\nSetting it to `null` completely removes the `LSMinimumSystemVersion` field on the bundle's `Info.plist` and the `MACOSX_DEPLOYMENT_TARGET` environment variable.\n\nAn empty string is considered an invalid value so the default value is used.",
           "default": "10.13",