From 81fb5160e54d4d15f40e7b74fa83db44a45dbadb Mon Sep 17 00:00:00 2001
From: Greg Johnston <greg.johnston@gmail.com>
Date: Wed, 10 Jan 2024 14:08:51 -0500
Subject: [PATCH] missing makefiles

---
 server_fn/Cargo.toml                           | 2 ++
 server_fn/Makefile.toml                        | 1 +
 server_fn/server_fn_macro_default/Makfile.toml | 4 ++++
 server_fn/src/error.rs                         | 8 +++++++-
 server_fn/src/response/browser.rs              | 3 ++-
 server_fn_macro/Makefile.toml                  | 1 +
 6 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 server_fn/Makefile.toml
 create mode 100644 server_fn/server_fn_macro_default/Makfile.toml
 create mode 100644 server_fn_macro/Makefile.toml

diff --git a/server_fn/Cargo.toml b/server_fn/Cargo.toml
index 53dd8495a..36027b4ec 100644
--- a/server_fn/Cargo.toml
+++ b/server_fn/Cargo.toml
@@ -50,6 +50,7 @@ rkyv = { version = "0.7", features = [
 # client
 gloo-net = { version = "0.5", optional = true }
 js-sys = { version = "0.3", optional = true }
+wasm-bindgen = { version = "0.2", optional = true }
 wasm-bindgen-futures = { version = "0.4", optional = true }
 wasm-streams = { version = "0.4", optional = true }
 web-sys = { version = "0.3", optional = true, features = [
@@ -79,6 +80,7 @@ browser = [
   "dep:gloo-net",
   "dep:js-sys",
   "dep:send_wrapper",
+  "dep:wasm-bindgen",
   "dep:web-sys",
   "dep:wasm-streams",
   "dep:wasm-bindgen-futures",
diff --git a/server_fn/Makefile.toml b/server_fn/Makefile.toml
new file mode 100644
index 000000000..3d822c68d
--- /dev/null
+++ b/server_fn/Makefile.toml
@@ -0,0 +1 @@
+extend = { path = "../cargo-make/main.toml" }
diff --git a/server_fn/server_fn_macro_default/Makfile.toml b/server_fn/server_fn_macro_default/Makfile.toml
new file mode 100644
index 000000000..4ed622914
--- /dev/null
+++ b/server_fn/server_fn_macro_default/Makfile.toml
@@ -0,0 +1,4 @@
+extend = { path = "../../cargo-make/main.toml" }
+
+[tasks.check-format]
+env = { LEPTOS_PROJECT_DIRECTORY = "../../" }
diff --git a/server_fn/src/error.rs b/server_fn/src/error.rs
index ec0d4f38c..df9eeb6f8 100644
--- a/server_fn/src/error.rs
+++ b/server_fn/src/error.rs
@@ -134,7 +134,7 @@ impl<E: std::error::Error + Clone> ViaError<E> for &&WrapError<E> {
 // we can still wrap it in String form
 impl<E: Display + Clone> ViaError<E> for &WrapError<E> {
     fn to_server_error(&self) -> ServerFnError<E> {
-        ServerFnError::WrappedServerError(self.0.clone())
+        ServerFnError::ServerError(self.0.to_string())
     }
 }
 
@@ -179,6 +179,12 @@ pub enum ServerFnError<E = NoCustomError> {
     MissingArg(String),
 }
 
+impl ServerFnError<NoCustomError> {
+    pub fn new(msg: impl ToString) -> Self {
+        Self::ServerError(msg.to_string())
+    }
+}
+
 impl<CustErr> From<CustErr> for ServerFnError<CustErr> {
     fn from(value: CustErr) -> Self {
         ServerFnError::WrappedServerError(value)
diff --git a/server_fn/src/response/browser.rs b/server_fn/src/response/browser.rs
index 845b2db54..4c8701ba8 100644
--- a/server_fn/src/response/browser.rs
+++ b/server_fn/src/response/browser.rs
@@ -3,9 +3,10 @@ use crate::{error::ServerFnError, redirect::REDIRECT_HEADER};
 use bytes::Bytes;
 use futures::{Stream, StreamExt};
 pub use gloo_net::http::Response;
-use js_sys::{wasm_bindgen::JsCast, Uint8Array};
+use js_sys::Uint8Array;
 use send_wrapper::SendWrapper;
 use std::future::Future;
+use wasm_bindgen::JsCast;
 use wasm_streams::ReadableStream;
 
 pub struct BrowserResponse(pub(crate) SendWrapper<Response>);
diff --git a/server_fn_macro/Makefile.toml b/server_fn_macro/Makefile.toml
new file mode 100644
index 000000000..3d822c68d
--- /dev/null
+++ b/server_fn_macro/Makefile.toml
@@ -0,0 +1 @@
+extend = { path = "../cargo-make/main.toml" }