Skip to content

Remove .js extensions from Next.js AppProvider imports #4883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
apedroferreira wants to merge 5 commits into from
Closed

Remove .js extensions from Next.js AppProvider imports #4883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed1402b
Remove .js extensions from Next.js AppProvider imports
apedroferreira Apr 23, 2025
c07e694
Adjust mocks
apedroferreira Apr 23, 2025
b452c7a
Forgot a mock... -.-
apedroferreira Apr 23, 2025
d22e39c
Last try today
apedroferreira Apr 23, 2025
f00b8df
Merge remote-tracking branch 'upstream/master' into fix-turborepo-issue
apedroferreira Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/toolpad-core/src/nextjs/NextAppProvider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {};
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-core/src/nextjs/NextAppProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/toolpad-core/src/nextjs/NextAppProviderApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/toolpad-core/src/nextjs/NextAppProviderPages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down