fix: move minify field

web-infra-dev · Aug 19, 2024 · b4abc23 · b4abc23
1 parent ff47c11
commit b4abc23
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/crates/node_binding/binding.d.ts b/crates/node_binding/binding.d.ts
@@ -1720,6 +1720,7 @@ export interface RawSwcJsMinimizerOptions {
   mangle: any
   format: any
   module?: boolean
+  minify?: boolean
 }
 
 export interface RawSwcJsMinimizerRspackPluginOptions {
@@ -1728,7 +1729,6 @@ export interface RawSwcJsMinimizerRspackPluginOptions {
   exclude?: string | RegExp | (string | RegExp)[]
   extractComments?: RawExtractComments
   minimizerOptions: RawSwcJsMinimizerOptions
-  minify?: boolean
 }
 
 export interface RawToOptions {

diff --git a/crates/rspack_binding_options/src/options/raw_builtins/raw_swc_js_minimizer.rs b/crates/rspack_binding_options/src/options/raw_builtins/raw_swc_js_minimizer.rs
@@ -26,7 +26,6 @@ pub struct RawSwcJsMinimizerRspackPluginOptions {
   pub exclude: Option<RawAssetConditions>,
   pub extract_comments: Option<RawExtractComments>,
   pub minimizer_options: RawSwcJsMinimizerOptions,
-  pub minify: Option<bool>,
 }
 
 #[derive(Debug)]
@@ -36,6 +35,7 @@ pub struct RawSwcJsMinimizerOptions {
   pub mangle: serde_json::Value,
   pub format: serde_json::Value,
   pub module: Option<bool>,
+  pub minify: Option<bool>,
 }
 
 fn try_deserialize_into<T>(value: serde_json::Value) -> Result<T>
@@ -82,12 +82,12 @@ impl TryFrom<RawSwcJsMinimizerRspackPluginOptions> for PluginOptions {
       test: value.test.map(into_asset_conditions),
       include: value.include.map(into_asset_conditions),
       exclude: value.exclude.map(into_asset_conditions),
-      minify: value.minify,
       minimizer_options: MinimizerOptions {
         compress,
         mangle,
         format: try_deserialize_into(value.minimizer_options.format)?,
         module: value.minimizer_options.module,
+        minify: value.minimizer_options.minify,
         ..Default::default()
       },
     })

diff --git a/crates/rspack_plugin_swc_js_minimizer/src/lib.rs b/crates/rspack_plugin_swc_js_minimizer/src/lib.rs
@@ -36,7 +36,6 @@ static JAVASCRIPT_ASSET_REGEXP: LazyLock<Regex> =
 
 #[derive(Debug, Hash)]
 pub struct PluginOptions {
-  pub minify: Option<bool>,
   pub test: Option<AssetConditions>,
   pub include: Option<AssetConditions>,
   pub exclude: Option<AssetConditions>,
@@ -46,6 +45,7 @@ pub struct PluginOptions {
 
 #[derive(Debug, Default)]
 pub struct MinimizerOptions {
+  pub minify: Option<bool>,
   pub compress: BoolOrDataConfig<TerserCompressorOptions>,
   pub mangle: BoolOrDataConfig<MangleOptions>,
   pub format: JsMinifyFormatOptions,
@@ -200,7 +200,7 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
         };
 
         let js_minify_options = JsMinifyOptions {
-          minify: options.minify.unwrap_or(true),
+          minify: minimizer_options.minify.unwrap_or(true),
           compress: minimizer_options.compress.clone(),
           mangle: minimizer_options.mangle.clone(),
           format: minimizer_options.format.clone(),

diff --git a/packages/rspack-test-tools/tests/__snapshots__/StatsAPI.test.js.snap b/packages/rspack-test-tools/tests/__snapshots__/StatsAPI.test.js.snap
@@ -52,7 +52,7 @@ Object {
         "main.js",
       ],
       "filteredModules": undefined,
-      "hash": "c0151c6dfca2168c65d7",
+      "hash": "333e59d94047c9b4ec6c",
       "id": "909",
       "idHints": Array [],
       "initial": true,
@@ -176,7 +176,7 @@ Object {
   "errorsCount": 0,
   "filteredAssets": undefined,
   "filteredModules": undefined,
-  "hash": "d46aa17c3e1115ff8d8a",
+  "hash": "a156b269cd7b4340da9d",
   "modules": Array [
     Object {
       "assets": Array [],
@@ -324,7 +324,7 @@ Object {
         "main.js",
       ],
       "filteredModules": undefined,
-      "hash": "e9a1c09dae741d8eab71",
+      "hash": "a2024ddd80c1dac51782",
       "id": "909",
       "idHints": Array [],
       "initial": true,
@@ -691,7 +691,7 @@ Object {
   "errorsCount": 0,
   "filteredAssets": undefined,
   "filteredModules": undefined,
-  "hash": "1234d41312362d1e5f6e",
+  "hash": "959ba20161293349edf3",
   "modules": Array [
     Object {
       "assets": Array [],
@@ -1458,7 +1458,7 @@ Object {
       "files": Array [
         "main.js",
       ],
-      "hash": "c0151c6dfca2168c65d7",
+      "hash": "333e59d94047c9b4ec6c",
       "id": "909",
       "idHints": Array [],
       "initial": true,
@@ -1714,7 +1714,7 @@ Object {
         "main.js",
       ],
       "filteredModules": undefined,
-      "hash": "b05777d51d49dfde7aa8",
+      "hash": "add6ca394a084131cdb7",
       "id": "909",
       "idHints": Array [],
       "initial": true,
@@ -2063,7 +2063,7 @@ exports.c = require(\\"./c?c=3\\");
   "errorsCount": 0,
   "filteredAssets": undefined,
   "filteredModules": undefined,
-  "hash": "b1ef105808f10ca0733b",
+  "hash": "0e205cc26142ad8eade1",
   "modules": Array [
     Object {
       "assets": Array [],

diff --git a/packages/rspack-test-tools/tests/configCases/plugins/minify-disable-minify/rspack.config.js b/packages/rspack-test-tools/tests/configCases/plugins/minify-disable-minify/rspack.config.js
@@ -15,8 +15,8 @@ module.exports = {
 	},
 	plugins: [
 		new rspack.SwcJsMinimizerRspackPlugin({
-			minify: false,
 			minimizerOptions: {
+				minify: false,
 				mangle: false
 			}
 		})

diff --git a/packages/rspack-test-tools/tests/statsAPICases/basic.js b/packages/rspack-test-tools/tests/statsAPICases/basic.js
@@ -39,7 +39,7 @@ module.exports = {
 		  entry ./fixtures/a
 		  cjs self exports reference self [585] ./fixtures/a.js
 		  
-		Rspack compiled successfully (d46aa17c3e1115ff8d8a)"
+		Rspack compiled successfully (a156b269cd7b4340da9d)"
 	`);
 	}
 };
diff --git a/packages/rspack-test-tools/tests/statsAPICases/chunks.js b/packages/rspack-test-tools/tests/statsAPICases/chunks.js
@@ -27,7 +27,7 @@ module.exports = {
 		      "chunkB.js",
 		    ],
 		    "filteredModules": undefined,
-		    "hash": "94e5f4b9ba950ceab14f",
+		    "hash": "9aa837bfaefd1fd4ec18",
 		    "id": "250",
 		    "idHints": Array [],
 		    "initial": false,
@@ -144,7 +144,7 @@ module.exports = {
 		      "main.js",
 		    ],
 		    "filteredModules": undefined,
-		    "hash": "5e75c3a7bac911893513",
+		    "hash": "0e471e878e0dbdf0ba5a",
 		    "id": "909",
 		    "idHints": Array [],
 		    "initial": true,

diff --git a/packages/rspack/src/builtin-plugin/SwcJsMinimizerPlugin.ts b/packages/rspack/src/builtin-plugin/SwcJsMinimizerPlugin.ts
@@ -22,8 +22,8 @@ export type SwcJsMinimizerRspackPluginOptions = {
 	exclude?: AssetConditions;
 	include?: AssetConditions;
 	extractComments?: ExtractCommentsOptions | undefined;
-	minify?: boolean;
 	minimizerOptions?: {
+		minify?: boolean;
 		compress?: TerserCompressOptions | boolean;
 		mangle?: TerserMangleOptions | boolean;
 		format?: JsFormatOptions & ToSnakeCaseProperties<JsFormatOptions>;
@@ -289,7 +289,6 @@ export const SwcJsMinimizerRspackPlugin = create(
 		}
 
 		return {
-			minify: options?.minify,
 			test: options?.test,
 			include: options?.include,
 			exclude: options?.exclude,
@@ -298,6 +297,7 @@ export const SwcJsMinimizerRspackPlugin = create(
 				compress,
 				mangle,
 				format,
+				minify: options?.minimizerOptions?.minify,
 				module: options?.minimizerOptions?.module
 			}
 		};

diff --git a/website/docs/en/plugins/rspack/swc-js-minimizer-rspack-plugin.mdx b/website/docs/en/plugins/rspack/swc-js-minimizer-rspack-plugin.mdx
@@ -27,8 +27,8 @@ module.exports = {
     exclude?: AssetConditions;
     include?: AssetConditions;
     extractComments?: boolean | RegExp;
-    minify?: boolean;
-    minimizerOptions: {
+    minimizerOptions?: {
+      minify?: boolean;
       compress?: TerserCompressOptions | boolean;
       mangle?: TerserMangleOptions | boolean;
       module?: boolean;

diff --git a/website/docs/zh/plugins/rspack/swc-js-minimizer-rspack-plugin.mdx b/website/docs/zh/plugins/rspack/swc-js-minimizer-rspack-plugin.mdx
@@ -27,8 +27,8 @@ module.exports = {
     exclude?: AssetConditions;
     include?: AssetConditions;
     extractComments?: boolean | RegExp;
-    minify?: boolean;
     minimizerOptions?: {
+      minify?: boolean;
       compress?: TerserCompressOptions | boolean;
       mangle?: TerserMangleOptions | boolean;
       module?: boolean;