From 99934b09f70f9fb594e3291a9d96b79685919b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= <kdy1997.dev@gmail.com>
Date: Tue, 15 Nov 2022 11:28:38 +0900
Subject: [PATCH] fix(es/minifier): Change the default of `mangle.toplevel` to
 false (#6439)

---
 crates/swc_ecma_minifier/src/option/mod.rs    |  2 +-
 .../tests/fixture/issues/6344/1/mangle.json   |  4 +++-
 .../tests/fixture/issues/6344/2/mangle.json   |  4 +++-
 .../element/script-group/output.min.html      | 22 +++++++++----------
 .../element/script-options-1/output.min.html  |  2 +-
 .../fixture/element/script/output.min.html    |  2 +-
 .../swc_plugin_runner/src/memory_interop.rs   |  4 +---
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/crates/swc_ecma_minifier/src/option/mod.rs b/crates/swc_ecma_minifier/src/option/mod.rs
index 383d7661a506..73145b3c59fa 100644
--- a/crates/swc_ecma_minifier/src/option/mod.rs
+++ b/crates/swc_ecma_minifier/src/option/mod.rs
@@ -58,7 +58,7 @@ pub struct MangleOptions {
     #[serde(default, alias = "properties")]
     pub props: Option<ManglePropertiesOptions>,
 
-    #[serde(default = "true_by_default", alias = "toplevel")]
+    #[serde(default, alias = "toplevel")]
     pub top_level: bool,
 
     #[serde(default, alias = "keep_classnames")]
diff --git a/crates/swc_ecma_minifier/tests/fixture/issues/6344/1/mangle.json b/crates/swc_ecma_minifier/tests/fixture/issues/6344/1/mangle.json
index 0967ef424bce..9fa9d303874e 100644
--- a/crates/swc_ecma_minifier/tests/fixture/issues/6344/1/mangle.json
+++ b/crates/swc_ecma_minifier/tests/fixture/issues/6344/1/mangle.json
@@ -1 +1,3 @@
-{}
+{
+    "toplevel": true
+}
diff --git a/crates/swc_ecma_minifier/tests/fixture/issues/6344/2/mangle.json b/crates/swc_ecma_minifier/tests/fixture/issues/6344/2/mangle.json
index 0967ef424bce..9fa9d303874e 100644
--- a/crates/swc_ecma_minifier/tests/fixture/issues/6344/2/mangle.json
+++ b/crates/swc_ecma_minifier/tests/fixture/issues/6344/2/mangle.json
@@ -1 +1,3 @@
-{}
+{
+    "toplevel": true
+}
diff --git a/crates/swc_html_minifier/tests/fixture/element/script-group/output.min.html b/crates/swc_html_minifier/tests/fixture/element/script-group/output.min.html
index 168a00fc7913..cc09c528dec4 100644
--- a/crates/swc_html_minifier/tests/fixture/element/script-group/output.min.html
+++ b/crates/swc_html_minifier/tests/fixture/element/script-group/output.min.html
@@ -27,11 +27,11 @@
 
 
 <div>breaker</div>
-<script type=module>var o="test";console.log(o)</script><script>var o="test";console.log(o)</script>
+<script type=module>var a="test";console.log(a)</script><script>var o="test";console.log(o)</script>
 
 
 <div>breaker</div>
-<script type=module>var o="test";console.log(o);var e="test";console.log(e)</script>
+<script type=module>var a="test";console.log(a);var b="test";console.log(b)</script>
 
 
 <div>breaker</div>
@@ -51,28 +51,28 @@
 <script>var o="test";console.log(o);var e="test";console.log(e)</script>
 
 <div>breaker</div>
-<script type=module>var o="test";console.log(o);var e="test";console.log(e)</script>
+<script type=module>var a="test";console.log(a);var a1="test";console.log(a1)</script>
 
 <div>breaker</div>
-<script type=module>var o="test";console.log(o)</script><script>var o="test";console.log(o)</script>
+<script type=module>var a="test";console.log(a)</script><script>var o="test";console.log(o)</script>
 
 <div>breaker</div>
-<script type=module>var o="test";console.log(o);var e="test";console.log(e)</script>
+<script type=module>var a="test";console.log(a);var a1="test";console.log(a1)</script>
 
 <div>breaker</div>
-<script type=module>var o="test";console.log(o);var e="test";console.log(e)</script>
+<script type=module>var a="test";console.log(a);var a1="test";console.log(a1)</script>
 
 <div>breaker</div>
 <script>let e="test";console.log(e);let l="test";console.log(l);let e="test";console.log(e);let l="test";console.log(l)</script>
 
 <div>breaker</div>
-<script type=module>let t="test";console.log(t);const o="test";console.log("test");let e="test";console.log(e);const s="test";console.log("test")</script>
+<script type=module>let a="test";console.log(a);const b="test";console.log("test");let a1="test";console.log(a1);const b1="test";console.log("test")</script>
 
 <div>breaker</div>
 <script>let e=[1,2,3];[()=>{console.log("test")},2,3][0]()</script>
 
 <div>breaker</div>
-<script type=module>let o="test";console.log(o),console.log(o),console.log(o);let l="test";console.log(l),console.log(l),console.log(l)</script>
+<script type=module>let a="test";console.log(a),console.log(a),console.log(a);let a1="test";console.log(a1),console.log(a1),console.log(a1)</script>
 
 <div>breaker</div>
 <script>let o="test";console.log(o);console.log(o);console.log(o);let o="test";console.log(o);console.log(o);console.log(o)</script>
@@ -84,10 +84,10 @@
 <script>var o="test";console.log(o);console.log(o);console.log(o);var o="test";console.log(o);console.log(o);console.log(o);var o="test";console.log(o);console.log(o);console.log(o)</script>
 
 <div>breaker</div>
-<script type=module>var o="test";console.log(o),console.log(o),console.log(o);var l="test";console.log(l),console.log(l),console.log(l);var e="test";console.log(e),console.log(e),console.log(e)</script>
+<script type=module>var a="test";console.log(a),console.log(a),console.log(a);var a1="test";console.log(a1),console.log(a1),console.log(a1);var a2="test";console.log(a2),console.log(a2),console.log(a2)</script>
 
 <div>breaker</div>
-<script type=module>var o="test";console.log(o),console.log(o),console.log(o)</script><script>var o="test";console.log(o);console.log(o);console.log(o)</script><script type=module>var o="test";console.log(o),console.log(o),console.log(o)</script>
+<script type=module>var a="test";console.log(a),console.log(a),console.log(a)</script><script>var o="test";console.log(o);console.log(o);console.log(o)</script><script type=module>var a="test";console.log(a),console.log(a),console.log(a)</script>
 
 <div>breaker</div>
-<script>var o="test";console.log(o);console.log(o);console.log(o)</script><script type=module>var o="test";console.log(o),console.log(o),console.log(o)</script><script>var o="test";console.log(o);console.log(o);console.log(o)</script>
\ No newline at end of file
+<script>var o="test";console.log(o);console.log(o);console.log(o)</script><script type=module>var a="test";console.log(a),console.log(a),console.log(a)</script><script>var o="test";console.log(o);console.log(o);console.log(o)</script>
\ No newline at end of file
diff --git a/crates/swc_html_minifier/tests/fixture/element/script-options-1/output.min.html b/crates/swc_html_minifier/tests/fixture/element/script-options-1/output.min.html
index 6623916aab81..8be8e100e978 100644
--- a/crates/swc_html_minifier/tests/fixture/element/script-options-1/output.min.html
+++ b/crates/swc_html_minifier/tests/fixture/element/script-options-1/output.min.html
@@ -1 +1 @@
-<!doctype html><html lang=en><title>Document</title><body><script type=module>const t="bar";function foo(){return"bartest"}</script>
\ No newline at end of file
+<!doctype html><html lang=en><title>Document</title><body><script type=module>const my="bar";function foo(){return"bartest"}</script>
\ No newline at end of file
diff --git a/crates/swc_html_minifier/tests/fixture/element/script/output.min.html b/crates/swc_html_minifier/tests/fixture/element/script/output.min.html
index 5a51d7267478..ce945121482d 100644
--- a/crates/swc_html_minifier/tests/fixture/element/script/output.min.html
+++ b/crates/swc_html_minifier/tests/fixture/element/script/output.min.html
@@ -19,7 +19,7 @@
 
         </script><script id=data type=application/json>{"foo":"bar"}</script><script>
             broken    broken
-        </script><script>var a=3,a=9</script><script type=module>import t from"foo.js";let o=58800,e="testtest"</script><script>let e=new Date;alert("Today's date is "+e)</script><script src=javascript.js>
+        </script><script>var a=3,a=9</script><script type=module>import t from"foo.js";let test=58800,test1="testtest"</script><script>let e=new Date;alert("Today's date is "+e)</script><script src=javascript.js>
 
 
 
diff --git a/crates/swc_plugin_runner/src/memory_interop.rs b/crates/swc_plugin_runner/src/memory_interop.rs
index 4c2dc52b4f9f..aed07d23b5be 100644
--- a/crates/swc_plugin_runner/src/memory_interop.rs
+++ b/crates/swc_plugin_runner/src/memory_interop.rs
@@ -32,9 +32,7 @@ where
     let serialized_len = serialized_bytes.as_ptr().1;
 
     let ptr_start: u32 = get_allocated_ptr(serialized_len);
-    let ptr_start_size: u32 = ptr_start
-        .try_into()
-        .unwrap_or_else(|_| panic!("Should be able to convert the value {} to u32", ptr_start));
+    let ptr_start_size: u32 = ptr_start;
     let serialized_len_size: u32 = serialized_len.try_into().unwrap_or_else(|_| {
         panic!(
             "Should be able to convert the value {} to u32",