Turbopack: Change eager import to lazy import for loader_tree

timneutkens · timneutkens · commit e773c31047e5 · 2025-08-28T09:09:46.000Z
diff --git 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
@@ -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
@@ -228,7 +228,6 @@ describe('Error overlay for hydration errors in App router', () => {
                              <SegmentTrieNode>
                              <script>
                              <script>
-                             <script>
                              <ClientSegmentRoot Component={function Root} slots={{...}} params={{}}>
                                <Root params={Promise}>
                                  <html
diff --git a/test/e2e/app-dir/cache-components-errors/cache-components-errors.test.ts b/test/e2e/app-dir/cache-components-errors/cache-components-errors.test.ts
@@ -2773,6 +2773,7 @@ describe('Cache Components Errors', () => {
                  "Error: "use cache: private" must not be used within \`unstable_cache()\`.
                      at __TURBOPACK__module__evaluation__ (bundler:///app/use-cache-private-in-unstable-cache/page.tsx:21:38)
                      at a (<next-dist-dir>)
+                     at b (<next-dist-dir>)
                    19 | }
                    20 |
                  > 21 | const getCachedData = unstable_cache(async () => {
@@ -2928,6 +2929,7 @@ describe('Cache Components Errors', () => {
                  "Error: "use cache: private" must not be used within "use cache". It can only be nested inside of another "use cache: private".
                      at __TURBOPACK__module__evaluation__ (bundler:///app/use-cache-private-in-use-cache/page.tsx:15:1)
                      at a (<next-dist-dir>)
+                     at b (<next-dist-dir>)
                    13 | }
                    14 |
                  > 15 | async function Private() {
@@ -2937,7 +2939,8 @@ describe('Cache Components Errors', () => {
                    18 |   return <p>Private</p>
                  Error: "use cache: private" must not be used within "use cache". It can only be nested inside of another "use cache: private".
                      at __TURBOPACK__module__evaluation__ (bundler:///app/use-cache-private-in-use-cache/page.tsx:15:1)
-                     at b (<next-dist-dir>)
+                     at c (<next-dist-dir>)
+                     at d (<next-dist-dir>)
                    13 | }
                    14 |
                  > 15 | async function Private() {
diff --git a/test/e2e/app-dir/server-source-maps/server-source-maps.test.ts b/test/e2e/app-dir/server-source-maps/server-source-maps.test.ts
@@ -485,6 +485,8 @@ describe('app-dir - server source maps', () => {
              "{module evaluation} app/module-evaluation/page.js (1:1)",
              "{module evaluation} app/module-evaluation/page.js (6:1)",
              "<FIXME-next-dist-dir>",
+             "Function.all <anonymous>",
+             "Function.all <anonymous>",
              "Page <anonymous>",
            ],
          }
@@ -515,9 +517,8 @@ describe('app-dir - server source maps', () => {
         expect(normalizeCliOutput(next.cliOutput)).toContain(
           '' +
             '\nError: module-evaluation' +
-            '\n    at __TURBOPACK__module__evaluation__ (bundler:///app/module-evaluation/module.js:1:22)' +
             // TODO(veil): Turbopack internals. Feel free to update. Tracked in https://linear.app/vercel/issue/NEXT-4362
-            '\n    at Object.<anonymous>'
+            '\n    at __TURBOPACK__module__evaluation__ (bundler:///app/module-evaluation/module.js:1:22)'
         )
         expect(normalizeCliOutput(next.cliOutput)).toContain(
           '' +
