Commit 268ac936 authored by JJ Kasper's avatar JJ Kasper Committed by Joe Haddad

Fix placeholder values being added when exporting from serverless (#7883)

* Add testing serverless in dynamic routes suite

* Fix placeholder dynamic values being added
when exporting from serverless
parent 193d049d
...@@ -50,7 +50,7 @@ const nextServerlessLoader: loader.Loader = function() { ...@@ -50,7 +50,7 @@ const nextServerlessLoader: loader.Loader = function() {
: `` : ``
} }
import { apiResolver } from 'next-server/dist/server/api-utils' import { apiResolver } from 'next-server/dist/server/api-utils'
export default (req, res) => { export default (req, res) => {
const params = ${ const params = ${
isDynamicRoute(page) isDynamicRoute(page)
...@@ -108,7 +108,7 @@ const nextServerlessLoader: loader.Loader = function() { ...@@ -108,7 +108,7 @@ const nextServerlessLoader: loader.Loader = function() {
${page === '/_error' ? `res.statusCode = 404` : ''} ${page === '/_error' ? `res.statusCode = 404` : ''}
${ ${
isDynamicRoute(page) isDynamicRoute(page)
? `const params = getRouteMatcher(getRouteRegex("${page}"))(parsedUrl.pathname) || {};` ? `const params = fromExport ? {} : getRouteMatcher(getRouteRegex("${page}"))(parsedUrl.pathname) || {};`
: `const params = {};` : `const params = {};`
} }
const result = await renderToHTML(req, res, "${page}", Object.assign({}, parsedUrl.query, params), renderOpts) const result = await renderToHTML(req, res, "${page}", Object.assign({}, parsedUrl.query, params), renderOpts)
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
/* global jasmine */ /* global jasmine */
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
import { join } from 'path' import { join } from 'path'
import fs from 'fs-extra'
import { import {
renderViaHTTP, renderViaHTTP,
findPort, findPort,
...@@ -150,9 +151,20 @@ function runTests () { ...@@ -150,9 +151,20 @@ function runTests () {
const text = await browser.eval(`document.body.innerHTML`) const text = await browser.eval(`document.body.innerHTML`)
expect(text).toMatch(/onmpost:.*post-1/) expect(text).toMatch(/onmpost:.*post-1/)
}) })
it('should not have placeholder query values for SSS', async () => {
const html = await renderViaHTTP(appPort, '/on-mount/post-1')
expect(html).not.toMatch(/post:.*?\[post\].*?<\/p>/)
})
} }
const nextConfig = join(appDir, 'next.config.js')
describe('Dynamic Routing', () => { describe('Dynamic Routing', () => {
beforeAll(async () => {
await fs.remove(nextConfig)
})
describe('dev mode', () => { describe('dev mode', () => {
beforeAll(async () => { beforeAll(async () => {
appPort = await findPort() appPort = await findPort()
...@@ -180,4 +192,31 @@ describe('Dynamic Routing', () => { ...@@ -180,4 +192,31 @@ describe('Dynamic Routing', () => {
runTests() runTests()
}) })
describe('SSR production mode', () => {
beforeAll(async () => {
await fs.writeFile(
nextConfig,
`
module.exports = {
target: 'serverless'
}
`
)
await runNextCommand(['build', appDir])
app = nextServer({
dir: appDir,
dev: false,
quiet: true
})
server = await startApp(app)
appPort = server.address().port
})
afterAll(() => stopApp(server))
runTests()
})
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment