mirror of
https://github.com/zellij-org/zellij.git
synced 2024-11-23 08:57:14 +03:00
c26a6bcf56
* zellij-tile: Move `data` to zellij-utils The rationale behind this is that all components of zellij access the data structures defined in this module, as they define some of the most basic types in the application. However, so far zellij-tile is treated like a separate crate from the rest of the program in that it is the only one that doesn't have access to `zellij-utils`, which contains a lot of other data structures used throughout zellij. This poses issues as discussed in https://github.com/zellij-org/zellij/pull/1242 and is one of the reasons why the keybindings in the status bar default plugin can't be updated dynamically. It is also the main reason for why the keybindings are currently passed to the plugin as strings: The plugins only have access to `zellij-tile`, but since this is a dependency of `zellij-utils`, it can't import `zellij-utils` to access the keybindings. Other weird side-effect are that in some places `server` and `client` have to access the `zellij-tile` contents "through" `zellij-utils`, as in `use zellij_utils::zellij_tile::prelude::*`. By moving these central data structures to one common shared crate (`zellij-utils`), `zellij-tile` will be enabled to import `zellij-utils` like `screen` and `client` already do. This will, next to other things, allow dropping a lot of `std::fmt::Fmt` impls needed to convert core data structures into strings and as a consequence, a lot of string parsing in the first place. * utils: Integrate new `data` module, bump rust ver Integrates the `data` module that was previously part of `zellij-tile` to allow sharing the contained data structures between all components of zellij. This allows `zellij-tile` to use `utils` as a dependency. However, since `tile` is build against the wasm target, it cannot include all of `zellij-utils`, since a lot of dependencies there cannot compile with `wasm` as target (Examples include: termwiz, log4rs, async-std). Thus we make all the dependencies that cannot compile against `wasm` optional and introduce a new feature `full` that will compile the crate with all dependencies. Along with this, modify `lib.rs` to include most of the data structures only when compiling against the `full` feature. This makes the compiles of `zellij-tile` lighter, as it doesn't include all of `utils`. As a side effect, due to the dependency notation for the optional dependencies (See https://doc.rust-lang.org/cargo/reference/features.html#optional-dependencies), we bump the rust toolchain version to 1.60.0. * tile: Import `data` from zellij-utils Add `zellij-utils` as a dependency to `zellij-tile` and allow us access to the `data` module defined there. Update the re-export in the `prelude` such that from all of the plugins points of view *absolutely nothing changes*. * utils: Fix `data` module dependency Since the `data` module has been migrated from `zellij-tile` to `zellij-utils`, we import it from `zellij-utils` directly now. Also unify the imports for the `data` module members: We import all of the through `data::` now, not through a mixture of `data::` and `prelude::`. * client: Fix `data` module dependency Since the `data` module has been migrated from `zellij-tile` to `zellij-utils`, we import it from `zellij-utils` directly now. Also unify the imports for the `data` module members: We import all of the through `data::` now, not through a mixture of `data::` and `prelude::`. Add the "full" feature flag to the `zellij-utils` dependency so it includes all the components we need. * server: Fix `data` module dependency Since the `data` module has been migrated from `zellij-tile` to `zellij-utils`, we import it from `zellij-utils` directly now. Also unify the imports for the `data` module members: We import all of the through `data::` now, not through a mixture of `data::` and `prelude::`. Add the "full" feature flag to the `zellij-utils` dependency so it includes all the components we need. * tests: Fix `data` module dependency Since the `data` module has been migrated from `zellij-tile` to `zellij-utils`, we import it from `zellij-utils` directly now. * utils: Remove "full" feature in favor of conditional compilation using `target_family`. Replace the rust 1.60 method of specifying optional dependencies based on features and optionally include the dependencies only when not building for wasm instead. (I.e. `cfg(not(target_family = "wasm"))`) * cargo: Update module dependencies since `client`, `server` and `tile` now all depend on `utils` only.
53 lines
1.3 KiB
TOML
53 lines
1.3 KiB
TOML
[package]
|
|
name = "zellij-utils"
|
|
version = "0.31.0"
|
|
authors = ["Kunal Mohan <kunalmohan99@gmail.com>"]
|
|
edition = "2021"
|
|
description = "A utility library for Zellij client and server"
|
|
license = "MIT"
|
|
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
|
|
[dependencies]
|
|
anyhow = "1.0.45"
|
|
backtrace = "0.3.55"
|
|
bincode = "1.3.1"
|
|
clap = { version = "3.2.2", features = ["derive", "env"] }
|
|
clap_complete = "3.2.1"
|
|
colored = "2.0.0"
|
|
colorsys = "0.6.5"
|
|
crossbeam = "0.8.1"
|
|
directories-next = "2.0"
|
|
lazy_static = "1.4.0"
|
|
libc = "0.2"
|
|
nix = "0.23.1"
|
|
once_cell = "1.8.0"
|
|
serde = { version = "1.0", features = ["derive"] }
|
|
serde_yaml = "0.8"
|
|
serde_json = "1.0"
|
|
strip-ansi-escapes = "0.1.0"
|
|
strum = "0.20.0"
|
|
strum_macros = "0.20.1"
|
|
thiserror = "1.0.30"
|
|
url = { version = "2.2.2", features = ["serde"] }
|
|
vte = "0.10.1"
|
|
log = "0.4.17"
|
|
unicode-width = "0.1.8"
|
|
miette = { version = "3.3.0", features = ["fancy"] }
|
|
regex = "1.5.5"
|
|
tempfile = "3.2.0"
|
|
|
|
#[cfg(not(target_family = "wasm"))]
|
|
[target.'cfg(not(target_family = "wasm"))'.dependencies]
|
|
termwiz = "0.16.0"
|
|
log4rs = "1.0.0"
|
|
signal-hook = "0.3"
|
|
interprocess = "1.1.1"
|
|
async-std = { version = "1.3.0", features = ["unstable"] }
|
|
|
|
[dev-dependencies]
|
|
|
|
[features]
|
|
disable_automatic_asset_installation = []
|
|
unstable = []
|