Commit 56e94bd2 authored by Tim Neutkens's avatar Tim Neutkens

Revert "Revert "refactor: write pages router export files directly to server/…"

This reverts commit 96338c31.
parent 901cb556
This diff is collapsed.
......@@ -345,8 +345,10 @@ async function exportAppImpl(
)
}
await fs.rm(outDir, { recursive: true, force: true })
await fs.mkdir(join(outDir, '_next', buildId), { recursive: true })
if (!options.buildExport) {
await fs.rm(outDir, { recursive: true, force: true })
await fs.mkdir(join(outDir, '_next', buildId), { recursive: true })
}
await fs.writeFile(
join(distDir, EXPORT_DETAIL),
......@@ -650,7 +652,7 @@ async function exportAppImpl(
}
const pagesDataDir = options.buildExport
? outDir
? join(distDir, 'server', 'pages')
: join(outDir, '_next/data', buildId)
const publicDir = join(dir, CLIENT_PUBLIC_FILES_PATH)
......@@ -717,7 +719,9 @@ async function exportAppImpl(
options,
dir,
distDir,
outDir,
outDir: options.buildExport
? join(distDir, 'server', 'pages')
: outDir,
nextConfig,
cacheHandler: nextConfig.cacheHandler,
cacheMaxMemorySize: nextConfig.cacheMaxMemorySize,
......@@ -930,19 +934,25 @@ async function exportAppImpl(
// realizing the implications.
const route = normalizePagePath(unnormalizedRoute)
const pagePath = getPagePath(pageName, distDir, undefined, isAppPath)
const distPagesDir = join(
pagePath,
// strip leading / and then recurse number of nested dirs
// to place from base folder
pageName
.slice(1)
.split('/')
.map(() => '..')
.join('/')
)
const orig = join(distPagesDir, route)
let orig: string
if (isAppPath) {
const pagePath = getPagePath(pageName, distDir, undefined, isAppPath)
const distPagesDir = join(
pagePath,
// strip leading / and then recurse number of nested dirs
// to place from base folder
pageName
.slice(1)
.split('/')
.map(() => '..')
.join('/')
)
orig = join(distPagesDir, route)
} else {
// Pages router files are written directly to server/pages/
// by the export worker during build, so read from there.
orig = join(distDir, 'server', 'pages', route)
}
const handlerSrc = `${orig}.body`
const handlerDest = join(outDir, route)
......
......@@ -113,7 +113,7 @@ export async function exportPagesPage(
renderResult && !renderResult.isNull ? renderResult.toUnchunkedString() : ''
const metadata = renderResult?.metadata || {}
if (metadata.pageData) {
if (metadata.pageData && !ssgNotFound) {
const dataFile = join(
pagesDataDir,
htmlFilename.replace(/\.html$/, NEXT_DATA_SUFFIX)
......
......@@ -1543,7 +1543,7 @@ function runTests({ dev }) {
"/catchall-dash/[...hello-world]": "pages/catchall-dash/[...hello-world].html",
"/d/[id]": "pages/d/[id].html",
"/dash/[hello-world]": "pages/dash/[hello-world].html",
"/index/[...slug]": "pages/index/index/[...slug].html",
"/index/[...slug]": "pages/index/[...slug].html",
"/on-mount/[post]": "pages/on-mount/[post].html",
"/p1/p2/all-ssg/[...rest]": "pages/p1/p2/all-ssg/[...rest].js",
"/p1/p2/all-ssr/[...rest]": "pages/p1/p2/all-ssr/[...rest].js",
......
......@@ -88,6 +88,15 @@ describe('i18n Support', () => {
expect(content).toMatch(/Internal Server Error/i)
}
})
it('should have locale-prefixed pages-manifest entries for default 500', async () => {
const manifest = await fs.readJSON(
join(appDir, '.next/server/pages-manifest.json')
)
for (const locale of locales) {
expect(manifest[`/${locale}/500`]).toBe(`pages/${locale}/500.html`)
}
})
}
)
......
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