diff --git a/.cargo/config.toml b/.cargo/config.toml index 6b77899..6b509f5 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [build] -target = "wasm32-wasi" +target = "wasm32-wasip1" diff --git a/.github/README.md b/.github/README.md index 2c1484c..bb00a35 100644 --- a/.github/README.md +++ b/.github/README.md @@ -10,6 +10,13 @@ Custom compact bar plugin for [Zellij](https://zellij.dev/) based on {session directory}-{session name} {mode in 1 letter} {...tabs} +## Installation + +To build it just run `make` and you'll find the binary in +`target/wasm32-wasip1/release/zellij-cb.wasm`. To load it into Zellij please +refer to their +[plugin loading documentation](https://zellij.dev/documentation/plugin-loading). + ## Features - Displays session directory name diff --git a/Cargo.lock b/Cargo.lock index 2bf8336..fc31e0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -284,12 +284,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - [[package]] name = "atomic-waker" version = "1.1.2" @@ -355,21 +349,6 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -455,12 +434,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "chrono" version = "0.4.31" @@ -702,7 +675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" dependencies = [ "lab", - "phf", + "phf 0.11.2", ] [[package]] @@ -865,15 +838,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "euclid" -version = "0.22.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" -dependencies = [ - "num-traits", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -891,16 +855,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - [[package]] name = "fastrand" version = "1.9.0" @@ -1504,7 +1458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47" dependencies = [ "miette", - "nom", + "nom 7.1.3", "thiserror", ] @@ -1647,16 +1601,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "mac_address" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8836fae9d0d4be2c8b4efcdd79e828a2faa058a90d005abf42f91cac5493a08e" -dependencies = [ - "nix 0.28.0", - "winapi", -] - [[package]] name = "memchr" version = "2.6.4" @@ -1678,15 +1622,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -1792,28 +1727,24 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", + "memoffset 0.6.5", ] [[package]] -name = "nix" -version = "0.28.0" +name = "nom" +version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset 0.9.0", + "memchr", + "version_check", ] [[package]] @@ -1951,15 +1882,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "ordered-float" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" -dependencies = [ - "num-traits", -] - [[package]] name = "os_str_bytes" version = "6.6.1" @@ -2068,6 +1990,15 @@ dependencies = [ "indexmap 2.0.2", ] +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + [[package]] name = "phf" version = "0.11.2" @@ -2075,7 +2006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -2085,7 +2016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -2094,7 +2025,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared", + "phf_shared 0.11.2", "rand 0.8.5", ] @@ -2105,12 +2036,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", "proc-macro2", "quote", "syn 2.0.38", ] +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + [[package]] name = "phf_shared" version = "0.11.2" @@ -2718,6 +2658,16 @@ dependencies = [ "dirs 5.0.1", ] +[[package]] +name = "signal-hook" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook" version = "0.3.17" @@ -3005,14 +2955,14 @@ dependencies = [ [[package]] name = "terminfo" -version = "0.8.0" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" +checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" dependencies = [ "dirs 4.0.0", "fnv", - "nom", - "phf", + "nom 5.1.3", + "phf 0.11.2", "phf_codegen", ] @@ -3027,14 +2977,13 @@ dependencies = [ [[package]] name = "termwiz" -version = "0.22.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a75313e21da5d4406ea31402035b3b97aa74c04356bdfafa5d1043ab4e551d1" +checksum = "9509a978a10fcbace4991deae486ae10885e0f4c2c465123e08c9714a90648fa" dependencies = [ "anyhow", "base64 0.21.4", - "bitflags 2.6.0", - "fancy-regex", + "bitflags 1.3.2", "filedescriptor", "finl_unicode", "fixedbitset", @@ -3043,18 +2992,18 @@ dependencies = [ "libc", "log", "memmem", - "nix 0.26.4", + "nix 0.24.3", "num-derive", "num-traits", - "ordered-float 4.2.1", + "ordered-float 3.9.2", "pest", "pest_derive", - "phf", + "phf 0.10.1", + "regex", "semver 0.11.0", - "sha2 0.10.8", - "signal-hook", + "sha2 0.9.9", + "signal-hook 0.1.17", "siphasher", - "tempfile", "terminfo", "termios", "thiserror", @@ -3062,10 +3011,8 @@ dependencies = [ "unicode-segmentation", "vtparse", "wezterm-bidi", - "wezterm-blob-leases", "wezterm-color-types", - "wezterm-dynamic 0.2.0", - "wezterm-input-types", + "wezterm-dynamic", "winapi", ] @@ -3329,7 +3276,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "atomic", "getrandom 0.2.10", "serde", ] @@ -3503,33 +3449,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1560382cf39b0fa92473eae4d5b3772f88c63202cbf5a72c35db72ba99e66c36" dependencies = [ "log", - "wezterm-dynamic 0.1.0", -] - -[[package]] -name = "wezterm-blob-leases" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5a5e0adf7eed68976410def849a4bdab6f6e9f6163f152de9cb89deea9e60b" -dependencies = [ - "getrandom 0.2.10", - "mac_address", - "once_cell", - "sha2 0.10.8", - "thiserror", - "uuid", + "wezterm-dynamic", ] [[package]] name = "wezterm-color-types" -version = "0.3.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de81ef35c9010270d63772bebef2f2d6d1f2d20a983d27505ac850b8c4b4296" +checksum = "4c6e7a483dd2785ba72705c51e8b1be18300302db2a78368dac9bc8773857777" dependencies = [ "csscolorparser", "deltae", "lazy_static", - "wezterm-dynamic 0.2.0", + "wezterm-dynamic", ] [[package]] @@ -3545,19 +3477,6 @@ dependencies = [ "wezterm-dynamic-derive", ] -[[package]] -name = "wezterm-dynamic" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb128bacfa86734e07681fb6068e34c144698e84ee022d6e009145d1abb77b5" -dependencies = [ - "log", - "ordered-float 4.2.1", - "strsim", - "thiserror", - "wezterm-dynamic-derive", -] - [[package]] name = "wezterm-dynamic-derive" version = "0.1.0" @@ -3569,18 +3488,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "wezterm-input-types" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7012add459f951456ec9d6c7e6fc340b1ce15d6fc9629f8c42853412c029e57e" -dependencies = [ - "bitflags 1.3.2", - "euclid", - "lazy_static", - "wezterm-dynamic 0.2.0", -] - [[package]] name = "which" version = "4.4.2" @@ -3721,7 +3628,9 @@ dependencies = [ [[package]] name = "zellij-tile" -version = "0.41.0" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43cd7459277f12a843b3edba8ed44e32ee8f79a76cc26f165d65c09f1441377b" dependencies = [ "clap", "serde", @@ -3733,20 +3642,23 @@ dependencies = [ [[package]] name = "zellij-tile-utils" -version = "0.41.0" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8690f96da6dd4e39bc546fc7d31856d2d54e0352cb136449bd2bb37ee4c85408" dependencies = [ "ansi_term", ] [[package]] name = "zellij-utils" -version = "0.41.0" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "019bf9a4795c67b97da79851f59f3f3970255d1f3e7a6dff4e1033366ca27009" dependencies = [ "anyhow", "async-channel", "async-std", "backtrace", - "bitflags 2.6.0", "clap", "clap_complete", "colored", @@ -3776,7 +3688,7 @@ dependencies = [ "serde", "serde_json", "shellexpand", - "signal-hook", + "signal-hook 0.3.17", "strip-ansi-escapes", "strum", "strum_macros", diff --git a/Cargo.toml b/Cargo.toml index 97b40b2..32cf00d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,5 +9,5 @@ license = "MIT" colored = "2" ansi_term = "0.12" unicode-width = "0.1.8" -zellij-tile = { path = "../zellij/zellij-tile" } -zellij-tile-utils = { path = "../zellij/zellij-tile-utils" } +zellij-tile = "0.40.1" +zellij-tile-utils = "0.40.1" diff --git a/Makefile b/Makefile index be682b5..f60a8f6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,9 @@ CC=cargo b -default: wasm32-wasi +default: release -wasm32-wasi: FORCE - $(CC) --release \ - --target wasm32-wasi +release: FORCE + $(CC) --release clean: FORCE -rm -r target