diff --git a/.gitignore b/.gitignore index 55f6feb..93cfad9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,macos,conan,cmake,c++,node .turbo +.venv ### C++ ### # Prerequisites diff --git a/apps/example-react/CHANGELOG.md b/apps/example-react/CHANGELOG.md index 855f42c..e39af65 100644 --- a/apps/example-react/CHANGELOG.md +++ b/apps/example-react/CHANGELOG.md @@ -1,5 +1,12 @@ # example-react +## 0.0.7 + +### Patch Changes + +- Updated dependencies + - @microblink/capture@1.0.8 + ## 0.0.6 ### Patch Changes diff --git a/apps/example-react/package.json b/apps/example-react/package.json index cb3b748..a6259fd 100644 --- a/apps/example-react/package.json +++ b/apps/example-react/package.json @@ -1,7 +1,7 @@ { "name": "example-react", "private": true, - "version": "0.0.6", + "version": "0.0.7", "type": "module", "scripts": { "dev": "vite", diff --git a/apps/example-solidjs-dist/CHANGELOG.md b/apps/example-solidjs-dist/CHANGELOG.md index 17ad729..64a0042 100644 --- a/apps/example-solidjs-dist/CHANGELOG.md +++ b/apps/example-solidjs-dist/CHANGELOG.md @@ -1,5 +1,12 @@ # example-solidjs-dist +## 0.0.7 + +### Patch Changes + +- Updated dependencies + - @microblink/capture@1.0.8 + ## 0.0.6 ### Patch Changes diff --git a/apps/example-solidjs-dist/package.json b/apps/example-solidjs-dist/package.json index ad0af6f..23404bd 100644 --- a/apps/example-solidjs-dist/package.json +++ b/apps/example-solidjs-dist/package.json @@ -1,6 +1,6 @@ { "name": "example-solidjs-dist", - "version": "0.0.6", + "version": "0.0.7", "private": true, "type": "module", "description": "This example runs uses the @microblink/capture bundled module", diff --git a/apps/example-solidjs/CHANGELOG.md b/apps/example-solidjs/CHANGELOG.md index 8340ea3..dbc02ba 100644 --- a/apps/example-solidjs/CHANGELOG.md +++ b/apps/example-solidjs/CHANGELOG.md @@ -1,5 +1,12 @@ # example-solidjs +## 0.0.4 + +### Patch Changes + +- capture-main@1.0.8 +- capture-ui@1.0.8 + ## 0.0.3 ### Patch Changes diff --git a/apps/example-solidjs/package.json b/apps/example-solidjs/package.json index 740c5e6..dca8387 100644 --- a/apps/example-solidjs/package.json +++ b/apps/example-solidjs/package.json @@ -1,6 +1,6 @@ { "name": "example-solidjs", - "version": "0.0.3", + "version": "0.0.4", "private": true, "type": "module", "description": "", diff --git a/apps/example-vanilla-ts-headless/CHANGELOG.md b/apps/example-vanilla-ts-headless/CHANGELOG.md index cba23c8..170716b 100644 --- a/apps/example-vanilla-ts-headless/CHANGELOG.md +++ b/apps/example-vanilla-ts-headless/CHANGELOG.md @@ -1,5 +1,12 @@ # example-vanilla-ts-headless +## 0.0.7 + +### Patch Changes + +- Updated dependencies + - @microblink/capture@1.0.8 + ## 0.0.6 ### Patch Changes diff --git a/apps/example-vanilla-ts-headless/package.json b/apps/example-vanilla-ts-headless/package.json index 82ac0b0..1a1f3f5 100644 --- a/apps/example-vanilla-ts-headless/package.json +++ b/apps/example-vanilla-ts-headless/package.json @@ -1,7 +1,7 @@ { "name": "example-vanilla-ts-headless", "private": true, - "version": "0.0.6", + "version": "0.0.7", "type": "module", "scripts": { "dev": "vite", diff --git a/apps/example-vanilla-ts/CHANGELOG.md b/apps/example-vanilla-ts/CHANGELOG.md index 580e6e9..f669936 100644 --- a/apps/example-vanilla-ts/CHANGELOG.md +++ b/apps/example-vanilla-ts/CHANGELOG.md @@ -1,5 +1,12 @@ # example-vanilla-ts +## 0.0.7 + +### Patch Changes + +- Updated dependencies + - @microblink/capture@1.0.8 + ## 0.0.6 ### Patch Changes diff --git a/apps/example-vanilla-ts/package.json b/apps/example-vanilla-ts/package.json index 393bf82..b94c750 100644 --- a/apps/example-vanilla-ts/package.json +++ b/apps/example-vanilla-ts/package.json @@ -1,7 +1,7 @@ { "name": "example-vanilla-ts", "private": true, - "version": "0.0.6", + "version": "0.0.7", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/capture-main/CHANGELOG.md b/packages/capture-main/CHANGELOG.md index 3975c3d..bc38ff6 100644 --- a/packages/capture-main/CHANGELOG.md +++ b/packages/capture-main/CHANGELOG.md @@ -1,5 +1,12 @@ # capture-main +## 1.0.8 + +### Patch Changes + +- Updated dependencies + - capture-worker@1.0.8 + ## 1.0.7 ### Patch Changes diff --git a/packages/capture-main/package.json b/packages/capture-main/package.json index c83c906..4d22388 100644 --- a/packages/capture-main/package.json +++ b/packages/capture-main/package.json @@ -1,6 +1,6 @@ { "name": "capture-main", - "version": "1.0.7", + "version": "1.0.8", "private": true, "description": "", "scripts": { diff --git a/packages/capture-ui/CHANGELOG.md b/packages/capture-ui/CHANGELOG.md index 316a493..37094bf 100644 --- a/packages/capture-ui/CHANGELOG.md +++ b/packages/capture-ui/CHANGELOG.md @@ -1,5 +1,11 @@ # capture-ui +## 1.0.8 + +### Patch Changes + +- capture-main@1.0.8 + ## 1.0.7 ### Patch Changes diff --git a/packages/capture-ui/package.json b/packages/capture-ui/package.json index 7824a9d..6fb33af 100644 --- a/packages/capture-ui/package.json +++ b/packages/capture-ui/package.json @@ -1,6 +1,6 @@ { "name": "capture-ui", - "version": "1.0.7", + "version": "1.0.8", "private": true, "type": "module", "description": "", diff --git a/packages/capture-wasm/dist/advanced-threads/capture-wasm.js b/packages/capture-wasm/dist/advanced-threads/capture-wasm.js index f9a9207..6460bc0 100644 --- a/packages/capture-wasm/dist/advanced-threads/capture-wasm.js +++ b/packages/capture-wasm/dist/advanced-threads/capture-wasm.js @@ -105,7 +105,7 @@ var createModule = (() => { for (var k = 0; k < r.length; ++k) m.prototype.bc[r[k].filename].onload(); D.removeRunDependency( - "datafile_/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/advanced-threads/capture-wasm.data", + "datafile_/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/advanced-threads/capture-wasm.data", ); } D.FS_createPath("/", "microblink", !0, !0); @@ -133,11 +133,11 @@ var createModule = (() => { q[p].filename, ); D.addRunDependency( - "datafile_/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/advanced-threads/capture-wasm.data", + "datafile_/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/advanced-threads/capture-wasm.data", ); D.sc || (D.sc = {}); D.sc[ - "/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/advanced-threads/capture-wasm.data" + "/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/advanced-threads/capture-wasm.data" ] = { Cd: !1 }; l ? (n(l), (l = null)) : (h = n); } diff --git a/packages/capture-wasm/dist/advanced-threads/capture-wasm.wasm b/packages/capture-wasm/dist/advanced-threads/capture-wasm.wasm index bdf742a..beba28e 100755 Binary files a/packages/capture-wasm/dist/advanced-threads/capture-wasm.wasm and b/packages/capture-wasm/dist/advanced-threads/capture-wasm.wasm differ diff --git a/packages/capture-wasm/dist/advanced/capture-wasm.js b/packages/capture-wasm/dist/advanced/capture-wasm.js index a695b06..0b269ca 100644 --- a/packages/capture-wasm/dist/advanced/capture-wasm.js +++ b/packages/capture-wasm/dist/advanced/capture-wasm.js @@ -77,7 +77,7 @@ var createModule = (() => { for (var k = 0; k < q.length; ++k) m.prototype.Cb[q[k].filename].onload(); h.removeRunDependency( - "datafile_/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/advanced/capture-wasm.data", + "datafile_/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/advanced/capture-wasm.data", ); } h.FS_createPath("/", "microblink", !0, !0); @@ -105,11 +105,11 @@ var createModule = (() => { r[p].filename, ); h.addRunDependency( - "datafile_/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/advanced/capture-wasm.data", + "datafile_/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/advanced/capture-wasm.data", ); h.Qb || (h.Qb = {}); h.Qb[ - "/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/advanced/capture-wasm.data" + "/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/advanced/capture-wasm.data" ] = { Kc: !1 }; l ? (n(l), (l = null)) : (g = n); } diff --git a/packages/capture-wasm/dist/advanced/capture-wasm.wasm b/packages/capture-wasm/dist/advanced/capture-wasm.wasm index fbc1bf7..0518523 100755 Binary files a/packages/capture-wasm/dist/advanced/capture-wasm.wasm and b/packages/capture-wasm/dist/advanced/capture-wasm.wasm differ diff --git a/packages/capture-wasm/dist/basic/capture-wasm.js b/packages/capture-wasm/dist/basic/capture-wasm.js index f111e00..e457ecc 100644 --- a/packages/capture-wasm/dist/basic/capture-wasm.js +++ b/packages/capture-wasm/dist/basic/capture-wasm.js @@ -77,7 +77,7 @@ var createModule = (() => { for (var k = 0; k < q.length; ++k) m.prototype.Cb[q[k].filename].onload(); h.removeRunDependency( - "datafile_/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/basic/capture-wasm.data", + "datafile_/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/basic/capture-wasm.data", ); } h.FS_createPath("/", "microblink", !0, !0); @@ -105,11 +105,11 @@ var createModule = (() => { r[p].filename, ); h.addRunDependency( - "datafile_/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/basic/capture-wasm.data", + "datafile_/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/basic/capture-wasm.data", ); h.Qb || (h.Qb = {}); h.Qb[ - "/Users/ivan/Dev/imagecapture-browser/packages/capture-wasm/dist/basic/capture-wasm.data" + "/Users/ivan/Dev/imagecapture-browser.worktrees/master/packages/capture-wasm/dist/basic/capture-wasm.data" ] = { Kc: !1 }; l ? (n(l), (l = null)) : (g = n); } diff --git a/packages/capture-wasm/dist/basic/capture-wasm.wasm b/packages/capture-wasm/dist/basic/capture-wasm.wasm index b08eb01..321e28f 100755 Binary files a/packages/capture-wasm/dist/basic/capture-wasm.wasm and b/packages/capture-wasm/dist/basic/capture-wasm.wasm differ diff --git a/packages/capture-worker/CHANGELOG.md b/packages/capture-worker/CHANGELOG.md index 81fc07a..0070ff1 100644 --- a/packages/capture-worker/CHANGELOG.md +++ b/packages/capture-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # capture-worker +## 1.0.8 + +### Patch Changes + +- Bugfix: prevent loading cross-origin worker on non-threaded builds + ## 1.0.7 ### Patch Changes diff --git a/packages/capture-worker/package.json b/packages/capture-worker/package.json index 53e20ad..f342413 100644 --- a/packages/capture-worker/package.json +++ b/packages/capture-worker/package.json @@ -1,6 +1,6 @@ { "name": "capture-worker", - "version": "1.0.7", + "version": "1.0.8", "private": true, "description": "", "scripts": { diff --git a/packages/capture-worker/src/wasm-feature-detect.ts b/packages/capture-worker/src/wasm-feature-detect.ts index fa155ce..0b6e5c5 100644 --- a/packages/capture-worker/src/wasm-feature-detect.ts +++ b/packages/capture-worker/src/wasm-feature-detect.ts @@ -46,7 +46,7 @@ export default async function checkThreadsSupport(): Promise { return "Worker" in self; } -type WasmVariant = "basic" | "advanced" | "advanced-threads"; +export type WasmVariant = "basic" | "advanced" | "advanced-threads"; export async function detectWasmFeatures(): Promise { const basicSet = [ diff --git a/packages/capture-worker/src/worker.ts b/packages/capture-worker/src/worker.ts index 2c27cd2..2fc6ddc 100644 --- a/packages/capture-worker/src/worker.ts +++ b/packages/capture-worker/src/worker.ts @@ -10,10 +10,10 @@ */ /* eslint-disable @typescript-eslint/ban-ts-comment */ -import { expose, finalizer, proxy } from "comlink"; import { Analyzer, CaptureWasmModule } from "capture-wasm"; -import { detectWasmFeatures } from "./wasm-feature-detect"; +import { expose, finalizer, proxy } from "comlink"; import { getCrossOriginWorkerURL } from "./getCrossOriginWorkerURL"; +import { detectWasmFeatures } from "./wasm-feature-detect"; declare global { interface WorkerGlobalScope { @@ -37,6 +37,7 @@ console.log("Worker loaded"); async function loadWasm() { // TODO: Error handling const wasmVariant = await detectWasmFeatures(); + console.log(`Requesting ${wasmVariant} Wasm build`); const variantUrl = `${resourceUrl}/${wasmVariant}`; @@ -44,8 +45,13 @@ async function loadWasm() { const loaderUrl = `${variantUrl}/capture-wasm.js`; const workerUrl = `${variantUrl}/capture-wasm.worker.js`; + let crossOriginWorkerUrl: string; + const crossOriginLoaderUrl = await getCrossOriginWorkerURL(loaderUrl); - const crossOriginWorkerUrl = await getCrossOriginWorkerURL(workerUrl); + + if (wasmVariant === "advanced-threads") { + crossOriginWorkerUrl = await getCrossOriginWorkerURL(workerUrl); + } try { importScripts(crossOriginLoaderUrl); diff --git a/packages/capture/CHANGELOG.md b/packages/capture/CHANGELOG.md index 3b8a54c..f36d7f6 100644 --- a/packages/capture/CHANGELOG.md +++ b/packages/capture/CHANGELOG.md @@ -1,5 +1,13 @@ # @microblink/capture +## 1.0.8 + +### Patch Changes + +- Bugfix: prevent loading cross-origin worker on non-threaded builds + - capture-main@1.0.8 + - capture-ui@1.0.8 + ## 1.0.7 ### Patch Changes diff --git a/packages/capture/npm-publish/package.json b/packages/capture/npm-publish/package.json index 7819393..d475c10 100644 --- a/packages/capture/npm-publish/package.json +++ b/packages/capture/npm-publish/package.json @@ -3,7 +3,7 @@ "description": "Wasm prebuilts + TS types", "homepage": "https://microblink.com/", "repository": "github:BlinkID/capture-browser", - "version": "1.0.7", + "version": "1.0.8", "type": "module", "files": [ "dist", diff --git a/packages/capture/package.json b/packages/capture/package.json index 5f5ad7e..d8c5f16 100644 --- a/packages/capture/package.json +++ b/packages/capture/package.json @@ -3,7 +3,7 @@ "description": "", "homepage": "https://microblink.com/", "repository": "github:BlinkID/capture-browser", - "version": "1.0.7", + "version": "1.0.8", "scripts": { "rollup": "api-extractor run --local --verbose", "build:js": "vite build",