Repository navigation
fix(release): cap proxied plain-http responses, count Firecrawl depth from the start URL, and drop stale route cache on upgrade #9860
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
Merged
Merged
Changes from all commits
Commits
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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,46 @@ | ||
| import { mkdir, mkdtemp, readdir, rm, writeFile } from 'node:fs/promises' | ||
| import { tmpdir } from 'node:os' | ||
| import { join } from 'node:path' | ||
| import { afterEach, beforeEach, describe, expect, it } from 'vitest' | ||
| import { clearRouteCacheFromOtherBuild } from '@/lib/core/utils/route-cache' | ||
|
|
||
| let nextDirectory: string | ||
| let routeCache: string | ||
|
|
||
| beforeEach(async () => { | ||
| nextDirectory = await mkdtemp(join(tmpdir(), 'route-cache-')) | ||
| routeCache = join(nextDirectory, 'server', 'route-cache') | ||
| await mkdir(join(routeCache, 'app-page'), { recursive: true }) | ||
| await writeFile(join(routeCache, 'app-page', 'contact.html'), '<html>old build</html>') | ||
| await writeFile(join(nextDirectory, 'BUILD_ID'), 'build-2\n') | ||
| }) | ||
|
|
||
| afterEach(async () => { | ||
| await rm(nextDirectory, { recursive: true, force: true }) | ||
| }) | ||
|
|
||
| describe('clearRouteCacheFromOtherBuild', () => { | ||
| it('clears pages rendered by an earlier build', async () => { | ||
| await writeFile(join(routeCache, '.build-id'), 'build-1') | ||
| await clearRouteCacheFromOtherBuild(nextDirectory) | ||
| expect(await readdir(routeCache)).toEqual(['.build-id']) | ||
| }) | ||
|
|
||
| it('clears a cache that records no build', async () => { | ||
| await clearRouteCacheFromOtherBuild(nextDirectory) | ||
| expect(await readdir(routeCache)).toEqual(['.build-id']) | ||
| }) | ||
|
|
||
| it('keeps pages rendered by the current build across restarts', async () => { | ||
| await clearRouteCacheFromOtherBuild(nextDirectory) | ||
| await writeFile(join(routeCache, 'app-page.html'), '<html>current build</html>') | ||
| await clearRouteCacheFromOtherBuild(nextDirectory) | ||
| expect((await readdir(routeCache)).sort()).toEqual(['.build-id', 'app-page.html']) | ||
| }) | ||
|
|
||
| it('leaves the cache alone when the build id is unreadable', async () => { | ||
| await rm(join(nextDirectory, 'BUILD_ID')) | ||
| await clearRouteCacheFromOtherBuild(nextDirectory) | ||
| expect(await readdir(routeCache)).toEqual(['app-page']) | ||
| }) | ||
| }) |
This file contains hidden or 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,25 @@ | ||
| import { readdir, readFile, rm, writeFile } from 'node:fs/promises' | ||
| import { join } from 'node:path' | ||
|
|
||
| const BUILD_MARKER = '.build-id' | ||
|
|
||
| /** | ||
| * Clears Next's route cache when it was written by a different build. Its keys carry no build | ||
| * id, and the image declares the directory a volume, so a container recreated from a newer | ||
| * image would otherwise serve pages the old build rendered, pointing at chunks it no longer | ||
| * ships. Never throws: a cache that cannot be read or cleared is left to Next. | ||
| */ | ||
| export async function clearRouteCacheFromOtherBuild(nextDirectory: string): Promise<void> { | ||
| const routeCache = join(nextDirectory, 'server', 'route-cache') | ||
| try { | ||
| const buildId = (await readFile(join(nextDirectory, 'BUILD_ID'), 'utf8')).trim() | ||
| if (!buildId) return | ||
| const cachedBuildId = await readFile(join(routeCache, BUILD_MARKER), 'utf8').catch(() => null) | ||
| if (cachedBuildId?.trim() === buildId) return | ||
| const entries = await readdir(routeCache) | ||
| await Promise.all( | ||
| entries.map((entry) => rm(join(routeCache, entry), { recursive: true, force: true })) | ||
| ) | ||
| await writeFile(join(routeCache, BUILD_MARKER), buildId) | ||
| } catch {} | ||
| } |
This file contains hidden or 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 hidden or 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
Large diffs are not rendered by default.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.