archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix serverless dynamic routes (#7505)

Browse source 
* Fix serverDir resolving for autoExporting

* Fix dynamic routes in serverless loader
This commit is contained in:
JJ Kasper 2019-06-05 04:18:23 -07:00 committed by Tim Neutkens
parent 2153789358
commit 93aaacd58d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/next/build/webpack/loaders/next-serverless-loader.ts
View file

@ -43,7 +43,7 @@ const nextServerlessLoader: loader.Loader = function() {
import {sendHTML} from 'next-server/dist/server/send-html'; import {sendHTML} from 'next-server/dist/server/send-html';
${ ${
page.includes('/$') page.includes('/$')
? `import {getRouteMatch} from 'next-server/dist/lib/router/utils';` ? `import {getRouteMatcher, getRouteRegex} from 'next-server/dist/lib/router/utils';`
: '' : ''
} }
import buildManifest from '${buildManifest}'; import buildManifest from '${buildManifest}';
@ -79,7 +79,7 @@ const nextServerlessLoader: loader.Loader = function() {
${page === '/_error' ? `res.statusCode = 404` : ''} ${page === '/_error' ? `res.statusCode = 404` : ''}
${ ${
page.includes('/$') page.includes('/$')
? `const params = getRouteMatch("${page}")(parsedUrl.pathname) || {};` ? `const params = 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)