Unverified Commit a0155c79 authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

refactor page export error tracking (#66392)

This adds a map to track failed pages (and the number of attempts, which
will be used in #66393). I removed some other variables that were being
used to track the same information.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
parent c467c0a9
......@@ -512,6 +512,7 @@ export async function exportAppImpl(
)
}
const failedExportAttemptsByPage: Map<string, number> = new Map()
const results = await Promise.all(
filteredPaths.map(async (path) => {
const pathMap = exportPathMap[path]
......@@ -558,10 +559,15 @@ export async function exportAppImpl(
})
})
if (nextConfig.experimental.prerenderEarlyExit) {
if (result && 'error' in result) {
throw new Error(
`Export encountered an error on ${path}, exiting due to prerenderEarlyExit: true being set`
if (result && 'error' in result) {
const { page } = exportPathMap[path]
const pageKey = page !== path ? `${page}: ${path}` : path
const currentCount = failedExportAttemptsByPage.get(pageKey) ?? 0
failedExportAttemptsByPage.set(pageKey, currentCount + 1)
if (nextConfig.experimental.prerenderEarlyExit) {
throw new ExportError(
`Export encountered an error on ${path}, exiting the build.`
)
}
}
......@@ -572,8 +578,6 @@ export async function exportAppImpl(
})
)
const errorPaths: string[] = []
let renderError = false
let hadValidationError = false
const collector: ExportAppResult = {
......@@ -584,7 +588,7 @@ export async function exportAppImpl(
}
for (const { result, path } of results) {
if (!result) continue
if (!result || 'error' in result) continue
const { page } = exportPathMap[path]
......@@ -597,13 +601,6 @@ export async function exportAppImpl(
)
}
// Capture any render errors.
if ('error' in result) {
renderError = true
errorPaths.push(page !== path ? `${page}: ${path}` : path)
continue
}
// Capture any amp validations.
if (result.ampValidations) {
for (const validation of result.ampValidations) {
......@@ -736,9 +733,10 @@ export async function exportAppImpl(
)
}
if (renderError) {
if (failedExportAttemptsByPage.size > 0) {
const failedPages = Array.from(failedExportAttemptsByPage.keys())
throw new ExportError(
`Export encountered errors on following paths:\n\t${errorPaths
`Export encountered errors on following paths:\n\t${failedPages
.sort()
.join('\n\t')}`
)
......
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