fix: remove ignore copied request file, prepare build-specific-js for…

… http mode

.gitignore

@@ -13,4 +13,6 @@ frontend/node_modules
 frontend/wailsjs
 package.json.md5
 
-build
+build
+
+frontend/src/utils/request.ts

frontend/package.json

@@ -4,12 +4,12 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
-    "dev:wails": "yarn prepare:wails && VITE_NWC_APP_TYPE=WAILS vite",
-    "build": "tsc && vite build",
+    "dev": "yarn prepare:http && vite",
+    "dev:wails": "yarn prepare:wails && vite",
+    "build": "yarn prepare:http && tsc && vite build",
     "prepare:wails": "cp ./platform_specific/wails/src/utils/request.ts src/utils/request.ts",
     "prepare:http": "cp ./platform_specific/http/src/utils/request.ts src/utils/request.ts",
-    "build:wails": "yarn prepare:wails && tsc && VITE_NWC_APP_TYPE=WAILS vite build",
+    "build:wails": "yarn prepare:wails && tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },

frontend/platform_specific/http/src/utils/request.ts

@@ -1,7 +1,6 @@
-import toast from "../components/Toast";
-import { ErrorResponse } from "../types";
+import { ErrorResponse } from "src/types";
 
-export const request = async <T,>(
+export const request = async <T>(
   ...args: Parameters<typeof fetch>
 ): Promise<T | undefined> => {
   try {
@@ -18,7 +17,7 @@ export const request = async <T,>(
       throw new Error(
         fetchResponse.status +
           " " +
-          ((body as ErrorResponse)?.message || "Unknown error"),
+          ((body as ErrorResponse)?.message || "Unknown error")
       );
     }
     return body;
@@ -27,8 +26,3 @@ export const request = async <T,>(
     throw error;
   }
 };
-
-export function handleRequestError(message: string, error: unknown) {
-  console.error(message, error);
-  toast.error(message + ": " + error);
-}

frontend/platform_specific/wails/src/utils/request.ts

@@ -1,15 +1,13 @@
-import toast from "../components/Toast";
-
 import { WailsRequestRouter } from "wailsjs/go/main/WailsApp";
 
-export const request = async <T,>(
+export const request = async <T>(
   ...args: Parameters<typeof fetch>
 ): Promise<T | undefined> => {
   try {
     const res = await WailsRequestRouter(
       args[0].toString(),
       args[1]?.method || "GET",
-      args[1]?.body?.toString() || "",
+      args[1]?.body?.toString() || ""
     );
 
     console.log("Wails request", ...args, res);
@@ -23,8 +21,3 @@ export const request = async <T,>(
     throw error;
   }
 };
-
-export function handleRequestError(message: string, error: unknown) {
-  console.error(message, error);
-  toast.error(message + ": " + error);
-}

frontend/src/screens/Setup.tsx

@@ -4,7 +4,8 @@ import Loading from "src/components/Loading";
 import { useCSRF } from "src/hooks/useCSRF";
 import { useInfo } from "src/hooks/useInfo";
 import { BackendType } from "src/types";
-import { request, handleRequestError } from "src/utils/request";
+import { handleRequestError } from "src/utils/handleRequestError";
+import { request } from "src/utils/request"; // build the project for this to appear
 
 export function Setup() {
   const [backendType, setBackendType] = React.useState<BackendType>("BREEZ");

frontend/src/screens/apps/NewApp.tsx

@@ -23,7 +23,8 @@ import { LightningIcon } from "src/components/icons/LightningIcon";
 import { InvoiceIcon } from "src/components/icons/InvoiceIcon";
 import { SearchIcon } from "src/components/icons/SearchIcon";
 import { TransactionsIcon } from "src/components/icons/TransactionsIcon";
-import { handleRequestError, request } from "src/utils/request";
+import { request } from "src/utils/request"; // build the project for this to appear
+import { handleRequestError } from "src/utils/handleRequestError";
 
 const NewApp = () => {
   const { data: csrf } = useCSRF();

frontend/src/screens/apps/ShowApp.tsx

@@ -6,7 +6,8 @@ import { useApp } from "src/hooks/useApp";
 import { useCSRF } from "src/hooks/useCSRF";
 import toast from "src/components/Toast";
 import Loading from "src/components/Loading";
-import { handleRequestError, request } from "src/utils/request";
+import { request } from "src/utils/request"; // build the project for this to appear
+import { handleRequestError } from "src/utils/handleRequestError";
 
 function ShowApp() {
   const { data: info } = useInfo();

frontend/src/utils/handleRequestError.ts

@@ -0,0 +1,6 @@
+import toast from "src/components/Toast";
+
+export function handleRequestError(message: string, error: unknown) {
+  console.error(message, error);
+  toast.error(message + ": " + error);
+}