diff --git a/packages/next/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts b/packages/next/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts index d661c1f3f379e5d..1cd9b47d1df0ff7 100644 --- a/packages/next/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts +++ b/packages/next/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts @@ -10,6 +10,8 @@ type WebpackPluginInstance = webpack.WebpackPluginInstance const originModules = [ require.resolve('../../../server/require'), require.resolve('../../../server/load-components'), + require.resolve('../../../server/next-server'), + require.resolve('../../../compiled/react-server-dom-webpack/client'), ] const RUNTIME_NAMES = ['webpack-runtime', 'webpack-api-runtime'] diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts index c4dae0ce636173f..3b793ba777e35bc 100644 --- a/packages/next/server/dev/next-dev-server.ts +++ b/packages/next/server/dev/next-dev-server.ts @@ -109,6 +109,7 @@ export default class DevServer extends Server { private edgeFunctions?: RoutingItem[] private verifyingTypeScript?: boolean private usingTypeScript?: boolean + private originalFetch?: typeof fetch protected staticPathsWorker?: { [key: string]: any } & { loadStaticPaths: typeof import('./static-paths-worker').loadStaticPaths @@ -149,6 +150,7 @@ export default class DevServer extends Server { constructor(options: Options) { super({ ...options, dev: true }) + this.persistPatchedGlobals() this.renderOpts.dev = true ;(this.renderOpts as any).ErrorDebug = ReactDevOverlay this.devReady = new Promise((resolve) => { @@ -1385,6 +1387,14 @@ export default class DevServer extends Server { return this.hotReloader!.ensurePage({ page: pathname, clientOnly: false }) } + private persistPatchedGlobals(): void { + this.originalFetch = global.fetch + } + + private restorePatchedGlobals(): void { + global.fetch = this.originalFetch! + } + protected async findPageComponents({ pathname, query, @@ -1418,6 +1428,11 @@ export default class DevServer extends Server { this.serverCSSManifest = super.getServerCSSManifest() } this.fontLoaderManifest = super.getFontLoaderManifest() + // before we re-evaluate a route module, we want to restore globals that might + // have been patched previously to their original state so that we don't + // patch on top of the previous patch, which would keep the context of the previous + // patched global in memory, creating a memory leak. + this.restorePatchedGlobals() return super.findPageComponents({ pathname, query, params, isAppPath }) } catch (err) {