From ed2571a9c72eecbd3e1ec2451f5b106e2dfddd26 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Wed, 20 Dec 2023 14:45:03 +0800 Subject: [PATCH] chore: update deprecated minimizer options --- .../core/src/provider/plugins/minimize.ts | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/core/src/provider/plugins/minimize.ts b/packages/core/src/provider/plugins/minimize.ts index e34b2806f4..cccaf308e6 100644 --- a/packages/core/src/provider/plugins/minimize.ts +++ b/packages/core/src/provider/plugins/minimize.ts @@ -1,4 +1,4 @@ -import { CHAIN_ID, type RspackBuiltinsConfig } from '@rsbuild/shared'; +import { CHAIN_ID, isObject, type RspackBuiltinsConfig } from '@rsbuild/shared'; import type { RsbuildPlugin, NormalizedConfig } from '../../types'; const getJsMinimizerOptions = (config: NormalizedConfig) => { @@ -7,29 +7,37 @@ const getJsMinimizerOptions = (config: NormalizedConfig) => { const { removeConsole } = config.performance; if (removeConsole === true) { - options.dropConsole = true; + options.compress = { + ...(isObject(options.compress) ? options.compress : {}), + drop_console: true, + }; } else if (Array.isArray(removeConsole)) { const pureFuncs = removeConsole.map((method) => `console.${method}`); - options.pureFuncs = pureFuncs; + options.compress = { + ...(isObject(options.compress) ? options.compress : {}), + pure_funcs: pureFuncs, + }; } + options.format ||= {}; + switch (config.output.legalComments) { case 'inline': - options.comments = 'some'; + options.format.comments = 'some'; options.extractComments = false; break; case 'linked': options.extractComments = true; break; case 'none': - options.comments = false; + options.format.comments = false; options.extractComments = false; break; default: break; } - options.asciiOnly = config.output.charset === 'ascii'; + options.format.asciiOnly = config.output.charset === 'ascii'; return options; };