zellij-org · har7an · Mar 23, 2025 · Mar 19, 2025 · Mar 19, 2025 · Mar 20, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * refactor(terminal): track scroll_region as tuple rather than Option (https://github.com/zellij-org/zellij/pull/4082)
 * chore(deps): Use workspace dependencies (https://github.com/zellij-org/zellij/pull/4085)
 * build: Don't use default features (https://github.com/zellij-org/zellij/pull/4086)
+* build: Don't re-export foreign crates (https://github.com/zellij-org/zellij/pull/4087)
 
 ## [0.42.1] - 2025-03-21
 * fix(mouse): fix mouse handling in windows terminal (https://github.com/zellij-org/zellij/pull/4076)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,9 +17,15 @@ rust-version = "1.84"
 zellij-client = { path = "zellij-client/", version = "0.43.0" }
 zellij-server = { path = "zellij-server/", version = "0.43.0" }
 zellij-utils = { workspace = true }
+anyhow = { workspace = true }
+clap = { workspace = true }
 dialoguer = { version = "0.10.4", default-features = false }
+humantime = { version = "2.1.0", default-features = false }
+interprocess = { workspace = true }
 log = { workspace = true }
+miette = { workspace = true }
 names = { version = "0.14.0", default-features = false }
+nix = { workspace = true }
 suggest = { version = "0.4.0", default-features = false }
 thiserror = { workspace = true }
 
@@ -28,6 +34,7 @@ insta = { version = "1.6.0", features = ["backtrace"] }
 ssh2 = "0.9.1"
 rand = "0.8.0"
 regex = "1.8.1"
+vte = { workspace = true }
 
 [workspace]
 members = [
@@ -52,16 +59,30 @@ members = [
 [workspace.dependencies]
 ansi_term = { version = "0.12.1", default-features = false }
 anyhow = { version = "1.0.70", default-features = false, features = ["backtrace", "std"] }
+async-std = { version = "1.3.0", default-features = false, features = ["attributes", "default", "std", "unstable"] }
 clap = { version = "3.2.2", default-features = false, features = ["env", "derive", "color", "std", "suggestions"] }
+interprocess = { version = "1.2.1", default-features = false }
+isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }
+lazy_static = { version = "1.4.0", default-features = false }
+libc = { version = "0.2", default-features = false, features = ["std"] }
 log = { version = "0.4.17", default-features = false }
+miette = { version = "5.7.0", default-features = false, features = ["fancy"] }
+nix = { version = "0.23.1", default-features = false }
+notify-debouncer-full = { version = "0.1.0", default-features = false }
+prost = { version = "0.11.9", default-features = false, features = ["std", "prost-derive"] }
+regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }
 serde = { version = "1.0", default-features = false, features = ["derive", "std"] }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }
+signal-hook = { version = "0.3", default-features = false, features = ["iterator"] }
 strum = { version = "0.20.0", default-features = false }
 strum_macros = { version = "0.20.0", default-features = false }
+tempfile = { version = "3.2.0", default-features = false }
+termwiz = { version = "0.23.2", default-features = false }
 thiserror = { version = "1.0.40", default-features = false }
 unicode-width = { version = "0.1.8", default-features = false }
 url = { version = "2.2.2", default-features = false, features = ["serde"] }
 uuid = { version = "1.4.1", default-features = false, features = ["serde", "v4", "std"] }
+vte = { version = "0.11.0", default-features = false }
 zellij-utils = { path = "zellij-utils/", version = "0.43.0" }
 
 [profile.dev-opt]

diff --git a/src/commands.rs b/src/commands.rs
@@ -9,6 +9,8 @@ use crate::sessions::{
     print_sessions_with_index, resurrection_layout, session_exists, ActiveSession,
     SessionNameMatch,
 };
+use miette::{Report, Result};
+use nix;
 use zellij_client::{
     old_config_converter::{
         config_yaml_to_config_kdl, convert_old_yaml_files, layout_yaml_to_layout_kdl,
@@ -27,8 +29,6 @@ use zellij_utils::{
         layout::Layout,
         options::Options,
     },
-    miette::{Report, Result},
-    nix,
     setup::{find_default_config_dir, get_layout_dir, Setup},
 };
 

diff --git a/src/main.rs b/src/main.rs
@@ -3,8 +3,8 @@ mod sessions;
 #[cfg(test)]
 mod tests;
 
+use clap::Parser;
 use zellij_utils::{
-    clap::Parser,
     cli::{CliAction, CliArgs, Command, Sessions},
     consts::create_config_and_cache_folders,
     envs,

diff --git a/src/sessions.rs b/src/sessions.rs
@@ -1,18 +1,18 @@
+use anyhow;
+use humantime::format_duration;
+use interprocess::local_socket::LocalSocketStream;
 use std::collections::HashMap;
 use std::os::unix::fs::FileTypeExt;
 use std::time::{Duration, SystemTime};
 use std::{fs, io, process};
 use suggest::Suggest;
 use zellij_utils::{
-    anyhow,
     consts::{
         session_info_folder_for_session, session_layout_cache_file_name,
         ZELLIJ_SESSION_INFO_CACHE_DIR, ZELLIJ_SOCK_DIR,
     },
     envs,
-    humantime::format_duration,
     input::layout::Layout,
-    interprocess::local_socket::LocalSocketStream,
     ipc::{ClientToServerMsg, IpcReceiverWithContext, IpcSenderWithContext, ServerToClientMsg},
 };
 

diff --git a/src/tests/e2e/remote_runner.rs b/src/tests/e2e/remote_runner.rs
@@ -2,11 +2,11 @@ use std::collections::HashMap;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
 
+use vte;
 use zellij_server::panes::sixel::SixelImageStore;
 use zellij_server::panes::{LinkHandler, TerminalPane};
 use zellij_utils::data::{Palette, Style};
 use zellij_utils::pane_size::{Dimension, PaneGeom, Size, SizeInPixels};
-use zellij_utils::vte;
 
 use ssh2::Session;
 use std::io::prelude::*;

diff --git a/zellij-client/Cargo.toml b/zellij-client/Cargo.toml
@@ -9,12 +9,22 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = { workspace = true }
+interprocess = { workspace = true }
+lazy_static = { workspace = true }
+libc = { workspace = true }
 log = { workspace = true }
 mio = { version = "0.7.11", default-features = false, features = ['os-ext'] }
+nix = { workspace = true }
+notify-debouncer-full = { workspace = true }
+regex = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { version = "0.8", default-features = false }
+signal-hook = { workspace = true }
+termwiz = { workspace = true }
 url = { workspace = true }
+uuid = { workspace = true }
 zellij-utils = { workspace = true }
 
 [dev-dependencies]

diff --git a/zellij-client/src/cli_client.rs b/zellij-client/src/cli_client.rs
@@ -6,11 +6,11 @@ use std::process;
 use std::{fs, path::PathBuf};
 
 use crate::os_input_output::ClientOsApi;
+use uuid::Uuid;
 use zellij_utils::{
     errors::prelude::*,
     input::actions::Action,
     ipc::{ClientToServerMsg, ExitReason, ServerToClientMsg},
-    uuid::Uuid,
 };
 
 pub fn start_cli_client(

diff --git a/zellij-client/src/input_handler.rs b/zellij-client/src/input_handler.rs
@@ -3,6 +3,7 @@ use crate::{
     os_input_output::ClientOsApi, stdin_ansi_parser::AnsiStdinInstruction, ClientId,
     ClientInstruction, CommandIsExecuting, InputInstruction,
 };
+use termwiz::input::{InputEvent, Modifiers, MouseButtons, MouseEvent as TermwizMouseEvent};
 use zellij_utils::{
     channels::{Receiver, SenderWithContext, OPENCALLS},
     data::{InputMode, KeyWithModifier},
@@ -16,7 +17,6 @@ use zellij_utils::{
     },
     ipc::{ClientToServerMsg, ExitReason},
     position::Position,
-    termwiz::input::{InputEvent, Modifiers, MouseButtons, MouseEvent as TermwizMouseEvent},
 };
 
 /// Handles the dispatching of [`Action`]s according to the current

diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs
@@ -17,14 +17,15 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use zellij_utils::errors::FatalError;
 
-use zellij_utils::notify_debouncer_full::notify::{self, Event, RecursiveMode, Watcher};
+use notify_debouncer_full::notify::{self, Event, RecursiveMode, Watcher};
 use zellij_utils::setup::Setup;
 
 use crate::stdin_ansi_parser::{AnsiStdinInstruction, StdinAnsiParser, SyncOutput};
 use crate::{
     command_is_executing::CommandIsExecuting, input_handler::input_loop,
     os_input_output::ClientOsApi, stdin_handler::stdin_loop,
 };
+use termwiz::input::InputEvent;
 use zellij_utils::{
     channels::{self, ChannelWithContext, SenderWithContext},
     consts::{set_permissions, ZELLIJ_SOCK_DIR},
@@ -34,7 +35,6 @@ use zellij_utils::{
     input::{config::Config, options::Options},
     ipc::{ClientAttributes, ClientToServerMsg, ExitReason, ServerToClientMsg},
     pane_size::Size,
-    termwiz::input::InputEvent,
 };
 use zellij_utils::{cli::CliArgs, input::layout::Layout};
 

diff --git a/zellij-client/src/os_input_output.rs b/zellij-client/src/os_input_output.rs
@@ -1,6 +1,9 @@
-use zellij_utils::anyhow::{Context, Result};
+use anyhow::{Context, Result};
+use interprocess;
+use libc;
+use nix;
+use signal_hook;
 use zellij_utils::pane_size::Size;
-use zellij_utils::{interprocess, libc, nix, signal_hook};
 
 use interprocess::local_socket::LocalSocketStream;
 use mio::{unix::SourceFd, Events, Interest, Poll, Token};

diff --git a/zellij-client/src/stdin_ansi_parser.rs b/zellij-client/src/stdin_ansi_parser.rs
@@ -1,15 +1,16 @@
 use std::time::{Duration, Instant};
 
 const STARTUP_PARSE_DEADLINE_MS: u64 = 500;
+use lazy_static::lazy_static;
+use regex::Regex;
 use zellij_utils::{
-    consts::ZELLIJ_STDIN_CACHE_FILE, ipc::PixelDimensions, lazy_static::lazy_static,
-    pane_size::SizeInPixels, regex::Regex,
+    consts::ZELLIJ_STDIN_CACHE_FILE, ipc::PixelDimensions, pane_size::SizeInPixels,
 };
 
+use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::fs::{File, OpenOptions};
 use std::io::{Read, Write};
-use zellij_utils::anyhow::Result;
 
 /// Describe the terminal implementation of synchronised output
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]

diff --git a/zellij-client/src/stdin_handler.rs b/zellij-client/src/stdin_handler.rs
@@ -3,8 +3,8 @@ use crate::os_input_output::ClientOsApi;
 use crate::stdin_ansi_parser::StdinAnsiParser;
 use crate::InputInstruction;
 use std::sync::{Arc, Mutex};
+use termwiz::input::{InputEvent, InputParser, MouseButtons};
 use zellij_utils::channels::SenderWithContext;
-use zellij_utils::termwiz::input::{InputEvent, InputParser, MouseButtons};
 
 fn send_done_parsing_after_query_timeout(
     send_input_instructions: SenderWithContext<InputInstruction>,