final fixes with folder structure and modal package

.vscode/settings.json

@@ -5,13 +5,17 @@
   },
   "eslint.workingDirectories": [
     {
-      "directory": "packages/*",
+      "directory": "packages/no-modal",
+      "changeProcessCWD": true
+    },
+    {
+      "directory": "packages/modal",
       "changeProcessCWD": true
     },
     {
       "directory": "demo/*",
       "changeProcessCWD": true
     }
   ],
-  "cSpell.words": ["JRPC","Solana"]
+  "cSpell.words": ["JRPC","Solana"],
 }

demo/vite-react-app/package.json

@@ -3,13 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@web3auth/account-abstraction-provider": "file:../../packages/providers/account-abstraction-provider",
-    "@web3auth/auth-adapter": "file:../../packages/adapters/auth-adapter",
-    "@web3auth/base": "file:../../packages/base",
-    "@web3auth/ethereum-provider": "file:../../packages/providers/ethereum-provider",
     "@web3auth/modal": "file:../../packages/modal",
     "@web3auth/sign-in-with-ethereum": "^4.2.2",
-    "@web3auth/wallet-services-plugin": "file:../../packages/plugins/wallet-services-plugin",
     "ethers": "^6.13.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

demo/vite-react-app/src/components/Main.tsx

@@ -1,4 +1,4 @@
-import { WALLET_ADAPTERS } from "@web3auth/base";
+import { WALLET_ADAPTERS } from "@web3auth/modal";
 import { useWeb3Auth } from "../services/web3auth";
 import styles from "../styles/Home.module.css";
 

demo/vite-react-app/src/config/chainConfig.ts

@@ -1,4 +1,4 @@
-import { CustomChainConfig, CHAIN_NAMESPACES } from "@web3auth/base";
+import { CustomChainConfig, CHAIN_NAMESPACES } from "@web3auth/modal";
 
 export const CHAIN_CONFIG = {
   mainnet: {

demo/vite-react-app/src/config/config.ts

@@ -1,4 +1,4 @@
-import { SignTypedDataMessageV4 } from "@web3auth/ethereum-provider";
+import { SignTypedDataMessageV4 } from "@web3auth/modal";
 
 export const getV4TypedData = (chainId: string): SignTypedDataMessageV4 => ({
   types: {

demo/vite-react-app/src/services/ethHandler.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { IProvider, log } from "@web3auth/base";
-import { SignTypedDataMessageV4 } from "@web3auth/ethereum-provider";
+import { IProvider, log } from "@web3auth/modal";
 import { verifyMessage as eipVerifyMessage } from "@web3auth/sign-in-with-ethereum";
 import { BrowserProvider, parseEther } from "ethers";
 import { getV4TypedData } from "../config/config";

demo/vite-react-app/src/services/walletServiceHandlers.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { log } from "@web3auth/base";
+import { log, WalletServicesPlugin } from "@web3auth/modal";
 import { verifyMessage as eipVerifyMessage } from "@web3auth/sign-in-with-ethereum";
-import { WalletServicesPlugin } from "@web3auth/wallet-services-plugin";
 import { BrowserProvider, parseEther } from "ethers";
 
 import { getV4TypedData } from "../config/config";

demo/vite-react-app/src/services/web3auth.tsx

@@ -1,13 +1,8 @@
-import { ADAPTER_EVENTS, CHAIN_NAMESPACES, CustomChainConfig, IProvider, WEB3AUTH_NETWORK_TYPE } from "@web3auth/base";
-import { Web3Auth } from "@web3auth/modal";
-import { WalletServicesPlugin } from "@web3auth/wallet-services-plugin";
-import { EthereumPrivateKeyProvider } from "@web3auth/ethereum-provider";
+import { ADAPTER_EVENTS, CHAIN_NAMESPACES, CustomChainConfig, EthereumPrivateKeyProvider, IProvider, WalletServicesPlugin, WEB3AUTH_NETWORK_TYPE, Web3Auth, AccountAbstractionProvider, SafeSmartAccount, PLUGIN_EVENTS } from "@web3auth/modal";
 import { createContext, FunctionComponent, ReactNode, useCallback, useContext, useEffect, useState } from "react";
 import { CHAIN_CONFIG, CHAIN_CONFIG_TYPE } from "../config/chainConfig";
 import * as ethHandler from "./ethHandler";
-import { PLUGIN_EVENTS } from "@web3auth/base";
 import * as walletServiceHandler from "./walletServiceHandlers";
-import { AccountAbstractionProvider, SafeSmartAccount } from "@web3auth/account-abstraction-provider";
 
 export interface IWeb3AuthContext {
   web3Auth: Web3Auth | null;

demo/vue-app/package.json

@@ -6,32 +6,16 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "install:local": "npm i @web3auth/modal @web3auth/no-modal @web3auth/base @web3auth/torus-evm-adapter @web3auth/torus-solana-adapter @web3auth/openlogin-adapter  @web3auth/metamask-adapter @web3auth/phantom-adapter @web3auth/wallet-connect-v1-adapter @web3auth/solana-provider"
+    "install:local": "npm i @web3auth/modal @web3auth/no-modal"
   },
   "dependencies": {
     "@solana/web3.js": "^1.95.3",
     "@toruslabs/openlogin": "^8.2.1",
     "@toruslabs/openlogin-ed25519": "^8.1.0",
     "@toruslabs/openlogin-utils": "^8.2.1",
     "@walletconnect/modal": "^2.6.2",
-    "@web3auth/base": "file:../../packages/base",
-    "@web3auth/base-evm-adapter": "file:../../packages/adapters/base-evm-adapter",
-    "@web3auth/base-solana-adapter": "file:../../packages/adapters/base-solana-adapter",
-    "@web3auth/default-evm-adapter": "file:../../packages/adapters/default-evm-adapter",
-    "@web3auth/default-solana-adapter": "file:../../packages/adapters/default-solana-adapter",
-    "@web3auth/ethereum-provider": "file:../../packages/providers/ethereum-provider",
-    "@web3auth/metamask-adapter": "file:../../packages/adapters/metamask-adapter",
     "@web3auth/modal": "file:../../packages/modal",
     "@web3auth/no-modal": "file:../../packages/no-modal",
-    "@web3auth/openlogin-adapter": "file:../../packages/adapters/openlogin-adapter",
-    "@web3auth/phantom-adapter": "file:../../packages/adapters/phantom-adapter",
-    "@web3auth/solana-provider": "file:../../packages/providers/solana-provider",
-    "@web3auth/solana-wallet-connector-plugin": "file:../../packages/plugins/solana-wallet-connector-plugin",
-    "@web3auth/solflare-adapter": "file:../../packages/adapters/solflare-adapter",
-    "@web3auth/torus-evm-adapter": "file:../../packages/adapters/torus-evm-adapter",
-    "@web3auth/torus-solana-adapter": "file:../../packages/adapters/torus-solana-adapter",
-    "@web3auth/wallet-connect-v2-adapter": "file:../../packages/adapters/wallet-connect-v2-adapter",
-    "@web3auth/wallet-services-plugin": "^8.12.5",
     "lodash": "^4.17.21",
     "lodash.merge": "^4.6.2",
     "ts-custom-error": "^3.3.1",

package.json

@@ -28,7 +28,6 @@
     "ts-patch": "^3.3.0",
     "tsconfig-paths": "^4.2.0",
     "tsconfig-paths-webpack-plugin": "^4.2.0",
-    "tslib": "^2.8.1",
     "typescript": "~5.6.3",
     "typescript-transform-paths": "^3.5.3"
   },

packages/modal/package.json

@@ -10,8 +10,8 @@
     "ethereum",
     "solana"
   ],
-  "main": "dist/lib.cjs/index.js",
-  "module": "dist/lib.esm/index.js",
+  "main": "dist/lib.cjs/packages/modal/src/index.js",
+  "module": "dist/lib.esm/packages/modal/src/index.js",
   "unpkg": "dist/modal.umd.min.js",
   "jsdelivr": "dist/modal.umd.min.js",
   "types": "dist/types/index.d.ts",
@@ -75,18 +75,18 @@
   },
   "exports": {
     ".": {
-      "import": "./dist/lib.esm/index.js",
-      "require": "./dist/lib.cjs/index.js",
+      "import": "./dist/lib.esm/packages/modal/src/index.js",
+      "require": "./dist/lib.cjs/packages/modal/src/index.js",
       "types": "./dist/types/index.d.ts"
     },
     "./react": {
-      "import": "./dist/lib.esm/react/index.js",
-      "require": "./dist/lib.cjs/react/index.js",
+      "import": "./dist/lib.esm/packages/modal/src/react/index.js",
+      "require": "./dist/lib.cjs/packages/modal/src/react/index.js",
       "types": "./dist/types/react/index.d.ts"
     },
     "./vue": {
-      "import": "./dist/lib.esm/vue/index.js",
-      "require": "./dist/lib.cjs/vue/index.js",
+      "import": "./dist/lib.esm/packages/modal/src/vue/index.js",
+      "require": "./dist/lib.cjs/packages/modal/src/vue/index.js",
       "types": "./dist/types/vue/index.d.ts"
     }
   },