Skip to content

Commit ed8d624

Browse files
sakina1303sakina1303
authored
Merge branch 'dev' into fix
2 parents 5b6c549 + ad1dec2 commit ed8d624

File tree

22 files changed

+274
-179
lines changed

22 files changed

+274
-179
lines changed

‎.changes/add-plugin-listener-error-handling.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@tauri-apps/api": patch:bug
3+
---
4+
5+
Fix `addPluginListener` fallback added in https://github.com/tauri-apps/tauri/pull/14132 didn't work properly

‎Cargo.lock‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/tauri-build/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## \[2.5.2]
4+
5+
### Dependencies
6+
7+
- Upgraded to `[email protected]`
8+
39
## \[2.5.1]
410

511
### Bug Fixes

‎crates/tauri-build/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tauri-build"
3-
version = "2.5.1"
3+
version = "2.5.2"
44
description = "build time code to pair with https://crates.io/crates/tauri"
55
exclude = ["CHANGELOG.md", "/target"]
66
readme = "README.md"
@@ -26,7 +26,7 @@ targets = [
2626
[dependencies]
2727
anyhow = "1"
2828
quote = { version = "1", optional = true }
29-
tauri-codegen = { version = "2.5.0", path = "../tauri-codegen", optional = true }
29+
tauri-codegen = { version = "2.5.1", path = "../tauri-codegen", optional = true }
3030
tauri-utils = { version = "2.8.0", path = "../tauri-utils", features = [
3131
"build",
3232
"resources",

‎crates/tauri-cli/config.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "https://schema.tauri.app/config/2.9.2",
3+
"$id": "https://schema.tauri.app/config/2.9.3",
44
"title": "Config",
55
"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 ```",
66
"type": "object",

‎crates/tauri-cli/metadata-v2.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "2.9.4",
44
"node": ">= 10.0.0"
55
},
6-
"tauri": "2.9.2",
7-
"tauri-build": "2.5.1",
6+
"tauri": "2.9.3",
7+
"tauri-build": "2.5.2",
88
"tauri-plugin": "2.5.1"
99
}

‎crates/tauri-codegen/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## \[2.5.1]
4+
5+
### Performance Improvements
6+
7+
- [`8e3bd63db`](https://www.github.com/tauri-apps/tauri/commit/8e3bd63db919a4cf72bb3d28028033d8654deb34) ([#14457](https://www.github.com/tauri-apps/tauri/pull/14457) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Wrap the generated context code in a function to make rust analyzer faster
8+
39
## \[2.5.0]
410

511
### Bug Fixes

‎crates/tauri-codegen/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tauri-codegen"
3-
version = "2.5.0"
3+
version = "2.5.1"
44
description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
55
exclude = ["CHANGELOG.md", "/target"]
66
readme = "README.md"

‎crates/tauri-codegen/src/context.rs‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -469,19 +469,24 @@ pub fn context_codegen(data: ContextData) -> EmbeddedAssetsResult<TokenStream> {
469469
});
470470

471471
Ok(quote!({
472-
let thread = ::std::thread::Builder::new()
473-
.name(String::from("generated tauri context creation"))
474-
.stack_size(8 * 1024 * 1024)
475-
.spawn(|| #context)
476-
.expect("unable to create thread with 8MiB stack");
477-
478-
match thread.join() {
479-
Ok(context) => context,
480-
Err(_) => {
481-
eprintln!("the generated Tauri `Context` panicked during creation");
482-
::std::process::exit(101);
472+
// Wrapping in a function to make rust analyzer faster,
473+
// see https://github.com/tauri-apps/tauri/pull/14457
474+
fn inner<R: #root::Runtime>() -> #root::Context<R> {
475+
let thread = ::std::thread::Builder::new()
476+
.name(String::from("generated tauri context creation"))
477+
.stack_size(8 * 1024 * 1024)
478+
.spawn(|| #context)
479+
.expect("unable to create thread with 8MiB stack");
480+
481+
match thread.join() {
482+
Ok(context) => context,
483+
Err(_) => {
484+
eprintln!("the generated Tauri `Context` panicked during creation");
485+
::std::process::exit(101);
486+
}
483487
}
484488
}
489+
inner()
485490
}))
486491
}
487492

‎crates/tauri-macros/CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## \[2.5.1]
4+
5+
### Bug Fixes
6+
7+
- [`4b00130b8`](https://www.github.com/tauri-apps/tauri/commit/4b00130b86a27b6f121bf57897b5e92d83bcc0fc) ([#14385](https://www.github.com/tauri-apps/tauri/pull/14385) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Fix iOS deadlock when running on the simulator from Xcode by properly piping stdout/stderr messages through the Xcode console and OSLog.
8+
9+
### Dependencies
10+
11+
- Upgraded to `[email protected]`
12+
313
## \[2.5.0]
414

515
### Bug Fixes

0 commit comments

Comments
 (0)