From 2380f011ec1d517b59713637989872dffb63227f Mon Sep 17 00:00:00 2001 From: Dominik Dorfmeister Date: Mon, 26 Jun 2023 23:17:56 +0200 Subject: [PATCH] Revert "refactor(rect-query): prefer client-only import over 'use client' (#5626)" This reverts commit 3e25f51d0e70fb118de6296bf65047e24b3ad9ee. --- package.json | 2 +- .../react-query-persist-client/package.json | 3 +-- .../src/PersistQueryClientProvider.tsx | 2 +- packages/react-query/package.json | 1 - .../react-query/src/QueryClientProvider.tsx | 2 +- packages/react-query/src/useBaseQuery.ts | 2 +- packages/react-query/src/useInfiniteQuery.ts | 2 +- packages/react-query/src/useIsFetching.ts | 2 +- packages/react-query/src/useIsMutating.ts | 2 +- packages/react-query/src/useMutation.ts | 2 +- packages/react-query/src/useQueries.ts | 2 +- packages/react-query/src/useQuery.ts | 2 +- pnpm-lock.yaml | 19 ++++--------------- 13 files changed, 15 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index a8a6ec0ac3..46d5f96f4b 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "react-dom-17": "npm:react-dom@^17.0.2", "rimraf": "^3.0.2", "rollup": "^2.70.2", - "rollup-plugin-preserve-directives": "0.2.0", + "rollup-plugin-preserve-directives": "0.1.0", "rollup-plugin-size": "^0.2.2", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-visualizer": "^5.6.0", diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index 04a21ffcd0..af3b249b18 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -45,8 +45,7 @@ "@tanstack/react-query": "workspace:*" }, "dependencies": { - "@tanstack/query-persist-client-core": "workspace:*", - "client-only": "0.0.1" + "@tanstack/query-persist-client-core": "workspace:*" }, "peerDependencies": { "@tanstack/react-query": "workspace:*" diff --git a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx index cb0ecb7dd8..ecfc916a2b 100644 --- a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx +++ b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import * as React from 'react' import type { PersistQueryClientOptions } from '@tanstack/query-persist-client-core' diff --git a/packages/react-query/package.json b/packages/react-query/package.json index a66b2a5a14..8b75f7436f 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -55,7 +55,6 @@ }, "dependencies": { "@tanstack/query-core": "workspace:*", - "client-only": "0.0.1", "use-sync-external-store": "^1.2.0" }, "peerDependencies": { diff --git a/packages/react-query/src/QueryClientProvider.tsx b/packages/react-query/src/QueryClientProvider.tsx index 37e860dc93..da4ba57880 100644 --- a/packages/react-query/src/QueryClientProvider.tsx +++ b/packages/react-query/src/QueryClientProvider.tsx @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import * as React from 'react' import type { QueryClient } from '@tanstack/query-core' diff --git a/packages/react-query/src/useBaseQuery.ts b/packages/react-query/src/useBaseQuery.ts index cebc0f69d7..87d3ff5eca 100644 --- a/packages/react-query/src/useBaseQuery.ts +++ b/packages/react-query/src/useBaseQuery.ts @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts index d0074b8f53..85e78699bd 100644 --- a/packages/react-query/src/useInfiniteQuery.ts +++ b/packages/react-query/src/useInfiniteQuery.ts @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import type { QueryObserver, QueryFunction, diff --git a/packages/react-query/src/useIsFetching.ts b/packages/react-query/src/useIsFetching.ts index cb17b0fe4a..ceac657496 100644 --- a/packages/react-query/src/useIsFetching.ts +++ b/packages/react-query/src/useIsFetching.ts @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import * as React from 'react' import type { QueryKey, QueryFilters } from '@tanstack/query-core' import { notifyManager, parseFilterArgs } from '@tanstack/query-core' diff --git a/packages/react-query/src/useIsMutating.ts b/packages/react-query/src/useIsMutating.ts index f3ed94f755..97c3ad2e4b 100644 --- a/packages/react-query/src/useIsMutating.ts +++ b/packages/react-query/src/useIsMutating.ts @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' diff --git a/packages/react-query/src/useMutation.ts b/packages/react-query/src/useMutation.ts index 240a9f3f96..0f10dbf74a 100644 --- a/packages/react-query/src/useMutation.ts +++ b/packages/react-query/src/useMutation.ts @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts index c43dba916e..46d4c3e5e1 100644 --- a/packages/react-query/src/useQueries.ts +++ b/packages/react-query/src/useQueries.ts @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import * as React from 'react' import { useSyncExternalStore } from './useSyncExternalStore' diff --git a/packages/react-query/src/useQuery.ts b/packages/react-query/src/useQuery.ts index 058b09d24c..ae23e9016f 100644 --- a/packages/react-query/src/useQuery.ts +++ b/packages/react-query/src/useQuery.ts @@ -1,4 +1,4 @@ -import 'client-only' +'use client' import type { QueryFunction, QueryKey } from '@tanstack/query-core' import { parseQueryArgs, QueryObserver } from '@tanstack/query-core' import type { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ede7df5be2..c4939da2d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -191,8 +191,8 @@ importers: specifier: ^2.70.2 version: 2.78.1 rollup-plugin-preserve-directives: - specifier: 0.2.0 - version: 0.2.0(rollup@2.78.1) + specifier: 0.1.0 + version: 0.1.0(rollup@2.78.1) rollup-plugin-size: specifier: ^0.2.2 version: 0.2.2 @@ -1295,9 +1295,6 @@ importers: '@tanstack/query-core': specifier: workspace:* version: link:../query-core - client-only: - specifier: 0.0.1 - version: 0.0.1 react-native: specifier: '*' version: 0.64.3(@babel/core@7.19.1)(@babel/preset-env@7.18.6)(react@18.2.0) @@ -1381,9 +1378,6 @@ importers: '@tanstack/query-persist-client-core': specifier: workspace:* version: link:../query-persist-client-core - client-only: - specifier: 0.0.1 - version: 0.0.1 devDependencies: '@tanstack/react-query': specifier: workspace:* @@ -8281,10 +8275,6 @@ packages: engines: {node: '>= 10'} dev: false - /client-only@0.0.1: - resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} - dev: false - /cliui@6.0.0: resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} dependencies: @@ -15332,12 +15322,11 @@ packages: dependencies: glob: 7.2.3 - /rollup-plugin-preserve-directives@0.2.0(rollup@2.78.1): - resolution: {integrity: sha512-KUwbBaFvD1zFIDNnOkR+u64sSod3m0l6q46/SzTOa4GTQ6hp6w0FRr2u7x99YkY9qhlna5panmTmuLWeJ/2KWw==} + /rollup-plugin-preserve-directives@0.1.0(rollup@2.78.1): + resolution: {integrity: sha512-fgzIK3hwF/afa6L1Qdsvshn0JlCHZRx0Sh9l0jjUgz3VK0unMFuEB4uqL3Vdae4OXkn+MBYCeNEN9vm81IteiA==} peerDependencies: rollup: 2.x || 3.x dependencies: - magic-string: 0.30.0 rollup: 2.78.1 dev: true