@rslib/core 0.4.1 → 0.5.0-alpha.0

package/dist/index.js

@@ -160,7 +160,7 @@ function prepareCli() {
     initNodeEnv();
     const { npm_execpath } = process.env;
     if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) console.log();
-    __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rslib v0.4.1\n`);
+    __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rslib v0.5.0-alpha.0\n`);
 }
 const DEFAULT_CONFIG_NAME = 'rslib.config';
 const DEFAULT_CONFIG_EXTENSIONS = [
@@ -996,8 +996,8 @@ function pattern2regex(resolvedPattern, allowJs) {
     regexStr += '$';
     return new RegExp(regexStr);
 }
-function util_replaceTokens(tsconfig, configDir) {
-    return JSON.parse(JSON.stringify(tsconfig).replaceAll(/"\${configDir}/g, `"${util_native2posix(configDir)}`));
+function util_replaceTokens(result) {
+    if (result.tsconfig) result.tsconfig = JSON.parse(JSON.stringify(result.tsconfig).replaceAll(/"\${configDir}/g, `"${util_native2posix(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].dirname(result.tsconfigFile))}`));
 }
 async function find(filename, options) {
     let dir = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].dirname(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].resolve(filename));
@@ -1167,7 +1167,7 @@ async function parse(filename, options) {
                 parseReferences(result, options)
             ]);
         }
-        result.tsconfig = util_replaceTokens(result.tsconfig, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].dirname(tsconfigFile));
+        util_replaceTokens(result);
         resolve(util_resolveSolutionTSConfig(filename, result));
     } catch (e) {
         reject(e);
@@ -1213,6 +1213,7 @@ async function parseReferences(result, options) {
     await Promise.all(referenced.map((ref)=>parseExtends(ref, options?.cache)));
     referenced.forEach((ref)=>{
         ref.solution = result;
+        util_replaceTokens(ref);
     });
     result.referenced = referenced;
 }
@@ -1382,6 +1383,18 @@ async function loadConfig({ cwd = process.cwd(), path, envMode }) {
         filePath: configFilePath
     };
 }
+const handleMatchedExternal = (value, request)=>{
+    if ('boolean' == typeof value) return value;
+    if ('string' == typeof value) {
+        const [first, second] = value.split(' ');
+        const hasType = !!second;
+        const _request = second ? second : first;
+        if (!hasType) return request === _request;
+        return false;
+    }
+    if (Array.isArray(value)) return handleMatchedExternal(value[0] ?? '', request);
+    return false;
+};
 const composeExternalsWarnConfig = (format, ...externalsArray)=>{
     if ('esm' !== format) return {};
     const externals = [];
@@ -1389,15 +1402,16 @@ const composeExternalsWarnConfig = (format, ...externalsArray)=>{
     else externals.push(e);
     const matchUserExternals = (externals, request, callback)=>{
         if ('string' == typeof externals) {
-            if (externals === request) {
-                callback(true);
+            if (handleMatchedExternal(externals, request)) {
+                callback(true, true);
                 return;
             }
-        } else if (Array.isArray(externals)) {
+        }
+        if (Array.isArray(externals)) {
             let i = 0;
             const next = ()=>{
                 let asyncFlag;
-                const handleExternalsAndCallback = (matched)=>{
+                const handleExternalsAndCallback = (matched, shouldWarn)=>{
                     if (!matched) {
                         if (asyncFlag) {
                             asyncFlag = false;
@@ -1405,42 +1419,43 @@ const composeExternalsWarnConfig = (format, ...externalsArray)=>{
                         }
                         return next();
                     }
-                    callback(matched);
+                    callback(matched, shouldWarn);
                 };
                 do {
                     asyncFlag = true;
-                    if (i >= externals.length) return callback();
+                    if (i >= externals.length) return callback(false);
                     matchUserExternals(externals[i++], request, handleExternalsAndCallback);
                 }while (!asyncFlag);
                 asyncFlag = false;
             };
             next();
             return;
-        } else if (externals instanceof RegExp) {
+        }
+        if (externals instanceof RegExp) {
             if (externals.test(request)) {
-                callback(true);
+                callback(true, true);
                 return;
             }
         } else if ('function' == typeof externals) ;
         else if ('object' == typeof externals) {
             if (Object.prototype.hasOwnProperty.call(externals, request)) {
-                callback(true);
+                handleMatchedExternal(externals[request], request) ? callback(true, true) : callback(true);
                 return;
             }
         }
-        callback();
+        callback(false);
     };
     return {
         output: {
             externals: [
                 ({ request, dependencyType, contextInfo }, callback)=>{
-                    let externalized = false;
-                    const _callback = (matched)=>{
-                        if (matched) externalized = true;
+                    let shouldWarn = false;
+                    const _callback = (_matched, _shouldWarn)=>{
+                        if (_shouldWarn) shouldWarn = true;
                     };
                     if (contextInfo.issuer && 'commonjs' === dependencyType) {
                         matchUserExternals(externals, request, _callback);
-                        if (externalized) __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(composeModuleImportWarn(request));
+                        if (shouldWarn) __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(composeModuleImportWarn(request));
                     }
                     callback();
                 }
@@ -1801,8 +1816,8 @@ const composeShimsConfig = (format, shims)=>{
                 tools: {
                     rspack: {
                         node: {
-                            __dirname: !!resolvedShims.esm.__dirname && 'node-module',
-                            __filename: !!resolvedShims.esm.__filename && 'node-module'
+                            __dirname: resolvedShims.esm.__dirname ? 'node-module' : false,
+                            __filename: resolvedShims.esm.__filename ? 'node-module' : false
                         }
                     }
                 },
@@ -1917,12 +1932,12 @@ const traverseEntryQuery = (entry, callback)=>{
 };
 const appendEntryQuery = (entries)=>traverseEntryQuery(entries, (item)=>`${item}?${RSLIB_ENTRY_QUERY}`);
 const resolveEntryPath = (entries, root)=>traverseEntryQuery(entries, (item)=>__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].resolve(root, item));
-const composeEntryConfig = async (rawEntry, bundle, root, cssModulesAuto)=>{
+const composeEntryConfig = async (rawEntry, bundle, root, cssModulesAuto, userOutBase)=>{
     let entries = rawEntry;
     if (!entries) {
         if (false !== bundle) return {
             entryConfig: {},
-            lcp: null
+            outBase: null
         };
         entries = {
             index: 'src/**'
@@ -1949,11 +1964,16 @@ const composeEntryConfig = async (rawEntry, bundle, root, cssModulesAuto)=>{
                     entry: appendEntryQuery(resolveEntryPath(entries, root))
                 }
             },
-            lcp: null
+            outBase: null
         };
     }
-    const scanGlobEntries = async (calcLcp)=>{
+    const scanGlobEntries = async (tryResolveOutBase)=>{
         const resolvedEntries = {};
+        const resolveOutBase = async (resolvedEntryFiles)=>{
+            if (void 0 !== userOutBase) return __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].isAbsolute(userOutBase) ? userOutBase : __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].resolve(root, userOutBase);
+            const lcp = await calcLongestCommonPath(resolvedEntryFiles) ?? root;
+            return lcp;
+        };
         for (const key of Object.keys(entries)){
             const entry = entries[key];
             const entryFiles = Array.isArray(entry) ? entry : 'string' == typeof entry ? [
@@ -1966,8 +1986,7 @@ const composeEntryConfig = async (rawEntry, bundle, root, cssModulesAuto)=>{
             });
             const resolvedEntryFiles = globEntryFiles.filter((i)=>!DTS_EXTENSIONS_PATTERN.test(i));
             if (0 === resolvedEntryFiles.length) throw new Error(`Cannot find ${resolvedEntryFiles}`);
-            const lcp = await calcLongestCommonPath(resolvedEntryFiles);
-            const outBase = null === lcp ? root : lcp;
+            const outBase = await resolveOutBase(resolvedEntryFiles);
             function getEntryName(file) {
                 const { dir, name } = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].parse(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].relative(outBase, file));
                 const entryFileName = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(dir, name);
@@ -1976,23 +1995,23 @@ const composeEntryConfig = async (rawEntry, bundle, root, cssModulesAuto)=>{
             }
             for (const file of resolvedEntryFiles){
                 const entryName = getEntryName(file);
-                if (resolvedEntries[entryName]) calcLcp && __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(`Duplicate entry ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__["default"].cyan(entryName)} from ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__["default"].cyan(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].relative(root, file))} and ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__["default"].cyan(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].relative(root, resolvedEntries[entryName]))}, which may lead to the incorrect output, please rename the file.`);
+                if (resolvedEntries[entryName]) tryResolveOutBase && __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.warn(`Duplicate entry ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__["default"].cyan(entryName)} from ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__["default"].cyan(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].relative(root, file))} and ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__["default"].cyan(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].relative(root, resolvedEntries[entryName]))}, which may lead to the incorrect output, please rename the file.`);
                 resolvedEntries[entryName] = file;
             }
         }
-        if (calcLcp) {
-            const lcp = await calcLongestCommonPath(Object.values(resolvedEntries));
+        if (tryResolveOutBase) {
+            const outBase = await resolveOutBase(Object.values(resolvedEntries));
             return {
                 resolvedEntries,
-                lcp
+                outBase
             };
         }
         return {
             resolvedEntries,
-            lcp: null
+            outBase: null
         };
     };
-    const { lcp } = await scanGlobEntries(true);
+    const { outBase } = await scanGlobEntries(true);
     const entryConfig = {
         tools: {
             rspack: {
@@ -2005,7 +2024,7 @@ const composeEntryConfig = async (rawEntry, bundle, root, cssModulesAuto)=>{
     };
     return {
         entryConfig,
-        lcp
+        outBase
     };
 };
 const composeBundlelessExternalConfig = (jsExtension, redirect, cssModulesAuto, bundle, rootPath)=>{
@@ -2074,7 +2093,7 @@ const composeBundlelessExternalConfig = (jsExtension, redirect, cssModulesAuto,
     };
 };
 const composeDtsConfig = async (libConfig, dtsExtension)=>{
-    const { format, autoExternal, banner, footer } = libConfig;
+    const { format, autoExternal, banner, footer, redirect } = libConfig;
     let { dts } = libConfig;
     if (false === dts || void 0 === dts) return {};
     if (true === dts) dts = {
@@ -2091,7 +2110,8 @@ const composeDtsConfig = async (libConfig, dtsExtension)=>{
                 dtsExtension: dts?.autoExtension ? dtsExtension : '.d.ts',
                 autoExternal: getAutoExternalDefaultValue(format, autoExternal),
                 banner: banner?.dts,
-                footer: footer?.dts
+                footer: footer?.dts,
+                redirect: redirect?.dts
             })
         ]
     };
@@ -2193,15 +2213,15 @@ async function composeLibRsbuildConfig(config, root, sharedPlugins) {
         pkgJson,
         userExternals: config.output?.externals
     });
-    const { entryConfig, lcp } = await composeEntryConfig(config.source?.entry, config.bundle, rootPath, cssModulesAuto);
-    const cssConfig = composeCssConfig(lcp, config.bundle, banner?.css, footer?.css);
+    const { entryConfig, outBase } = await composeEntryConfig(config.source?.entry, config.bundle, rootPath, cssModulesAuto, config.outBase);
+    const cssConfig = composeCssConfig(outBase, config.bundle, banner?.css, footer?.css);
     const assetConfig = composeAssetConfig(bundle, format);
     const entryChunkConfig = composeEntryChunkConfig({
         enabledImportMetaUrlShim: enabledShims.cjs['import.meta.url'],
-        contextToWatch: lcp
+        contextToWatch: outBase
     });
     const dtsConfig = await composeDtsConfig(config, dtsExtension);
-    const externalsWarnConfig = composeExternalsWarnConfig(format, autoExternalConfig?.output?.externals, userExternalsConfig?.output?.externals);
+    const externalsWarnConfig = composeExternalsWarnConfig(format, userExternalsConfig?.output?.externals, autoExternalConfig?.output?.externals);
     const minifyConfig = composeMinifyConfig(config);
     const bannerFooterConfig = composeBannerFooterConfig(banner, footer);
     const decoratorsConfig = composeDecoratorsConfig(compilerOptions, config.source?.decorators?.version);
@@ -2233,7 +2253,8 @@ async function composeCreateRsbuildConfig(rslibConfig) {
                 footer: true,
                 dts: true,
                 shims: true,
-                umdName: true
+                umdName: true,
+                outBase: true
             }))
         };
         if ('string' == typeof libConfig.id) config.id = libConfig.id;
@@ -2420,7 +2441,7 @@ const repeatableOption = (value, previous)=>(previous ?? []).concat([
         value
     ]);
 function runCli() {
-    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.name('rslib').usage('<command> [options]').version("0.4.1");
+    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.name('rslib').usage('<command> [options]').version("0.5.0-alpha.0");
     const buildCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.command('build');
     const inspectCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.command('inspect');
     const mfDevCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.command('mf-dev');
@@ -2481,6 +2502,6 @@ function runCli() {
     });
     __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.parse();
 }
-const src_rslib_entry_version = "0.4.1";
+const src_rslib_entry_version = "0.5.0-alpha.0";
 var __webpack_exports__logger = __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger;
 export { build, defineConfig, inspect, loadConfig, prepareCli, runCli, startMFDevServer, composeCreateRsbuildConfig as unstable_composeCreateRsbuildConfig, src_rslib_entry_version as version, __webpack_exports__logger as logger };

package/dist/libCssExtractLoader.js

@@ -19,7 +19,7 @@ const pitch = function(request, _, _data) {
         return;
     }
     const options = this.getOptions();
-    const emit = void 0 === options.emit || options.emit;
+    const emit = void 0 !== options.emit ? options.emit : true;
     const callback = this.async();
     const filepath = this.resourcePath;
     const rootDir = options.rootDir ?? this.rootContext;
@@ -37,7 +37,7 @@ const pitch = function(request, _, _data) {
     const handleExports = (originalExports)=>{
         let locals;
         let namedExport;
-        const esModule = void 0 === options.esModule || options.esModule;
+        const esModule = void 0 !== options.esModule ? options.esModule : true;
         let dependencies = [];
         try {
             const exports = originalExports.__esModule ? originalExports.default : originalExports;
@@ -87,7 +87,7 @@ const pitch = function(request, _, _data) {
                     }());
                     const localsString = identifiers.map(([id, key])=>`\nvar ${id} = ${stringifyLocal(locals[key])};`).join('');
                     const exportsString = `export { ${identifiers.map(([id, key])=>`${id} as ${JSON.stringify(key)}`).join(', ')} }`;
-                    const defaultExport = void 0 !== options.defaultExport && options.defaultExport;
+                    const defaultExport = void 0 !== options.defaultExport ? options.defaultExport : false;
                     return defaultExport ? `${localsString}\n${exportsString}\nexport default { ${identifiers.map(([id, key])=>`${JSON.stringify(key)}: ${id}`).join(', ')} }\n` : `${localsString}\n${exportsString}\n`;
                 }
                 return `\n${esModule ? 'export default' : 'module.exports = '} ${JSON.stringify(locals)};`;

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

@@ -139,6 +139,18 @@ export type StyleRedirect = {
      */
     extension?: boolean;
 };
+export type DtsRedirect = {
+    /**
+     * Whether to automatically redirect the import paths of TypeScript declaration output files.
+     * @defaultValue `true`
+     */
+    path?: boolean;
+    /**
+     * Whether to automatically redirect the file extension to import paths based on the TypeScript declaration output files.
+     * @defaultValue `false`
+     */
+    extension?: boolean;
+};
 export type Redirect = {
     /** Controls the redirect of the import paths of output JavaScript files. */
     js?: JsRedirect;
@@ -146,6 +158,8 @@ export type Redirect = {
     style?: StyleRedirect;
     /** Controls the redirect of the import paths of output asset files. */
     asset?: boolean;
+    /** Controls the redirect of the import paths of output TypeScript declaration files. */
+    dts?: DtsRedirect;
 };
 export interface LibConfig extends EnvironmentConfig {
     /**
@@ -239,6 +253,12 @@ export interface LibConfig extends EnvironmentConfig {
      * @see {@link https://lib.rsbuild.dev/config/lib/umd-name}
      */
     umdName?: string;
+    /**
+     * The base directory of the output files.
+     * @defaultValue `undefined`
+     * @see {@link https://lib.rsbuild.dev/config/lib/out-base}
+     */
+    outBase?: string;
 }
 export type LibOnlyConfig = Omit<LibConfig, keyof EnvironmentConfig>;
 export interface RslibConfig extends RsbuildConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.4.1",
+  "version": "0.5.0-alpha.0",
   "description": "The Rsbuild-based library development tool.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {
@@ -36,12 +36,12 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rsbuild/core": "~1.2.4",
+    "@rsbuild/core": "~1.2.8",
     "tinyglobby": "^0.2.10",
-    "rsbuild-plugin-dts": "0.4.1"
+    "rsbuild-plugin-dts": "0.5.0-alpha.0"
   },
   "devDependencies": {
-    "@module-federation/rsbuild-plugin": "^0.8.9",
+    "@module-federation/rsbuild-plugin": "^0.8.11",
     "@types/fs-extra": "^11.0.4",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",
@@ -50,9 +50,9 @@
     "picocolors": "1.1.1",
     "prebundle": "1.2.7",
     "rsbuild-plugin-publint": "^0.3.0",
-    "rslib": "npm:@rslib/core@0.4.0",
+    "rslib": "npm:@rslib/core@0.4.1",
     "rslog": "^1.2.3",
-    "tsconfck": "3.1.4",
+    "tsconfck": "3.1.5",
     "typescript": "^5.7.3",
     "@rslib/tsconfig": "0.0.1"
   },