@rsbuild/core 0.7.6 → 0.7.7

package/dist/client/hmr.js

@@ -30,16 +30,16 @@ function hintUnknownFiles(message) {
   }
   return message;
 }
-function formatMessage(stats) {
+function formatMessage(stats, verbose) {
   let lines = [];
   let message;
   if (typeof stats === "object") {
     const fileName = resolveFileName(stats);
     const mainMessage = stats.message;
-    const details = stats.details ? `
+    const details = verbose && stats.details ? `
 Details: ${stats.details}
 ` : "";
-    const stack = stats.stack ? `
+    const stack = verbose && stats.stack ? `
 ${stats.stack}` : "";
     message = `${fileName}${mainMessage}${details}${stack}`;
   } else {
@@ -49,12 +49,16 @@ ${stats.stack}` : "";
   lines = message.split("\n");
   lines = lines.filter((line, index, arr) => index === 0 || line.trim() !== "" || line.trim() !== arr[index - 1].trim());
   message = lines.join("\n");
+  const innerError = "-- inner error --";
+  if (!verbose && message.includes(innerError)) {
+    message = message.split(innerError)[0];
+  }
   return message.trim();
 }
-function formatStatsMessages(stats) {
+function formatStatsMessages(stats, verbose) {
   var _stats_errors, _stats_warnings;
-  const formattedErrors = ((_stats_errors = stats.errors) === null || _stats_errors === void 0 ? void 0 : _stats_errors.map(formatMessage)) || [];
-  const formattedWarnings = ((_stats_warnings = stats.warnings) === null || _stats_warnings === void 0 ? void 0 : _stats_warnings.map(formatMessage)) || [];
+  const formattedErrors = ((_stats_errors = stats.errors) === null || _stats_errors === void 0 ? void 0 : _stats_errors.map((error) => formatMessage(error, verbose))) || [];
+  const formattedWarnings = ((_stats_warnings = stats.warnings) === null || _stats_warnings === void 0 ? void 0 : _stats_warnings.map((warning) => formatMessage(warning, verbose))) || [];
   return {
     errors: formattedErrors,
     warnings: formattedWarnings

package/dist/client/overlay.js

@@ -50,7 +50,7 @@ var overlayTemplate = `
 .container {
   font-family: Menlo, Consolas, monospace;
   line-height: 1.6;
-  width: 800px;
+  width: 960px;
   max-width: 85%;
   color: #d8d8d8;
   margin: 32px auto;

package/dist/index.cjs

@@ -76,16 +76,16 @@ function hintUnknownFiles(message) {
   }
   return message;
 }
-function formatMessage(stats) {
+function formatMessage(stats, verbose) {
   let lines = [];
   let message;
   if (typeof stats === "object") {
     const fileName = resolveFileName(stats);
     const mainMessage = stats.message;
-    const details = stats.details ? `
+    const details = verbose && stats.details ? `
 Details: ${stats.details}
 ` : "";
-    const stack = stats.stack ? `
+    const stack = verbose && stats.stack ? `
 ${stats.stack}` : "";
     message = `${fileName}${mainMessage}${details}${stack}`;
   } else {
@@ -97,11 +97,15 @@ ${stats.stack}` : "";
     (line, index, arr) => index === 0 || line.trim() !== "" || line.trim() !== arr[index - 1].trim()
   );
   message = lines.join("\n");
+  const innerError = "-- inner error --";
+  if (!verbose && message.includes(innerError)) {
+    message = message.split(innerError)[0];
+  }
   return message.trim();
 }
-function formatStatsMessages(stats) {
-  const formattedErrors = stats.errors?.map(formatMessage) || [];
-  const formattedWarnings = stats.warnings?.map(formatMessage) || [];
+function formatStatsMessages(stats, verbose) {
+  const formattedErrors = stats.errors?.map((error) => formatMessage(error, verbose)) || [];
+  const formattedWarnings = stats.warnings?.map((warning) => formatMessage(warning, verbose)) || [];
   return {
     errors: formattedErrors,
     warnings: formattedWarnings
@@ -202,10 +206,14 @@ function formatStats(stats, options = {}) {
       ...options
     } : options
   );
-  const { errors, warnings } = formatStatsMessages({
-    errors: getAllStatsErrors(statsData),
-    warnings: getAllStatsWarnings(statsData)
-  });
+  const { errors, warnings } = formatStatsMessages(
+    {
+      errors: getAllStatsErrors(statsData),
+      warnings: getAllStatsWarnings(statsData)
+    },
+    // display verbose messages in prod build or debug mode
+    (0, import_shared.isProd)() || (0, import_shared.isDebug)()
+  );
   if (stats.hasErrors()) {
     return {
       message: formatErrorMessage(errors),
@@ -625,7 +633,7 @@ async function stringifyConfig(config, verbose) {
   const stringify = import_shared5.RspackChain.toString;
   return stringify(config, { verbose });
 }
-var import_node_fs, import_node_path4, import_shared5, getDefaultDevConfig, getDefaultServerConfig, getDefaultSourceConfig, getDefaultHtmlConfig, getDefaultSecurityConfig, getDefaultToolsConfig, getDefaultPerformanceConfig, getDefaultOutputConfig, createDefaultConfig, withDefaultConfig, normalizeConfig, resolveConfigPath;
+var import_node_fs, import_node_path4, import_shared5, getDefaultDevConfig, getDefaultServerConfig, getDefaultSourceConfig, getDefaultHtmlConfig, getDefaultSecurityConfig, getDefaultToolsConfig, getDefaultPerformanceConfig, getDefaultOutputConfig, createDefaultConfig, withDefaultConfig, normalizeConfig, resolveConfigPath, normalizePublicDirs;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
@@ -652,12 +660,7 @@ var init_config = __esm({
       htmlFallback: "index",
       compress: true,
       printUrls: true,
-      strictPort: false,
-      publicDir: {
-        name: "public",
-        copyOnBuild: true,
-        watch: false
-      }
+      strictPort: false
     });
     getDefaultSourceConfig = () => ({
       alias: {},
@@ -798,6 +801,31 @@ var init_config = __esm({
       }
       return null;
     };
+    normalizePublicDirs = (publicDir) => {
+      if (publicDir === false) {
+        return [];
+      }
+      const defaultConfig = {
+        name: "public",
+        copyOnBuild: true,
+        watch: false
+      };
+      if (publicDir === void 0) {
+        return [defaultConfig];
+      }
+      if (Array.isArray(publicDir)) {
+        return publicDir.map((options) => ({
+          ...defaultConfig,
+          ...options
+        }));
+      }
+      return [
+        {
+          ...defaultConfig,
+          ...publicDir
+        }
+      ];
+    };
   }
 });
 
@@ -828,6 +856,7 @@ function loadEnv({
   for (const key of Object.keys(process.env)) {
     if (prefixes.some((prefix) => key.startsWith(prefix))) {
       const val = process.env[key];
+      publicVars[`import.meta.env.${key}`] = JSON.stringify(val);
       publicVars[`process.env.${key}`] = JSON.stringify(val);
     }
   }
@@ -1003,7 +1032,7 @@ async function createContextByConfig(options, bundlerType, config = {}) {
   return {
     entry: getEntryObject(config, "web"),
     targets: config.output?.targets || [],
-    version: "0.7.6",
+    version: "0.7.7",
     rootPath,
     distPath,
     cachePath,
@@ -2037,6 +2066,7 @@ var init_getDevMiddlewares = __esm({
     import_node_path10 = require("path");
     import_node_url2 = __toESM(require("url"));
     import_shared19 = require("@rsbuild/shared");
+    init_config();
     init_middlewares();
     applySetupMiddlewares = (dev, compileMiddlewareAPI) => {
       const setupMiddlewares = dev.setupMiddlewares || [];
@@ -2114,11 +2144,12 @@ var init_getDevMiddlewares = __esm({
           }
         });
       }
-      if (server.publicDir !== false && server.publicDir?.name) {
+      const publicDirs = normalizePublicDirs(server?.publicDir);
+      for (const publicDir of publicDirs) {
         const { default: sirv } = await import("../compiled/sirv/index.js");
-        const { name } = server.publicDir;
-        const publicDir = (0, import_node_path10.isAbsolute)(name) ? name : (0, import_node_path10.join)(pwd, name);
-        const assetMiddleware = sirv(publicDir, {
+        const { name } = publicDir;
+        const normalizedPath = (0, import_node_path10.isAbsolute)(name) ? name : (0, import_node_path10.join)(pwd, name);
+        const assetMiddleware = sirv(normalizedPath, {
           etag: true,
           dev: true
         });
@@ -2503,11 +2534,15 @@ async function watchDevFiles(devConfig, compileMiddlewareAPI) {
   return startWatchFiles(watchOptions, compileMiddlewareAPI);
 }
 function watchServerFiles(serverConfig, compileMiddlewareAPI) {
-  const { publicDir } = serverConfig;
-  if (!publicDir || !publicDir.watch || !publicDir.name) {
+  const publicDirs = normalizePublicDirs(serverConfig.publicDir);
+  if (!publicDirs.length) {
+    return;
+  }
+  const watchPaths = publicDirs.filter((item) => item.watch).map((item) => item.name);
+  if (!watchPaths.length) {
     return;
   }
-  const watchOptions = prepareWatchOptions(publicDir.name);
+  const watchOptions = prepareWatchOptions(watchPaths);
   return startWatchFiles(watchOptions, compileMiddlewareAPI);
 }
 function prepareWatchOptions(paths, options = {}) {
@@ -2527,6 +2562,7 @@ async function startWatchFiles({ paths, options }, compileMiddlewareAPI) {
 var init_watchFiles = __esm({
   "src/server/watchFiles.ts"() {
     "use strict";
+    init_config();
   }
 });
 
@@ -3291,12 +3327,12 @@ var init_basic = __esm({
       name: "rsbuild:basic",
       setup(api) {
         api.modifyBundlerChain(
-          (chain, { env, isProd: isProd5, target, bundler, CHAIN_ID: CHAIN_ID3 }) => {
+          (chain, { env, isProd: isProd6, target, bundler, CHAIN_ID: CHAIN_ID3 }) => {
             const config = api.getNormalizedConfig();
             chain.name(import_shared25.TARGET_ID_MAP[target]);
             chain.devtool((0, import_shared25.getJsSourceMap)(config));
             chain.context(api.context.rootPath);
-            chain.mode(isProd5 ? "production" : "development");
+            chain.mode(isProd6 ? "production" : "development");
             chain.merge({
               infrastructureLogging: {
                 // Using `error` level to avoid `cache.PackFileCacheStrategy` logs
@@ -3309,9 +3345,9 @@ var init_basic = __esm({
                 exportsPresence: "error"
               }
             });
-            const isMinimize = isProd5 && config.output.minify !== false;
+            const isMinimize = isProd6 && config.output.minify !== false;
             chain.optimization.minimize(isMinimize);
-            const usingHMR = (0, import_shared25.isUsingHMR)(config, { target, isProd: isProd5 });
+            const usingHMR = (0, import_shared25.isUsingHMR)(config, { target, isProd: isProd6 });
             if (usingHMR) {
               chain.plugin(CHAIN_ID3.PLUGIN.HMR).use(bundler.HotModuleReplacementPlugin);
             }
@@ -3493,7 +3529,7 @@ async function applyCSSRule({
   rule,
   config,
   context,
-  utils: { target, isProd: isProd5, CHAIN_ID: CHAIN_ID3 },
+  utils: { target, isProd: isProd6, CHAIN_ID: CHAIN_ID3 },
   importLoaders = 1
 }) {
   const browserslist = await (0, import_shared28.getBrowserslistWithDefault)(
@@ -3502,7 +3538,7 @@ async function applyCSSRule({
     target
   );
   const enableExtractCSS = isUseCssExtract(config, target);
-  const localIdentName = getCSSModulesLocalIdentName(config, isProd5);
+  const localIdentName = getCSSModulesLocalIdentName(config, isProd6);
   const cssLoaderOptions = getCSSLoaderOptions({
     config,
     importLoaders,
@@ -3545,8 +3581,8 @@ var init_css = __esm({
     init_pluginHelper();
     enableNativeCss = (config) => !config.output.injectStyles;
     isUseCssExtract = (config, target) => !config.output.injectStyles && target !== "node" && target !== "web-worker";
-    getCSSModulesLocalIdentName = (config, isProd5) => config.output.cssModules.localIdentName || // Using shorter classname in production to reduce bundle size
-    (isProd5 ? "[local]-[hash:base64:6]" : "[path][name]__[local]-[hash:base64:6]");
+    getCSSModulesLocalIdentName = (config, isProd6) => config.output.cssModules.localIdentName || // Using shorter classname in production to reduce bundle size
+    (isProd6 ? "[local]-[hash:base64:6]" : "[path][name]__[local]-[hash:base64:6]");
     normalizeCssLoaderOptions = (options, exportOnlyLocals) => {
       if (options.modules && exportOnlyLocals) {
         let { modules } = options;
@@ -3693,13 +3729,13 @@ __export(output_exports, {
   pluginOutput: () => pluginOutput
 });
 function getPublicPath({
-  isProd: isProd5,
+  isProd: isProd6,
   config,
   context
 }) {
   const { dev, output } = config;
   let publicPath = import_shared29.DEFAULT_ASSET_PREFIX;
-  if (isProd5) {
+  if (isProd6) {
     if (typeof output.assetPrefix === "string") {
       publicPath = output.assetPrefix;
     }
@@ -3733,16 +3769,16 @@ var init_output = __esm({
       name: "rsbuild:output",
       setup(api) {
         api.modifyBundlerChain(
-          async (chain, { CHAIN_ID: CHAIN_ID3, target, isProd: isProd5, isServer, isServiceWorker }) => {
+          async (chain, { CHAIN_ID: CHAIN_ID3, target, isProd: isProd6, isServer, isServiceWorker }) => {
             const config = api.getNormalizedConfig();
             const publicPath = getPublicPath({
               config,
-              isProd: isProd5,
+              isProd: isProd6,
               context: api.context
             });
             const jsPath = (0, import_shared29.getDistPath)(config, "js");
             const jsAsyncPath = (0, import_shared29.getDistPath)(config, "jsAsync");
-            const jsFilename = (0, import_shared29.getFilename)(config, "js", isProd5);
+            const jsFilename = (0, import_shared29.getFilename)(config, "js", isProd6);
             const isJsFilenameFn = typeof jsFilename === "function";
             chain.output.path(api.context.distPath).filename(
               isJsFilenameFn ? (...args) => {
@@ -3775,7 +3811,7 @@ var init_output = __esm({
             if (isUseCssExtract(config, target)) {
               const extractPluginOptions = config.tools.cssExtract.pluginOptions;
               const cssPath = (0, import_shared29.getDistPath)(config, "css");
-              const cssFilename = (0, import_shared29.getFilename)(config, "css", isProd5);
+              const cssFilename = (0, import_shared29.getFilename)(config, "css", isProd6);
               const cssAsyncPath = (0, import_shared29.getDistPath)(config, "cssAsync");
               chain.plugin(CHAIN_ID3.PLUGIN.MINI_CSS_EXTRACT).use(getCssExtractPlugin(), [
                 {
@@ -4151,12 +4187,12 @@ var init_asset = __esm({
     pluginAsset = () => ({
       name: "rsbuild:asset",
       setup(api) {
-        api.modifyBundlerChain((chain, { isProd: isProd5, target }) => {
+        api.modifyBundlerChain((chain, { isProd: isProd6, target }) => {
           const config = api.getNormalizedConfig();
           const createAssetRule = (assetType, exts, emit2) => {
             const regExp = getRegExpForExts(exts);
             const distDir = (0, import_shared34.getDistPath)(config, assetType);
-            const filename = (0, import_shared34.getFilename)(config, assetType, isProd5);
+            const filename = (0, import_shared34.getFilename)(config, assetType, isProd6);
             const { dataUriLimit } = config.output;
             const maxSize = typeof dataUriLimit === "number" ? dataUriLimit : dataUriLimit[assetType];
             const rule = chain.module.rule(assetType).test(regExp);
@@ -4234,9 +4270,9 @@ var init_minimize = __esm({
       }
       return options;
     };
-    parseMinifyOptions = (config, isProd5 = true) => {
+    parseMinifyOptions = (config, isProd6 = true) => {
       const minify = config.output.minify;
-      if (minify === false || !isProd5) {
+      if (minify === false || !isProd6) {
         return {
           minifyJs: false,
           minifyCss: false,
@@ -4268,9 +4304,9 @@ var init_minimize = __esm({
         if (api.context.bundlerType === "webpack") {
           return;
         }
-        api.modifyBundlerChain(async (chain, { isProd: isProd5 }) => {
+        api.modifyBundlerChain(async (chain, { isProd: isProd6 }) => {
           const config = api.getNormalizedConfig();
-          const isMinimize = isProd5 && config.output.minify !== false;
+          const isMinimize = isProd6 && config.output.minify !== false;
           if (!isMinimize) {
             return;
           }
@@ -4609,8 +4645,8 @@ function getTerserMinifyOptions(config) {
   const finalOptions = applyRemoveConsole(options, config);
   return finalOptions;
 }
-async function getHtmlMinifyOptions(isProd5, config) {
-  if (!isProd5 || !config.output.minify || !parseMinifyOptions(config).minifyHtml) {
+async function getHtmlMinifyOptions(isProd6, config) {
+  if (!isProd6 || !config.output.minify || !parseMinifyOptions(config).minifyHtml) {
     return false;
   }
   const minifyJS = getTerserMinifyOptions(config);
@@ -4761,12 +4797,12 @@ var init_html = __esm({
       name: "rsbuild:html",
       setup(api) {
         api.modifyBundlerChain(
-          async (chain, { HtmlPlugin, isProd: isProd5, CHAIN_ID: CHAIN_ID3, target }) => {
+          async (chain, { HtmlPlugin, isProd: isProd6, CHAIN_ID: CHAIN_ID3, target }) => {
             const config = api.getNormalizedConfig();
             if ((0, import_shared38.isHtmlDisabled)(config, target)) {
               return;
             }
-            const minify = await getHtmlMinifyOptions(isProd5, config);
+            const minify = await getHtmlMinifyOptions(isProd6, config);
             const assetPrefix = getPublicPathFromChain(chain, false);
             const entries = chain.entryPoints.entries() || {};
             const entryNames = Object.keys(entries);
@@ -6283,28 +6319,30 @@ var init_server = __esm({
     "use strict";
     import_node_path26 = require("path");
     import_shared51 = require("@rsbuild/shared");
+    init_config();
     pluginServer = () => ({
       name: "rsbuild:server",
       setup(api) {
         api.onBeforeBuild(async () => {
           const config = api.getNormalizedConfig();
-          if (config.server?.publicDir) {
-            const { name, copyOnBuild } = config.server.publicDir;
+          const publicDirs = normalizePublicDirs(config.server.publicDir);
+          for (const publicDir of publicDirs) {
+            const { name, copyOnBuild } = publicDir;
             if (!copyOnBuild || !name) {
-              return;
+              continue;
             }
-            const publicDir = (0, import_node_path26.isAbsolute)(name) ? name : (0, import_node_path26.join)(api.context.rootPath, name);
-            if (!import_shared51.fse.existsSync(publicDir)) {
-              return;
+            const normalizedPath = (0, import_node_path26.isAbsolute)(name) ? name : (0, import_node_path26.join)(api.context.rootPath, name);
+            if (!import_shared51.fse.existsSync(normalizedPath)) {
+              continue;
             }
             try {
-              await import_shared51.fse.copy(publicDir, api.context.distPath, {
+              await import_shared51.fse.copy(normalizedPath, api.context.distPath, {
                 // dereference symlinks
                 dereference: true
               });
             } catch (err) {
               if (err instanceof Error) {
-                err.message = `Copy public dir (${publicDir}) to dist failed:
+                err.message = `Copy public dir (${normalizedPath}) to dist failed:
 ${err.message}`;
               }
               throw err;
@@ -6640,8 +6678,8 @@ var init_lazyCompilation = __esm({
     pluginLazyCompilation = () => ({
       name: "rsbuild:lazy-compilation",
       setup(api) {
-        api.modifyBundlerChain((chain, { isProd: isProd5, target }) => {
-          if (isProd5 || target !== "web") {
+        api.modifyBundlerChain((chain, { isProd: isProd6, target }) => {
+          if (isProd6 || target !== "web") {
             return;
           }
           const config = api.getNormalizedConfig();
@@ -7224,7 +7262,7 @@ var applyServerOptions = (command) => {
   command.option("-o --open [url]", "open the page in browser on startup").option("--port <port>", "specify a port number for server to listen").option("--host <host>", "specify the host that the server listens to");
 };
 function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.7.6");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.7.7");
   const devCommand = import_commander.program.command("dev");
   const buildCommand = import_commander.program.command("build");
   const previewCommand = import_commander.program.command("preview");
@@ -7314,7 +7352,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  import_shared61.logger.greet(`  ${`Rsbuild v${"0.7.6"}`}
+  import_shared61.logger.greet(`  ${`Rsbuild v${"0.7.7"}`}
 `);
 }
 
@@ -7341,7 +7379,7 @@ init_config();
 var import_shared62 = require("@rsbuild/shared");
 init_mergeConfig();
 init_constants();
-var version = "0.7.6";
+var version = "0.7.7";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,