refactor(es/minifier): Remove mangle.safari10 (#8857)

**Related issue:** - Closes #8837
swc-project · Apr 16, 2024 · df2e056 · df2e056
1 parent 0af2010
commit df2e056
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 43 deletions.
diff --git a/crates/swc_ecma_minifier/benches/full.rs b/crates/swc_ecma_minifier/benches/full.rs
@@ -83,7 +83,6 @@ fn run(src: &str) {
                         keep_fn_names: false,
                         keep_private_props: false,
                         ie8: false,
-                        safari10: false,
                         ..Default::default()
                     }),
                     wrap: false,

diff --git a/crates/swc_ecma_minifier/src/option/mod.rs b/crates/swc_ecma_minifier/src/option/mod.rs
@@ -75,6 +75,7 @@ pub struct MangleOptions {
     #[serde(default, alias = "ie8")]
     pub ie8: bool,
 
+    #[deprecated = "This field is no longer required to work around bugs in Safari 10."]
     #[serde(default, alias = "safari10")]
     pub safari10: bool,
 

diff --git a/crates/swc_ecma_minifier/src/pass/mangle_names/mod.rs b/crates/swc_ecma_minifier/src/pass/mangle_names/mod.rs
@@ -27,9 +27,9 @@ pub(crate) fn name_mangler(
         renamer(
             swc_ecma_transforms_base::hygiene::Config {
                 keep_class_names: options.keep_class_names,
-                safari_10: options.safari10,
                 top_level_mark,
                 ignore_eval: options.eval,
+                ..Default::default()
             },
             ManglingRenamer { chars, preserved }
         )

diff --git a/crates/swc_ecma_minifier/tests/terser/compress/try_catch/broken_safari_catch_scope/output.js b/crates/swc_ecma_minifier/tests/terser/compress/try_catch/broken_safari_catch_scope/output.js
@@ -6,8 +6,8 @@ new class {
             throw {
                 m: "PASS"
             };
-        } catch ({ m: B  }) {
-            console.log(B);
+        } catch ({ m: A }) {
+            console.log(A);
         }
     }
 }().f();
diff --git a/..._ecma_minifier/tests/terser/compress/try_catch/broken_safari_catch_scope_caveat/output.js b/..._ecma_minifier/tests/terser/compress/try_catch/broken_safari_catch_scope_caveat/output.js
@@ -6,8 +6,8 @@ new class {
             throw {
                 m: "PASS"
             };
-        } catch ({ m: B  }) {
-            console.log(B);
+        } catch ({ m: A  }) {
+            console.log(A);
         }
     }
 }().f();
diff --git a/crates/swc_ecma_transforms_base/src/hygiene/mod.rs b/crates/swc_ecma_transforms_base/src/hygiene/mod.rs
@@ -14,6 +14,7 @@ pub struct Config {
     pub keep_class_names: bool,
 
     /// If true, the bug of safari 10 is avoided.
+    #[deprecated = "This field is no longer required to work around bugs in Safari 10."]
     pub safari_10: bool,
 
     /// The marks derived from this marks will treated as `specified by user`

diff --git a/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs b/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs
@@ -9,7 +9,6 @@ pub(super) mod scope;
 
 #[derive(Debug, Default)]
 pub(super) struct Analyzer {
-    pub safari_10: bool,
     /// If `eval` exists for the current scope, we only rename synthesized
     /// identifiers.
     pub has_eval: bool,
@@ -50,7 +49,6 @@ impl Analyzer {
     {
         {
             let mut v = Analyzer {
-                safari_10: self.safari_10,
                 has_eval: self.has_eval,
                 top_level_mark: self.top_level_mark,
 
@@ -153,43 +151,20 @@ impl Visit for Analyzer {
     }
 
     fn visit_catch_clause(&mut self, n: &CatchClause) {
-        if self.safari_10 {
-            let old_is_pat_decl = self.is_pat_decl;
-            let old_in_catch_params = self.in_catch_params;
-
-            self.is_pat_decl = true;
-            self.in_catch_params = true;
-            n.param.visit_with(self);
-
-            self.in_catch_params = old_in_catch_params;
-            self.is_pat_decl = old_is_pat_decl;
-
-            self.with_scope(ScopeKind::Block, |v| {
-                let old = v.is_pat_decl;
-                let old_in_catch_params = v.in_catch_params;
-
-                v.is_pat_decl = false;
-                n.body.visit_children_with(v);
-
-                v.is_pat_decl = old;
-                v.in_catch_params = old_in_catch_params;
-            })
-        } else {
-            self.with_scope(ScopeKind::Block, |v| {
-                let old = v.is_pat_decl;
-                let old_in_catch_params = v.in_catch_params;
+        self.with_scope(ScopeKind::Block, |v| {
+            let old = v.is_pat_decl;
+            let old_in_catch_params = v.in_catch_params;
 
-                v.is_pat_decl = false;
-                n.body.visit_children_with(v);
+            v.is_pat_decl = false;
+            n.body.visit_children_with(v);
 
-                v.is_pat_decl = true;
-                v.in_catch_params = true;
-                n.param.visit_with(v);
+            v.is_pat_decl = true;
+            v.in_catch_params = true;
+            n.param.visit_with(v);
 
-                v.is_pat_decl = old;
-                v.in_catch_params = old_in_catch_params;
-            })
-        }
+            v.is_pat_decl = old;
+            v.in_catch_params = old_in_catch_params;
+        })
     }
 
     fn visit_class_decl(&mut self, c: &ClassDecl) {

diff --git a/crates/swc_ecma_transforms_base/src/rename/mod.rs b/crates/swc_ecma_transforms_base/src/rename/mod.rs
@@ -132,7 +132,6 @@ where
     {
         let mut scope = {
             let mut v = Analyzer {
-                safari_10: self.config.safari_10,
                 has_eval,
                 top_level_mark: self.config.top_level_mark,