Merge remote-tracking branch 'tannerlinsley/main' into beta

Author: TkDodo

.github/workflows/ci.yml

@@ -2,7 +2,13 @@ name: ci
 concurrency:
   group: publish-${{ github.github.base_ref }}
   cancel-in-progress: true
-on: [push]
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: override release tag
+        required: false
+  push:
 jobs:
   test-and-publish:
     if: github.repository == 'TanStack/query' && github.event_name != 'pull_request'
@@ -28,3 +34,4 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          TAG: ${{ inputs.tag }}

docs/guides/mutations.md

@@ -320,7 +320,7 @@ export default function App() {
 }
 ```
 
-We also have an extensive [offline example](../examples/offline) that covers both queries and mutations.
+We also have an extensive [offline example](../examples/react/offline) that covers both queries and mutations.
 
 ## Further reading
 

docs/guides/ssr.md

@@ -83,7 +83,7 @@ import { dehydrate, QueryClient, useQuery } from '@tanstack/react-query';
 export async function getStaticProps() {
   const queryClient = new QueryClient()
 
-  await queryClient.prefetchQuery('posts', getPosts)
+  await queryClient.prefetchQuery(['posts'], getPosts)
 
   return {
     props: {

docs/reference/QueryCache.md

@@ -19,7 +19,7 @@ const queryCache = new QueryCache({
   }
 })
 
-const query = queryCache.find('posts')
+const query = queryCache.find(['posts'])
 ```
 
 Its available methods are:

docs/reference/useQuery.md

@@ -149,10 +149,10 @@ const result = useQuery({
   - This function will fire if the query encounters an error and will be passed the error.
 - `onSettled: (data?: TData, error?: TError) => void`
   - Optional
-  - This function will fire any time the query is either successfully fetched or errors and be passed either the data or error
+  - This function will fire any time the query is either successfully fetched or errors and be passed either the data or error.
 - `select: (data: TData) => unknown`
   - Optional
-  - This option can be used to transform or select a part of the data returned by the query function.
+  - This option can be used to transform or select a part of the data returned by the query function. It affects the returned `data` value, but does not affect what gets stored in the query cache.
 - `suspense: boolean`
   - Optional
   - Set this to `true` to enable suspense mode.

examples/react/simple/README.md

@@ -3,4 +3,4 @@
 To run this example:
 
 - `npm install`
-- `npm run start`
+- `npm run dev`

examples/react/simple/package.json

@@ -2,6 +2,7 @@
   "name": "@tanstack/query-example-react-simple",
   "private": true,
   "version": "0.0.1",
+  "main": "src/index.jsx",
   "scripts": {
     "dev": "vite",
     "build": "vite build",