diff --git a/apps/example-react/CHANGELOG.md b/apps/example-react/CHANGELOG.md index bd18415..aa4e5e6 100644 --- a/apps/example-react/CHANGELOG.md +++ b/apps/example-react/CHANGELOG.md @@ -1,5 +1,12 @@ # example-react +## 1.1.1 + +### Patch Changes + +- Updated dependencies [f70472b] + - @microblink/capture@1.1.1 + ## 1.1.0 ### Patch Changes diff --git a/apps/example-react/package.json b/apps/example-react/package.json index 02fb594..b0ff270 100644 --- a/apps/example-react/package.json +++ b/apps/example-react/package.json @@ -1,7 +1,7 @@ { "name": "example-react", "private": true, - "version": "1.1.0", + "version": "1.1.1", "scripts": { "build": "tsc && vite build", "clean": "rimraf .turbo types dist public/resources *.tsbuildinfo", diff --git a/apps/example-solidjs/CHANGELOG.md b/apps/example-solidjs/CHANGELOG.md index 73cc986..fa8a03b 100644 --- a/apps/example-solidjs/CHANGELOG.md +++ b/apps/example-solidjs/CHANGELOG.md @@ -1,5 +1,12 @@ # example-solidjs +## 1.1.1 + +### Patch Changes + +- Updated dependencies [f70472b] + - @microblink/capture@1.1.1 + ## 1.1.0 ### Patch Changes diff --git a/apps/example-solidjs/package.json b/apps/example-solidjs/package.json index 5d338cb..92b5894 100644 --- a/apps/example-solidjs/package.json +++ b/apps/example-solidjs/package.json @@ -2,7 +2,7 @@ "name": "example-solidjs", "description": "", "private": true, - "version": "1.1.0", + "version": "1.1.1", "scripts": { "build": "vite build", "build:js-dev": "vite build --mode development", diff --git a/apps/example-vanilla-ts-headless/CHANGELOG.md b/apps/example-vanilla-ts-headless/CHANGELOG.md index 6433090..269dc1c 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 +## 1.1.1 + +### Patch Changes + +- Updated dependencies [f70472b] + - @microblink/capture@1.1.1 + ## 1.1.0 ### Patch Changes diff --git a/apps/example-vanilla-ts-headless/package.json b/apps/example-vanilla-ts-headless/package.json index 6356698..3bf6758 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": "1.1.0", + "version": "1.1.1", "scripts": { "build": "tsc && vite build", "clean": "rimraf dist public .turbo types", diff --git a/apps/example-vanilla-ts/CHANGELOG.md b/apps/example-vanilla-ts/CHANGELOG.md index bf94008..f078f3a 100644 --- a/apps/example-vanilla-ts/CHANGELOG.md +++ b/apps/example-vanilla-ts/CHANGELOG.md @@ -1,5 +1,12 @@ # example-vanilla-ts +## 1.1.1 + +### Patch Changes + +- Updated dependencies [f70472b] + - @microblink/capture@1.1.1 + ## 1.1.0 ### Patch Changes diff --git a/apps/example-vanilla-ts/package.json b/apps/example-vanilla-ts/package.json index ec500e3..fb461f8 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": "1.1.0", + "version": "1.1.1", "scripts": { "build": "tsc && vite build", "clean": "rimraf dist public .turbo types", diff --git a/packages/capture-main/CHANGELOG.md b/packages/capture-main/CHANGELOG.md index 3975c3d..fff4400 100644 --- a/packages/capture-main/CHANGELOG.md +++ b/packages/capture-main/CHANGELOG.md @@ -1,5 +1,13 @@ # capture-main +## 1.1.1 + +### Patch Changes + +- f70472b: Removed the use of `data:` protocols when loading cross-origin workers. Will only use the `blob:` to be more flexible with different CSPs. +- Updated dependencies [f70472b] + - capture-worker@1.1.1 + ## 1.0.7 ### Patch Changes diff --git a/packages/capture-main/package.json b/packages/capture-main/package.json index b380c81..769c3f2 100644 --- a/packages/capture-main/package.json +++ b/packages/capture-main/package.json @@ -2,7 +2,7 @@ "name": "capture-main", "description": "", "private": true, - "version": "1.0.7", + "version": "1.1.1", "author": "", "scripts": { "build": "concurrently pnpm:build:js pnpm:build:types", diff --git a/packages/capture-main/src/core/getCrossOriginWorkerURL.ts b/packages/capture-main/src/core/getCrossOriginWorkerURL.ts index f53dfc0..3233913 100644 --- a/packages/capture-main/src/core/getCrossOriginWorkerURL.ts +++ b/packages/capture-main/src/core/getCrossOriginWorkerURL.ts @@ -58,13 +58,15 @@ export const getCrossOriginWorkerURL = ( importScripts = (...urls) => _importScripts(...urls.map(_fixImports)); `; - let finalURL = - `data:${type},` + encodeURIComponent(importScriptsFix + codeString); + let finalURL = ""; if (options.useBlob) { - finalURL = URL.createObjectURL( - new Blob([`importScripts("${finalURL}")`], { type }), - ); + const blob = new Blob([importScriptsFix + codeString], { type }); + finalURL = URL.createObjectURL(blob); + } else { + finalURL = + `data:${type},` + + encodeURIComponent(importScriptsFix + codeString); } resolve(finalURL); diff --git a/packages/capture-published/CHANGELOG.md b/packages/capture-published/CHANGELOG.md index 3e4b7b0..f25fa8f 100644 --- a/packages/capture-published/CHANGELOG.md +++ b/packages/capture-published/CHANGELOG.md @@ -1,5 +1,11 @@ # @microblink/capture +## 1.1.1 + +### Patch Changes + +- Removed the use of `data:` protocols when loading cross-origin workers. Will only use the `blob:` to be more flexible with different CSPs. + ## 1.1.0 ### Minor Changes diff --git a/packages/capture-published/README.md b/packages/capture-published/README.md index a2bf915..4cd65bc 100644 --- a/packages/capture-published/README.md +++ b/packages/capture-published/README.md @@ -1,4 +1,4 @@ -![logo-microblink](assets/microblink-logo.png) +![logo-microblink](https://github.com/BlinkID/capture-browser/assets/2827047/ab8ab61b-ac82-4d84-8013-f6f2efe5bec5) # _Capture_ SDK for browsers diff --git a/packages/capture-published/create-npm.mts b/packages/capture-published/create-npm.mts index e3d49e1..5d0cb53 100644 --- a/packages/capture-published/create-npm.mts +++ b/packages/capture-published/create-npm.mts @@ -56,6 +56,11 @@ fs.writeFileSync( JSON.stringify(publishPackageJson, null, 2), ); +// get git root +const gitRoot = (await $`git rev-parse --show-toplevel`.quiet()) + .toString() + .trim(); + // copy readme file fs.copySync( `${releasePackagePath}/README.md`, diff --git a/packages/capture-published/package.json b/packages/capture-published/package.json index 7313cfd..d67d09d 100644 --- a/packages/capture-published/package.json +++ b/packages/capture-published/package.json @@ -3,7 +3,7 @@ "description": "", "homepage": "https://microblink.com/", "repository": "github:BlinkID/capture-browser", - "version": "1.1.0", + "version": "1.1.1", "scripts": { "build": "pnpm run create-npm", "clean": "rimraf .turbo types dist publish-dir public *.tsbuildinfo", @@ -39,7 +39,7 @@ "@mb/utils": "workspace:*", "@microsoft/api-extractor": "^7.38.0", "@types/emscripten": "^1.39.9", - "capture-main": "1.0.7", + "capture-main": "workspace:*", "capture-wasm": "workspace:*", "capture-worker": "workspace:*", "comlink": "^4.4.1", diff --git a/packages/capture-wasm/dist/advanced-threads/capture-wasm.wasm b/packages/capture-wasm/dist/advanced-threads/capture-wasm.wasm index 4670cc6..7197800 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.wasm b/packages/capture-wasm/dist/advanced/capture-wasm.wasm index d373f47..6fa13b4 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.wasm b/packages/capture-wasm/dist/basic/capture-wasm.wasm index 8744292..5f0b7f9 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..74b58f0 100644 --- a/packages/capture-worker/CHANGELOG.md +++ b/packages/capture-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # capture-worker +## 1.1.1 + +### Patch Changes + +- f70472b: Removed the use of `data:` protocols when loading cross-origin workers. Will only use the `blob:` to be more flexible with different CSPs. + ## 1.0.7 ### Patch Changes diff --git a/packages/capture-worker/package.json b/packages/capture-worker/package.json index acfe600..276d4ee 100644 --- a/packages/capture-worker/package.json +++ b/packages/capture-worker/package.json @@ -2,7 +2,7 @@ "name": "capture-worker", "description": "", "private": true, - "version": "1.0.7", + "version": "1.1.1", "scripts": { "build": "concurrently pnpm:build:js pnpm:build:types", "build:dev": "concurrently pnpm:build:js-dev pnpm:build:types", diff --git a/packages/capture-worker/src/getCrossOriginWorkerURL.ts b/packages/capture-worker/src/getCrossOriginWorkerURL.ts index ac2442d..bc16d9a 100644 --- a/packages/capture-worker/src/getCrossOriginWorkerURL.ts +++ b/packages/capture-worker/src/getCrossOriginWorkerURL.ts @@ -47,12 +47,13 @@ export const getCrossOriginWorkerURL = ( const workerPath = new URL(originalWorkerUrl).href.split("/"); workerPath.pop(); - let finalURL = `data:${type},` + encodeURIComponent(codeString); + let finalURL = ""; if (options.useBlob) { - finalURL = URL.createObjectURL( - new Blob([`importScripts("${finalURL}")`], { type }), - ); + const blob = new Blob([codeString], { type }); + finalURL = URL.createObjectURL(blob); + } else { + finalURL = `data:${type},` + encodeURIComponent(codeString); } resolve(finalURL); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 87244de..82bfac4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -356,7 +356,7 @@ importers: specifier: ^1.39.9 version: 1.39.9 capture-main: - specifier: 1.0.7 + specifier: workspace:* version: link:../capture-main capture-wasm: specifier: workspace:*