From 64133de8814c9d5369dd1772cc3e51c0127125a1 Mon Sep 17 00:00:00 2001
From: Danny McGee <dannymcgee@gmail.com>
Date: Mon, 2 Oct 2023 20:05:42 -0400
Subject: [PATCH] Workflow fixes

---
 .vscode/settings.json |  3 ++
 Cargo.lock            | 10 -------
 Cargo.toml            | 37 +++++++++++++++++++++--
 studio/Cargo.toml     | 68 -------------------------------------------
 studio/project.json   |  7 ++---
 5 files changed, 41 insertions(+), 84 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..902668a
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+	"rust-analyzer.showUnlinkedFileNotification": false,
+}
diff --git a/Cargo.lock b/Cargo.lock
index 9505f22..250a2c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -283,7 +283,6 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18e71a9143ac21bed247c30129399af8be170309e7ff5983a1bd37e87d3da520"
 dependencies = [
- "bevy_dylib",
  "bevy_internal",
 ]
 
@@ -445,15 +444,6 @@ dependencies = [
  "sysinfo",
 ]
 
-[[package]]
-name = "bevy_dylib"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2107d1e8f3d5320ae02b3bf4b2b98c078f225a78a93b01fa29d619bc170f2d9b"
-dependencies = [
- "bevy_internal",
-]
-
 [[package]]
 name = "bevy_ecs"
 version = "0.11.2"
diff --git a/Cargo.toml b/Cargo.toml
index 2f9c1c7..c7bb39f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,9 +7,42 @@ members = [
 [workspace.dependencies.bevy]
 version = "0.11.2"
 default-features = false
+# TODO: Narrow this down to the features we actually need
+# FIXME: WebGPU is sparsely supported, but using the default WebGL backend
+#       causes a panic upstream: "Tex storage 2D multisample is not supported"
+features = [
+    "animation",
+    "bevy_asset",
+    "bevy_audio",
+    "bevy_gilrs",
+    "bevy_scene",
+    "bevy_winit",
+    "bevy_core_pipeline",
+    "bevy_pbr",
+    "bevy_gltf",
+    "bevy_render",
+    "bevy_sprite",
+    "bevy_text",
+    "bevy_ui",
+    "png",
+    "hdr",
+    "ktx2",
+    "zstd",
+    "vorbis",
+    "x11",
+    "filesystem_watcher",
+    "bevy_gizmos",
+    "android_shared_stdcxx",
+    "tonemapping_luts",
+    "default_font",
+]
 
-[profile.dev]
+[profile.dev-custom]
+inherits = "dev"
 opt-level = 1
 
-[profile.dev.package."*"]
+[profile.dev-custom.package."*"]
 opt-level = 3
+
+[profile.release]
+opt-level = "s"
diff --git a/studio/Cargo.toml b/studio/Cargo.toml
index ce3eaea..be6451a 100644
--- a/studio/Cargo.toml
+++ b/studio/Cargo.toml
@@ -22,71 +22,3 @@ wasm = ["dep:console_error_panic_hook"]
 
 [dependencies.bevy]
 workspace = true
-default-features = false
-# TODO: Narrow this down to the features we actually need
-# FIXME: WebGPU is sparsely supported, but using the default WebGL backend
-#       causes a panic upstream: "Tex storage 2D multisample is not supported"
-features = [
-    "animation",
-    "bevy_asset",
-    "bevy_audio",
-    "bevy_gilrs",
-    "bevy_scene",
-    "bevy_winit",
-    "bevy_core_pipeline",
-    "bevy_pbr",
-    "bevy_gltf",
-    "bevy_render",
-    "bevy_sprite",
-    "bevy_text",
-    "bevy_ui",
-    "png",
-    "hdr",
-    "ktx2",
-    "zstd",
-    "vorbis",
-    "x11",
-    "filesystem_watcher",
-    "bevy_gizmos",
-    "android_shared_stdcxx",
-    "tonemapping_luts",
-    "default_font",
-]
-
-[target.'cfg(not(target_family = "wasm"))'.dependencies.bevy]
-workspace = true
-default-features = false
-features = [
-    "animation",
-    "bevy_asset",
-    "bevy_audio",
-    "bevy_gilrs",
-    "bevy_scene",
-    "bevy_winit",
-    "bevy_core_pipeline",
-    "bevy_pbr",
-    "bevy_gltf",
-    "bevy_render",
-    "bevy_sprite",
-    "bevy_text",
-    "bevy_ui",
-    "png",
-    "hdr",
-    "ktx2",
-    "zstd",
-    "vorbis",
-    "x11",
-    "filesystem_watcher",
-    "bevy_gizmos",
-    "android_shared_stdcxx",
-    "tonemapping_luts",
-    "default_font",
-    # TODO: This line is the only difference from default. Is there a way to
-    #       deduplicate the feature list?
-    "dynamic_linking",
-]
-
-# FIXME: Profiles for the non-root package are ignored, but [target] keys are
-# not allowed in the root package >_<
-# [target.'cfg(target_family = "wasm")'.profile.release]
-# opt-level = "z"
diff --git a/studio/project.json b/studio/project.json
index 7525e9f..0d21a8a 100644
--- a/studio/project.json
+++ b/studio/project.json
@@ -27,11 +27,10 @@
         "parallel": false
       }
     },
-    "run": {
-      "executor": "@nxrs/cargo:build",
+    "dev": {
+      "executor": "@nxrs/cargo:run",
       "options": {
-        "release": false,
-        "run": true,
+        "profile": "dev-custom",
         "bin": "studio-standalone"
       }
     },