fix: JsModuleInfo

Author: SyMind

Cargo.lock

@@ -799,7 +799,7 @@ export interface JsModuleDescriptor {
 
 export interface JsModuleInfo {
   moduleId: string
-  isAsync: boolean
+  async: boolean
 }
 
 export interface JsModulePair {

crates/node_binding/binding.d.ts

@@ -7,14 +7,14 @@ use rustc_hash::FxHashMap as HashMap;
 #[napi(object, object_from_js = false)]
 pub struct JsModuleInfo {
   pub module_id: String,
-  pub is_async: bool,
+  pub r#async: bool,
 }
 
 impl From<ModuleInfo> for JsModuleInfo {
   fn from(value: ModuleInfo) -> Self {
     JsModuleInfo {
       module_id: value.module_id,
-      is_async: value.is_async,
+      r#async: value.r#async,
     }
   }
 }

crates/node_binding/src/raw_options/raw_builtins/raw_flight_client_entry_plugin.rs

@@ -29,6 +29,7 @@ tokio       = { workspace = true, features = ["rt"] }
 tracing     = { workspace = true }
 futures     = { workspace = true }
 querystring = { version = "1.1.0" }
+form_urlencoded = "1.2.1"
 sugar_path= { workspace = true }
 serde_urlencoded = "0.7.1"
 lazy-regex               = "3.4.1"

crates/rspack_plugin_next_flight_client_entry/Cargo.toml

@@ -54,7 +54,7 @@ type Actions = HashMap<String, Action>;
 #[derive(Clone, Serialize)]
 pub struct ModuleInfo {
   pub module_id: String,
-  pub is_async: bool,
+  pub r#async: bool,
 }
 
 #[derive(Default, Clone)]
@@ -449,12 +449,6 @@ pub struct Manifest {
   pub edge: Actions,
 }
 
-#[derive(Serialize)]
-pub struct LoaderParams {
-  pub modules: String,
-  pub server: bool,
-}
-
 #[plugin]
 #[derive(Debug)]
 pub struct FlightClientEntryPlugin {
@@ -638,6 +632,7 @@ impl FlightClientEntryPlugin {
 
     let mut should_invalidate = false;
 
+    // client_imports key 缺少
     let mut modules: Vec<_> = client_imports
       .keys()
       .map(|client_import_path| {
@@ -658,61 +653,43 @@ impl FlightClientEntryPlugin {
     // server is using the ESM build (when using the Edge runtime), we need to
     // replace them.
     let client_browser_loader = {
-      let modules = if self.is_edge_server {
-        modules
-          .iter()
-          .map(|(request, ids)| {
-            serde_json::to_string(&json!({
-                "request": request.replace(
-                    r"/next/dist/esm/",
-                    &format!("/next/dist/{}", std::path::MAIN_SEPARATOR)
-                ),
-                "ids": ids
-            }))
-            .unwrap()
-          })
-          .join(",")
-      } else {
-        modules
-          .iter()
-          .map(|(request, ids)| {
-            serde_json::to_string(&json!({
-                "request": request,
-                "ids": ids
-            }))
-            .unwrap()
-          })
-          .join(",")
-      };
-      let params = LoaderParams {
-        modules,
-        server: false,
-      };
-      format!(
-        "next-flight-client-entry-loader?{}!",
-        serde_urlencoded::to_string(params).unwrap()
-      )
-    };
-
-    let client_server_loader = {
-      let modules = modules
-        .iter()
-        .map(|(request, ids)| {
+      let mut serializer = form_urlencoded::Serializer::new(String::new());
+      for (request, ids) in &modules {
+        let module_json = if self.is_edge_server {
+          serde_json::to_string(&json!({
+              "request": request.replace(
+                  r"/next/dist/esm/",
+                  &format!("/next/dist/{}", std::path::MAIN_SEPARATOR)
+              ),
+              "ids": ids
+          }))
+          .unwrap()
+        } else {
           serde_json::to_string(&json!({
               "request": request,
               "ids": ids
           }))
           .unwrap()
-        })
-        .join(",");
-      let params = LoaderParams {
-        modules,
-        server: true,
-      };
-      format!(
-        "next-flight-client-entry-loader?{}!",
-        serde_urlencoded::to_string(params).unwrap()
-      )
+        };
+        serializer.append_pair("modules", &module_json);
+      }
+      serializer.append_pair("server", "false");
+
+      format!("next-flight-client-entry-loader?{}!", serializer.finish())
+    };
+
+    let client_server_loader = {
+      let mut serializer = form_urlencoded::Serializer::new(String::new());
+      for (request, ids) in &modules {
+        let module_json = serde_json::to_string(&json!({
+            "request": request,
+            "ids": ids
+        }))
+        .unwrap();
+        serializer.append_pair("modules", &module_json);
+      }
+      serializer.append_pair("server", "true");
+      format!("next-flight-client-entry-loader?{}!", serializer.finish())
     };
 
     // Add for the client compilation
@@ -825,7 +802,7 @@ impl FlightClientEntryPlugin {
           bundle_path.to_string(),
           ModuleInfo {
             module_id: "".to_string(), // TODO: What's the meaning of this?
-            is_async: false,
+            r#async: false,
           },
         );
 
@@ -1060,6 +1037,7 @@ impl FlightClientEntryPlugin {
           // compiler: compiler.clone(),
           // compilation: compilation.clone(),
           entry_name: name.to_string(),
+          // client_component_imports keys 缺少很多
           client_imports: component_info.client_component_imports,
           bundle_path: bundle_path.clone(),
           absolute_page_path: entry_request.to_string_lossy().to_string(),
@@ -1293,7 +1271,7 @@ impl FlightClientEntryPlugin {
               .or_insert_with(Default::default);
             let module_info = ModuleInfo {
               module_id: module_id.to_string(),
-              is_async: ModuleGraph::is_async(&compilation, module_identifier),
+              r#async: ModuleGraph::is_async(&compilation, module_identifier),
             };
             if from_client {
               module_pair.client = Some(module_info);
@@ -1458,7 +1436,7 @@ async fn after_emit(&self, compilation: &mut Compilation) -> Result<()> {
 
           let module_info = ModuleInfo {
             module_id: module_id.to_string(),
-            is_async: ModuleGraph::is_async(&compilation, &module.identifier()),
+            r#async: ModuleGraph::is_async(&compilation, &module.identifier()),
           };
 
           if self.is_edge_server {
@@ -1492,7 +1470,7 @@ async fn after_emit(&self, compilation: &mut Compilation) -> Result<()> {
 
         let module_info = ModuleInfo {
           module_id: module_id.to_string(),
-          is_async: ModuleGraph::is_async(&compilation, &module.identifier()),
+          r#async: ModuleGraph::is_async(&compilation, &module.identifier()),
         };
 
         if self.is_edge_server {

crates/rspack_plugin_next_flight_client_entry/src/lib.rs

@@ -58,5 +58,5 @@ pub fn is_client_component_entry_module(module: &dyn Module) -> bool {
 // Determine if the whole module is client action, 'use server' in nested closure in the client module
 fn is_action_client_layer_module(module: &dyn Module) -> bool {
   let build_info = get_module_build_info(module);
-  build_info.rsc.r#type == RSC_MODULE_TYPES.client
+  build_info.rsc.actions.is_some() && build_info.rsc.r#type == RSC_MODULE_TYPES.client
 }