fix: should generate correct context request with query (#6018)

crates/rspack_core/src/context_module.rs

@@ -131,6 +131,7 @@ pub struct ContextOptions {
   pub exclude: Option<String>,
   pub category: DependencyCategory,
   pub request: String,
+  pub context: String,
   pub namespace_object: ContextNameSpaceObject,
   pub chunk_name: Option<String>,
   pub start: u32,
@@ -141,7 +142,7 @@ impl Display for ContextOptions {
   fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     write!(
       f,
-      "ContextOptions|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}",
+      "ContextOptions|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}|{:?}",
       self.mode,
       self.recursive,
       self.reg_exp,
@@ -150,6 +151,7 @@ impl Display for ContextOptions {
       self.exclude,
       self.category,
       self.request,
+      self.context,
       self.namespace_object,
       self.chunk_name
     )
@@ -165,6 +167,7 @@ impl PartialEq for ContextOptions {
       && self.exclude == other.exclude
       && self.category == other.category
       && self.request == other.request
+      && self.context == other.context
       && self.namespace_object == other.namespace_object
   }
 }
@@ -180,6 +183,7 @@ impl Hash for ContextOptions {
     self.exclude.hash(state);
     self.category.hash(state);
     self.request.hash(state);
+    self.context.hash(state);
     self.namespace_object.hash(state);
   }
 }

crates/rspack_plugin_javascript/src/dependency/context/import_context_dependency.rs

@@ -112,15 +112,17 @@ impl DependencyTemplate for ImportContextDependency {
 
     source.replace(self.callee_start, self.callee_end, &expr, None);
 
-    let context = normalize_context(&self.options.request);
+    let context = normalize_context(&self.options.context);
     let query = parse_resource(&self.options.request).and_then(|data| data.query);
-    if !context.is_empty() {
+    if !context.is_empty() || query.is_some() {
       source.insert(self.callee_end, "(", None);
-      source.insert(
-        self.args_end,
-        format!(".replace('{context}', './')").as_str(),
-        None,
-      );
+      if !context.is_empty() {
+        source.insert(
+          self.args_end,
+          format!(".replace('{context}', './')").as_str(),
+          None,
+        );
+      }
       if let Some(query) = query {
         source.insert(
           self.args_end,

crates/rspack_plugin_javascript/src/parser_plugin/common_js_imports_parse_plugin.rs

@@ -52,6 +52,7 @@ fn create_commonjs_require_context_dependency(
       exclude: None,
       category: DependencyCategory::CommonJS,
       request: format!("{}{}{}", result.context, result.query, result.fragment),
+      context: result.context,
       namespace_object: ContextNameSpaceObject::Unset,
       start: callee_start,
       end: callee_end,
@@ -232,6 +233,7 @@ impl CommonJsImportsParserPlugin {
         exclude: None,
         category: DependencyCategory::Unknown,
         request: ".".to_string(),
+        context: ".".to_string(),
         namespace_object: ContextNameSpaceObject::Unset,
         start: ident.span().real_lo(),
         end: ident.span().real_hi(),

crates/rspack_plugin_javascript/src/parser_plugin/import_meta_context_dependency_parser_plugin.rs

@@ -63,7 +63,8 @@ fn create_import_meta_context_dependency(node: &CallExpr) -> Option<ImportMetaCo
       exclude: None,
       recursive,
       category: DependencyCategory::Esm,
-      request: context,
+      request: context.clone(),
+      context,
       namespace_object: ContextNameSpaceObject::Unset,
       mode,
       start: node.span().real_lo(),
@@ -79,7 +80,8 @@ fn create_import_meta_context_dependency(node: &CallExpr) -> Option<ImportMetaCo
       reg_exp: context_reg_exp(reg, ""),
       reg_str,
       category: DependencyCategory::Esm,
-      request: context,
+      request: context.clone(),
+      context,
       namespace_object: ContextNameSpaceObject::Unset,
       start: node.span().real_lo(),
       end: node.span().real_hi(),

crates/rspack_plugin_javascript/src/parser_plugin/import_parser_plugin.rs

@@ -212,7 +212,8 @@ impl JavascriptParserPlugin for ImportParserPlugin {
               include: None,
               exclude: None,
               category: DependencyCategory::Esm,
-              request: format!("{}{}{}", context, query, fragment),
+              request: format!("{}{}{}", context.clone(), query, fragment),
+              context,
               namespace_object: if parser.build_meta.strict_harmony_module {
                 ContextNameSpaceObject::Strict
               } else {

crates/rspack_plugin_javascript/src/parser_plugin/require_context_dependency_parser_plugin.rs

@@ -89,6 +89,7 @@ impl JavascriptParserPlugin for RequireContextDependencyParserPlugin {
             exclude: None,
             category: DependencyCategory::CommonJS,
             request: request_expr.string().to_string(),
+            context: request_expr.string().to_string(),
             namespace_object: rspack_core::ContextNameSpaceObject::Unset,
             chunk_name: None,
             start: expr.span().real_lo(),

packages/rspack/tests/__snapshots__/StatsTestCases.basictest.js.snap

@@ -94,7 +94,7 @@ exports[`StatsTestCases should print correct stats for ignore-plugin 1`] = `
 "runtime modules 1 module
 ./index.js
 ./locals/en.js
-Xdir/ignore-plugin/locals|Some(\\"\\")|Some(\\"\\")|ContextOptions|Sync|true|Some(RspackRegex(\\"^\\\\\\\\.\\\\\\\\/.*$\\"))|\\"^\\\\\\\\.\\\\\\\\/.*$\\"|None|None|CommonJS|\\"./locals\\"|Unset|None"
+Xdir/ignore-plugin/locals|Some(\\"\\")|Some(\\"\\")|ContextOptions|Sync|true|Some(RspackRegex(\\"^\\\\\\\\.\\\\\\\\/.*$\\"))|\\"^\\\\\\\\.\\\\\\\\/.*$\\"|None|None|CommonJS|\\"./locals\\"|\\"./locals\\"|Unset|None"
 `;
 
 exports[`StatsTestCases should print correct stats for ignore-warning 1`] = `"Rspack compiled successfully"`;

packages/rspack/tests/cases/context/resource-query-prefix/index.js

@@ -0,0 +1,57 @@
+it("should detect query strings in dynamic import in sub directories by concat as a static value", function () {
+  var testFileName = "a";
+
+  return Promise.all([
+    import(`./sub/${testFileName}`).then(({ default: a }) => {
+      expect(a()).toBe("a");
+    }),
+    import(`./sub/${testFileName}`).then(({ default: a }) => {
+      expect(a()).toBe("a");
+    }),
+    import(`./sub/${testFileName}bc`).then(({ default: a }) => {
+      expect(a()).toBe("abc");
+    }),
+    import(`./sub/${testFileName}?queryString`).then(({ default: a }) => {
+      expect(a()).toBe("a?queryString");
+    })
+  ]);
+});
+
+it("should detect query strings in dynamic import in sub directories by template string as a static value", function () {
+  var testFileName = "a";
+
+  return Promise.all([
+    import("./sub/".concat(testFileName)).then(({ default: a }) => {
+      expect(a()).toBe("a");
+    }),
+    import("./sub/".concat(testFileName).concat("")).then(({ default: a }) => {
+      expect(a()).toBe("a");
+    }),
+    import("./sub/".concat(testFileName).concat("bc")).then(({ default: a }) => {
+      expect(a()).toBe("abc");
+    }),
+    import("./sub/".concat(testFileName).concat("?queryString")).then(({ default: a }) => {
+      expect(a()).toBe("a?queryString");
+    })
+  ]);
+});
+
+it("should detect query strings in dynamic import in sub directories by add as a static value", function () {
+  var testFileName = "a";
+
+  return Promise.all([
+    import("./sub/" + testFileName).then(({ default: a }) => {
+      expect(a()).toBe("a");
+    }),
+    import("./sub/" + testFileName + "").then(({ default: a }) => {
+      expect(a()).toBe("a");
+    }),
+    import("./sub/" + testFileName + "bc").then(({ default: a }) => {
+      expect(a()).toBe("abc");
+    }),
+    import("./sub/" + testFileName + "?queryString").then(({ default: a }) => {
+      expect(a()).toBe("a?queryString");
+    })
+  ]);
+});
+

packages/rspack/tests/cases/context/resource-query-prefix/sub/a.js

@@ -0,0 +1,3 @@
+export default function a() {
+	return "a" + __resourceQuery;
+}

packages/rspack/tests/cases/context/resource-query-prefix/sub/abc.js

@@ -0,0 +1,3 @@
+export default function abc() {
+	return "abc" + __resourceQuery;
+}