Move UI-specific code to react-data-query

Author: FrederikBolding

packages/base-data-service/package.json

@@ -52,7 +52,6 @@
     "@metamask/messenger": "^0.3.0",
     "@metamask/utils": "^11.9.0",
     "@tanstack/query-core": "^4.43.0",
-    "@tanstack/react-query": "^4.43.0",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {

packages/base-data-service/src/index.ts

@@ -9,5 +9,3 @@ export type {
   QueryKey,
 } from './BaseDataService';
 export { BaseDataService } from './BaseDataService';
-export { createUIQueryClient } from './createUIQueryClient';
-export { useQuery, useInfiniteQuery } from './hooks';

packages/base-data-service/tsconfig.json

@@ -4,8 +4,8 @@
     "baseUrl": "./"
   },
   "references": [
-    { "path": "../messenger/tsconfig.build.json" },
-    { "path": "../controller-utils/tsconfig.build.json" }
+    { "path": "../messenger" },
+    { "path": "../controller-utils" }
   ],
   "include": ["../../types", "./src", "./tests"]
 }

packages/react-data-query/package.json

@@ -46,6 +46,11 @@
     "test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
+  "dependencies": {
+    "@metamask/utils": "^11.10.0",
+    "@tanstack/query-core": "^4.43.0",
+    "@tanstack/react-query": "^4.43.0"
+  },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@ts-bridge/cli": "^0.6.4",
@@ -57,6 +62,11 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~5.3.3"
   },
+  "peerDependencies": {
+    "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+    "react-native": "*"
+  },
   "engines": {
     "node": "^18.18 || >=20"
   },

…-service/src/createUIQueryClient.test.ts …ta-query/src/createUIQueryClient.test.tspackages/base-data-service/src/createUIQueryClient.test.ts renamed to packages/react-data-query/src/createUIQueryClient.test.ts packages/base-data-service/src/createUIQueryClient.test.ts renamed to packages/react-data-query/src/createUIQueryClient.test.ts

@@ -14,12 +14,12 @@ import {
   ExampleDataServiceEvents,
   GetActivityResponse,
   PageParam,
-} from '../tests/ExampleDataService';
+} from '../../base-data-service/tests/ExampleDataService';
 import {
   mockAssets,
   mockTransactionsPage1,
   mockTransactionsPage2,
-} from '../tests/mocks';
+} from '../../base-data-service/tests/mocks';
 
 const DATA_SERVICES = ['ExampleDataService'];
 

…-data-service/src/createUIQueryClient.ts …ct-data-query/src/createUIQueryClient.tspackages/base-data-service/src/createUIQueryClient.ts renamed to packages/react-data-query/src/createUIQueryClient.ts packages/base-data-service/src/createUIQueryClient.ts renamed to packages/react-data-query/src/createUIQueryClient.ts

@@ -9,7 +9,7 @@ import {
   QueryKey,
 } from '@tanstack/query-core';
 
-import { GranularCacheUpdatedPayload } from './BaseDataService';
+import { GranularCacheUpdatedPayload } from '@metamask/base-data-service';
 
 type SubscriptionCallback = (payload: GranularCacheUpdatedPayload) => void;
 type JsonSubscriptionCallback = (data: Json) => void;

…ages/base-data-service/src/hooks.test.ts …kages/react-data-query/src/hooks.test.tspackages/base-data-service/src/hooks.test.ts renamed to packages/react-data-query/src/hooks.test.ts packages/base-data-service/src/hooks.test.ts renamed to packages/react-data-query/src/hooks.test.ts

@@ -10,7 +10,7 @@ import {
   UseInfiniteQueryResult,
 } from '@tanstack/react-query';
 
-import { QueryKey } from './BaseDataService';
+import { QueryKey } from '@metamask/base-data-service';
 
 // We provide re-exports of the underlying TanStack Query hooks with narrower types,
 // removing `staleTime` and `queryFn` which aren't useful when using data services.

packages/base-data-service/src/hooks.ts packages/react-data-query/src/hooks.tspackages/base-data-service/src/hooks.ts renamed to packages/react-data-query/src/hooks.ts

@@ -1,9 +1,2 @@
-/**
- * Example function that returns a greeting for the given name.
- *
- * @param name - The name to greet.
- * @returns The greeting.
- */
-export default function greeter(name: string): string {
-  return `Hello, ${name}!`;
-}
+export { createUIQueryClient } from './createUIQueryClient';
+export { useQuery, useInfiniteQuery } from './hooks';