From cc499eec8b26fd600c31c54ca1c24271726c93d3 Mon Sep 17 00:00:00 2001
From: Danny McGee <dannymcgee@gmail.com>
Date: Wed, 28 Feb 2024 15:42:38 -0500
Subject: [PATCH] Fix build configuration for image-generator-demo

---
 .vscode/settings.json             | 5 +----
 image-generator-demo/project.json | 4 ++--
 studio/Cargo.toml                 | 1 -
 studio/project.json               | 8 --------
 studio/src/lib.rs                 | 2 +-
 studio/src/wasm/mod.rs            | 2 --
 6 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4f9b6e6..a74e4ec 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,10 +4,7 @@
 		"*.element.ts": "${capture}.element.scss, ${capture}.element.spec.ts",
 		"*.tsx": "${capture}.module.scss, ${capture}.spec.tsx",
 	},
-	"rust-analyzer.cargo.features": [
-		"wasm",
-		"wasm_screenshot"
-	],
+	"rust-analyzer.cargo.features": ["wasm"],
 	"files.associations": {
 		"*.meta": "ron"
 	}
diff --git a/image-generator-demo/project.json b/image-generator-demo/project.json
index 719f5b8..396ee34 100644
--- a/image-generator-demo/project.json
+++ b/image-generator-demo/project.json
@@ -29,7 +29,7 @@
       "dependsOn": [
         {
           "projects": ["studio"],
-          "target": "build:image-generator"
+          "target": "build:web"
         }
       ],
       "options": {
@@ -52,7 +52,7 @@
       "dependsOn": [
         {
           "projects": ["studio"],
-          "target": "build:image-generator"
+          "target": "build:web"
         }
       ],
       "options": {
diff --git a/studio/Cargo.toml b/studio/Cargo.toml
index 8303db2..4f6b018 100644
--- a/studio/Cargo.toml
+++ b/studio/Cargo.toml
@@ -67,7 +67,6 @@ wasm = [
 	"bevy_rapier3d/wasm-bindgen",
 ]
 desktop = []
-wasm_screenshot = []
 
 [dependencies.bevy]
 workspace = true
diff --git a/studio/project.json b/studio/project.json
index eac8000..b3b28be 100644
--- a/studio/project.json
+++ b/studio/project.json
@@ -31,14 +31,6 @@
         "cwd": "studio"
       }
     },
-    "build:image-generator": {
-      "executor": "nx:run-commands",
-      "inputs": ["assets"],
-      "options": {
-        "command": "node scripts/build-web.mjs --features=wasm,wasm_screenshot",
-        "cwd": "studio"
-      }
-    },
     "dev": {
       "executor": "@nxrs/cargo:run",
       "options": {
diff --git a/studio/src/lib.rs b/studio/src/lib.rs
index 0ef7ff4..8bdfb58 100644
--- a/studio/src/lib.rs
+++ b/studio/src/lib.rs
@@ -158,7 +158,7 @@ pub fn start(init: InitParams, mode: StudioMode, window_config: Option<Window>)
             ..default()
         }),
         CommonPlugins,
-        #[cfg(all(feature = "wasm", feature = "wasm_screenshot"))]
+        #[cfg(feature = "wasm")]
         wasm::ScreenshotPlugin,
     ));
 
diff --git a/studio/src/wasm/mod.rs b/studio/src/wasm/mod.rs
index c109cad..3f1770a 100644
--- a/studio/src/wasm/mod.rs
+++ b/studio/src/wasm/mod.rs
@@ -5,12 +5,10 @@ use wasm_bindgen::prelude::wasm_bindgen;
 
 mod conv;
 mod init;
-#[cfg(feature = "wasm_screenshot")]
 mod screenshot;
 mod util;
 
 pub use conv::*;
-#[cfg(feature = "wasm_screenshot")]
 pub use screenshot::ScreenshotPlugin;
 pub(crate) use util::*;