@rsbuild/webpack 0.7.8 → 0.7.10

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;
+var import_core, getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, chainToConfig, modifyBundlerChain, onCompileDone, TARGET_ID_MAP;
 var init_shared = __esm({
   "src/shared.ts"() {
     "use strict";
@@ -52,7 +52,11 @@ var init_shared = __esm({
       getDevMiddleware,
       getStatsOptions,
       stringifyConfig,
-      outputInspectConfigFiles
+      outputInspectConfigFiles,
+      chainToConfig,
+      modifyBundlerChain,
+      onCompileDone,
+      TARGET_ID_MAP
     } = import_core.__internalHelper);
   }
 });
@@ -130,7 +134,7 @@ var init_inspectConfig = __esm({
 
 // src/webpackConfig.ts
 async function modifyWebpackChain(context, utils, chain) {
-  (0, import_shared3.debug)("modify webpack chain");
+  import_core2.logger.debug("modify webpack chain");
   const [modifiedChain] = await context.hooks.modifyWebpackChain.call(
     chain,
     utils
@@ -140,11 +144,11 @@ async function modifyWebpackChain(context, utils, chain) {
       item(modifiedChain, utils);
     }
   }
-  (0, import_shared3.debug)("modify webpack chain done");
+  import_core2.logger.debug("modify webpack chain done");
   return modifiedChain;
 }
 async function modifyWebpackConfig(context, webpackConfig, utils) {
-  (0, import_shared3.debug)("modify webpack config");
+  import_core2.logger.debug("modify webpack config");
   let [modifiedConfig] = await context.hooks.modifyWebpackConfig.call(
     webpackConfig,
     utils
@@ -157,7 +161,7 @@ async function modifyWebpackConfig(context, webpackConfig, utils) {
       mergeFn: utils.mergeConfig
     });
   }
-  (0, import_shared3.debug)("modify webpack config done");
+  import_core2.logger.debug("modify webpack config done");
   return modifiedConfig;
 }
 async function getChainUtils2(target) {
@@ -226,7 +230,7 @@ async function generateWebpackConfig({
     ProvidePlugin,
     HotModuleReplacementPlugin
   } = webpack2;
-  const bundlerChain = await (0, import_shared3.modifyBundlerChain)(context, {
+  const bundlerChain = await modifyBundlerChain(context, {
     ...chainUtils,
     bundler: {
       BannerPlugin,
@@ -237,7 +241,7 @@ async function generateWebpackConfig({
     }
   });
   const chain = await modifyWebpackChain(context, chainUtils, bundlerChain);
-  let webpackConfig = (0, import_shared3.chainToConfig)(chain);
+  let webpackConfig = chainToConfig(chain);
   webpackConfig = await modifyWebpackConfig(
     context,
     webpackConfig,
@@ -269,7 +273,7 @@ async function initConfigs({
   const webpackConfigs = await Promise.all(
     targets.map((target) => generateWebpackConfig({ target, context }))
   );
-  if ((0, import_shared5.isDebug)()) {
+  if (import_core3.logger.level === "verbose") {
     const inspect = () => {
       const inspectOptions = {
         verbose: true,
@@ -290,11 +294,11 @@ async function initConfigs({
     webpackConfigs
   };
 }
-var import_shared5;
+var import_core3;
 var init_initConfigs = __esm({
   "src/initConfigs.ts"() {
     "use strict";
-    import_shared5 = require("@rsbuild/shared");
+    import_core3 = require("@rsbuild/core");
     init_inspectConfig();
     init_shared();
     init_webpackConfig();
@@ -311,7 +315,7 @@ async function createCompiler({
   context,
   webpackConfigs
 }) {
-  (0, import_shared7.debug)("create compiler");
+  import_core4.logger.debug("create compiler");
   await context.hooks.onBeforeCreateCompiler.call({
     bundlerConfigs: webpackConfigs
   });
@@ -323,12 +327,12 @@ async function createCompiler({
       getStatsOptions(compiler)
     );
     if (level === "error") {
-      import_core3.logger.error(message);
+      import_core4.logger.error(message);
     }
     if (level === "warning") {
-      import_core3.logger.warn(message);
+      import_core4.logger.warn(message);
     }
-    if ((0, import_shared7.isDev)()) {
+    if ((0, import_shared6.isDev)()) {
       await context.hooks.onDevCompileDone.call({
         isFirstCompile,
         stats
@@ -337,11 +341,11 @@ async function createCompiler({
     isFirstCompile = false;
   };
   let isFirstCompile = true;
-  (0, import_shared7.onCompileDone)(compiler, done, import_MultiStats.default);
+  onCompileDone(compiler, done, import_MultiStats.default);
   await context.hooks.onAfterCreateCompiler.call({
     compiler
   });
-  (0, import_shared7.debug)("create compiler done");
+  import_core4.logger.debug("create compiler done");
   return compiler;
 }
 async function createDevMiddleware(options, customCompiler) {
@@ -360,15 +364,16 @@ async function createDevMiddleware(options, customCompiler) {
     compiler
   };
 }
-var import_core3, import_shared7, import_MultiStats;
+var import_core4, import_shared6, import_MultiStats;
 var init_createCompiler = __esm({
   "src/createCompiler.ts"() {
     "use strict";
-    import_core3 = require("@rsbuild/core");
-    import_shared7 = require("@rsbuild/shared");
+    import_core4 = require("@rsbuild/core");
+    import_shared6 = require("@rsbuild/shared");
     import_MultiStats = __toESM(require("webpack/lib/MultiStats.js"));
     init_initConfigs();
     init_shared();
+    init_shared();
   }
 });
 
@@ -2229,24 +2234,24 @@ function createNonTTYLogger() {
       }
       prevPercentage = 100;
       if (hasErrors) {
-        import_core4.logger.error(`${id} compile failed in ${compileTime}`);
+        import_core5.logger.error(`${id} compile failed in ${compileTime}`);
       } else {
-        import_core4.logger.ready(`${id} compiled in ${compileTime}`);
+        import_core5.logger.ready(`${id} compiled in ${compileTime}`);
       }
     } else if (current - prevPercentage > 10) {
       prevPercentage = current;
-      import_core4.logger.info(`${id} compile progress: ${current.toFixed(0)}%`);
+      import_core5.logger.info(`${id} compile progress: ${current.toFixed(0)}%`);
     }
   };
   return {
     log
   };
 }
-var import_core4;
+var import_core5;
 var init_nonTty = __esm({
   "src/progress/helpers/nonTty.ts"() {
     "use strict";
-    import_core4 = require("@rsbuild/core");
+    import_core5 = require("@rsbuild/core");
   }
 });
 
@@ -2255,10 +2260,11 @@ var ProgressPlugin_exports = {};
 __export(ProgressPlugin_exports, {
   ProgressPlugin: () => ProgressPlugin
 });
-var import_shared10, import_webpack, ProgressPlugin;
+var import_core6, import_shared10, import_webpack, ProgressPlugin;
 var init_ProgressPlugin = __esm({
   "src/progress/ProgressPlugin.ts"() {
     "use strict";
+    import_core6 = require("@rsbuild/core");
     import_shared10 = require("@rsbuild/shared");
     import_webpack = __toESM(require("webpack"));
     init_helpers();
@@ -2321,7 +2327,7 @@ var init_ProgressPlugin = __esm({
             this.compileTime = (0, import_shared10.prettyTime)(seconds);
             startTime = null;
             if (!this.hasCompileErrors) {
-              import_shared10.logger.ready(`${this.id} compiled in ${this.compileTime}`);
+              import_core6.logger.ready(`${this.id} compiled in ${this.compileTime}`);
             }
           }
         });
@@ -2352,18 +2358,23 @@ async function applyTsConfigPathsPlugin({
     }
   ]);
 }
+function isWebTarget(target) {
+  const targets = (0, import_shared11.castArray)(target);
+  return targets.includes("web") || target.includes("web-worker");
+}
 var import_node_fs, import_shared11, 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) {
         return mainFields;
       }
-      if ((0, import_shared11.isWebTarget)(target)) {
+      if (isWebTarget(target)) {
         return ["browser", "module", "main"];
       }
       return ["module", "main"];
@@ -2387,7 +2398,7 @@ var init_plugin = __esm({
             const { ProgressPlugin: ProgressPlugin2 } = await Promise.resolve().then(() => (init_ProgressPlugin(), ProgressPlugin_exports));
             chain.plugin(CHAIN_ID.PLUGIN.PROGRESS).use(ProgressPlugin2, [
               {
-                id: import_shared11.TARGET_ID_MAP[target],
+                id: TARGET_ID_MAP[target],
                 ...progress === true ? {} : progress
               }
             ]);
@@ -2427,18 +2438,19 @@ var build_exports = {};
 __export(build_exports, {
   build: () => build
 });
-var import_core5, import_shared12, import_MultiStats2, build;
+var import_core7, import_shared13, import_MultiStats2, build;
 var init_build = __esm({
   "src/build.ts"() {
     "use strict";
-    import_core5 = require("@rsbuild/core");
-    import_shared12 = require("@rsbuild/shared");
+    import_core7 = require("@rsbuild/core");
+    import_shared13 = require("@rsbuild/shared");
     import_MultiStats2 = __toESM(require("webpack/lib/MultiStats.js"));
     init_createCompiler();
     init_initConfigs();
+    init_shared();
     build = async (initOptions, { mode = "production", watch, compiler: customCompiler } = {}) => {
-      if (!(0, import_shared12.getNodeEnv)()) {
-        (0, import_shared12.setNodeEnv)(mode);
+      if (!(0, import_shared13.getNodeEnv)()) {
+        (0, import_shared13.setNodeEnv)(mode);
       }
       const { context } = initOptions;
       let compiler;
@@ -2462,11 +2474,11 @@ var init_build = __esm({
         isFirstCompile = false;
         await p;
       };
-      (0, import_shared12.onCompileDone)(compiler, onDone, import_MultiStats2.default);
+      onCompileDone(compiler, onDone, import_MultiStats2.default);
       if (watch) {
         compiler.watch({}, (err) => {
           if (err) {
-            import_core5.logger.error(err);
+            import_core7.logger.error(err);
           }
         });
         return;
@@ -2478,7 +2490,7 @@ var init_build = __esm({
             reject(buildError);
           } else {
             compiler.close((closeErr) => {
-              closeErr && import_core5.logger.error(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;
+var getChainUtils, initRsbuildConfig, createDevServer, formatStats, getDevMiddleware, getStatsOptions, stringifyConfig, outputInspectConfigFiles, chainToConfig, modifyBundlerChain, onCompileDone, TARGET_ID_MAP;
 var init_shared = __esm({
   "src/shared.ts"() {
     "use strict";
@@ -70,7 +70,11 @@ var init_shared = __esm({
       getDevMiddleware,
       getStatsOptions,
       stringifyConfig,
-      outputInspectConfigFiles
+      outputInspectConfigFiles,
+      chainToConfig,
+      modifyBundlerChain,
+      onCompileDone,
+      TARGET_ID_MAP
     } = __internalHelper);
   }
 });
@@ -148,17 +152,15 @@ var init_inspectConfig = __esm({
 
 // src/webpackConfig.ts
 import {
-  __internalHelper as __internalHelper2
+  __internalHelper as __internalHelper2,
+  logger
 } from "@rsbuild/core";
 import {
   castArray,
-  chainToConfig,
-  debug,
-  modifyBundlerChain,
   reduceConfigsWithContext
 } from "@rsbuild/shared";
 async function modifyWebpackChain(context, utils, chain) {
-  debug("modify webpack chain");
+  logger.debug("modify webpack chain");
   const [modifiedChain] = await context.hooks.modifyWebpackChain.call(
     chain,
     utils
@@ -168,11 +170,11 @@ async function modifyWebpackChain(context, utils, chain) {
       item(modifiedChain, utils);
     }
   }
-  debug("modify webpack chain done");
+  logger.debug("modify webpack chain done");
   return modifiedChain;
 }
 async function modifyWebpackConfig(context, webpackConfig, utils) {
-  debug("modify webpack config");
+  logger.debug("modify webpack config");
   let [modifiedConfig] = await context.hooks.modifyWebpackConfig.call(
     webpackConfig,
     utils
@@ -185,7 +187,7 @@ async function modifyWebpackConfig(context, webpackConfig, utils) {
       mergeFn: utils.mergeConfig
     });
   }
-  debug("modify webpack config done");
+  logger.debug("modify webpack config done");
   return modifiedConfig;
 }
 async function getChainUtils2(target) {
@@ -282,7 +284,9 @@ var init_webpackConfig = __esm({
 });
 
 // src/initConfigs.ts
-import { isDebug } from "@rsbuild/shared";
+import {
+  logger as logger2
+} from "@rsbuild/core";
 async function initConfigs({
   context,
   pluginManager,
@@ -296,7 +300,7 @@ async function initConfigs({
   const webpackConfigs = await Promise.all(
     targets.map((target) => generateWebpackConfig({ target, context }))
   );
-  if (isDebug()) {
+  if (logger2.level === "verbose") {
     const inspect = () => {
       const inspectOptions = {
         verbose: true,
@@ -333,18 +337,14 @@ __export(createCompiler_exports, {
   createCompiler: () => createCompiler,
   createDevMiddleware: () => createDevMiddleware
 });
-import { logger } from "@rsbuild/core";
-import {
-  debug as debug2,
-  isDev,
-  onCompileDone
-} from "@rsbuild/shared";
+import { logger as logger3 } from "@rsbuild/core";
+import { isDev } from "@rsbuild/shared";
 import WebpackMultiStats from "webpack/lib/MultiStats.js";
 async function createCompiler({
   context,
   webpackConfigs
 }) {
-  debug2("create compiler");
+  logger3.debug("create compiler");
   await context.hooks.onBeforeCreateCompiler.call({
     bundlerConfigs: webpackConfigs
   });
@@ -356,10 +356,10 @@ async function createCompiler({
       getStatsOptions(compiler)
     );
     if (level === "error") {
-      logger.error(message);
+      logger3.error(message);
     }
     if (level === "warning") {
-      logger.warn(message);
+      logger3.warn(message);
     }
     if (isDev()) {
       await context.hooks.onDevCompileDone.call({
@@ -374,7 +374,7 @@ async function createCompiler({
   await context.hooks.onAfterCreateCompiler.call({
     compiler
   });
-  debug2("create compiler done");
+  logger3.debug("create compiler done");
   return compiler;
 }
 async function createDevMiddleware(options, customCompiler) {
@@ -399,6 +399,7 @@ var init_createCompiler = __esm({
     init_esm();
     init_initConfigs();
     init_shared();
+    init_shared();
   }
 });
 
@@ -2266,7 +2267,7 @@ var init_helpers = __esm({
 });
 
 // src/progress/helpers/nonTty.ts
-import { logger as logger2 } from "@rsbuild/core";
+import { logger as logger4 } from "@rsbuild/core";
 function createNonTTYLogger() {
   let prevPercentage = 0;
   const log = ({
@@ -2282,13 +2283,13 @@ function createNonTTYLogger() {
       }
       prevPercentage = 100;
       if (hasErrors) {
-        logger2.error(`${id} compile failed in ${compileTime}`);
+        logger4.error(`${id} compile failed in ${compileTime}`);
       } else {
-        logger2.ready(`${id} compiled in ${compileTime}`);
+        logger4.ready(`${id} compiled in ${compileTime}`);
       }
     } else if (current - prevPercentage > 10) {
       prevPercentage = current;
-      logger2.info(`${id} compile progress: ${current.toFixed(0)}%`);
+      logger4.info(`${id} compile progress: ${current.toFixed(0)}%`);
     }
   };
   return {
@@ -2307,7 +2308,8 @@ var ProgressPlugin_exports = {};
 __export(ProgressPlugin_exports, {
   ProgressPlugin: () => ProgressPlugin
 });
-import { logger as logger3, prettyTime } from "@rsbuild/shared";
+import { logger as logger5 } from "@rsbuild/core";
+import { prettyTime } from "@rsbuild/shared";
 import webpack from "webpack";
 var ProgressPlugin;
 var init_ProgressPlugin = __esm({
@@ -2374,7 +2376,7 @@ var init_ProgressPlugin = __esm({
             this.compileTime = prettyTime(seconds);
             startTime = null;
             if (!this.hasCompileErrors) {
-              logger3.ready(`${this.id} compiled in ${this.compileTime}`);
+              logger5.ready(`${this.id} compiled in ${this.compileTime}`);
             }
           }
         });
@@ -2389,10 +2391,7 @@ __export(plugin_exports, {
   pluginAdaptor: () => pluginAdaptor
 });
 import fs from "fs";
-import {
-  TARGET_ID_MAP,
-  isWebTarget
-} from "@rsbuild/shared";
+import { castArray as castArray2 } from "@rsbuild/shared";
 async function applyTsConfigPathsPlugin({
   chain,
   CHAIN_ID,
@@ -2410,11 +2409,16 @@ async function applyTsConfigPathsPlugin({
     }
   ]);
 }
+function isWebTarget(target) {
+  const targets = castArray2(target);
+  return targets.includes("web") || target.includes("web-worker");
+}
 var getMainFields, pluginAdaptor;
 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) {
@@ -2484,10 +2488,9 @@ var build_exports = {};
 __export(build_exports, {
   build: () => build
 });
-import { logger as logger4 } from "@rsbuild/core";
+import { logger as logger6 } from "@rsbuild/core";
 import {
   getNodeEnv as getNodeEnv2,
-  onCompileDone as onCompileDone2,
   setNodeEnv as setNodeEnv2
 } from "@rsbuild/shared";
 import WebpackMultiStats2 from "webpack/lib/MultiStats.js";
@@ -2498,6 +2501,7 @@ var init_build = __esm({
     init_esm();
     init_createCompiler();
     init_initConfigs();
+    init_shared();
     build = async (initOptions, { mode = "production", watch, compiler: customCompiler } = {}) => {
       if (!getNodeEnv2()) {
         setNodeEnv2(mode);
@@ -2524,11 +2528,11 @@ var init_build = __esm({
         isFirstCompile = false;
         await p;
       };
-      onCompileDone2(compiler, onDone, WebpackMultiStats2);
+      onCompileDone(compiler, onDone, WebpackMultiStats2);
       if (watch) {
         compiler.watch({}, (err) => {
           if (err) {
-            logger4.error(err);
+            logger6.error(err);
           }
         });
         return;
@@ -2540,7 +2544,7 @@ var init_build = __esm({
             reject(buildError);
           } else {
             compiler.close((closeErr) => {
-              closeErr && logger4.error(closeErr);
+              closeErr && logger6.error(closeErr);
               resolve({ stats });
             });
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/webpack",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "homepage": "https://rsbuild.dev",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
     "mini-css-extract-plugin": "2.9.0",
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "webpack": "^5.92.0",
-    "@rsbuild/core": "0.7.8",
-    "@rsbuild/shared": "0.7.8"
+    "@rsbuild/core": "0.7.10",
+    "@rsbuild/shared": "0.7.10"
   },
   "devDependencies": {
     "@types/node": "18.x",
@@ -36,7 +36,7 @@
     "cli-truncate": "2.1.0",
     "patch-console": "1.0.0",
     "typescript": "^5.4.2",
-    "@scripts/test-helper": "0.7.8"
+    "@scripts/test-helper": "0.7.10"
   },
   "publishConfig": {
     "access": "public",