@umijs/bundler-webpack 4.0.42 → 4.0.44

package/compiled/terser-webpack-plugin/package.json

@@ -1 +1 @@
-{"name":"terser-webpack-plugin","author":"webpack Contrib Team","license":"MIT","types":"types/index.d.ts"}
+{"name":"terser-webpack-plugin","version":"5.3.6","author":"webpack Contrib Team","license":"MIT","types":"types/index.d.ts"}

package/compiled/terser-webpack-plugin/types/index.d.ts

@@ -7,7 +7,7 @@ export = TerserPlugin;
 /** @typedef {import('./utils').TerserECMA} TerserECMA */
 /** @typedef {import('./utils').TerserOptions} TerserOptions */
 /** @typedef {import('../jest-worker').Worker} JestWorker */
-/** @typedef {import('../source-map').RawSourceMap} RawSourceMap */
+/** @typedef {import('../@jridgewell/trace-mapping').SourceMapInput} SourceMapInput */
 /** @typedef {RegExp | string} Rule */
 /** @typedef {Rule[] | Rule} Rules */
 /**
@@ -37,7 +37,7 @@ export = TerserPlugin;
 /**
  * @typedef {Object} MinimizedResult
  * @property {string} code
- * @property {RawSourceMap} [map]
+ * @property {SourceMapInput} [map]
  * @property {Array<Error | string>} [errors]
  * @property {Array<Error | string>} [warnings]
  * @property {Array<string>} [extractedComments]
@@ -65,7 +65,7 @@ export = TerserPlugin;
  * @template T
  * @callback BasicMinimizerImplementation
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {MinimizerOptions<T>} minifyOptions
  * @param {ExtractCommentsOptions | undefined} extractComments
  * @returns {Promise<MinimizedResult>}
@@ -83,7 +83,7 @@ export = TerserPlugin;
  * @typedef {Object} InternalOptions
  * @property {string} name
  * @property {string} input
- * @property {RawSourceMap | undefined} inputSourceMap
+ * @property {SourceMapInput | undefined} inputSourceMap
  * @property {ExtractCommentsOptions | undefined} extractComments
  * @property {{ implementation: MinimizerImplementation<T>, options: MinimizerOptions<T> }} minimizer
  */
@@ -131,7 +131,7 @@ declare class TerserPlugin<T = import('../../terser').MinifyOptions> {
    * @private
    * @param {any} error
    * @param {string} file
-   * @param {SourceMapConsumer} [sourceMap]
+   * @param {TraceMap} [sourceMap]
    * @param {Compilation["requestShortener"]} [requestShortener]
    * @returns {Error}
    */
@@ -190,7 +190,7 @@ declare namespace TerserPlugin {
     TerserECMA,
     TerserOptions,
     JestWorker,
-    RawSourceMap,
+    SourceMapInput,
     Rule,
     Rules,
     ExtractCommentsFunction,
@@ -244,7 +244,7 @@ type Asset = import('../../webpack').Asset;
 type TerserECMA = import('./utils').TerserECMA;
 type TerserOptions = import('./utils').TerserOptions;
 type JestWorker = import('../jest-worker').Worker;
-type RawSourceMap = import('../source-map').RawSourceMap;
+type SourceMapInput = import('../@jridgewell/trace-mapping').SourceMapInput;
 type Rule = RegExp | string;
 type Rules = Rule[] | Rule;
 type ExtractCommentsFunction = (
@@ -276,7 +276,7 @@ type ExtractCommentsObject = {
 type ExtractCommentsOptions = ExtractCommentsCondition | ExtractCommentsObject;
 type MinimizedResult = {
   code: string;
-  map?: import('../source-map').RawSourceMap | undefined;
+  map?: import('../@jridgewell/trace-mapping').SourceMapInput | undefined;
   errors?: (string | Error)[] | undefined;
   warnings?: (string | Error)[] | undefined;
   extractedComments?: string[] | undefined;
@@ -295,7 +295,7 @@ type PredefinedOptions = {
 type MinimizerOptions<T> = PredefinedOptions & InferDefaultType<T>;
 type BasicMinimizerImplementation<T> = (
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap: SourceMapInput | undefined,
   minifyOptions: MinimizerOptions<T>,
   extractComments: ExtractCommentsOptions | undefined
 ) => Promise<MinimizedResult>;
@@ -307,7 +307,7 @@ type MinimizerImplementation<T> = BasicMinimizerImplementation<T> &
 type InternalOptions<T> = {
   name: string;
   input: string;
-  inputSourceMap: RawSourceMap | undefined;
+  inputSourceMap: SourceMapInput | undefined;
   extractComments: ExtractCommentsOptions | undefined;
   minimizer: {
     implementation: MinimizerImplementation<T>;

package/compiled/terser-webpack-plugin/types/utils.d.ts

@@ -1,7 +1,8 @@
 export type Task<T> = () => Promise<T>;
-export type RawSourceMap = import('../source-map').RawSourceMap;
+export type SourceMapInput = import('../@jridgewell/trace-mapping').SourceMapInput;
 export type TerserFormatOptions = import('../../terser').FormatOptions;
 export type TerserOptions = import('../../terser').MinifyOptions;
+export type TerserCompressOptions = import('../../terser').CompressOptions;
 export type TerserECMA = import('../../terser').ECMA;
 export type ExtractCommentsOptions =
   import('./index').ExtractCommentsOptions;
@@ -28,14 +29,14 @@ export type ExtractedComments = Array<string>;
 export function throttleAll<T>(limit: number, tasks: Task<T>[]): Promise<T[]>;
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {PredefinedOptions & CustomOptions} minimizerOptions
  * @param {ExtractCommentsOptions | undefined} extractComments
  * @return {Promise<MinimizedResult>}
  */
 export function terserMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap: SourceMapInput | undefined,
   minimizerOptions: PredefinedOptions & CustomOptions,
   extractComments: ExtractCommentsOptions | undefined
 ): Promise<MinimizedResult>;
@@ -47,14 +48,14 @@ export namespace terserMinify {
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {PredefinedOptions & CustomOptions} minimizerOptions
  * @param {ExtractCommentsOptions | undefined} extractComments
  * @return {Promise<MinimizedResult>}
  */
 export function uglifyJsMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap: SourceMapInput | undefined,
   minimizerOptions: PredefinedOptions & CustomOptions,
   extractComments: ExtractCommentsOptions | undefined
 ): Promise<MinimizedResult>;
@@ -66,13 +67,13 @@ export namespace uglifyJsMinify {
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {PredefinedOptions & CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */
 export function swcMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap: SourceMapInput | undefined,
   minimizerOptions: PredefinedOptions & CustomOptions
 ): Promise<MinimizedResult>;
 export namespace swcMinify {
@@ -83,13 +84,13 @@ export namespace swcMinify {
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {PredefinedOptions & CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */
 export function esbuildMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap: SourceMapInput | undefined,
   minimizerOptions: PredefinedOptions & CustomOptions
 ): Promise<MinimizedResult>;
 export namespace esbuildMinify {

package/compiled/terser-webpack-plugin/utils.js

@@ -1,11 +1,13 @@
 "use strict";
 
-/** @typedef {import("source-map").RawSourceMap} RawSourceMap */
+/** @typedef {import("@jridgewell/trace-mapping").SourceMapInput} SourceMapInput */
 
 /** @typedef {import("terser").FormatOptions} TerserFormatOptions */
 
 /** @typedef {import("terser").MinifyOptions} TerserOptions */
 
+/** @typedef {import("terser").CompressOptions} TerserCompressOptions */
+
 /** @typedef {import("terser").ECMA} TerserECMA */
 
 /** @typedef {import("./index.js").ExtractCommentsOptions} ExtractCommentsOptions */
@@ -86,7 +88,7 @@ function throttleAll(limit, tasks) {
 
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {PredefinedOptions & CustomOptions} minimizerOptions
  * @param {ExtractCommentsOptions | undefined} extractComments
  * @return {Promise<MinimizedResult>}
@@ -218,14 +220,14 @@ async function terserMinify(input, sourceMap, minimizerOptions, extractComments)
   };
   /**
    * @param {PredefinedOptions & TerserOptions} [terserOptions={}]
-   * @returns {TerserOptions & { sourceMap: undefined } & ({ output: TerserFormatOptions & { beautify: boolean } } | { format: TerserFormatOptions & { beautify: boolean } })}
+   * @returns {TerserOptions & { sourceMap: undefined } & { compress: TerserCompressOptions } & ({ output: TerserFormatOptions & { beautify: boolean } } | { format: TerserFormatOptions & { beautify: boolean } })}
    */
 
 
   const buildTerserOptions = (terserOptions = {}) => {
     // Need deep copy objects to avoid https://github.com/terser/terser/issues/366
     return { ...terserOptions,
-      compress: typeof terserOptions.compress === "boolean" ? terserOptions.compress : { ...terserOptions.compress
+      compress: typeof terserOptions.compress === "boolean" ? terserOptions.compress ? {} : false : { ...terserOptions.compress
       },
       // ecma: terserOptions.ecma,
       // ie8: terserOptions.ie8,
@@ -282,6 +284,18 @@ async function terserMinify(input, sourceMap, minimizerOptions, extractComments)
     terserOptions.format.comments = buildComments(terserOptions, extractedComments);
   }
 
+  if (terserOptions.compress) {
+    // More optimizations
+    if (typeof terserOptions.compress.ecma === "undefined") {
+      terserOptions.compress.ecma = terserOptions.ecma;
+    } // https://github.com/webpack/webpack/issues/16135
+
+
+    if (terserOptions.ecma === 5 && typeof terserOptions.compress.arrows === "undefined") {
+      terserOptions.compress.arrows = false;
+    }
+  }
+
   const [[filename, code]] = Object.entries(input);
   const result = await minify({
     [filename]: code
@@ -293,7 +307,7 @@ async function terserMinify(input, sourceMap, minimizerOptions, extractComments)
     // @ts-ignore
     // eslint-disable-next-line no-undefined
     map: result.map ?
-    /** @type {RawSourceMap} **/
+    /** @type {SourceMapInput} **/
     result.map : undefined,
     extractedComments
   };
@@ -318,7 +332,7 @@ terserMinify.getMinimizerVersion = () => {
 
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {PredefinedOptions & CustomOptions} minimizerOptions
  * @param {ExtractCommentsOptions | undefined} extractComments
  * @return {Promise<MinimizedResult>}
@@ -524,7 +538,7 @@ uglifyJsMinify.getMinimizerVersion = () => {
 
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {PredefinedOptions & CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */
@@ -533,12 +547,12 @@ uglifyJsMinify.getMinimizerVersion = () => {
 async function swcMinify(input, sourceMap, minimizerOptions) {
   /**
    * @param {PredefinedOptions & import("@swc/core").JsMinifyOptions} [swcOptions={}]
-   * @returns {import("@swc/core").JsMinifyOptions & { sourceMap: undefined }}
+   * @returns {import("@swc/core").JsMinifyOptions & { sourceMap: undefined } & { compress: import("@swc/core").TerserCompressOptions }}
    */
   const buildSwcOptions = (swcOptions = {}) => {
     // Need deep copy objects to avoid https://github.com/terser/terser/issues/366
     return { ...swcOptions,
-      compress: typeof swcOptions.compress === "boolean" ? swcOptions.compress : { ...swcOptions.compress
+      compress: typeof swcOptions.compress === "boolean" ? swcOptions.compress ? {} : false : { ...swcOptions.compress
       },
       mangle: swcOptions.mangle == null ? true : typeof swcOptions.mangle === "boolean" ? swcOptions.mangle : { ...swcOptions.mangle
       },
@@ -564,6 +578,18 @@ async function swcMinify(input, sourceMap, minimizerOptions) {
     swcOptions.sourceMap = true;
   }
 
+  if (swcOptions.compress) {
+    // More optimizations
+    if (typeof swcOptions.compress.ecma === "undefined") {
+      swcOptions.compress.ecma = swcOptions.ecma;
+    } // https://github.com/webpack/webpack/issues/16135
+
+
+    if (swcOptions.ecma === 5 && typeof swcOptions.compress.arrows === "undefined") {
+      swcOptions.compress.arrows = false;
+    }
+  }
+
   const [[filename, code]] = Object.entries(input);
   const result = await swc.minify(code, swcOptions);
   let map;
@@ -600,7 +626,7 @@ swcMinify.getMinimizerVersion = () => {
 
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {SourceMapInput | undefined} sourceMap
  * @param {PredefinedOptions & CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */

package/compiled/webpack/package.json

@@ -1 +1 @@
-{"name":"webpack","version":"5.74.0","author":"Tobias Koppers @sokra","license":"MIT","types":"types.d.ts"}
+{"name":"webpack","version":"5.75.0","author":"Tobias Koppers @sokra","license":"MIT","types":"types.d.ts"}