Skip to content

Patch all bindings #1546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mytherin merged 2 commits into from
Jan 2, 2024
Merged

Patch all bindings #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dfaf65
Patch all bindings
Y-- Dec 22, 2023
be455f7
Update .gitignore
Y-- Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ lib/.idea

check_duckdb
wasm_setup
loadable_extensions/*.wasm
loadable_extensions
24 changes: 13 additions & 11 deletions packages/duckdb-wasm/bundle.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-eh.wasm'), path.resolve(dist,
fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist, 'duckdb-coi.wasm'), printErr);

(async () => {
// Don't attempt to bundle NodeJS modules in the browser build.
console.log('[ ESBUILD ] Patch bindings');
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');

// -------------------------------
// Browser bundles

Expand Down Expand Up @@ -132,13 +139,6 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist,
});

console.log('[ ESBUILD ] duckdb-browser-blocking.cjs');
// Don't attempt to bundle NodeJS modules in the browser build.
execSync(
`sed -i.bak 's/require("child_process")/["child_process"].map(require)/g' ./src/bindings/duckdb-mvp.js && rm ./src/bindings/duckdb-mvp.js.bak`,
);
execSync(
`sed -i.bak 's/require("child_process")/["child_process"].map(require)/g' ./src/bindings/duckdb-eh.js && rm ./src/bindings/duckdb-eh.js.bak`,
);
await esbuild.build({
entryPoints: ['./src/targets/duckdb-browser-blocking.ts'],
outfile: 'dist/duckdb-browser-blocking.cjs',
Expand Down Expand Up @@ -203,10 +203,6 @@ 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',
Expand Down Expand Up @@ -361,3 +357,9 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist,
console.log(`Patched ${file}`);
}
})();

function patchFile(fileName, moduleName) {
// Patch file to make sure ESBuild doesn't statically analyse and attempt to load "moduleName"
const sedCommand = `s/require("${moduleName}")/["${moduleName}"].map(require)/g`;
execSync(`sed -i.bak '${sedCommand}' ${fileName} && rm ${fileName}.bak`);
}