rebase

Author: OmarBasem

apps/zerodev-signer-demo/next.config.ts

@@ -8,19 +8,25 @@ const nextConfig: NextConfig = {
     '@zerodev/wallet-react-ui',
     '@zerodev/wallet-core',
   ],
-  // Force a single wagmi / @wagmi/core instance in the bundle. wagmi exposes
-  // its config through React Context; if two physical copies end up loaded,
-  // `WagmiProvider` and `useConfig` reference different Contexts and hooks
-  // throw WagmiProviderNotFoundError. Duplicates can arise whenever the same
-  // wagmi version is resolved with different (optional) peer-dependency
-  // contexts across paths — common in workspaces. Aliasing both packages to
-  // this app's node_modules guarantees every import resolves to the same
-  // module identity.
+  // Force a single wagmi / @wagmi/core / @tanstack/react-query instance in the
+  // bundle. Each exposes state through a React Context (WagmiProvider config,
+  // QueryClientProvider client). If two physical copies end up loaded, provider
+  // and consumer reference different Contexts and hooks throw (e.g.
+  // WagmiProviderNotFoundError, "No QueryClient set"). Duplicates arise
+  // whenever the same version resolves under different (optional) peer
+  // contexts — the workspace pulls react@19.2.3 through the Expo/RN side and
+  // react@19.2.0 through the demo, so pnpm splits @tanstack/react-query into
+  // two variants. Aliasing to this app's node_modules pins every import to the
+  // same module identity.
   webpack: (config) => {
     config.resolve.alias = {
       ...config.resolve.alias,
       wagmi: path.resolve(__dirname, 'node_modules/wagmi'),
       '@wagmi/core': path.resolve(__dirname, 'node_modules/@wagmi/core'),
+      '@tanstack/react-query': path.resolve(
+        __dirname,
+        'node_modules/@tanstack/react-query',
+      ),
     }
     return config
   },