diff --git a/app/web/src/base/load/db/client-db.tsx b/app/web/src/base/load/db/client-db.tsx index 8a89e5e6..e231f8fb 100644 --- a/app/web/src/base/load/db/client-db.tsx +++ b/app/web/src/base/load/db/client-db.tsx @@ -2,7 +2,6 @@ import hash_sum from "hash-sum"; import { fetchViaProxy } from "../../../nova/vi/load/proxy"; export const dbClient = (name: string, dburl: string) => { - console.log(dburl); return new Proxy( {}, { diff --git a/app/web/src/nova/ed/logic/ed-init.ts b/app/web/src/nova/ed/logic/ed-init.ts index 10093345..464e3aac 100644 --- a/app/web/src/nova/ed/logic/ed-init.ts +++ b/app/web/src/nova/ed/logic/ed-init.ts @@ -13,7 +13,7 @@ export const edInit = async (p: PG) => { w.db = dbClient("prasi", `${cur.protocol}//${cur.host}`); await init(); - jscript.init(p.render); + jscript.init(p.render, { esbuild: false }); p.script.loaded = true; p.render(); diff --git a/app/web/src/nova/vi/load/proxy.ts b/app/web/src/nova/vi/load/proxy.ts index c3ea2924..31f12651 100644 --- a/app/web/src/nova/vi/load/proxy.ts +++ b/app/web/src/nova/vi/load/proxy.ts @@ -52,17 +52,24 @@ export const fetchViaProxy = async ( body, headers, }); - return res.json(); + const raw = await res.text(); + try { + return JSON.parse(raw); + } catch (e) { + return raw; + } } else { - const res = await fetch(`/_proxy`, { - method: "POST", - body: JSON.stringify({ - url, - body, - headers, - }), - headers: { "content-type": "application/json" }, - }); - return res.json(); + console.log(url); + return null; + // const res = await fetch(`/_proxy`, { + // method: "POST", + // body: JSON.stringify({ + // url, + // body, + // headers, + // }), + // headers: { "content-type": "application/json" }, + // }); + // return res.json(); } }; diff --git a/app/web/src/utils/script/jscript.ts b/app/web/src/utils/script/jscript.ts index 15c6435e..6834bb4f 100644 --- a/app/web/src/utils/script/jscript.ts +++ b/app/web/src/utils/script/jscript.ts @@ -1,5 +1,4 @@ import type { Editor as MonacoEditor } from "@monaco-editor/react"; -import type { BuildOptions } from "esbuild-wasm"; import type Prettier from "prettier/standalone"; import type estree from "prettier/plugins/estree"; import type ts from "prettier/plugins/typescript"; @@ -60,7 +59,7 @@ export const jscript = { if (enabled?.esbuild !== false) { this.build = async (entry, src, files, verbose?: boolean) => { - const options: BuildOptions = { + const options = { entryPoints: [entry], jsx: "transform", bundle: true,