From cb6bcc61ebb2e1101ee5303163a2673ceb1eb2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 15 Nov 2022 09:48:24 +0900 Subject: [PATCH 1/4] Fix --- crates/swc_ecma_minifier/src/option/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, - #[serde(default = "true_by_default", alias = "toplevel")] + #[serde(default, alias = "toplevel")] pub top_level: bool, #[serde(default, alias = "keep_classnames")] From dedf8fecff0efe324f4f0c5709191a3f2d610a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 15 Nov 2022 09:51:00 +0900 Subject: [PATCH 2/4] clippy --- crates/swc_plugin_runner/src/memory_interop.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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", From bb85c91dcb466bb58f42f6bb27e1ceb838290def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 15 Nov 2022 10:18:33 +0900 Subject: [PATCH 3/4] Fix --- .../swc_ecma_minifier/tests/fixture/issues/6344/1/mangle.json | 4 +++- .../swc_ecma_minifier/tests/fixture/issues/6344/2/mangle.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 +} From 4b02865a8cbc5de786746adb340883fdcd5f9056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 15 Nov 2022 10:19:43 +0900 Subject: [PATCH 4/4] Update test refs --- .../element/script-group/output.min.html | 22 +++++++++---------- .../element/script-options-1/output.min.html | 2 +- .../fixture/element/script/output.min.html | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) 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 @@
breaker
- +
breaker
- +
breaker
@@ -51,28 +51,28 @@
breaker
- +
breaker
- +
breaker
- +
breaker
- +
breaker
breaker
- +
breaker
breaker
- +
breaker
@@ -84,10 +84,10 @@
breaker
- +
breaker
- +
breaker
- \ No newline at end of file + \ 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 @@ -Document \ No newline at end of file +Document \ 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 @@