@tanstack/react-query 4.0.10 → 4.0.11-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query",
-  "version": "4.0.10",
+  "version": "4.0.11-beta.4",
   "description": "Hooks for managing, caching and syncing asynchronous and remote data in React",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -10,27 +10,30 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
-  "module": "build/esm/index.js",
-  "main": "build/cjs/react-query/src/index.js",
-  "browser": "build/umd/index.production.js",
-  "types": "build/types/packages/react-query/src/index.d.ts",
+  "types": "build/lib/index.d.ts",
+  "module": "build/lib/index.mjs",
+  "main": "build/lib/index.js",
+  "exports": {
+    ".": {
+      "types": "./build/lib/index.d.ts",
+      "import": "./build/lib/index.mjs",
+      "default": "./build/lib/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "sideEffects": [
-    "lib/index.js",
-    "lib/index.mjs",
-    "lib/reactjs/index.js",
-    "lib/reactjs/index.mjs",
-    "lib/reactjs/setBatchUpdatesFn.js",
-    "lib/reactjs/setBatchUpdatesFn.mjs"
+    "./src/setBatchUpdatesFn.ts"
   ],
   "scripts": {
+    "clean": "rm -rf ./build",
     "test:codemods": "../../node_modules/.bin/jest --config codemods/jest.config.js",
     "test:eslint": "../../node_modules/.bin/eslint --ext .ts,.tsx ./src",
     "test:jest": "yarn test:codemods && ../../node_modules/.bin/jest --config jest.config.js",
-    "test:jest:dev": "yarn test:jest --watch",
-    "compile": "../../node_modules/.bin/tsc -p tsconfig.json --noEmit --emitDeclarationOnly false"
+    "test:jest:dev": "yarn test:jest --watch"
   },
   "files": [
-    "build/*",
+    "build/lib/*",
+    "build/umd/*",
     "src",
     "codemods",
     "!codemods/jest.config.js",
@@ -43,7 +46,7 @@
     "react-error-boundary": "^3.1.4"
   },
   "dependencies": {
-    "@tanstack/query-core": "^4.0.0-beta.1",
+    "@tanstack/query-core": "^4.0.10",
     "@types/use-sync-external-store": "^0.0.3",
     "use-sync-external-store": "^1.2.0"
   },

package/src/__tests__/useQuery.test.tsx

@@ -2149,14 +2149,16 @@ describe('useQuery', () => {
     await sleep(20)
     unsubscribe()
 
-    // 1. Subscribe observer
-    // 2. Query loading
-    // 3. Observer loading
-    // 4. Query success
-    // 5. Observer success
-    // 6. Query stale
-    // 7. Unsubscribe observer
-    expect(fn).toHaveBeenCalledTimes(7)
+    // 1. Query added -> loading
+    // 2. Observer result updated -> loading
+    // 3. Observer added
+    // 4. Query updated -> success
+    // 5. Observer result updated -> success
+    // 6. Query updated -> stale
+    // 7. Observer options updated
+    // 8. Observer result updated -> stale
+    // 9. Observer options updated
+    expect(fn).toHaveBeenCalledTimes(9)
   })
 
   it('should not re-render when it should only re-render on data changes and the data did not change', async () => {

package/src/types.ts

@@ -8,6 +8,7 @@ import {
   QueryKey,
   MutationObserverOptions,
   MutateFunction,
+  DefinedQueryObserverResult,
 } from '@tanstack/query-core'
 import type { QueryClient } from '@tanstack/query-core'
 
@@ -65,10 +66,15 @@ export type UseQueryResult<
   TError = unknown,
 > = UseBaseQueryResult<TData, TError>
 
-export type DefinedUseQueryResult<TData = unknown, TError = unknown> = Omit<
-  UseQueryResult<TData, TError>,
-  'data'
-> & { data: TData }
+export type DefinedUseBaseQueryResult<
+  TData = unknown,
+  TError = unknown,
+> = DefinedQueryObserverResult<TData, TError>
+
+export type DefinedUseQueryResult<
+  TData = unknown,
+  TError = unknown,
+> = DefinedUseBaseQueryResult<TData, TError>
 
 export type UseInfiniteQueryResult<
   TData = unknown,

package/src/useBaseQuery.ts

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { useSyncExternalStore } from 'use-sync-external-store/shim'
+import { useSyncExternalStore } from './useSyncExternalStore'
 
 import { QueryKey, notifyManager, QueryObserver } from '@tanstack/query-core'
 import { useQueryErrorResetBoundary } from './QueryErrorResetBoundary'

package/src/useIsFetching.ts

@@ -6,7 +6,7 @@ import {
   QueryFilters,
 } from '@tanstack/query-core'
 
-import { useSyncExternalStore } from 'use-sync-external-store/shim'
+import { useSyncExternalStore } from './useSyncExternalStore'
 import { ContextOptions } from './types'
 import { useQueryClient } from './QueryClientProvider'
 

package/src/useIsMutating.ts

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { useSyncExternalStore } from 'use-sync-external-store/shim'
+import { useSyncExternalStore } from './useSyncExternalStore'
 
 import {
   notifyManager,

package/src/useMutation.ts

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { useSyncExternalStore } from 'use-sync-external-store/shim'
+import { useSyncExternalStore } from './useSyncExternalStore'
 
 import {
   notifyManager,

package/src/useQueries.ts

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { useSyncExternalStore } from 'use-sync-external-store/shim'
+import { useSyncExternalStore } from './useSyncExternalStore'
 
 import {
   QueryKey,

package/src/useSyncExternalStore.native.ts

@@ -0,0 +1,3 @@
+// Temporary workaround due to an issue with react-native uSES - https://github.com/TanStack/query/pull/3601
+// @ts-ignore
+export { useSyncExternalStore } from 'use-sync-external-store/shim/index.native.js'

package/src/useSyncExternalStore.ts

@@ -0,0 +1,2 @@
+// Temporary workaround due to an issue with react-native uSES - https://github.com/TanStack/query/pull/3601
+export { useSyncExternalStore } from 'use-sync-external-store/shim/index.js'