From bb8fc1c16212d57a2e3eeca9e63b92d335640a0d Mon Sep 17 00:00:00 2001
From: Charles Taylor <charlestaylor95@gmail.com>
Date: Fri, 3 May 2024 14:30:45 -0400
Subject: [PATCH] Merge wasm directory into root

---
 .gitignore                        | 2 ++
 wasm/Cargo.lock => Cargo.lock     | 0
 wasm/Cargo.toml => Cargo.toml     | 0
 index.html                        | 2 +-
 mprocs.yaml                       | 3 ---
 wasm/rustfmt.toml => rustfmt.toml | 0
 {wasm/src => src}/lib.rs          | 6 +++---
 {wasm/src => src}/permutation.rs  | 0
 {wasm/src => src}/puzzle.rs       | 0
 {wasm/src => src}/webgl.rs        | 0
 {src => ts}/center-cuts/index.ts  | 0
 {src => ts}/main.ts               | 0
 {src => ts}/utils.ts              | 0
 {src => ts}/vite-env.d.ts         | 0
 wasm/.gitignore                   | 2 --
 15 files changed, 6 insertions(+), 9 deletions(-)
 rename wasm/Cargo.lock => Cargo.lock (100%)
 rename wasm/Cargo.toml => Cargo.toml (100%)
 rename wasm/rustfmt.toml => rustfmt.toml (100%)
 rename {wasm/src => src}/lib.rs (73%)
 rename {wasm/src => src}/permutation.rs (100%)
 rename {wasm/src => src}/puzzle.rs (100%)
 rename {wasm/src => src}/webgl.rs (100%)
 rename {src => ts}/center-cuts/index.ts (100%)
 rename {src => ts}/main.ts (100%)
 rename {src => ts}/utils.ts (100%)
 rename {src => ts}/vite-env.d.ts (100%)
 delete mode 100644 wasm/.gitignore

diff --git a/.gitignore b/.gitignore
index a547bf3..83b3785 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+/target/
+/vendor/
diff --git a/wasm/Cargo.lock b/Cargo.lock
similarity index 100%
rename from wasm/Cargo.lock
rename to Cargo.lock
diff --git a/wasm/Cargo.toml b/Cargo.toml
similarity index 100%
rename from wasm/Cargo.toml
rename to Cargo.toml
diff --git a/index.html b/index.html
index 02d168c..9abc00b 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <script type="module">
-      import init, { render, on_key_down, on_key_up } from "/wasm/pkg/look_how_they_truncated_my_boy.js";
+      import init, { render, on_key_down, on_key_up } from "/pkg/look_how_they_truncated_my_boy.js";
       await init();
       function loop(ms) {
         render(ms);
diff --git a/mprocs.yaml b/mprocs.yaml
index 49a9cfe..b65e047 100644
--- a/mprocs.yaml
+++ b/mprocs.yaml
@@ -1,17 +1,14 @@
 procs:
   Wasm Pack:
-    cwd: wasm
     shell: watchexec -e rs -- wasm-pack build --debug --target web
 
   Dev Server:
     shell: npm run dev
 
   Docs:
-    cwd: wasm
     shell: cargo doc --open
     autostart: false
 
   Unit Tests:
-    cwd: wasm
     shell: cargo watch -x test
     autostart: false
diff --git a/wasm/rustfmt.toml b/rustfmt.toml
similarity index 100%
rename from wasm/rustfmt.toml
rename to rustfmt.toml
diff --git a/wasm/src/lib.rs b/src/lib.rs
similarity index 73%
rename from wasm/src/lib.rs
rename to src/lib.rs
index 80e02b1..e934cd1 100644
--- a/wasm/src/lib.rs
+++ b/src/lib.rs
@@ -5,6 +5,6 @@
   let_chains
 )]
 #![allow(incomplete_features)]
-mod permutation;
-mod puzzle;
-mod webgl;
+pub mod permutation;
+pub mod puzzle;
+pub mod webgl;
diff --git a/wasm/src/permutation.rs b/src/permutation.rs
similarity index 100%
rename from wasm/src/permutation.rs
rename to src/permutation.rs
diff --git a/wasm/src/puzzle.rs b/src/puzzle.rs
similarity index 100%
rename from wasm/src/puzzle.rs
rename to src/puzzle.rs
diff --git a/wasm/src/webgl.rs b/src/webgl.rs
similarity index 100%
rename from wasm/src/webgl.rs
rename to src/webgl.rs
diff --git a/src/center-cuts/index.ts b/ts/center-cuts/index.ts
similarity index 100%
rename from src/center-cuts/index.ts
rename to ts/center-cuts/index.ts
diff --git a/src/main.ts b/ts/main.ts
similarity index 100%
rename from src/main.ts
rename to ts/main.ts
diff --git a/src/utils.ts b/ts/utils.ts
similarity index 100%
rename from src/utils.ts
rename to ts/utils.ts
diff --git a/src/vite-env.d.ts b/ts/vite-env.d.ts
similarity index 100%
rename from src/vite-env.d.ts
rename to ts/vite-env.d.ts
diff --git a/wasm/.gitignore b/wasm/.gitignore
deleted file mode 100644
index 2332034..0000000
--- a/wasm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/vendor/