diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index 3f611c42405fc45..4182c953f1663b3 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -741,7 +741,7 @@ export async function renderToHTML(
AppTree: (props: any) => {
return (
- {renderFlight(AppMod, ComponentMod, { ...props, router })}
+ {renderFlight(AppMod, ComponentMod, props)}
)
},
@@ -1216,7 +1216,7 @@ export async function renderToHTML(
// Pass router to the Server Component as a temporary workaround.
if (isServerComponent) {
- props.pageProps = Object.assign({}, props.pageProps, { router })
+ props.pageProps = Object.assign({}, props.pageProps)
}
// the response might be finished on the getInitialProps call
diff --git a/test/integration/react-streaming-and-server-components/app/pages/index.server.js b/test/integration/react-streaming-and-server-components/app/pages/index.server.js
index 9383793d9513f12..c408b7ec05b0c41 100644
--- a/test/integration/react-streaming-and-server-components/app/pages/index.server.js
+++ b/test/integration/react-streaming-and-server-components/app/pages/index.server.js
@@ -3,11 +3,10 @@ import Nav from '../components/nav'
const envVar = process.env.ENV_VAR_TEST
const headerKey = 'x-next-test-client'
-export default function Index({ header, router }) {
+export default function Index({ header }) {
return (
{`component:index.server`}
-
{'path:' + router.pathname}
{'env:' + envVar}
{'header:' + header}
diff --git a/test/integration/react-streaming-and-server-components/app/pages/next-api/link.server.js b/test/integration/react-streaming-and-server-components/app/pages/next-api/link.server.js
index 5e8a81e35c34993..2eff2d450f3b834 100644
--- a/test/integration/react-streaming-and-server-components/app/pages/next-api/link.server.js
+++ b/test/integration/react-streaming-and-server-components/app/pages/next-api/link.server.js
@@ -1,9 +1,8 @@
import Link from 'next/link'
import Nav from '../../components/nav'
-export default function LinkPage({ router }) {
- const { query } = router
- const id = parseInt(query.id || '0', 10)
+export default function LinkPage({ queryId }) {
+ const id = parseInt(queryId)
return (
<>
query:{id}
@@ -17,6 +16,10 @@ export default function LinkPage({ router }) {
)
}
-export const config = {
- runtime: 'edge',
+export function getServerSideProps({ query }) {
+ return {
+ props: {
+ queryId: query.id || '0',
+ },
+ }
}
diff --git a/test/integration/react-streaming-and-server-components/app/pages/routes/[dynamic].server.js b/test/integration/react-streaming-and-server-components/app/pages/routes/[dynamic].server.js
index 27c7c0bddf02830..f70037571d20b60 100644
--- a/test/integration/react-streaming-and-server-components/app/pages/routes/[dynamic].server.js
+++ b/test/integration/react-streaming-and-server-components/app/pages/routes/[dynamic].server.js
@@ -1,7 +1,11 @@
-export default function Pid({ router }) {
- return
{`query: ${router.query.dynamic}`}
+export default function Pid({ text }) {
+ return
{`query: ${text}`}
}
-export const config = {
- runtime: 'edge',
+export function getServerSideProps({ params }) {
+ return {
+ props: {
+ text: params.dynamic,
+ },
+ }
}
diff --git a/test/integration/react-streaming-and-server-components/test/rsc.js b/test/integration/react-streaming-and-server-components/test/rsc.js
index a9f043f4e162a35..105aa8618377cc9 100644
--- a/test/integration/react-streaming-and-server-components/test/rsc.js
+++ b/test/integration/react-streaming-and-server-components/test/rsc.js
@@ -19,7 +19,6 @@ export default function (context, { runtime, env }) {
expect(homeHTML).toContain('component:index.server')
expect(homeHTML).toContain('env:env_var_test')
expect(homeHTML).toContain('header:test-util')
- expect(homeHTML).toContain('path:/')
})
it('should reuse the inline flight response without sending extra requests', async () => {