fix: escape node.__dirname (#8172)

web-infra-dev · Oct 20, 2024 · e616982 · e616982 · rspack-bot · Oct 20, 2024
1 parent 539b10f
commit e616982
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/node_stuff_plugin.rs b/crates/rspack_plugin_javascript/src/parser_plugin/node_stuff_plugin.rs
@@ -83,7 +83,9 @@ impl JavascriptParserPlugin for NodeStuffPlugin {
           .push(Box::new(ConstDependency::new(
             ident.span.real_lo(),
             ident.span.real_hi(),
-            format!("'{dirname}'").into(),
+            serde_json::to_string(&dirname)
+              .expect("should render dirname")
+              .into(),
             None,
           )));
         return Some(true);

diff --git a/packages/rspack-test-tools/tests/configCases/parsing/rspack-issue-8170/dir1/dir2/file.js b/packages/rspack-test-tools/tests/configCases/parsing/rspack-issue-8170/dir1/dir2/file.js
@@ -0,0 +1 @@
+exports.dirname = __dirname;
diff --git a/packages/rspack-test-tools/tests/configCases/parsing/rspack-issue-8170/index.js b/packages/rspack-test-tools/tests/configCases/parsing/rspack-issue-8170/index.js
@@ -0,0 +1,3 @@
+it("should define __dirname", function() {
+	expect(require("./dir1/dir2/file").dirname).toMatch(/^dir1[\\\/]dir2$/);
+});
diff --git a/packages/rspack-test-tools/tests/configCases/parsing/rspack-issue-8170/rspack.config.js b/packages/rspack-test-tools/tests/configCases/parsing/rspack-issue-8170/rspack.config.js
@@ -0,0 +1,6 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	node: {
+		__dirname: true
+	}
+};
Name	Base (2024-10-20 539b10f)	Current	Change
10000_development-mode + exec	2.12 s ± 25 ms	2.11 s ± 26 ms	-0.31 %
10000_development-mode_hmr + exec	668 ms ± 9.3 ms	667 ms ± 15 ms	-0.06 %
10000_production-mode + exec	2.66 s ± 24 ms	2.68 s ± 58 ms	+0.56 %
arco-pro_development-mode + exec	1.78 s ± 57 ms	1.78 s ± 63 ms	-0.39 %
arco-pro_development-mode_hmr + exec	426 ms ± 2.3 ms	426 ms ± 2.6 ms	-0.03 %
arco-pro_production-mode + exec	3.23 s ± 79 ms	3.2 s ± 85 ms	-0.73 %
arco-pro_production-mode_generate-package-json-webpack-plugin + exec	3.25 s ± 71 ms	3.31 s ± 44 ms	+1.65 %
threejs_development-mode_10x + exec	1.6 s ± 18 ms	1.61 s ± 22 ms	+0.62 %
threejs_development-mode_10x_hmr + exec	763 ms ± 10 ms	756 ms ± 11 ms	-0.96 %
threejs_production-mode_10x + exec	4.99 s ± 36 ms	4.98 s ± 35 ms	-0.20 %
suite	result
modernjs	✅ success
_selftest	✅ success
rspress	✅ success
rslib	❌ failure
rsbuild	✅ success
examples	✅ success
devserver	✅ success