@rsbuild/webpack 1.0.1-beta.1 → 1.0.1-beta.11

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, castArray;
+var import_core, getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, getRsbuildInspectConfig, chainToConfig, modifyBundlerChain, registerDevHook, registerBuildHook, prettyTime, castArray;
 var init_shared = __esm({
   "src/shared.ts"() {
     "use strict";
@@ -56,7 +56,8 @@ var init_shared = __esm({
       getRsbuildInspectConfig,
       chainToConfig,
       modifyBundlerChain,
-      onCompileDone,
+      registerDevHook,
+      registerBuildHook,
       prettyTime
     } = import_core.__internalHelper);
     castArray = (arr) => {
@@ -80,8 +81,8 @@ async function inspectConfig({
   bundlerConfigs,
   inspectOptions = {}
 }) {
-  if (inspectOptions.env) {
-    process.env.NODE_ENV = inspectOptions.env;
+  if (inspectOptions.mode) {
+    process.env.NODE_ENV = inspectOptions.mode;
   } else if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "development";
   }
@@ -104,10 +105,7 @@ async function inspectConfig({
     inspectOptions,
     pluginManager
   });
-  let outputPath = inspectOptions.outputPath || context.distPath;
-  if (!(0, import_node_path.isAbsolute)(outputPath)) {
-    outputPath = (0, import_node_path.join)(context.rootPath, outputPath);
-  }
+  const outputPath = getInspectOutputPath(context, inspectOptions);
   if (inspectOptions.writeToDisk) {
     await outputInspectConfigFiles({
       rawBundlerConfigs,
@@ -130,23 +128,32 @@ async function inspectConfig({
     }
   };
 }
-var import_node_path;
+var import_node_path, getInspectOutputPath;
 var init_inspectConfig = __esm({
   "src/inspectConfig.ts"() {
     "use strict";
     import_node_path = require("path");
     init_initConfigs();
     init_shared();
+    getInspectOutputPath = (context, inspectOptions) => {
+      if (inspectOptions.outputPath) {
+        if ((0, import_node_path.isAbsolute)(inspectOptions.outputPath)) {
+          return inspectOptions.outputPath;
+        }
+        return (0, import_node_path.join)(context.distPath, inspectOptions.outputPath);
+      }
+      return context.distPath;
+    };
   }
 });
 
 // src/webpackConfig.ts
 async function modifyWebpackChain(context, utils, chain) {
   import_core2.logger.debug("modify webpack chain");
-  const [modifiedChain] = await context.hooks.modifyWebpackChain.call(
-    chain,
-    utils
-  );
+  const [modifiedChain] = await context.hooks.modifyWebpackChain.callInEnvironment({
+    environment: utils.environment.name,
+    args: [chain, utils]
+  });
   if (utils.environment.config.tools?.webpackChain) {
     for (const item of castArray(utils.environment.config.tools.webpackChain)) {
       item(modifiedChain, utils);
@@ -157,10 +164,10 @@ async function modifyWebpackChain(context, utils, chain) {
 }
 async function modifyWebpackConfig(context, webpackConfig, utils) {
   import_core2.logger.debug("modify webpack config");
-  let [modifiedConfig] = await context.hooks.modifyWebpackConfig.call(
-    webpackConfig,
-    utils
-  );
+  let [modifiedConfig] = await context.hooks.modifyWebpackConfig.callInEnvironment({
+    environment: utils.environment.name,
+    args: [webpackConfig, utils]
+  });
   if (utils.environment.config.tools?.webpack) {
     modifiedConfig = (0, import_reduce_configs.reduceConfigsWithContext)({
       initial: modifiedConfig,
@@ -269,7 +276,11 @@ async function initConfigs({
         bundlerConfigs: webpackConfigs
       });
     };
-    context.hooks.onBeforeBuild.tap(inspect);
+    context.hooks.onBeforeBuild.tap(({ isFirstCompile }) => {
+      if (isFirstCompile) {
+        inspect();
+      }
+    });
     context.hooks.onAfterStartDevServer.tap(inspect);
   }
   return {
@@ -304,7 +315,7 @@ async function createCompiler({
   });
   const { default: webpack2 } = await import("webpack");
   const compiler = webpackConfigs.length === 1 ? webpack2(webpackConfigs[0]) : webpack2(webpackConfigs);
-  const done = async (stats) => {
+  const done = (stats) => {
     const { message, level } = formatStats(
       stats,
       getStatsOptions(compiler)
@@ -315,17 +326,18 @@ async function createCompiler({
     if (level === "warning") {
       import_core4.logger.warn(message);
     }
-    if (process.env.NODE_ENV === "development") {
-      await context.hooks.onDevCompileDone.call({
-        isFirstCompile,
-        stats,
-        environments: context.environments
-      });
-    }
-    isFirstCompile = false;
   };
-  let isFirstCompile = true;
-  onCompileDone(compiler, done, import_MultiStats.default);
+  compiler.hooks.done.tap("rsbuild:done", (stats) => {
+    done(stats);
+  });
+  if (context.normalizedConfig?.mode === "development") {
+    registerDevHook({
+      compiler,
+      context,
+      bundlerConfigs: webpackConfigs,
+      MultiStatsCtor: import_MultiStats.default
+    });
+  }
   await context.hooks.onAfterCreateCompiler.call({
     compiler,
     environments: context.environments
@@ -357,7 +369,6 @@ var init_createCompiler = __esm({
     import_MultiStats = __toESM(require("webpack/lib/MultiStats.js"));
     init_initConfigs();
     init_shared();
-    init_shared();
   }
 });
 
@@ -2434,9 +2445,9 @@ var init_build = __esm({
     init_createCompiler();
     init_initConfigs();
     init_shared();
-    build = async (initOptions, { mode = "production", watch, compiler: customCompiler } = {}) => {
+    build = async (initOptions, { watch, compiler: customCompiler } = {}) => {
       if (!process.env.NODE_ENV) {
-        process.env.NODE_ENV = mode;
+        process.env.NODE_ENV = "production";
       }
       const { context } = initOptions;
       let compiler;
@@ -2451,28 +2462,24 @@ var init_build = __esm({
         });
         bundlerConfigs = webpackConfigs;
       }
-      let isFirstCompile = true;
-      await context.hooks.onBeforeBuild.call({
+      registerBuildHook({
+        context,
         bundlerConfigs,
-        environments: context.environments
+        compiler,
+        isWatch: Boolean(watch),
+        MultiStatsCtor: import_MultiStats2.default
       });
-      const onDone = async (stats) => {
-        const p = context.hooks.onAfterBuild.call({
-          isFirstCompile,
-          stats,
-          environments: context.environments
-        });
-        isFirstCompile = false;
-        await p;
-      };
-      onCompileDone(compiler, onDone, import_MultiStats2.default);
       if (watch) {
-        compiler.watch({}, (err) => {
+        const watching = compiler.watch({}, (err) => {
           if (err) {
             import_core7.logger.error(err);
           }
         });
-        return;
+        return {
+          close: () => new Promise((resolve) => {
+            watching.close(resolve);
+          })
+        };
       }
       await new Promise(
         (resolve, reject) => {

package/dist/index.js

@@ -46,18 +46,18 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// ../../../node_modules/.pnpm/@modern-js+module-tools@2.55.0_eslint@9.6.0_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../../node_modules/.pnpm/@modern-js+module-tools@2.57.1_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js
 import { fileURLToPath } from "url";
 import path from "path";
 var init_esm = __esm({
-  "../../../node_modules/.pnpm/@modern-js+module-tools@2.55.0_eslint@9.6.0_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js"() {
+  "../../../node_modules/.pnpm/@modern-js+module-tools@2.57.1_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js"() {
     "use strict";
   }
 });
 
 // src/shared.ts
 import { __internalHelper } from "@rsbuild/core";
-var getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, getRsbuildInspectConfig, chainToConfig, modifyBundlerChain, onCompileDone, prettyTime, castArray;
+var getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, getRsbuildInspectConfig, chainToConfig, modifyBundlerChain, registerDevHook, registerBuildHook, prettyTime, castArray;
 var init_shared = __esm({
   "src/shared.ts"() {
     "use strict";
@@ -74,7 +74,8 @@ var init_shared = __esm({
       getRsbuildInspectConfig,
       chainToConfig,
       modifyBundlerChain,
-      onCompileDone,
+      registerDevHook,
+      registerBuildHook,
       prettyTime
     } = __internalHelper);
     castArray = (arr) => {
@@ -99,8 +100,8 @@ async function inspectConfig({
   bundlerConfigs,
   inspectOptions = {}
 }) {
-  if (inspectOptions.env) {
-    process.env.NODE_ENV = inspectOptions.env;
+  if (inspectOptions.mode) {
+    process.env.NODE_ENV = inspectOptions.mode;
   } else if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "development";
   }
@@ -123,10 +124,7 @@ async function inspectConfig({
     inspectOptions,
     pluginManager
   });
-  let outputPath = inspectOptions.outputPath || context.distPath;
-  if (!isAbsolute(outputPath)) {
-    outputPath = join(context.rootPath, outputPath);
-  }
+  const outputPath = getInspectOutputPath(context, inspectOptions);
   if (inspectOptions.writeToDisk) {
     await outputInspectConfigFiles({
       rawBundlerConfigs,
@@ -149,12 +147,22 @@ async function inspectConfig({
     }
   };
 }
+var getInspectOutputPath;
 var init_inspectConfig = __esm({
   "src/inspectConfig.ts"() {
     "use strict";
     init_esm();
     init_initConfigs();
     init_shared();
+    getInspectOutputPath = (context, inspectOptions) => {
+      if (inspectOptions.outputPath) {
+        if (isAbsolute(inspectOptions.outputPath)) {
+          return inspectOptions.outputPath;
+        }
+        return join(context.distPath, inspectOptions.outputPath);
+      }
+      return context.distPath;
+    };
   }
 });
 
@@ -166,10 +174,10 @@ import {
 import { reduceConfigsWithContext } from "reduce-configs";
 async function modifyWebpackChain(context, utils, chain) {
   logger.debug("modify webpack chain");
-  const [modifiedChain] = await context.hooks.modifyWebpackChain.call(
-    chain,
-    utils
-  );
+  const [modifiedChain] = await context.hooks.modifyWebpackChain.callInEnvironment({
+    environment: utils.environment.name,
+    args: [chain, utils]
+  });
   if (utils.environment.config.tools?.webpackChain) {
     for (const item of castArray(utils.environment.config.tools.webpackChain)) {
       item(modifiedChain, utils);
@@ -180,10 +188,10 @@ async function modifyWebpackChain(context, utils, chain) {
 }
 async function modifyWebpackConfig(context, webpackConfig, utils) {
   logger.debug("modify webpack config");
-  let [modifiedConfig] = await context.hooks.modifyWebpackConfig.call(
-    webpackConfig,
-    utils
-  );
+  let [modifiedConfig] = await context.hooks.modifyWebpackConfig.callInEnvironment({
+    environment: utils.environment.name,
+    args: [webpackConfig, utils]
+  });
   if (utils.environment.config.tools?.webpack) {
     modifiedConfig = reduceConfigsWithContext({
       initial: modifiedConfig,
@@ -293,7 +301,11 @@ async function initConfigs({
         bundlerConfigs: webpackConfigs
       });
     };
-    context.hooks.onBeforeBuild.tap(inspect);
+    context.hooks.onBeforeBuild.tap(({ isFirstCompile }) => {
+      if (isFirstCompile) {
+        inspect();
+      }
+    });
     context.hooks.onAfterStartDevServer.tap(inspect);
   }
   return {
@@ -329,7 +341,7 @@ async function createCompiler({
   });
   const { default: webpack2 } = await import("webpack");
   const compiler = webpackConfigs.length === 1 ? webpack2(webpackConfigs[0]) : webpack2(webpackConfigs);
-  const done = async (stats) => {
+  const done = (stats) => {
     const { message, level } = formatStats(
       stats,
       getStatsOptions(compiler)
@@ -340,17 +352,18 @@ async function createCompiler({
     if (level === "warning") {
       logger3.warn(message);
     }
-    if (process.env.NODE_ENV === "development") {
-      await context.hooks.onDevCompileDone.call({
-        isFirstCompile,
-        stats,
-        environments: context.environments
-      });
-    }
-    isFirstCompile = false;
   };
-  let isFirstCompile = true;
-  onCompileDone(compiler, done, WebpackMultiStats);
+  compiler.hooks.done.tap("rsbuild:done", (stats) => {
+    done(stats);
+  });
+  if (context.normalizedConfig?.mode === "development") {
+    registerDevHook({
+      compiler,
+      context,
+      bundlerConfigs: webpackConfigs,
+      MultiStatsCtor: WebpackMultiStats
+    });
+  }
   await context.hooks.onAfterCreateCompiler.call({
     compiler,
     environments: context.environments
@@ -380,7 +393,6 @@ var init_createCompiler = __esm({
     init_esm();
     init_initConfigs();
     init_shared();
-    init_shared();
   }
 });
 
@@ -2482,9 +2494,9 @@ var init_build = __esm({
     init_createCompiler();
     init_initConfigs();
     init_shared();
-    build = async (initOptions, { mode = "production", watch, compiler: customCompiler } = {}) => {
+    build = async (initOptions, { watch, compiler: customCompiler } = {}) => {
       if (!process.env.NODE_ENV) {
-        process.env.NODE_ENV = mode;
+        process.env.NODE_ENV = "production";
       }
       const { context } = initOptions;
       let compiler;
@@ -2499,28 +2511,24 @@ var init_build = __esm({
         });
         bundlerConfigs = webpackConfigs;
       }
-      let isFirstCompile = true;
-      await context.hooks.onBeforeBuild.call({
+      registerBuildHook({
+        context,
         bundlerConfigs,
-        environments: context.environments
+        compiler,
+        isWatch: Boolean(watch),
+        MultiStatsCtor: WebpackMultiStats2
       });
-      const onDone = async (stats) => {
-        const p = context.hooks.onAfterBuild.call({
-          isFirstCompile,
-          stats,
-          environments: context.environments
-        });
-        isFirstCompile = false;
-        await p;
-      };
-      onCompileDone(compiler, onDone, WebpackMultiStats2);
       if (watch) {
-        compiler.watch({}, (err) => {
+        const watching = compiler.watch({}, (err) => {
           if (err) {
             logger6.error(err);
           }
         });
-        return;
+        return {
+          close: () => new Promise((resolve) => {
+            watching.close(resolve);
+          })
+        };
       }
       await new Promise(
         (resolve, reject) => {

package/dist-types/build.d.ts

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

package/dist-types/initConfigs.d.ts

@@ -1,10 +1,10 @@
-import { type CreateRsbuildOptions, type PluginManager } from '@rsbuild/core';
+import { type PluginManager, type ResolvedCreateRsbuildOptions } from '@rsbuild/core';
 import { type InternalContext } from './shared';
 import type { WebpackConfig } from './types';
 export type InitConfigsOptions = {
     context: InternalContext;
     pluginManager: PluginManager;
-    rsbuildOptions: Required<CreateRsbuildOptions>;
+    rsbuildOptions: ResolvedCreateRsbuildOptions;
 };
 export declare function initConfigs({ context, pluginManager, rsbuildOptions, }: InitConfigsOptions): Promise<{
     webpackConfigs: WebpackConfig[];

package/dist-types/shared.d.ts

@@ -11,7 +11,18 @@ 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("@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, };
+}, chainToConfig: typeof __internalHelper.chainToConfig, modifyBundlerChain: typeof __internalHelper.modifyBundlerChain, registerDevHook: ({ context, compiler, bundlerConfigs, MultiStatsCtor, }: {
+    bundlerConfigs?: import("@rspack/core").Configuration[];
+    context: __internalHelper.InternalContext;
+    compiler: import("@rspack/core").Compiler | import("@rspack/core").MultiCompiler;
+    MultiStatsCtor: new (stats: import("@rspack/core").Stats[]) => import("@rspack/core").MultiStats;
+}) => void, registerBuildHook: ({ context, isWatch, compiler, bundlerConfigs, MultiStatsCtor, }: {
+    bundlerConfigs?: import("@rspack/core").Configuration[];
+    context: __internalHelper.InternalContext;
+    compiler: import("@rspack/core").Compiler | import("@rspack/core").MultiCompiler;
+    isWatch: boolean;
+    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, registerDevHook, registerBuildHook, 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.1-beta.1",
+  "version": "1.0.1-beta.11",
   "homepage": "https://rsbuild.dev",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "reduce-configs": "^1.0.0",
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "webpack": "^5.93.0",
-    "@rsbuild/core": "1.0.1-beta.1"
+    "@rsbuild/core": "1.0.1-beta.11"
   },
   "devDependencies": {
     "@types/node": "18.x",
@@ -38,7 +38,7 @@
     "cli-truncate": "2.1.0",
     "patch-console": "1.0.0",
     "typescript": "^5.5.2",
-    "@scripts/test-helper": "1.0.1-beta.1"
+    "@scripts/test-helper": "1.0.1-beta.11"
   },
   "publishConfig": {
     "access": "public",