From 6b1f79b1df83039e3d278abbacea70e95cac1a30 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Wed, 27 Aug 2025 17:31:50 +0200 Subject: [PATCH 1/7] Turbopack: Change eager import to lazy import for loader_tree --- crates/next-core/src/base_loader_tree.rs | 4 ++-- packages/next/src/server/next-server.ts | 7 ------- test/development/acceptance-app/hydration-error.test.ts | 1 - .../cache-components-errors.test.ts | 5 ++++- .../app-dir/server-source-maps/server-source-maps.test.ts | 5 +++-- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/crates/next-core/src/base_loader_tree.rs b/crates/next-core/src/base_loader_tree.rs index 43ddd007e49bc..319b5625313f4 100644 --- a/crates/next-core/src/base_loader_tree.rs +++ b/crates/next-core/src/base_loader_tree.rs @@ -99,7 +99,7 @@ impl BaseLoaderTreeBuilder { self.imports.push( formatdoc!( r#" - import * as {} from "MODULE_{}"; + const {} = () => import("MODULE_{}"); "#, identifier, i @@ -118,7 +118,7 @@ impl BaseLoaderTreeBuilder { let module_path = module.ident().path().to_string().await?; Ok(format!( - "[() => {identifier}, {path}]", + "[{identifier}, {path}]", path = StringifyJs(&module_path), )) } diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts index 77f3daf4326c6..1d795882c6e28 100644 --- a/packages/next/src/server/next-server.ts +++ b/packages/next/src/server/next-server.ts @@ -387,13 +387,6 @@ export default class NextNodeServer extends BaseServer< // otherwise if the fetch is patched by user code, we will be patching it // too late and there won't be any caching behaviors ComponentMod.patchFetch() - - const webpackRequire = ComponentMod.__next_app__.require - if (webpackRequire?.m) { - for (const id of Object.keys(webpackRequire.m)) { - await webpackRequire(id) - } - } } catch (_err) { // Intentionally ignored because this is a preload step. } diff --git a/test/development/acceptance-app/hydration-error.test.ts b/test/development/acceptance-app/hydration-error.test.ts index a327cb01d329c..01ee69a19bd0e 100644 --- a/test/development/acceptance-app/hydration-error.test.ts +++ b/test/development/acceptance-app/hydration-error.test.ts @@ -228,7 +228,6 @@ describe('Error overlay for hydration errors in App router', () => {