@rsbuild/webpack 1.0.0-alpha.2 → 1.0.0-alpha.3

package/dist/build.d.ts

@@ -1,3 +1,3 @@
-import type { BuildOptions } from '@rsbuild/shared';
+import type { BuildOptions } from '@rsbuild/core';
 import { type InitConfigsOptions } from './initConfigs';
 export declare const build: (initOptions: InitConfigsOptions, { mode, watch, compiler: customCompiler }?: BuildOptions) => Promise<void>;

package/dist/index.cjs

@@ -39,7 +39,7 @@ var __publicField = (obj, key, value) => {
 };
 
 // src/shared.ts
-var import_core, getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, getRsbuildInspectConfig, chainToConfig, modifyBundlerChain, onCompileDone, prettyTime;
+var import_core, getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, getRsbuildInspectConfig, chainToConfig, modifyBundlerChain, onCompileDone, prettyTime, castArray;
 var init_shared = __esm({
   "src/shared.ts"() {
     "use strict";
@@ -59,6 +59,12 @@ var init_shared = __esm({
       onCompileDone,
       prettyTime
     } = import_core.__internalHelper);
+    castArray = (arr) => {
+      if (arr === void 0) {
+        return [];
+      }
+      return Array.isArray(arr) ? arr : [arr];
+    };
   }
 });
 
@@ -141,8 +147,8 @@ async function modifyWebpackChain(context, utils, chain) {
     chain,
     utils
   );
-  if (context.config.tools?.webpackChain) {
-    for (const item of (0, import_shared2.castArray)(context.config.tools.webpackChain)) {
+  if (utils.environment.config.tools?.webpackChain) {
+    for (const item of castArray(utils.environment.config.tools.webpackChain)) {
       item(modifiedChain, utils);
     }
   }
@@ -155,10 +161,10 @@ async function modifyWebpackConfig(context, webpackConfig, utils) {
     webpackConfig,
     utils
   );
-  if (context.config.tools?.webpack) {
+  if (utils.environment.config.tools?.webpack) {
     modifiedConfig = (0, import_reduce_configs.reduceConfigsWithContext)({
       initial: modifiedConfig,
-      config: context.config.tools.webpack,
+      config: utils.environment.config.tools.webpack,
       ctx: utils,
       mergeFn: utils.mergeConfig
     });
@@ -180,44 +186,6 @@ async function getChainUtils2(target, environment) {
     HtmlWebpackPlugin: import_core2.__internalHelper.getHTMLPlugin()
   };
 }
-async function getConfigUtils(config, chainUtils) {
-  const { merge } = await import("@rsbuild/shared/webpack-merge");
-  return {
-    ...chainUtils,
-    mergeConfig: merge,
-    addRules(rules) {
-      const ruleArr = (0, import_shared2.castArray)(rules);
-      if (!config.module) {
-        config.module = {};
-      }
-      if (!config.module.rules) {
-        config.module.rules = [];
-      }
-      config.module.rules.unshift(...ruleArr);
-    },
-    prependPlugins(plugins) {
-      const pluginArr = (0, import_shared2.castArray)(plugins);
-      if (!config.plugins) {
-        config.plugins = [];
-      }
-      config.plugins.unshift(...pluginArr);
-    },
-    appendPlugins(plugins) {
-      const pluginArr = (0, import_shared2.castArray)(plugins);
-      if (!config.plugins) {
-        config.plugins = [];
-      }
-      config.plugins.push(...pluginArr);
-    },
-    removePlugin(pluginName) {
-      if (config.plugins) {
-        config.plugins = config.plugins.filter(
-          (item) => item?.constructor.name !== pluginName
-        );
-      }
-    }
-  };
-}
 async function generateWebpackConfig({
   target,
   context,
@@ -247,19 +215,22 @@ async function generateWebpackConfig({
   });
   const chain = await modifyWebpackChain(context, chainUtils, bundlerChain);
   let webpackConfig = chainToConfig(chain);
+  const configUtils = await import_core2.__internalHelper.getConfigUtils(
+    webpackConfig,
+    chainUtils
+  );
   webpackConfig = await modifyWebpackConfig(
     context,
     webpackConfig,
-    await getConfigUtils(webpackConfig, chainUtils)
+    configUtils
   );
   return webpackConfig;
 }
-var import_core2, import_shared2, import_reduce_configs;
+var import_core2, import_reduce_configs;
 var init_webpackConfig = __esm({
   "src/webpackConfig.ts"() {
     "use strict";
     import_core2 = require("@rsbuild/core");
-    import_shared2 = require("@rsbuild/shared");
     import_reduce_configs = require("reduce-configs");
     init_shared();
   }
@@ -1839,12 +1810,12 @@ var init_utils = __esm({
 });
 
 // src/progress/helpers/bar.ts
-var import_shared7, import_cli_truncate, defaultOption, padding, FULL_WIDTH, MIDDLE_WIDTH, renderBar;
+var import_cli_truncate, import_picocolors, defaultOption, padding, FULL_WIDTH, MIDDLE_WIDTH, renderBar;
 var init_bar = __esm({
   "src/progress/helpers/bar.ts"() {
     "use strict";
-    import_shared7 = require("@rsbuild/shared");
     import_cli_truncate = __toESM(require_cli_truncate());
+    import_picocolors = __toESM(require("picocolors"));
     init_utils();
     defaultOption = {
       total: 100,
@@ -1897,15 +1868,15 @@ var init_bar = __esm({
       } = mergedOptions;
       const space = " ".repeat(spaceWidth);
       const percent = clamp(Math.floor(current / total * 100), 0, 100);
-      const barColor = import_shared7.color[color3];
-      const backgroundColor = import_shared7.color[bgColor];
-      const doneColor = hasErrors ? import_shared7.color.red : barColor;
+      const barColor = import_picocolors.default[color3];
+      const backgroundColor = import_picocolors.default[bgColor];
+      const doneColor = hasErrors ? import_picocolors.default.red : barColor;
       const idColor = done ? doneColor : barColor;
       const id = mergedOptions.id ? idColor(padding(mergedOptions.id, maxIdLen)) : "";
       const { columns: terminalWidth = FULL_WIDTH } = process.stdout;
       if (done) {
         if (hasErrors) {
-          const message2 = import_shared7.color.bold(doneColor(errorInfo));
+          const message2 = import_picocolors.default.bold(doneColor(errorInfo));
           if (terminalWidth >= MIDDLE_WIDTH) {
             return [idColor(errorIcon), id, doneColor(`${space}${message2}`)].join(
               ""
@@ -1915,7 +1886,7 @@ var init_bar = __esm({
         }
         return "";
       }
-      const msgStr = import_shared7.color[messageColor](
+      const msgStr = import_picocolors.default[messageColor](
         (0, import_cli_truncate.default)(message, messageWidth, { position: "start" })
       );
       const left = clamp(Math.floor(percent * width / 100), 0, width);
@@ -2180,9 +2151,9 @@ var init_bus = __esm({
   }
 });
 
-// src/progress/helpers/type.ts
-var init_type = __esm({
-  "src/progress/helpers/type.ts"() {
+// src/progress/helpers/types.ts
+var init_types = __esm({
+  "src/progress/helpers/types.ts"() {
     "use strict";
   }
 });
@@ -2226,7 +2197,7 @@ var init_helpers = __esm({
     "use strict";
     init_bus();
     init_bar();
-    init_type();
+    init_types();
     init_percentage();
   }
 });
@@ -2241,7 +2212,7 @@ function createNonTTYLogger() {
     hasErrors,
     compileTime
   }) => {
-    const suffix = import_shared8.color.gray(`(${id})`);
+    const suffix = import_picocolors2.default.gray(`(${id})`);
     if (done) {
       if (prevPercentage === 100) {
         return;
@@ -2261,12 +2232,12 @@ function createNonTTYLogger() {
     log
   };
 }
-var import_core5, import_shared8;
+var import_core5, import_picocolors2;
 var init_nonTty = __esm({
   "src/progress/helpers/nonTty.ts"() {
     "use strict";
     import_core5 = require("@rsbuild/core");
-    import_shared8 = require("@rsbuild/shared");
+    import_picocolors2 = __toESM(require("picocolors"));
   }
 });
 
@@ -2275,12 +2246,12 @@ var ProgressPlugin_exports = {};
 __export(ProgressPlugin_exports, {
   ProgressPlugin: () => ProgressPlugin
 });
-var import_core6, import_shared9, import_webpack, ProgressPlugin;
+var import_core6, import_picocolors3, import_webpack, ProgressPlugin;
 var init_ProgressPlugin = __esm({
   "src/progress/ProgressPlugin.ts"() {
     "use strict";
     import_core6 = require("@rsbuild/core");
-    import_shared9 = require("@rsbuild/shared");
+    import_picocolors3 = __toESM(require("picocolors"));
     import_webpack = __toESM(require("webpack"));
     init_shared();
     init_helpers();
@@ -2343,7 +2314,7 @@ var init_ProgressPlugin = __esm({
             this.compileTime = prettyTime(seconds);
             startTime = null;
             if (!this.hasCompileErrors) {
-              const suffix = this.id ? import_shared9.color.gray(` (${this.id})`) : "";
+              const suffix = this.id ? import_picocolors3.default.gray(` (${this.id})`) : "";
               import_core6.logger.ready(`Compiled in ${this.compileTime} ${suffix}`);
             }
           }
@@ -2376,15 +2347,15 @@ async function applyTsConfigPathsPlugin({
   ]);
 }
 function isWebTarget(target) {
-  const targets = (0, import_shared11.castArray)(target);
+  const targets = castArray(target);
   return targets.includes("web") || target.includes("web-worker");
 }
-var import_node_fs, import_shared11, getMainFields, pluginAdaptor;
+var import_node_fs, getMainFields, pluginAdaptor;
 var init_plugin = __esm({
   "src/plugin.ts"() {
     "use strict";
     import_node_fs = __toESM(require("fs"));
-    import_shared11 = require("@rsbuild/shared");
+    init_shared();
     getMainFields = (chain, target) => {
       const mainFields = chain.resolve.mainFields.values();
       if (mainFields.length) {
@@ -2503,19 +2474,21 @@ var init_build = __esm({
         });
         return;
       }
-      await new Promise((resolve, reject) => {
-        compiler.run((err, stats) => {
-          if (err || stats?.hasErrors()) {
-            const buildError = err || new Error("Webpack build failed!");
-            reject(buildError);
-          } else {
-            compiler.close((closeErr) => {
-              closeErr && import_core7.logger.error(closeErr);
-              resolve({ stats });
-            });
-          }
-        });
-      });
+      await new Promise(
+        (resolve, reject) => {
+          compiler.run((err, stats) => {
+            if (err || stats?.hasErrors()) {
+              const buildError = err || new Error("Webpack build failed!");
+              reject(buildError);
+            } else {
+              compiler.close((closeErr) => {
+                closeErr && import_core7.logger.error(closeErr);
+                resolve({ stats });
+              });
+            }
+          });
+        }
+      );
     };
   }
 });

package/dist/index.js

@@ -57,7 +57,7 @@ var init_esm = __esm({
 
 // src/shared.ts
 import { __internalHelper } from "@rsbuild/core";
-var getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, getRsbuildInspectConfig, chainToConfig, modifyBundlerChain, onCompileDone, prettyTime;
+var getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, getRsbuildInspectConfig, chainToConfig, modifyBundlerChain, onCompileDone, prettyTime, castArray;
 var init_shared = __esm({
   "src/shared.ts"() {
     "use strict";
@@ -77,6 +77,12 @@ var init_shared = __esm({
       onCompileDone,
       prettyTime
     } = __internalHelper);
+    castArray = (arr) => {
+      if (arr === void 0) {
+        return [];
+      }
+      return Array.isArray(arr) ? arr : [arr];
+    };
   }
 });
 
@@ -157,9 +163,6 @@ import {
   __internalHelper as __internalHelper2,
   logger
 } from "@rsbuild/core";
-import {
-  castArray
-} from "@rsbuild/shared";
 import { reduceConfigsWithContext } from "reduce-configs";
 async function modifyWebpackChain(context, utils, chain) {
   logger.debug("modify webpack chain");
@@ -167,8 +170,8 @@ async function modifyWebpackChain(context, utils, chain) {
     chain,
     utils
   );
-  if (context.config.tools?.webpackChain) {
-    for (const item of castArray(context.config.tools.webpackChain)) {
+  if (utils.environment.config.tools?.webpackChain) {
+    for (const item of castArray(utils.environment.config.tools.webpackChain)) {
       item(modifiedChain, utils);
     }
   }
@@ -181,10 +184,10 @@ async function modifyWebpackConfig(context, webpackConfig, utils) {
     webpackConfig,
     utils
   );
-  if (context.config.tools?.webpack) {
+  if (utils.environment.config.tools?.webpack) {
     modifiedConfig = reduceConfigsWithContext({
       initial: modifiedConfig,
-      config: context.config.tools.webpack,
+      config: utils.environment.config.tools.webpack,
       ctx: utils,
       mergeFn: utils.mergeConfig
     });
@@ -206,44 +209,6 @@ async function getChainUtils2(target, environment) {
     HtmlWebpackPlugin: __internalHelper2.getHTMLPlugin()
   };
 }
-async function getConfigUtils(config, chainUtils) {
-  const { merge } = await import("@rsbuild/shared/webpack-merge");
-  return {
-    ...chainUtils,
-    mergeConfig: merge,
-    addRules(rules) {
-      const ruleArr = castArray(rules);
-      if (!config.module) {
-        config.module = {};
-      }
-      if (!config.module.rules) {
-        config.module.rules = [];
-      }
-      config.module.rules.unshift(...ruleArr);
-    },
-    prependPlugins(plugins) {
-      const pluginArr = castArray(plugins);
-      if (!config.plugins) {
-        config.plugins = [];
-      }
-      config.plugins.unshift(...pluginArr);
-    },
-    appendPlugins(plugins) {
-      const pluginArr = castArray(plugins);
-      if (!config.plugins) {
-        config.plugins = [];
-      }
-      config.plugins.push(...pluginArr);
-    },
-    removePlugin(pluginName) {
-      if (config.plugins) {
-        config.plugins = config.plugins.filter(
-          (item) => item?.constructor.name !== pluginName
-        );
-      }
-    }
-  };
-}
 async function generateWebpackConfig({
   target,
   context,
@@ -273,10 +238,14 @@ async function generateWebpackConfig({
   });
   const chain = await modifyWebpackChain(context, chainUtils, bundlerChain);
   let webpackConfig = chainToConfig(chain);
+  const configUtils = await __internalHelper2.getConfigUtils(
+    webpackConfig,
+    chainUtils
+  );
   webpackConfig = await modifyWebpackConfig(
     context,
     webpackConfig,
-    await getConfigUtils(webpackConfig, chainUtils)
+    configUtils
   );
   return webpackConfig;
 }
@@ -1879,7 +1848,7 @@ var init_utils = __esm({
 });
 
 // src/progress/helpers/bar.ts
-import { color as colors } from "@rsbuild/shared";
+import colors from "picocolors";
 var import_cli_truncate, defaultOption, padding, FULL_WIDTH, MIDDLE_WIDTH, renderBar;
 var init_bar = __esm({
   "src/progress/helpers/bar.ts"() {
@@ -2224,9 +2193,9 @@ var init_bus = __esm({
   }
 });
 
-// src/progress/helpers/type.ts
-var init_type = __esm({
-  "src/progress/helpers/type.ts"() {
+// src/progress/helpers/types.ts
+var init_types = __esm({
+  "src/progress/helpers/types.ts"() {
     "use strict";
     init_esm();
   }
@@ -2273,14 +2242,14 @@ var init_helpers = __esm({
     init_esm();
     init_bus();
     init_bar();
-    init_type();
+    init_types();
     init_percentage();
   }
 });
 
 // src/progress/helpers/nonTty.ts
 import { logger as logger4 } from "@rsbuild/core";
-import { color } from "@rsbuild/shared";
+import color from "picocolors";
 function createNonTTYLogger() {
   let prevPercentage = 0;
   const log = ({
@@ -2323,7 +2292,7 @@ __export(ProgressPlugin_exports, {
   ProgressPlugin: () => ProgressPlugin
 });
 import { logger as logger5 } from "@rsbuild/core";
-import { color as color2 } from "@rsbuild/shared";
+import color2 from "picocolors";
 import webpack from "webpack";
 var ProgressPlugin;
 var init_ProgressPlugin = __esm({
@@ -2407,7 +2376,6 @@ __export(plugin_exports, {
   pluginAdaptor: () => pluginAdaptor
 });
 import fs from "fs";
-import { castArray as castArray2 } from "@rsbuild/shared";
 async function applyTsConfigPathsPlugin({
   chain,
   CHAIN_ID,
@@ -2426,7 +2394,7 @@ async function applyTsConfigPathsPlugin({
   ]);
 }
 function isWebTarget(target) {
-  const targets = castArray2(target);
+  const targets = castArray(target);
   return targets.includes("web") || target.includes("web-worker");
 }
 var getMainFields, pluginAdaptor;
@@ -2434,6 +2402,7 @@ var init_plugin = __esm({
   "src/plugin.ts"() {
     "use strict";
     init_esm();
+    init_shared();
     getMainFields = (chain, target) => {
       const mainFields = chain.resolve.mainFields.values();
       if (mainFields.length) {
@@ -2553,19 +2522,21 @@ var init_build = __esm({
         });
         return;
       }
-      await new Promise((resolve, reject) => {
-        compiler.run((err, stats) => {
-          if (err || stats?.hasErrors()) {
-            const buildError = err || new Error("Webpack build failed!");
-            reject(buildError);
-          } else {
-            compiler.close((closeErr) => {
-              closeErr && logger6.error(closeErr);
-              resolve({ stats });
-            });
-          }
-        });
-      });
+      await new Promise(
+        (resolve, reject) => {
+          compiler.run((err, stats) => {
+            if (err || stats?.hasErrors()) {
+              const buildError = err || new Error("Webpack build failed!");
+              reject(buildError);
+            } else {
+              compiler.close((closeErr) => {
+                closeErr && logger6.error(closeErr);
+                resolve({ stats });
+              });
+            }
+          });
+        }
+      );
     };
   }
 });

package/dist/initConfigs.d.ts

@@ -1,5 +1,4 @@
-import { type CreateRsbuildOptions } from '@rsbuild/core';
-import type { PluginManager } from '@rsbuild/shared';
+import { type CreateRsbuildOptions, type PluginManager } from '@rsbuild/core';
 import { type InternalContext } from './shared';
 import type { WebpackConfig } from './types';
 export type InitConfigsOptions = {

package/dist/progress/ProgressPlugin.d.ts

@@ -1,5 +1,5 @@
 import webpack from 'webpack';
-import type { Props } from './helpers/type';
+import type { Props } from './helpers/types';
 export interface ProgressOptions extends Omit<Partial<Props>, 'message' | 'total' | 'current' | 'done'> {
     id?: string;
 }

package/dist/progress/helpers/bar.d.ts

@@ -1,4 +1,4 @@
-import type { Props } from './type';
+import type { Props } from './types';
 export declare const FULL_WIDTH = 70;
 export declare const MIDDLE_WIDTH = 40;
 export declare const SMALL_WIDTH = 15;

package/dist/progress/helpers/bus.d.ts

@@ -1,6 +1,5 @@
-import type { Colors } from '@rsbuild/shared';
 import type { LogUpdate } from './log';
-import type { Props } from './type';
+import type { Colors, Props } from './types';
 export declare const getProgressColor: (index: number) => Colors;
 declare class Bus {
     states: Partial<Props>[];

package/dist/progress/helpers/index.d.ts

@@ -1,4 +1,4 @@
 export * from './bus';
 export * from './bar';
-export * from './type';
+export * from './types';
 export * from './percentage';

package/dist/progress/helpers/{type.d.ts → types.d.ts}

@@ -1,4 +1,5 @@
-import type { Colors } from '@rsbuild/shared';
+import type color from 'picocolors';
+export type Colors = Omit<keyof typeof color, 'createColor' | 'isColorSupported'>;
 export type Props = {
     total: number;
     current: number;

package/dist/shared.d.ts

@@ -2,7 +2,7 @@ import { __internalHelper } from '@rsbuild/core';
 declare const getChainUtils: typeof __internalHelper.getChainUtils, initRsbuildConfig: typeof __internalHelper.initRsbuildConfig, createDevServer: typeof __internalHelper.createDevServer, formatStats: typeof __internalHelper.formatStats, getDevMiddleware: (multiCompiler: import("@rspack/core").Compiler | import("@rspack/core").MultiCompiler) => Promise<NonNullable<import("node_modules/@rsbuild/core/dist-types/server/devMiddleware").DevMiddleware>>, getStatsOptions: typeof __internalHelper.getStatsOptions, stringifyConfig: typeof __internalHelper.stringifyConfig, outputInspectConfigFiles: typeof __internalHelper.outputInspectConfigFiles, getRsbuildInspectConfig: ({ normalizedConfig, inspectOptions, pluginManager, }: {
     normalizedConfig: import("@rsbuild/core").NormalizedConfig;
     inspectOptions: import("@rsbuild/core").InspectConfigOptions;
-    pluginManager: import("@rsbuild/shared").PluginManager;
+    pluginManager: import("@rsbuild/core").PluginManager;
 }) => {
     rawRsbuildConfig: string;
     rsbuildConfig: import("@rsbuild/core").InspectConfigResult["origin"]["rsbuildConfig"];
@@ -11,6 +11,7 @@ declare const getChainUtils: typeof __internalHelper.getChainUtils, initRsbuildC
         content: string;
     }>;
     environmentConfigs: import("@rsbuild/core").InspectConfigResult["origin"]["environmentConfigs"];
-}, chainToConfig: typeof __internalHelper.chainToConfig, modifyBundlerChain: typeof __internalHelper.modifyBundlerChain, onCompileDone: (compiler: import("@rspack/core").Compiler | import("@rspack/core").MultiCompiler, onDone: (stats: import("@rsbuild/shared").Stats | import("@rsbuild/shared").MultiStats) => Promise<void>, MultiStatsCtor: new (stats: import("@rsbuild/shared").Stats[]) => import("@rsbuild/shared").MultiStats) => void, prettyTime: (seconds: number) => string;
+}, chainToConfig: typeof __internalHelper.chainToConfig, modifyBundlerChain: typeof __internalHelper.modifyBundlerChain, onCompileDone: (compiler: import("@rspack/core").Compiler | import("@rspack/core").MultiCompiler, onDone: (stats: import("@rspack/core").Stats | import("@rspack/core").MultiStats) => Promise<void>, MultiStatsCtor: new (stats: import("@rspack/core").Stats[]) => import("@rspack/core").MultiStats) => void, prettyTime: (seconds: number) => string;
 export { getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, chainToConfig, modifyBundlerChain, onCompileDone, prettyTime, getRsbuildInspectConfig, };
 export type InternalContext = __internalHelper.InternalContext;
+export declare const castArray: <T>(arr?: T | T[]) => T[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/webpack",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "homepage": "https://rsbuild.dev",
   "repository": {
     "type": "git",
@@ -25,11 +25,11 @@
   "dependencies": {
     "copy-webpack-plugin": "11.0.0",
     "mini-css-extract-plugin": "2.9.0",
+    "picocolors": "^1.0.1",
     "reduce-configs": "^1.0.0",
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "webpack": "^5.92.1",
-    "@rsbuild/core": "1.0.0-alpha.2",
-    "@rsbuild/shared": "1.0.0-alpha.2"
+    "@rsbuild/core": "1.0.0-alpha.3"
   },
   "devDependencies": {
     "@types/node": "18.x",
@@ -37,7 +37,7 @@
     "cli-truncate": "2.1.0",
     "patch-console": "1.0.0",
     "typescript": "^5.5.2",
-    "@scripts/test-helper": "1.0.0-alpha.2"
+    "@scripts/test-helper": "1.0.0-alpha.3"
   },
   "publishConfig": {
     "access": "public",