Merge pull request #23 from nabla-studio/DavideSegullo/fix-types

Davide segullo/fix types
nabla-studio · Nov 24, 2023 · a6ab28b · a6ab28b
2 parents 9e27aa0 + fd2c973
commit a6ab28b
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 25 deletions.
diff --git a/examples/nextjs/components/button.tsx b/examples/nextjs/components/button.tsx
@@ -18,7 +18,7 @@ export const Button = () => {
         }}
       >
         <img
-          src={wallet.options.logoUrls?.light?.svg}
+          src={wallet.logoLight}
           alt={wallet.options.prettyName}
           height="48px"
           width="48px"

diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "typescript": "~5.2.2",
     "verdaccio": "^5.27.0",
     "vite": "~4.5.0",
-    "vite-plugin-dts": "~3.6.1",
+    "vite-plugin-dts": "~2.3.0",
     "vitest": "~0.34.6",
     "vue-tsc": "^1.8.8"
   },

diff --git a/packages/chain-registry/vite.config.ts b/packages/chain-registry/vite.config.ts
@@ -11,7 +11,8 @@ export default defineConfig({
     nxViteTsPaths(),
     dts({
       entryRoot: 'src',
-      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
     }),
   ],
 

diff --git a/packages/core/src/wallet.ts b/packages/core/src/wallet.ts
@@ -37,6 +37,46 @@ export abstract class Wallet<T = unknown> {
     this.events.removeAllListeners();
   }
 
+  get logoDark() {
+    const urls = this.options.logoUrls;
+
+    if (urls && urls.dark) {
+      const keys = Object.keys(urls.dark);
+
+      if (urls.dark.svg) {
+        return urls.dark.svg;
+      }
+
+      if (keys.length > 0) {
+        const [key] = keys;
+
+        return (urls.dark as { [key: string]: string })[key];
+      }
+    }
+
+    return undefined;
+  }
+
+  get logoLight() {
+    const urls = this.options.logoUrls;
+
+    if (urls && urls.light) {
+      const keys = Object.keys(urls.light);
+
+      if (urls.light.svg) {
+        return urls.light.svg;
+      }
+
+      if (keys.length > 0) {
+        const [key] = keys;
+
+        return (urls.light as { [key: string]: string })[key];
+      }
+    }
+
+    return undefined;
+  }
+
   abstract addListeners(): void;
 
   abstract init(): Promise<T | undefined>;

diff --git a/packages/core/vite.config.ts b/packages/core/vite.config.ts
@@ -11,7 +11,8 @@ export default defineConfig({
     nxViteTsPaths(),
     dts({
       entryRoot: 'src',
-      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
     }),
   ],
 

diff --git a/packages/nuxt/vite.config.ts b/packages/nuxt/vite.config.ts
@@ -13,7 +13,8 @@ export default defineConfig({
     nxViteTsPaths(),
     dts({
       entryRoot: 'src',
-      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
     }),
   ],
 

diff --git a/packages/react/src/providers/next.tsx b/packages/react/src/providers/next.tsx
@@ -1,5 +1,5 @@
 import { QuirksConfigContext } from './config';
-import { PropsWithChildren, useContext, useEffect, useState } from 'react';
+import { type PropsWithChildren, useContext, useEffect, useState } from 'react';
 
 export const QuirksNextProvider = (props: PropsWithChildren<unknown>) => {
   const { children } = props;

diff --git a/packages/react/vite.config.ts b/packages/react/vite.config.ts
@@ -13,7 +13,8 @@ export default defineConfig({
     nxViteTsPaths(),
     dts({
       entryRoot: 'src',
-      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
     }),
   ],
 

diff --git a/packages/store/tsconfig.lib.json b/packages/store/tsconfig.lib.json
@@ -5,6 +5,6 @@
     "declaration": true,
     "types": ["node", "vite/client"]
   },
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
   "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
 }
diff --git a/packages/store/vite.config.ts b/packages/store/vite.config.ts
@@ -11,7 +11,8 @@ export default defineConfig({
     nxViteTsPaths(),
     dts({
       entryRoot: 'src',
-      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
     }),
   ],
 

diff --git a/packages/vue/vite.config.ts b/packages/vue/vite.config.ts
@@ -13,7 +13,8 @@ export default defineConfig({
     nxViteTsPaths(),
     dts({
       entryRoot: 'src',
-      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
     }),
   ],
 

diff --git a/packages/wallets/src/xdefi/registry.ts b/packages/wallets/src/xdefi/registry.ts
@@ -12,10 +12,10 @@ export const xdefiExtensionOptions: WalletOptions = {
   ],
   logoUrls: {
     light: {
-      jpg: 'https://lh3.googleusercontent.com/6TkuRn_tZ2v5Bw4MZ2nTwJLEWU-76bAQFJhXunA7cbroI0izn7Mwi46Wvu3q5WfNUbQiPucQTCSTrb0FD_BCXuo3=w128-h128-e365-rj-sc0x00ffffff',
+      jpg: 'https://explorer-api.walletconnect.com/v3/logo/lg/efec6318-7f96-4b30-9287-6c287660cd00?projectId=2f05ae7f1116030fde2d36508f472bfb',
     },
     dark: {
-      jpg: 'https://lh3.googleusercontent.com/6TkuRn_tZ2v5Bw4MZ2nTwJLEWU-76bAQFJhXunA7cbroI0izn7Mwi46Wvu3q5WfNUbQiPucQTCSTrb0FD_BCXuo3=w128-h128-e365-rj-sc0x00ffffff',
+      jpg: 'https://explorer-api.walletconnect.com/v3/logo/lg/efec6318-7f96-4b30-9287-6c287660cd00?projectId=2f05ae7f1116030fde2d36508f472bfb',
     },
   },
   events: {

diff --git a/packages/wallets/vite.config.ts b/packages/wallets/vite.config.ts
@@ -11,7 +11,8 @@ export default defineConfig({
     nxViteTsPaths(),
     dts({
       entryRoot: 'src',
-      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
     }),
   ],
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml