Merge pull request #19 from coilysiren/js

Javascript build

.github/workflows/action.yml

@@ -9,14 +9,30 @@ on:
       - main
 
 jobs:
-  test:
+  rust:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - run: curl -sSf https://sh.rustup.rs | sh -s -- -y
+
+      # rust
       - run: cargo build
       - run: cargo check
       - run: cargo test
-      - run: pip install tomlq
+
+      # wasm
+      - run: cargo install wasm-pack
+      - run: wasm-pack build --target web
+  js:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: curl -sSf https://sh.rustup.rs | sh -s -- -y
+      - run: wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
+
+      # wasm
       - run: cargo install wasm-pack
       - run: wasm-pack build --target web
+
+      # js
+      - run: npm ci

.gitignore

@@ -1,9 +1,3 @@
-/target
-**/*.rs.bk
-node_modules
-
-# the following entries are removed from this file on the deploy branch
-dist/
-pkg/
-*.wasm
-*.log
+wasm-pack.log
+target/
+node_modules/

makefile

@@ -3,41 +3,14 @@
 help:
 	@perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-25s\033[0m %s\n", $$1, $$2}'
 
-update:
-	brew upgrade
-	brew update
-	rustup self update
-	rustup update
-	rm Cargo.lock
-	cargo update
-	npm i -g npm
-
 install:
 	cargo build
 	npm install
 
-dev: ## dev (primary entrypoint)
-	npx concurrently \
-		-k -n rust,rust::test,js,js::test \
-		-c red,red,green,green \
-		"make build-rust-dev" \
-		"make test-rust-dev" \
-		"make build-js-dev" \
-		"make test-js-dev"
-
 test-rust:
 	cargo check
 	cargo test -- --color always
 
-test-rust-dev:
-	cargo watch -s "make test-rust"
-
-test-js:
-	npx karma start src/js/tests/karma.conf.js --singleRun=true
-
-test-js-dev:
-	npx karma start src/js/tests/karma.conf.js
-
 build-rust:
 	cargo build
 	make build-wasm