WIP

Author: kwojcik-blockether

.storybook/main.ts

@@ -26,10 +26,10 @@ const config: StorybookConfig = {
     return mergeConfig(config, {
       define: {
         global: 'globalThis',
-        BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION: JSON.stringify(''),
+        BLOCKETHER_FOUNDATION_ASSETS_PATH: JSON.stringify(''),
       },
       optimizeDeps: {
-        include: ['react', 'react-dom'],
+        include: ['react', 'react-dom']
       },
     })
   }

examples/standalone/vite.config.ts

@@ -37,7 +37,7 @@ export default defineConfig({
         'process.env': JSON.stringify({
             NODE_ENV: 'production'
         }),
-        BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION: JSON.stringify('/assets/')
+        BLOCKETHER_FOUNDATION_ASSETS_PATH: JSON.stringify('/assets/')
     },
     build: {
         // Lib mode for proper ES module exports

src/components/cockpit/sql/editor.tsx

@@ -93,13 +93,14 @@ export function SQLEditor({
 
   // Initialize Monaco Editor
   useEffect(() => {
+    loader.config({ monaco })
+
     self.MonacoEnvironment = {
-      getWorker: async (_, __) => {
-        return new (await import('monaco-editor/esm/vs/editor/editor.worker?worker')).default()
-      },
+      getWorkerUrl(workerId: string, label: string) {
+        return import.meta.resolve('/node_modules/monaco-editor/esm/vs/editor/editor.worker.js');
+      }
     }
 
-    loader.config({ monaco })
 
     // Initialize Monaco and mark as loaded
     loader
@@ -113,6 +114,7 @@ export function SQLEditor({
       .catch(error => {
         logger.error('Failed to initialize Monaco Editor:', error)
       })
+
   }, [logger])
 
   // Configure editor options

src/lib/duckdb/init.ts

@@ -62,18 +62,18 @@ const duckdbBundles = async () => {
   }
 }
 
-const MVP_MODULE = (BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION !== '' && BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION + 'duckdb-mvp.wasm') || 'unknown';
-const MVP_WORKER = (BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION !== '' && BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION + 'duckdb-browser-mvp.worker.js') || 'unknown';
-const EH_MODULE = (BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION !== '' && BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION + 'duckdb-eh.wasm') || 'unknown';
-const EH_WORKER = (BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION !== '' && BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION + 'duckdb-browser-eh.worker.js') || 'unknown';
+const MVP_MODULE = (BLOCKETHER_FOUNDATION_ASSETS_PATH !== '' && BLOCKETHER_FOUNDATION_ASSETS_PATH + 'duckdb-mvp.wasm') || 'unknown';
+const MVP_WORKER = (BLOCKETHER_FOUNDATION_ASSETS_PATH !== '' && BLOCKETHER_FOUNDATION_ASSETS_PATH + 'duckdb-browser-mvp.worker.js') || 'unknown';
+const EH_MODULE = (BLOCKETHER_FOUNDATION_ASSETS_PATH !== '' && BLOCKETHER_FOUNDATION_ASSETS_PATH + 'duckdb-eh.wasm') || 'unknown';
+const EH_WORKER = (BLOCKETHER_FOUNDATION_ASSETS_PATH !== '' && BLOCKETHER_FOUNDATION_ASSETS_PATH + 'duckdb-browser-eh.worker.js') || 'unknown';
 
-const bundleResolver = BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION !== '' ?
+const bundleResolver = BLOCKETHER_FOUNDATION_ASSETS_PATH !== '' ?
   (
     async () => {
       const logger = getGlobalLogger()
       try {
         logger.info('Standalone DuckDB paths:', {
-          BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION,
+          BLOCKETHER_FOUNDATION_ASSETS_PATH,
           MVP_MODULE,
           MVP_WORKER,
           EH_MODULE,
@@ -104,9 +104,9 @@ const bundleResolver = BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION !== '' ?
         }
 
         // Validate that all files use the same base location
-        const baseUrl = BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION
+        const baseUrl = BLOCKETHER_FOUNDATION_ASSETS_PATH
         if (!MVP_MODULE.startsWith(baseUrl) || !MVP_WORKER.startsWith(baseUrl) ||
-            !EH_MODULE.startsWith(baseUrl) || !EH_WORKER.startsWith(baseUrl)) {
+          !EH_MODULE.startsWith(baseUrl) || !EH_WORKER.startsWith(baseUrl)) {
           throw new Error(`Path inconsistency: All DuckDB files must be served from the same base location: ${baseUrl}`)
         }
 

types/env.d.ts

@@ -8,7 +8,7 @@
  * - Custom path ('./assets/') in standalone: loads from assets folder
  */
 declare global {
-  const BLOCKETHER_FOUNDATION_DUCK_DB_LOCATION: string
+  const BLOCKETHER_FOUNDATION_ASSETS_PATH: string
 }
 
-export {}
+export { }

vite.config.mts

@@ -89,9 +89,5 @@ export default defineConfig({
     minify: 'esbuild',
     sourcemap: false,
     emptyOutDir: true,
-  },
-  // Configure Monaco Editor worker handling
-  optimizeDeps: {
-    exclude: ['@monaco-editor/react', 'monaco-editor', '@duckdb/duckdb-wasm', 'sql-formatter', 'apache-arrow'],
   }
 })