From 68213990232025a2b8bc5b02ee4d37c04015532a Mon Sep 17 00:00:00 2001 From: Yves Date: Thu, 14 Dec 2023 09:41:50 -0500 Subject: [PATCH 1/2] Update .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index f5d6fe310..f5132f693 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,7 @@ compile_commands.json data/tpch/**/*.parquet .idea lib/.idea + +check_duckdb +wasm_setup +loadable_extensions/*.wasm From 68903ad3fad94732cd192e58ee3ce5758a1b2b09 Mon Sep 17 00:00:00 2001 From: Yves Date: Thu, 14 Dec 2023 11:25:44 -0500 Subject: [PATCH 2/2] Preven esbuild from attempting to bundle `vm` --- packages/duckdb-wasm/bundle.mjs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/duckdb-wasm/bundle.mjs b/packages/duckdb-wasm/bundle.mjs index 81b118166..713369b71 100644 --- a/packages/duckdb-wasm/bundle.mjs +++ b/packages/duckdb-wasm/bundle.mjs @@ -4,6 +4,7 @@ import path from 'path'; import { rimrafSync } from 'rimraf'; import mkdir from 'make-dir'; import { fileURLToPath } from 'url'; +import { execSync } from 'child_process'; // ------------------------------- // Current bundling strategy @@ -195,6 +196,10 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist, }); console.log('[ ESBUILD ] duckdb-browser-coi.worker.js'); + // Don't attempt to bundle NodeJS modules in the browser build. + execSync( + `sed -i.bak 's/require("vm")/["vm"].map(require)/g' ./src/bindings/duckdb-coi.pthread.js && rm ./src/bindings/duckdb-coi.pthread.js.bak`, + ); await esbuild.build({ entryPoints: ['./src/targets/duckdb-browser-coi.worker.ts'], outfile: 'dist/duckdb-browser-coi.worker.js',