remove co-located duckdb package

githubocto · mattrothenberg · May 12, 2022 · May 12, 2022 · May 12, 2022 · May 12, 2022
commit 99055d60fc2b12d5df58bb92162426b04b5fba17
diff --git a/package.json b/package.json
@@ -22,7 +22,6 @@
     "d3-dsv": "^2.0.0",
     "date-fns": "^2.19.0",
     "downshift": "^6.1.0",
-    "duckdb": "^0.3.4",
     "formik": "^2.2.6",
     "lodash": "^4.17.21",
     "lodash.debounce": "^4.0.8",
@@ -60,6 +59,6 @@
     "postcss": "^8.2.8",
     "tailwindcss": "^3.0.24",
     "typescript": "^4.1.2",
-    "vite": "^2.0.5"
+    "vite": "^2.9.9"
   }
 }
diff --git a/public/duckdb/duckdb-browser-blocking.cjs b/public/duckdb/duckdb-browser-blocking.cjs
diff --git a/public/duckdb/duckdb-browser-blocking.cjs.map b/public/duckdb/duckdb-browser-blocking.cjs.map
diff --git a/public/duckdb/duckdb-browser-blocking.d.ts b/public/duckdb/duckdb-browser-blocking.d.ts
diff --git a/public/duckdb/duckdb-browser-blocking.mjs b/public/duckdb/duckdb-browser-blocking.mjs
diff --git a/public/duckdb/duckdb-browser-blocking.mjs.map b/public/duckdb/duckdb-browser-blocking.mjs.map
diff --git a/public/duckdb/duckdb-browser-coi.pthread.worker.js b/public/duckdb/duckdb-browser-coi.pthread.worker.js
diff --git a/public/duckdb/duckdb-browser-coi.pthread.worker.js.map b/public/duckdb/duckdb-browser-coi.pthread.worker.js.map
diff --git a/public/duckdb/duckdb-browser-coi.worker.js b/public/duckdb/duckdb-browser-coi.worker.js
diff --git a/public/duckdb/duckdb-browser-coi.worker.js.map b/public/duckdb/duckdb-browser-coi.worker.js.map
diff --git a/public/duckdb/duckdb-browser-eh.worker.js b/public/duckdb/duckdb-browser-eh.worker.js
diff --git a/public/duckdb/duckdb-browser-eh.worker.js.map b/public/duckdb/duckdb-browser-eh.worker.js.map
diff --git a/public/duckdb/duckdb-browser-mvp.worker.js b/public/duckdb/duckdb-browser-mvp.worker.js
diff --git a/public/duckdb/duckdb-browser-mvp.worker.js.map b/public/duckdb/duckdb-browser-mvp.worker.js.map
diff --git a/public/duckdb/duckdb-browser.cjs b/public/duckdb/duckdb-browser.cjs
diff --git a/public/duckdb/duckdb-browser.cjs.map b/public/duckdb/duckdb-browser.cjs.map
diff --git a/public/duckdb/duckdb-browser.d.ts b/public/duckdb/duckdb-browser.d.ts
diff --git a/public/duckdb/duckdb-browser.mjs b/public/duckdb/duckdb-browser.mjs
diff --git a/public/duckdb/duckdb-browser.mjs.map b/public/duckdb/duckdb-browser.mjs.map
diff --git a/public/duckdb/duckdb-coi.wasm b/public/duckdb/duckdb-coi.wasm
diff --git a/public/duckdb/duckdb-eh.wasm b/public/duckdb/duckdb-eh.wasm
diff --git a/public/duckdb/duckdb-mvp.wasm b/public/duckdb/duckdb-mvp.wasm
diff --git a/public/duckdb/duckdb-node-blocking.cjs b/public/duckdb/duckdb-node-blocking.cjs
diff --git a/public/duckdb/duckdb-node-blocking.cjs.map b/public/duckdb/duckdb-node-blocking.cjs.map
diff --git a/public/duckdb/duckdb-node-blocking.d.ts b/public/duckdb/duckdb-node-blocking.d.ts
diff --git a/public/duckdb/duckdb-node-eh.worker.cjs b/public/duckdb/duckdb-node-eh.worker.cjs
diff --git a/public/duckdb/duckdb-node-eh.worker.cjs.map b/public/duckdb/duckdb-node-eh.worker.cjs.map
diff --git a/public/duckdb/duckdb-node-mvp.worker.cjs b/public/duckdb/duckdb-node-mvp.worker.cjs
diff --git a/public/duckdb/duckdb-node-mvp.worker.cjs.map b/public/duckdb/duckdb-node-mvp.worker.cjs.map
diff --git a/public/duckdb/duckdb-node.cjs b/public/duckdb/duckdb-node.cjs
diff --git a/public/duckdb/duckdb-node.cjs.map b/public/duckdb/duckdb-node.cjs.map
diff --git a/public/duckdb/duckdb-node.d.ts b/public/duckdb/duckdb-node.d.ts
diff --git a/src/components/db-explorer.tsx b/src/components/db-explorer.tsx
@@ -1,5 +1,4 @@
 import { sql } from "@codemirror/lang-sql";
-import * as duckdb from "@duckdb/duckdb-wasm";
 import { Grid } from "@githubocto/flat-ui";
 import CodeMirror from "@uiw/react-codemirror";
 import React, { useEffect, useMemo, useRef, useState } from "react";
@@ -11,6 +10,11 @@ import { ErrorState } from "./error-state";
 import { LoadingState } from "./loading-state";
 import { Spinner } from "./spinner";
 
+import * as duckdb from "@duckdb/duckdb-wasm";
+import duckdb_wasm from "@duckdb/duckdb-wasm/dist/duckdb-mvp.wasm?url";
+import duckdb_wasm_next from "@duckdb/duckdb-wasm/dist/duckdb-eh.wasm?url";
+import eh_worker from "@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js?url";
+
 interface Props {
   sha: string;
   filename: string;
@@ -62,12 +66,12 @@ function DBExplorerInner(props: DBExplorerInnerProps) {
     const initDuckDb = async () => {
       const MANUAL_BUNDLES: duckdb.DuckDBBundles = {
         mvp: {
-          mainModule: "/duckdb/duckdb.wasm",
-          mainWorker: "/duckdb/duckdb-browser-mvp.worker.js",
+          mainModule: duckdb_wasm,
+          mainWorker: eh_worker,
         },
         eh: {
-          mainModule: "/duckdb/duckdb-eh.wasm",
-          mainWorker: "/duckdb/duckdb-browser-eh.worker.js",
+          mainModule: duckdb_wasm_next,
+          mainWorker: eh_worker,
         },
       };
       const bundle = await duckdb.selectBundle(MANUAL_BUNDLES);

diff --git a/yarn.lock b/yarn.lock