chore: add WASM=true for web compile

Author: AprilNEA

.github/workflows/deploy-web.yml

@@ -62,7 +62,7 @@ jobs:
       run: make pkg
 
     - name: Build website
-      run: pnpm build
+      run: make build-web
 
     - name: Cache build
       uses: actions/cache/save@v3

Makefile

@@ -21,7 +21,7 @@ build-desktop:
 	pnpm tauri build
 
 build-web: pkg
-	pnpm build
+	WASM=true pnpm build
 
 .PHONY: license
 license:

src-utility/src/core/formatter/json.rs

@@ -23,8 +23,8 @@ use universal_function_macro::universal_function;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
-#[cfg_attr(feature = "web", derive(tsify::Tsify))]
-#[cfg_attr(feature = "web", tsify(into_wasm_abi, from_wasm_abi))]
+#[cfg_attr(target_arch = "wasm32", derive(tsify::Tsify))]
+#[cfg_attr(target_arch = "wasm32", tsify(into_wasm_abi, from_wasm_abi))]
 pub enum IndentStyle {
     Spaces(usize),
     Tabs,

src-utility/src/error.rs

@@ -11,9 +11,6 @@
 //
 // See LICENSE file for details or contact [email protected]
 
-#[cfg(feature = "web")]
-use wasm_bindgen::prelude::*;
-
 #[derive(Debug, thiserror::Error)]
 pub enum UtilityError {
     #[error(transparent)]
@@ -37,9 +34,9 @@ impl serde::Serialize for UtilityError {
     }
 }
 
-#[cfg(feature = "web")]
-impl From<UtilityError> for JsValue {
-    fn from(err: UtilityError) -> JsValue {
-        JsValue::from_str(&err.to_string())
+#[cfg(target_arch = "wasm32")]
+impl From<UtilityError> for wasm_bindgen::prelude::JsValue {
+    fn from(err: UtilityError) -> wasm_bindgen::prelude::JsValue {
+        wasm_bindgen::prelude::JsValue::from_str(&err.to_string())
     }
 }