Fixed build errors

shamin · Sep 2, 2021 · 116c9d3 · 116c9d3
1 parent 232fb9f
commit 116c9d3
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/client/package.json b/client/package.json
@@ -5,7 +5,8 @@
     "start": "npm run dev",
     "build": "tsc && vite build",
     "serve": "vite preview",
-    "create-mint": "node scripts/createMint.js"
+    "create-mint": "node scripts/createMint.js",
+    "deploy": "npx surge dist share-ride.surge.sh"
   },
   "dependencies": {
     "@project-serum/anchor": "^0.13.2",

diff --git a/client/src/app/pages/offer/offer.tsx b/client/src/app/pages/offer/offer.tsx
@@ -37,7 +37,6 @@ export const Offer = () => {
   const {
     addDriver,
     loadDrivers,
-    loading,
     showCompleteModal,
     setShowCompleteModal,
   } = shareRideState;
@@ -176,7 +175,6 @@ export const Offer = () => {
         </div>
         {
           <Button
-            isLoading={loading}
             disabled={
               !fromAddress || !toAddress || !selectedSeats || !costPerKm
             }

diff --git a/client/src/app/pages/ride/PolyLineOverlay.tsx b/client/src/app/pages/ride/PolyLineOverlay.tsx
@@ -1,4 +1,4 @@
-import React, { PureComponent } from "react";
+import React from "react";
 import { CanvasOverlay } from "react-map-gl";
 
 const settings = {

diff --git a/client/src/app/web3/provider/state/arweave.ts b/client/src/app/web3/provider/state/arweave.ts
@@ -27,7 +27,9 @@ class ArweaveService {
         this.walletKey = this.testWeave?.rootJWK;
       });
     } else {
-      this.arweave = Arweave.init({});
+      this.arweave = Arweave.init({
+        host: 'arweave.net'
+      });
       this.walletKey = WalletJson;
     }
   }
@@ -53,13 +55,18 @@ class ArweaveService {
 
   async getData(drivers: Array<ArweaveDriver>): Promise<Array<unknown>> {
     const arweaveData = drivers.map(async ({ archive }) => {
-      const data = await this.arweave.transactions.getData(archive, {
-        decode: true,
-        string: true,
-      });
-      return { ...JSON.parse(data?.toString()), archiveId: archive };
+      try {
+        const data = await this.arweave.transactions.getData(archive, {
+          decode: true,
+          string: true,
+        });
+        return { ...JSON.parse(data?.toString()), archiveId: archive };     
+      } catch(err) {
+        return null
+      }
     });
-    return Promise.all(arweaveData);
+    const data = await Promise.all(arweaveData);
+    return data.filter((d)=>d!==null)
   }
 }
 

diff --git a/client/src/app/web3/provider/state/types.ts b/client/src/app/web3/provider/state/types.ts
diff --git a/client/tsconfig.json b/client/tsconfig.json
@@ -3,7 +3,7 @@
     "target": "ESNext",
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "allowJs": false,
-    "skipLibCheck": false,
+    "skipLibCheck": true,
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
@@ -13,7 +13,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react"
+    "jsx": "react",
   },
   "include": ["./src"]
 }
diff --git a/client/vite.config.ts b/client/vite.config.ts
@@ -7,7 +7,9 @@ export default defineConfig({
   server: {
     port: 5000
   },
-  plugins: [reactRefresh(), polyfillNode()],
+  plugins: [reactRefresh(),
+    //  polyfillNode()
+    ],
   optimizeDeps: {
     exclude: ["web3"], // <= The libraries that need shimming should be excluded from dependency optimization.
   },