Merge branch 'reduxjs:master' into docs-batch-correction

Author: EskiMojo14

.github/workflows/size.yml renamed to .github/workflows/size.yml.bak

@@ -96,7 +96,7 @@ jobs:
       fail-fast: false
       matrix:
         node: ['14.x']
-        ts: ['4.1', '4.2', '4.3', '4.4', '4.5', '4.6.1-rc', 'next']
+        ts: ['4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2

.github/workflows/tests.yml

@@ -149,7 +149,7 @@ This has different uses:
 
 ### As a TypeScript Type Guard
 
-This `match` method is a [TypeScript type guard](https://www.typescriptlang.org/docs/handbook/advanced-types.html#user-defined-type-guards) and can be used to discriminate the `payload` type of an action.
+This `match` method is a [TypeScript type guard](https://www.typescriptlang.org/docs/handbook/2/narrowing.html#using-type-predicates) and can be used to discriminate the `payload` type of an action.
 
 This behavior can be particularly useful when used in custom middlewares, where manual casts might be neccessary otherwise.
 

docs/api/createAction.mdx

@@ -208,7 +208,7 @@ The primary content of an entity adapter is a set of generated reducer functions
 - `addOne`: accepts a single entity, and adds it if it's not already present.
 - `addMany`: accepts an array of entities or an object in the shape of `Record<EntityId, T>`, and adds them if not already present.
 - `setOne`: accepts a single entity and adds or replaces it
-- `setMany`: accepts an array of entities or an an object in the shape of `Record<EntityId, T>`, and adds or replaces them.
+- `setMany`: accepts an array of entities or an object in the shape of `Record<EntityId, T>`, and adds or replaces them.
 - `setAll`: accepts an array of entities or an object in the shape of `Record<EntityId, T>`, and replaces all existing entities with the values in the array.
 - `removeOne`: accepts a single entity ID value, and removes the entity with that ID if it exists.
 - `removeMany`: accepts an array of entity ID values, and removes each entity with those IDs if they exist.

docs/api/createEntityAdapter.mdx

@@ -20,7 +20,7 @@ The **Redux Toolkit** package is intended to be the standard way to write [Redux
 - "I have to add a lot of packages to get Redux to do anything useful"
 - "Redux requires too much boilerplate code"
 
-We can't solve every use case, but in the spirit of [`create-react-app`](https://github.com/facebook/create-react-app) and [`apollo-boost`](https://www.apollographql.com/blog/announcement/frontend/zero-config-graphql-state-management/), we can try to provide some tools that abstract over the setup process and handle the most common use cases, as well as include some useful utilities that will let the user simplify their application code.
+We can't solve every use case, but in the spirit of [`create-react-app`](https://github.com/facebook/create-react-app), we can try to provide some tools that abstract over the setup process and handle the most common use cases, as well as include some useful utilities that will let the user simplify their application code.
 
 Redux Toolkit also includes a powerful data fetching and caching capability that we've dubbed ["RTK Query"](#rtk-query). It's included in the package as a separate set of entry points. It's optional, but can eliminate the need to hand-write data fetching logic yourself.
 

docs/introduction/getting-started.md

@@ -26,7 +26,7 @@ For maintainability purposes, you may wish to split up endpoint definitions acro
 ```ts title="API Slice Contents" no-transpile
 const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: '/' }),
-  endpoints: (builder) => ({
+  endpoints: (build) => ({
     // ...
   }),
 })

docs/rtk-query/api/created-api/overview.mdx

@@ -22,6 +22,12 @@ description: 'RTK Query > Overview: a summary of the RTK Query data caching API
 
 RTK Query is **an optional addon included in the Redux Toolkit package**, and its functionality is built on top of the other APIs in Redux Toolkit.
 
+:::info
+
+To learn how to use RTK Query, see the full ["Redux Essentials" tutorial](https://redux.js.org/tutorials/essentials/part-7-rtk-query-basics) on the Redux core docs site.
+
+:::
+
 ## Motivation
 
 Web applications normally need to fetch data from a server in order to display it. They also usually need to make updates to that data, send those updates to the server, and keep the cached data on the client in sync with the data on the server. This is made more complicated by the need to implement other behaviors used in today's applications:

docs/rtk-query/overview.md

@@ -578,7 +578,7 @@ function PostDetail() {
   if (error) {
     if ('status' in error) {
       // you can access all properties of `FetchBaseQueryError` here
-      const errMsg = 'error' in err ? err.error : JSON.stringify(err.data)
+      const errMsg = 'error' in error ? error.error : JSON.stringify(error.data)
 
       return (
         <div>

docs/rtk-query/usage-with-typescript.mdx

@@ -251,18 +251,22 @@ const axiosBaseQuery =
       url: string
       method: AxiosRequestConfig['method']
       data?: AxiosRequestConfig['data']
+      params?: AxiosRequestConfig['params']
     },
     unknown,
     unknown
   > =>
-  async ({ url, method, data }) => {
+  async ({ url, method, data, params }) => {
     try {
-      const result = await axios({ url: baseUrl + url, method, data })
+      const result = await axios({ url: baseUrl + url, method, data, params })
       return { data: result.data }
     } catch (axiosError) {
       let err = axiosError as AxiosError
       return {
-        error: { status: err.response?.status, data: err.response?.data },
+        error: {
+          status: err.response?.status,
+          data: err.response?.data || err.message
+        },
       }
     }
   }

docs/rtk-query/usage/customizing-queries.mdx

@@ -16,30 +16,24 @@ We have a variety of examples that demonstrate various aspects of using RTK Quer
 
 These examples are not meant to be what you base your application on, but exist to show _very specific_ behaviors that you may not actually want or need in your application. For most users, the basic examples in the [Queries](./queries) and [Mutations](./mutations) sections will cover the majority of your needs.
 
-:::info
-
-The examples were created as part of the standalone `@rtk-incubator/rtk-query` development cycle. We're currently working to update them as part of the process of finalizing RTK Query's integration into Redux Toolkit, so some of the imports are mismatched and not all the examples are currently in the RTK repo. However, you should be able to inspect these examples and use the logic they show as guidelines.
-
-:::
-
 :::tip
 
 Please note that when playing with the examples in CodeSandbox that you can experience quirky behavior, especially if you fork them and start editing files. Hot reloading, CSB service workers and [`msw`](https://mswjs.io/) sometimes have trouble getting on the right page -- when that happens, just refresh in the CSB browser pane.
 
 :::
 
-## React Hooks
+## Kitchen Sink
 
 <iframe
-  src="https://codesandbox.io/embed/rtk-query-demo-lbp7n?fontsize=12&hidenavigation=1&theme=dark&runonclick=1"
+  src="https://codesandbox.io/embed/github/reduxjs/redux-toolkit/tree/master/examples/query/react/kitchen-sink?fontsize=12&hidenavigation=1&theme=dark&runonclick=1"
   style={{
     width: '100%',
     height: '800px',
     border: 0,
     borderRadius: '4px',
     overflow: 'hidden',
   }}
-  title="RTK Query React Hooks Example"
+  title="RTK Query Kitchen Sink Example"
   allow="geolocation; microphone; camera; midi; vr; accelerometer; gyroscope; payment; ambient-light-sensor; encrypted-media; usb"
   sandbox="allow-modals allow-forms allow-popups allow-scripts allow-same-origin"
 ></iframe>