Make sure that params are properly passed to hybrid amp pages (#17461)

Co-authored-by: Tim Neutkens <tim@timneutkens.nl>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Author: 3 people

packages/next/export/worker.ts

@@ -352,7 +352,8 @@ export default async function exportPage({
         if (serverless) {
           req.url += (req.url!.includes('?') ? '&' : '?') + 'amp=1'
           // @ts-ignore
-          ampHtml = (await renderMethod(req, res, 'export')).html
+          ampHtml = (await renderMethod(req, res, 'export', undefined, params))
+            .html
         } else {
           ampHtml = await renderMethod(
             req,

test/integration/amphtml-ssg/pages/blog/[slug].js

@@ -4,9 +4,10 @@ export const config = {
   amp: 'hybrid',
 }
 
-export const getStaticProps = () => {
+export const getStaticProps = (ctx) => {
   return {
     props: {
+      slug: ctx.params?.slug || null,
       hello: 'hello',
       random: Math.random(),
     },
@@ -18,10 +19,11 @@ export const getStaticPaths = () => ({
   fallback: false,
 })
 
-export default ({ hello, random }) => (
+export default ({ hello, random, slug }) => (
   <>
     <p id="use-amp">useAmp: {useAmp() ? 'yes' : 'no'}</p>
     <p id="hello">{hello}</p>
     <p id="random">{random}</p>
+    <p id="slug">{slug}</p>
   </>
 )

test/integration/amphtml-ssg/test/index.test.js

@@ -51,20 +51,23 @@ const runTests = (isDev = false) => {
     const $ = cheerio.load(html)
     expect($('#use-amp').text()).toContain('no')
     expect($('#hello').text()).toContain('hello')
+    expect($('#slug').text()).toContain('post-1')
   })
 
   it('should load dynamic hybrid SSG/AMP page with trailing slash', async () => {
     const html = await renderViaHTTP(appPort, '/blog/post-1/')
     const $ = cheerio.load(html)
     expect($('#use-amp').text()).toContain('no')
     expect($('#hello').text()).toContain('hello')
+    expect($('#slug').text()).toContain('post-1')
   })
 
   it('should load dynamic hybrid SSG/AMP page with query', async () => {
     const html = await renderViaHTTP(appPort, '/blog/post-1?amp=1')
     const $ = cheerio.load(html)
     expect($('#use-amp').text()).toContain('yes')
     expect($('#hello').text()).toContain('hello')
+    expect($('#slug').text()).toContain('post-1')
   })
 
   it('should load a hybrid amp page with query correctly', async () => {