fix: Fix types for passing a custom type to redirect (#714)

Fixes #709

Author: amannn

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
           version: 8.6.0
       - uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 18.17.0
           cache: 'pnpm'
       - run: pnpm install
 

packages/next-intl/src/navigation/react-client/clientRedirect.tsx

@@ -1,10 +1,10 @@
 import useLocale from '../../react-client/useLocale';
-import {LocalePrefix, ParametersExceptFirstTwo} from '../../shared/types';
+import {LocalePrefix, ParametersExceptFirst} from '../../shared/types';
 import baseRedirect from '../shared/baseRedirect';
 
 export default function clientRedirect(
   params: {localePrefix?: LocalePrefix; pathname: string},
-  ...args: ParametersExceptFirstTwo<typeof baseRedirect>
+  ...args: ParametersExceptFirst<typeof baseRedirect>
 ) {
   let locale;
   try {

packages/next-intl/src/navigation/react-server/serverRedirect.tsx

@@ -1,10 +1,10 @@
 import {getRequestLocale} from '../../server/react-server/RequestLocale';
-import {LocalePrefix, ParametersExceptFirstTwo} from '../../shared/types';
+import {LocalePrefix, ParametersExceptFirst} from '../../shared/types';
 import baseRedirect from '../shared/baseRedirect';
 
 export default function serverRedirect(
   params: {pathname: string; localePrefix?: LocalePrefix},
-  ...args: ParametersExceptFirstTwo<typeof baseRedirect>
+  ...args: ParametersExceptFirst<typeof baseRedirect>
 ) {
   const locale = getRequestLocale();
   return baseRedirect({...params, locale}, ...args);

packages/next-intl/test/navigation/createLocalizedPathnamesNavigation.test.tsx

@@ -2,7 +2,8 @@ import {render, screen} from '@testing-library/react';
 import {
   usePathname as useNextPathname,
   useParams,
-  redirect as nextRedirect
+  redirect as nextRedirect,
+  RedirectType
 } from 'next/navigation';
 import React from 'react';
 import {renderToString} from 'react-dom/server';
@@ -13,7 +14,15 @@ import BaseLink from '../../src/navigation/shared/BaseLink';
 import {Pathnames} from '../../src/navigation.react-client';
 import {getRequestLocale} from '../../src/server/react-server/RequestLocale';
 
-vi.mock('next/navigation');
+vi.mock('next/navigation', async () => {
+  const actual = await vi.importActual('next/navigation');
+  return {
+    ...actual,
+    usePathname: vi.fn(),
+    useParams: vi.fn(),
+    redirect: vi.fn()
+  };
+});
 vi.mock('next-intl/config', () => ({
   default: async () =>
     ((await vi.importActual('../../src/server')) as any).getRequestConfig({
@@ -305,6 +314,15 @@ describe.each([
           render(<Component href="/unknown" />);
           expect(nextRedirect).toHaveBeenLastCalledWith('/en/unknown');
         });
+
+        it('can supply a type', () => {
+          function Test() {
+            redirect('/', RedirectType.push);
+            return null;
+          }
+          render(<Test />);
+          expect(nextRedirect).toHaveBeenLastCalledWith('/en', 'push');
+        });
       });
 
       describe('getPathname', () => {

packages/next-intl/test/navigation/createSharedPathnamesNavigation.test.tsx

@@ -2,7 +2,8 @@ import {render, screen} from '@testing-library/react';
 import {
   usePathname as useNextPathname,
   useParams,
-  redirect as nextRedirect
+  redirect as nextRedirect,
+  RedirectType
 } from 'next/navigation';
 import React from 'react';
 import {renderToString} from 'react-dom/server';
@@ -12,11 +13,15 @@ import createSharedPathnamesNavigationServer from '../../src/navigation/react-se
 import BaseLink from '../../src/navigation/shared/BaseLink';
 import {getRequestLocale} from '../../src/server/react-server/RequestLocale';
 
-vi.mock('next/navigation', () => ({
-  useParams: vi.fn(() => ({locale: 'en'})),
-  usePathname: vi.fn(() => '/'),
-  redirect: vi.fn()
-}));
+vi.mock('next/navigation', async () => {
+  const actual = await vi.importActual('next/navigation');
+  return {
+    ...actual,
+    useParams: vi.fn(() => ({locale: 'en'})),
+    usePathname: vi.fn(() => '/'),
+    redirect: vi.fn()
+  };
+});
 vi.mock('next-intl/config', () => ({
   default: async () =>
     ((await vi.importActual('../../src/server')) as any).getRequestConfig({
@@ -167,6 +172,15 @@ describe.each([
             '/en?foo=bar&bar=1&bar=2'
           );
         });
+
+        it('can supply a type', () => {
+          function Test() {
+            redirect('/', RedirectType.push);
+            return null;
+          }
+          render(<Test />);
+          expect(nextRedirect).toHaveBeenLastCalledWith('/en', 'push');
+        });
       });
     });