diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 6f1feec..fbff055 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -25,13 +25,11 @@ jobs: - name: Setup rust run: | - cargo install sqlx-cli wasm-pack cargo-machete - sqlx database create --database-url sqlite://db.sqlite3 - sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3 + cargo install wasm-pack cargo-machete - name: Build wasm run: | - wasm-pack build --target web + wasm-pack build --target web --features wasm - name: Lint run: | @@ -42,4 +40,4 @@ jobs: - name: Test run: | cargo test --verbose -- --include-ignored - wasm-pack test --node + wasm-pack test --node --features wasm diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 96180ba..b6eafaa 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -30,7 +30,7 @@ jobs: - name: Build wasm run: | cargo install wasm-pack - wasm-pack build --target web + wasm-pack build --target web --features wasm cp -R pkg/reconcile.js examples/website/ cp -R pkg/reconcile_bg.wasm examples/website/ diff --git a/scripts/dev-website.sh b/scripts/dev-website.sh index 39262fb..284908b 100755 --- a/scripts/dev-website.sh +++ b/scripts/dev-website.sh @@ -1,8 +1,12 @@ #!/bin/bash +rm -rf pkg + +wasm-pack build --target web --features wasm + cp -R pkg/reconcile.js examples/website/ cp -R pkg/reconcile_bg.wasm examples/website/ cd examples/website/ -python3 -m http.server $1 \ No newline at end of file +python3 -m http.server $1 diff --git a/tests/web.rs b/tests/web.rs index e5db786..a992051 100644 --- a/tests/web.rs +++ b/tests/web.rs @@ -1,4 +1,5 @@ -use insta::assert_debug_snapshot; +#![cfg(feature = "wasm")] + use reconcile::wasm::{ cursor::{JsCursorPosition, JsTextWithCursors}, lib::{is_binary, is_file_type_mergable, merge, merge_text, merge_text_with_cursors},