Merge branch 'v4' into v4-suspensive-react-query-links

Author: manudeli

.github/workflows/ci.yml

@@ -12,6 +12,7 @@ on:
       - 'alpha'
       - 'beta'
       - 'rc'
+      - 'v4'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
@@ -23,7 +24,7 @@ env:
 
 jobs:
   test-and-publish:
-    if: github.repository == 'TanStack/query' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/alpha' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/rc')
+    if: github.repository == 'TanStack/query'
     name: 'Test & Publish'
     runs-on: ubuntu-latest
     steps:

packages/vue-query/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/vue-query",
-  "version": "4.37.0",
+  "version": "4.37.1",
   "description": "Hooks for managing, caching and syncing asynchronous and remote data in Vue",
   "author": "Damian Osipiuk",
   "license": "MIT",

packages/vue-query/src/useInfiniteQuery.ts

@@ -11,7 +11,6 @@ import type { UseQueryReturnType } from './useBaseQuery'
 
 import type {
   DeepUnwrapRef,
-  DistributiveOmit,
   VueInfiniteQueryObserverOptions,
   WithQueryClientKey,
 } from './types'
@@ -31,23 +30,11 @@ export type UseInfiniteQueryOptions<
   >
 >
 
-type InfiniteQueryReturnType<TData, TError> = UseQueryReturnType<
+export type UseInfiniteQueryReturnType<TData, TError> = UseQueryReturnType<
   TData,
   TError,
   InfiniteQueryObserverResult<TData, TError>
 >
-export type UseInfiniteQueryReturnType<TData, TError> = DistributiveOmit<
-  InfiniteQueryReturnType<TData, TError>,
-  'fetchNextPage' | 'fetchPreviousPage' | 'refetch' | 'remove'
-> & {
-  fetchNextPage: InfiniteQueryObserverResult<TData, TError>['fetchNextPage']
-  fetchPreviousPage: InfiniteQueryObserverResult<
-    TData,
-    TError
-  >['fetchPreviousPage']
-  refetch: InfiniteQueryObserverResult<TData, TError>['refetch']
-  remove: InfiniteQueryObserverResult<TData, TError>['remove']
-}
 
 export function useInfiniteQuery<
   TQueryFnData = unknown,
@@ -104,7 +91,7 @@ export function useInfiniteQuery<
     arg1,
     arg2,
     arg3,
-  ) as InfiniteQueryReturnType<TData, TError>
+  ) as UseInfiniteQueryReturnType<TData, TError>
 
   return result
 }

packages/vue-query/src/useQuery.ts

@@ -1,37 +1,25 @@
 import { QueryObserver } from '@tanstack/query-core'
 import { useBaseQuery } from './useBaseQuery'
-import type { ToRefs } from 'vue-demi'
 import type {
   DefinedQueryObserverResult,
   QueryFunction,
   QueryKey,
-  QueryObserverResult,
 } from '@tanstack/query-core'
 import type { UseQueryReturnType as UQRT } from './useBaseQuery'
 import type {
   DeepUnwrapRef,
-  DistributiveOmit,
   MaybeRef,
   VueQueryObserverOptions,
   WithQueryClientKey,
 } from './types'
 
-export type UseQueryReturnType<TData, TError> = DistributiveOmit<
-  UQRT<TData, TError>,
-  'refetch' | 'remove'
-> & {
-  refetch: QueryObserverResult<TData, TError>['refetch']
-  remove: QueryObserverResult<TData, TError>['remove']
-}
+export type UseQueryReturnType<TData, TError> = UQRT<TData, TError>
 
-export type UseQueryDefinedReturnType<TData, TError> = DistributiveOmit<
-  ToRefs<Readonly<DefinedQueryObserverResult<TData, TError>>>,
-  'refetch' | 'remove'
-> & {
-  suspense: () => Promise<QueryObserverResult<TData, TError>>
-  refetch: QueryObserverResult<TData, TError>['refetch']
-  remove: QueryObserverResult<TData, TError>['remove']
-}
+export type UseQueryDefinedReturnType<TData, TError> = UQRT<
+  TData,
+  TError,
+  DefinedQueryObserverResult<TData, TError>
+>
 
 export type UseQueryOptions<
   TQueryFnData = unknown,

scripts/config.ts

@@ -77,8 +77,6 @@ export const packages: Package[] = [
   },
 ]
 
-export const latestBranch = 'main'
-
 export const branchConfigs: Record<string, BranchConfig> = {
   main: {
     prerelease: false,
@@ -95,6 +93,10 @@ export const branchConfigs: Record<string, BranchConfig> = {
   rc: {
     prerelease: true,
   },
+  v4: {
+    prerelease: false,
+    previousVersion: true,
+  },
 }
 
 export const rootDir = path.resolve(__dirname, '..')

scripts/publish.ts

@@ -10,8 +10,8 @@ import log from 'git-log-parser'
 import streamToArray from 'stream-to-array'
 import axios from 'axios'
 import { DateTime } from 'luxon'
-import { branchConfigs, latestBranch, packages, rootDir } from './config'
-import type { BranchConfig, Commit, Package } from './types'
+import { branchConfigs, packages, rootDir } from './config'
+import type { BranchConfig, Commit } from './types'
 
 import type { PackageJson } from 'type-fest'
 
@@ -22,8 +22,10 @@ async function run() {
     process.env.BRANCH ??
     // (process.env.PR_NUMBER ? `pr-${process.env.PR_NUMBER}` : currentGitBranch())
     currentGitBranch()
+  const branchConfig: BranchConfig | undefined = branchConfigs[branchName]
 
   const isMainBranch = branchName === 'main'
+  const isPreviousRelease = branchConfig?.previousVersion
   const npmTag = isMainBranch ? 'latest' : branchName
 
   // Get tags
@@ -33,6 +35,10 @@ async function run() {
   tags = tags
     .filter((tag) => semver.valid(tag))
     .filter((tag) => {
+      // If this is an older release, filter to only include that version
+      if (isPreviousRelease) {
+        return tag.startsWith(branchName)
+      }
       if (semver.prerelease(tag) === null) {
         return isMainBranch
       } else {
@@ -286,8 +292,6 @@ async function run() {
     recommendedReleaseLevel = 0
   }
 
-  const branchConfig: BranchConfig | undefined = branchConfigs[branchName]
-
   if (!branchConfig) {
     console.log(`No publish config found for branch: ${branchName}`)
     console.log('Exiting...')
@@ -367,15 +371,14 @@ async function run() {
   }
 
   console.info()
-  console.info(`Publishing all packages to npm with tag "${npmTag}"`)
+  console.info(`Publishing all packages to npm`)
 
   // Publish each package
   changedPackages.forEach((pkg) => {
     const packageDir = path.join(rootDir, 'packages', pkg.packageDir)
-    const cmd = `cd ${packageDir} && pnpm publish --tag ${npmTag} --access=public --no-git-checks`
-    console.info(
-      `  Publishing ${pkg.name}@${version} to npm with tag "${npmTag}"...`,
-    )
+    const tagParam = branchConfig.previousVersion ? `` : `--tag ${npmTag}`
+    const cmd = `cd ${packageDir} && pnpm publish ${tagParam} --access=public --no-git-checks`
+    console.info(`  Publishing ${pkg.name}@${version} to npm "${tagParam}"...`)
     execSync(cmd, {
       stdio: [process.stdin, process.stdout, process.stderr],
     })
@@ -405,7 +408,7 @@ async function run() {
   // Stringify the markdown to excape any quotes
   execSync(
     `gh release create v${version} ${
-      !isMainBranch ? '--prerelease' : ''
+      branchConfig.prerelease ? '--prerelease' : ''
     } --notes '${changelogMd.replace(/'/g, '"')}'`,
   )
   console.info(`  Github release created.`)

scripts/types.ts

@@ -43,4 +43,5 @@ export type Package = {
 
 export type BranchConfig = {
   prerelease: boolean
+  previousVersion?: boolean
 }