[react] Making new submodule opt-in and not automatically imported

Author: hardsetting

packages/wallet-adapter-react/package.json

@@ -7,9 +7,16 @@
   "types": "./dist/index.d.ts",
   "license": "Apache-2.0",
   "exports": {
-    "require": "./dist/index.js",
-    "import": "./dist/index.mjs",
-    "types": "./dist/index.d.ts"
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs"
+    },
+    "./new": {
+      "types": "./dist/new/index.d.ts",
+      "require": "./dist/new/index.js",
+      "import": "./dist/new/index.mjs"
+    }
   },
   "repository": {
     "type": "git",
@@ -29,13 +36,20 @@
     "React"
   ],
   "scripts": {
-    "build:bundle": "tsup src/index.tsx --format esm,cjs --sourcemap",
+    "build:bundle": "tsup --sourcemap",
     "build:declarations": "tsc --emitDeclarationOnly --declaration --declarationMap",
     "build": "pnpm build:bundle && pnpm build:declarations",
-    "dev": "tsup src/index.tsx --format esm,cjs --watch",
+    "dev": "tsup --watch",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
     "lint": "TIMING=1 eslint \"src/**/*.ts*\""
   },
+  "tsup": {
+    "entryPoints": [
+      "src/index.tsx",
+      "src/new/index.ts"
+    ],
+    "format": ["esm", "cjs"]
+  },
   "devDependencies": {
     "@aptos-labs/wallet-adapter-tsconfig": "workspace:*",
     "@types/react": "^18.3.3",

packages/wallet-adapter-react/src/index.tsx

@@ -3,5 +3,4 @@ export * from "./WalletProvider";
 export * from "./components/AboutAptosConnect";
 export * from "./components/AptosPrivacyPolicy";
 export * from "./components/WalletItem";
-export * from "./new";
 export * from "./useWallet";

packages/wallet-adapter-react/src/new/Example.tsx

@@ -1,4 +1,4 @@
-import { WalletAdapter, WalletAdapterConfig } from '@aptos-labs/wallet-adapter-core';
+import { WalletAdapter, WalletAdapterConfig } from '@aptos-labs/wallet-adapter-core/new';
 import { createContext, PropsWithChildren, useMemo } from 'react';
 
 export const WalletAdapterContext = createContext<WalletAdapter | null>(null);

packages/wallet-adapter-react/src/new/WalletAdapterContext.tsx

@@ -1,4 +1,4 @@
-import { AdaptedWallet, isRedirectable } from "@aptos-labs/wallet-adapter-core";
+import { AdaptedWallet } from "@aptos-labs/wallet-adapter-core/new";
 import { UserResponseStatus } from '@aptos-labs/wallet-standard';
 import { Slot } from "@radix-ui/react-slot";
 import { createContext, forwardRef, useCallback, useContext } from "react";
@@ -44,7 +44,8 @@ const Root = forwardRef<HTMLDivElement, WalletItemProps>(
     const mobileSupport = false;
     // "deeplinkProvider" in wallet && wallet.deeplinkProvider;
 
-    if (!isWalletReady && isRedirectable() && !mobileSupport) return null;
+    const isRedirectable = false;
+    if (!isWalletReady && isRedirectable && !mobileSupport) return null;
 
     const Component = asChild ? Slot : "div";
 

packages/wallet-adapter-react/src/new/WalletItem.tsx

@@ -3,4 +3,4 @@ export * from './useActiveWalletId';
 export * from './useAvailableWallets';
 export * from './useWalletAdapter';
 export * from './WalletAdapterContext';
-export { WalletItem as NewWalletItem } from './WalletItem';
+export * from './WalletItem';

packages/wallet-adapter-react/src/new/index.ts

@@ -1,4 +1,4 @@
-import { AdaptedWallet, NewNetwork as Network } from '@aptos-labs/wallet-adapter-core';
+import { AdaptedWallet, Network } from '@aptos-labs/wallet-adapter-core/new';
 import {
   AccountInfo,
   AptosFeatures,

packages/wallet-adapter-react/src/new/useActiveWallet.ts

@@ -1,4 +1,4 @@
-import { WalletAdapter } from '@aptos-labs/wallet-adapter-core';
+import { WalletAdapter } from '@aptos-labs/wallet-adapter-core/new';
 import { useContext } from 'react';
 import { WalletAdapterContext } from './WalletAdapterContext';
 

packages/wallet-adapter-react/src/new/useWalletAdapter.tsx

@@ -5,6 +5,7 @@
   "compilerOptions": {
     "target": "es2020",
     "lib": ["es2020", "dom"],
+    "moduleResolution": "bundler",
     "rootDir": "src",
     "outDir": "dist"
   }