Merge branch 'master' into v1.9-integration

markerikson · markerikson · commit 8c0f2391fbd6 · 2022-08-06T14:22:38.000-04:00
diff --git a/docs/rtk-query/api/createApi.mdx b/docs/rtk-query/api/createApi.mdx
@@ -10,7 +10,7 @@ description: 'RTK Query > API: createApi reference'
 
 # `createApi`
 
-`createApi` is the core of RTK Query's functionality. It allows you to define a set of endpoints describe how to retrieve data from a series of endpoints, including configuration of how to fetch and transform that data. It generates [an "API slice" structure](./created-api/overview.mdx) that contains Redux logic (and optionally React hooks) that encapsulate the data fetching and caching process for you.
+`createApi` is the core of RTK Query's functionality. It allows you to define a set of "endpoints" that describe how to retrieve data from backend APIs and other async sources, including the configuration of how to fetch and transform that data. It generates [an "API slice" structure](./created-api/overview.mdx) that contains Redux logic (and optionally React hooks) that encapsulate the data fetching and caching process for you.
 
 :::tip
 
diff --git a/examples/query/react/authentication-with-extrareducers/package.json b/examples/query/react/authentication-with-extrareducers/package.json
@@ -11,7 +11,7 @@
     "@emotion/styled": "^11.3.0",
     "@reduxjs/toolkit": "^1.6.0-rc.1",
     "framer-motion": "^2.9.5",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-icons": "3.11.0",
diff --git a/examples/query/react/authentication/package.json b/examples/query/react/authentication/package.json
@@ -11,7 +11,7 @@
     "@emotion/styled": "^11.3.0",
     "@reduxjs/toolkit": "^1.6.0-rc.1",
     "framer-motion": "^2.9.5",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-icons": "3.11.0",
diff --git a/examples/query/react/kitchen-sink/package.json b/examples/query/react/kitchen-sink/package.json
@@ -7,7 +7,7 @@
   "main": "src/index.tsx",
   "dependencies": {
     "@reduxjs/toolkit": "1.8.1",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-redux": "^8.0.2",
diff --git a/examples/query/react/mutations/package.json b/examples/query/react/mutations/package.json
@@ -12,7 +12,7 @@
     "@mswjs/data": "^0.3.0",
     "@reduxjs/toolkit": "^1.6.0-rc.1",
     "framer-motion": "^2.9.5",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-icons": "3.11.0",
diff --git a/examples/query/react/optimistic-update/package.json b/examples/query/react/optimistic-update/package.json
@@ -12,7 +12,7 @@
     "@mswjs/data": "^0.3.0",
     "@reduxjs/toolkit": "^1.6.0-rc.1",
     "framer-motion": "^2.9.5",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-icons": "3.11.0",
diff --git a/examples/query/react/pagination/package.json b/examples/query/react/pagination/package.json
@@ -13,7 +13,7 @@
     "@reduxjs/toolkit": "^1.6.0-rc.1",
     "faker": "^5.5.3",
     "framer-motion": "^2.9.5",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-icons": "3.11.0",
diff --git a/examples/query/react/prefetching-automatic-waterfall/package.json b/examples/query/react/prefetching-automatic-waterfall/package.json
@@ -13,7 +13,7 @@
     "@reduxjs/toolkit": "^1.6.0-rc.1",
     "faker": "^5.5.3",
     "framer-motion": "^2.9.5",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-icons": "3.11.0",
diff --git a/examples/query/react/prefetching-automatic/package.json b/examples/query/react/prefetching-automatic/package.json
@@ -13,7 +13,7 @@
     "@reduxjs/toolkit": "^1.6.0-rc.1",
     "faker": "^5.5.3",
     "framer-motion": "^2.9.5",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-icons": "3.11.0",
diff --git a/examples/query/react/prefetching/package.json b/examples/query/react/prefetching/package.json
@@ -13,7 +13,7 @@
     "@reduxjs/toolkit": "^1.6.0-rc.1",
     "faker": "^5.5.3",
     "framer-motion": "^2.9.5",
-    "msw": "^0.41.1",
+    "msw": "^0.40.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-icons": "3.11.0",
diff --git a/packages/rtk-query-graphql-request-base-query/package.json b/packages/rtk-query-graphql-request-base-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rtk-query/graphql-request-base-query",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "author": {
     "name": "Lenz Weber",
     "email": "mail@phryneas.de",
@@ -23,11 +23,11 @@
   },
   "peerDependencies": {
     "@reduxjs/toolkit": "^1.7.1",
-    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
     "@reduxjs/toolkit": "^1.6.0",
-    "graphql": "^15.5.0",
+    "graphql": "^16.5.0",
     "microbundle": "^0.13.3",
     "rimraf": "^3.0.2",
     "typescript": "^4.3.4"
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -30,7 +30,7 @@
     "@microsoft/api-extractor": "^7.13.2",
     "@size-limit/preset-small-lib": "^4.11.0",
     "@testing-library/react": "^13.3.0",
-    "@testing-library/user-event": "^14.2.0",
+    "@testing-library/user-event": "^13.1.5",
     "@types/convert-source-map": "^1.5.1",
     "@types/jest": "^27",
     "@types/json-stringify-safe": "^5.0.0",
diff --git a/packages/toolkit/setup-type-tests.d.ts b/packages/toolkit/setup-type-tests.d.ts
diff --git a/packages/toolkit/src/createReducer.ts b/packages/toolkit/src/createReducer.ts
@@ -37,7 +37,7 @@ export type ActionMatcherDescriptionCollection<S> = Array<
 >
 
 /**
- * An *case reducer* is a reducer function for a specific action type. Case
+ * A *case reducer* is a reducer function for a specific action type. Case
  * reducers can be composed to full reducers using `createReducer()`.
  *
  * Unlike a normal Redux reducer, a case reducer is never called with an
diff --git a/packages/toolkit/src/query/core/buildThunks.ts b/packages/toolkit/src/query/core/buildThunks.ts
@@ -361,7 +361,7 @@ export function buildThunks<
         process.env.NODE_ENV === 'development'
       ) {
         console.error(
-          `An unhandled error occured processing a request for the endpoint "${arg.endpointName}".
+          `An unhandled error occurred processing a request for the endpoint "${arg.endpointName}".
 In the case of an unhandled error, no tags will be "provided" or "invalidated".`,
           error
         )
diff --git a/packages/toolkit/src/query/tests/devWarnings.test.tsx b/packages/toolkit/src/query/tests/devWarnings.test.tsx
@@ -287,7 +287,7 @@ describe('`console.error` on unhandled errors during `initiate`', () => {
     await store.dispatch(api.endpoints.baseQuery.initiate())
 
     expect(getLog().log)
-      .toBe(`An unhandled error occured processing a request for the endpoint "baseQuery".
+      .toBe(`An unhandled error occurred processing a request for the endpoint "baseQuery".
 In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: this was kinda expected]`)
   })
 
@@ -311,7 +311,7 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".
     await store.dispatch(api.endpoints.queryFn.initiate())
 
     expect(getLog().log)
-      .toBe(`An unhandled error occured processing a request for the endpoint "queryFn".
+      .toBe(`An unhandled error occurred processing a request for the endpoint "queryFn".
 In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: this was kinda expected]`)
   })
 
@@ -336,7 +336,7 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".
     await store.dispatch(api.endpoints.transformRspn.initiate())
 
     expect(getLog().log)
-      .toBe(`An unhandled error occured processing a request for the endpoint "transformRspn".
+      .toBe(`An unhandled error occurred processing a request for the endpoint "transformRspn".
 In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: this was kinda expected]`)
   })
 
@@ -363,7 +363,7 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".
     await store.dispatch(api.endpoints.prep.initiate())
 
     expect(getLog().log)
-      .toBe(`An unhandled error occured processing a request for the endpoint "prep".
+      .toBe(`An unhandled error occurred processing a request for the endpoint "prep".
 In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: this was kinda expected]`)
   })
 
@@ -393,7 +393,7 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".
     await store.dispatch(api.endpoints.val.initiate())
 
     expect(getLog().log)
-      .toBe(`An unhandled error occured processing a request for the endpoint "val".
+      .toBe(`An unhandled error occurred processing a request for the endpoint "val".
 In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: this was kinda expected]`)
   })
 })
diff --git a/packages/toolkit/src/query/tests/fakeBaseQuery.test.tsx b/packages/toolkit/src/query/tests/fakeBaseQuery.test.tsx
@@ -127,7 +127,7 @@ test('fakeBaseQuery throws when invoking query', async () => {
   await expect(async () => {
     result = await store.dispatch(thunk)
   }).toHaveConsoleOutput(
-    `An unhandled error occured processing a request for the endpoint "withQuery".
+    `An unhandled error occurred processing a request for the endpoint "withQuery".
     In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: When using \`fakeBaseQuery\`, all queries & mutations must use the \`queryFn\` definition syntax.]`
   )
 
diff --git a/packages/toolkit/src/query/tests/queryFn.test.tsx b/packages/toolkit/src/query/tests/queryFn.test.tsx
@@ -179,7 +179,7 @@ describe('queryFn base implementation tests', () => {
       result = await store.dispatch(thunk)
     }).toHaveConsoleOutput(
       endpointName.includes('Throw')
-        ? `An unhandled error occured processing a request for the endpoint "${endpointName}".
+        ? `An unhandled error occurred processing a request for the endpoint "${endpointName}".
         In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: resultFrom(${endpointName})]`
         : ''
     )
@@ -227,7 +227,7 @@ describe('queryFn base implementation tests', () => {
       result = await store.dispatch(thunk)
     }).toHaveConsoleOutput(
       endpointName.includes('Throw')
-        ? `An unhandled error occured processing a request for the endpoint "${endpointName}".
+        ? `An unhandled error occurred processing a request for the endpoint "${endpointName}".
         In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: resultFrom(${endpointName})]`
         : ''
     )
@@ -262,7 +262,7 @@ describe('queryFn base implementation tests', () => {
       await expect(async () => {
         result = await store.dispatch(thunk)
       }).toHaveConsoleOutput(
-        `An unhandled error occured processing a request for the endpoint "withNeither".
+        `An unhandled error occurred processing a request for the endpoint "withNeither".
         In the case of an unhandled error, no tags will be "provided" or "invalidated". [TypeError: endpointDefinition.queryFn is not a function]`
       )
       expect(result!.error).toEqual(
@@ -280,7 +280,7 @@ describe('queryFn base implementation tests', () => {
       await expect(async () => {
         result = await store.dispatch(thunk)
       }).toHaveConsoleOutput(
-        `An unhandled error occured processing a request for the endpoint "mutationWithNeither".
+        `An unhandled error occurred processing a request for the endpoint "mutationWithNeither".
         In the case of an unhandled error, no tags will be "provided" or "invalidated". [TypeError: endpointDefinition.queryFn is not a function]`
       )
       expect((result as any).error).toEqual(
@@ -379,7 +379,7 @@ describe('usage scenario tests', () => {
         api.endpoints.getMissingFirebaseUser.initiate(1)
       )
     })
-      .toHaveConsoleOutput(`An unhandled error occured processing a request for the endpoint "getMissingFirebaseUser".
+      .toHaveConsoleOutput(`An unhandled error occurred processing a request for the endpoint "getMissingFirebaseUser".
     In the case of an unhandled error, no tags will be "provided" or "invalidated". [Error: Missing user]`)
 
     expect(result!.data).toBeUndefined()
diff --git a/packages/toolkit/tsconfig.test.json b/packages/toolkit/tsconfig.test.json
@@ -13,6 +13,5 @@
     "baseUrl": ".",
     "skipLibCheck": false,
     "noImplicitReturns": false
-  },
-  "include": ["./setup-type-tests.d.ts"]
+  }
 }
diff --git a/yarn.lock b/yarn.lock
