fix browser tests for ESM build

iden3 · Oct 26, 2023 · 72934d0 · 72934d0
1 parent 196c302
commit 72934d0
Show file tree

Hide file tree

Showing 7 changed files with 20,851 additions and 3,414 deletions.
diff --git a/browser_tests/test/groth16.html b/browser_tests/test/groth16.html
@@ -67,7 +67,7 @@
       }
 
       await testBrowserBuilds(snarkjs);
-      const esmBuild = await import("/build/esm.js");
+      const esmBuild = await import("/build/browser.esm.js");
       await testBrowserBuilds(esmBuild);
       shutdown();
     </script>

diff --git a/build/cli.cjs b/build/cli.cjs
@@ -281,7 +281,7 @@ function askEntropy() {
 
 function getRandomBytes(n) {
     let array = new Uint8Array(n);
-    if (typeof globalThis.crypto !== "undefined") { // Supported
+    if (process.browser) { // Supported
         globalThis.crypto.getRandomValues(array);
     } else { // NodeJS
         crypto__default["default"].randomFillSync(array);
@@ -290,7 +290,7 @@ function getRandomBytes(n) {
 }
 
 async function sha256digest(data) {
-    if (typeof globalThis.crypto !== "undefined" && typeof globalThis.crypto.subtle !== "undefined") { // Supported
+    if (process.browser) { // Supported
         const buffer = await globalThis.crypto.subtle.digest("SHA-256", data.buffer);
         return new Uint8Array(buffer);
     } else { // NodeJS

diff --git a/build/main.cjs b/build/main.cjs
@@ -176,7 +176,7 @@ function askEntropy() {
 
 function getRandomBytes(n) {
     let array = new Uint8Array(n);
-    if (typeof globalThis.crypto !== "undefined") { // Supported
+    if (process.browser) { // Supported
         globalThis.crypto.getRandomValues(array);
     } else { // NodeJS
         crypto__default["default"].randomFillSync(array);
@@ -185,7 +185,7 @@ function getRandomBytes(n) {
 }
 
 async function sha256digest(data) {
-    if (typeof globalThis.crypto !== "undefined" && typeof globalThis.crypto.subtle !== "undefined") { // Supported
+    if (process.browser) { // Supported
         const buffer = await globalThis.crypto.subtle.digest("SHA-256", data.buffer);
         return new Uint8Array(buffer);
     } else { // NodeJS