-
Notifications
You must be signed in to change notification settings - Fork 27.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Show revalidate/expire columns in build output #76343
Merged
+154
−60
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import type { CacheControl } from '../../server/lib/cache-control' | ||
|
|
||
| const timeUnits = [ | ||
| { label: 'y', seconds: 31536000 }, | ||
| { label: 'w', seconds: 604800 }, | ||
| { label: 'd', seconds: 86400 }, | ||
| { label: 'h', seconds: 3600 }, | ||
| { label: 'm', seconds: 60 }, | ||
| { label: 's', seconds: 1 }, | ||
| ] | ||
|
|
||
| function humanReadableTimeRounded(seconds: number): string { | ||
| // Find the largest fitting unit. | ||
| let candidateIndex = timeUnits.length - 1 | ||
| for (let i = 0; i < timeUnits.length; i++) { | ||
| if (seconds >= timeUnits[i].seconds) { | ||
| candidateIndex = i | ||
| break | ||
| } | ||
| } | ||
|
|
||
| const candidate = timeUnits[candidateIndex] | ||
| const value = seconds / candidate.seconds | ||
| const isExact = Number.isInteger(value) | ||
|
|
||
| // For days and weeks only, check if using the next smaller unit yields an | ||
| // exact result. | ||
| if (!isExact && (candidate.label === 'd' || candidate.label === 'w')) { | ||
| const nextUnit = timeUnits[candidateIndex + 1] | ||
| const nextValue = seconds / nextUnit.seconds | ||
|
|
||
| if (Number.isInteger(nextValue)) { | ||
| return `${nextValue}${nextUnit.label}` | ||
| } | ||
| } | ||
|
|
||
| if (isExact) { | ||
| return `${value}${candidate.label}` | ||
| } | ||
|
|
||
| return `≈${Math.round(value)}${candidate.label}` | ||
| } | ||
|
|
||
| export function formatRevalidate(cacheControl: CacheControl): string { | ||
| const { revalidate } = cacheControl | ||
|
|
||
| return revalidate ? humanReadableTimeRounded(revalidate) : '' | ||
| } | ||
|
|
||
| export function formatExpire(cacheControl: CacheControl): string { | ||
| const { expire } = cacheControl | ||
|
|
||
| return expire ? humanReadableTimeRounded(expire) : '' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
test/production/app-dir/build-output-tree-view/fixtures/mixed/app/cache-life-custom/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| 'use cache' | ||
|
|
||
| import { unstable_cacheLife } from 'next/cache' | ||
|
|
||
| export default async function Page() { | ||
| unstable_cacheLife({ revalidate: 412, expire: 8940 }) | ||
|
|
||
| return <p>hello world</p> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe just me, I feel the left aligned was intended, visually more comfortable, and the JS column as the previous last column, it's right aligned.
Horizontally wide feels hard to read. Having two new columns feel like a lot more information to view and match visually. I quite like the 1st iteration where they stay together. We can explain
"Revalidate / Expire"in title.