Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .changes/android-studio-script-loading-ios-config.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/app-bundle-type.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/enable-android-edge-to-edge.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/export-window-props-from-wry-runtime.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/expose-run-callback-in-mock.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/fix-cf-bundle-version.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/fix-nsis-per-machine-installer-elevation.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/fix-nsis-tauri-utils-dll-required-files-path.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/install-ios-deps.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/isolation-iframe-loop.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changes/linux-apprun-url.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/migrate-alpha-error.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/mobile-external-urls.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/mock-emit.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/patch-binaries.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/platform-bundle-type.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/plugin-all-frame-init-script.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/plugin-boxed.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/plugin-js-init-script-into-string.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/proxy-body.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/runner-object-config.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/traffic-light-position-type.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/update-android-sdk.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/v2-beta-to-stable.md

This file was deleted.

20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions crates/tauri-build/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## \[2.3.1]

### Dependencies

- Upgraded to `tauri-utils@2.6.0`
- Upgraded to `tauri-codegen@2.3.1`

## \[2.2.1]

### Dependencies
Expand Down
6 changes: 3 additions & 3 deletions crates/tauri-build/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-build"
version = "2.3.0"
version = "2.3.1"
description = "build time code to pair with https://crates.io/crates/tauri"
exclude = ["CHANGELOG.md", "/target"]
readme = "README.md"
Expand Down Expand Up @@ -28,8 +28,8 @@ rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
anyhow = "1"
quote = { version = "1", optional = true }
tauri-codegen = { version = "2.3.0", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "2.5.0", path = "../tauri-utils", features = [
tauri-codegen = { version = "2.3.1", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "2.6.0", path = "../tauri-utils", features = [
"build",
"resources",
] }
Expand Down
12 changes: 12 additions & 0 deletions crates/tauri-bundler/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## \[2.5.1]

### Bug Fixes

- [`f94af9035`](https://www.github.com/tauri-apps/tauri/commit/f94af90359ec8b01138ae542391caa704ec18ca8) ([#13786](https://www.github.com/tauri-apps/tauri/pull/13786) by [@catalinsh](https://www.github.com/tauri-apps/tauri/../../catalinsh)) Fix NSIS per-machine installer not requesting elevation when run by non-admin users.
- [`f2dbe7309`](https://www.github.com/tauri-apps/tauri/commit/f2dbe730979d570be3ee3ecac9621204c4ceb788) ([#13772](https://www.github.com/tauri-apps/tauri/pull/13772) by [@catalinsh](https://www.github.com/tauri-apps/tauri/../../catalinsh)) Fix incorrect expected file path for `nsis_tauri_utils.dll` resulting in tauri-cli re-downloading the file on every build.
- [`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.

### Dependencies

- Upgraded to `tauri-utils@2.6.0`

## \[2.5.0]

### New Features
Expand Down
4 changes: 2 additions & 2 deletions crates/tauri-bundler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-bundler"
version = "2.5.0"
version = "2.5.1"
authors = [
"George Burton <burtonageo@gmail.com>",
"Tauri Programme within The Commons Conservancy",
Expand All @@ -15,7 +15,7 @@ rust-version = "1.77.2"
exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"]

[dependencies]
tauri-utils = { version = "2.5.0", path = "../tauri-utils", features = [
tauri-utils = { version = "2.6.0", path = "../tauri-utils", features = [
"resources",
] }
image = "0.25"
Expand Down
29 changes: 29 additions & 0 deletions crates/tauri-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
# 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.
- [`acd757428`](https://www.github.com/tauri-apps/tauri/commit/acd7574284056f9c00894cdce6c07f948fd80c87) ([#13743](https://www.github.com/tauri-apps/tauri/pull/13743) by [@owjs3901](https://www.github.com/tauri-apps/tauri/../../owjs3901)) Fix type of CFBundleVersion generated by `tauri ios init` when `bundleVersion` is a single number (for example `1` instead of `1.0.0`).
- [`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

### What's Changed

- [`cfc5bb819`](https://www.github.com/tauri-apps/tauri/commit/cfc5bb819637a97141cbda3285c5d772cfc0ebca) ([#13780](https://www.github.com/tauri-apps/tauri/pull/13780) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Enable edge to edge in `tauri android init` template
- [`12e359061`](https://www.github.com/tauri-apps/tauri/commit/12e3590613c7b4370aeddc16db7e29335e3a7684) ([#13759](https://www.github.com/tauri-apps/tauri/pull/13759) by [@owjs3901](https://www.github.com/tauri-apps/tauri/../../owjs3901)) Update compileSdk, targetSdk in android template to 36

### Dependencies

- Upgraded to `tauri-bundler@2.5.1`
- Upgraded to `tauri-utils@2.6.0`

## \[2.6.2]

### Bug Fixes
Expand Down
6 changes: 3 additions & 3 deletions crates/tauri-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-cli"
version = "2.6.2"
version = "2.7.0"
authors = ["Tauri Programme within The Commons Conservancy"]
edition = "2021"
rust-version = "1.77.2"
Expand Down Expand Up @@ -47,7 +47,7 @@ sublime_fuzzy = "0.7"
clap_complete = "4"
clap = { version = "4", features = ["derive", "env"] }
anyhow = "1"
tauri-bundler = { version = "2.5.0", default-features = false, path = "../tauri-bundler" }
tauri-bundler = { version = "2.5.1", default-features = false, path = "../tauri-bundler" }
colored = "2"
serde = { version = "1", features = ["derive"] }
serde_json = { version = "1", features = ["preserve_order"] }
Expand All @@ -58,7 +58,7 @@ shared_child = "1"
duct = "1.0"
toml_edit = { version = "0.22", features = ["serde"] }
json-patch = "3"
tauri-utils = { version = "2.5.0", path = "../tauri-utils", features = [
tauri-utils = { version = "2.6.0", path = "../tauri-utils", features = [
"isolation",
"schema",
"config-json5",
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-cli/config.schema.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 4 additions & 4 deletions crates/tauri-cli/metadata-v2.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"cli.js": {
"version": "2.6.2",
"version": "2.6.3",
"node": ">= 10.0.0"
},
"tauri": "2.6.2",
"tauri-build": "2.3.0",
"tauri-plugin": "2.3.0"
"tauri": "2.7.0",
"tauri-build": "2.3.1",
"tauri-plugin": "2.3.1"
}
Loading