shuttle-hq · chesedo · Oct 26, 2022 · Oct 26, 2022 · Oct 26, 2022 · Oct 26, 2022
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,9 +13,9 @@ members = [
 exclude = [
   "e2e",
   "examples",
-  "plugins",
   "resources/aws-rds",
   "resources/persist",
   "resources/secrets",
-  "resources/shared-db"
+  "resources/shared-db",
+  "runtimes"
 ]
diff --git a/plugins/Cargo.toml b/plugins/Cargo.toml
diff --git a/plugins/serenity/Makefile b/plugins/serenity/Makefile
diff --git a/runtimes/Cargo.toml b/runtimes/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+members = [
+  "legacy",
+  "next",
+  "wasm"
+]
diff --git a/runtimes/Makefile b/runtimes/Makefile
@@ -0,0 +1,16 @@
+.PHONY: wasm next
+
+all: wasm next
+
+wasm:
+	cd wasm; cargo build --target wasm32-wasi
+	cp target/wasm32-wasi/debug/shuttle_serenity.wasm next/bot.wasm
+
+test: wasm
+	cd next; cargo test -- --nocapture
+
+next:
+	cd next; cargo build
+
+legacy:
+	cd legacy; cargo build
diff --git a/next/Cargo.toml → runtimes/legacy/Cargo.toml b/next/Cargo.toml → runtimes/legacy/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "shuttle-next"
+name = "shuttle-legacy"
 version = "0.1.0"
 edition = "2021"
 publish = false

diff --git a/next/README.md → runtimes/legacy/README.md b/next/README.md → runtimes/legacy/README.md
@@ -1,4 +1,4 @@
-## shuttle-next runtime-wrapper
+## shuttle-legacy
 
 Load and run an .so library that implements `shuttle_service::Service`. 
 

diff --git a/next/src/args.rs → runtimes/legacy/src/args.rs b/next/src/args.rs → runtimes/legacy/src/args.rs
diff --git a/next/src/error.rs → runtimes/legacy/src/error.rs b/next/src/error.rs → runtimes/legacy/src/error.rs
diff --git a/next/src/lib.rs → runtimes/legacy/src/lib.rs b/next/src/lib.rs → runtimes/legacy/src/lib.rs
diff --git a/next/src/main.rs → runtimes/legacy/src/main.rs b/next/src/main.rs → runtimes/legacy/src/main.rs
diff --git a/plugins/serenity/runtime/Cargo.toml → runtimes/next/Cargo.toml b/plugins/serenity/runtime/Cargo.toml → runtimes/next/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "shuttle-runtime"
+name = "shuttle-next"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/plugins/serenity/runtime/README.md → runtimes/next/README.md b/plugins/serenity/runtime/README.md → runtimes/next/README.md
@@ -1,4 +1,4 @@
-# `shuttle-runtime`
+# `shuttle-next`
 
 ## How to run
 

diff --git a/plugins/serenity/runtime/src/lib.rs → runtimes/next/src/lib.rs b/plugins/serenity/runtime/src/lib.rs → runtimes/next/src/lib.rs
diff --git a/plugins/serenity/runtime/src/main.rs → runtimes/next/src/main.rs b/plugins/serenity/runtime/src/main.rs → runtimes/next/src/main.rs
diff --git a/plugins/serenity/wasm/Cargo.toml → runtimes/wasm/Cargo.toml b/plugins/serenity/wasm/Cargo.toml → runtimes/wasm/Cargo.toml
diff --git a/plugins/serenity/wasm/src/lib.rs → runtimes/wasm/src/lib.rs b/plugins/serenity/wasm/src/lib.rs → runtimes/wasm/src/lib.rs