npm - @rsbuild/core - Versions diffs - 1.2.12 → 1.2.13 - Mend

@rsbuild/core 1.2.12 → 1.2.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/compiled/rsbuild-dev-middleware/index.js +56 -46
package/compiled/rsbuild-dev-middleware/package.json +1 -1
package/dist/index.cjs +64 -44
package/dist/index.js +64 -44
package/dist-types/helpers/index.d.ts +1 -0
package/package.json +2 -2

package/compiled/rsbuild-dev-middleware/index.js CHANGED Viewed

@@ -4449,14 +4449,15 @@
         return a.start - b.start;
       }
     },
-    6230: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    4189: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const middleware = __nccwpck_require__(9228);
-      const getFilenameFromUrl = __nccwpck_require__(7508);
-      const setupHooks = __nccwpck_require__(4425);
-      const setupWriteToDisk = __nccwpck_require__(6998);
-      const setupOutputFileSystem = __nccwpck_require__(5063);
-      const ready = __nccwpck_require__(7875);
+      const { logger } = __nccwpck_require__(8679);
+      const middleware = __nccwpck_require__(7217);
+      const getFilenameFromUrl = __nccwpck_require__(5513);
+      const setupHooks = __nccwpck_require__(2628);
+      const setupWriteToDisk = __nccwpck_require__(495);
+      const setupOutputFileSystem = __nccwpck_require__(6372);
+      const ready = __nccwpck_require__(4480);
       const noop = () => {};
       function wdm(compiler, options = {}) {
         const context = {
@@ -4465,7 +4466,6 @@
           callbacks: [],
           options,
           compiler,
-          logger: compiler.getInfrastructureLogger("webpack-dev-middleware"),
         };
         setupHooks(context);
         if (options.writeToDisk) {
@@ -4477,7 +4477,10 @@
         } else {
           const errorHandler = (error) => {
             if (error) {
-              context.logger.error(error);
+              if (error.message && error.message.includes("× Error:")) {
+                error.message = error.message.replace("× Error:", "").trim();
+              }
+              logger.error(error);
             }
           };
           if (Array.isArray(context.compiler.compilers)) {
@@ -4511,14 +4514,15 @@
       }
       module.exports = wdm;
     },
-    9228: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    7217: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const mrmime = __nccwpck_require__(8311);
+      const { logger } = __nccwpck_require__(8679);
       const onFinishedStream = __nccwpck_require__(21);
-      const getFilenameFromUrl = __nccwpck_require__(7508);
-      const ready = __nccwpck_require__(7875);
-      const parseTokenList = __nccwpck_require__(3086);
-      const memorize = __nccwpck_require__(4504);
+      const getFilenameFromUrl = __nccwpck_require__(5513);
+      const ready = __nccwpck_require__(4480);
+      const parseTokenList = __nccwpck_require__(1855);
+      const memorize = __nccwpck_require__(2297);
       async function getEtag(stat) {
         const mtime = stat.mtime.getTime().toString(16);
         const size = stat.size.toString(16);
@@ -4610,7 +4614,7 @@
             return;
           }
           function sendError(status, options) {
-            const escapeHtml = __nccwpck_require__(600);
+            const escapeHtml = __nccwpck_require__(2117);
             const content = statuses[status] || String(status);
             const document = Buffer.from(
               `<!DOCTYPE html>\n<html lang="en">\n<head>\n<meta charset="utf-8">\n<title>Error</title>\n</head>\n<body>\n<pre>${escapeHtml(content)}</pre>\n</body>\n</html>`,
@@ -4769,7 +4773,9 @@
             const filename = getFilenameFromUrl(context, req.url, extra);
             if (extra.errorCode) {
               if (extra.errorCode === 403) {
-                context.logger.error(`Malicious path "${filename}".`);
+                logger.error(
+                  `[rsbuild-dev-middleware] Malicious path "${filename}".`,
+                );
               }
               sendError(extra.errorCode);
               return;
@@ -4836,7 +4842,9 @@
                 parsedRanges = [];
               }
               if (parsedRanges === -1) {
-                context.logger.error("Unsatisfiable range for 'Range' header.");
+                logger.error(
+                  "[rsbuild-dev-middleware] Unsatisfiable range for 'Range' header.",
+                );
                 res.setHeader(
                   "Content-Range",
                   getValueContentRangeHeader("bytes", size),
@@ -4847,12 +4855,12 @@
                 return;
               }
               if (parsedRanges === -2) {
-                context.logger.error(
-                  "A malformed 'Range' header was provided. A regular response will be sent for this request.",
+                logger.error(
+                  "[rsbuild-dev-middleware] A malformed 'Range' header was provided. A regular response will be sent for this request.",
                 );
               } else if (parsedRanges.length > 1) {
-                context.logger.error(
-                  "A 'Range' header with multiple ranges was provided. Multiple ranges are not supported, so a regular response will be sent for this request.",
+                logger.error(
+                  "[rsbuild-dev-middleware] A 'Range' header with multiple ranges was provided. Multiple ranges are not supported, so a regular response will be sent for this request.",
                 );
               }
               if (parsedRanges !== -2 && parsedRanges.length === 1) {
@@ -4915,7 +4923,7 @@
       }
       module.exports = wrapper;
     },
-    600: (module) => {
+    2117: (module) => {
       "use strict";
       const matchHtmlRegExp = /["'&<>]/;
       function escapeHtml(string) {
@@ -4960,13 +4968,13 @@
       }
       module.exports = escapeHtml;
     },
-    7508: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    5513: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const path = __nccwpck_require__(6928);
       const { parse } = __nccwpck_require__(7016);
       const querystring = __nccwpck_require__(3480);
-      const getPaths = __nccwpck_require__(7938);
-      const memorize = __nccwpck_require__(4504);
+      const getPaths = __nccwpck_require__(4803);
+      const memorize = __nccwpck_require__(2297);
       const memoizedParse = memorize(parse, undefined, (value) => {
         if (value.pathname) {
           value.pathname = decode(value.pathname);
@@ -5049,7 +5057,7 @@
       }
       module.exports = getFilenameFromUrl;
     },
-    7938: (module) => {
+    4803: (module) => {
       "use strict";
       function getPaths(context) {
         const { stats, options } = context;
@@ -5070,7 +5078,7 @@
       }
       module.exports = getPaths;
     },
-    4504: (module) => {
+    2297: (module) => {
       "use strict";
       const cacheStore = new WeakMap();
       function memorize(fn, { cache = new Map() } = {}, callback) {
@@ -5092,7 +5100,7 @@
       }
       module.exports = memorize;
     },
-    3086: (module) => {
+    1855: (module) => {
       "use strict";
       function parseTokenList(str) {
         let end = 0;
@@ -5125,28 +5133,26 @@
       }
       module.exports = parseTokenList;
     },
-    7875: (module) => {
+    4480: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
+      const { logger } = __nccwpck_require__(8679);
       function ready(context, callback, req) {
         if (context.state) {
           callback(context.stats);
           return;
         }
         const name = (req && req.url) || callback.name;
-        context.logger.info(
-          `wait until bundle finished${name ? `: ${name}` : ""}`,
+        logger.debug(
+          `[rsbuild-dev-middleware] wait until bundle finished${name ? `: ${name}` : ""}`,
         );
         context.callbacks.push(callback);
       }
       module.exports = ready;
     },
-    4425: (module) => {
+    2628: (module) => {
       "use strict";
       function setupHooks(context) {
         function invalid() {
-          if (context.state) {
-            context.logger.log("Compilation starting...");
-          }
           context.state = false;
           context.stats = undefined;
         }
@@ -5154,11 +5160,10 @@
           context.state = true;
           context.stats = stats;
           process.nextTick(() => {
-            const { logger, state, callbacks } = context;
+            const { state, callbacks } = context;
             if (!state) {
               return;
             }
-            logger.log("Compilation finished");
             context.callbacks = [];
             callbacks.forEach((callback) => {
               callback(stats);
@@ -5172,7 +5177,7 @@
       }
       module.exports = setupHooks;
     },
-    5063: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    6372: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const memfs = __nccwpck_require__(5590);
       function setupOutputFileSystem(context) {
@@ -5199,10 +5204,11 @@
       }
       module.exports = setupOutputFileSystem;
     },
-    6998: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    495: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const fs = __nccwpck_require__(9896);
       const path = __nccwpck_require__(6928);
+      const { logger } = __nccwpck_require__(8679);
       function setupWriteToDisk(context) {
         const compilers = context.compiler.compilers || [context.compiler];
         for (const compiler of compilers) {
@@ -5228,20 +5234,20 @@
                   : "";
                 return fs.mkdir(dir, { recursive: true }, (mkdirError) => {
                   if (mkdirError) {
-                    context.logger.error(
-                      `${name}Unable to write "${dir}" directory to disk:\n${mkdirError}`,
+                    logger.error(
+                      `[rsbuild-dev-middleware] ${name}Unable to write "${dir}" directory to disk:\n${mkdirError}`,
                     );
                     return callback(mkdirError);
                   }
                   return fs.writeFile(targetPath, content, (writeFileError) => {
                     if (writeFileError) {
-                      context.logger.error(
-                        `${name}Unable to write "${targetPath}" asset to disk:\n${writeFileError}`,
+                      logger.error(
+                        `[rsbuild-dev-middleware] ${name}Unable to write "${targetPath}" asset to disk:\n${writeFileError}`,
                       );
                       return callback(writeFileError);
                     }
-                    context.logger.log(
-                      `${name}Asset written to disk: "${targetPath}"`,
+                    logger.debug(
+                      `[rsbuild-dev-middleware] ${name}Asset written to disk: "${targetPath}"`,
                     );
                     return callback();
                   });
@@ -6118,6 +6124,10 @@
       "use strict";
       module.exports = require("../mrmime");
     },
+    8679: (module) => {
+      "use strict";
+      module.exports = require("../rslog");
+    },
     2613: (module) => {
       "use strict";
       module.exports = require("assert");
@@ -6185,6 +6195,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(6230);
+  var __webpack_exports__ = __nccwpck_require__(4189);
   module.exports = __webpack_exports__;
 })();

package/compiled/rsbuild-dev-middleware/package.json CHANGED Viewed

	@@ -1 +1 @@
1	- {"name":"rsbuild-dev-middleware","author":"Tobias Koppers @sokra","version":"0.1.2","funding":{"type":"opencollective","url":"https://opencollective.com/webpack"},"license":"MIT","types":"index.d.ts","type":"commonjs"}
1	+ {"name":"rsbuild-dev-middleware","author":"Tobias Koppers @sokra","version":"0.2.0","funding":{"type":"opencollective","url":"https://opencollective.com/webpack"},"license":"MIT","types":"index.d.ts","type":"commonjs"}

package/dist/index.cjs CHANGED Viewed

@@ -521,7 +521,7 @@ var __webpack_exports__ = {};
                 withFileTypes: !0
             });
             await Promise.all(entries.map(async (entry)=>{
-                let fullPath = external_node_path_default().resolve(dir, entry.name);
+                let fullPath = external_node_path_default().join(dir, entry.name);
                 !keep.some((reg)=>reg.test(toPosixPath(fullPath))) && (entry.isDirectory() ? (await emptyDir(fullPath, keep, !1), keep.length || await external_node_fs_default().promises.rmdir(fullPath)) : await external_node_fs_default().promises.unlink(fullPath));
             }));
         } catch (err) {
@@ -772,7 +772,9 @@ var __webpack_exports__ = {};
         if (seconds < 60) return `${format(seconds.toFixed(1))} s`;
         let minutes = seconds / 60;
         return `${format(minutes.toFixed(2))} m`;
-    }, isTTY = (type = 'stdout')=>('stdin' === type ? process.stdin.isTTY : process.stdout.isTTY) && !process.env.CI;
+    }, isTTY = (type = 'stdout')=>('stdin' === type ? process.stdin.isTTY : process.stdout.isTTY) && !process.env.CI, addCompilationError = (compilation, message)=>{
+        compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
+    };
     function loadEnv({ cwd = process.cwd(), mode = getNodeEnv(), prefixes = [
         'PUBLIC_'
     ], processEnv = process.env } = {}) {
@@ -916,7 +918,7 @@ var __webpack_exports__ = {};
             merged[key] = mergeConfig_merge(x[key], y[key], childPath);
         }
         return merged;
-    }, mergeRsbuildConfig = (...configs)=>2 === configs.length ? mergeConfig_merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>mergeConfig_merge(result, config), {}), commonOpts = {}, getEnvDir = (cwd, envDir)=>envDir ? external_node_path_default().isAbsolute(envDir) ? envDir : external_node_path_default().resolve(cwd, envDir) : cwd;
+    }, mergeRsbuildConfig = (...configs)=>2 === configs.length ? mergeConfig_merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>mergeConfig_merge(result, config), {}), commonOpts = {}, getEnvDir = (cwd, envDir)=>envDir ? external_node_path_default().isAbsolute(envDir) ? envDir : external_node_path_default().join(cwd, envDir) : cwd;
     async function init({ cliOptions, isRestart, isBuildWatch = !1 }) {
         cliOptions && (commonOpts = cliOptions);
         try {
@@ -1742,7 +1744,7 @@ var __webpack_exports__ = {};
     async function createContext(options, userConfig, bundlerType) {
         let { cwd } = options, rootPath = userConfig.root ? getAbsolutePath(cwd, userConfig.root) : cwd, rsbuildConfig = await withDefaultConfig(rootPath, userConfig), cachePath = (0, external_node_path_namespaceObject.join)(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0;
         return {
-            version: "1.2.12",
+            version: "1.2.13",
             rootPath,
             distPath: '',
             cachePath,
@@ -1821,12 +1823,24 @@ var __webpack_exports__ = {};
                     if (!appIcon) return;
                     let distDir = config.output.distPath.image, manifestFile = appIcon.filename ?? 'manifest.webmanifest', publicPath = getPublicPathFromCompiler(compilation), icons = appIcon.icons.map((icon)=>formatIcon(icon, distDir, publicPath)), tags = [];
                     for (let icon of icons){
-                        if ('web-app-manifest' === icon.target && !appIcon.name) throw Error("[rsbuild:app-icon] `appIcon.name` is required when `target` is 'web-app-manifest'.");
+                        if ('web-app-manifest' === icon.target && !appIcon.name) {
+                            addCompilationError(compilation, '[rsbuild:app-icon] "appIcon.name" is required when "target" is "web-app-manifest".');
+                            continue;
+                        }
                         if (!icon.isURL) {
-                            if (!compilation.inputFileSystem) throw Error("[rsbuild:app-icon] 'compilation.inputFileSystem' is not available.");
-                            if (!await fileExistsByCompilation(compilation, icon.absolutePath)) throw Error(`[rsbuild:app-icon] Can not find the app icon, please check if the '${icon.relativePath}' file exists'.`);
+                            if (!compilation.inputFileSystem) {
+                                addCompilationError(compilation, '[rsbuild:app-icon] Failed to read the icon file as "compilation.inputFileSystem" is not available.');
+                                continue;
+                            }
+                            if (!await fileExistsByCompilation(compilation, icon.absolutePath)) {
+                                addCompilationError(compilation, `[rsbuild:app-icon] Failed to find the icon file at "${index_js_default().cyan(icon.absolutePath)}".`);
+                                continue;
+                            }
                             let source = await (0, external_node_util_namespaceObject.promisify)(compilation.inputFileSystem.readFile)(icon.absolutePath);
-                            if (!source) throw Error(`[rsbuild:app-icon] Failed to read the app icon file, please check if the '${icon.relativePath}' file exists'.`);
+                            if (!source) {
+                                addCompilationError(compilation, `[rsbuild:app-icon] Failed to read the icon file at "${index_js_default().cyan(icon.absolutePath)}".`);
+                                continue;
+                            }
                             compilation.emitAsset(icon.relativePath, new sources.RawSource(source));
                         }
                         ('apple-touch-icon' === icon.target || !icon.target && icon.size < 200) && tags.push({
@@ -2043,7 +2057,7 @@ var __webpack_exports__ = {};
                         javascript: {
                             exportsPresence: 'error'
                         }
-                    }), isDev && config.dev.hmr && 'web' === target && chain.plugin(CHAIN_ID.PLUGIN.HMR).use(bundler.HotModuleReplacementPlugin), 'development' === env && chain.output.devtoolModuleFilenameTemplate((info)=>toPosixPath(external_node_path_default().resolve(info.absoluteResourcePath))), process.env.RSPACK_CONFIG_VALIDATE ||= 'loose-unrecognized-keys', process.env.WATCHPACK_WATCHER_LIMIT ||= '20', process.env.EXPERIMENTAL_RSPACK_INCREMENTAL && chain.experiments({
+                    }), isDev && config.dev.hmr && 'web' === target && chain.plugin(CHAIN_ID.PLUGIN.HMR).use(bundler.HotModuleReplacementPlugin), 'development' === env && chain.output.devtoolModuleFilenameTemplate((info)=>toPosixPath(info.absoluteResourcePath)), process.env.RSPACK_CONFIG_VALIDATE ||= 'loose-unrecognized-keys', process.env.WATCHPACK_WATCHER_LIMIT ||= '20', process.env.EXPERIMENTAL_RSPACK_INCREMENTAL && chain.experiments({
                         ...chain.get('experiments'),
                         incremental: isDev
                     });
@@ -2614,16 +2628,25 @@ var __webpack_exports__ = {};
     class RsbuildHtmlPlugin {
         apply(compiler) {
             let emitFavicon = async (compilation, favicon)=>{
+                let buffer;
                 let name = external_node_path_default().basename(favicon);
                 if (compilation.assets[name]) return name;
-                if (!compilation.inputFileSystem) throw Error("[rsbuild:html] 'compilation.inputFileSystem' is not available.");
-                let filename = external_node_path_default().resolve(compilation.compiler.context, favicon), buf = await (0, external_node_util_namespaceObject.promisify)(compilation.inputFileSystem.readFile)(filename);
-                if (!buf) throw Error(`[rsbuild:html] Failed to read the favicon, please check if the '${filename}' file exists'.`);
-                let source = new compiler.webpack.sources.RawSource(buf, !1);
+                if (!compilation.inputFileSystem) return addCompilationError(compilation, '[rsbuild:html] Failed to read the favicon file as "compilation.inputFileSystem" is not available.'), null;
+                let filename = external_node_path_default().isAbsolute(favicon) ? favicon : external_node_path_default().join(compilation.compiler.context, favicon);
+                try {
+                    if (!(buffer = await (0, external_node_util_namespaceObject.promisify)(compilation.inputFileSystem.readFile)(filename))) throw Error('Buffer is undefined');
+                } catch (error) {
+                    return rslog_index_js_namespaceObject.logger.debug(`read favicon error: ${error}`), addCompilationError(compilation, `[rsbuild:html] Failed to read the favicon file at "${index_js_default().cyan(filename)}".`), null;
+                }
+                let source = new compiler.webpack.sources.RawSource(buffer, !1);
                 return compilation.emitAsset(name, source), name;
             }, addFavicon = async (headTags, favicon, compilation, publicPath)=>{
                 let href = favicon;
-                isURL(favicon) || (href = ensureAssetPrefix(await emitFavicon(compilation, favicon), publicPath));
+                if (!isURL(favicon)) {
+                    let name = await emitFavicon(compilation, favicon);
+                    if (null === name) return;
+                    href = ensureAssetPrefix(name, publicPath);
+                }
                 let tag = {
                     tagName: 'link',
                     voidTag: !0,
@@ -2676,7 +2699,7 @@ var __webpack_exports__ = {};
             templatePath: void 0,
             templateContent: getDefaultTemplateContent(config.html.mountId)
         };
-        let absolutePath = (0, external_node_path_namespaceObject.isAbsolute)(templatePath) ? templatePath : external_node_path_default().resolve(rootPath, templatePath);
+        let absolutePath = (0, external_node_path_namespaceObject.isAbsolute)(templatePath) ? templatePath : external_node_path_default().join(rootPath, templatePath);
         if (!existTemplatePath.has(absolutePath)) {
             if (!await isFileExists(absolutePath)) throw Error(`[rsbuild:html] Failed to resolve HTML template, please check if the file exists: ${index_js_default().cyan(absolutePath)}`);
             existTemplatePath.add(absolutePath);
@@ -4648,7 +4671,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
         }
         updateStats(stats) {
             let compilationId = getCompilationId(stats.compilation);
-            this.stats[compilationId] = stats, this.sendStats({
+            this.stats[compilationId] = stats, this.sockets.length && this.sendStats({
                 compilationId
             });
         }
@@ -5559,7 +5582,10 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                 getPublicPathFromCompiler(compiler)
             ], compilerDevMiddleware = new CompilerDevMiddleware({
                 dev: devConfig,
-                server: config.server,
+                server: {
+                    ...config.server,
+                    port
+                },
                 publicPaths: publicPaths,
                 compiler,
                 environments: options.context.environments
@@ -6180,35 +6206,29 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                 let pluginName = 'RsbuildCorePlugin';
                 chain.plugin(pluginName).use(class {
                     apply(compiler) {
-                        for (let { handler, environment: pluginEnvironment } of (compiler.__rsbuildTransformer = transformer, resolveFns)){
-                            if (pluginEnvironment && !isPluginMatchEnvironment(pluginEnvironment, environment.name)) return;
-                            compiler.hooks.compilation.tap(pluginName, (compilation, { normalModuleFactory })=>{
-                                normalModuleFactory.hooks.resolve.tapPromise(pluginName, async (resolveData)=>handler({
-                                        compiler,
-                                        compilation,
-                                        environment,
-                                        resolveData
-                                    }));
-                            });
-                        }
+                        for (let { handler, environment: pluginEnvironment } of (compiler.__rsbuildTransformer = transformer, resolveFns))(!pluginEnvironment || isPluginMatchEnvironment(pluginEnvironment, environment.name)) && compiler.hooks.compilation.tap(pluginName, (compilation, { normalModuleFactory })=>{
+                            normalModuleFactory.hooks.resolve.tapPromise(pluginName, async (resolveData)=>handler({
+                                    compiler,
+                                    compilation,
+                                    environment,
+                                    resolveData
+                                }));
+                        });
                         compiler.hooks.thisCompilation.tap(pluginName, (compilation)=>{
                             compilation.hooks.childCompiler.tap(pluginName, (childCompiler)=>{
                                 childCompiler.__rsbuildTransformer = transformer;
                             });
                             let { sources } = compiler.webpack;
-                            for (let { descriptor, handler, environment: pluginEnvironment } of processAssetsFns){
-                                if (descriptor.targets && !descriptor.targets.includes(target) || descriptor.environments && !descriptor.environments.includes(environment.name) || pluginEnvironment && !isPluginMatchEnvironment(pluginEnvironment, environment.name)) return;
-                                compilation.hooks.processAssets.tapPromise({
-                                    name: pluginName,
-                                    stage: mapProcessAssetsStage(compiler, descriptor.stage)
-                                }, async (assets)=>handler({
-                                        assets,
-                                        compiler,
-                                        compilation,
-                                        environment,
-                                        sources
-                                    }));
-                            }
+                            for (let { descriptor, handler, environment: pluginEnvironment } of processAssetsFns)(!descriptor.targets || descriptor.targets.includes(target)) && (!descriptor.environments || descriptor.environments.includes(environment.name)) && (!pluginEnvironment || isPluginMatchEnvironment(pluginEnvironment, environment.name)) && compilation.hooks.processAssets.tapPromise({
+                                name: pluginName,
+                                stage: mapProcessAssetsStage(compiler, descriptor.stage)
+                            }, async (assets)=>handler({
+                                    assets,
+                                    compiler,
+                                    compilation,
+                                    environment,
+                                    sources
+                                }));
                         });
                     }
                     constructor(){
@@ -6723,12 +6743,12 @@ ${section.body}` : section.body).join("\n\n"));
                 }
             }(), process.title = 'rsbuild-node';
             let { npm_execpath } = process.env;
-            (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), rslog_index_js_namespaceObject.logger.greet(`  Rsbuild v1.2.12\n`);
+            (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), rslog_index_js_namespaceObject.logger.greet(`  Rsbuild v1.2.13\n`);
         }();
         try {
             !function() {
                 let cli = dist('rsbuild');
-                cli.help(), cli.version("1.2.12"), applyCommonOptions(cli);
+                cli.help(), cli.version("1.2.13"), applyCommonOptions(cli);
                 let devCommand = cli.command('dev', 'starting the dev server'), buildCommand = cli.command('build', 'build the app for production'), previewCommand = cli.command('preview', 'preview the production build locally'), inspectCommand = cli.command('inspect', 'inspect the Rspack and Rsbuild configs');
                 applyServerOptions(devCommand), applyServerOptions(previewCommand), devCommand.action(async (options)=>{
                     try {
@@ -6779,7 +6799,7 @@ ${section.body}` : section.body).join("\n\n"));
             rslog_index_js_namespaceObject.logger.error('Failed to start Rsbuild CLI.'), rslog_index_js_namespaceObject.logger.error(err);
         }
     }
-    let src_rslib_entry_version = "1.2.12";
+    let src_rslib_entry_version = "1.2.13";
 })();
 var __webpack_export_target__ = exports;
 for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];

package/dist/index.js CHANGED Viewed

@@ -434,7 +434,7 @@ async function emptyDir(dir, keep = [], checkExists = !0) {
             withFileTypes: !0
         });
         await Promise.all(entries.map(async (entry)=>{
-            let fullPath = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(dir, entry.name);
+            let fullPath = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.join(dir, entry.name);
             !keep.some((reg)=>reg.test(toPosixPath(fullPath))) && (entry.isDirectory() ? (await emptyDir(fullPath, keep, !1), keep.length || await __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__.default.promises.rmdir(fullPath)) : await __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__.default.promises.unlink(fullPath));
         }));
     } catch (err) {
@@ -685,7 +685,9 @@ let camelCase = (input)=>input.replace(/[-_](\w)/g, (_, c)=>c.toUpperCase()), pr
     if (seconds < 60) return `${format(seconds.toFixed(1))} s`;
     let minutes = seconds / 60;
     return `${format(minutes.toFixed(2))} m`;
-}, isTTY = (type = 'stdout')=>('stdin' === type ? process.stdin.isTTY : process.stdout.isTTY) && !process.env.CI;
+}, isTTY = (type = 'stdout')=>('stdin' === type ? process.stdin.isTTY : process.stdout.isTTY) && !process.env.CI, addCompilationError = (compilation, message)=>{
+    compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
+};
 function loadEnv({ cwd = process.cwd(), mode = getNodeEnv(), prefixes = [
     'PUBLIC_'
 ], processEnv = process.env } = {}) {
@@ -825,7 +827,7 @@ let configCache = {}, OVERRIDE_PATHS = [
         merged[key] = mergeConfig_merge(x[key], y[key], childPath);
     }
     return merged;
-}, mergeRsbuildConfig = (...configs)=>2 === configs.length ? mergeConfig_merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>mergeConfig_merge(result, config), {}), commonOpts = {}, getEnvDir = (cwd, envDir)=>envDir ? __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.isAbsolute(envDir) ? envDir : __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(cwd, envDir) : cwd;
+}, mergeRsbuildConfig = (...configs)=>2 === configs.length ? mergeConfig_merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>mergeConfig_merge(result, config), {}), commonOpts = {}, getEnvDir = (cwd, envDir)=>envDir ? __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.isAbsolute(envDir) ? envDir : __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.join(cwd, envDir) : cwd;
 async function init({ cliOptions, isRestart, isBuildWatch = !1 }) {
     cliOptions && (commonOpts = cliOptions);
     try {
@@ -1651,7 +1653,7 @@ async function updateEnvironmentContext(context, configs) {
 async function createContext(options, userConfig, bundlerType) {
     let { cwd } = options, rootPath = userConfig.root ? getAbsolutePath(cwd, userConfig.root) : cwd, rsbuildConfig = await withDefaultConfig(rootPath, userConfig), cachePath = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0;
     return {
-        version: "1.2.12",
+        version: "1.2.13",
         rootPath,
         distPath: '',
         cachePath,
@@ -1730,12 +1732,24 @@ let pluginAppIcon = ()=>({
                 if (!appIcon) return;
                 let distDir = config.output.distPath.image, manifestFile = appIcon.filename ?? 'manifest.webmanifest', publicPath = getPublicPathFromCompiler(compilation), icons = appIcon.icons.map((icon)=>formatIcon(icon, distDir, publicPath)), tags = [];
                 for (let icon of icons){
-                    if ('web-app-manifest' === icon.target && !appIcon.name) throw Error("[rsbuild:app-icon] `appIcon.name` is required when `target` is 'web-app-manifest'.");
+                    if ('web-app-manifest' === icon.target && !appIcon.name) {
+                        addCompilationError(compilation, '[rsbuild:app-icon] "appIcon.name" is required when "target" is "web-app-manifest".');
+                        continue;
+                    }
                     if (!icon.isURL) {
-                        if (!compilation.inputFileSystem) throw Error("[rsbuild:app-icon] 'compilation.inputFileSystem' is not available.");
-                        if (!await fileExistsByCompilation(compilation, icon.absolutePath)) throw Error(`[rsbuild:app-icon] Can not find the app icon, please check if the '${icon.relativePath}' file exists'.`);
+                        if (!compilation.inputFileSystem) {
+                            addCompilationError(compilation, '[rsbuild:app-icon] Failed to read the icon file as "compilation.inputFileSystem" is not available.');
+                            continue;
+                        }
+                        if (!await fileExistsByCompilation(compilation, icon.absolutePath)) {
+                            addCompilationError(compilation, `[rsbuild:app-icon] Failed to find the icon file at "${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.cyan(icon.absolutePath)}".`);
+                            continue;
+                        }
                         let source = await (0, __WEBPACK_EXTERNAL_MODULE_node_util_1b29d436__.promisify)(compilation.inputFileSystem.readFile)(icon.absolutePath);
-                        if (!source) throw Error(`[rsbuild:app-icon] Failed to read the app icon file, please check if the '${icon.relativePath}' file exists'.`);
+                        if (!source) {
+                            addCompilationError(compilation, `[rsbuild:app-icon] Failed to read the icon file at "${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.cyan(icon.absolutePath)}".`);
+                            continue;
+                        }
                         compilation.emitAsset(icon.relativePath, new sources.RawSource(source));
                     }
                     ('apple-touch-icon' === icon.target || !icon.target && icon.size < 200) && tags.push({
@@ -1952,7 +1966,7 @@ let configChain_CHAIN_ID = {
                     javascript: {
                         exportsPresence: 'error'
                     }
-                }), isDev && config.dev.hmr && 'web' === target && chain.plugin(CHAIN_ID.PLUGIN.HMR).use(bundler.HotModuleReplacementPlugin), 'development' === env && chain.output.devtoolModuleFilenameTemplate((info)=>toPosixPath(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(info.absoluteResourcePath))), process.env.RSPACK_CONFIG_VALIDATE ||= 'loose-unrecognized-keys', process.env.WATCHPACK_WATCHER_LIMIT ||= '20', process.env.EXPERIMENTAL_RSPACK_INCREMENTAL && chain.experiments({
+                }), isDev && config.dev.hmr && 'web' === target && chain.plugin(CHAIN_ID.PLUGIN.HMR).use(bundler.HotModuleReplacementPlugin), 'development' === env && chain.output.devtoolModuleFilenameTemplate((info)=>toPosixPath(info.absoluteResourcePath)), process.env.RSPACK_CONFIG_VALIDATE ||= 'loose-unrecognized-keys', process.env.WATCHPACK_WATCHER_LIMIT ||= '20', process.env.EXPERIMENTAL_RSPACK_INCREMENTAL && chain.experiments({
                     ...chain.get('experiments'),
                     incremental: isDev
                 });
@@ -2520,16 +2534,25 @@ let VOID_TAGS = [
 class RsbuildHtmlPlugin {
     apply(compiler) {
         let emitFavicon = async (compilation, favicon)=>{
+            let buffer;
             let name = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.basename(favicon);
             if (compilation.assets[name]) return name;
-            if (!compilation.inputFileSystem) throw Error("[rsbuild:html] 'compilation.inputFileSystem' is not available.");
-            let filename = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(compilation.compiler.context, favicon), buf = await (0, __WEBPACK_EXTERNAL_MODULE_node_util_1b29d436__.promisify)(compilation.inputFileSystem.readFile)(filename);
-            if (!buf) throw Error(`[rsbuild:html] Failed to read the favicon, please check if the '${filename}' file exists'.`);
-            let source = new compiler.webpack.sources.RawSource(buf, !1);
+            if (!compilation.inputFileSystem) return addCompilationError(compilation, '[rsbuild:html] Failed to read the favicon file as "compilation.inputFileSystem" is not available.'), null;
+            let filename = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.isAbsolute(favicon) ? favicon : __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.join(compilation.compiler.context, favicon);
+            try {
+                if (!(buffer = await (0, __WEBPACK_EXTERNAL_MODULE_node_util_1b29d436__.promisify)(compilation.inputFileSystem.readFile)(filename))) throw Error('Buffer is undefined');
+            } catch (error) {
+                return __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.debug(`read favicon error: ${error}`), addCompilationError(compilation, `[rsbuild:html] Failed to read the favicon file at "${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.cyan(filename)}".`), null;
+            }
+            let source = new compiler.webpack.sources.RawSource(buffer, !1);
             return compilation.emitAsset(name, source), name;
         }, addFavicon = async (headTags, favicon, compilation, publicPath)=>{
             let href = favicon;
-            isURL(favicon) || (href = ensureAssetPrefix(await emitFavicon(compilation, favicon), publicPath));
+            if (!isURL(favicon)) {
+                let name = await emitFavicon(compilation, favicon);
+                if (null === name) return;
+                href = ensureAssetPrefix(name, publicPath);
+            }
             let tag = {
                 tagName: 'link',
                 voidTag: !0,
@@ -2582,7 +2605,7 @@ async function getTemplate(entryName, config, rootPath) {
         templatePath: void 0,
         templateContent: getDefaultTemplateContent(config.html.mountId)
     };
-    let absolutePath = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.isAbsolute)(templatePath) ? templatePath : __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(rootPath, templatePath);
+    let absolutePath = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.isAbsolute)(templatePath) ? templatePath : __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.join(rootPath, templatePath);
     if (!existTemplatePath.has(absolutePath)) {
         if (!await isFileExists(absolutePath)) throw Error(`[rsbuild:html] Failed to resolve HTML template, please check if the file exists: ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.cyan(absolutePath)}`);
         existTemplatePath.add(absolutePath);
@@ -4542,7 +4565,7 @@ class SocketServer {
     }
     updateStats(stats) {
         let compilationId = getCompilationId(stats.compilation);
-        this.stats[compilationId] = stats, this.sendStats({
+        this.stats[compilationId] = stats, this.sockets.length && this.sendStats({
             compilationId
         });
     }
@@ -5448,7 +5471,10 @@ async function devServer_createDevServer(options, createCompiler, config, { comp
             getPublicPathFromCompiler(compiler)
         ], compilerDevMiddleware = new CompilerDevMiddleware({
             dev: devConfig,
-            server: config.server,
+            server: {
+                ...config.server,
+                port
+            },
             publicPaths: publicPaths,
             compiler,
             environments: options.context.environments
@@ -6069,35 +6095,29 @@ async function createRsbuild(options = {}) {
             let pluginName = 'RsbuildCorePlugin';
             chain.plugin(pluginName).use(class {
                 apply(compiler) {
-                    for (let { handler, environment: pluginEnvironment } of (compiler.__rsbuildTransformer = transformer, resolveFns)){
-                        if (pluginEnvironment && !isPluginMatchEnvironment(pluginEnvironment, environment.name)) return;
-                        compiler.hooks.compilation.tap(pluginName, (compilation, { normalModuleFactory })=>{
-                            normalModuleFactory.hooks.resolve.tapPromise(pluginName, async (resolveData)=>handler({
-                                    compiler,
-                                    compilation,
-                                    environment,
-                                    resolveData
-                                }));
-                        });
-                    }
+                    for (let { handler, environment: pluginEnvironment } of (compiler.__rsbuildTransformer = transformer, resolveFns))(!pluginEnvironment || isPluginMatchEnvironment(pluginEnvironment, environment.name)) && compiler.hooks.compilation.tap(pluginName, (compilation, { normalModuleFactory })=>{
+                        normalModuleFactory.hooks.resolve.tapPromise(pluginName, async (resolveData)=>handler({
+                                compiler,
+                                compilation,
+                                environment,
+                                resolveData
+                            }));
+                    });
                     compiler.hooks.thisCompilation.tap(pluginName, (compilation)=>{
                         compilation.hooks.childCompiler.tap(pluginName, (childCompiler)=>{
                             childCompiler.__rsbuildTransformer = transformer;
                         });
                         let { sources } = compiler.webpack;
-                        for (let { descriptor, handler, environment: pluginEnvironment } of processAssetsFns){
-                            if (descriptor.targets && !descriptor.targets.includes(target) || descriptor.environments && !descriptor.environments.includes(environment.name) || pluginEnvironment && !isPluginMatchEnvironment(pluginEnvironment, environment.name)) return;
-                            compilation.hooks.processAssets.tapPromise({
-                                name: pluginName,
-                                stage: mapProcessAssetsStage(compiler, descriptor.stage)
-                            }, async (assets)=>handler({
-                                    assets,
-                                    compiler,
-                                    compilation,
-                                    environment,
-                                    sources
-                                }));
-                        }
+                        for (let { descriptor, handler, environment: pluginEnvironment } of processAssetsFns)(!descriptor.targets || descriptor.targets.includes(target)) && (!descriptor.environments || descriptor.environments.includes(environment.name)) && (!pluginEnvironment || isPluginMatchEnvironment(pluginEnvironment, environment.name)) && compilation.hooks.processAssets.tapPromise({
+                            name: pluginName,
+                            stage: mapProcessAssetsStage(compiler, descriptor.stage)
+                        }, async (assets)=>handler({
+                                assets,
+                                compiler,
+                                compilation,
+                                environment,
+                                sources
+                            }));
                     });
                 }
                 constructor(){
@@ -6611,12 +6631,12 @@ async function runCLI() {
             }
         }(), process.title = 'rsbuild-node';
         let { npm_execpath } = process.env;
-        (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rsbuild v1.2.12\n`);
+        (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rsbuild v1.2.13\n`);
     }();
     try {
         !function() {
             let cli = dist('rsbuild');
-            cli.help(), cli.version("1.2.12"), applyCommonOptions(cli);
+            cli.help(), cli.version("1.2.13"), applyCommonOptions(cli);
             let devCommand = cli.command('dev', 'starting the dev server'), buildCommand = cli.command('build', 'build the app for production'), previewCommand = cli.command('preview', 'preview the production build locally'), inspectCommand = cli.command('inspect', 'inspect the Rspack and Rsbuild configs');
             applyServerOptions(devCommand), applyServerOptions(previewCommand), devCommand.action(async (options)=>{
                 try {
@@ -6667,6 +6687,6 @@ async function runCLI() {
         __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error('Failed to start Rsbuild CLI.'), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error(err);
     }
 }
-let src_version = "1.2.12";
+let src_version = "1.2.13";
 var __webpack_exports__logger = __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger, __webpack_exports__rspack = __WEBPACK_EXTERNAL_MODULE__rspack_core_e0096ff7__.rspack;
 export { PLUGIN_CSS_NAME, PLUGIN_SWC_NAME, createRsbuild, defineConfig, ensureAssetPrefix, config_loadConfig as loadConfig, loadEnv, mergeRsbuildConfig, runCLI, src_version as version, __webpack_exports__logger as logger, __webpack_exports__rspack as rspack };

package/dist-types/helpers/index.d.ts CHANGED Viewed

@@ -45,3 +45,4 @@ export declare const prettyTime: (seconds: number) => string;
  * Check if running in a TTY context
  */
 export declare const isTTY: (type?: "stdin" | "stdout") => boolean;
+export declare const addCompilationError: (compilation: Rspack.Compilation, message: string) => void;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -81,7 +81,7 @@
     "postcss-loader": "8.1.1",
     "prebundle": "1.2.7",
     "reduce-configs": "^1.1.0",
-    "rsbuild-dev-middleware": "0.1.2",
+    "rsbuild-dev-middleware": "0.2.0",
     "rslog": "^1.2.3",
     "rspack-chain": "^1.2.1",
     "rspack-manifest-plugin": "5.0.3",