Merge pull request #2373 from reduxjs/bugfix/ts-47-compat

reduxjs · May 30, 2022 · 64a30d8 · 64a30d8
2 parents 937471f + ceca051
commit 64a30d8
Show file tree

Hide file tree

Showing 23 changed files with 57 additions and 181 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -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

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.28.2",
+    "msw": "^0.41.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "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.28.2",
+    "msw": "^0.41.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-icons": "3.11.0",

diff --git a/examples/query/react/basic/package.json b/examples/query/react/basic/package.json
@@ -18,7 +18,7 @@
     "@types/react": "17.0.0",
     "@types/react-dom": "17.0.0",
     "@types/react-redux": "7.1.9",
-    "msw": "^0.30.0",
+    "msw": "^0.41.1",
     "typescript": "~4.2.4"
   },
   "eslintConfig": {

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.39.2",
+    "msw": "^0.41.1",
     "react": "17.0.0",
     "react-dom": "17.0.0",
     "react-redux": "7.2.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.28.2",
+    "msw": "^0.41.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "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.28.2",
+    "msw": "^0.41.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "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.28.2",
+    "msw": "^0.41.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "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.28.2",
+    "msw": "^0.41.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "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.28.2",
+    "msw": "^0.41.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "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.28.2",
+    "msw": "^0.41.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-icons": "3.11.0",

diff --git a/package.json b/package.json
@@ -41,7 +41,8 @@
     "console-testing-library": "patch:console-testing-library@npm:0.3.1#.yarn/patches/console-testing-library__npm_0.3.1.patch",
     "react-redux": "npm:7.2.4",
     "react": "npm:17.0.2",
-    "react-dom": "npm:17.0.2"
+    "react-dom": "npm:17.0.2",
+    "@types/inquirer": "npm:8.2.1"
   },
   "scripts": {
     "build": "yarn build:packages",

diff --git a/packages/rtk-query-codegen-openapi/package.json b/packages/rtk-query-codegen-openapi/package.json
@@ -47,7 +47,7 @@
     "esbuild-runner": "^2.2.1",
     "husky": "^4.3.6",
     "jest": "^26.6.3",
-    "msw": "^0.25.0",
+    "msw": "^0.41.1",
     "openapi-types": "^9.1.0",
     "pretty-quick": "^3.1.0",
     "ts-jest": "^26.4.4",

diff --git a/packages/rtk-query-codegen-openapi/test/mocks/server.ts b/packages/rtk-query-codegen-openapi/test/mocks/server.ts
@@ -7,12 +7,8 @@ import petstoreYAML from '../fixtures/petstore.yaml.mock';
 // This configures a request mocking server with the given request handlers.
 
 export const server = setupServer(
-  rest.get('https://example.com/echo', (req, res, ctx) =>
-    res(ctx.json({ ...req, headers: req.headers.getAllHeaders() }))
-  ),
-  rest.post('https://example.com/echo', (req, res, ctx) =>
-    res(ctx.json({ ...req, headers: req.headers.getAllHeaders() }))
-  ),
+  rest.get('https://example.com/echo', (req, res, ctx) => res(ctx.json({ ...req, headers: req.headers.all() }))),
+  rest.post('https://example.com/echo', (req, res, ctx) => res(ctx.json({ ...req, headers: req.headers.all() }))),
 
   rest.get('https://petstore3.swagger.io/api/v3/openapi.json', (req, res, ctx) => res(ctx.json(petstoreJSON))),
   rest.get('https://petstore3.swagger.io/api/v3/openapi.yaml', (req, res, ctx) =>

diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -63,7 +63,7 @@
     "json-stringify-safe": "^5.0.1",
     "magic-string": "^0.25.7",
     "merge-source-map": "^1.1.0",
-    "msw": "^0.28.2",
+    "msw": "^0.41.1",
     "node-fetch": "^2.6.1",
     "prettier": "^2.2.1",
     "query-string": "^7.0.1",

diff --git a/packages/toolkit/src/configureStore.ts b/packages/toolkit/src/configureStore.ts
@@ -144,7 +144,7 @@ export function configureStore<
   if (typeof reducer === 'function') {
     rootReducer = reducer
   } else if (isPlainObject(reducer)) {
-    rootReducer = combineReducers(reducer)
+    rootReducer = combineReducers(reducer) as unknown as Reducer<S, A>
   } else {
     throw new Error(
       '"reducer" is a required argument, and must be a function or an object of functions that can be passed to combineReducers'

diff --git a/packages/toolkit/src/createAsyncThunk.ts b/packages/toolkit/src/createAsyncThunk.ts
@@ -530,14 +530,16 @@ export function createAsyncThunk<
     typeof AbortController !== 'undefined'
       ? AbortController
       : class implements AbortController {
-          signal: AbortSignal = {
+          signal = {
             aborted: false,
             addEventListener() {},
             dispatchEvent() {
               return false
             },
             onabort() {},
             removeEventListener() {},
+            reason: undefined,
+            throwIfAborted() {},
           }
           abort() {
             if (process.env.NODE_ENV !== 'production') {

diff --git a/packages/toolkit/src/query/react/buildHooks.ts b/packages/toolkit/src/query/react/buildHooks.ts
@@ -188,7 +188,7 @@ export type UseLazyQueryLastPromiseInfo<
  * When the trigger function returned from a LazyQuery, it always initiates a new request to the server even if there is cached data. Set `preferCacheValue`(the second argument to the function) as `true` if you want it to immediately return a cached value if one exists.
  */
 export type UseLazyQuery<D extends QueryDefinition<any, any, any, any>> = <
-  R = UseQueryStateDefaultResult<D>
+  R extends Record<string, any> = UseQueryStateDefaultResult<D>
 >(
   options?: SubscriptionOptions & Omit<UseQueryStateOptions<D, R>, 'skip'>
 ) => [
@@ -257,7 +257,7 @@ export type QueryStateSelector<
  * - Re-renders as the request status changes and data becomes available
  */
 export type UseQueryState<D extends QueryDefinition<any, any, any, any>> = <
-  R = UseQueryStateDefaultResult<D>
+  R extends Record<string, any> = UseQueryStateDefaultResult<D>
 >(
   arg: QueryArgFrom<D> | SkipToken,
   options?: UseQueryStateOptions<D, R>

diff --git a/packages/toolkit/src/query/retry.ts b/packages/toolkit/src/query/retry.ts
@@ -61,7 +61,7 @@ const retryWithBackoff: BaseQueryEnhancer<
         throw new HandledError(result)
       }
       return result
-    } catch (e) {
+    } catch (e: any) {
       retry++
       if (e.throwImmediately || retry > options.maxRetries) {
         if (e instanceof HandledError) {

diff --git a/packages/toolkit/src/query/tests/createApi.test.ts b/packages/toolkit/src/query/tests/createApi.test.ts
@@ -731,7 +731,7 @@ test('providesTags and invalidatesTags can use baseQueryMeta', async () => {
   type SuccessResponse = { value: 'success' }
 
   const api = createApi({
-    baseQuery: fetchBaseQuery({ baseUrl: 'http://example.com' }),
+    baseQuery: fetchBaseQuery({ baseUrl: 'https://example.com' }),
     tagTypes: ['success'],
     endpoints: (build) => ({
       query: build.query<SuccessResponse, void>({
@@ -754,7 +754,6 @@ test('providesTags and invalidatesTags can use baseQueryMeta', async () => {
   const storeRef = setupApiStore(api)
 
   await storeRef.store.dispatch(api.endpoints.query.initiate())
-
   expect('request' in _meta! && 'response' in _meta!).toBe(true)
 
   _meta = undefined

diff --git a/packages/toolkit/src/query/tests/devWarnings.test.tsx b/packages/toolkit/src/query/tests/devWarnings.test.tsx
@@ -273,7 +273,7 @@ If you have multiple apis, you *have* to specify the reducerPath option when usi
 describe('`console.error` on unhandled errors during `initiate`', () => {
   test('error thrown in `baseQuery`', async () => {
     const api = createApi({
-      baseQuery() {
+      baseQuery(): { data: any } {
         throw new Error('this was kinda expected')
       },
       endpoints: (build) => ({

diff --git a/packages/toolkit/src/query/tests/unionTypes.test.ts b/packages/toolkit/src/query/tests/unionTypes.test.ts
@@ -349,7 +349,7 @@ describe.skip('TS only tests', () => {
     const useQueryStateWithSelectFromResult = api.endpoints.test.useQueryState(
       undefined,
       {
-        selectFromResult: () => true,
+        selectFromResult: () => ({ x: true }),
       }
     )