fix: removal of unecessary underscore logic in escape job #8735

web-infra-dev · Jan 7, 2025 · 116cba0 · 116cba0
1 parent eb7595d
commit 116cba0
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 133 deletions.
diff --git a/crates/rspack_plugin_css/src/dependency/local_ident.rs b/crates/rspack_plugin_css/src/dependency/local_ident.rs
@@ -75,12 +75,7 @@ impl DependencyTemplate for CssLocalIdentDependency {
     source: &mut TemplateReplaceSource,
     _code_generatable_context: &mut TemplateContext,
   ) {
-    source.replace(
-      self.start,
-      self.end,
-      &escape_css(&self.local_ident, false),
-      None,
-    );
+    source.replace(self.start, self.end, &escape_css(&self.local_ident), None);
   }
 
   fn dependency_id(&self) -> Option<DependencyId> {

diff --git a/crates/rspack_plugin_css/src/dependency/self_reference.rs b/crates/rspack_plugin_css/src/dependency/self_reference.rs
@@ -87,7 +87,7 @@ impl DependencyTemplate for CssSelfReferenceLocalIdentDependency {
       source.replace(
         replace.start,
         replace.end,
-        &escape_css(&replace.local_ident, false),
+        &escape_css(&replace.local_ident),
         None,
       );
     }

diff --git a/crates/rspack_plugin_css/src/utils.rs b/crates/rspack_plugin_css/src/utils.rs
@@ -29,8 +29,6 @@ use crate::parser_and_generator::CssExport;
 pub const AUTO_PUBLIC_PATH_PLACEHOLDER: &str = "__RSPACK_PLUGIN_CSS_AUTO_PUBLIC_PATH__";
 pub static LEADING_DIGIT_REGEX: LazyLock<Regex> =
   LazyLock::new(|| Regex::new(r"^((-?[0-9])|--)").expect("Invalid regexp"));
-pub static PREFIX_UNDERSCORE_REGEX: LazyLock<Regex> =
-  LazyLock::new(|| Regex::new(r"^[0-9_-]").expect("Invalid regexp"));
 
 #[derive(Debug, Clone)]
 pub struct LocalIdentOptions<'a> {
@@ -116,16 +114,10 @@ impl LocalIdentNameRenderOptions<'_> {
 static UNESCAPE_CSS_IDENT_REGEX: LazyLock<Regex> =
   LazyLock::new(|| Regex::new(r"([^a-zA-Z0-9_\u0081-\uffff-])").expect("invalid regex"));
 
-pub fn escape_css(s: &str, omit_optional_underscore: bool) -> Cow<str> {
+pub fn escape_css(s: &str) -> Cow<str> {
   let escaped = UNESCAPE_CSS_IDENT_REGEX.replace_all(s, |s: &Captures| format!("\\{}", &s[0]));
-  if !omit_optional_underscore
-    && !escaped.starts_with("--")
-    && PREFIX_UNDERSCORE_REGEX.is_match(&escaped)
-  {
-    format!("_{}", escaped).into()
-  } else {
-    escaped
-  }
+
+  escaped
 }
 
 pub(crate) fn export_locals_convention(

diff --git a/packages/rspack-test-tools/tests/__snapshots__/Config.test.js.snap b/packages/rspack-test-tools/tests/__snapshots__/Config.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`config config/builtin-lightningcss-loader/basic-include exported tests should transform css correct 1`] = `
 body {
-  & ._-_6ec1c834ac8cc99e-used {
+  & .-_6ec1c834ac8cc99e-used {
     color: #00f;
   }
 }