Merge branch 'mainnet' into docs/doc-fixes

iamalwaysuncomfortable · iamalwaysuncomfortable · commit e6ca001b08bb · 2025-02-18T15:43:40.000-05:00
diff --git a/.github/workflows/staging-website.yml b/.github/workflows/staging-website.yml
@@ -22,7 +22,7 @@ jobs:
           override: true
           components: rustfmt, rust-src
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml
@@ -19,7 +19,7 @@ jobs:
           override: true
           components: rustfmt, rust-src
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -22,7 +22,7 @@ jobs:
           override: true
           components: rustfmt, rust-src
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
diff --git a/create-leo-app/README.md b/create-leo-app/README.md
@@ -13,14 +13,14 @@ npm create leo-app@latest
 
 Then follow the prompts!
 
-You can also directly specify the project name and the template you want to use via additional command line options. For example, to scaffold an Aleo + React project, run:
+You can also directly specify the project name you want to use via additional command line options. For example, to scaffold a Leo project, run:
 
 ```bash
 # npm 6.x
-npm create leo-app@latest my-leo-app --template react
+npm create leo-app@latest my-leo-app
 
 # npm 7+, extra double-dash is needed:
-npm create leo-app@latest my-leo-app -- --template react
+npm create leo-app@latest my-leo-app
 ```
 
 Currently supported template presets include:
diff --git a/create-leo-app/template-react-leo/vite.config.js b/create-leo-app/template-react-leo/vite.config.js
@@ -4,8 +4,9 @@ import react from "@vitejs/plugin-react";
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
+  assetsInclude: ['**/*.wasm'],
   optimizeDeps: {
-    exclude: ["@provablehq/wasm", "@provablehq/sdk"],
+    exclude: ["@provablehq/wasm"],
   },
   server: {
     headers: {
diff --git a/create-leo-app/template-react-managed-worker/vite.config.js b/create-leo-app/template-react-managed-worker/vite.config.js
@@ -3,9 +3,10 @@ import react from "@vitejs/plugin-react";
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  assetsInclude: ['**/*.wasm'],
   plugins: [react()],
   optimizeDeps: {
-    exclude: ["@provablehq/wasm", "@provablehq/sdk"],
+    exclude: ["@provablehq/wasm"],
   },
   server: {
     // Needed if you are linking local packages for development
diff --git a/create-leo-app/template-react-ts/vite.config.ts b/create-leo-app/template-react-ts/vite.config.ts
@@ -3,9 +3,10 @@ import react from "@vitejs/plugin-react";
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  assetsInclude: ['**/*.wasm'],
   plugins: [react()],
   optimizeDeps: {
-    exclude: ["@provablehq/wasm", "@provablehq/sdk"],
+    exclude: ["@provablehq/wasm"],
   },
   server: {
     headers: {
diff --git a/create-leo-app/template-vanilla/vite.config.js b/create-leo-app/template-vanilla/vite.config.js
@@ -1,7 +1,9 @@
 import { defineConfig } from "vite";
+
 export default defineConfig({
+    assetsInclude: ['**/*.wasm'],
     optimizeDeps: {
-        exclude: ["@provablehq/wasm", "@provablehq/sdk"],
+        exclude: ["@provablehq/wasm",],
     },
     server: {
         headers: {
diff --git a/sdk/package.json b/sdk/package.json
@@ -51,7 +51,8 @@
     "comlink": "^4.4.2",
     "core-js": "^3.40.0",
     "mime": "^4.0.6",
-    "sync-request": "^6.1.0"
+    "sync-request": "^6.1.0",
+    "xmlhttprequest-ssl": "^3.1.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^6.0.2",
diff --git a/sdk/rollup.config.js b/sdk/rollup.config.js
@@ -28,6 +28,7 @@ export default networks.map((network) => {
             "node:crypto",
             "mime/lite",
             "sync-request",
+            "xmlhttprequest-ssl",
 
             // Used by the SDK
             "comlink",
diff --git a/sdk/rollup.test.js b/sdk/rollup.test.js
@@ -35,6 +35,7 @@ export default networks.map((network) => {
             "node:crypto",
             "mime/lite",
             "sync-request",
+            "xmlhttprequest-ssl",
 
             // Used by the SDK
             "comlink",
diff --git a/sdk/src/polyfill/fetch.ts b/sdk/src/polyfill/fetch.ts
@@ -4,13 +4,35 @@ import $mime from "mime/lite";
 
 const oldFetch = globalThis.fetch;
 
+
+let supports: Promise<boolean> | null = null;
+
+async function checkFetch() {
+    try {
+        await oldFetch(new URL("file:"));
+        return true;
+
+    } catch (e) {
+        return false;
+    }
+}
+
+async function supportsFetch(): Promise<boolean> {
+    if (supports === null) {
+        supports = checkFetch();
+    }
+
+    return await supports;
+}
+
+
 // We always polyfill fetch because Node's fetch doesn't support file URLs.
 (globalThis.fetch as any) = async function (resource: URL | RequestInfo, options: RequestInit | undefined): Promise<Response> {
     const request = new Request(resource, options);
 
     const url = new URL(request.url);
 
-    if (url.protocol === "file:") {
+    if (!(await supportsFetch()) && url.protocol === "file:") {
         const readStream = $fs.createReadStream(url);
 
         const headers: HeadersInit = {};
diff --git a/sdk/src/polyfill/worker.ts b/sdk/src/polyfill/worker.ts
@@ -10,90 +10,92 @@ if (globalThis.navigator == null) {
     } as Navigator;
 }
 
-globalThis.Worker = class Worker extends EventTarget {
-    private _worker: import("node:worker_threads").Worker;
+if (globalThis.Worker == null) {
+    globalThis.Worker = class Worker extends EventTarget {
+        private _worker: import("node:worker_threads").Worker;
 
-    constructor(url: string | URL, options?: WorkerOptions | undefined) {
-        super();
+        constructor(url: string | URL, options?: WorkerOptions | undefined) {
+            super();
 
-        if (url instanceof URL) {
-            if (url.protocol !== "file:") {
-                throw new Error("Worker only supports file: URLs");
+            if (url instanceof URL) {
+                if (url.protocol !== "file:") {
+                    throw new Error("Worker only supports file: URLs");
+                }
+
+                url = url.href;
+
+            } else {
+                throw new Error("Filepaths are unreliable, use `new URL(\"...\", import.meta.url)` instead.");
             }
 
-            url = url.href;
+            if (!options || options.type !== "module") {
+                throw new Error("Workers must use \`type: \"module\"\`");
+            }
 
-        } else {
-            throw new Error("Filepaths are unreliable, use `new URL(\"...\", import.meta.url)` instead.");
+            const code = `
+                import("node:worker_threads")
+                    .then(({ workerData }) => {
+                        return import(workerData.polyfill)
+                            .then(() => import(workerData.url))
+                    })
+                    .catch((e) => {
+                        // TODO maybe it should send a message to the parent?
+                        console.error(e.stack);
+                    });
+            `;
+
+            this._worker = new $worker.Worker(code, {
+                eval: true,
+                workerData: {
+                    url,
+                    polyfill: new URL("node-polyfill.js", import.meta.url).href,
+                },
+            });
+
+            this._worker.on("message", (data) => {
+                this.dispatchEvent(new MessageEvent("message", { data }));
+            });
+
+            this._worker.on("messageerror", (error) => {
+                throw new Error("UNIMPLEMENTED");
+            });
+
+            this._worker.on("error", (error) => {
+                // TODO attach the error to the event somehow
+                const event = new Event("error");
+                this.dispatchEvent(event);
+            });
         }
 
-        if (!options || options.type !== "module") {
-            throw new Error("Workers must use \`type: \"module\"\`");
+        set onmessage(f: () => void) {
+            throw new Error("UNIMPLEMENTED");
         }
 
-        const code = `
-            import("node:worker_threads")
-                .then(({ workerData }) => {
-                    return import(workerData.polyfill)
-                        .then(() => import(workerData.url))
-                })
-                .catch((e) => {
-                    // TODO maybe it should send a message to the parent?
-                    console.error(e.stack);
-                });
-        `;
-
-        this._worker = new $worker.Worker(code, {
-            eval: true,
-            workerData: {
-                url,
-                polyfill: new URL("node-polyfill.js", import.meta.url).href,
-            },
-        });
-
-        this._worker.on("message", (data) => {
-            this.dispatchEvent(new MessageEvent("message", { data }));
-        });
-
-        this._worker.on("messageerror", (error) => {
+        set onmessageerror(f: () => void) {
             throw new Error("UNIMPLEMENTED");
-        });
-
-        this._worker.on("error", (error) => {
-            // TODO attach the error to the event somehow
-            const event = new Event("error");
-            this.dispatchEvent(event);
-        });
-    }
-
-    set onmessage(f: () => void) {
-        throw new Error("UNIMPLEMENTED");
-    }
-
-    set onmessageerror(f: () => void) {
-        throw new Error("UNIMPLEMENTED");
-    }
+        }
 
-    set onerror(f: () => void) {
-        throw new Error("UNIMPLEMENTED");
-    }
+        set onerror(f: () => void) {
+            throw new Error("UNIMPLEMENTED");
+        }
 
-    postMessage(message: any, transfer: Array<Transferable>): void;
-    postMessage(message: any, options?: StructuredSerializeOptions | undefined): void;
-    postMessage(value: any, transfer: any) {
-        this._worker.postMessage(value, transfer);
-    }
+        postMessage(message: any, transfer: Array<Transferable>): void;
+        postMessage(message: any, options?: StructuredSerializeOptions | undefined): void;
+        postMessage(value: any, transfer: any) {
+            this._worker.postMessage(value, transfer);
+        }
 
-    terminate() {
-        this._worker.terminate();
-    }
+        terminate() {
+            this._worker.terminate();
+        }
 
-    // This is Node-specific, it allows the process to exit
-    // even if the Worker is still running.
-    unref() {
-        this._worker.unref();
-    }
-};
+        // This is Node-specific, it allows the process to exit
+        // even if the Worker is still running.
+        unref() {
+            this._worker.unref();
+        }
+    };
+}
 
 
 if (!$worker.isMainThread) {
diff --git a/sdk/src/polyfill/xmlhttprequest.ts b/sdk/src/polyfill/xmlhttprequest.ts
diff --git a/website/vite.config.js b/website/vite.config.js
diff --git a/yarn.lock b/yarn.lock
