Spaces:

cephalization
/

quack

Running

App Files Files Community

Tony Powell commited on Oct 5, 2024

Commit

d567792

1 Parent(s): e6a8261

Serve duckdb wasm from cdn in production

Browse files

Files changed (8) hide show

dist/assets/duckdb-eh-CL-fYs8o.wasm +0 -3
dist/assets/duckdb-mvp-CI5K6Di1.wasm +0 -3
dist/assets/{index-Ca_b_QWh.js → index-D5yLWlyE.js} +0 -0
dist/index.html +1 -1
package.json +2 -1
pnpm-lock.yaml +58 -0
src/duck.ts +44 -15
vite.config.ts +2 -2

dist/assets/duckdb-eh-CL-fYs8o.wasm DELETED Viewed

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38c0a08bb304ffdffcf3b9066da29b0f9c541d0c1e0edbeba0063580a301c177
-size 33317702

dist/assets/duckdb-mvp-CI5K6Di1.wasm DELETED Viewed

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73fe41d7fba91ed42ae510b12115ebd8e9b54c32683bac4da8b02ab9641b4b21
-size 36927547

dist/assets/{index-Ca_b_QWh.js → index-D5yLWlyE.js} RENAMED Viewed

The diff for this file is too large to render. See raw diff

dist/index.html CHANGED Viewed

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React + TS</title>
     <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
-    <script type="module" crossorigin src="/assets/index-Ca_b_QWh.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CcNIbOfP.css">
   </head>
   <body>

     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React + TS</title>
     <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
+    <script type="module" crossorigin src="/assets/index-D5yLWlyE.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CcNIbOfP.css">
   </head>
   <body>

package.json CHANGED Viewed

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "vite",
-    "build": "tsc -b && vite build",
     "lint": "eslint .",
     "preview": "vite preview"
   },
@@ -34,6 +34,7 @@
     "eslint-plugin-react-refresh": "^0.4.12",
     "globals": "^15.9.0",
     "postcss": "^8.4.47",
     "tailwindcss": "^3.4.13",
     "tsx": "^4.19.1",
     "typescript": "^5.5.3",

   "license": "MIT",
   "scripts": {
     "dev": "vite",
+    "build": "tsc -b && vite build && rimraf dist/assets/*.wasm",
     "lint": "eslint .",
     "preview": "vite preview"
   },
     "eslint-plugin-react-refresh": "^0.4.12",
     "globals": "^15.9.0",
     "postcss": "^8.4.47",
+    "rimraf": "^6.0.1",
     "tailwindcss": "^3.4.13",
     "tsx": "^4.19.1",
     "typescript": "^5.5.3",

pnpm-lock.yaml CHANGED Viewed

@@ -72,6 +72,9 @@ importers:
       postcss:
         specifier: ^8.4.47
         version: 8.4.47
       tailwindcss:
         specifier: ^3.4.13
         version: 3.4.13([email protected](@types/[email protected])([email protected]))
@@ -1353,6 +1356,11 @@ packages:
     resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
     hasBin: true
   [email protected]:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
@@ -1422,6 +1430,10 @@ packages:
   [email protected]:
     resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
   [email protected]:
     resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
     hasBin: true
@@ -1494,6 +1506,10 @@ packages:
   [email protected]:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
   [email protected]:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
@@ -1513,6 +1529,10 @@ packages:
     resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
   [email protected]:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
@@ -1595,6 +1615,10 @@ packages:
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
   [email protected]:
     resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
@@ -1701,6 +1725,11 @@ packages:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
   [email protected]:
     resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
@@ -3152,6 +3181,15 @@ snapshots:
       package-json-from-dist: 1.0.1
       path-scurry: 1.11.1
   [email protected]: {}
   [email protected]: {}
@@ -3203,6 +3241,10 @@ snapshots:
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
   [email protected]: {}
   [email protected]: {}
@@ -3254,6 +3296,8 @@ snapshots:
   [email protected]: {}
   [email protected]:
     dependencies:
       yallist: 3.1.1
@@ -3272,6 +3316,10 @@ snapshots:
       braces: 3.0.3
       picomatch: 2.3.1
   [email protected]:
     dependencies:
       brace-expansion: 1.1.11
@@ -3342,6 +3390,11 @@ snapshots:
       lru-cache: 10.4.3
       minipass: 7.1.2
   [email protected]: {}
   [email protected]: {}
@@ -3428,6 +3481,11 @@ snapshots:
   [email protected]: {}
   [email protected]:
     dependencies:
       '@types/estree': 1.0.6

       postcss:
         specifier: ^8.4.47
         version: 8.4.47
+      rimraf:
+        specifier: ^6.0.1
+        version: 6.0.1
       tailwindcss:
         specifier: ^3.4.13
         version: 3.4.13([email protected](@types/[email protected])([email protected]))
     resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
     hasBin: true
+  [email protected]:
+    resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==}
+    engines: {node: 20 || >=22}
+    hasBin: true
   [email protected]:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
   [email protected]:
     resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
+  [email protected]:
+    resolution: {integrity: sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==}
+    engines: {node: 20 || >=22}
   [email protected]:
     resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
     hasBin: true
   [email protected]:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+  [email protected]:
+    resolution: {integrity: sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==}
+    engines: {node: 20 || >=22}
   [email protected]:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
     resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
+  [email protected]:
+    resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
+    engines: {node: 20 || >=22}
   [email protected]:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
+  [email protected]:
+    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
+    engines: {node: 20 || >=22}
   [email protected]:
     resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+  [email protected]:
+    resolution: {integrity: sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==}
+    engines: {node: 20 || >=22}
+    hasBin: true
   [email protected]:
     resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
       package-json-from-dist: 1.0.1
       path-scurry: 1.11.1
+  [email protected]:
+    dependencies:
+      foreground-child: 3.3.0
+      jackspeak: 4.0.2
+      minimatch: 10.0.1
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.1
+      path-scurry: 2.0.0
   [email protected]: {}
   [email protected]: {}
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
+  [email protected]:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
   [email protected]: {}
   [email protected]: {}
   [email protected]: {}
+  [email protected]: {}
   [email protected]:
     dependencies:
       yallist: 3.1.1
       braces: 3.0.3
       picomatch: 2.3.1
+  [email protected]:
+    dependencies:
+      brace-expansion: 2.0.1
   [email protected]:
     dependencies:
       brace-expansion: 1.1.11
       lru-cache: 10.4.3
       minipass: 7.1.2
+  [email protected]:
+    dependencies:
+      lru-cache: 11.0.1
+      minipass: 7.1.2
   [email protected]: {}
   [email protected]: {}
   [email protected]: {}
+  [email protected]:
+    dependencies:
+      glob: 11.0.0
+      package-json-from-dist: 1.0.1
   [email protected]:
     dependencies:
       '@types/estree': 1.0.6

src/duck.ts CHANGED Viewed

@@ -1,24 +1,53 @@
 import * as duckdb from "@duckdb/duckdb-wasm";
-import duckdb_wasm from "@duckdb/duckdb-wasm/dist/duckdb-mvp.wasm?url";
-import mvp_worker from "@duckdb/duckdb-wasm/dist/duckdb-browser-mvp.worker.js?url";
-import duckdb_wasm_eh from "@duckdb/duckdb-wasm/dist/duckdb-eh.wasm?url";
-import eh_worker from "@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js?url";
-const MANUAL_BUNDLES: duckdb.DuckDBBundles = {
-  mvp: {
-    mainModule: duckdb_wasm,
-    mainWorker: mvp_worker,
-  },
-  eh: {
-    mainModule: duckdb_wasm_eh,
-    mainWorker: eh_worker,
-  },
-};
 // https://duckdb.org/docs/api/wasm/instantiation#vite
 export const createDb = async () => {
   // Select a bundle based on browser checks
-  const bundle = await duckdb.selectBundle(MANUAL_BUNDLES);
   // Instantiate the asynchronus version of DuckDB-wasm
   const worker = new Worker(bundle.mainWorker!);
   const logger = new duckdb.ConsoleLogger();

 import * as duckdb from "@duckdb/duckdb-wasm";
+const production = import.meta.env.PROD;
+const makeUrl = (path: string) =>
+  `https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm/dist/${path}`;
+const MANUAL_BUNDLES:
+  | duckdb.DuckDBBundles
+  | (() => Promise<duckdb.DuckDBBundles>) = production
+  ? {
+      mvp: {
+        mainModule: makeUrl("duckdb-mvp.wasm"),
+        mainWorker: makeUrl("duckdb-browser-mvp.worker.js"),
+      },
+      eh: {
+        mainModule: makeUrl("duckdb-eh.wasm"),
+        mainWorker: makeUrl("duckdb-browser-eh.worker.js"),
+      },
+    }
+  : async () => ({
+      mvp: {
+        mainModule: (
+          await import("@duckdb/duckdb-wasm/dist/duckdb-mvp.wasm?url")
+        ).default,
+        mainWorker: (
+          await import(
+            "@duckdb/duckdb-wasm/dist/duckdb-browser-mvp.worker.js?url"
+          )
+        ).default,
+      },
+      eh: {
+        mainModule: (
+          await import("@duckdb/duckdb-wasm/dist/duckdb-eh.wasm?url")
+        ).default,
+        mainWorker: (
+          await import(
+            "@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js?url"
+          )
+        ).default,
+      },
+    });
 // https://duckdb.org/docs/api/wasm/instantiation#vite
 export const createDb = async () => {
+  const bundles =
+    typeof MANUAL_BUNDLES === "function"
+      ? await MANUAL_BUNDLES()
+      : MANUAL_BUNDLES;
   // Select a bundle based on browser checks
+  const bundle = await duckdb.selectBundle(bundles);
   // Instantiate the asynchronus version of DuckDB-wasm
   const worker = new Worker(bundle.mainWorker!);
   const logger = new duckdb.ConsoleLogger();

vite.config.ts CHANGED Viewed

@@ -3,11 +3,11 @@ import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
 // https://vitejs.dev/config/
-export default defineConfig({
   plugins: [react()],
   resolve: {
     alias: {
       "~": path.resolve(__dirname, "src"),
     },
   },
-});

 import react from "@vitejs/plugin-react";
 // https://vitejs.dev/config/
+export default defineConfig(() => ({
   plugins: [react()],
   resolve: {
     alias: {
       "~": path.resolve(__dirname, "src"),
     },
   },
+}));