diff --git a/Makefile b/Makefile index 35db27ed..b8f8e7e5 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ default: frontend clean: cargo clean + rm -rf browser/pkg || true rm ./src/cache_buster_data.json || true rm -rf ./static/cache/bundle || true rm -rf ./assets || true @@ -48,7 +49,8 @@ run: frontend cargo run test: frontend-test frontend - tree assets || true + echo 'static/' && tree static || true + echo 'tree/' && tree assets || true cargo test --all-features --no-fail-fast xml-test-coverage: migrate diff --git a/build.rs b/build.rs index de202120..95565aa6 100644 --- a/build.rs +++ b/build.rs @@ -51,7 +51,7 @@ fn cache_bust() { let no_hash = vec![NoHashCategory::FileExtentions(vec!["wasm"])]; let config = BusterBuilder::default() - .source("./static/cache") + .source("./static/cache/") .result("./assets") .copy(true) .no_hash(no_hash) diff --git a/package.json b/package.json index 66537142..ecff0bed 100644 --- a/package.json +++ b/package.json @@ -29,5 +29,8 @@ "webpack": "^5.0.0", "webpack-cli": "^4.6.0", "webpack-dev-server": "^3.1.14" + }, + "dependencies": { + "mcaptcha-browser": "./browser/pkg/" } } diff --git a/templates/widget/js/prove.ts b/templates/widget/js/prove.ts index d40bb88a..dd7aebae 100644 --- a/templates/widget/js/prove.ts +++ b/templates/widget/js/prove.ts @@ -9,7 +9,7 @@ * MIT or for Apache. */ -import {gen_pow} from '../../../browser/pkg/mcaptcha_browser'; +import {gen_pow} from 'mcaptcha-browser'; import {PoWConfig} from './fetchPoWConfig'; import * as CONST from './const'; diff --git a/yarn.lock b/yarn.lock index cba31c6a..35347d32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3944,6 +3944,9 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +mcaptcha-browser@./browser/pkg/: + version "0.1.0" + mdn-data@2.0.14: version "2.0.14" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"