fix(es): Fix bugs (#2469)

swc:
 - Fix handling of `envs`.
 - Check for already fixed issues. (#2319)

Cargo.lock

@@ -2324,7 +2324,7 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 
 [[package]]
 name = "swc"
-version = "0.73.0"
+version = "0.73.1"
 dependencies = [
  "ahash",
  "anyhow",

Cargo.toml

@@ -21,7 +21,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
 license = "Apache-2.0/MIT"
 name = "swc"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.73.0"
+version = "0.73.1"
 
 [lib]
 name = "swc"

ecmascript/minifier/tests/compress/fixture/issues/2319/1/input.js

@@ -0,0 +1,18 @@
+function foo(l, r) {
+
+    var lightGreeting
+
+    if (l > 0) {
+        var greeting = "hello";
+    } else {
+        var greeting = "howdy";
+    }
+
+    if (r > 0) {
+        lightGreeting = greeting.substr(0, 2)
+    }
+
+    return lightGreeting
+}
+
+module.exports = foo;

ecmascript/minifier/tests/compress/fixture/issues/2319/1/output.js

@@ -0,0 +1,7 @@
+function foo(l, r) {
+    var lightGreeting;
+    if (l > 0) var greeting = "hello";
+    else var greeting = "howdy";
+    return r > 0 && (lightGreeting = greeting.substr(0, 2)), lightGreeting;
+}
+module.exports = foo;

src/config/mod.rs

@@ -993,6 +993,7 @@ pub struct GlobalPassOption {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
 pub enum GlobalInliningPassEnvs {
     List(AHashSet<String>),
     Map(AHashMap<String, String>),

tests/fixture/issue-2319/1/input/index.js

@@ -0,0 +1,18 @@
+function foo(l, r) {
+
+    var lightGreeting
+
+    if (l > 0) {
+        var greeting = "hello";
+    } else {
+        var greeting = "howdy";
+    }
+
+    if (r > 0) {
+        lightGreeting = greeting.substr(0, 2)
+    }
+
+    return lightGreeting
+}
+
+module.exports = foo;

tests/fixture/issue-2319/1/output/index.js

@@ -0,0 +1,13 @@
+function foo(l, r) {
+    var lightGreeting;
+    if (l > 0) {
+        var greeting = "hello";
+    } else {
+        var greeting = "howdy";
+    }
+    if (r > 0) {
+        lightGreeting = greeting.substr(0, 2);
+    }
+    return lightGreeting;
+}
+module.exports = foo;

tests/fixture/options/globals/1/input/.swcrc

@@ -0,0 +1,13 @@
+{
+    "jsc": {
+        "transform": {
+            "optimizer": {
+                "globals": {
+                    "envs": {
+                        "NODE_ENV_ALT": "true"
+                    }
+                }
+            }
+        }
+    }
+}

tests/fixture/options/globals/1/input/index.js

@@ -0,0 +1 @@
+console.log(process.env.NODE_ENV_ALT)

tests/fixture/options/globals/1/output/index.js

@@ -0,0 +1 @@
+console.log(true);