Release 1.0.8

BlinkID · Oct 23, 2023 · 427c6f7 · 427c6f7
1 parent 3156dd3
commit 427c6f7
Show file tree

Hide file tree

Showing 28 changed files with 92 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,12 @@
 # example-solidjs
 
+## 0.0.4
+
+### Patch Changes
+
+- [email protected]
+- [email protected]
+
 ## 0.0.3
 
 ### Patch Changes

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,12 @@
 # capture-main
 
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+
 ## 1.0.7
 
 ### Patch Changes

diff --git 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
@@ -1,5 +1,11 @@
 # capture-ui
 
+## 1.0.8
+
+### Patch Changes
+
+- [email protected]
+
 ## 1.0.7
 
 ### Patch Changes

diff --git 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
@@ -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
diff --git 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
diff --git 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
diff --git 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
@@ -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
@@ -46,7 +46,7 @@ export default async function checkThreadsSupport(): Promise<boolean> {
   return "Worker" in self;
 }
 
-type WasmVariant = "basic" | "advanced" | "advanced-threads";
+export type WasmVariant = "basic" | "advanced" | "advanced-threads";
 
 export async function detectWasmFeatures(): Promise<WasmVariant> {
   const basicSet = [

diff --git 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,15 +37,21 @@ console.log("Worker loaded");
 async function loadWasm() {
   // TODO: Error handling
   const wasmVariant = await detectWasmFeatures();
+
   console.log(`Requesting ${wasmVariant} Wasm build`);
 
   const variantUrl = `${resourceUrl}/${wasmVariant}`;
 
   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
@@ -1,5 +1,13 @@
 # @microblink/capture
 
+## 1.0.8
+
+### Patch Changes
+
+- Bugfix: prevent loading cross-origin worker on non-threaded builds
+  - [email protected]
+  - [email protected]
+
 ## 1.0.7
 
 ### Patch Changes

diff --git 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
@@ -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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,macos,conan,cmake,c++,node
     .turbo
+    .venv
     ### C++ ###
     # Prerequisites
@@ Expand Down @@