Unverified Commit 09a5521c authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: clear require.cache after writing files (Next.rs API) (#53285)

### What?

make sure to clear require.cache when writing files again

### Why?

changes should be reflected on reloads
parent aaa94cd6
...@@ -482,12 +482,3 @@ impl Project { ...@@ -482,12 +482,3 @@ impl Project {
unit() unit()
} }
} }
#[turbo_tasks::function]
async fn project_fs(project_dir: String, watching: bool) -> Result<Vc<Box<dyn FileSystem>>> {
let disk_fs = DiskFileSystem::new(PROJECT_FILESYSTEM_NAME.to_string(), project_dir.to_string());
if watching {
disk_fs.await?.start_watching_with_invalidation_reason()?;
}
Ok(Vc::upcast(disk_fs))
}
...@@ -21,6 +21,7 @@ export function useFlightResponse( ...@@ -21,6 +21,7 @@ export function useFlightResponse(
if (flightResponseRef.current !== null) { if (flightResponseRef.current !== null) {
return flightResponseRef.current return flightResponseRef.current
} }
// react-server-dom-webpack/client.edge must not be hoisted for require cache clearing to work correctly
const { const {
createFromReadableStream, createFromReadableStream,
} = require(`react-server-dom-webpack/client.edge`) } = require(`react-server-dom-webpack/client.edge`)
......
...@@ -245,10 +245,25 @@ async function startWatcher(opts: SetupOpts) { ...@@ -245,10 +245,25 @@ async function startWatcher(opts: SetupOpts) {
return manifest return manifest
} }
function printIssues( async function processResult(
result: TurbopackResult<WrittenEndpoint> | undefined result: TurbopackResult<WrittenEndpoint> | undefined
): TurbopackResult<WrittenEndpoint> | undefined { ): Promise<TurbopackResult<WrittenEndpoint> | undefined> {
if (result) { if (result) {
await (global as any)._nextDeleteCache?.(
result.serverPaths
.map((p) => path.join(distDir, p))
.concat([
// We need to clear the chunk cache in react
require.resolve(
'next/dist/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js'
),
// And this redirecting module as well
require.resolve(
'next/dist/compiled/react-server-dom-webpack/client.edge.js'
),
])
)
for (const issue of result.issues) { for (const issue of result.issues) {
// TODO better formatting // TODO better formatting
if (issue.severity !== 'error' && issue.severity !== 'fatal') continue if (issue.severity !== 'error' && issue.severity !== 'fatal') continue
...@@ -485,14 +500,14 @@ async function startWatcher(opts: SetupOpts) { ...@@ -485,14 +500,14 @@ async function startWatcher(opts: SetupOpts) {
} }
if (page === '/_error') { if (page === '/_error') {
printIssues(await globalEntries.app?.writeToDisk()) await processResult(await globalEntries.app?.writeToDisk())
await loadBuildManifest('_app') await loadBuildManifest('_app')
await loadPagesManifest('_app') await loadPagesManifest('_app')
printIssues(await globalEntries.document?.writeToDisk()) await processResult(await globalEntries.document?.writeToDisk())
await loadPagesManifest('_document') await loadPagesManifest('_document')
printIssues(await globalEntries.error?.writeToDisk()) await processResult(await globalEntries.error?.writeToDisk())
await loadBuildManifest('_error') await loadBuildManifest('_error')
await loadPagesManifest('_error') await loadPagesManifest('_error')
...@@ -523,17 +538,19 @@ async function startWatcher(opts: SetupOpts) { ...@@ -523,17 +538,19 @@ async function startWatcher(opts: SetupOpts) {
) )
} }
printIssues(await globalEntries.app?.writeToDisk()) await processResult(await globalEntries.app?.writeToDisk())
await loadBuildManifest('_app') await loadBuildManifest('_app')
await loadPagesManifest('_app') await loadPagesManifest('_app')
printIssues(await globalEntries.document?.writeToDisk()) await processResult(await globalEntries.document?.writeToDisk())
await loadPagesManifest('_document') await loadPagesManifest('_document')
const writtenEndpoint = const writtenEndpoint =
route.type === 'page-api' route.type === 'page-api'
? printIssues(await route.endpoint.writeToDisk()) ? await processResult(await route.endpoint.writeToDisk())
: printIssues(await route.htmlEndpoint.writeToDisk()) : await processResult(
await route.htmlEndpoint.writeToDisk()
)
if (route.type === 'page') { if (route.type === 'page') {
await loadBuildManifest(page) await loadBuildManifest(page)
...@@ -562,7 +579,7 @@ async function startWatcher(opts: SetupOpts) { ...@@ -562,7 +579,7 @@ async function startWatcher(opts: SetupOpts) {
break break
} }
case 'app-page': { case 'app-page': {
printIssues(await route.htmlEndpoint.writeToDisk()) await processResult(await route.htmlEndpoint.writeToDisk())
await loadAppBuildManifest(page) await loadAppBuildManifest(page)
await loadBuildManifest(page, true) await loadBuildManifest(page, true)
...@@ -577,7 +594,7 @@ async function startWatcher(opts: SetupOpts) { ...@@ -577,7 +594,7 @@ async function startWatcher(opts: SetupOpts) {
break break
} }
case 'app-route': { case 'app-route': {
printIssues(await route.endpoint.writeToDisk()) await processResult(await route.endpoint.writeToDisk())
await loadAppPathManifest(page, true) await loadAppPathManifest(page, true)
......
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