starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-28 11:47:01 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

cli: use workspace plugins dir in dev mode

Browse Source
This commit is contained in:
Gregory Schier
2026-02-26 08:22:44 -08:00
parent ffc80d234c
commit 68d68035a1
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates-cli/yaak-cli/src/context.rs
View File

@@ -38,12 +38,21 @@ impl CliContext {
let encryption_manager = Arc::new(EncryptionManager::new(query_manager.clone(), app_id)); let encryption_manager = Arc::new(EncryptionManager::new(query_manager.clone(), app_id));
let plugin_manager = if with_plugins { let plugin_manager = if with_plugins {
let vendored_plugin_dir = data_dir.join("vendored-plugins"); let dev_mode = cfg!(debug_assertions);
let embedded_vendored_plugin_dir = data_dir.join("vendored-plugins");
let vendored_plugin_dir = if dev_mode {
resolve_workspace_plugins_dir()
.unwrap_or_else(|| embedded_vendored_plugin_dir.clone())
} else {
embedded_vendored_plugin_dir.clone()
};
let installed_plugin_dir = data_dir.join("installed-plugins"); let installed_plugin_dir = data_dir.join("installed-plugins");
let node_bin_path = PathBuf::from("node"); let node_bin_path = PathBuf::from("node");
prepare_embedded_vendored_plugins(&vendored_plugin_dir) if vendored_plugin_dir == embedded_vendored_plugin_dir {
.expect("Failed to prepare bundled plugins"); prepare_embedded_vendored_plugins(&vendored_plugin_dir)
.expect("Failed to prepare bundled plugins");
}
let plugin_runtime_main = let plugin_runtime_main =
std::env::var("YAAK_PLUGIN_RUNTIME").map(PathBuf::from).unwrap_or_else(|_| { std::env::var("YAAK_PLUGIN_RUNTIME").map(PathBuf::from).unwrap_or_else(|_| {
@@ -58,7 +67,7 @@ impl CliContext {
plugin_runtime_main, plugin_runtime_main,
&query_manager, &query_manager,
&PluginContext::new_empty(), &PluginContext::new_empty(),
false, dev_mode,
) )
.await .await
{ {
@@ -131,3 +140,11 @@ fn prepare_embedded_vendored_plugins(vendored_plugin_dir: &Path) -> std::io::Res
EMBEDDED_VENDORED_PLUGINS.extract(vendored_plugin_dir)?; EMBEDDED_VENDORED_PLUGINS.extract(vendored_plugin_dir)?;
Ok(()) Ok(())
} }
fn resolve_workspace_plugins_dir() -> Option<PathBuf> {
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("../..")
.join("plugins")
.canonicalize()
.ok()
}