Merge pull request #158 from tursodatabase/fix-wasm-browser

Fix Wasm in browser
tursodatabase · Jan 19, 2024 · 3f5391c · 3f5391c
2 parents 3015afb + 0157c7b
commit 3f5391c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 51 deletions.
diff --git a/packages/libsql-client-wasm/examples/browser/README.md b/packages/libsql-client-wasm/examples/browser/README.md
@@ -2,20 +2,22 @@
 
 ## Building
 
-Run the following in top-level directory of this repository:
+Run the following in the `packages/libsql-client-wasm` directory:
 
 ```
 npm run build
 ```
 
-Then run the following in this directory:
+Run the following in this directory:
 
 ```
+npm i
 ./node_modules/.bin/esbuild --target=safari16 index.js --bundle --outfile=dist/out.js --format=esm
+cp ../../../../node_modules/@libsql/libsql-wasm-experimental/sqlite-wasm/jswasm/sqlite3.wasm dist
 ```
 
 and open the app in browser:
 
 ```
-npx http-server -o .
+npx http-server -o
 ```
diff --git a/packages/libsql-client-wasm/examples/browser/package-lock.json b/packages/libsql-client-wasm/examples/browser/package-lock.json
diff --git a/packages/libsql-client-wasm/examples/browser/package.json b/packages/libsql-client-wasm/examples/browser/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@libsql/client": "../../"
+    "@libsql/client-wasm": "../.."
   },
   "devDependencies": {
     "esbuild": "0.19.11"

diff --git a/packages/libsql-client-wasm/package.json b/packages/libsql-client-wasm/package.json
@@ -28,48 +28,14 @@
         ".": {
             "types": "./lib-esm/wasm.d.ts",
             "import": {
-                "workerd": "./lib-esm/web.js",
-                "deno": "./lib-esm/web.js",
-                "edge-light": "./lib-esm/web.js",
-                "netlify": "./lib-esm/web.js",
-                "wasm": "./lib-esm/wasm.js",
-                "browser": "./lib-esm/web.js",
                 "default": "./lib-esm/wasm.js"
             }
-        },
-        "./http": {
-            "types": "./lib-esm/http.d.ts",
-            "import": "./lib-esm/http.js"
-        },
-        "./ws": {
-            "types": "./lib-esm/ws.d.ts",
-            "import": "./lib-esm/ws.js"
-        },
-        "./wasm": {
-            "types": "./lib-esm/wasm.d.ts",
-            "import": "./lib-esm/wasm.js"
-        },
-        "./web": {
-            "types": "./lib-esm/web.d.ts",
-            "import": "./lib-esm/web.js"
         }
     },
     "typesVersions": {
         "*": {
             ".": [
                 "./lib-esm/wasm.d.ts"
-            ],
-            "http": [
-                "./lib-esm/http.d.ts"
-            ],
-            "hrana": [
-                "./lib-esm/hrana.d.ts"
-            ],
-            "wasm": [
-                "./lib-esm/wasm.d.ts"
-            ],
-            "web": [
-                "./lib-esm/web.d.ts"
             ]
         }
     },

diff --git a/packages/libsql-client-wasm/src/wasm.ts b/packages/libsql-client-wasm/src/wasm.ts
@@ -310,8 +310,6 @@ function valueFromSql(sqlValue: unknown, intMode: IntMode): Value {
         } else {
             throw new Error("Invalid value for IntMode");
         }
-    } else if (sqlValue instanceof Buffer) {
-        return sqlValue.buffer;
     }
     return sqlValue as Value;
 }
@@ -341,8 +339,6 @@ function valueToSql(value: InValue, intMode: IntMode): SqlValue {
         default:
           return value ? 1 : 0;
       }
-    } else if (value instanceof ArrayBuffer) {
-        return Buffer.from(value);
     } else if (value instanceof Date) {
         return value.valueOf();
     } else if (value === undefined) {