@rsbuild/webpack 1.6.0 → 1.6.2

package/dist/1~0.cjs

@@ -83,7 +83,7 @@ exports.ids = [
         };
         Object.defineProperty(module, 'exports', {
             enumerable: !0,
-            get: function() {
+            get: function assembleStyles() {
                 let codes = new Map(), styles = {
                     modifier: {
                         reset: [
@@ -416,6 +416,9 @@ exports.ids = [
                 value: labels
             });
         }
+        function comparativeDistance(x, y) {
+            return (x[0] - y[0]) ** 2 + (x[1] - y[1]) ** 2 + (x[2] - y[2]) ** 2;
+        }
         convert.rgb.hsl = function(rgb) {
             let h, r = rgb[0] / 255, g = rgb[1] / 255, b = rgb[2] / 255, min = Math.min(r, g, b), max = Math.max(r, g, b), delta = max - min;
             max === min ? h = 0 : r === max ? h = (g - b) / delta : g === max ? h = 2 + (b - r) / delta : b === max && (h = 4 + (r - g) / delta), (h = Math.min(60 * h, 360)) < 0 && (h += 360);
@@ -454,7 +457,7 @@ exports.ids = [
             if (reversed) return reversed;
             let currentClosestDistance = 1 / 0;
             for (let keyword of Object.keys(cssKeywords)){
-                let value = cssKeywords[keyword], distance = (rgb[0] - value[0]) ** 2 + (rgb[1] - value[1]) ** 2 + (rgb[2] - value[2]) ** 2;
+                let distance = comparativeDistance(rgb, cssKeywords[keyword]);
                 distance < currentClosestDistance && (currentClosestDistance = distance, currentClosestKeyword = keyword);
             }
             return currentClosestKeyword;
@@ -818,6 +821,24 @@ exports.ids = [
     },
     "../../../node_modules/.pnpm/color-convert@2.0.1/node_modules/color-convert/index.js": function(module, __unused_webpack_exports, __webpack_require__) {
         let conversions = __webpack_require__("../../../node_modules/.pnpm/color-convert@2.0.1/node_modules/color-convert/conversions.js"), route = __webpack_require__("../../../node_modules/.pnpm/color-convert@2.0.1/node_modules/color-convert/route.js"), convert = {};
+        function wrapRaw(fn) {
+            let wrappedFn = function(...args) {
+                let arg0 = args[0];
+                return null == arg0 ? arg0 : (arg0.length > 1 && (args = arg0), fn(args));
+            };
+            return 'conversion' in fn && (wrappedFn.conversion = fn.conversion), wrappedFn;
+        }
+        function wrapRounded(fn) {
+            let wrappedFn = function(...args) {
+                let arg0 = args[0];
+                if (null == arg0) return arg0;
+                arg0.length > 1 && (args = arg0);
+                let result = fn(args);
+                if ('object' == typeof result) for(let len = result.length, i = 0; i < len; i++)result[i] = Math.round(result[i]);
+                return result;
+            };
+            return 'conversion' in fn && (wrappedFn.conversion = fn.conversion), wrappedFn;
+        }
         Object.keys(conversions).forEach((fromModel)=>{
             convert[fromModel] = {}, Object.defineProperty(convert[fromModel], 'channels', {
                 value: conversions[fromModel].channels
@@ -826,58 +847,52 @@ exports.ids = [
             });
             let routes = route(fromModel);
             Object.keys(routes).forEach((toModel)=>{
-                let wrappedFn, wrappedFn1, fn = routes[toModel];
-                convert[fromModel][toModel] = (wrappedFn = function(...args) {
-                    let arg0 = args[0];
-                    if (null == arg0) return arg0;
-                    arg0.length > 1 && (args = arg0);
-                    let result = fn(args);
-                    if ('object' == typeof result) for(let len = result.length, i = 0; i < len; i++)result[i] = Math.round(result[i]);
-                    return result;
-                }, 'conversion' in fn && (wrappedFn.conversion = fn.conversion), wrappedFn), convert[fromModel][toModel].raw = (wrappedFn1 = function(...args) {
-                    let arg0 = args[0];
-                    return null == arg0 ? arg0 : (arg0.length > 1 && (args = arg0), fn(args));
-                }, 'conversion' in fn && (wrappedFn1.conversion = fn.conversion), wrappedFn1);
+                let fn = routes[toModel];
+                convert[fromModel][toModel] = wrapRounded(fn), convert[fromModel][toModel].raw = wrapRaw(fn);
             });
         }), module.exports = convert;
     },
     "../../../node_modules/.pnpm/color-convert@2.0.1/node_modules/color-convert/route.js": function(module, __unused_webpack_exports, __webpack_require__) {
         let conversions = __webpack_require__("../../../node_modules/.pnpm/color-convert@2.0.1/node_modules/color-convert/conversions.js");
-        module.exports = function(fromModel) {
-            let graph = function(fromModel) {
-                let graph = function() {
-                    let graph = {}, models = Object.keys(conversions);
-                    for(let len = models.length, i = 0; i < len; i++)graph[models[i]] = {
-                        distance: -1,
-                        parent: null
-                    };
-                    return graph;
-                }(), queue = [
-                    fromModel
-                ];
-                for(graph[fromModel].distance = 0; queue.length;){
-                    let current = queue.pop(), adjacents = Object.keys(conversions[current]);
-                    for(let len = adjacents.length, i = 0; i < len; i++){
-                        let adjacent = adjacents[i], node = graph[adjacent];
-                        -1 === node.distance && (node.distance = graph[current].distance + 1, node.parent = current, queue.unshift(adjacent));
-                    }
+        function buildGraph() {
+            let graph = {}, models = Object.keys(conversions);
+            for(let len = models.length, i = 0; i < len; i++)graph[models[i]] = {
+                distance: -1,
+                parent: null
+            };
+            return graph;
+        }
+        function deriveBFS(fromModel) {
+            let graph = buildGraph(), queue = [
+                fromModel
+            ];
+            for(graph[fromModel].distance = 0; queue.length;){
+                let current = queue.pop(), adjacents = Object.keys(conversions[current]);
+                for(let len = adjacents.length, i = 0; i < len; i++){
+                    let adjacent = adjacents[i], node = graph[adjacent];
+                    -1 === node.distance && (node.distance = graph[current].distance + 1, node.parent = current, queue.unshift(adjacent));
                 }
-                return graph;
-            }(fromModel), conversion = {}, models = Object.keys(graph);
+            }
+            return graph;
+        }
+        function link(from, to) {
+            return function(args) {
+                return to(from(args));
+            };
+        }
+        function wrapConversion(toModel, graph) {
+            let path = [
+                graph[toModel].parent,
+                toModel
+            ], fn = conversions[graph[toModel].parent][toModel], cur = graph[toModel].parent;
+            for(; graph[cur].parent;)path.unshift(graph[cur].parent), fn = link(conversions[graph[cur].parent][cur], fn), cur = graph[cur].parent;
+            return fn.conversion = path, fn;
+        }
+        module.exports = function(fromModel) {
+            let graph = deriveBFS(fromModel), conversion = {}, models = Object.keys(graph);
             for(let len = models.length, i = 0; i < len; i++){
                 let toModel = models[i];
-                null !== graph[toModel].parent && (conversion[toModel] = function(toModel, graph) {
-                    let path = [
-                        graph[toModel].parent,
-                        toModel
-                    ], fn = conversions[graph[toModel].parent][toModel], cur = graph[toModel].parent;
-                    for(; graph[cur].parent;)path.unshift(graph[cur].parent), fn = function(from, to) {
-                        return function(args) {
-                            return to(from(args));
-                        };
-                    }(conversions[graph[cur].parent][cur], fn), cur = graph[cur].parent;
-                    return fn.conversion = path, fn;
-                }(toModel, graph));
+                null !== graph[toModel].parent && (conversion[toModel] = wrapConversion(toModel, graph));
             }
             return conversion;
         };

package/dist/{1~363.cjs → 1~56.cjs}

@@ -1,13 +1,13 @@
 "use strict";
 const __rslib_import_meta_url__ = 'undefined' == typeof document ? new (require('url'.replace('', ''))).URL('file:' + __filename).href : document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href;
 exports.ids = [
-    "363"
+    "56"
 ], exports.modules = {
     "./src/progress/ProgressPlugin.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
             ProgressPlugin: ()=>ProgressPlugin
         });
-        var core_ = __webpack_require__("@rsbuild/core"), external_picocolors_ = __webpack_require__("picocolors"), external_picocolors_default = __webpack_require__.n(external_picocolors_), external_webpack_ = __webpack_require__("webpack?2a1e"), external_webpack_default = __webpack_require__.n(external_webpack_), cli_truncate = __webpack_require__("../../../node_modules/.pnpm/cli-truncate@2.1.0/node_modules/cli-truncate/index.js"), cli_truncate_default = __webpack_require__.n(cli_truncate);
+        var core_ = __webpack_require__("@rsbuild/core"), external_picocolors_ = __webpack_require__("picocolors"), external_picocolors_default = __webpack_require__.n(external_picocolors_), external_webpack_ = __webpack_require__("webpack"), external_webpack_default = __webpack_require__.n(external_webpack_), cli_truncate = __webpack_require__("../../../node_modules/.pnpm/cli-truncate@2.1.0/node_modules/cli-truncate/index.js"), cli_truncate_default = __webpack_require__.n(cli_truncate);
         let clamp = (x, min, max)=>Math.min(max, Math.max(min, x)), defaultOption = {
             total: 100,
             current: 0,
@@ -127,6 +127,18 @@ exports.ids = [
                 this.log.clear(), this.log.done();
             }
         }();
+        function createNonTTYLogger() {
+            let prevPercentage = 0;
+            return {
+                log: ({ id, done, current, hasErrors, compileTime })=>{
+                    let suffix = external_picocolors_default().gray(`(${id})`);
+                    if (done) {
+                        if (100 === prevPercentage) return;
+                        prevPercentage = 100, hasErrors ? core_.logger.error(`build failed in ${compileTime} ${suffix}`) : core_.logger.ready(`built in ${compileTime} ${suffix}`);
+                    } else current - prevPercentage > 10 && (prevPercentage = current, core_.logger.info(`build progress: ${current.toFixed(0)}% ${suffix}`));
+                }
+            };
+        }
         class ProgressPlugin extends external_webpack_default().ProgressPlugin {
             name = 'ProgressPlugin';
             id;
@@ -134,18 +146,7 @@ exports.ids = [
             compileTime = null;
             prettyTime;
             constructor(options){
-                const { id = 'Rsbuild' } = options, nonTTYLogger = function() {
-                    let prevPercentage = 0;
-                    return {
-                        log: ({ id, done, current, hasErrors, compileTime })=>{
-                            let suffix = external_picocolors_default().gray(`(${id})`);
-                            if (done) {
-                                if (100 === prevPercentage) return;
-                                prevPercentage = 100, hasErrors ? core_.logger.error(`built failed in ${compileTime} ${suffix}`) : core_.logger.ready(`built in ${compileTime} ${suffix}`);
-                            } else current - prevPercentage > 10 && (prevPercentage = current, core_.logger.info(`build progress: ${current.toFixed(0)}% ${suffix}`));
-                        }
-                    };
-                }(), friendlyPercentage = (()=>{
+                const { id = 'Rsbuild' } = options, nonTTYLogger = createNonTTYLogger(), friendlyPercentage = (()=>{
                     let prevPercentage = 0;
                     return (percentage)=>{
                         if (0 === percentage || 1 === percentage) return prevPercentage = 0, percentage;

package/dist/index.cjs

@@ -13,33 +13,8 @@ var __webpack_modules__ = {
     stream: function(module) {
         module.exports = require("stream");
     },
-    "webpack?2a1e": function(module) {
+    webpack: function(module) {
         module.exports = require("webpack");
-    },
-    "copy-webpack-plugin": function(module) {
-        module.exports = import("copy-webpack-plugin").then(function(module) {
-            return module;
-        });
-    },
-    "html-webpack-plugin": function(module) {
-        module.exports = import("html-webpack-plugin").then(function(module) {
-            return module;
-        });
-    },
-    "mini-css-extract-plugin": function(module) {
-        module.exports = import("mini-css-extract-plugin").then(function(module) {
-            return module;
-        });
-    },
-    "tsconfig-paths-webpack-plugin": function(module) {
-        module.exports = import("tsconfig-paths-webpack-plugin").then(function(module) {
-            return module;
-        });
-    },
-    "webpack?5a4d": function(module) {
-        module.exports = import("webpack").then(function(module) {
-            return module;
-        });
     }
 }, __webpack_module_cache__ = {};
 function __webpack_require__(moduleId) {
@@ -120,10 +95,10 @@ for(var __webpack_i__ in (()=>{
             mergeFn: utils.mergeConfig
         })), core_.logger.debug('modify webpack config done'), modifiedConfig;
     }
-    async function getChainUtils(target, environment, helpers) {
-        let { default: webpack } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "webpack?5a4d"));
+    async function getChainUtils(target, environment, environments, helpers) {
+        let { default: webpack } = await import("webpack");
         return {
-            ...helpers.getChainUtils(target, environment),
+            ...helpers.getChainUtils(target, environment, environments),
             name: ({
                 web: 'client',
                 node: 'server',
@@ -134,7 +109,7 @@ for(var __webpack_i__ in (()=>{
         };
     }
     async function generateWebpackConfig({ target, context, environment, helpers }) {
-        let chainUtils = await getChainUtils(target, context.environments[environment], helpers), { default: webpack } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "webpack?5a4d")), { BannerPlugin, DefinePlugin, IgnorePlugin, ProvidePlugin, SourceMapDevToolPlugin, HotModuleReplacementPlugin } = webpack, bundlerChain = await helpers.modifyBundlerChain(context, {
+        let chainUtils = await getChainUtils(target, context.environments[environment], context.environments, helpers), { default: webpack } = await import("webpack"), { BannerPlugin, DefinePlugin, IgnorePlugin, ProvidePlugin, SourceMapDevToolPlugin, HotModuleReplacementPlugin } = webpack, bundlerChain = await helpers.modifyBundlerChain(context, {
             ...chainUtils,
             bundler: {
                 BannerPlugin,
@@ -186,7 +161,7 @@ for(var __webpack_i__ in (()=>{
             bundlerConfigs: webpackConfigs,
             environments: context.environments
         });
-        let { default: webpack } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "webpack?5a4d")), compiler = webpack(1 === webpackConfigs.length ? webpackConfigs[0] : webpackConfigs);
+        let { default: webpack } = await import("webpack"), compiler = webpack(1 === webpackConfigs.length ? webpackConfigs[0] : webpackConfigs);
         return compiler.hooks.run.tap(HOOK_NAME, ()=>{
             context.buildState.status = 'building';
         }), compiler.hooks.watchRun.tap(HOOK_NAME, ()=>{
@@ -213,7 +188,7 @@ for(var __webpack_i__ in (()=>{
     }
     let build = async (initOptions, { watch, compiler: customCompiler } = {})=>{
         let compiler, bundlerConfigs, { helpers, context } = initOptions;
-        if (customCompiler) compiler = customCompiler;
+        if (customCompiler) compiler = customCompiler, bundlerConfigs = customCompiler.options;
         else {
             let result = await createCompiler_createCompiler(initOptions);
             compiler = result.compiler, bundlerConfigs = result.webpackConfigs;
@@ -249,7 +224,7 @@ for(var __webpack_i__ in (()=>{
     }, external_node_fs_namespaceObject = require("node:fs");
     var external_node_fs_default = __webpack_require__.n(external_node_fs_namespaceObject);
     async function applyTsConfigPathsPlugin({ chain, CHAIN_ID, mainFields, extensions, configFile }) {
-        let { TsconfigPathsPlugin } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "tsconfig-paths-webpack-plugin"));
+        let { TsconfigPathsPlugin } = await import("tsconfig-paths-webpack-plugin");
         chain.resolve.plugin(CHAIN_ID.RESOLVE_PLUGIN.TS_CONFIG_PATHS).use(TsconfigPathsPlugin, [
             {
                 configFile,
@@ -258,10 +233,13 @@ for(var __webpack_i__ in (()=>{
             }
         ]);
     }
+    function isWebTarget(target) {
+        return castArray(target).includes('web') || target.includes('web-worker');
+    }
     let webpackProvider = async ({ context, pluginManager, rsbuildOptions, helpers })=>{
-        let helpers1, { default: cssExtractPlugin } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "mini-css-extract-plugin"));
+        let helpers1, { default: cssExtractPlugin } = await import("mini-css-extract-plugin");
         if (helpers.setCssExtractPlugin(cssExtractPlugin), helpers.setHTMLPlugin) {
-            let { default: htmlPlugin } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "html-webpack-plugin"));
+            let { default: htmlPlugin } = await import("html-webpack-plugin");
             helpers.setHTMLPlugin(htmlPlugin);
         }
         let createCompiler = async ()=>(await createCompiler_createCompiler({
@@ -275,13 +253,13 @@ for(var __webpack_i__ in (()=>{
                 name: 'rsbuild-webpack:adaptor',
                 setup (api) {
                     api.modifyBundlerChain(async (chain, { CHAIN_ID, environment, target })=>{
-                        var chain1, target1, target2;
+                        var chain1, target1;
                         let mainFields, { config, tsconfigPath } = environment, aliasStrategy = config.source.aliasStrategy ?? config.resolve.aliasStrategy;
                         tsconfigPath && 'prefer-tsconfig' === aliasStrategy && await applyTsConfigPathsPlugin({
                             chain,
                             CHAIN_ID,
                             configFile: tsconfigPath,
-                            mainFields: (chain1 = chain, target1 = target, (mainFields = chain1.resolve.mainFields.values()).length ? mainFields : castArray(target2 = target1).includes('web') || target2.includes('web-worker') ? [
+                            mainFields: (chain1 = chain, target1 = target, (mainFields = chain1.resolve.mainFields.values()).length ? mainFields : isWebTarget(target1) ? [
                                 'browser',
                                 'module',
                                 'main'
@@ -295,7 +273,7 @@ for(var __webpack_i__ in (()=>{
                         if (progressBar) {
                             let { ProgressPlugin } = await Promise.all([
                                 __webpack_require__.e("0"),
-                                __webpack_require__.e("363")
+                                __webpack_require__.e("56")
                             ]).then(__webpack_require__.bind(__webpack_require__, "./src/progress/ProgressPlugin.ts"));
                             chain.plugin(CHAIN_ID.PLUGIN.PROGRESS).use(ProgressPlugin, [
                                 {
@@ -307,7 +285,7 @@ for(var __webpack_i__ in (()=>{
                         }
                         let { copy } = config.output;
                         if (copy) {
-                            let { default: CopyPlugin } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "copy-webpack-plugin")), options = Array.isArray(copy) ? {
+                            let { default: CopyPlugin } = await import("copy-webpack-plugin"), options = Array.isArray(copy) ? {
                                 patterns: copy
                             } : copy;
                             chain.plugin(CHAIN_ID.PLUGIN.COPY).use(CopyPlugin, [