From ed1402be420ec507c49b17a4bbe2ded402295dcb Mon Sep 17 00:00:00 2001
From: Pedro Ferreira <10789765+apedroferreira@users.noreply.github.com>
Date: Thu, 24 Apr 2025 00:19:58 +0100
Subject: [PATCH 1/4] Remove .js extensions from Next.js AppProvider imports

---
 packages/toolpad-core/src/nextjs/NextAppProviderApp.tsx   | 4 ++--
 packages/toolpad-core/src/nextjs/NextAppProviderPages.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/toolpad-core/src/nextjs/NextAppProviderApp.tsx b/packages/toolpad-core/src/nextjs/NextAppProviderApp.tsx
index d3b78c3ac3b..0f64d3a976d 100644
--- a/packages/toolpad-core/src/nextjs/NextAppProviderApp.tsx
+++ b/packages/toolpad-core/src/nextjs/NextAppProviderApp.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import NextLink from 'next/link.js';
-import { usePathname, useSearchParams, useRouter } from 'next/navigation.js';
+import NextLink from 'next/link';
+import { usePathname, useSearchParams, useRouter } from 'next/navigation';
 import { LinkProps } from '../shared/Link';
 import { AppProvider } from '../AppProvider';
 import type { AppProviderProps, Navigate, Router } from '../AppProvider';
diff --git a/packages/toolpad-core/src/nextjs/NextAppProviderPages.tsx b/packages/toolpad-core/src/nextjs/NextAppProviderPages.tsx
index 7ec2f5a0af3..bc5c4c4e714 100644
--- a/packages/toolpad-core/src/nextjs/NextAppProviderPages.tsx
+++ b/packages/toolpad-core/src/nextjs/NextAppProviderPages.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import NextLink from 'next/link.js';
+import NextLink from 'next/link';
 import { asArray } from '@toolpad/utils/collections';
-import { useRouter } from 'next/router.js';
+import { useRouter } from 'next/router';
 import { LinkProps } from '../shared/Link';
 import { AppProvider } from '../AppProvider';
 import type { AppProviderProps, Navigate, Router } from '../AppProvider';

From c07e69453ab829a561c2e0b70c84ae791d502ead Mon Sep 17 00:00:00 2001
From: Pedro Ferreira <10789765+apedroferreira@users.noreply.github.com>
Date: Thu, 24 Apr 2025 00:27:26 +0100
Subject: [PATCH 2/4] Adjust mocks

---
 packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx b/packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx
index 05b54e87833..dfc94ef9f47 100644
--- a/packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx
+++ b/packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx
@@ -20,11 +20,11 @@ vi.mock('next/navigation.js', () => {
   };
 });
 
-vi.mock('next/router.js', () => ({ useRouter: () => null }));
+vi.mock('next/router', () => ({ useRouter: () => null }));
 
-vi.mock('next/compat/router.js', () => ({ useRouter: () => null }));
+vi.mock('next/compat/router', () => ({ useRouter: () => null }));
 
-vi.mock('next/link.js', () => ({ default: () => null }));
+vi.mock('next/link', () => ({ default: () => null }));
 
 interface RouterTestProps {
   children: React.ReactNode;

From b452c7afe2f7904153854a71ca8f1a4429c73cfd Mon Sep 17 00:00:00 2001
From: Pedro Ferreira <10789765+apedroferreira@users.noreply.github.com>
Date: Thu, 24 Apr 2025 00:45:19 +0100
Subject: [PATCH 3/4] Forgot a mock... -.-

---
 packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx b/packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx
index dfc94ef9f47..c49396090de 100644
--- a/packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx
+++ b/packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx
@@ -8,7 +8,7 @@ import { render, screen } from '@testing-library/react';
 import { NextAppProvider } from './NextAppProvider';
 import { Router } from '../AppProvider';
 
-vi.mock('next/navigation.js', () => {
+vi.mock('next/navigation', () => {
   const searchParams = new URLSearchParams();
   const push = () => {};
   const replace = () => {};

From d22e39c3ed8a35d1e0e281387798df70cb97b2bd Mon Sep 17 00:00:00 2001
From: Pedro Ferreira <10789765+apedroferreira@users.noreply.github.com>
Date: Thu, 24 Apr 2025 00:59:48 +0100
Subject: [PATCH 4/4] Last try today

---
 packages/toolpad-core/src/nextjs/NextAppProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolpad-core/src/nextjs/NextAppProvider.tsx b/packages/toolpad-core/src/nextjs/NextAppProvider.tsx
index cbdea5b579e..80b797b751e 100644
--- a/packages/toolpad-core/src/nextjs/NextAppProvider.tsx
+++ b/packages/toolpad-core/src/nextjs/NextAppProvider.tsx
@@ -1,6 +1,6 @@
 'use client';
 import * as React from 'react';
-import { useRouter } from 'next/compat/router.js';
+import { useRouter } from 'next/compat/router';
 import { NextAppProviderApp } from './NextAppProviderApp';
 import { NextAppProviderPages } from './NextAppProviderPages';
 import type { AppProviderProps } from '../AppProvider';