25 files changed, 34 insertions, 44 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e55d9c438..c668594a2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,19 +84,19 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
+checksum = "fcb9af4888a70ad78ecb5efcb0ba95d66a3cf54a88b62ae81559954c7588c7a2"
 dependencies = [
  "concurrent-queue",
  "fastrand",
  "futures-lite",
  "libc",
  "log",
- "nb-connect",
  "once_cell",
  "parking",
  "polling",
+ "socket2",
  "vec-arena",
  "waker-fn",
  "winapi",
@@ -104,9 +104,9 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb"
+checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
 dependencies = [
  "event-listener",
 ]
@@ -1026,16 +1026,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
 
 [[package]]
-name = "nb-connect"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19900e7eee95eb2b3c2e26d12a874cc80aaf750e31be6fcbe743ead369fa45d"
-dependencies = [
- "libc",
- "socket2",
-]
-
-[[package]]
 name = "nix"
 version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1272,9 +1262,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
+checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041"
 dependencies = [
  "bitflags",
 ]
@@ -2227,7 +2217,7 @@ dependencies = [
 
 [[package]]
 name = "zellij-tile"
-version = "0.6.0"
+version = "1.0.0"
 dependencies = [
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 30c727b29..e6d5dfbb1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ lazy_static = "1.4.0"
 wasmer = "1.0.0"
 wasmer-wasi = "1.0.0"
 interprocess = "1.0.1"
-zellij-tile = { path = "zellij-tile/", version = "0.6.0" }
+zellij-tile = { path = "zellij-tile/", version = "1.0.0" }
 
 [dependencies.async-std]
 version = "1.3.0"
@@ -49,9 +49,9 @@ structopt = "0.3"
 [workspace]
 members = [
     "zellij-tile",
-    "default-tiles/status-bar",
-    "default-tiles/strider",
-    "default-tiles/tab-bar",
+    "default-plugins/status-bar",
+    "default-plugins/strider",
+    "default-plugins/tab-bar",
     ".",
 ]
 
diff --git a/Makefile.toml b/Makefile.toml
index 68767eaf2..83cdcb854 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -64,7 +64,7 @@ args = ["clippy", "--", "@@split(CARGO_MAKE_TASK_ARGS,;)"]
 # Release building and installing Zellij
 [tasks.install]
 workspace = false
-dependencies = ["build-tiles-release", "wasm-opt-tiles", "build-release"]
+dependencies = ["build-plugins-release", "wasm-opt-plugins", "build-release"]
 script_runner = "@duckscript"
 script = '''
 if is_dir ${CARGO_MAKE_TASK_ARGS}
@@ -74,20 +74,20 @@ else
 end
 '''
 
-[tasks.build-tiles-release]
+[tasks.build-plugins-release]
 env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = ["."] }
 run_task = { name = "build-release", fork = true }
 
-[tasks.wasm-opt-tiles]
+[tasks.wasm-opt-plugins]
 script_runner = "@duckscript"
 script = '''
-tiles = glob_array ${CARGO_TARGET_DIR}/wasm32-wasi/release/*.wasm
+plugins = glob_array ${CARGO_TARGET_DIR}/wasm32-wasi/release/*.wasm
 
-for tile in ${tiles}
-    tile_name = basename ${tile}
-    tile_out = set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/assets/plugins/${tile_name}
-    if is_path_newer ${tile} ${tile_out}
-        exec wasm-opt -O ${tile} -o ${tile_out}
+for plugin in ${plugins}
+    plugin_name = basename ${plugin}
+    plugin_out = set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/assets/plugins/${plugin_name}
+    if is_path_newer ${plugin} ${plugin_out}
+        exec wasm-opt -O ${plugin} -o ${plugin_out}
     end
 end
 '''
@@ -95,7 +95,7 @@ end
 # CI Releasing Zellij
 [tasks.ci-build-release]
 workspace = false
-dependencies = ["build-tiles-release", "wasm-opt-tiles", "build-release"]
+dependencies = ["build-plugins-release", "wasm-opt-plugins", "build-release"]
 command = "cargo"
 args = ["build", "--verbose", "--release", "--target", "${CARGO_MAKE_TASK_ARGS}"]
 
@@ -103,7 +103,7 @@ args = ["build", "--verbose", "--release", "--target", "${CARGO_MAKE_TASK_ARGS}"
 [tasks.publish]
 clear = true
 workspace = false
-dependencies = ["build-tiles-release", "wasm-opt-tiles", "build-release", "publish-zellij-tile"]
+dependencies = ["build-plugins-release", "wasm-opt-plugins", "build-release", "publish-zellij-tile"]
 run_task = "publish-zellij"
 
 [tasks.publish-zellij-tile]
diff --git a/assets/plugins/status-bar.wasm b/assets/plugins/status-bar.wasm
index b9a66a7bb..b63fff93d 100644
--- a/assets/plugins/status-bar.wasm
+++ b/assets/plugins/status-bar.wasm
diff --git a/assets/plugins/strider.wasm b/assets/plugins/strider.wasm
index 768bbbd94..383907fcb 100644
--- a/assets/plugins/strider.wasm
+++ b/assets/plugins/strider.wasm
diff --git a/assets/plugins/tab-bar.wasm b/assets/plugins/tab-bar.wasm
index 49a79bb0f..ebe1bce84 100644
--- a/assets/plugins/tab-bar.wasm
+++ b/assets/plugins/tab-bar.wasm
diff --git a/default-tiles/status-bar/.cargo/config.toml b/default-plugins/status-bar/.cargo/config.toml
index bc255e30b..bc255e30b 100644
--- a/default-tiles/status-bar/.cargo/config.toml
+++ b/default-plugins/status-bar/.cargo/config.toml
diff --git a/default-tiles/status-bar/Cargo.toml b/default-plugins/status-bar/Cargo.toml
index c94d8feb8..c94d8feb8 100644
--- a/default-tiles/status-bar/Cargo.toml
+++ b/default-plugins/status-bar/Cargo.toml
diff --git a/default-tiles/status-bar/LICENSE.md b/default-plugins/status-bar/LICENSE.md
index f0608a63a..f0608a63a 120000
--- a/default-tiles/status-bar/LICENSE.md
+++ b/default-plugins/status-bar/LICENSE.md
diff --git a/default-tiles/status-bar/src/first_line.rs b/default-plugins/status-bar/src/first_line.rs
index ea48cb1b8..ea48cb1b8 100644
--- a/default-tiles/status-bar/src/first_line.rs
+++ b/default-plugins/status-bar/src/first_line.rs
diff --git a/default-tiles/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index ee4d17635..5529eb318 100644
--- a/default-tiles/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -27,7 +27,7 @@ struct State {
     mode_info: ModeInfo,
 }
 
-register_tile!(State);
+register_plugin!(State);
 
 #[derive(Default)]
 pub struct LinePart {
@@ -41,7 +41,7 @@ impl Display for LinePart {
     }
 }
 
-impl ZellijTile for State {
+impl ZellijPlugin for State {
     fn load(&mut self) {
         set_selectable(false);
         set_invisible_borders(true);
diff --git a/default-tiles/status-bar/src/second_line.rs b/default-plugins/status-bar/src/second_line.rs
index 1046314e2..1046314e2 100644
--- a/default-tiles/status-bar/src/second_line.rs
+++ b/default-plugins/status-bar/src/second_line.rs
diff --git a/default-tiles/strider/.cargo/config.toml b/default-plugins/strider/.cargo/config.toml
index bc255e30b..bc255e30b 100644
--- a/default-tiles/strider/.cargo/config.toml
+++ b/default-plugins/strider/.cargo/config.toml
diff --git a/default-tiles/strider/Cargo.toml b/default-plugins/strider/Cargo.toml
index 41e16a551..d10598512 100644
--- a/default-tiles/strider/Cargo.toml
+++ b/default-plugins/strider/Cargo.toml
@@ -3,7 +3,7 @@ name = "strider"
 version = "0.2.0"
 authors = ["Brooks J Rady <b.j.rady@gmail.com>"]
 edition = "2018"
-description = "A simplified ranger clone written as a Zellij tile"
+description = "A simplified ranger clone written as a Zellij plugin"
 license = "MIT"
 
 [dependencies]
diff --git a/default-tiles/strider/LICENSE.md b/default-plugins/strider/LICENSE.md
index f0608a63a..f0608a63a 120000
--- a/default-tiles/strider/LICENSE.md
+++ b/default-plugins/strider/LICENSE.md
diff --git a/default-tiles/strider/src/main.rs b/default-plugins/strider/src/main.rs
index 71e2e5b74..8edc1e197 100644
--- a/default-tiles/strider/src/main.rs
+++ b/default-plugins/strider/src/main.rs
@@ -5,9 +5,9 @@ use state::{FsEntry, State};
 use std::{cmp::min, fs::read_dir};
 use zellij_tile::prelude::*;
 
-register_tile!(State);
+register_plugin!(State);
 
-impl ZellijTile for State {
+impl ZellijPlugin for State {
     fn load(&mut self) {
         refresh_directory(self);
         subscribe(&[EventType::KeyPress]);
diff --git a/default-tiles/strider/src/state.rs b/default-plugins/strider/src/state.rs
index 0d96ae0b9..0d96ae0b9 100644
--- a/default-tiles/strider/src/state.rs
+++ b/default-plugins/strider/src/state.rs
diff --git a/default-tiles/tab-bar/.cargo/config.toml b/default-plugins/tab-bar/.cargo/config.toml
index 6b77899cb..6b77899cb 100644
--- a/default-tiles/tab-bar/.cargo/config.toml
+++ b/default-plugins/tab-bar/.cargo/config.toml
diff --git a/default-tiles/tab-bar/Cargo.toml b/default-plugins/tab-bar/Cargo.toml
index 59b95b4bf..59b95b4bf 100644
--- a/default-tiles/tab-bar/Cargo.toml
+++ b/default-plugins/tab-bar/Cargo.toml
diff --git a/default-tiles/tab-bar/LICENSE.md b/default-plugins/tab-bar/LICENSE.md
index f0608a63a..f0608a63a 120000
--- a/default-tiles/tab-bar/LICENSE.md
+++ b/default-plugins/tab-bar/LICENSE.md
diff --git a/default-tiles/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs
index 1d1c33ecd..1d1c33ecd 100644
--- a/default-tiles/tab-bar/src/line.rs
+++ b/default-plugins/tab-bar/src/line.rs
diff --git a/default-tiles/tab-bar/src/main.rs b/default-plugins/tab-bar/src/main.rs
index 4a1f2933b..5a77ebaca 100644
--- a/default-tiles/tab-bar/src/main.rs
+++ b/default-plugins/tab-bar/src/main.rs
@@ -31,9 +31,9 @@ pub mod colors {
     pub const RED: Colour = Fixed(88);
 }
 
-register_tile!(State);
+register_plugin!(State);
 
-impl ZellijTile for State {
+impl ZellijPlugin for State {
     fn load(&mut self) {
         set_selectable(false);
         set_invisible_borders(true);
diff --git a/default-tiles/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index a4c7c3762..a4c7c3762 100644
--- a/default-tiles/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
diff --git a/zellij-tile/Cargo.toml b/zellij-tile/Cargo.toml
index c91568338..5a299cb1e 100644
--- a/zellij-tile/Cargo.toml
+++ b/zellij-tile/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "zellij-tile"
-version = "0.6.0"
+version = "1.0.0"
 authors = ["Brooks J Rady <b.j.rady@gmail.com>"]
 edition = "2018"
-description = "A small client-side library for writing Zellij plugins (tiles)"
+description = "A small client-side library for writing Zellij plugins"
 license = "MIT"
 
 [dependencies]
diff --git a/zellij-tile/src/lib.rs b/zellij-tile/src/lib.rs
index 72211764b..af7d8ca12 100644
--- a/zellij-tile/src/lib.rs
+++ b/zellij-tile/src/lib.rs
@@ -5,14 +5,14 @@ pub mod shim;
 use data::*;
 
 #[allow(unused_variables)]
-pub trait ZellijTile {
+pub trait ZellijPlugin {
     fn load(&mut self) {}
     fn update(&mut self, event: Event) {}
     fn render(&mut self, rows: usize, cols: usize) {}
 }
 
 #[macro_export]
-macro_rules! register_tile {
+macro_rules! register_plugin {
     ($t:ty) => {
         thread_local! {
             static STATE: std::cell::RefCell<$t> = std::cell::RefCell::new(Default::default());