Reapply "Turbopack: Register react refresh exports in module factory (#…

…8191)" (#8214)

This reverts commit 63c39e6.

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/base/runtime-base.ts

@@ -29,6 +29,7 @@ declare var $RefreshInterceptModuleExecution$:
 type RefreshContext = {
   register: RefreshRuntimeGlobals["$RefreshReg$"];
   signature: RefreshRuntimeGlobals["$RefreshSig$"];
+  registerExports: typeof registerExportsAndSetupBoundaryForReactRefresh;
 };
 
 type RefreshHelpers = RefreshRuntimeGlobals["$RefreshHelpers$"];
@@ -403,16 +404,8 @@ function runModuleExecutionHooks(
     executeModule({
       register: globalThis.$RefreshReg$,
       signature: globalThis.$RefreshSig$,
+      registerExports: registerExportsAndSetupBoundaryForReactRefresh,
     });
-
-    if ("$RefreshHelpers$" in globalThis) {
-      // This pattern can also be used to register the exports of
-      // a module with the React Refresh runtime.
-      registerExportsAndSetupBoundaryForReactRefresh(
-        module,
-        globalThis.$RefreshHelpers$
-      );
-    }
   } catch (e) {
     throw e;
   } finally {

crates/turbopack-ecmascript/src/chunk/item.rs

@@ -108,7 +108,7 @@ impl EcmascriptChunkItemContent {
         if this.options.refresh {
             args.push("k: __turbopack_refresh__");
         }
-        if this.options.module {
+        if this.options.module || this.options.refresh {
             args.push("m: module");
         }
         if this.options.exports {

crates/turbopack-ecmascript/src/transform/mod.rs

@@ -8,16 +8,15 @@ use swc_core::{
     common::{chain, collections::AHashMap, comments::Comments, util::take::Take, Mark, SourceMap},
     ecma::{
         ast::{Module, ModuleItem, Program, Script},
-        preset_env::{
-            Targets, {self},
-        },
+        preset_env::{self, Targets},
         transforms::{
             base::{feature::FeatureFlag, helpers::inject_helpers, Assumptions},
             optimization::inline_globals2,
             react::react,
         },
         visit::{FoldWith, VisitMutWith},
     },
+    quote,
 };
 use turbo_tasks::{ValueDefault, Vc};
 use turbo_tasks_fs::FileSystemPath;
@@ -198,6 +197,22 @@ impl EcmascriptInputTransform {
                     top_level_mark,
                     unresolved_mark,
                 ));
+
+                if *refresh {
+                    let stmt = quote!(
+                        "\n__turbopack_refresh__.registerExports(module, \
+                         globalThis.$RefreshHelpers$); }\n" as Stmt
+                    );
+
+                    match program {
+                        Program::Module(module) => {
+                            module.body.push(ModuleItem::Stmt(stmt));
+                        }
+                        Program::Script(script) => {
+                            script.body.push(stmt);
+                        }
+                    }
+                }
             }
             EcmascriptInputTransform::CommonJs => {
                 // Explicit type annotation to ensure that we don't duplicate transforms in the