fix(es): Fix bugs (#2004)

swc_ecma_codegen:
 - Fix codegen of regexp where `minify` = `true`. (#2000)

swc_ecma_transforms_react:
 - Respect `@jsxImportSource` in `classic` mode. (#1933)

swc:
 - Upgrade `base64`.

Cargo.toml

@@ -17,7 +17,7 @@ name = "swc"
 [dependencies]
 ahash = "0.7.2"
 anyhow = "1"
-base64 = "0.12.0"
+base64 = "0.13.0"
 dashmap = "4.0.2"
 either = "1"
 log = {version = "0.4", features = ["release_max_level_info"]}

ecmascript/ast/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0/MIT"
 name = "swc_ecma_ast"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.49.0"
+version = "0.49.1"
 
 [features]
 default = []

ecmascript/codegen/Cargo.toml

@@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
 license = "Apache-2.0/MIT"
 name = "swc_ecma_codegen"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.65.0"
+version = "0.65.1"
 
 [dependencies]
 bitflags = "1"

ecmascript/codegen/src/text_writer/semicolon.rs

@@ -60,7 +60,7 @@ impl<W: WriteJs> WriteJs for OmitTrailingSemi<W> {
                 self.commit_pending_semi()?;
             }
 
-            "{" | "(" => {
+            "/" | "{" | "(" => {
                 self.commit_pending_semi()?;
             }
 

ecmascript/codegen/tests/fixture/issues/2000/input.js

@@ -0,0 +1,5 @@
+function testme() {
+    for (var a = arguments.length, b = new Array(a), c = 0; c < a; c++)
+        b[c] = arguments[c];
+    /^toto.+/.test(b.join("")) && global.other(!0)
+}

ecmascript/codegen/tests/fixture/issues/2000/output.js

@@ -0,0 +1,4 @@
+function testme() {
+    for(var a = arguments.length, b = new Array(a), c = 0; c < a; c++)b[c] = arguments[c];
+    /^toto.+/.test(b.join("")) && global.other(!0);
+}

ecmascript/codegen/tests/fixture/issues/2000/output.min.js

@@ -0,0 +1 @@
+function testme(){for(var a=arguments.length,b=new Array(a),c=0;c<a;c++)b[c]=arguments[c];/^toto.+/.test(b.join(""))&&global.other(!0)}

ecmascript/transforms/react/Cargo.toml

@@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
 license = "Apache-2.0/MIT"
 name = "swc_ecma_transforms_react"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.30.0"
+version = "0.30.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

ecmascript/transforms/react/src/jsx/mod.rs

@@ -752,6 +752,7 @@ where
 
                         if line.starts_with("@jsxImportSource") {
                             let src = line.replace("@jsxImportSource", "").trim().to_string();
+                            self.runtime = Runtime::Automatic;
                             self.import_source = src.into();
                         }
 
@@ -775,17 +776,15 @@ where
                             };
                         } else if line.starts_with("@jsx ") {
                             if self.runtime == Runtime::Automatic {
-                                if self.runtime == Runtime::Automatic {
-                                    HANDLER.with(|handler| {
-                                        handler
-                                            .struct_span_err(
-                                                module.span,
-                                                "pragma and pragmaFrag cannot be set when runtime \
-                                                 is automatic",
-                                            )
-                                            .emit()
-                                    });
-                                }
+                                HANDLER.with(|handler| {
+                                    handler
+                                        .struct_span_err(
+                                            module.span,
+                                            "pragma and pragmaFrag cannot be set when runtime is \
+                                             automatic",
+                                        )
+                                        .emit()
+                                });
                             }
 
                             let src = line.replace("@jsx", "").trim().to_string();

ecmascript/transforms/react/tests/jsx/fixture/issue-1933/input.js

@@ -0,0 +1,4 @@
+/* @jsxImportSource react */
+const p = () => (
+    <div>Hello World</div>
+);

ecmascript/transforms/react/tests/jsx/fixture/issue-1933/options.json

@@ -0,0 +1,3 @@
+{
+    "runtime": "classic"
+}

ecmascript/transforms/react/tests/jsx/fixture/issue-1933/output.js

@@ -0,0 +1,6 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+
+/* @jsxImportSource react */
+const p = () => /*#__PURE__*/_jsx("div", {
+    children: "Hello World"
+});

tests/fixture/.issue-1726/case1/input/.swcrc → tests/fixture/issue-1726/case1/input/.swcrc

@@ -1,5 +1,4 @@
 {
-    "sourceMaps": "inline",
     "jsc": {
         "target": "es5",
         "parser": {
@@ -8,4 +7,4 @@
         },
         "loose": true
     }
-}
+}

tests/fixture/issue-1726/case1/input/index.tsx

@@ -0,0 +1 @@
+const foo = /* 1 */ <h1>{/* 2 */ bar /* 3 */}</h1>; /* 4 */

tests/fixture/issue-1726/case1/output/index.tsx

@@ -0,0 +1 @@
+var foo = /* 1 */ /*#__PURE__*/ React.createElement("h1", null, bar /* 3 */ ); /* 4 */ 

tests/fixture/issue-2000/input/.swcrc

@@ -0,0 +1,10 @@
+{
+    "jsc": {
+        "loose": true,
+        "minify": {
+            "compress": true,
+            "mangle": true
+        }
+    },
+    "minify": true
+}

tests/fixture/issue-2000/input/index.js

@@ -0,0 +1,3 @@
+function testme(...list) {
+    if (/^toto.+/.test(list.join(''))) global.other(true);
+}

tests/fixture/issue-2000/output/index.js

@@ -0,0 +1 @@
+function testme(){for(var a=arguments.length,b=new Array(a),c=0;c<a;c++)b[c]=arguments[c];/^toto.+/.test(b.join(""))&&global.other(!0)}