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.

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

Fix req.url of rsc dynamic routes pages gSSP in edge runtime #36134

Merged
merged 1 commit into from Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/server/web-server.ts
Expand Up @@ -125,7 +125,7 @@ export default class NextWebServer extends BaseServer {
): Promise<RenderResult | null> {
return renderToHTML(
{
url: pathname,
url: req.url,
cookies: req.cookies,
headers: req.headers,
} as any,
Expand Down
@@ -1,10 +1,18 @@
export default function Pid({ text }) {
return <div>{`query: ${text}`}</div>
import { parse } from 'url'

export default function Pid({ text, pathname }) {
return (
<>
<div>{`query: ${text}`}</div>
<div>{`pathname: ${pathname}`}</div>
</>
)
}

export function getServerSideProps({ params }) {
export function getServerSideProps({ params, req }) {
return {
props: {
pathname: parse(req.url).pathname,
text: params.dynamic,
},
}
Expand Down
Expand Up @@ -10,20 +10,6 @@ export default async function basic(context, { env }) {
expect(pathNotFoundHTML).toContain('custom-404-page')
})

it('should render dynamic routes correctly', async () => {
const dynamicRoute1HTML = await renderViaHTTP(
context.appPort,
'/routes/dynamic1'
)
const dynamicRoute2HTML = await renderViaHTTP(
context.appPort,
'/routes/dynamic2'
)

expect(dynamicRoute1HTML).toContain('query: dynamic1')
expect(dynamicRoute2HTML).toContain('query: dynamic2')
})

it('should support api routes', async () => {
const res = await renderViaHTTP(context.appPort, '/api/ping')
expect(res).toContain('pong')
Expand Down
Expand Up @@ -102,6 +102,22 @@ export default function (context, { runtime, env }) {
expect(await browser.eval('window.beforeNav')).toBe(1)
})

it('should render dynamic routes correctly', async () => {
const dynamicRoute1HTML = await renderViaHTTP(
context.appPort,
'/routes/dynamic1'
)
const dynamicRoute2HTML = await renderViaHTTP(
context.appPort,
'/routes/dynamic2'
)

expect(dynamicRoute1HTML).toContain('query: dynamic1')
expect(dynamicRoute1HTML).toContain('pathname: /routes/dynamic')
expect(dynamicRoute2HTML).toContain('query: dynamic2')
expect(dynamicRoute2HTML).toContain('pathname: /routes/dynamic')
})

it('should be able to navigate between rsc pages', async () => {
let content
const browser = await webdriver(context.appPort, '/')
Expand Down