@rsbuild/webpack 0.2.18 → 0.3.1

package/dist/core/build.d.ts

@@ -1,16 +1,3 @@
-import { InitConfigsOptions } from './initConfigs';
-import { type Stats, type BuildOptions } from '@rsbuild/shared';
-import type { Compiler, MultiStats, MultiCompiler } from 'webpack';
-export interface BuildExecuter {
-    (compiler: Compiler): Promise<{
-        stats: Stats;
-    }>;
-    (compiler: MultiCompiler): Promise<{
-        stats: MultiStats;
-    }>;
-    (compiler: Compiler | MultiCompiler): Promise<{
-        stats: Stats | MultiStats;
-    }>;
-}
-export declare const webpackBuild: BuildExecuter;
-export declare const build: (initOptions: InitConfigsOptions, { mode, watch, compiler: customCompiler }?: BuildOptions, executer?: BuildExecuter) => Promise<void>;
+import { type InitConfigsOptions } from './initConfigs';
+import { type BuildOptions } from '@rsbuild/shared';
+export declare const build: (initOptions: InitConfigsOptions, { mode, watch, compiler: customCompiler }?: BuildOptions) => Promise<void>;

package/dist/core/build.js

@@ -18,29 +18,13 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var build_exports = {};
 __export(build_exports, {
-  build: () => build,
-  webpackBuild: () => webpackBuild
+  build: () => build
 });
 module.exports = __toCommonJS(build_exports);
 var import_createCompiler = require("./createCompiler");
 var import_initConfigs = require("./initConfigs");
 var import_shared = require("@rsbuild/shared");
-const webpackBuild = async (compiler) => {
-  return 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_shared.logger.error(closeErr);
-          resolve({ stats });
-        });
-      }
-    });
-  });
-};
-const build = async (initOptions, { mode = "production", watch, compiler: customCompiler } = {}, executer) => {
+const build = async (initOptions, { mode = "production", watch, compiler: customCompiler } = {}) => {
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = mode;
   }
@@ -57,7 +41,7 @@ const build = async (initOptions, { mode = "production", watch, compiler: custom
     });
     bundlerConfigs = webpackConfigs;
   }
-  await context.hooks.onBeforeBuildHook.call({
+  await context.hooks.onBeforeBuild.call({
     bundlerConfigs
   });
   if (watch) {
@@ -66,15 +50,26 @@ const build = async (initOptions, { mode = "production", watch, compiler: custom
         import_shared.logger.error(err);
       }
     });
-  } else {
-    const executeResult = await executer?.(compiler);
-    await context.hooks.onAfterBuildHook.call({
-      stats: executeResult?.stats
-    });
+    return;
   }
+  const { stats } = await new Promise(
+    (resolve, reject) => {
+      compiler.run((err, stats2) => {
+        if (err || stats2?.hasErrors()) {
+          const buildError = err || new Error("Webpack build failed!");
+          reject(buildError);
+        } else {
+          compiler.close((closeErr) => {
+            closeErr && import_shared.logger.error(closeErr);
+            resolve({ stats: stats2 });
+          });
+        }
+      });
+    }
+  );
+  await context.hooks.onAfterBuild.call({ stats });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  build,
-  webpackBuild
+  build
 });

package/dist/core/createCompiler.d.ts

@@ -1,7 +1,7 @@
 import { type Rspack } from '@rsbuild/shared';
 import type { InternalContext } from '@rsbuild/core/provider';
 import type { WebpackConfig } from '../types';
-import { InitConfigsOptions } from './initConfigs';
+import { type InitConfigsOptions } from './initConfigs';
 export declare function createCompiler({ context, webpackConfigs, }: {
     context: InternalContext;
     webpackConfigs: WebpackConfig[];

package/dist/core/createCompiler.js

@@ -40,7 +40,7 @@ async function createCompiler({
   webpackConfigs
 }) {
   (0, import_shared.debug)("create compiler");
-  await context.hooks.onBeforeCreateCompilerHook.call({
+  await context.hooks.onBeforeCreateCompiler.call({
     bundlerConfigs: webpackConfigs
   });
   const { default: webpack } = await Promise.resolve().then(() => __toESM(require("webpack")));
@@ -55,14 +55,14 @@ async function createCompiler({
       import_shared.logger.warn(message);
     }
     if ((0, import_shared.isDev)()) {
-      await context.hooks.onDevCompileDoneHook.call({
+      await context.hooks.onDevCompileDone.call({
         isFirstCompile,
         stats
       });
     }
     isFirstCompile = false;
   });
-  await context.hooks.onAfterCreateCompilerHook.call({
+  await context.hooks.onAfterCreateCompiler.call({
     compiler
   });
   (0, import_shared.debug)("create compiler done");

package/dist/core/initConfigs.js

@@ -52,8 +52,8 @@ async function initConfigs({
         bundlerConfigs: webpackConfigs
       });
     };
-    context.hooks.onBeforeBuildHook.tap(inspect);
-    context.hooks.onBeforeStartDevServerHook.tap(inspect);
+    context.hooks.onBeforeBuild.tap(inspect);
+    context.hooks.onBeforeStartDevServer.tap(inspect);
   }
   return {
     webpackConfigs

package/dist/core/inspectConfig.d.ts

@@ -1,4 +1,4 @@
-import { InitConfigsOptions } from './initConfigs';
+import { type InitConfigsOptions } from './initConfigs';
 import { type InspectConfigResult, type InspectConfigOptions } from '@rsbuild/shared';
 import type { WebpackConfig } from '../types';
 export declare function inspectConfig({ context, pluginStore, rsbuildOptions, bundlerConfigs, inspectOptions, }: InitConfigsOptions & {

package/dist/core/webpackConfig.js

@@ -35,7 +35,7 @@ var import_shared = require("@rsbuild/shared");
 var import_shared2 = require("../shared");
 async function modifyWebpackChain(context, utils, chain) {
   (0, import_shared.debug)("modify webpack chain");
-  const [modifiedChain] = await context.hooks.modifyWebpackChainHook.call(
+  const [modifiedChain] = await context.hooks.modifyWebpackChain.call(
     chain,
     utils
   );
@@ -49,7 +49,7 @@ async function modifyWebpackChain(context, utils, chain) {
 }
 async function modifyWebpackConfig(context, webpackConfig, utils) {
   (0, import_shared.debug)("modify webpack config");
-  let [modifiedConfig] = await context.hooks.modifyWebpackConfigHook.call(
+  let [modifiedConfig] = await context.hooks.modifyWebpackConfig.call(
     webpackConfig,
     utils
   );

package/dist/index.d.ts

@@ -1,3 +1,2 @@
 export { webpackProvider } from './provider';
-export { webpackBuild } from './core/build';
 export type { webpack, WebpackChain, WebpackConfig, } from './types';

package/dist/index.js

@@ -18,14 +18,11 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  webpackBuild: () => import_build.webpackBuild,
   webpackProvider: () => import_provider.webpackProvider
 });
 module.exports = __toCommonJS(src_exports);
 var import_provider = require("./provider");
-var import_build = require("./core/build");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  webpackBuild,
   webpackProvider
 });

package/dist/plugins/css.d.ts

@@ -1,4 +1,4 @@
-import { ModifyChainUtils, type RsbuildContext, type RsbuildPlugin, type NormalizedConfig, type BundlerChainRule } from '@rsbuild/shared';
+import { type RsbuildContext, type RsbuildPlugin, type NormalizedConfig, type BundlerChainRule, type ModifyChainUtils } from '@rsbuild/shared';
 export declare function applyBaseCSSRule({ rule, config, context, utils: { target, isProd, isServer, CHAIN_ID, isWebWorker }, importLoaders, }: {
     rule: BundlerChainRule;
     config: NormalizedConfig;

package/dist/plugins/less.d.ts

@@ -1,4 +1,4 @@
-import { FileFilterUtil, type RsbuildPlugin } from '@rsbuild/shared';
+import { type RsbuildPlugin, type FileFilterUtil } from '@rsbuild/shared';
 export type LessLoaderUtils = {
     addExcludes: FileFilterUtil;
 };

package/dist/plugins/server.d.ts

@@ -1,2 +1,2 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
+import type { RsbuildPlugin } from '@rsbuild/shared';
 export declare const pluginServer: () => RsbuildPlugin;

package/dist/plugins/server.js

@@ -39,7 +39,7 @@ const pluginServer = () => ({
     api.modifyBundlerChain(async (chain, { isProd }) => {
       const config = api.getNormalizedConfig();
       if (isProd && config.server?.publicDir) {
-        const { name, copyOnBuild } = config.server?.publicDir;
+        const { name, copyOnBuild } = config.server.publicDir;
         if (!copyOnBuild || !name) {
           return;
         }

package/dist/progress/ProgressPlugin.js

@@ -5,6 +5,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -26,6 +27,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 var ProgressPlugin_exports = {};
 __export(ProgressPlugin_exports, {
   ProgressPlugin: () => ProgressPlugin
@@ -49,8 +54,8 @@ class ProgressPlugin extends import_webpack.default.ProgressPlugin {
       dependencies: true,
       dependenciesCount: 1e4,
       percentBy: null,
-      handler: (percentage, message) => {
-        percentage = friendlyPercentage(percentage);
+      handler: (originalPercentage, message) => {
+        const percentage = friendlyPercentage(originalPercentage);
         const done = percentage === 1;
         if (process.stdout.isTTY) {
           import_helpers.bus.update({
@@ -72,9 +77,10 @@ class ProgressPlugin extends import_webpack.default.ProgressPlugin {
         }
       }
     });
-    this.name = "ProgressPlugin";
-    this.hasCompileErrors = false;
-    this.compileTime = null;
+    __publicField(this, "name", "ProgressPlugin");
+    __publicField(this, "id");
+    __publicField(this, "hasCompileErrors", false);
+    __publicField(this, "compileTime", null);
     this.id = id;
   }
   apply(compiler) {

package/dist/progress/helpers/bus.js

@@ -5,6 +5,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -26,6 +27,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 var bus_exports = {};
 __export(bus_exports, {
   bus: () => bus
@@ -39,8 +44,11 @@ var import_log = require("./log");
 var import_shared = require("@rsbuild/shared");
 class Bus {
   constructor() {
-    this.states = [];
-    this.destroyed = false;
+    __publicField(this, "states", []);
+    __publicField(this, "log");
+    __publicField(this, "restore");
+    __publicField(this, "prevOutput");
+    __publicField(this, "destroyed", false);
     this.prevOutput = "";
     this.log = (0, import_log.create)(process.stdout);
     console.Console = import_console.Console;

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Writable } from 'stream';
+import type { Writable } from 'stream';
 export interface LogUpdate {
     clear: () => void;
     done: () => void;

package/dist/provider.js

@@ -44,9 +44,19 @@ const webpackProvider = async ({
   const context = await (0, import_provider.createContext)(rsbuildOptions, rsbuildConfig, "webpack");
   const pluginAPI = (0, import_provider.getPluginAPI)({ context, pluginStore });
   context.pluginAPI = pluginAPI;
+  const createCompiler = async () => {
+    const { createCompiler: createCompiler2 } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
+    const { webpackConfigs } = await (0, import_initConfigs.initConfigs)({
+      context,
+      pluginStore,
+      rsbuildOptions
+    });
+    return createCompiler2({ context, webpackConfigs });
+  };
   return {
     bundler: "webpack",
     pluginAPI,
+    createCompiler,
     publicContext: (0, import_provider.createPublicContext)(context),
     async applyDefaultPlugins() {
       pluginStore.addPlugins(await (0, import_shared2.applyDefaultPlugins)(plugins));
@@ -59,15 +69,6 @@ const webpackProvider = async ({
       });
       return webpackConfigs;
     },
-    async createCompiler() {
-      const { createCompiler } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
-      const { webpackConfigs } = await (0, import_initConfigs.initConfigs)({
-        context,
-        pluginStore,
-        rsbuildOptions
-      });
-      return createCompiler({ context, webpackConfigs });
-    },
     async getServerAPIs(options) {
       const { getServerAPIs } = await Promise.resolve().then(() => __toESM(require("@rsbuild/core/server")));
       const { createDevMiddleware } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
@@ -104,12 +105,8 @@ const webpackProvider = async ({
       return startProdServer(context, context.config, options);
     },
     async build(options) {
-      const { build: buildImpl, webpackBuild } = await Promise.resolve().then(() => __toESM(require("./core/build")));
-      return buildImpl(
-        { context, pluginStore, rsbuildOptions },
-        options,
-        webpackBuild
-      );
+      const { build } = await Promise.resolve().then(() => __toESM(require("./core/build")));
+      return build({ context, pluginStore, rsbuildOptions }, options);
     },
     async inspectConfig(inspectOptions) {
       const { inspectConfig } = await Promise.resolve().then(() => __toESM(require("./core/inspectConfig")));

package/dist/shared.js

@@ -45,7 +45,6 @@ const applyDefaultPlugins = (plugins) => (0, import_shared2.awaitableGetter)([
   Promise.resolve().then(() => __toESM(require("./plugins/resolve"))).then((m) => m.pluginResolve()),
   plugins.fileSize?.(),
   plugins.cleanOutput?.(),
-  Promise.resolve().then(() => __toESM(require("./plugins/hmr"))).then((m) => m.pluginHMR()),
   plugins.asset(),
   Promise.resolve().then(() => __toESM(require("./plugins/copy"))).then((m) => m.pluginCopy()),
   plugins.html(),
@@ -59,8 +58,6 @@ const applyDefaultPlugins = (plugins) => (0, import_shared2.awaitableGetter)([
   Promise.resolve().then(() => __toESM(require("./plugins/sass"))).then((m) => m.pluginSass()),
   Promise.resolve().then(() => __toESM(require("./plugins/less"))).then((m) => m.pluginLess()),
   plugins.bundleAnalyzer(),
-  plugins.toml(),
-  plugins.yaml(),
   plugins.splitChunks(),
   plugins.startUrl?.(),
   plugins.inlineChunk(),
@@ -74,9 +71,8 @@ const getCompiledPath = (packageName) => {
   const providerCompilerPath = (0, import_path.join)(__dirname, "../../compiled", packageName);
   if (import_fs.default.existsSync(providerCompilerPath)) {
     return providerCompilerPath;
-  } else {
-    return (0, import_shared.getSharedPkgCompiledPath)(packageName);
   }
+  return (0, import_shared.getSharedPkgCompiledPath)(packageName);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/webpack",
-  "version": "0.2.18",
+  "version": "0.3.1",
   "homepage": "https://rsbuild.dev",
   "repository": {
     "type": "git",
@@ -35,13 +35,13 @@
     "terser-webpack-plugin": "5.3.9",
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "webpack": "^5.89.0",
-    "@rsbuild/core": "0.2.18",
-    "@rsbuild/shared": "0.2.18"
+    "@rsbuild/shared": "0.3.1",
+    "@rsbuild/core": "0.3.1"
   },
   "devDependencies": {
     "@types/node": "16.x",
     "typescript": "^5.3.0",
-    "@rsbuild/test-helper": "0.2.18"
+    "@scripts/test-helper": "1.0.0"
   },
   "publishConfig": {
     "access": "public",

package/dist/plugins/hmr.d.ts

@@ -1,2 +0,0 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
-export declare const pluginHMR: () => RsbuildPlugin;

package/dist/plugins/hmr.js

@@ -1,41 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var hmr_exports = {};
-__export(hmr_exports, {
-  pluginHMR: () => pluginHMR
-});
-module.exports = __toCommonJS(hmr_exports);
-var import_shared = require("@rsbuild/shared");
-const pluginHMR = () => ({
-  name: "rsbuild-webpack:hmr",
-  setup(api) {
-    api.modifyBundlerChain((chain, utils) => {
-      const config = api.getNormalizedConfig();
-      if (!(0, import_shared.isUsingHMR)(config, utils)) {
-        return;
-      }
-      const { bundler, CHAIN_ID } = utils;
-      chain.plugin(CHAIN_ID.PLUGIN.HMR).use(bundler.HotModuleReplacementPlugin);
-    });
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  pluginHMR
-});