Merge branch 'main' into issue-8923

swc-project · May 7, 2024 · 402c6eb · 402c6eb
2 parents 271d27d + 9bf5790
commit 402c6eb
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 
 
 
+- **(es/fixer)** Wrap class expressions in callee ([#8928](https://github.com/swc-project/swc/issues/8928)) ([6b60bdb](https://github.com/swc-project/swc/commit/6b60bdb69713f7ccf603db04696621985d200d28))
+
+
 - **(es/minifier)** Respect `module: false` ([#8925](https://github.com/swc-project/swc/issues/8925)) ([aca6a77](https://github.com/swc-project/swc/commit/aca6a77903e31099f473587eb9285ae1c4dee309))
 
 ## [1.5.4] - 2024-05-06
@@ -1311,9 +1314,6 @@
 - **(ci)** Fix CI ([#8079](https://github.com/swc-project/swc/issues/8079)) ([7073e83](https://github.com/swc-project/swc/commit/7073e83f65ed5e98ee294c8e366a80b0a0f5921f))
 
 
-- **(es/codegen)** Fix codegen of type-only imports ([#8070](https://github.com/swc-project/swc/issues/8070)) ([6f45b46](https://github.com/swc-project/swc/commit/6f45b4693e6d35bf05bacb89b65c7f013d0366a2))
-
-
 - **(es/compat)** Handle `__proto__` edge case in `shorthand` pass ([#8077](https://github.com/swc-project/swc/issues/8077)) ([a912937](https://github.com/swc-project/swc/commit/a912937cea672ad4fbda057efc3a09283e3635fe))
 
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/swc/tests/fixture/issues-8xxx/8920/input/.swcrc b/crates/swc/tests/fixture/issues-8xxx/8920/input/.swcrc
@@ -0,0 +1,64 @@
+{
+    "jsc": {
+        "parser": {
+            "syntax": "ecmascript",
+            "jsx": false
+        },
+        "target": "es2022",
+        "loose": false,
+        "minify": {
+            "compress": {
+                "arguments": false,
+                "arrows": true,
+                "booleans": true,
+                "booleans_as_integers": false,
+                "collapse_vars": true,
+                "comparisons": true,
+                "computed_props": true,
+                "conditionals": true,
+                "dead_code": true,
+                "directives": true,
+                "drop_console": false,
+                "drop_debugger": true,
+                "evaluate": true,
+                "expression": false,
+                "hoist_funs": false,
+                "hoist_props": true,
+                "hoist_vars": false,
+                "if_return": true,
+                "join_vars": true,
+                "keep_classnames": false,
+                "keep_fargs": true,
+                "keep_fnames": false,
+                "keep_infinity": false,
+                "loops": true,
+                "negate_iife": true,
+                "properties": true,
+                "reduce_funcs": false,
+                "reduce_vars": false,
+                "side_effects": true,
+                "switches": true,
+                "typeofs": true,
+                "unsafe": false,
+                "unsafe_arrows": false,
+                "unsafe_comps": false,
+                "unsafe_Function": false,
+                "unsafe_math": false,
+                "unsafe_symbols": false,
+                "unsafe_methods": false,
+                "unsafe_proto": false,
+                "unsafe_regexp": false,
+                "unsafe_undefined": false,
+                "unused": true,
+                "const_to_let": true,
+                "pristine_globals": true
+            },
+            "mangle": false
+        }
+    },
+    "module": {
+        "type": "commonjs"
+    },
+    "minify": false,
+    "isModule": false
+}
diff --git a/crates/swc/tests/fixture/issues-8xxx/8920/input/1.js b/crates/swc/tests/fixture/issues-8xxx/8920/input/1.js
@@ -0,0 +1,8 @@
+"use strict";
+const k = (() => {
+    function f() {
+        class x { }
+        x();
+    }
+    return f;
+})();
diff --git a/crates/swc/tests/fixture/issues-8xxx/8920/output/1.js b/crates/swc/tests/fixture/issues-8xxx/8920/output/1.js
@@ -0,0 +1,5 @@
+"use strict";
+let k = function() {
+    (class {
+    })();
+};
diff --git a/crates/swc_core/Cargo.toml b/crates/swc_core/Cargo.toml
@@ -6,7 +6,7 @@ edition       = "2021"
 license       = "Apache-2.0"
 name          = "swc_core"
 repository    = "https://github.com/swc-project/swc.git"
-version       = "0.92.0"
+version       = "0.92.1"
   [package.metadata.docs.rs]
   features = [
     "allocator_node",

diff --git a/crates/swc_ecma_transforms_base/Cargo.toml b/crates/swc_ecma_transforms_base/Cargo.toml
@@ -7,7 +7,7 @@ include       = ["Cargo.toml", "src/**/*.rs", "src/**/*.js"]
 license       = "Apache-2.0"
 name          = "swc_ecma_transforms_base"
 repository    = "https://github.com/swc-project/swc.git"
-version       = "0.138.1"
+version       = "0.138.2"
 
 [lib]
 bench = false

diff --git a/crates/swc_ecma_transforms_base/src/fixer.rs b/crates/swc_ecma_transforms_base/src/fixer.rs
@@ -87,6 +87,7 @@ impl Fixer<'_> {
         match e {
             Expr::Lit(Lit::Num(..) | Lit::Str(..)) => (),
             Expr::Cond(..)
+            | Expr::Class(..)
             | Expr::Bin(..)
             | Expr::Lit(..)
             | Expr::Unary(..)