Merge wasm directory into root

CharlesTaylor7 · May 3, 2024 · bb8fc1c · bb8fc1c
1 parent e862f99
commit bb8fc1c
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+/target/
+/vendor/
diff --git a/wasm/Cargo.lock → Cargo.lock b/wasm/Cargo.lock → Cargo.lock
diff --git a/wasm/Cargo.toml → Cargo.toml b/wasm/Cargo.toml → Cargo.toml
diff --git 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
@@ -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 → rustfmt.toml b/wasm/rustfmt.toml → rustfmt.toml
diff --git a/wasm/src/lib.rs → src/lib.rs b/wasm/src/lib.rs → 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 → src/permutation.rs b/wasm/src/permutation.rs → src/permutation.rs
diff --git a/wasm/src/puzzle.rs → src/puzzle.rs b/wasm/src/puzzle.rs → src/puzzle.rs
diff --git a/wasm/src/webgl.rs → src/webgl.rs b/wasm/src/webgl.rs → src/webgl.rs
diff --git a/src/center-cuts/index.ts → ts/center-cuts/index.ts b/src/center-cuts/index.ts → ts/center-cuts/index.ts
diff --git a/src/main.ts → ts/main.ts b/src/main.ts → ts/main.ts
diff --git a/src/utils.ts → ts/utils.ts b/src/utils.ts → ts/utils.ts
diff --git a/src/vite-env.d.ts → ts/vite-env.d.ts b/src/vite-env.d.ts → ts/vite-env.d.ts
diff --git a/wasm/.gitignore b/wasm/.gitignore