Skip to content
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

Handle next/navigation import in middleware #66175

Merged
merged 3 commits into from
May 24, 2024
+48 −1
Merged

Handle next/navigation import in middleware #66175

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9ac35f
Handle next/navigation import in middleware
timneutkens May 24, 2024
28ecd11
Ensure React aliases apply to middleware. Add missing next/navigation…
timneutkens May 24, 2024
bbe29f4
Update test/e2e/app-dir/navigation-redirect-import/app/route-handler/…
timneutkens May 24, 2024
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
6 changes: 5 additions & 1 deletion packages/next-swc/crates/next-core/src/next_import_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,10 @@ async fn insert_next_server_special_aliases(

rsc_aliases(import_map, project_path, ty, runtime, next_config).await?;
}
ServerContextType::Middleware | ServerContextType::Instrumentation => {}
ServerContextType::Middleware => {
rsc_aliases(import_map, project_path, ty, runtime, next_config).await?;
}
ServerContextType::Instrumentation => {}
}

// see https://github.com/vercel/next.js/blob/8013ef7372fc545d49dbd060461224ceb563b454/packages/next/src/build/webpack-config.ts#L1449-L1531
Expand Down Expand Up @@ -727,6 +730,7 @@ async fn rsc_aliases(
"react-dom" => format!("next/dist/compiled/react-dom{react_channel}/react-dom.react-server"),
"next/dist/compiled/react-dom" => format!("next/dist/compiled/react-dom{react_channel}/react-dom.react-server"),
"next/dist/compiled/react-dom-experimental" => format!("next/dist/compiled/react-dom-experimental/react-dom.react-server"),
"next/navigation" => format!("next/dist/api/navigation.react-server"),
})
}

Expand Down
8 changes: 8 additions & 0 deletions test/e2e/app-dir/navigation-redirect-import/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { ReactNode } from 'react'
export default function Root({ children }: { children: ReactNode }) {
return (
<html>
<body>{children}</body>
</html>
)
}
3 changes: 3 additions & 0 deletions test/e2e/app-dir/navigation-redirect-import/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function Page() {
return <p>hello world</p>
}
8 changes: 8 additions & 0 deletions test/e2e/app-dir/navigation-redirect-import/app/route-handler/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { redirect } from 'next/navigation'

// Redirect can't be called in middleware, but it should be able to be imported.
timneutkens marked this conversation as resolved.
Show resolved Hide resolved
console.log({ redirect })

export function GET() {
return new Response('hello world')
}
5 changes: 5 additions & 0 deletions test/e2e/app-dir/navigation-redirect-import/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { redirect } from 'next/navigation'
// Redirect can't be called in middleware, but it should be able to be imported.
console.log({ redirect })

export default function middleware() {}
13 changes: 13 additions & 0 deletions test/e2e/app-dir/navigation-redirect-import/navigation-redirect-import.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { nextTestSetup } from 'e2e-utils'

describe('navigation-redirect-import', () => {
const { next } = nextTestSetup({
files: __dirname,
})

it('should work using fetch', async () => {
const res = await next.fetch('/route-handler')
expect(res.status).toBe(200)
expect(await res.text()).toBe('hello world')
})
})
6 changes: 6 additions & 0 deletions test/e2e/app-dir/navigation-redirect-import/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {}

module.exports = nextConfig
Loading