npm - @rsbuild/core - Versions diffs - 1.2.0-beta.0 → 1.2.0-beta.1 - Mend

@rsbuild/core 1.2.0-beta.0 → 1.2.0-beta.1

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 (15) hide show

package/compiled/css-loader/index.js +43 -62
package/compiled/http-proxy-middleware/index.js +20 -22
package/compiled/postcss/index.js +131 -117
package/compiled/postcss/package.json +1 -1
package/compiled/postcss-load-config/index.js +10 -10
package/compiled/postcss-loader/index.js +8 -28
package/compiled/rsbuild-dev-middleware/index.js +25 -25
package/compiled/style-loader/index.js +13 -13
package/dist/index.cjs +42 -18
package/dist/index.js +42 -18
package/dist-types/helpers/fs.d.ts +1 -1
package/dist-types/index.d.ts +2 -1
package/dist-types/types/config.d.ts +17 -2
package/dist-types/types/plugin.d.ts +11 -0
package/package.json +5 -5

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

@@ -4417,14 +4417,14 @@
         return a.start - b.start;
       }
     },
-    6233: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    9096: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const middleware = __nccwpck_require__(319);
-      const getFilenameFromUrl = __nccwpck_require__(8369);
-      const setupHooks = __nccwpck_require__(3414);
-      const setupWriteToDisk = __nccwpck_require__(5986);
-      const setupOutputFileSystem = __nccwpck_require__(7009);
-      const ready = __nccwpck_require__(3195);
+      const middleware = __nccwpck_require__(242);
+      const getFilenameFromUrl = __nccwpck_require__(2039);
+      const setupHooks = __nccwpck_require__(1618);
+      const setupWriteToDisk = __nccwpck_require__(8764);
+      const setupOutputFileSystem = __nccwpck_require__(5921);
+      const ready = __nccwpck_require__(6247);
       const noop = () => {};
       function wdm(compiler, options = {}) {
         const context = {
@@ -4479,14 +4479,14 @@
       }
       module.exports = wdm;
     },
-    319: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    242: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const mrmime = __nccwpck_require__(802);
       const onFinishedStream = __nccwpck_require__(8772);
-      const getFilenameFromUrl = __nccwpck_require__(8369);
-      const ready = __nccwpck_require__(3195);
-      const parseTokenList = __nccwpck_require__(6753);
-      const memorize = __nccwpck_require__(1526);
+      const getFilenameFromUrl = __nccwpck_require__(2039);
+      const ready = __nccwpck_require__(6247);
+      const parseTokenList = __nccwpck_require__(6653);
+      const memorize = __nccwpck_require__(4544);
       async function getEtag(stat) {
         const mtime = stat.mtime.getTime().toString(16);
         const size = stat.size.toString(16);
@@ -4578,7 +4578,7 @@
             return;
           }
           function sendError(status, options) {
-            const escapeHtml = __nccwpck_require__(5730);
+            const escapeHtml = __nccwpck_require__(643);
             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>`,
@@ -4883,7 +4883,7 @@
       }
       module.exports = wrapper;
     },
-    5730: (module) => {
+    643: (module) => {
       "use strict";
       const matchHtmlRegExp = /["'&<>]/;
       function escapeHtml(string) {
@@ -4928,13 +4928,13 @@
       }
       module.exports = escapeHtml;
     },
-    8369: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    2039: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const path = __nccwpck_require__(1017);
       const { parse } = __nccwpck_require__(7310);
       const querystring = __nccwpck_require__(3477);
-      const getPaths = __nccwpck_require__(9904);
-      const memorize = __nccwpck_require__(1526);
+      const getPaths = __nccwpck_require__(1197);
+      const memorize = __nccwpck_require__(4544);
       const memoizedParse = memorize(parse, undefined, (value) => {
         if (value.pathname) {
           value.pathname = decode(value.pathname);
@@ -5017,7 +5017,7 @@
       }
       module.exports = getFilenameFromUrl;
     },
-    9904: (module) => {
+    1197: (module) => {
       "use strict";
       function getPaths(context) {
         const { stats, options } = context;
@@ -5038,7 +5038,7 @@
       }
       module.exports = getPaths;
     },
-    1526: (module) => {
+    4544: (module) => {
       "use strict";
       const cacheStore = new WeakMap();
       function memorize(fn, { cache = new Map() } = {}, callback) {
@@ -5060,7 +5060,7 @@
       }
       module.exports = memorize;
     },
-    6753: (module) => {
+    6653: (module) => {
       "use strict";
       function parseTokenList(str) {
         let end = 0;
@@ -5093,7 +5093,7 @@
       }
       module.exports = parseTokenList;
     },
-    3195: (module) => {
+    6247: (module) => {
       "use strict";
       function ready(context, callback, req) {
         if (context.state) {
@@ -5108,7 +5108,7 @@
       }
       module.exports = ready;
     },
-    3414: (module) => {
+    1618: (module) => {
       "use strict";
       function setupHooks(context) {
         function invalid() {
@@ -5140,7 +5140,7 @@
       }
       module.exports = setupHooks;
     },
-    7009: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    5921: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const memfs = __nccwpck_require__(5953);
       function setupOutputFileSystem(context) {
@@ -5167,7 +5167,7 @@
       }
       module.exports = setupOutputFileSystem;
     },
-    5986: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    8764: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const fs = __nccwpck_require__(7147);
       const path = __nccwpck_require__(1017);
@@ -6153,6 +6153,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(6233);
+  var __webpack_exports__ = __nccwpck_require__(9096);
   module.exports = __webpack_exports__;
 })();

package/compiled/style-loader/index.js CHANGED Viewed

@@ -1,16 +1,16 @@
 (() => {
   "use strict";
   var __webpack_modules__ = {
-    596: (module, __unused_webpack_exports, __nccwpck_require__) => {
-      const loader = __nccwpck_require__(17);
+    256: (module, __unused_webpack_exports, __nccwpck_require__) => {
+      const loader = __nccwpck_require__(213);
       module.exports = loader.default;
     },
-    17: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    213: (__unused_webpack_module, exports, __nccwpck_require__) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       exports["default"] = void 0;
-      var _path = _interopRequireDefault(__nccwpck_require__(822));
-      var _utils = __nccwpck_require__(995);
-      var _options = _interopRequireDefault(__nccwpck_require__(189));
+      var _path = _interopRequireDefault(__nccwpck_require__(17));
+      var _utils = __nccwpck_require__(595);
+      var _options = _interopRequireDefault(__nccwpck_require__(209));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule ? obj : { default: obj };
       }
@@ -104,7 +104,7 @@
       };
       var _default = (exports["default"] = loader);
     },
-    692: (module) => {
+    423: (module) => {
       function isEqualLocals(a, b, isNamedExport) {
         if ((!a && b) || (a && !b)) {
           return false;
@@ -130,7 +130,7 @@
       }
       module.exports = isEqualLocals;
     },
-    995: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    595: (__unused_webpack_module, exports, __nccwpck_require__) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.getExportLazyStyleCode = getExportLazyStyleCode;
       exports.getExportStyleCode = getExportStyleCode;
@@ -150,8 +150,8 @@
       exports.getStyleTagTransformFnCode = getStyleTagTransformFnCode;
       exports.getdomAPI = getdomAPI;
       exports.stringifyRequest = stringifyRequest;
-      var _path = _interopRequireDefault(__nccwpck_require__(822));
-      var _isEqualLocals = _interopRequireDefault(__nccwpck_require__(692));
+      var _path = _interopRequireDefault(__nccwpck_require__(17));
+      var _isEqualLocals = _interopRequireDefault(__nccwpck_require__(423));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule ? obj : { default: obj };
       }
@@ -391,10 +391,10 @@
           : `var setAttributes = require(${modulePath});`;
       }
     },
-    822: (module) => {
+    17: (module) => {
       module.exports = require("path");
     },
-    189: (module) => {
+    209: (module) => {
       module.exports = JSON.parse(
         '{"title":"Style Loader options","type":"object","properties":{"injectType":{"description":"Allows to setup how styles will be injected into DOM.","link":"https://github.com/webpack-contrib/style-loader#injecttype","enum":["styleTag","singletonStyleTag","autoStyleTag","lazyStyleTag","lazySingletonStyleTag","lazyAutoStyleTag","linkTag"]},"attributes":{"description":"Adds custom attributes to tag.","link":"https://github.com/webpack-contrib/style-loader#attributes","type":"object"},"insert":{"description":"Inserts `<style>`/`<link>` at the given position.","link":"https://github.com/webpack-contrib/style-loader#insert","anyOf":[{"type":"string"},{"instanceof":"Function"}]},"base":{"description":"Sets module ID base for DLLPlugin.","link":"https://github.com/webpack-contrib/style-loader#base","type":"number"},"esModule":{"description":"Use the ES modules syntax.","link":"https://github.com/webpack-contrib/css-loader#esmodule","type":"boolean"},"styleTagTransform":{"description":"Transform tag and css when insert \'style\' tag into the DOM","link":"https://github.com/webpack-contrib/style-loader#styleTagTransform","anyOf":[{"type":"string"},{"instanceof":"Function"}]}},"additionalProperties":false}',
       );
@@ -422,6 +422,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(596);
+  var __webpack_exports__ = __nccwpck_require__(256);
   module.exports = __webpack_exports__;
 })();

package/dist/index.cjs CHANGED Viewed

@@ -507,12 +507,15 @@ var __webpack_exports__ = {};
             });
         });
     }
-    async function emptyDir(dir) {
-        if (await pathExists(dir)) try {
-            for (let file of (await external_node_fs_default().promises.readdir(dir)))await external_node_fs_default().promises.rm(external_node_path_default().resolve(dir, file), {
-                recursive: !0,
-                force: !0
+    async function emptyDir(dir, keep = [], checkExists = !0) {
+        if (!checkExists || await pathExists(dir)) try {
+            let entries = await external_node_fs_default().promises.readdir(dir, {
+                withFileTypes: !0
             });
+            await Promise.all(entries.map(async (entry)=>{
+                let fullPath = external_node_path_default().resolve(dir, entry.name);
+                !keep.some((reg)=>reg.test(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) {
             rslog_index_js_namespaceObject.logger.debug(`Failed to empty dir: ${dir}`), rslog_index_js_namespaceObject.logger.debug(err);
         }
@@ -1700,7 +1703,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.0-beta.0",
+            version: "1.2.0-beta.1",
             rootPath,
             distPath: '',
             cachePath,
@@ -1976,18 +1979,39 @@ var __webpack_exports__ = {};
         }), addTrailingSep = (dir)=>dir.endsWith(external_node_path_namespaceObject.sep) ? dir : dir + external_node_path_namespaceObject.sep, isStrictSubdir = (parent, child)=>{
         let parentDir = addTrailingSep(parent), childDir = addTrailingSep(child);
         return parentDir !== childDir && childDir.startsWith(parentDir);
+    }, normalizeCleanDistPath = (userOptions)=>{
+        let defaultOptions = {
+            enable: 'auto'
+        };
+        return 'boolean' == typeof userOptions || 'auto' === userOptions ? {
+            ...defaultOptions,
+            enable: userOptions
+        } : {
+            ...defaultOptions,
+            ...userOptions
+        };
     }, pluginCleanOutput = ()=>({
             name: 'rsbuild:clean-output',
             setup (api) {
-                let getRsbuildCleanPath = ()=>{
-                    let { rootPath, distPath } = api.context, config = api.getNormalizedConfig(), cleanPath = (0, external_node_path_namespaceObject.join)(distPath, RSBUILD_OUTPUTS_PATH), { cleanDistPath } = config.output;
-                    if (!0 === cleanDistPath || 'auto' === cleanDistPath && isStrictSubdir(rootPath, cleanPath)) return cleanPath;
-                }, getCleanPath = (environment)=>{
-                    let { rootPath } = api.context, { config, distPath } = environment, { cleanDistPath } = config.output;
-                    if ('auto' !== cleanDistPath || (cleanDistPath = isStrictSubdir(rootPath, distPath)) || (rslog_index_js_namespaceObject.logger.warn('The dist path is not a subdir of root path, Rsbuild will not empty it.'), rslog_index_js_namespaceObject.logger.warn(`Please set ${index_js_default().yellow('`output.cleanDistPath`')} config manually.`), rslog_index_js_namespaceObject.logger.warn(`Current root path: ${index_js_default().dim(rootPath)}`), rslog_index_js_namespaceObject.logger.warn(`Current dist path: ${index_js_default().dim(distPath)}`)), cleanDistPath) return distPath;
+                let getRsbuildOutputPath = ()=>{
+                    let { rootPath, distPath } = api.context, config = api.getNormalizedConfig(), targetPath = (0, external_node_path_namespaceObject.join)(distPath, RSBUILD_OUTPUTS_PATH), { enable } = normalizeCleanDistPath(config.output.cleanDistPath);
+                    if (!0 === enable || 'auto' === enable && isStrictSubdir(rootPath, targetPath)) return {
+                        path: targetPath
+                    };
+                }, getPathInfo = (environment)=>{
+                    let { rootPath } = api.context, { config, distPath } = environment, { enable, keep } = normalizeCleanDistPath(config.output.cleanDistPath);
+                    return 'auto' === enable ? isStrictSubdir(rootPath, distPath) ? {
+                        path: distPath,
+                        keep
+                    } : (rslog_index_js_namespaceObject.logger.warn('The dist path is not a subdir of root path, Rsbuild will not empty it.'), rslog_index_js_namespaceObject.logger.warn(`Please set ${index_js_default().yellow('`output.cleanDistPath`')} config manually.`), rslog_index_js_namespaceObject.logger.warn(`Current root path: ${index_js_default().dim(rootPath)}`), void rslog_index_js_namespaceObject.logger.warn(`Current dist path: ${index_js_default().dim(distPath)}`)) : !0 === enable ? {
+                        path: distPath,
+                        keep
+                    } : void 0;
                 }, cleanAll = async (params)=>{
-                    let cleanPaths = Object.values(params.environments).reduce((total, curr)=>(total.find((t)=>t.distPath === curr.distPath) || total.push(curr), total), []).map((e)=>getCleanPath(e)).concat(getRsbuildCleanPath()).filter((p)=>!!p);
-                    await Promise.all(dedupeNestedPaths(cleanPaths).map((p)=>emptyDir(p)));
+                    for (let pathInfo of [
+                        ...Object.values(params.environments).reduce((result, curr)=>(result.find((item)=>item.distPath === curr.distPath) || result.push(curr), result), []).map(getPathInfo),
+                        getRsbuildOutputPath()
+                    ].filter((pathInfo)=>!!pathInfo))await emptyDir(pathInfo.path, pathInfo.keep);
                 };
                 api.onBeforeBuild(async ({ isFirstCompile, environments })=>{
                     isFirstCompile && await cleanAll({
@@ -6057,7 +6081,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                         handler: (chain, { target, environment })=>{
                             if (descriptor.targets && !descriptor.targets.includes(target) || descriptor.environments && !descriptor.environments.includes(environment.name)) return;
                             let rule = chain.module.rule(id);
-                            descriptor.test && rule.test(descriptor.test), descriptor.resourceQuery && rule.resourceQuery(descriptor.resourceQuery), descriptor.layer && rule.layer(descriptor.layer), descriptor.issuerLayer && rule.issuerLayer(descriptor.issuerLayer);
+                            descriptor.test && rule.test(descriptor.test), descriptor.resourceQuery && rule.resourceQuery(descriptor.resourceQuery), descriptor.layer && rule.layer(descriptor.layer), descriptor.issuerLayer && rule.issuerLayer(descriptor.issuerLayer), descriptor.issuer && rule.issuer(descriptor.issuer), descriptor.with && rule.with(descriptor.with);
                             let loaderName = descriptor.raw ? 'transformRawLoader.mjs' : 'transformLoader.mjs', loaderPath = (0, external_node_path_namespaceObject.join)(LOADER_PATH, loaderName);
                             rule.use(id).loader(loaderPath).options({
                                 id,
@@ -6551,12 +6575,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.0-beta.0\n`);
+            (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), rslog_index_js_namespaceObject.logger.greet(`  Rsbuild v1.2.0-beta.1\n`);
         }();
         try {
             !function() {
                 let cli = cac_dist('rsbuild');
-                cli.help(), cli.version("1.2.0-beta.0"), applyCommonOptions(cli);
+                cli.help(), cli.version("1.2.0-beta.1"), 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 {
@@ -6607,7 +6631,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.0-beta.0";
+    let src_rslib_entry_version = "1.2.0-beta.1";
 })();
 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

@@ -419,12 +419,15 @@ async function fileExistsByCompilation({ inputFileSystem }, filePath) {
         });
     });
 }
-async function emptyDir(dir) {
-    if (await pathExists(dir)) try {
-        for (let file of (await __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__.default.promises.readdir(dir)))await __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__.default.promises.rm(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(dir, file), {
-            recursive: !0,
-            force: !0
+async function emptyDir(dir, keep = [], checkExists = !0) {
+    if (!checkExists || await pathExists(dir)) try {
+        let entries = await __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__.default.promises.readdir(dir, {
+            withFileTypes: !0
         });
+        await Promise.all(entries.map(async (entry)=>{
+            let fullPath = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(dir, entry.name);
+            !keep.some((reg)=>reg.test(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) {
         __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.debug(`Failed to empty dir: ${dir}`), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.debug(err);
     }
@@ -1608,7 +1611,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.0-beta.0",
+        version: "1.2.0-beta.1",
         rootPath,
         distPath: '',
         cachePath,
@@ -1883,18 +1886,39 @@ let pluginCache = ()=>({
     }), addTrailingSep = (dir)=>dir.endsWith(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.sep) ? dir : dir + __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.sep, isStrictSubdir = (parent, child)=>{
     let parentDir = addTrailingSep(parent), childDir = addTrailingSep(child);
     return parentDir !== childDir && childDir.startsWith(parentDir);
+}, normalizeCleanDistPath = (userOptions)=>{
+    let defaultOptions = {
+        enable: 'auto'
+    };
+    return 'boolean' == typeof userOptions || 'auto' === userOptions ? {
+        ...defaultOptions,
+        enable: userOptions
+    } : {
+        ...defaultOptions,
+        ...userOptions
+    };
 }, pluginCleanOutput = ()=>({
         name: 'rsbuild:clean-output',
         setup (api) {
-            let getRsbuildCleanPath = ()=>{
-                let { rootPath, distPath } = api.context, config = api.getNormalizedConfig(), cleanPath = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(distPath, RSBUILD_OUTPUTS_PATH), { cleanDistPath } = config.output;
-                if (!0 === cleanDistPath || 'auto' === cleanDistPath && isStrictSubdir(rootPath, cleanPath)) return cleanPath;
-            }, getCleanPath = (environment)=>{
-                let { rootPath } = api.context, { config, distPath } = environment, { cleanDistPath } = config.output;
-                if ('auto' !== cleanDistPath || (cleanDistPath = isStrictSubdir(rootPath, distPath)) || (__WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn('The dist path is not a subdir of root path, Rsbuild will not empty it.'), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(`Please set ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.yellow('`output.cleanDistPath`')} config manually.`), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(`Current root path: ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.dim(rootPath)}`), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(`Current dist path: ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.dim(distPath)}`)), cleanDistPath) return distPath;
+            let getRsbuildOutputPath = ()=>{
+                let { rootPath, distPath } = api.context, config = api.getNormalizedConfig(), targetPath = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(distPath, RSBUILD_OUTPUTS_PATH), { enable } = normalizeCleanDistPath(config.output.cleanDistPath);
+                if (!0 === enable || 'auto' === enable && isStrictSubdir(rootPath, targetPath)) return {
+                    path: targetPath
+                };
+            }, getPathInfo = (environment)=>{
+                let { rootPath } = api.context, { config, distPath } = environment, { enable, keep } = normalizeCleanDistPath(config.output.cleanDistPath);
+                return 'auto' === enable ? isStrictSubdir(rootPath, distPath) ? {
+                    path: distPath,
+                    keep
+                } : (__WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn('The dist path is not a subdir of root path, Rsbuild will not empty it.'), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(`Please set ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.yellow('`output.cleanDistPath`')} config manually.`), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(`Current root path: ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.dim(rootPath)}`), void __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(`Current dist path: ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.dim(distPath)}`)) : !0 === enable ? {
+                    path: distPath,
+                    keep
+                } : void 0;
             }, cleanAll = async (params)=>{
-                let cleanPaths = Object.values(params.environments).reduce((total, curr)=>(total.find((t)=>t.distPath === curr.distPath) || total.push(curr), total), []).map((e)=>getCleanPath(e)).concat(getRsbuildCleanPath()).filter((p)=>!!p);
-                await Promise.all(dedupeNestedPaths(cleanPaths).map((p)=>emptyDir(p)));
+                for (let pathInfo of [
+                    ...Object.values(params.environments).reduce((result, curr)=>(result.find((item)=>item.distPath === curr.distPath) || result.push(curr), result), []).map(getPathInfo),
+                    getRsbuildOutputPath()
+                ].filter((pathInfo)=>!!pathInfo))await emptyDir(pathInfo.path, pathInfo.keep);
             };
             api.onBeforeBuild(async ({ isFirstCompile, environments })=>{
                 isFirstCompile && await cleanAll({
@@ -5946,7 +5970,7 @@ async function createRsbuild(options = {}) {
                     handler: (chain, { target, environment })=>{
                         if (descriptor.targets && !descriptor.targets.includes(target) || descriptor.environments && !descriptor.environments.includes(environment.name)) return;
                         let rule = chain.module.rule(id);
-                        descriptor.test && rule.test(descriptor.test), descriptor.resourceQuery && rule.resourceQuery(descriptor.resourceQuery), descriptor.layer && rule.layer(descriptor.layer), descriptor.issuerLayer && rule.issuerLayer(descriptor.issuerLayer);
+                        descriptor.test && rule.test(descriptor.test), descriptor.resourceQuery && rule.resourceQuery(descriptor.resourceQuery), descriptor.layer && rule.layer(descriptor.layer), descriptor.issuerLayer && rule.issuerLayer(descriptor.issuerLayer), descriptor.issuer && rule.issuer(descriptor.issuer), descriptor.with && rule.with(descriptor.with);
                         let loaderName = descriptor.raw ? 'transformRawLoader.mjs' : 'transformLoader.mjs', loaderPath = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(LOADER_PATH, loaderName);
                         rule.use(id).loader(loaderPath).options({
                             id,
@@ -6439,12 +6463,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.0-beta.0\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.0-beta.1\n`);
     }();
     try {
         !function() {
             let cli = cac_dist('rsbuild');
-            cli.help(), cli.version("1.2.0-beta.0"), applyCommonOptions(cli);
+            cli.help(), cli.version("1.2.0-beta.1"), 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 {
@@ -6495,6 +6519,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.0-beta.0";
+let src_version = "1.2.0-beta.1";
 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/fs.d.ts CHANGED Viewed

@@ -10,4 +10,4 @@ export declare const findExists: (files: string[]) => string | false;
 export declare function pathExists(path: string): Promise<boolean>;
 export declare function isFileExists(file: string): Promise<boolean>;
 export declare function fileExistsByCompilation({ inputFileSystem }: Rspack.Compilation, filePath: string): Promise<boolean>;
-export declare function emptyDir(dir: string): Promise<void>;
+export declare function emptyDir(dir: string, keep?: RegExp[], checkExists?: boolean): Promise<void>;

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

@@ -15,5 +15,6 @@ export { logger } from './logger';
 export { mergeRsbuildConfig } from './mergeConfig';
 export { ensureAssetPrefix } from './helpers';
 export { PLUGIN_SWC_NAME, PLUGIN_CSS_NAME } from './constants';
-export type { AppIcon, AppIconItem, AliasStrategy, Build, BuildOptions, BundlerPluginInstance, CacheGroup, CacheGroups, Charset, ClientConfig, CliShortcut, ConfigChain, ConfigChainWithContext, ConsoleType, CreateCompiler, CreateRsbuildOptions, CrossOrigin, CSSLoaderOptions, CSSModules, CSSModulesLocalsConvention, DataUriLimit, Decorators, DevConfig, DistPathConfig, EnvironmentContext, EnvironmentConfig, FilenameConfig, HistoryApiFallbackContext, HistoryApiFallbackOptions, HtmlConfig, HtmlRspackPlugin, HtmlBasicTag, HtmlFallback, HtmlTagHandler, HtmlTagDescriptor, HtmlTagContext, InspectConfigOptions, InspectConfigResult, InlineChunkConfig, InlineChunkTest, InlineChunkTestFunction, InternalContext, LegalComments, ManifestData, ManifestConfig, ManifestObjectConfig, MetaAttrs, MetaOptions, Minify, ModifyBundlerChainFn, ModifyBundlerChainUtils, ModifyChainUtils, ModifyEnvironmentConfigFn, ModifyEnvironmentConfigUtils, ModifyHTMLTagsContext, ModifyHTMLTagsFn, ModifyRsbuildConfigUtils, ModifyRspackConfigFn, ModifyRspackConfigUtils, ModifyRsbuildConfigFn, ModifyWebpackChainFn, ModifyWebpackChainUtils, ModifyWebpackConfigFn, ModifyWebpackConfigUtils, ModuleFederationConfig, MergedEnvironmentConfig, NormalizedConfig, NormalizedDevConfig, NormalizedEnvironmentConfig, NormalizedHtmlConfig, NormalizedModuleFederationConfig, NormalizedOutputConfig, NormalizedPerformanceConfig, NormalizedSecurityConfig, NormalizedServerConfig, NormalizedSourceConfig, NormalizedToolsConfig, OnAfterEnvironmentCompileFn, OnBeforeEnvironmentCompileFn, OnCloseBuildFn, OnAfterBuildFn, OnAfterCreateCompilerFn, OnAfterStartDevServerFn, OnAfterStartProdServerFn, OnBeforeBuildFn, OnBeforeCreateCompilerFn, OnBeforeStartDevServerFn, OnBeforeStartProdServerFn, OnCloseDevServerFn, OnDevCompileDoneFn, OnExitFn, OutputConfig, OutputStructure, PreloadIncludeType, PerformanceConfig, PluginManager, Polyfill, PostCSSLoaderOptions, PostCSSOptions, PostCSSPlugin, PreviewOptions, PreconnectOption, ProxyConfig, ProxyOptions, PrintUrls, PublicDir, PublicDirOptions, ProgressBarConfig, RequestHandler, ResolvedCreateRsbuildOptions, RsbuildConfig, RsbuildContext, RsbuildEntry, RsbuildEntryDescription, RsbuildInstance, RsbuildMode, RsbuildPlugin, RsbuildPluginAPI, RsbuildPlugins, RsbuildProvider, RsbuildProviderHelpers, RsbuildTarget, RspackChain, RspackRule, StartDevServerOptions, SriOptions, SriAlgorithm, ScriptInject, ScriptLoading, SecurityConfig, SourceMap, SetupMiddlewaresFn, SetupMiddlewaresServer, ServerConfig, SourceConfig, SplitChunks, StyleLoaderOptions, TransformContext, TransformDescriptor, ToolsConfig, TransformFn, TransformHandler, TransformImport, WatchFiles, } from './types';
+export type { AppIcon, AppIconItem, AliasStrategy, Build, BuildOptions, BundlerPluginInstance, CacheGroup, CacheGroups, Charset, ClientConfig, CliShortcut, CleanDistPath, CleanDistPathObject, ConfigChain, ConfigChainWithContext, ConsoleType, CreateCompiler, CreateRsbuildOptions, CrossOrigin, CSSLoaderOptions, CSSModules, CSSModulesLocalsConvention, DataUriLimit, Decorators, DevConfig, DistPathConfig, EnvironmentContext, EnvironmentConfig, FilenameConfig, HistoryApiFallbackContext, HistoryApiFallbackOptions, HtmlConfig, HtmlRspackPlugin, HtmlBasicTag, HtmlFallback, HtmlTagHandler, HtmlTagDescriptor, HtmlTagContext, InspectConfigOptions, InspectConfigResult, InlineChunkConfig, InlineChunkTest, InlineChunkTestFunction, InternalContext, LegalComments, ManifestData, ManifestConfig, ManifestObjectConfig, MetaAttrs, MetaOptions, Minify, ModifyBundlerChainFn, ModifyBundlerChainUtils, ModifyChainUtils, ModifyEnvironmentConfigFn, ModifyEnvironmentConfigUtils, ModifyHTMLTagsContext, ModifyHTMLTagsFn, ModifyRsbuildConfigUtils, ModifyRspackConfigFn, ModifyRspackConfigUtils, ModifyRsbuildConfigFn, ModifyWebpackChainFn, ModifyWebpackChainUtils, ModifyWebpackConfigFn, ModifyWebpackConfigUtils, ModuleFederationConfig, MergedEnvironmentConfig, NormalizedConfig, NormalizedDevConfig, NormalizedEnvironmentConfig, NormalizedHtmlConfig, NormalizedModuleFederationConfig, NormalizedOutputConfig, NormalizedPerformanceConfig, NormalizedSecurityConfig, NormalizedServerConfig, NormalizedSourceConfig, NormalizedToolsConfig, OnAfterEnvironmentCompileFn, OnBeforeEnvironmentCompileFn, OnCloseBuildFn, OnAfterBuildFn, OnAfterCreateCompilerFn, OnAfterStartDevServerFn, OnAfterStartProdServerFn, OnBeforeBuildFn, OnBeforeCreateCompilerFn, OnBeforeStartDevServerFn, OnBeforeStartProdServerFn, OnCloseDevServerFn, OnDevCompileDoneFn, OnExitFn, OutputConfig, OutputStructure, PreloadIncludeType, PerformanceConfig, PluginManager, Polyfill, PostCSSLoaderOptions, PostCSSOptions, PostCSSPlugin, PreviewOptions, PreconnectOption, ProxyConfig, ProxyOptions, PrintUrls, PublicDir, PublicDirOptions, ProgressBarConfig, RequestHandler, ResolvedCreateRsbuildOptions, RsbuildConfig, RsbuildContext, RsbuildEntry, RsbuildEntryDescription, RsbuildInstance, RsbuildMode, RsbuildPlugin, RsbuildPluginAPI, RsbuildPlugins, RsbuildProvider, RsbuildProviderHelpers, RsbuildTarget, RspackChain, RspackRule, StartDevServerOptions, SriOptions, SriAlgorithm, ScriptInject, ScriptLoading, SecurityConfig, SourceMap, SetupMiddlewaresFn, SetupMiddlewaresServer, ServerConfig, SourceConfig, SplitChunks, StyleLoaderOptions, TransformContext, TransformDescriptor, ToolsConfig, TransformFn, TransformHandler, TransformImport, WatchFiles, } from './types';
 export type { ChainIdentifier } from './configChain';
+export type { RsbuildDevServer } from './server/devServer';

package/dist-types/types/config.d.ts CHANGED Viewed

@@ -737,6 +737,20 @@ export type ManifestObjectConfig = {
     filter?: (file: FileDescriptor) => boolean;
 };
 export type ManifestConfig = string | boolean | ManifestObjectConfig;
+export type CleanDistPathObject = {
+    /**
+     * Whether to clean up all files under the output directory before the build starts.
+     * @default 'auto'
+     */
+    enable?: boolean | 'auto';
+    /**
+     * Specify the files to keep in the output directory.
+     * If the file's absolute path matches the regular expression in `keep`, the file will not be removed.
+     * @default undefined
+     */
+    keep?: RegExp[];
+};
+export type CleanDistPath = boolean | 'auto' | CleanDistPathObject;
 export interface OutputConfig {
     /**
      * Specify build target to run in specified environment.
@@ -792,10 +806,10 @@ export interface OutputConfig {
      */
     legalComments?: LegalComments;
     /**
-     * Whether to clean all files in the dist path before starting compilation.
+     * Whether to clean up all files under the output directory before the build starts.
      * @default 'auto'
      */
-    cleanDistPath?: boolean | 'auto';
+    cleanDistPath?: CleanDistPath;
     /**
      * Allow to custom CSS Modules options.
      */
@@ -882,6 +896,7 @@ export interface NormalizedOutputConfig extends OutputConfig {
         js?: Rspack.Configuration['devtool'];
         css: boolean;
     };
+    cleanDistPath: CleanDistPath;
     filenameHash: boolean | string;
     assetPrefix: string;
     dataUriLimit: number | NormalizedDataUriLimit;

package/dist-types/types/plugin.d.ts CHANGED Viewed

@@ -229,6 +229,17 @@ export type TransformDescriptor = {
      * @see https://rspack.dev/config/module#ruleissuerlayer
      */
     issuerLayer?: string;
+    /**
+     * Matches all modules that match this resource, and will match against Resource
+     * (the absolute path without query and fragment) of the module that issued the current module.
+     * @see https://rspack.dev/config/module#ruleissuer
+     */
+    issuer?: Rspack.RuleSetCondition;
+    /**
+     * `with` can be used in conjunction with [import attributes](https://github.com/tc39/proposal-import-attributes).
+     * @see https://rspack.dev/config/module#rulewith
+     */
+    with?: Record<string, Rspack.RuleSetCondition>;
 };
 export type TransformFn = (descriptor: TransformDescriptor, handler: TransformHandler) => void;
 export type ProcessAssetsStage = 'additional' | 'pre-process' | 'derived' | 'additions' | 'none' | 'optimize' | 'optimize-count' | 'optimize-compatibility' | 'optimize-size' | 'dev-tooling' | 'optimize-inline' | 'summarize' | 'optimize-hash' | 'optimize-transfer' | 'analyse' | 'report';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -49,10 +49,10 @@
     "@rspack/core": "1.2.0-beta.0",
     "@rspack/lite-tapable": "~1.0.1",
     "@swc/helpers": "^0.5.15",
-    "core-js": "~3.39.0"
+    "core-js": "~3.40.0"
   },
   "devDependencies": {
-    "@rslib/core": "0.3.0",
+    "@rslib/core": "0.3.1",
     "@types/connect": "3.4.38",
     "@types/node": "^22.10.5",
     "@types/on-finished": "2.3.4",
@@ -76,7 +76,7 @@
     "on-finished": "2.4.1",
     "open": "^8.4.0",
     "picocolors": "^1.1.1",
-    "postcss": "^8.4.49",
+    "postcss": "^8.5.1",
     "postcss-load-config": "6.0.1",
     "postcss-loader": "8.1.1",
     "prebundle": "1.2.5",
@@ -88,7 +88,7 @@
     "sirv": "^3.0.0",
     "style-loader": "3.3.4",
     "tinyglobby": "^0.2.10",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
     "webpack": "^5.97.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-merge": "6.0.1",