5 files changed, 38 insertions, 11 deletions
diff --git a/ext/wasm/api/extern-post-js.c-pp.js b/ext/wasm/api/extern-post-js.c-pp.js
index 87d99eaba..691ad7685 100644
--- a/ext/wasm/api/extern-post-js.c-pp.js
+++ b/ext/wasm/api/extern-post-js.c-pp.js
@@ -45,14 +45,23 @@ const toExportForES6 =
     moduleScript: self?.document?.currentScript,
     isWorker: ('undefined' !== typeof WorkerGlobalScope),
     location: self.location,
-    urlParams: new URL(self.location.href).searchParams
+    urlParams:
+//#if target=es6-bundler-friendly
+    undefined
+//#else
+    new URL(self.location.href).searchParams
+//#endif
   });
   initModuleState.debugModule =
-    (new URL(self.location.href).searchParams).has('sqlite3.debugModule')
+//#if target=es6-bundler-friendly
+  ()=>{}
+//#else
+  (new URL(self.location.href).searchParams).has('sqlite3.debugModule')
     ? (...args)=>console.warn('sqlite3.debugModule:',...args)
     : ()=>{};
+//#endif
 
-  if(initModuleState.urlParams.has('sqlite3.dir')){
+  if(initModuleState.urlParams && initModuleState.urlParams.has('sqlite3.dir')){
     initModuleState.sqlite3Dir = initModuleState.urlParams.get('sqlite3.dir') +'/';
   }else if(initModuleState.moduleScript){
     const li = initModuleState.moduleScript.src.split('/');
diff --git a/ext/wasm/api/pre-js.c-pp.js b/ext/wasm/api/pre-js.c-pp.js
index 772601f42..c27c2fe0d 100644
--- a/ext/wasm/api/pre-js.c-pp.js
+++ b/ext/wasm/api/pre-js.c-pp.js
@@ -6,7 +6,10 @@
 */
 
 // See notes in extern-post-js.js
-const sqlite3InitModuleState = self.sqlite3InitModuleState || Object.create(null);
+const sqlite3InitModuleState = self.sqlite3InitModuleState
+      || Object.assign(Object.create(null),{
+        debugModule: ()=>{}
+      });
 delete self.sqlite3InitModuleState;
 sqlite3InitModuleState.debugModule('self.location =',self.location);
 
diff --git a/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js b/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js
index 451f0019c..aeda62aa2 100644
--- a/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js
+++ b/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js
@@ -100,13 +100,20 @@ const installOpfsVfs = function callee(options){
   if(!options || 'object'!==typeof options){
     options = Object.create(null);
   }
-  const urlParams = new URL(self.location.href).searchParams;
-  if(undefined===options.verbose){
-    options.verbose = urlParams.has('opfs-verbose')
-      ? (+urlParams.get('opfs-verbose') || 2) : 1;
-  }
-  if(undefined===options.sanityChecks){
-    options.sanityChecks = urlParams.has('opfs-sanity-check');
+  const urlParams =
+//#if target=es6-bundler-friendly
+        undefined;
+//#else
+        new URL(self.location.href).searchParams;
+//#endif
+  if(urlParams){
+    if(undefined===options.verbose){
+      options.verbose = urlParams.has('opfs-verbose')
+        ? (+urlParams.get('opfs-verbose') || 2) : 1;
+    }
+    if(undefined===options.sanityChecks){
+      options.sanityChecks = urlParams.has('opfs-sanity-check');
+    }
   }
   if(undefined===options.proxyUri){
     options.proxyUri = callee.defaultProxyUri;
diff --git a/ext/wasm/api/sqlite3-worker1-promiser.js b/ext/wasm/api/sqlite3-worker1-promiser.js
index 7360512d4..1689d3480 100644
--- a/ext/wasm/api/sqlite3-worker1-promiser.js
+++ b/ext/wasm/api/sqlite3-worker1-promiser.js
@@ -238,6 +238,9 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
 }/*sqlite3Worker1Promiser()*/;
 self.sqlite3Worker1Promiser.defaultConfig = {
   worker: function(){
+//#if target=es6-bundler-friendly
+    return new Worker("sqlite3-worker1.js");
+//#else
     let theJs = "sqlite3-worker1.js";
     if(this.currentScript){
       const src = this.currentScript.src.split('/');
@@ -252,6 +255,7 @@ self.sqlite3Worker1Promiser.defaultConfig = {
       }
     }
     return new Worker(theJs + self.location.search);
+//#endif
   }.bind({
     currentScript: self?.document?.currentScript
   }),
diff --git a/ext/wasm/api/sqlite3-worker1.js b/ext/wasm/api/sqlite3-worker1.js
index 4ff19b888..9e9c3ac42 100644
--- a/ext/wasm/api/sqlite3-worker1.js
+++ b/ext/wasm/api/sqlite3-worker1.js
@@ -33,6 +33,9 @@
 */
 "use strict";
 (()=>{
+//#if target=es6-bundler-friendly
+  importScripts('sqlite3.js');
+//#else
   const urlParams = new URL(self.location.href).searchParams;
   let theJs = 'sqlite3.js';
   if(urlParams.has('sqlite3.dir')){
@@ -40,6 +43,7 @@
   }
   //console.warn("worker1 theJs =",theJs);
   importScripts(theJs);
+//#endif
   sqlite3InitModule().then((sqlite3)=>{
     sqlite3.initWorker1API();
   });