Desktop: Stop compiling the editor into the wasm wrapper (#4348)

* Make wasm wrapper not depend on editor on native

* Introduce pkg-native

* Fix tests

* Fix fmt

* Correct span and make cargo fmt work inside editor_commands block

* Review

* Fix lint

desktop/src/app.rs

@@ -14,13 +14,12 @@ use winit::event::{ButtonSource, ElementState, MouseButton, StartCause, WindowEv
 use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
 use winit::window::WindowId;
 
-use graphite_desktop_ui::{UiCommand, UiInstance};
-
 use crate::dirs;
 use crate::event::{AppEvent, AppEventScheduler};
 use crate::persist;
 use crate::preferences;
 use crate::render::{RenderError, RenderState};
+use crate::ui::{UiCommand, UiInstance};
 use crate::window::Window;
 use crate::wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage, InputMessage, MouseKeys, MouseState, Preferences};
 use crate::wrapper::{DesktopWrapper, MmapResourceStorage, NodeGraphExecutionResult, WgpuContext, serialize_frontend_messages};

desktop/src/event.rs

@@ -1,9 +1,10 @@
+use crate::ui::Cursor;
 use crate::wrapper::NodeGraphExecutionResult;
 use crate::wrapper::messages::DesktopWrapperMessage;
 
 pub(crate) enum AppEvent {
 	UiUpdate(wgpu::Texture),
-	CursorChange(graphite_desktop_ui::Cursor),
+	CursorChange(Cursor),
 	WebCommunicationInitialized,
 	DesktopWrapperMessage(DesktopWrapperMessage),
 	NodeGraphExecutionResult(NodeGraphExecutionResult),

desktop/src/lib.rs

@@ -3,12 +3,13 @@ use crate::cli::Cli;
 use crate::consts::APP_LOCK_FILE_NAME;
 use crate::event::{AppEvent, CreateAppEventSchedulerEventLoopExt};
 use clap::Parser;
-use graphite_desktop_ui::{Acceleration, UiConfig, UiContext, UiEvent, UiSetupResult};
 use std::io::Write;
 use std::process::ExitCode;
 use tracing_subscriber::EnvFilter;
+use ui::{Acceleration, UiConfig, UiContext, UiEvent, UiSetupResult};
 use winit::event_loop::EventLoop;
 
+pub(crate) use graphite_desktop_ui as ui;
 pub(crate) use graphite_desktop_wrapper as wrapper;
 
 mod app;
@@ -69,7 +70,7 @@ pub fn start() -> ExitCode {
 		}
 	};
 
-	dirs::clear_dir(&graphite_desktop_ui::temp_dir_root());
+	dirs::clear_dir(&ui::temp_dir_root());
 
 	// TODO: Eventually remove this cleanup code for the old "browser" CEF directory
 	dirs::delete_old_cef_browser_directory();

desktop/src/window.rs

@@ -1,8 +1,8 @@
 use crate::consts::APP_NAME;
 use crate::event::AppEventScheduler;
+use crate::ui::Cursor;
 use crate::wrapper::messages::MenuItem;
 use crate::wrapper::{WgpuInstance, WgpuSurface};
-use graphite_desktop_ui::Cursor;
 use std::collections::HashMap;
 use std::sync::Arc;
 use winit::cursor::{CustomCursor, CustomCursorSource};

desktop/wrapper/Cargo.toml

@@ -14,6 +14,7 @@ gpu = ["graphite-editor/gpu", "graphene-std/shader-nodes"]
 [dependencies]
 # Local dependencies
 graphite-editor = { workspace = true }
+graphite-wasm-wrapper = { path = "../../frontend/wrapper", default-features = false, features = ["editor"] }
 graphene-std = { workspace = true }
 graph-craft = { workspace = true }
 wgpu-executor = { workspace = true }
@@ -22,7 +23,6 @@ wgpu = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 dirs = { workspace = true }
-ron = { workspace = true}
 vello = { workspace = true }
 image = { workspace = true }
 serde = { workspace = true }

desktop/wrapper/src/lib.rs

@@ -1,7 +1,9 @@
 use graph_craft::application_io::PlatformApplicationIo;
 use graph_craft::application_io::resource::ResourceStorage;
 use graphite_editor::application::{Editor, Environment, Host, Platform};
-use graphite_editor::messages::prelude::{FrontendMessage, Message, Wake};
+use graphite_editor::messages::frontend::FrontendMessage;
+use graphite_editor::messages::prelude::Wake;
+
 use message_dispatcher::DesktopWrapperMessageDispatcher;
 use messages::{DesktopFrontendMessage, DesktopWrapperMessage};
 use std::sync::Arc;
@@ -65,21 +67,10 @@ pub enum NodeGraphExecutionResult {
 }
 
 pub fn deserialize_editor_message(data: &[u8]) -> Option<DesktopWrapperMessage> {
-	if let Ok(string) = std::str::from_utf8(data) {
-		if let Ok(message) = ron::de::from_str::<Message>(string) {
-			Some(DesktopWrapperMessage::FromWeb(message.into()))
-		} else {
-			None
-		}
-	} else {
-		None
-	}
+	let message = graphite_wasm_wrapper::native_communication::decode_editor_command(data)?;
+	Some(DesktopWrapperMessage::FromWeb(message.into()))
 }
 
 pub fn serialize_frontend_messages(messages: Vec<FrontendMessage>) -> Option<Vec<u8>> {
-	if let Ok(serialized) = ron::ser::to_string(&messages) {
-		Some(serialized.into_bytes())
-	} else {
-		None
-	}
+	graphite_wasm_wrapper::native_communication::encode_frontend_messages(messages)
 }