[wallet-ext] Add wallet to pnpm workspace (MystenLabs#4242)

* Add wallet to workspace * Update actions * Fix bad cache
ninja88666 · Aug 24, 2022 · 50e9261 · 50e9261
1 parent 6b6e293
commit 50e9261
Show file tree

Hide file tree

Showing 11 changed files with 3,115 additions and 28,109 deletions.
diff --git a/.github/workflows/wallet-ext-prs.yml b/.github/workflows/wallet-ext-prs.yml
@@ -27,21 +27,17 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: "16"
-          cache: 'npm'
-          cache-dependency-path: ./wallet/package-lock.json
-      - name: Install sdk dependencies
+          cache: 'pnpm'
+      - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build SDK
         run: pnpm --filter @mysten/sui.js build
-      - name: Install dependencies
-        working-directory: ${{env.working-directory}}
-        run: npm ci
       - name: Lint
         working-directory: ${{env.working-directory}}
-        run: npm run lint
+        run: pnpm lint
       - name: Test
         working-directory: ${{env.working-directory}}
-        run: npm test
+        run: pnpm test
       - name: Build
         working-directory: ${{env.working-directory}}
-        run: npm run build:prod
+        run: pnpm build:prod
diff --git a/explorer/client/package.json b/explorer/client/package.json
@@ -9,8 +9,8 @@
         "@types/bn.js": "^5.1.0",
         "@types/jest": "^27.4.0",
         "@types/node": "^16.11.24",
-        "@types/react": "^17.0.39",
-        "@types/react-dom": "^17.0.11",
+        "@types/react": "^18.0.17",
+        "@types/react-dom": "^18.0.6",
         "@types/topojson-client": "^3.1.1",
         "autoprefixer": "^10.4.2",
         "cypress": "^10.4.0",
@@ -42,8 +42,8 @@
         "prism-react-renderer": "^1.3.5",
         "prism-themes": "^1.9.0",
         "prismjs": "^1.28.0",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
         "react-ga4": "^1.4.1",
         "react-router-dom": "^6.2.1",
         "topojson-client": "^3.1.0",

diff --git a/explorer/client/src/components/displaybox/DisplayBox.tsx b/explorer/client/src/components/displaybox/DisplayBox.tsx
@@ -102,7 +102,7 @@ function DisplayBox({
     }, [display]);
 
     const handleImageFail = useCallback(
-        (error) => {
+        (error: unknown) => {
             console.log(error);
             setHasDisplayLoaded(true);
             setHasFailedToLoad(true);
@@ -135,7 +135,7 @@ function DisplayBox({
             <>
                 {hasClickedImage && (
                     <div
-                        className={`${styles.modalcontainer} 
+                        className={`${styles.modalcontainer}
                           ${isFadeEffect ? styles.fade : ''}`}
                         onClick={handleImageClick}
                     >

diff --git a/package.json b/package.json
@@ -8,9 +8,7 @@
       "jest": "27",
       "ts-jest": "27",
       "async": "3.2.2",
-      "nth-check": "2.0.1",
-      "@types/react": "17.x",
-      "@types/react-dom": "17.x"
+      "nth-check": "2.0.1"
     }
   }
 }