Merge pull request #205 from argentlabs/chore/skip-argent

chore: remove export of Argent connector

Author: Aleksandar Cakalic

package.json

@@ -42,11 +42,6 @@
       "import": "./dist/argentMobile.js",
       "require": "./dist/argentMobile.cjs"
     },
-    "./argent": {
-      "types": "./dist/argent.d.ts",
-      "import": "./dist/argent.js",
-      "require": "./dist/argent.cjs"
-    },
     "./argentX": {
       "types": "./dist/argentX.d.ts",
       "import": "./dist/argentX.js",
@@ -81,11 +76,6 @@
       "types": "./dist/window.d.ts",
       "import": "./dist/window.js",
       "require": "./dist/window.cjs"
-    },
-    "./starknet-react": {
-      "types": "./dist/starknet-react.d.ts",
-      "import": "./dist/starknet-react.js",
-      "require": "./dist/starknet-react.cjs"
     }
   },
   "main": "./dist/starknetkit.cjs",

src/connectors/argent/index.ts

@@ -23,7 +23,7 @@ interface ArgentSettings {
 const ArgentIcon =
   "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIHZpZXdCb3g9IjAgMCAzMiAzMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgaWQ9IkhpdG8gaW4gY29udGFpbmVyIj4KPHBhdGggaWQ9IlZlY3RvciIgZD0iTTE4Ljc5OTkgNS45MkgxMy4yMDAzQzEzLjAxMzIgNS45MiAxMi44NjMyIDYuMDc0MDIgMTIuODU5MiA2LjI2NTQ3QzEyLjc0NiAxMS42NDcgOS45OTQ3NyAxNi43NTQ2IDUuMjU5MyAyMC4zNzI0QzUuMTA4OTUgMjAuNDg3MiA1LjA3NDcgMjAuNzAzIDUuMTg0NjIgMjAuODU4NEw4LjQ2MDg3IDI1LjQ5NDNDOC41NzIzMyAyNS42NTIgOC43ODk1IDI1LjY4NzcgOC45NDIzNyAyNS41NzE4QzExLjkwMzMgMjMuMzI0NCAxNC4yODUgMjAuNjEzNCAxNi4wMDAxIDE3LjYwODVDMTcuNzE1MiAyMC42MTM0IDIwLjA5NyAyMy4zMjQ0IDIzLjA1OCAyNS41NzE4QzIzLjIxMDcgMjUuNjg3NyAyMy40Mjc5IDI1LjY1MiAyMy41Mzk1IDI1LjQ5NDNMMjYuODE1NyAyMC44NTg0QzI2LjkyNTUgMjAuNzAzIDI2Ljg5MTIgMjAuNDg3MiAyNi43NDEgMjAuMzcyNEMyMi4wMDU0IDE2Ljc1NDYgMTkuMjU0MiAxMS42NDcgMTkuMTQxMiA2LjI2NTQ3QzE5LjEzNzEgNi4wNzQwMiAxOC45ODcgNS45MiAxOC43OTk5IDUuOTJaIiBmaWxsPSIjRkY4NzVCIi8+CjwvZz4KPC9zdmc+Cg=="
 
-export class Argent
+class Argent
   extends StarknetkitCompoundConnector
   implements StarknetkitCompoundConnector
 {

src/helpers/defaultConnectors.ts

@@ -1,31 +1,29 @@
-import type {
-  StarknetkitCompoundConnector,
-  StarknetkitConnector,
-} from "../connectors"
+import type { StarknetkitConnector } from "../connectors"
 import { type ArgentMobileConnectorOptions } from "../connectors/argent/argentMobile"
 import { BraavosMobileBaseConnector } from "../connectors/braavosMobile"
 import { WebWalletConnector } from "../connectors/webwallet"
 import { Braavos } from "../connectors/injected/braavos"
-import { Argent } from "../connectors/argent"
 import { Fordefi } from "../connectors/injected/fordefi"
 import { Keplr } from "../connectors/injected/keplr"
 import { MetaMask } from "../connectors/injected/metamask"
 
 import { isMobileDevice, isSafari } from "./navigator"
+import { ArgentX } from "../connectors/injected/argentX"
 
 export const defaultConnectors = ({
   argentMobileOptions,
   webWalletUrl,
 }: {
   argentMobileOptions: ArgentMobileConnectorOptions
   webWalletUrl?: string
-}): (StarknetkitConnector | StarknetkitCompoundConnector)[] => {
-  const defaultConnectors: (
-    | StarknetkitConnector
-    | StarknetkitCompoundConnector
-  )[] = []
+}): StarknetkitConnector[] => {
+  // | StarknetkitCompoundConnector
+  const defaultConnectors: StarknetkitConnector[] =
+    // | StarknetkitCompoundConnector
+    []
 
-  defaultConnectors.push(new Argent({ mobile: argentMobileOptions }))
+  defaultConnectors.push(new ArgentX())
+  //  defaultConnectors.push(new Argent({ mobile: argentMobileOptions }))
 
   if (!isSafari()) {
     defaultConnectors.push(new Braavos())

src/helpers/mapModalWallets.ts

@@ -9,15 +9,16 @@ import {
 import { ARGENT_X_ICON } from "../connectors/injected/constants"
 import type { ModalWallet, StoreVersion } from "../types/modal"
 import { isInArgentMobileAppBrowser } from "../connectors/argent/helpers"
-import { extractConnector, findConnectorById } from "./connector"
+import {
+  extractConnector,
+  findConnectorById,
+  isCompoundConnector,
+} from "./connector"
 import { getStoreVersionFromBrowser } from "./getStoreVersionFromBrowser"
 
 interface SetConnectorsExpandedParams {
-  availableConnectors: (
-    | Connector
-    | StarknetkitConnector
-    | StarknetkitCompoundConnector
-  )[]
+  availableConnectors: (Connector | StarknetkitConnector)[]
+  // | StarknetkitCompoundConnector
   installedWallets: StarknetWindowObject[]
   discoveryWallets: WalletProvider[]
   storeVersion: StoreVersion | null
@@ -41,23 +42,17 @@ export function getModalWallet(
     connectorOrCompoundConnector,
   ) as StarknetkitConnector
 
-  const isCompoundConnector = (
-    connectorOrCompoundConnector as StarknetkitCompoundConnector
-  ).isCompoundConnector
+  const isCompound = isCompoundConnector(connectorOrCompoundConnector)
 
   const downloads = discoveryWallets?.find(
     (d) =>
       d.id === (connector.id === "argentMobile" ? "argentX" : connector.id),
   )?.downloads
 
   return {
-    name: isCompoundConnector
-      ? connectorOrCompoundConnector.name
-      : connector.name,
+    name: isCompound ? connectorOrCompoundConnector.name : connector.name,
     id: connector.id,
-    icon: isCompoundConnector
-      ? connectorOrCompoundConnector.icon
-      : connector.icon,
+    icon: isCompound ? connectorOrCompoundConnector.icon : connector.icon,
     connector: connectorOrCompoundConnector,
     installed: true,
     title:
@@ -103,8 +98,7 @@ export const mapModalWallets = ({
 
   const connectors = orderedByInstall
     .map<ModalWallet | null>((_c) => {
-      const isCompoundConnector = (_c as StarknetkitCompoundConnector)
-        .isCompoundConnector
+      const isCompound = isCompoundConnector(_c)
       const c = extractConnector(_c)
 
       const installed = installedWallets.find((w) => w.id === c?.id)
@@ -113,7 +107,7 @@ export const mapModalWallets = ({
         let name
         let download
 
-        if (isCompoundConnector) {
+        if (isCompound) {
           icon = _c.icon
           name = _c.name
         } else {

src/main.ts

@@ -12,7 +12,6 @@ import {
 import type {
   Connector,
   StarknetkitConnector,
-  StarknetkitCompoundConnector,
   ConnectorData,
 } from "./connectors"
 import { DEFAULT_WEBWALLET_URL } from "./connectors/webwallet/constants"
@@ -93,6 +92,8 @@ export const connect = async ({
     // This is ugly but needed fix for useStarknetkitConnectModal
     availableConnectors?.map((connector) => {
       if (isCompoundConnector(connector)) {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error
         if ("connector" in connector && "_options" in connector.connector) {
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-expect-error
@@ -271,7 +272,7 @@ export type {
   DisconnectOptions,
   StarknetWindowObject,
   StarknetkitConnector,
-  StarknetkitCompoundConnector,
+  // StarknetkitCompoundConnector,
   defaultConnectors as starknetkitDefaultConnectors,
   ConnectOptions,
   ConnectOptionsWithConnectors,

src/modal/Modal.svelte

@@ -14,7 +14,7 @@
   import DynamicIcon from "./components/DynamicIcon.svelte"
 
   import { isInArgentMobileAppBrowser } from "../connectors/argent/helpers"
-  import { extractConnector } from "../helpers/connector"
+  import { extractConnector, isCompoundConnector } from "../helpers/connector"
   import type { StarknetkitCompoundConnector } from "../connectors"
   import { ArgentX } from "../connectors/injected/argentX"
   import { Braavos } from "../connectors/injected/braavos"
@@ -40,7 +40,8 @@
 
   export let showBackButton: boolean = true
   $: showFallback = Boolean(
-    (selectedWallet?.connector as StarknetkitCompoundConnector).isCompoundConnector
+    selectedWallet
+    && isCompoundConnector(selectedWallet?.connector)
     && (selectedWallet?.connector as StarknetkitCompoundConnector)?.fallbackConnector
   );
 

src/starknet-react/index.tsx

@@ -40,7 +40,7 @@ type StarknetReactWrapperProps = {
   theme?: "dark" | "light"
 }
 
-export function StarknetReactWrapper({
+function StarknetReactWrapper({
   children,
   connector,
   connectAsyncFunction,

src/types/modal.ts

@@ -37,11 +37,8 @@ export interface ConnectOptions extends GetWalletOptions {
 
 export interface ConnectOptionsWithConnectors
   extends Omit<ConnectOptions, "webWalletUrl" | "argentMobileOptions"> {
-  connectors?: (
-    | Connector
-    | StarknetkitConnector
-    | StarknetkitCompoundConnector
-  )[]
+  connectors?: (Connector | StarknetkitConnector)[]
+  // | StarknetkitCompoundConnector
 }
 
 export type ModalWallet = {

vite.config.ts

@@ -1,6 +1,6 @@
 import { resolve } from "path"
 
-import react from "@vitejs/plugin-react"
+// import react from "@vitejs/plugin-react"
 import { svelte } from "@sveltejs/vite-plugin-svelte"
 import { defineConfig } from "vite"
 import dts from "vite-plugin-dts"
@@ -22,7 +22,7 @@ export default defineConfig({
     lib: {
       entry: {
         starknetkit: resolve(__dirname, "src/main.ts"),
-        "starknet-react": resolve(__dirname, "src/starknet-react/index.tsx"),
+        // "starknet-react": resolve(__dirname, "src/starknet-react/index.tsx"),
         webwalletConnector: resolve(
           __dirname,
           "src/connectors/webwallet/index.ts",
@@ -39,7 +39,7 @@ export default defineConfig({
           __dirname,
           "src/connectors/injected/index.ts",
         ),
-        argent: resolve(__dirname, "src/connectors/argent/index.ts"),
+        // argent: resolve(__dirname, "src/connectors/argent/index.ts"),
         argentX: resolve(__dirname, "src/connectors/injected/argentX.ts"),
         braavos: resolve(__dirname, "src/connectors/injected/braavos.ts"),
         metamask: resolve(__dirname, "src/connectors/injected/metamask.ts"),
@@ -50,7 +50,7 @@ export default defineConfig({
     },
   },
   plugins: [
-    react({}),
+    // react({}),
     svelte({
       emitCss: false,
     }),