Reorganize web demo into subfolders (#166)

.github/workflows/wasm-demo.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./demos/web-editor
+        working-directory: ./demos/web-editor/web
     steps:
     - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2

Cargo.toml

@@ -7,7 +7,7 @@ members = [
     "demos/viewer",
     "workspace-hack",
 ]
-exclude = ["demos/web-editor"]
+exclude = ["demos/web-editor/crate"]
 
 [profile.release]
 debug = true

demos/web-editor/.gitignore

@@ -1,4 +1,5 @@
-node_modules
-pkg
-dist
-target
+web/node_modules
+web/dist
+web/pkg
+crate/pkg
+crate/target

demos/web-editor/README.md

@@ -3,7 +3,7 @@ The `web-editor` subfolder embeds Fidget into a web application.
 Building this demo requires [`wasm-pack`](https://rustwasm.github.io/wasm-pack/)
 to be installed on the host system.
 
-Run the editor demo with
+Run the editor demo in the `web` subfolder with
 
 ```
 npm install

demos/web-editor/Cargo.toml → demos/web-editor/crate/Cargo.toml

@@ -12,7 +12,7 @@ bincode = "1.3.3"
 wasm-bindgen = "0.2.92"
 nalgebra = "0.33"
 
-fidget = {path = "../../fidget", default-features = false, features = ["rhai", "mesh", "render"]}
+fidget = {path = "../../../fidget", default-features = false, features = ["rhai", "mesh", "render"]}
 
 # Take advantage of feature unification to turn on wasm-bindgen here
 rhai = { version = "*", features = ["wasm-bindgen"] }

demos/web-editor/index.ts → demos/web-editor/web/src/index.ts

@@ -24,12 +24,12 @@ import { rhai } from "./rhai";
 
 import { RENDER_SIZE, WORKERS_PER_SIDE, WORKER_COUNT } from "./constants";
 
-import GYROID_SCRIPT from "../../models/gyroid-sphere.rhai";
+import GYROID_SCRIPT from "../../../../models/gyroid-sphere.rhai";
 
 var fidget: any = null;
 
 async function setup() {
-  fidget = await import("./pkg")!;
+  fidget = await import("../../crate/pkg")!;
   const app = new App();
 }
 

demos/web-editor/worker.ts → demos/web-editor/web/src/worker.ts

@@ -84,7 +84,7 @@ class Worker {
 }
 
 async function run() {
-  fidget = await import("./pkg")!;
+  fidget = await import("../../crate/pkg")!;
   let worker: null | Worker = null;
   onmessage = function (e: any) {
     let req = e.data as WorkerRequest;

demos/web-editor/webpack.config.js → demos/web-editor/web/webpack.config.js

@@ -3,7 +3,7 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
 const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
 
 module.exports = {
-  entry: "./index.ts",
+  entry: "./src/index.ts",
   module: {
     rules: [
       {
@@ -30,18 +30,18 @@ module.exports = {
   },
   plugins: [
     new HtmlWebpackPlugin({
-      template: "index.html",
+      template: "src/index.html",
     }),
     new WasmPackPlugin({
-      crateDirectory: path.resolve(__dirname, "."),
+      crateDirectory: path.resolve(__dirname, "../crate/"),
     }),
   ],
   mode: "development",
   experiments: {
     asyncWebAssembly: true,
   },
   devServer: {
-    watchFiles: ["./index.html", "./worker.ts"],
+    watchFiles: ["./src/index.html", "./src/worker.ts"],
     hot: true,
   },
 };