Feature add ci for wasm

.github/workflows/ci.yaml

@@ -118,3 +118,22 @@ jobs:
         run: scripts/build-ohos-example.sh
         env:
           OHOS_SDK_HOME: ${{ steps.setup-ohos-sdk.outputs.ohos-base-sdk-home }}
+
+  ci-wasm:
+    name: Wasm
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: 4.0.9
+          actions-cache-folder: emsdk-cache
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install
+        run: |
+          rustup target add wasm32-unknown-emscripten
+      - name: Build
+        run: cd examples/gallery && cargo build --target wasm32-unknown-emscripten --release

Cargo.toml

@@ -13,7 +13,7 @@ edition = "2021"
 [dependencies]
 deft-macros = { path = "packages/deft-macros", version = "0.3.1" }
 
-quick-js = { package = "deft-quick-js", version = "0.6.1"}
+quick-js = { package = "deft-quick-js", version = "0.7.0"}
 yoga = { package = "deft-yoga", version = "0.7.0" }
 winit = { package = "deft-winit", version = "0.32.1", features = ["android-native-activity", "rwh_06"] }
 skia-window = { path = "skia-window", version = "0.8.0"}
@@ -102,9 +102,9 @@ cfg_aliases = "0.2.1"
 [target.'cfg(target_env = "ohos")'.build-dependencies]
 napi-build-ohos = "1.0.4"
 
-[profile.release]
-lto = true
-opt-level = "z"
+#[profile.release]
+#lto = true
+#opt-level = "z"
 
 #[lib]
 #name = "deft"

README.md

@@ -70,13 +70,15 @@ apt install build-essential libssl-dev libclang-dev libc++-dev \
 
 Native:
 ```
-cargo run --example gallery
+cd examples/gallery
+cargo run
 ```
 
 Wasm:
 > Make sure that [Emscripten SDK](https://emscripten.org/docs/getting_started/downloads.html) is installed.
 ```bash
-./scripts/build-wasm.sh --release
+cd examples/gallery
+cargo build --target wasm32-unknown-emscripten --release
 python3 -m http.server
 ```
 Visit `http://localhost:8000/web/` to preview.

examples/demo.rs

@@ -2,7 +2,7 @@
 use deft::app::{App, IApp};
 use deft::bootstrap;
 use deft::js::js_engine::JsEngine;
-use quick_js::loader::{FsJsModuleLoader, JsModuleLoader};
+use quick_js::loader::JsModuleLoader;
 
 struct AppImpl {}
 
@@ -21,23 +21,25 @@ impl IApp for AppImpl {
     fn create_module_loader(&mut self) -> Box<dyn JsModuleLoader + Send + Sync + 'static> {
         use deft::loader::StaticModuleLoader;
         let mut ml = StaticModuleLoader::new();
-        ml.add_module("index.js".to_string(), include_str!("./demo-js/index.js").to_owned());
+        ml.add_module(
+            "index.js".to_string(),
+            include_str!("./demo-js/index.js").to_owned(),
+        );
         Box::new(ml)
     }
 }
 
 fn bootstrap_app() {
-    env_logger::init();
     let app = App::new(AppImpl {});
     bootstrap(app);
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 fn main() {
+    env_logger::init();
     bootstrap_app();
 }
 
-
 #[cfg(target_os = "emscripten")]
 pub fn main() {
     // Do nothing
@@ -46,5 +48,7 @@ pub fn main() {
 #[cfg(target_os = "emscripten")]
 #[no_mangle]
 pub extern "C" fn asm_main() {
+    use deft::log::SimpleLogger;
+    SimpleLogger::init_with_max_level(log::LevelFilter::Info);
     bootstrap_app();
-}
+}

examples/gallery/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "gallery"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+deft = { path = "../..", default-features = false}
+env_logger = "0.11.8"
+log = "0.4.27"
+
+[build-dependencies]
+cfg_aliases = "0.2.1"

examples/gallery/build.rs

@@ -0,0 +1,17 @@
+use cfg_aliases::cfg_aliases;
+fn main() {
+    println!("cargo:rustc-env=EMCC_CFLAGS=-s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 -s EXPORT_NAME=loadDeftApp -s EXPORTED_RUNTIME_METHODS=GL,cwrap");
+    println!("cargo:rerun-if-changed=build.rs");
+
+    cfg_aliases! {
+        // Systems.
+        web_platform: { all(target_family = "wasm", target_os = "unknown") },
+        emscripten_platform: { all(target_family = "wasm", target_os = "emscripten") },
+        macos_platform: { target_os = "macos" },
+        windows_platform: { target_os = "windows" },
+        linux_platform: { all(target_os = "linux", not(ohos)) },
+        desktop_platform: { any(windows_platform, linux_platform, macos_platform) },
+        ohos: { target_env = "ohos" },
+
+    }
+}

examples/gallery.rs → examples/gallery/src/main.rs

@@ -2,8 +2,8 @@
 use deft::app::{App, IApp};
 use deft::bootstrap;
 use deft::js::js_engine::JsEngine;
-use quick_js::loader::JsModuleLoader;
 use deft::resource::Resource;
+use deft::js::loader::JsModuleLoader;
 
 struct AppImpl {}
 
@@ -14,7 +14,7 @@ impl IApp for AppImpl {
 
     #[cfg(desktop_platform)]
     fn create_module_loader(&mut self) -> Box<dyn JsModuleLoader + Send + Sync + 'static> {
-        use quick_js::loader::FsJsModuleLoader;
+        use deft::js::loader::FsJsModuleLoader;
         let ml = FsJsModuleLoader::new("examples/gallery-js");
         Box::new(ml)
     }
@@ -23,7 +23,10 @@ impl IApp for AppImpl {
     fn create_module_loader(&mut self) -> Box<dyn JsModuleLoader + Send + Sync + 'static> {
         use deft::loader::StaticModuleLoader;
         let mut ml = StaticModuleLoader::new();
-        ml.add_module("index.js".to_string(), include_str!("./gallery-js/index.js").to_owned());
+        ml.add_module(
+            "index.js".to_string(),
+            include_str!("./gallery-js/index.js").to_owned(),
+        );
         Box::new(ml)
     }
 }
@@ -43,14 +46,15 @@ fn main() {
     bootstrap_app();
 }
 
-
 #[cfg(target_os = "emscripten")]
 pub fn main() {
     // Do nothing
 }
 
 #[cfg(target_os = "emscripten")]
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn asm_main() {
+    use deft::log::SimpleLogger;
+    SimpleLogger::init_with_max_level(log::LevelFilter::Info);
     bootstrap_app();
-}
+}

scripts/build-wasm.bat

@@ -0,0 +1,2 @@
+@echo off
+cargo build --target wasm32-unknown-emscripten --no-default-features

scripts/build-wasm.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-export EMCC_CFLAGS="-s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 -s EXPORT_NAME=loadDeftApp -s EXPORTED_RUNTIME_METHODS=GL,cwrap"
-cargo build --target wasm32-unknown-emscripten --no-default-features --example gallery $@
+cargo build --target wasm32-unknown-emscripten --no-default-features $@

src/element/common/image_object.rs

@@ -1,14 +1,14 @@
 use crate::element::common::svg_object::SvgObject;
 use crate::img_manager::{dyn_image_to_skia_image, IMG_MANAGER};
 use crate::render::RenderFn;
+use crate::resource::Resource;
 use anyhow::Error;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use image::{EncodableLayout, ImageReader};
 use log::error;
 use skia_safe::Color;
 use std::io::Cursor;
-use crate::resource::Resource;
 
 #[derive(Clone)]
 enum ImageSrc {
@@ -22,7 +22,7 @@ unsafe impl Send for ImageSrc {}
 impl ImageSrc {
     pub fn get_size(&self) -> (f32, f32) {
         match self {
-            ImageSrc::Svg(dom) => unsafe { dom.container_size() },
+            ImageSrc::Svg(dom) =>  dom.container_size(),
             ImageSrc::Img(img) => (img.width() as f32, img.height() as f32),
             ImageSrc::None => (0.0, 0.0),
         }
@@ -122,7 +122,8 @@ impl ImageObject {
                 } else {
                     Self::load_image_from_data(data)
                 }
-            }).unwrap_or_else(|| {
+            })
+            .unwrap_or_else(|| {
                 error!("Image not found: {:?}", src);
                 ImageSrc::None
             });

src/element/common/svg_object.rs

@@ -1,14 +1,14 @@
 use anyhow::Error;
 use resvg::usvg::Tree;
 use resvg::{tiny_skia, usvg, RenderOptions};
-use skia_safe::{Color};
+use skia_safe::Color;
 use skia_safe::{surfaces, AlphaType, Canvas, ColorType, ImageInfo};
 use std::fs;
 use std::sync::{Arc, Mutex};
 
-pub struct SvgState{
+pub struct SvgState {
     tree: Tree,
-    options: RenderOptions,    
+    options: RenderOptions,
 }
 
 #[derive(Clone)]
@@ -21,7 +21,7 @@ impl SvgObject {
         let options = usvg::Options::default();
         let tree = Tree::from_data(bytes, &options)?;
         let options = RenderOptions::default();
-        Ok(Self { 
+        Ok(Self {
             state: Arc::new(Mutex::new(SvgState { tree, options })),
         })
     }

src/element/font_manager.rs

@@ -14,7 +14,6 @@ use font_kit::sources::mem::MemSource as SystemSource;
 use skia_safe::font_style::Slant;
 use skia_safe::wrapper::NativeTransmutableWrapper;
 use std::collections::HashMap;
-use std::sync::Arc;
 use swash::{ObliqueAngle, Style, Weight};
 
 #[mrc_object]
@@ -35,10 +34,12 @@ impl FontManager {
         #[cfg(target_os = "emscripten")]
         let mut source = {
             let mut source = SystemSource::empty();
-            source.add_font(Handle::Memory {
-                bytes: Arc::new(include_bytes!("../../fonts/NotoSerif-Regular.ttf").to_vec()),
-                font_index: 0,
-            }).unwrap();
+            source
+                .add_font(Handle::Memory {
+                    bytes: std::sync::Arc::new(include_bytes!("../../fonts/NotoSerif-Regular.ttf").to_vec()),
+                    font_index: 0,
+                })
+                .unwrap();
             source
         };
 

src/element/label.rs

@@ -9,14 +9,8 @@ use crate::style::StylePropKey;
 use crate::text::textbox::{TextBox, TextElement, TextUnit};
 use crate::text::TextAlign;
 use deft_macros::{element_backend, js_methods};
-use skia_safe::FontMgr;
 use yoga::Size;
 
-thread_local! {
-    //TODO remove
-    pub static FONT_MGR: FontMgr = FontMgr::new();
-}
-
 pub fn parse_align(align: &str) -> TextAlign {
     match align {
         "left" => TextAlign::Left,

src/element/paragraph.rs

@@ -1,6 +1,5 @@
 #![allow(unused)]
 pub mod simple_paragraph_builder;
-pub mod typeface_mgr;
 
 use crate as deft;
 use crate::base::{EventContext, MouseDetail, MouseEventType};

src/element/select.rs

@@ -171,7 +171,6 @@ impl ElementBackend for Select {
     fn on_event(&mut self, event: &mut Event, _ctx: &mut EventContext<ElementWeak>) {
         let el = ok_or_return!(self.element_weak.upgrade());
         let w = some_or_return!(el.get_window());
-        let window = ok_or_return!(w.upgrade_mut());
         let bounds = el.get_origin_bounds();
         if let Some(_) = ClickEvent::cast(event) {
             let mut popup: Mrc<Option<Popup>> = Mrc::new(None);