Use wasm-bindgen

noClaps · Jan 4, 2025 · f6397e1 · f6397e1
1 parent 839baba
commit f6397e1
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 172 deletions.
diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
@@ -12,12 +12,10 @@ jobs:
           sudo apt install clang llvm gcc-multilib -y
           export CC=clang
           export CXX=clang++
-      - run: rustup target add wasm32-wasip1-threads
-      - uses: oven-sh/setup-bun@v2
-      - run: bun install
+      - run: cargo install wasm-pack
       - run: |
           mkdir dist
-          bun run build --target wasm32-wasip1-threads
+          wasm-pack build --release -d ./dist
       - uses: actions/upload-artifact@v4
         with:
           path: dist
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,12 +7,6 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = { version = "3.0.0-alpha.24", default-features = false, features = [
-    "napi8",
-] }
-napi-derive = { version = "3.0.0-alpha.22", default-features = false, features = [
-    "type-def",
-] }
 tree-sitter-agda = "1.3.3"
 tree-sitter-bash = "0.23.3"
 tree-sitter-c = "0.23.4"
@@ -33,10 +27,4 @@ tree-sitter-ruby = "0.23.1"
 tree-sitter-rust = "0.23.2"
 tree-sitter-scala = "0.23.4"
 tree-sitter-typescript = "0.23.2"
-
-[build-dependencies]
-napi-build = "2.1.4"
-
-[profile.release]
-lto = true
-strip = "symbols"
+wasm-bindgen = "0.2.99"
diff --git a/build.rs b/build.rs
diff --git a/package.json b/package.json
@@ -13,14 +13,7 @@
     "README.md",
     "package.json"
   ],
-  "napi": {
-    "binaryName": "highlight",
-    "targets": [
-      "wasm32-wasip1-threads"
-    ]
-  },
   "scripts": {
-    "build": "napi build --platform --release --strip -o ./dist",
     "bump": "bunx changelogen --bump && bun bump-version.ts"
   },
   "type": "module"

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,5 @@
-use napi_derive::napi;
 use tree_sitter_highlight::{Highlight, HighlightConfiguration, Highlighter, HtmlRenderer};
+use wasm_bindgen::prelude::*;
 
 fn get_highlight_query(language: String) -> String {
     let cpp = format!(
@@ -116,7 +116,7 @@ fn get_language(language: String) -> HighlightConfiguration {
     .unwrap()
 }
 
-#[napi]
+#[wasm_bindgen]
 pub fn highlight(highlight_names: Vec<String>, language: String, code: String) -> String {
     let mut highlighter = Highlighter::new();