fix: the value of this.sourceMap in LoaderContext is incorrect when u…

…sing SourceMapDevToolPlugin
web-infra-dev · Sep 24, 2024 · 077e3c5 · 077e3c5
1 parent 23d6bf3
commit 077e3c5
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 16 deletions.
diff --git a/crates/node_binding/binding.d.ts b/crates/node_binding/binding.d.ts
@@ -672,6 +672,7 @@ export interface JsModule {
   factoryMeta?: JsFactoryMeta
   type: string
   layer?: string
+  useSourceMap?: boolean
 }
 
 export interface JsModuleDescriptor {

diff --git a/crates/rspack_binding_values/src/module.rs b/crates/rspack_binding_values/src/module.rs
@@ -328,6 +328,7 @@ pub struct JsModule {
   pub factory_meta: Option<JsFactoryMeta>,
   pub r#type: String,
   pub layer: Option<String>,
+  pub use_source_map: Option<bool>,
 }
 
 pub trait ToJsModule {
@@ -365,20 +366,17 @@ impl ToJsModule for dyn Module {
           .map(|factory_meta| JsFactoryMeta {
             side_effect_free: factory_meta.side_effect_free,
           }),
+        ..Default::default()
       })
       .or_else(|_| {
         self.try_as_raw_module().map(|_| JsModule {
           context: context(),
           r#type: module_type(),
           layer: module_layer(),
           original_source: original_source(),
-          resource: None,
           module_identifier: module_identifier(),
           name_for_condition: name_for_condition(),
-          raw_request: None,
-          user_request: None,
-          request: None,
-          factory_meta: None,
+          ..Default::default()
         })
       })
       .or_else(|_| {
@@ -387,13 +385,9 @@ impl ToJsModule for dyn Module {
           original_source: original_source(),
           r#type: module_type(),
           layer: module_layer(),
-          resource: None,
           module_identifier: module_identifier(),
           name_for_condition: name_for_condition(),
-          raw_request: None,
-          user_request: None,
-          request: None,
-          factory_meta: None,
+          ..Default::default()
         })
       })
       .or_else(|_| {
@@ -402,13 +396,9 @@ impl ToJsModule for dyn Module {
           original_source: original_source(),
           r#type: module_type(),
           layer: module_layer(),
-          resource: None,
           module_identifier: module_identifier(),
           name_for_condition: name_for_condition(),
-          raw_request: None,
-          user_request: None,
-          request: None,
-          factory_meta: None,
+          ..Default::default()
         })
       })
       .or_else(|_| {
@@ -440,6 +430,7 @@ impl ToJsModule for CompilerModuleContext {
       factory_meta: self.factory_meta.as_ref().map(|fm| JsFactoryMeta {
         side_effect_free: fm.side_effect_free,
       }),
+      use_source_map: Some(self.use_source_map),
     };
     Ok(module)
   }

diff --git a/crates/rspack_core/src/loader/loader_runner.rs b/crates/rspack_core/src/loader/loader_runner.rs
@@ -21,6 +21,7 @@ pub struct CompilerModuleContext {
   pub user_request: Option<String>,
   pub raw_request: Option<String>,
   pub factory_meta: Option<FactoryMeta>,
+  pub use_source_map: bool,
 }
 
 impl CompilerModuleContext {
@@ -40,6 +41,7 @@ impl CompilerModuleContext {
       factory_meta: normal_module
         .and_then(|normal_module| normal_module.factory_meta())
         .map(|factory_meta| factory_meta.to_owned()),
+      use_source_map: module.get_source_map_kind().source_map(),
     }
   }
 }

diff --git a/packages/rspack-test-tools/tests/configCases/source-map/custom-loader/index.js b/packages/rspack-test-tools/tests/configCases/source-map/custom-loader/index.js
@@ -0,0 +1,3 @@
+it("should include a.ts in SourceMap", function() {
+	expect(__SOURCEMAP__).toBe(true);
+});
diff --git a/packages/rspack-test-tools/tests/configCases/source-map/custom-loader/loader.js b/packages/rspack-test-tools/tests/configCases/source-map/custom-loader/loader.js
@@ -0,0 +1,3 @@
+module.exports = function (content) {
+	return content.replace("__SOURCEMAP__", this.sourceMap);
+};
diff --git a/packages/rspack-test-tools/tests/configCases/source-map/custom-loader/rspack.config.js b/packages/rspack-test-tools/tests/configCases/source-map/custom-loader/rspack.config.js
@@ -0,0 +1,16 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	devtool: false,
+	plugins: [
+		compiler => {
+			new compiler.webpack.SourceMapDevToolPlugin({}).apply(compiler);
+		}
+	],
+	module: {
+		rules: [
+			{
+				loader: "./loader.js"
+			}
+		]
+	}
+};
diff --git a/packages/rspack/src/loader-runner/index.ts b/packages/rspack/src/loader-runner/index.ts
@@ -555,7 +555,7 @@ export async function runLoaders(
 	loaderContext.version = 2;
 	loaderContext.sourceMap = compiler.options.devtool
 		? isUseSourceMap(compiler.options.devtool)
-		: false;
+		: context._module.useSourceMap ?? false;
 	loaderContext.mode = compiler.options.mode;
 	Object.assign(loaderContext, compiler.options.loader);