Skip to content

chore(tauri): make the devtools plugin opt-in behind a cargo feature #1333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eleboucher wants to merge 1 commit into
base: dev
Choose a base branch
from
+20 −8
Open

chore(tauri): make the devtools plugin opt-in behind a cargo feature #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ tauri-plugin-clipboard-manager = "2.3.2"
# wry/tauri-runtime-wry/webkit2gtk.
# Pinned to =2.0.0 because 2.1.0+ introduced an unconditional call to
# tauri::webview_version() which is gated behind tauri's `wry` feature.
tauri-plugin-devtools = { version = "=2.0.0", default-features = false }
tauri-plugin-devtools = { version = "=2.0.0", default-features = false, optional = true }

[target.'cfg(target_os = "windows")'.dependencies]
enigo = "0.5.0"
Expand Down Expand Up @@ -135,6 +135,9 @@ wry = ["tauri/wry", "dep:webkit2gtk"]
updater = ["dep:tauri-plugin-updater"]
# CEF (Chromium) runtime. Build with --no-default-features --features cef.
cef = ["dep:tauri-runtime-cef", "dep:cef"]
# CrabNebula devtools. Off by default: its aggregator retains every metadata record for the
# session, which costs hundreds of MB per minute once tauri-plugin-log feeds it.
devtools = ["dep:tauri-plugin-devtools"]
[patch.crates-io]
tauri-typegen = { git = "https://github.com/SableClient/tauri-typegen", branch = "fix/nondeterministic-generation-cache" }

Expand Down
23 changes: 16 additions & 7 deletions src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,13 +415,22 @@ pub fn run() {

#[cfg(debug_assertions)]
{
let (log_plugin, _level, logger) = tauri_plugin_log::Builder::default()
.level(log::LevelFilter::Info)
.split(app.handle())?;
let mut devtools = tauri_plugin_devtools::Builder::default();
devtools.attach_logger(logger);
app.handle().plugin(devtools.init())?;
app.handle().plugin(log_plugin)?;
#[cfg(feature = "devtools")]
{
let (log_plugin, _level, logger) = tauri_plugin_log::Builder::default()
.level(log::LevelFilter::Info)
.split(app.handle())?;
let mut devtools = tauri_plugin_devtools::Builder::default();
devtools.attach_logger(logger);
app.handle().plugin(devtools.init())?;
app.handle().plugin(log_plugin)?;
}
#[cfg(not(feature = "devtools"))]
app.handle().plugin(
tauri_plugin_log::Builder::default()
.level(log::LevelFilter::Info)
.build(),
)?;
}

Ok(())
Expand Down
Loading