Skip to content
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.

Sign up for GitHub

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

fix memory leak in require.cache cleanup #55377

Merged
merged 2 commits into from
Sep 14, 2023
Merged

fix memory leak in require.cache cleanup #55377

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f68ea
fix memory leak in require.cache cleanup
sokra Sep 14, 2023
964cb34
fixup
sokra Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 25 additions & 21 deletions packages/next/src/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const originModules = [
require.resolve('../../../server/require'),
require.resolve('../../../server/load-components'),
require.resolve('../../../server/next-server'),
require.resolve('../../../server/app-render/use-flight-response'),
require.resolve('../../../compiled/react-server-dom-webpack/client.edge'),
require.resolve(
'../../../compiled/react-server-dom-webpack-experimental/client.edge'
Expand All @@ -20,27 +21,7 @@ const originModules = [

const RUNTIME_NAMES = ['webpack-runtime', 'webpack-api-runtime']

export function deleteAppClientCache() {
// ensure we reset the cache for rsc components
// loaded via react-server-dom-webpack
const reactServerDomModId = require.resolve(
'react-server-dom-webpack/client.edge'
)
const reactServerDomMod = require.cache[reactServerDomModId]

if (reactServerDomMod) {
for (const child of reactServerDomMod.children) {
child.parent = null
delete require.cache[child.id]
}
}
delete require.cache[reactServerDomModId]
}

export function deleteCache(filePath: string) {
// try to clear it from the fs cache
clearManifestCache(filePath)

function deleteFromRequireCache(filePath: string) {
try {
filePath = realpathSync(filePath)
} catch (e) {
Expand All @@ -66,6 +47,29 @@ export function deleteCache(filePath: string) {
return false
}

export function deleteAppClientCache() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving this down makes the diff a bit unnecessarily complicated 🙃

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah. eslint forced me to do that... declare before use... :-|

// ensure we reset the cache for rsc components
// loaded via react-server-dom-webpack
const reactServerDomModId = require.resolve(
'react-server-dom-webpack/client.edge'
)
const reactServerDomMod = require.cache[reactServerDomModId]

if (reactServerDomMod) {
for (const child of [...reactServerDomMod.children]) {
deleteFromRequireCache(child.id)
}
deleteFromRequireCache(reactServerDomModId)
}
}

export function deleteCache(filePath: string) {
// try to clear it from the fs cache
clearManifestCache(filePath)

deleteFromRequireCache(filePath)
}

const PLUGIN_NAME = 'NextJsRequireCacheHotReloader'

// This plugin flushes require.cache after emitting the files. Providing 'hot reloading' of server files.
Expand Down