Merge remote-tracking branch 'origin/next' into v1.9-integration

Author: phryneas

.github/workflows/tests.yml

@@ -123,10 +123,6 @@ jobs:
 
       - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json ./jest.config.js ./src/tests/*.* ./src/query/tests/*.*
 
-      - name: "@ts-ignore stuff that didn't exist pre-4.1 in the tests"
-        if: ${{ matrix.ts < 4.1 }}
-        run: sed -i -e 's/@pre41-ts-ignore/@ts-ignore/' -e  '/pre41-remove-start/,/pre41-remove-end/d' ./src/tests/*.* ./src/query/tests/*.ts*
-
       - name: Test types
         run: |
           yarn tsc --version

packages/toolkit/scripts/build.ts

@@ -326,13 +326,6 @@ async function main({ skipExtraction = false, local = false }: BuildArgs) {
     await buildUMD(outputPath, entryPoint.prefix, entryPoint.globalName)
   }
 
-  // We need one additional package.json file in dist to support
-  // versioned types for TS <4.1
-  fs.copyFileSync(
-    'src/query/react/versionedTypes/package.dist.json',
-    'dist/query/react/versionedTypes/package.json'
-  )
-
   if (!skipExtraction) {
     for (let entryPoint of entryPoints) {
       try {

packages/toolkit/src/query/react/module.ts

@@ -12,7 +12,7 @@ import { capitalize } from '../utils'
 import { safeAssign } from '../tsHelpers'
 import type { BaseQueryFn } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
 
-import type { HooksWithUniqueNames } from './versionedTypes'
+import type { HooksWithUniqueNames } from './namedHooks'
 
 import {
   useDispatch as rrUseDispatch,

packages/toolkit/src/query/react/versionedTypes/ts41Types.ts renamed to packages/toolkit/src/query/react/namedHooks.ts

@@ -1,13 +1,11 @@
-import type { UseMutation, UseLazyQuery, UseQuery } from '../buildHooks'
+import type { UseMutation, UseLazyQuery, UseQuery } from './buildHooks'
 import type {
   DefinitionType,
   EndpointDefinitions,
   MutationDefinition,
   QueryDefinition,
 } from '@reduxjs/toolkit/dist/query/endpointDefinitions'
 
-// For TS 4.1 and later, we can use string literal types to define
-// the exact names of each endpoint's exported hooks
 export type HooksWithUniqueNames<Definitions extends EndpointDefinitions> =
   keyof Definitions extends infer Keys
     ? Keys extends string

packages/toolkit/src/query/react/versionedTypes/index.ts

@@ -1828,14 +1828,10 @@ describe('hooks with createApi defaults set', () => {
 
     const storeRef = setupApiStore(api)
 
-    // @pre41-ts-ignore
     expectExactType(api.useGetPostsQuery)(api.endpoints.getPosts.useQuery)
-    // @pre41-ts-ignore
     expectExactType(api.useUpdatePostMutation)(
-      // @pre41-ts-ignore
       api.endpoints.updatePost.useMutation
     )
-    // @pre41-ts-ignore
     expectExactType(api.useAddPostMutation)(api.endpoints.addPost.useMutation)
 
     test('useQueryState serves a deeply memoized value and does not rerender unnecessarily', async () => {

packages/toolkit/src/query/react/versionedTypes/package.dist.json

@@ -141,7 +141,6 @@ describe.skip('TS only tests', () => {
       expectType<never>(result)
     }
   })
-  // pre41-remove-start
   test('useQuery TS4.1 union', () => {
     const result = api.useTestQuery()
 
@@ -207,7 +206,6 @@ describe.skip('TS only tests', () => {
       expectType<never>(result)
     }
   })
-  // pre41-remove-end
 
   test('useLazyQuery union', () => {
     const [_trigger, result] = api.endpoints.test.useLazyQuery()
@@ -275,7 +273,6 @@ describe.skip('TS only tests', () => {
     }
   })
 
-  // pre41-remove-start
   test('useLazyQuery TS4.1 union', () => {
     const [_trigger, result] = api.useLazyTestQuery()
 
@@ -341,7 +338,6 @@ describe.skip('TS only tests', () => {
       expectType<never>(result)
     }
   })
-  // pre41-remove-end
 
   test('queryHookResult (without selector) union', () => {
     const useQueryStateResult = api.endpoints.test.useQueryState()
@@ -501,7 +497,6 @@ describe.skip('TS only tests', () => {
     })(result)
   })
 
-  // pre41-remove-start
   test('useMutation TS4.1 union', () => {
     const [_trigger, result] = api.useMutationMutation()
 
@@ -552,5 +547,4 @@ describe.skip('TS only tests', () => {
       expectType<never>(result)
     }
   })
-  // pre41-remove-end
 })