diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd50d5f38..a6cf228e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,7 @@ concurrency: env: EMSCRIPTEN_VERSION: 'latest' + EMSCRIPTEN_VERSION_COI: '3.1.67' jobs: clang_format: @@ -456,7 +457,7 @@ jobs: - uses: mymindstorm/setup-emsdk@v14 with: - version: ${{ env.EMSCRIPTEN_VERSION }} + version: ${{ env.EMSCRIPTEN_VERSION_COI }} - name: Setup Ccache uses: hendrikmuhs/ccache-action@main @@ -586,7 +587,7 @@ jobs: - uses: mymindstorm/setup-emsdk@v14 with: - version: ${{ env.EMSCRIPTEN_VERSION }} + version: ${{ env.EMSCRIPTEN_VERSION_COI }} - name: Setup Ccache uses: hendrikmuhs/ccache-action@main diff --git a/packages/duckdb-wasm-app/src/app.tsx b/packages/duckdb-wasm-app/src/app.tsx index c146ddc5e..d72df00ca 100644 --- a/packages/duckdb-wasm-app/src/app.tsx +++ b/packages/duckdb-wasm-app/src/app.tsx @@ -30,7 +30,7 @@ const DUCKDB_BUNDLES: duckdb.DuckDBBundles = { mainModule: duckdb_wasm_coi, mainWorker: new URL('@duckdb/duckdb-wasm/dist/duckdb-browser-coi.worker.js', import.meta.url).toString(), pthreadWorker: new URL( - '@duckdb/duckdb-wasm/dist/duckdb-browser-coi.worker.js', + '@duckdb/duckdb-wasm/dist/duckdb-browser-coi.pthread.worker.js', import.meta.url, ).toString(), }, diff --git a/packages/duckdb-wasm/bundle.mjs b/packages/duckdb-wasm/bundle.mjs index 8563a0b3e..cb3b9efdd 100644 --- a/packages/duckdb-wasm/bundle.mjs +++ b/packages/duckdb-wasm/bundle.mjs @@ -104,7 +104,7 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist, patchFile('./src/bindings/duckdb-mvp.js', 'child_process'); patchFile('./src/bindings/duckdb-eh.js', 'child_process'); patchFile('./src/bindings/duckdb-coi.js', 'child_process'); - // patchFile('./src/bindings/duckdb-coi.pthread.js', 'vm'); + patchFile('./src/bindings/duckdb-coi.pthread.js', 'vm'); // ------------------------------- // Browser bundles @@ -216,7 +216,7 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist, external: EXTERNALS_WEBWORKER, define: { 'process.release.name': '"browser"' }, }); -/* + console.log('[ ESBUILD ] duckdb-browser-coi.pthread.worker.js'); await esbuild.build({ entryPoints: ['./src/targets/duckdb-browser-coi.pthread.worker.ts'], @@ -230,7 +230,7 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist, external: EXTERNALS_WEBWORKER, define: { 'process.release.name': '"browser"' }, }); -*/ + // ------------------------------- // Node bundles diff --git a/packages/duckdb-wasm/test/index_browser.ts b/packages/duckdb-wasm/test/index_browser.ts index 982094002..0e3ad0c75 100644 --- a/packages/duckdb-wasm/test/index_browser.ts +++ b/packages/duckdb-wasm/test/index_browser.ts @@ -15,7 +15,7 @@ const DUCKDB_BUNDLES: duckdb.DuckDBBundles = { coi: { mainModule: new URL('/static/duckdb-coi.wasm', window.location.href).href, mainWorker: new URL('/static/duckdb-browser-coi.worker.js', window.location.href).href, - pthreadWorker: new URL('/static/duckdb-browser-coi.worker.js', window.location.href).href, + pthreadWorker: new URL('/static/duckdb-browser-coi.pthread.worker.js', window.location.href).href, }, }; let DUCKDB_BUNDLE: duckdb.DuckDBBundle | null = null;