@rsbuild/core 2.1.0-beta.0 → 2.1.0

package/compiled/html-rspack-plugin/index.js

@@ -1,8 +1,8 @@
 (() => {
   var __webpack_modules__ = {
-    755: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    690: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const { HtmlWebpackChildCompiler } = __nccwpck_require__(104);
+      const { HtmlWebpackChildCompiler } = __nccwpck_require__(139);
       const compilerMap = new WeakMap();
       class CachedChildCompilation {
         constructor(compiler) {
@@ -311,7 +311,7 @@
       }
       module.exports = { CachedChildCompilation };
     },
-    104: (module) => {
+    139: (module) => {
       "use strict";
       class HtmlWebpackChildCompiler {
         constructor(templates) {
@@ -480,7 +480,7 @@
       }
       module.exports = { HtmlWebpackChildCompiler };
     },
-    128: (module) => {
+    577: (module) => {
       "use strict";
       module.exports = {};
       module.exports.none = (chunks) => chunks;
@@ -499,7 +499,7 @@
       };
       module.exports.auto = module.exports.none;
     },
-    775: (module) => {
+    480: (module) => {
       "use strict";
       module.exports = function (err) {
         return {
@@ -523,7 +523,7 @@
         };
       };
     },
-    726: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    703: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const { AsyncSeriesWaterfallHook } = __nccwpck_require__(159);
       const htmlWebpackPluginHooksMap = new WeakMap();
@@ -549,7 +549,7 @@
       }
       module.exports = { getHtmlRspackPluginHooks };
     },
-    259: (module) => {
+    822: (module) => {
       const voidTags = [
         "area",
         "base",
@@ -617,19 +617,19 @@
         htmlTagObjectToString,
       };
     },
-    194: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    623: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const promisify = __nccwpck_require__(23).promisify;
       const vm = __nccwpck_require__(154);
       const fs = __nccwpck_require__(896);
       const path = __nccwpck_require__(928);
-      const { CachedChildCompilation } = __nccwpck_require__(755);
+      const { CachedChildCompilation } = __nccwpck_require__(690);
       const { createHtmlTagObject, htmlTagObjectToString, HtmlTagArray } =
-        __nccwpck_require__(259);
-      const prettyError = __nccwpck_require__(775);
-      const chunkSorter = __nccwpck_require__(128);
+        __nccwpck_require__(822);
+      const prettyError = __nccwpck_require__(480);
+      const chunkSorter = __nccwpck_require__(577);
       const getHtmlRspackPluginHooks =
-        __nccwpck_require__(726).getHtmlRspackPluginHooks;
+        __nccwpck_require__(703).getHtmlRspackPluginHooks;
       const WITH_PLACEHOLDER = "function __with_placeholder__";
       class HtmlRspackPlugin {
         constructor(userOptions = {}) {
@@ -2398,6 +2398,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(194);
+  var __webpack_exports__ = __nccwpck_require__(623);
   module.exports = __webpack_exports__;
 })();

package/compiled/postcss-loader/index.js

@@ -1,15 +1,15 @@
 (() => {
   "use strict";
   var __webpack_modules__ = {
-    93: (module, __unused_webpack_exports, __nccwpck_require__) => {
-      module.exports = __nccwpck_require__(879)["default"];
+    303: (module, __unused_webpack_exports, __nccwpck_require__) => {
+      module.exports = __nccwpck_require__(713)["default"];
     },
-    879: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    713: (__unused_webpack_module, exports, __nccwpck_require__) => {
       var __webpack_unused_export__;
       __webpack_unused_export__ = { value: true };
       exports["default"] = loader;
       var _nodePath = _interopRequireDefault(__nccwpck_require__(760));
-      var _utils = __nccwpck_require__(434);
+      var _utils = __nccwpck_require__(732);
       function _interopRequireDefault(e) {
         return e && e.__esModule ? e : { default: e };
       }
@@ -179,7 +179,7 @@
         callback(null, result.css, map, { ast });
       }
     },
-    434: (module, exports, __nccwpck_require__) => {
+    732: (module, exports, __nccwpck_require__) => {
       module = __nccwpck_require__.nmd(module);
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.exec = exec;
@@ -716,6 +716,6 @@
   })();
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(93);
+  var __webpack_exports__ = __nccwpck_require__(303);
   module.exports = __webpack_exports__;
 })();

package/dist/756.js

@@ -3289,9 +3289,10 @@ function initPluginAPI({ context, pluginManager }) {
             default:
                 throw Error(`${color.dim('[rsbuild]')} ${color.yellow('getRsbuildConfig')} received an invalid type parameter.`);
         }
-    }, exposed = new Map(), expose = (id, api)=>{
-        exposed.set(id, api);
-    }, useExposed = (id)=>exposed.get(id), transformId = 0, transformer = {}, processAssetsFns = [], resolveFns = [];
+    }, GLOBAL_EXPOSED_KEY = Symbol('global-exposed'), exposed = new Map(), expose = (id, api, options)=>{
+        let exposedAPIs = exposed.get(id) ?? new Map(), key = options?.environment ?? GLOBAL_EXPOSED_KEY;
+        exposedAPIs.set(key, api), exposed.set(id, exposedAPIs);
+    }, transformId = 0, transformer = {}, processAssetsFns = [], resolveFns = [];
     hooks.modifyBundlerChain.tap((chain, { target, environment })=>{
         let pluginName = 'RsbuildCorePlugin';
         chain.plugin(pluginName).use(class {
@@ -3351,7 +3352,10 @@ function initPluginAPI({ context, pluginManager }) {
                     }
                 });
             },
-            useExposed,
+            useExposed: (id)=>{
+                let exposedAPIs = exposed.get(id);
+                if (exposedAPIs) return void 0 !== environment && exposedAPIs.has(environment) ? exposedAPIs.get(environment) : exposedAPIs.get(GLOBAL_EXPOSED_KEY);
+            },
             processAssets: (descriptor, handler)=>{
                 processAssetsFns.push({
                     environment: environment,
@@ -3497,7 +3501,7 @@ function createPublicContext(context) {
 async function createContext(options, userConfig, logger) {
     let { cwd } = options, rootPath = userConfig.root ? ensureAbsolutePath(cwd, userConfig.root) : cwd, rsbuildConfig = await withDefaultConfig(rootPath, userConfig), cachePath = join(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0;
     return {
-        version: "2.1.0-beta.0",
+        version: "2.1.0",
         rootPath,
         distPath: '',
         cachePath,
@@ -5118,12 +5122,11 @@ function pluginExternals() {
     };
 }
 async function gzipSize(input) {
-    let data = await new Promise((resolve, reject)=>{
+    return (await new Promise((resolve, reject)=>{
         node_zlib.gzip(input, (err, result)=>{
             err ? reject(err) : resolve(result);
         });
-    });
-    return Buffer.byteLength(data);
+    })).length;
 }
 function getSnapshotPath(dir, snapshotHash) {
     return snapshotHash ? node_path.join(dir, `rsbuild/file-sizes-${snapshotHash}.json`) : node_path.join(dir, 'rsbuild/file-sizes.json');
@@ -5148,7 +5151,7 @@ async function saveSnapshots(snapshotPath, snapshots, logger) {
         logger.debug('Failed to save file size snapshots:', err);
     }
 }
-let EXCLUDE_ASSET_REGEX = /\.(?:map|LICENSE\.txt|d\.ts)$/, excludeAsset = (asset)=>EXCLUDE_ASSET_REGEX.test(asset.name), isSignificantDiff = (diff)=>Math.abs(diff) >= 10, formatDiff = (diff)=>{
+let EXCLUDE_ASSET_REGEX = /\.(?:map|LICENSE\.txt|d\.ts)$/, isSignificantDiff = (diff)=>Math.abs(diff) >= 10, formatDiff = (diff)=>{
     let label = `(${diff > 0 ? '+' : '-'}${calcFileSize(Math.abs(diff))})`;
     return {
         label: (diff > 0 ? color.red : color.green)(label),
@@ -5173,22 +5176,25 @@ function getHeader(maxFileLength, maxSizeLength, fileHeader, showGzipHeader) {
 let calcFileSize = (len)=>{
     let val = len / 1000;
     return `${val.toFixed(val < 1 ? 2 : 1)} kB`;
-}, COMPRESSIBLE_REGEX = /\.(?:js|css|html|json|svg|txt|xml|xhtml|wasm|manifest|md)$/i;
-async function printFileSizes(options, stats, rootPath, distPath, environmentName, previousSizes) {
+}, COMPRESSIBLE_REGEX = /\.(?:js|css|html|json|svg|txt|xml|xhtml|wasm|manifest|md)$/i, isCompressible = (assetName)=>COMPRESSIBLE_REGEX.test(assetName), getFilePath = (assetName)=>{
+    let queryIndex = assetName.indexOf('?');
+    return -1 === queryIndex ? assetName : assetName.slice(0, queryIndex);
+};
+async function printFileSizes(options, stats, rootPath, distPath, environmentName, previousSizes, saveSnapshot) {
     let logs = [], showDetail = !1 !== options.detail, showDiff = !1 !== options.diff && null !== previousSizes, showTotal = !1 !== options.total;
     if (!showTotal && !showDetail) return {
         logs
     };
-    let relativeDistPath = node_path.relative(rootPath, distPath), snapshot = {
+    let relativeDistPath = node_path.relative(rootPath, distPath), snapshot = saveSnapshot ? {
         files: {},
         totalSize: 0,
         totalGzipSize: 0
-    }, formatAsset = async (asset)=>{
-        let { size, filePath } = asset, gzippedSize = options.compressed && COMPRESSIBLE_REGEX.test(filePath) ? await gzipSize(asset.content) : null, normalizedPath = normalizeFilePath(filePath);
-        snapshot.files[normalizedPath] = {
+    } : null, formatAsset = (filePath, size, gzippedSize)=>{
+        let normalizedPath = '';
+        (snapshot || showDiff) && (normalizedPath = normalizeFilePath(filePath), snapshot && (snapshot.files[normalizedPath] = {
             size,
             gzippedSize: gzippedSize ?? void 0
-        };
+        }));
         let sizeLabel = calcFileSize(size), sizeLabelLength = sizeLabel.length, gzipSizeLabel = gzippedSize ? getAssetColor(gzippedSize)(calcFileSize(gzippedSize)) : null;
         if (showDiff) {
             let sizeData = previousSizes[environmentName]?.files[normalizedPath], sizeDiff = size - (sizeData?.size ?? 0);
@@ -5201,12 +5207,11 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
                 isSignificantDiff(gzipDiff) && (gzipSizeLabel += ` ${formatDiff(gzipDiff).label}`);
             }
         }
-        let folder = node_path.join(relativeDistPath, node_path.dirname(filePath)), filename = node_path.basename(filePath), filenameLabel = color.dim(folder + node_path.sep) + (JS_REGEX.test(filename) ? color.cyan(filename) : filename.endsWith('.css') ? color.yellow(filename) : filename.endsWith('.html') ? color.green(filename) : color.magenta(filename)), filenameLength = (folder + node_path.sep + filename).length;
+        let separatorIndex = filePath.lastIndexOf('/'), folderLabel = (-1 === separatorIndex ? node_path.join(relativeDistPath, '.') : node_path.join(relativeDistPath, filePath.slice(0, separatorIndex))) + node_path.sep, filename = -1 === separatorIndex ? filePath : filePath.slice(separatorIndex + 1);
         return {
             filePath,
-            filename,
-            filenameLabel,
-            filenameLength,
+            filenameLabel: color.dim(folderLabel) + (JS_REGEX.test(filename) ? color.cyan(filename) : filename.endsWith('.css') ? color.yellow(filename) : filename.endsWith('.html') ? color.green(filename) : color.magenta(filename)),
+            filenameLength: folderLabel.length + filename.length,
             size,
             sizeLabel,
             sizeLabelLength,
@@ -5214,21 +5219,21 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
             gzipSizeLabel
         };
     }, getAssets = async ()=>{
-        let assets = Object.entries(stats.compilation.assets).map(([assetName, value])=>{
-            let filePath = assetName.split('?')[0], content = value.source();
-            return {
-                filePath,
-                size: Buffer.byteLength(content),
-                content
-            };
-        }), exclude = options.exclude ?? excludeAsset, filteredAssets = assets.filter((asset)=>{
-            let publicAsset = {
-                name: asset.filePath,
-                size: asset.size
-            };
-            return !exclude(publicAsset) && (!options.include || options.include(publicAsset));
-        });
-        return (await Promise.all(filteredAssets.map((asset)=>formatAsset(asset)))).sort((a, b)=>a.size - b.size);
+        let { exclude, include } = options, formattedAssets = [], compilationAssets = stats.compilation.assets;
+        for (let assetName of Object.keys(compilationAssets)){
+            let value = compilationAssets[assetName], filePath = getFilePath(assetName);
+            if (!exclude && EXCLUDE_ASSET_REGEX.test(filePath)) continue;
+            let content = options.compressed && isCompressible(filePath) ? value.source() : void 0, size = void 0 === content ? value.size() : Buffer.byteLength(content);
+            if (exclude || include) {
+                let publicAsset = {
+                    name: filePath,
+                    size
+                };
+                if (exclude?.(publicAsset) || include && !include(publicAsset)) continue;
+            }
+            void 0 === content ? formattedAssets.push(formatAsset(filePath, size, null)) : formattedAssets.push(gzipSize(content).then((gzippedSize)=>formatAsset(filePath, size, gzippedSize)));
+        }
+        return (await Promise.all(formattedAssets)).sort((a, b)=>a.size - b.size);
     }, assets = await getAssets();
     if (0 === assets.length) return {
         logs
@@ -5242,7 +5247,7 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
             totalGzipSize
         };
     })(assets, options.compressed);
-    snapshot.totalSize = totalSize, snapshot.totalGzipSize = totalGzipSize;
+    snapshot && (snapshot.totalSize = totalSize, snapshot.totalGzipSize = totalGzipSize);
     let fileHeader = showDetail ? `File (${environmentName})` : '', { totalSizeTitle, totalSizeLabel, totalSizeLabelLength } = (()=>{
         if (!showTotal) return {
             totalSizeTitle: '',
@@ -5273,7 +5278,9 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
             totalGzipSize
         }) : null;
     if (showDetail) {
-        let maxFileLength = Math.max(...assets.map((asset)=>asset.filenameLength), showTotal ? totalSizeTitle.length : 0, fileHeader.length), maxSizeLength = Math.max(...assets.map((a)=>a.sizeLabelLength), totalSizeLabelLength), showGzipHeader = !!(options.compressed && assets.some((item)=>null !== item.gzippedSize));
+        let maxFileLength = Math.max(showTotal ? totalSizeTitle.length : 0, fileHeader.length), maxSizeLength = totalSizeLabelLength, hasGzipSize = !1;
+        for (let asset of assets)asset.filenameLength > maxFileLength && (maxFileLength = asset.filenameLength), asset.sizeLabelLength > maxSizeLength && (maxSizeLength = asset.sizeLabelLength), null !== asset.gzippedSize && (hasGzipSize = !0);
+        let showGzipHeader = !!(options.compressed && hasGzipSize);
         for (let asset of (logs.push(getHeader(maxFileLength, maxSizeLength, fileHeader, showGzipHeader)), assets)){
             let { sizeLabel, filenameLabel } = asset, { sizeLabelLength, gzipSizeLabel, filenameLength } = asset;
             sizeLabelLength < maxSizeLength && (sizeLabel += ' '.repeat(maxSizeLength - sizeLabelLength)), filenameLength < maxFileLength && (filenameLabel += ' '.repeat(maxFileLength - filenameLength));
@@ -6699,7 +6706,7 @@ function createAssetsMiddleware(context, ready, outputFileSystem) {
 }
 async function setupOutputFileSystem(writeToDisk, compilers) {
     if (!0 !== writeToDisk) {
-        let { createFsFromVolume, Volume } = await import("./memfs.js").then(__webpack_require__.t.bind(__webpack_require__, "../../node_modules/.pnpm/memfs@4.57.7/node_modules/memfs/lib/index.js", 23)), outputFileSystem = createFsFromVolume(new Volume());
+        let { createFsFromVolume, Volume } = await import("./memfs.js").then(__webpack_require__.t.bind(__webpack_require__, "../../node_modules/.pnpm/memfs@4.57.8/node_modules/memfs/lib/index.js", 23)), outputFileSystem = createFsFromVolume(new Volume());
         for (let compiler of compilers)compiler.outputFileSystem = outputFileSystem;
     }
     let compiler = compilers.find((compiler)=>!!compiler.outputFileSystem);
@@ -8651,7 +8658,7 @@ function applyDefaultPlugins(pluginManager, context) {
                                 ...defaultConfig,
                                 ...printFileSize
                             };
-                        })(config), statsItem, api.context.rootPath, distPath, name, prevSnapshots);
+                        })(config), statsItem, api.context.rootPath, distPath, name, prevSnapshots, showDiff);
                         return snapshot && (nextSnapshots[name] = snapshot), sizeLogs.join('\n');
                     })).catch((err)=>{
                         api.logger.warn('Failed to print file size.'), api.logger.warn(err);
@@ -9486,7 +9493,7 @@ try {
                 api.modifyBundlerChain(async (chain, { CHAIN_ID, environment, isDev })=>{
                     let { output: { manifest }, dev: { writeToDisk } } = environment.config;
                     if (!1 === manifest) return;
-                    let manifestOptions = normalizeManifestObjectConfig(manifest), { RspackManifestPlugin } = await import("./rspack-manifest-plugin.js").then(__webpack_require__.bind(__webpack_require__, "../../node_modules/.pnpm/rspack-manifest-plugin@5.2.2_@rspack+core@2.1.0-beta.0/node_modules/rspack-manifest-plugin/dist/index.js")), { htmlPaths } = environment, filter = manifestOptions.filter ?? ((file)=>!file.name.endsWith('.LICENSE.txt'));
+                    let manifestOptions = normalizeManifestObjectConfig(manifest), { RspackManifestPlugin } = await import("./rspack-manifest-plugin.js").then(__webpack_require__.bind(__webpack_require__, "../../node_modules/.pnpm/rspack-manifest-plugin@5.2.2_@rspack+core@2.1.0/node_modules/rspack-manifest-plugin/dist/index.js")), { htmlPaths } = environment, filter = manifestOptions.filter ?? ((file)=>!file.name.endsWith('.LICENSE.txt'));
                     manifestFilenames.set(environment.name, manifestOptions.filename);
                     let pluginOptions = {
                         fileName: manifestOptions.filename,
@@ -10021,7 +10028,7 @@ let applyServerOptions = (command)=>{
 };
 function setupCommands() {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.1.0-beta.0"), cli.option('--base <base>', 'Set the base path of the server').option('-c, --config <config>', 'Set the configuration file (relative or absolute path)').option('--config-loader <loader>', 'Set the config file loader (auto | jiti | native)', {
+    cli.version("2.1.0"), cli.option('--base <base>', 'Set the base path of the server').option('-c, --config <config>', 'Set the configuration file (relative or absolute path)').option('--config-loader <loader>', 'Set the config file loader (auto | jiti | native)', {
         default: 'auto'
     }).option('--env-dir <dir>', 'Set the directory for loading `.env` files').option('--env-mode <mode>', 'Set the env mode to load the `.env.[mode]` file').option('--environment <name>', 'Set the environment name(s) to build', {
         type: [
@@ -10092,7 +10099,7 @@ function initNodeEnv(command) {
 }
 function showGreeting() {
     let { npm_execpath, npm_lifecycle_event, NODE_RUN_SCRIPT_NAME } = process.env, isBun = npm_execpath?.includes('.bun');
-    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.1.0-beta.0\n`);
+    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.1.0\n`);
 }
 function setupLogLevel() {
     if (cli_argv.length <= 3) return;
@@ -10114,5 +10121,5 @@ function runCLI() {
         src_logger.error('Failed to start Rsbuild CLI.'), src_logger.error(err), process.exit(1);
     }
 }
-let src_version = "2.1.0-beta.0";
+let src_version = "2.1.0";
 export { PLUGIN_CSS_NAME, PLUGIN_SWC_NAME, core_rspack as rspack, createRsbuild, defaultAllowedOrigins, defineConfig, ensureAssetPrefix, loadConfig_loadConfig as loadConfig, loadEnv, logger_createLogger as createLogger, mergeRsbuildConfig, mrmime_lookup, runCLI, src_logger as logger, src_version as version };