Skip to content

Commit 8fb754b

Browse files
committed
fix npm import resolution; pin Arrow (17) for DuckDB-Wasm (1.29.0)
1 parent 6b250e0 commit 8fb754b

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

src/javascript/imports/npm.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ function getDefaultRange(name: string): string {
3939
switch (name) {
4040
case "@duckdb/duckdb-wasm":
4141
return "@1.29.0"; // https://github.com/duckdb/duckdb-wasm/issues/1994
42+
case "apache-arrow":
43+
return "@17.0.0"; // to match @duckdb/duckdb-wasm 1.29.0
4244
default:
4345
return "";
4446
}

src/runtime/stdlib/duckdb.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import * as duckdb from "npm:@duckdb/duckdb-wasm";
3131

3232
const bundles = {
3333
mvp: {
34-
mainModule: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm/dist/duckdb-mvp.wasm",
35-
mainWorker: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm/dist/duckdb-browser-mvp.worker.js"
34+
mainModule: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-mvp.wasm",
35+
mainWorker: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-mvp.worker.js"
3636
},
3737
eh: {
38-
mainModule: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm/dist/duckdb-eh.wasm",
39-
mainWorker: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js"
38+
mainModule: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-eh.wasm",
39+
mainWorker: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-eh.worker.js"
4040
}
4141
};
4242
const bundle = duckdb.selectBundle(bundles);

src/vite/config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {dirname, resolve} from "node:path";
22
import {fileURLToPath} from "node:url";
33
import type {UserConfig} from "vite";
4+
import {resolveNpmImport} from "../javascript/imports/npm.js";
45

56
const __filename = fileURLToPath(import.meta.url);
67
const __dirname = dirname(__filename);
@@ -17,8 +18,9 @@ export function config(): UserConfig {
1718
resolve: {
1819
alias: [
1920
{
20-
find: /^npm:(.*)$/,
21-
replacement: "https://cdn.jsdelivr.net/npm/$1/+esm"
21+
find: /^(npm:.*)$/,
22+
replacement: "$1",
23+
customResolver: resolveNpmImport
2224
},
2325
{
2426
find: /^jsr:(.*)$/,

0 commit comments

Comments
 (0)