fix: update

Author: LingyuCoder

crates/node_binding/binding.d.ts

@@ -355,8 +355,8 @@ export interface JsHooks {
   finishMake: (compilation: JsCompilation) => void
   buildModule: (module: JsModule) => void
   chunkAsset: (asset: JsChunkAssetArgs) => void
-  contextModuleFactoryBeforeResolve: (data: JsBeforeResolveArgs) => Promise<boolean | void>
   afterResolve: (data: AfterResolveData) => Promise<(boolean | void | AfterResolveCreateData)[]>
+  contextModuleFactoryBeforeResolve: (data: JsBeforeResolveArgs) => Promise<boolean | void>
   contextModuleFactoryAfterResolve: (data: AfterResolveData) => Promise<boolean | void>
   normalModuleFactoryCreateModule: (data: CreateModuleData) => void
   normalModuleFactoryResolveForScheme: (data: JsResolveForSchemeInput) => Promise<JsResolveForSchemeResult>

crates/rspack_binding_values/src/hooks.rs

@@ -2,8 +2,8 @@ use napi_derive::napi;
 use rspack_napi::threadsafe_function::ThreadsafeFunction;
 
 use crate::{
-  AfterResolveCreateData, AfterResolveData, BeforeResolveData, CreateModuleData,
-  JsAssetEmittedArgs, JsChunkAssetArgs, JsCompilation, JsExecuteModuleArg, JsModule,
+  AfterResolveCreateData, AfterResolveData, CreateModuleData, JsAssetEmittedArgs,
+  JsBeforeResolveArgs, JsChunkAssetArgs, JsCompilation, JsExecuteModuleArg, JsModule,
   JsResolveForSchemeInput, JsResolveForSchemeResult, JsRuntimeModule, JsRuntimeModuleArg,
 };
 
@@ -41,15 +41,13 @@ pub struct JsHooks {
   pub build_module: ThreadsafeFunction<JsModule, ()>, // TODO
   #[napi(ts_type = "(asset: JsChunkAssetArgs) => void")]
   pub chunk_asset: ThreadsafeFunction<JsChunkAssetArgs, ()>,
-  #[napi(ts_type = "(data: JsBeforeResolveArgs) => Promise<boolean | void>")]
-  pub context_module_factory_before_resolve: ThreadsafeFunction<JsBeforeResolveArgs, Option<bool>>,
   #[napi(
     ts_type = "(data: AfterResolveData) => Promise<(boolean | void | AfterResolveCreateData)[]>"
   )]
   pub after_resolve:
     ThreadsafeFunction<AfterResolveData, (Option<bool>, Option<AfterResolveCreateData>)>,
-  #[napi(ts_type = "(data: BeforeResolveData) => Promise<boolean | void>")]
-  pub context_module_factory_before_resolve: ThreadsafeFunction<BeforeResolveData, Option<bool>>,
+  #[napi(ts_type = "(data: JsBeforeResolveArgs) => Promise<boolean | void>")]
+  pub context_module_factory_before_resolve: ThreadsafeFunction<JsBeforeResolveArgs, Option<bool>>,
   #[napi(ts_type = "(data: AfterResolveData) => Promise<boolean | void>")]
   pub context_module_factory_after_resolve: ThreadsafeFunction<AfterResolveData, Option<bool>>,
   #[napi(ts_type = "(data: CreateModuleData) => void")]

crates/rspack_binding_values/src/normal_module_factory.rs

@@ -1,6 +1,7 @@
 use napi_derive::napi;
 use rspack_core::{
-  BeforeResolveArgs, NormalModuleAfterResolveArgs, NormalModuleCreateData, ResourceData,
+  BeforeResolveArgs, NormalModuleAfterResolveArgs, NormalModuleAfterResolveCreateData,
+  NormalModuleCreateData, ResourceData,
 };
 
 #[napi(object)]

crates/rspack_core/src/normal_module_factory.rs

@@ -17,9 +17,9 @@ use crate::{
   FactorizeArgs, FactoryMeta, FuncUseCtx, GeneratorOptions, ModuleExt, ModuleFactory,
   ModuleFactoryCreateData, ModuleFactoryResult, ModuleIdentifier, ModuleRule, ModuleRuleEnforce,
   ModuleRuleUse, ModuleRuleUseLoader, ModuleType, NormalModule, NormalModuleAfterResolveArgs,
-  NormalModuleCreateData, ParserOptions, RawModule, Resolve, ResolveArgs,
-  ResolveOptionsWithDependencyType, ResolveResult, Resolver, ResolverFactory, ResourceData,
-  ResourceParsedData, SharedPluginDriver,
+  NormalModuleAfterResolveCreateData, NormalModuleCreateData, ParserOptions, RawModule, Resolve,
+  ResolveArgs, ResolveOptionsWithDependencyType, ResolveResult, Resolver, ResolverFactory,
+  ResourceData, ResourceParsedData, SharedPluginDriver,
 };
 
 pub type NormalModuleFactoryBeforeResolveHook = AsyncSeriesBailHook<BeforeResolveArgs, bool>;