Skip to content

Commit c3252f7

Browse files
committed
fix(tauri): on_related_view should be behind the wry feature flag
1 parent b4abb6c commit c3252f7

File tree

8 files changed

+32
-20
lines changed

8 files changed

+32
-20
lines changed

Cargo.lock

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

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.8.0",
3+
"$id": "https://schema.tauri.app/config/2.8.1",
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "2.8.0",
44
"node": ">= 10.0.0"
55
},
6-
"tauri": "2.8.0",
6+
"tauri": "2.8.1",
77
"tauri-build": "2.4.0",
88
"tauri-plugin": "2.4.0"
99
}

crates/tauri-schema-generator/schemas/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.8.0",
3+
"$id": "https://schema.tauri.app/config/2.8.1",
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/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.8.1]
4+
5+
### Bug Fixes
6+
7+
- [`902727`](https://www.github.com/tauri-apps/tauri/commit/902727a6acea0bd9569b62ca243ae9563b4ed795) Move `WebviewWindowBuilder::with_related_view` behind the `wry` feature flag.
8+
39
## \[2.8.0]
410

511
### New Features

crates/tauri/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"
3-
version = "2.8.0"
3+
version = "2.8.1"
44
description = "Make tiny, secure apps for all desktop platforms with Tauri"
55
exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"]
66
readme = "README.md"

crates/tauri/src/webview/mod.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,12 +1187,15 @@ fn main() {
11871187

11881188
/// Creates a new webview sharing the same web process with the provided webview.
11891189
/// Useful if you need to link a webview to another, for instance when using the [`Self::on_new_window`].
1190-
#[cfg(any(
1191-
target_os = "linux",
1192-
target_os = "dragonfly",
1193-
target_os = "freebsd",
1194-
target_os = "netbsd",
1195-
target_os = "openbsd",
1190+
#[cfg(all(
1191+
feature = "wry",
1192+
any(
1193+
target_os = "linux",
1194+
target_os = "dragonfly",
1195+
target_os = "freebsd",
1196+
target_os = "netbsd",
1197+
target_os = "openbsd",
1198+
)
11961199
))]
11971200
pub fn with_related_view(mut self, related_view: webkit2gtk::WebView) -> Self {
11981201
self.webview_attributes.related_view.replace(related_view);

crates/tauri/src/webview/webview_window.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,12 +1276,15 @@ impl<R: Runtime, M: Manager<R>> WebviewWindowBuilder<'_, R, M> {
12761276

12771277
/// Creates a new webview sharing the same web process with the provided webview.
12781278
/// Useful if you need to link a webview to another, for instance when using the [`Self::on_new_window`].
1279-
#[cfg(any(
1280-
target_os = "linux",
1281-
target_os = "dragonfly",
1282-
target_os = "freebsd",
1283-
target_os = "netbsd",
1284-
target_os = "openbsd"
1279+
#[cfg(all(
1280+
feature = "wry",
1281+
any(
1282+
target_os = "linux",
1283+
target_os = "dragonfly",
1284+
target_os = "freebsd",
1285+
target_os = "netbsd",
1286+
target_os = "openbsd",
1287+
)
12851288
))]
12861289
pub fn with_related_view(mut self, related_view: webkit2gtk::WebView) -> Self {
12871290
self.webview_builder = self.webview_builder.with_related_view(related_view);

0 commit comments

Comments
 (0)