@rsbuild/webpack 0.4.12 → 0.4.14

package/dist/core/build.js

@@ -41,9 +41,20 @@ const build = async (initOptions, { mode = "production", watch, compiler: custom
     });
     bundlerConfigs = webpackConfigs;
   }
+  let isFirstCompile = true;
   await context.hooks.onBeforeBuild.call({
     bundlerConfigs
   });
+  const onDone = async (stats) => {
+    const p = context.hooks.onAfterBuild.call({ isFirstCompile, stats });
+    isFirstCompile = false;
+    await p;
+  };
+  if ((0, import_shared.isMultiCompiler)(compiler)) {
+    compiler.hooks.done.tap("rsbuild:done", onDone);
+  } else {
+    compiler.hooks.done.tapPromise("rsbuild:done", onDone);
+  }
   if (watch) {
     compiler.watch({}, (err) => {
       if (err) {
@@ -52,22 +63,19 @@ const build = async (initOptions, { mode = "production", watch, compiler: custom
     });
     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 });
+  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_shared.logger.error(closeErr);
+          resolve({ stats });
+        });
+      }
+    });
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/core/createCompiler.js

@@ -46,8 +46,7 @@ async function createCompiler({
   });
   const { default: webpack } = await Promise.resolve().then(() => __toESM(require("webpack")));
   const compiler = webpackConfigs.length === 1 ? webpack(webpackConfigs[0]) : webpack(webpackConfigs);
-  let isFirstCompile = true;
-  compiler.hooks.done.tap("rsbuild:done", async (stats) => {
+  const done = async (stats) => {
     const { message, level } = (0, import_provider.formatStats)(stats);
     if (level === "error") {
       import_shared.logger.error(message);
@@ -62,7 +61,13 @@ async function createCompiler({
       });
     }
     isFirstCompile = false;
-  });
+  };
+  let isFirstCompile = true;
+  if ((0, import_shared.isMultiCompiler)(compiler)) {
+    compiler.hooks.done.tap("rsbuild:done", done);
+  } else {
+    compiler.hooks.done.tapPromise("rsbuild:done", done);
+  }
   await context.hooks.onAfterCreateCompiler.call({
     compiler
   });

package/dist/core/devMiddleware.js

@@ -41,7 +41,7 @@ const applyHMREntry = (compiler, clientPath) => {
       }).apply(compiler2);
     }
   };
-  if (compiler.compilers) {
+  if ((0, import_shared.isMultiCompiler)(compiler)) {
     compiler.compilers.forEach((target) => {
       applyEntry(clientPath, target);
     });
@@ -50,7 +50,7 @@ const applyHMREntry = (compiler, clientPath) => {
   }
 };
 const setupHooks = (compiler, hookCallbacks) => {
-  if (compiler.compilers) {
+  if ((0, import_shared.isMultiCompiler)(compiler)) {
     compiler.compilers.forEach(
       (compiler2) => (0, import_shared.setupServerHooks)(compiler2, hookCallbacks)
     );

package/dist/shared.js

@@ -35,8 +35,7 @@ module.exports = __toCommonJS(shared_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = require("node:path");
 var import_shared = require("@rsbuild/shared");
-var import_shared2 = require("@rsbuild/shared");
-const applyDefaultPlugins = (plugins) => (0, import_shared2.awaitableGetter)([
+const applyDefaultPlugins = (plugins) => (0, import_shared.awaitableGetter)([
   plugins.basic?.(),
   plugins.entry?.(),
   plugins.cache?.(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/webpack",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "homepage": "https://rsbuild.dev",
   "repository": {
     "type": "git",
@@ -29,19 +29,19 @@
   "dependencies": {
     "fast-glob": "^3.3.1",
     "globby": "^11.1.0",
-    "html-webpack-plugin": "npm:html-rspack-plugin@5.6.1",
+    "html-webpack-plugin": "npm:html-rspack-plugin@5.6.2",
     "mini-css-extract-plugin": "2.8.1",
     "postcss": "^8.4.33",
     "terser-webpack-plugin": "5.3.10",
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "webpack": "^5.89.0",
-    "@rsbuild/core": "0.4.12",
-    "@rsbuild/shared": "0.4.12"
+    "@rsbuild/core": "0.4.14",
+    "@rsbuild/shared": "0.4.14"
   },
   "devDependencies": {
     "@types/node": "16.x",
-    "typescript": "^5.3.0",
-    "@scripts/test-helper": "0.4.12"
+    "typescript": "^5.4.2",
+    "@scripts/test-helper": "0.4.14"
   },
   "publishConfig": {
     "access": "public",