remove minified js from build scripts

packages/desktop/.gitignore

@@ -1 +0,0 @@
-/src/minified.js

packages/desktop/_build.rs

@@ -1,94 +0,0 @@
-use dioxus_interpreter_js::binary_protocol::SLEDGEHAMMER_JS;
-
-use std::io::Write;
-
-const EDITS_PATH: &str = {
-    #[cfg(any(target_os = "android", target_os = "windows"))]
-    {
-        "http://dioxus.index.html/edits"
-    }
-    #[cfg(not(any(target_os = "android", target_os = "windows")))]
-    {
-        "dioxus://index.html/edits"
-    }
-};
-
-fn check_gnu() {
-    // WARN about wry support on windows gnu targets. GNU windows targets don't work well in wry currently
-    if std::env::var("CARGO_CFG_WINDOWS").is_ok()
-        && std::env::var("CARGO_CFG_TARGET_ENV").unwrap() == "gnu"
-        && !cfg!(feature = "gnu")
-    {
-        println!("cargo:warning=GNU windows targets have some limitations within Wry. Using the MSVC windows toolchain is recommended. If you would like to use continue using GNU, you can read https://github.com/wravery/webview2-rs#cross-compilation and disable this warning by adding the gnu feature to dioxus-desktop in your Cargo.toml")
-    }
-}
-
-fn main() {
-    check_gnu();
-
-    let prevent_file_upload = r#"// Prevent file inputs from opening the file dialog on click
-    let inputs = document.querySelectorAll("input");
-    for (let input of inputs) {
-      if (!input.getAttribute("data-dioxus-file-listener")) {
-        // prevent file inputs from opening the file dialog on click
-        const type = input.getAttribute("type");
-        if (type === "file") {
-          input.setAttribute("data-dioxus-file-listener", true);
-          input.addEventListener("click", (event) => {
-            let target = event.target;
-            let target_id = find_real_id(target);
-            if (target_id !== null) {
-              const send = (event_name) => {
-                const message = window.interpreter.serializeIpcMessage("file_diolog", { accept: target.getAttribute("accept"), directory: target.getAttribute("webkitdirectory") === "true", multiple: target.hasAttribute("multiple"), target: parseInt(target_id), bubbles: event_bubbles(event_name), event: event_name });
-                window.ipc.postMessage(message);
-              };
-              send("change&input");
-            }
-            event.preventDefault();
-          });
-        }
-      }
-    }"#;
-    let polling_request = format!(
-        r#"// Poll for requests
-    window.interpreter.wait_for_request = (headless) => {{
-      fetch(new Request("{EDITS_PATH}"))
-          .then(response => {{
-              response.arrayBuffer()
-                  .then(bytes => {{
-                      // In headless mode, the requestAnimationFrame callback is never called, so we need to run the bytes directly
-                      if (headless) {{
-                        run_from_bytes(bytes);
-                      }}
-                      else {{
-                        requestAnimationFrame(() => {{
-                          run_from_bytes(bytes);
-                        }});
-                      }}
-                      window.interpreter.wait_for_request(headless);
-                  }});
-          }})
-    }}"#
-    );
-    let mut interpreter = SLEDGEHAMMER_JS
-        .replace("/*POST_HANDLE_EDITS*/", prevent_file_upload)
-        .replace("export", "")
-        + &polling_request;
-    while let Some(import_start) = interpreter.find("import") {
-        let import_end = interpreter[import_start..]
-            .find(|c| c == ';' || c == '\n')
-            .map(|i| i + import_start)
-            .unwrap_or_else(|| interpreter.len());
-        interpreter.replace_range(import_start..import_end, "");
-    }
-
-    let js = format!("{interpreter}\nconst config = new InterpreterConfig(false);");
-
-    use minify_js::*;
-    let session = Session::new();
-    let mut out = Vec::new();
-    minify(&session, TopLevelMode::Module, js.as_bytes(), &mut out).unwrap();
-    let minified = String::from_utf8(out).unwrap();
-    let mut file = std::fs::File::create("src/minified.js").unwrap();
-    file.write_all(minified.as_bytes()).unwrap();
-}

packages/desktop/build.rs

@@ -0,0 +1,13 @@
+fn check_gnu() {
+    // WARN about wry support on windows gnu targets. GNU windows targets don't work well in wry currently
+    if std::env::var("CARGO_CFG_WINDOWS").is_ok()
+        && std::env::var("CARGO_CFG_TARGET_ENV").unwrap() == "gnu"
+        && !cfg!(feature = "gnu")
+    {
+        println!("cargo:warning=GNU windows targets have some limitations within Wry. Using the MSVC windows toolchain is recommended. If you would like to use continue using GNU, you can read https://github.com/wravery/webview2-rs#cross-compilation and disable this warning by adding the gnu feature to dioxus-desktop in your Cargo.toml")
+    }
+}
+
+fn main() {
+    check_gnu();
+}

packages/desktop/src/protocol.rs

@@ -1,11 +1,82 @@
 use crate::{assets::*, edits::EditQueue};
+use dioxus_interpreter_js::SLEDGEHAMMER_JS;
 use std::path::{Path, PathBuf};
 use wry::{
     http::{status::StatusCode, Request, Response},
     RequestAsyncResponder, Result,
 };
 
-static MINIFIED: &str = include_str!("./minified.js");
+fn handle_edits_code() -> String {
+    const EDITS_PATH: &str = {
+        #[cfg(any(target_os = "android", target_os = "windows"))]
+        {
+            "http://dioxus.index.html/edits"
+        }
+        #[cfg(not(any(target_os = "android", target_os = "windows")))]
+        {
+            "dioxus://index.html/edits"
+        }
+    };
+
+    let prevent_file_upload = r#"// Prevent file inputs from opening the file dialog on click
+    let inputs = document.querySelectorAll("input");
+    for (let input of inputs) {
+      if (!input.getAttribute("data-dioxus-file-listener")) {
+        // prevent file inputs from opening the file dialog on click
+        const type = input.getAttribute("type");
+        if (type === "file") {
+          input.setAttribute("data-dioxus-file-listener", true);
+          input.addEventListener("click", (event) => {
+            let target = event.target;
+            let target_id = find_real_id(target);
+            if (target_id !== null) {
+              const send = (event_name) => {
+                const message = window.interpreter.serializeIpcMessage("file_diolog", { accept: target.getAttribute("accept"), directory: target.getAttribute("webkitdirectory") === "true", multiple: target.hasAttribute("multiple"), target: parseInt(target_id), bubbles: event_bubbles(event_name), event: event_name });
+                window.ipc.postMessage(message);
+              };
+              send("change&input");
+            }
+            event.preventDefault();
+          });
+        }
+      }
+    }"#;
+    let polling_request = format!(
+        r#"// Poll for requests
+    window.interpreter.wait_for_request = (headless) => {{
+      fetch(new Request("{EDITS_PATH}"))
+          .then(response => {{
+              response.arrayBuffer()
+                  .then(bytes => {{
+                      // In headless mode, the requestAnimationFrame callback is never called, so we need to run the bytes directly
+                      if (headless) {{
+                        run_from_bytes(bytes);
+                      }}
+                      else {{
+                        requestAnimationFrame(() => {{
+                          run_from_bytes(bytes);
+                        }});
+                      }}
+                      window.interpreter.wait_for_request(headless);
+                  }});
+          }})
+    }}"#
+    );
+    let mut interpreter = SLEDGEHAMMER_JS
+        .replace("/*POST_HANDLE_EDITS*/", prevent_file_upload)
+        .replace("export", "")
+        + &polling_request;
+    while let Some(import_start) = interpreter.find("import") {
+        let import_end = interpreter[import_start..]
+            .find(|c| c == ';' || c == '\n')
+            .map(|i| i + import_start)
+            .unwrap_or_else(|| interpreter.len());
+        interpreter.replace_range(import_start..import_end, "");
+    }
+
+    format!("{interpreter}\nconst config = new InterpreterConfig(false);")
+}
+
 static DEFAULT_INDEX: &str = include_str!("./index.html");
 
 /// Build the index.html file we use for bootstrapping a new app
@@ -162,10 +233,11 @@ fn serve_from_fs(path: PathBuf) -> Result<Response<Vec<u8>>> {
 /// - headless: is this page being loaded but invisible? Important because not all windows are visible and the
 ///             interpreter can't connect until the window is ready.
 fn module_loader(root_id: &str, headless: bool) -> String {
+    let js = handle_edits_code();
     format!(
         r#"
 <script type="module">
-    {MINIFIED}
+    {js}
     // Wait for the page to load
     window.onload = function() {{
         let rootname = "{root_id}";

packages/liveview/.gitignore

@@ -1 +0,0 @@
-/src/minified.js

packages/liveview/_build.rs

@@ -1,64 +0,0 @@
-use dioxus_interpreter_js::binary_protocol::SLEDGEHAMMER_JS;
-use minify_js::*;
-use std::io::Write;
-
-fn main() {
-    let serialize_file_uploads = r#"if (
-            target.tagName === "INPUT" &&
-            (event.type === "change" || event.type === "input")
-          ) {
-            const type = target.getAttribute("type");
-            if (type === "file") {
-              async function read_files() {
-                const files = target.files;
-                const file_contents = {};
-
-                for (let i = 0; i < files.length; i++) {
-                  const file = files[i];
-
-                  file_contents[file.name] = Array.from(
-                    new Uint8Array(await file.arrayBuffer())
-                  );
-                }
-                let file_engine = {
-                  files: file_contents,
-                };
-                contents.files = file_engine;
-
-                if (realId === null) {
-                  return;
-                }
-                const message = window.interpreter.serializeIpcMessage("user_event", {
-                  name: name,
-                  element: parseInt(realId),
-                  data: contents,
-                  bubbles,
-                });
-                window.ipc.postMessage(message);
-              }
-              read_files();
-              return;
-            }
-          }"#;
-    let mut interpreter = SLEDGEHAMMER_JS
-        .replace("/*POST_EVENT_SERIALIZATION*/", serialize_file_uploads)
-        .replace("export", "");
-    while let Some(import_start) = interpreter.find("import") {
-        let import_end = interpreter[import_start..]
-            .find(|c| c == ';' || c == '\n')
-            .map(|i| i + import_start)
-            .unwrap_or_else(|| interpreter.len());
-        interpreter.replace_range(import_start..import_end, "");
-    }
-
-    let main_js = std::fs::read_to_string("src/main.js").unwrap();
-
-    let js = format!("{interpreter}\n{main_js}");
-
-    let session = Session::new();
-    let mut out = Vec::new();
-    minify(&session, TopLevelMode::Module, js.as_bytes(), &mut out).unwrap();
-    let minified = String::from_utf8(out).unwrap();
-    let mut file = std::fs::File::create("src/minified.js").unwrap();
-    file.write_all(minified.as_bytes()).unwrap();
-}

packages/liveview/src/lib.rs

@@ -29,7 +29,61 @@ pub enum LiveViewError {
     SendingFailed,
 }
 
-static MINIFIED: &str = include_str!("./minified.js");
+fn handle_edits_code() -> String {
+    use dioxus_interpreter_js::binary_protocol::SLEDGEHAMMER_JS;
+
+    let serialize_file_uploads = r#"if (
+        target.tagName === "INPUT" &&
+        (event.type === "change" || event.type === "input")
+      ) {
+        const type = target.getAttribute("type");
+        if (type === "file") {
+          async function read_files() {
+            const files = target.files;
+            const file_contents = {};
+
+            for (let i = 0; i < files.length; i++) {
+              const file = files[i];
+
+              file_contents[file.name] = Array.from(
+                new Uint8Array(await file.arrayBuffer())
+              );
+            }
+            let file_engine = {
+              files: file_contents,
+            };
+            contents.files = file_engine;
+
+            if (realId === null) {
+              return;
+            }
+            const message = window.interpreter.serializeIpcMessage("user_event", {
+              name: name,
+              element: parseInt(realId),
+              data: contents,
+              bubbles,
+            });
+            window.ipc.postMessage(message);
+          }
+          read_files();
+          return;
+        }
+      }"#;
+    let mut interpreter = SLEDGEHAMMER_JS
+        .replace("/*POST_EVENT_SERIALIZATION*/", serialize_file_uploads)
+        .replace("export", "");
+    while let Some(import_start) = interpreter.find("import") {
+        let import_end = interpreter[import_start..]
+            .find(|c| c == ';' || c == '\n')
+            .map(|i| i + import_start)
+            .unwrap_or_else(|| interpreter.len());
+        interpreter.replace_range(import_start..import_end, "");
+    }
+
+    let main_js = include_str!("./main.js");
+
+    format!("{interpreter}\n{main_js}")
+}
 
 /// This script that gets injected into your app connects this page to the websocket endpoint
 ///
@@ -67,6 +121,8 @@ pub fn interpreter_glue(url_or_path: &str) -> String {
         "return path;"
     };
 
+    let handle_edits = handle_edits_code();
+
     format!(
         r#"
 <script>
@@ -75,7 +131,7 @@ pub fn interpreter_glue(url_or_path: &str) -> String {
     }}
     
     var WS_ADDR = __dioxusGetWsUrl("{url_or_path}");
-    {MINIFIED}
+    {handle_edits}
 </script>
     "#
     )