Fixes 'next export' when exportPathMap function depends on runtime config (vercel#4339)

cedric-marcone · timneutkens · commit d3c710b325c4 · 2018-05-11T14:52:39.000+02:00
diff --git a/server/export.js b/server/export.js
@@ -81,9 +81,6 @@ export default async function (dir, options, configuration) {
     }
   }
 
-  const exportPathMap = await nextConfig.exportPathMap(defaultPathMap)
-  const exportPaths = Object.keys(exportPathMap)
-
   // Start the rendering process
   const renderOpts = {
     dir,
@@ -116,6 +113,9 @@ export default async function (dir, options, configuration) {
     nextExport: true
   }
 
+  const exportPathMap = await nextConfig.exportPathMap(defaultPathMap)
+  const exportPaths = Object.keys(exportPathMap)
+
   for (const path of exportPaths) {
     log(`> exporting path: ${path}`)
     if (!path.startsWith('/')) {

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,6 @@ export default async function (dir, options, configuration) {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`- const exportPathMap = await nextConfig.exportPathMap(defaultPathMap)`
`85`		`- const exportPaths = Object.keys(exportPathMap)`
`86`		`-`
`87`	`84`	`// Start the rendering process`
`88`	`85`	`const renderOpts = {`
`89`	`86`	`dir,`
`@@ -116,6 +113,9 @@ export default async function (dir, options, configuration) {`
`116`	`113`	`nextExport: true`
`117`	`114`	`}`
`118`	`115`
	`116`	`+ const exportPathMap = await nextConfig.exportPathMap(defaultPathMap)`
	`117`	`+ const exportPaths = Object.keys(exportPathMap)`
	`118`	`+`
`119`	`119`	`for (const path of exportPaths) {`
`120`	`120`	log(`> exporting path: ${path}`)
`121`	`121`	`if (!path.startsWith('/')) {`