@rslib/core 0.18.1 → 0.18.3

package/compiled/rslog/index.js

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    logger: ()=>src_logger,
-    createLogger: ()=>createLogger
+    createLogger: ()=>createLogger,
+    logger: ()=>src_logger
 });
 const external_node_process_namespaceObject = require("node:process");
 const external_node_os_namespaceObject = require("node:os");
@@ -132,9 +132,10 @@ const supportsColor = {
 };
 const supports_color = supportsColor;
 const colorLevel = supports_color.stdout ? supports_color.stdout.level : 0;
-let errorStackRegExp = /at\s.*:\d+:\d+[\s\)]*$/;
-let anonymousErrorStackRegExp = /at\s.*\(<anonymous>\)$/;
-let isErrorStackMessage = (message)=>errorStackRegExp.test(message) || anonymousErrorStackRegExp.test(message);
+let errorStackRegExp = /at [^\r\n]{0,200}:\d+:\d+[\s\)]*$/;
+let anonymousErrorStackRegExp = /at [^\r\n]{0,200}\(<anonymous>\)$/;
+let indexErrorStackRegExp = /at [^\r\n]{0,200}\(index\s\d+\)$/;
+let isErrorStackMessage = (message)=>errorStackRegExp.test(message) || anonymousErrorStackRegExp.test(message) || indexErrorStackRegExp.test(message);
 let formatter = (open, close, replace = open)=>colorLevel >= 2 ? (input)=>{
         let string = '' + input;
         let index = string.indexOf(close, open.length);
@@ -246,9 +247,10 @@ const normalizeErrorMessage = (err)=>{
 let createLogger = (options = {})=>{
     let maxLevel = options.level || 'info';
     let log = (type, message, ...args)=>{
-        if (LOG_LEVEL[LOG_TYPES[type].level] > LOG_LEVEL[maxLevel]) return;
-        if (null == message) return console.log();
         let logType = LOG_TYPES[type];
+        const { level } = logType;
+        if (LOG_LEVEL[level] > LOG_LEVEL[maxLevel]) return;
+        if (null == message) return console.log();
         let label = '';
         let text = '';
         if ('label' in logType) {
@@ -262,11 +264,12 @@ let createLogger = (options = {})=>{
                 text += yellow('\n  [cause]: ');
                 text += cause instanceof Error ? normalizeErrorMessage(cause) : String(cause);
             }
-        } else if ('error' === logType.level && 'string' == typeof message) {
+        } else if ('error' === level && 'string' == typeof message) {
             let lines = message.split('\n');
             text = lines.map((line)=>isErrorStackMessage(line) ? gray(line) : line).join('\n');
         } else text = `${message}`;
-        console.log(label.length ? `${label} ${text}` : text, ...args);
+        const method = 'error' === level || 'warn' === level ? level : 'log';
+        console[method](label.length ? `${label} ${text}` : text, ...args);
     };
     let logger = {
         greet: (message)=>log('log', gradient(message))

package/compiled/rslog/package.json

@@ -1 +1 @@
-{"name":"rslog","version":"1.3.0","license":"MIT","types":"index.d.ts","type":"commonjs"}
+{"name":"rslog","version":"1.3.2","license":"MIT","types":"index.d.ts","type":"commonjs"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import * as __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__ from "@rsbuild/core";
+import * as __rspack_external__rsbuild_core_1b356efc from "@rsbuild/core";
 import node_fs, { promises } from "node:fs";
 import { glob } from "../compiled/tinyglobby/index.js";
 import { createRequire } from "node:module";
@@ -20,7 +20,7 @@ class LibSvgrPatchPlugin {
                 const chunkAsset = Object.keys(assets).filter((name)=>/js$/.test(name));
                 for (const name of chunkAsset)compilation.updateAsset(name, (old)=>{
                     const oldSource = old.source().toString();
-                    const newSource = new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.sources.ReplaceSource(old);
+                    const newSource = new __rspack_external__rsbuild_core_1b356efc.rspack.sources.ReplaceSource(old);
                     const pattern = new RegExp(`\\(?['"]${PUBLIC_PATH_PLACEHOLDER}(.*)['"]\\)?`, 'g');
                     const matches = [
                         ...oldSource.matchAll(pattern)
@@ -164,7 +164,7 @@ class LibCssExtractPlugin {
                 const chunkAsset = Object.keys(assets).filter((name)=>/\.css/.test(name));
                 for (const name of chunkAsset)compilation.updateAsset(name, (old)=>{
                     const oldSource = old.source().toString();
-                    const replaceSource = new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.sources.ReplaceSource(old);
+                    const replaceSource = new __rspack_external__rsbuild_core_1b356efc.rspack.sources.ReplaceSource(old);
                     function replace(searchValue, replaceValue) {
                         let start = oldSource.indexOf(searchValue);
                         while(-1 !== start){
@@ -291,7 +291,7 @@ class EntryChunkPlugin {
                 const chunkAsset = Object.keys(assets).filter((name)=>JS_EXTENSIONS_PATTERN.test(name) && this.shimsInjectedAssets.has(name));
                 for (const name of chunkAsset)compilation.updateAsset(name, (old)=>{
                     const oldSource = old.source().toString();
-                    const replaceSource = new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.sources.ReplaceSource(old);
+                    const replaceSource = new __rspack_external__rsbuild_core_1b356efc.rspack.sources.ReplaceSource(old);
                     if (oldSource.startsWith('#!')) {
                         const firstLineEnd = oldSource.indexOf('\n');
                         replaceSource.insert(firstLineEnd + 1, IMPORT_META_URL_SHIM);
@@ -346,9 +346,9 @@ const pluginEsmRequireShim = ()=>({
         setup (api) {
             api.modifyRspackConfig((config)=>{
                 config.plugins ??= [];
-                config.plugins.push(new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.BannerPlugin({
+                config.plugins.push(new __rspack_external__rsbuild_core_1b356efc.rspack.BannerPlugin({
                     banner: requireShim,
-                    stage: __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE - 1,
+                    stage: __rspack_external__rsbuild_core_1b356efc.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE - 1,
                     raw: true,
                     include: /\.(js|mjs)$/
                 }));
@@ -1229,7 +1229,7 @@ async function loadConfig({ cwd = process.cwd(), path, envMode, loader }) {
         },
         filePath: void 0
     };
-    const { content } = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.loadConfig)({
+    const { content } = await (0, __rspack_external__rsbuild_core_1b356efc.loadConfig)({
         cwd: dirname(configFilePath),
         path: configFilePath,
         envMode,
@@ -1392,30 +1392,30 @@ function composeBannerFooterConfig(banner, footer) {
     if (isEmptyObject(bannerConfig) && isEmptyObject(footerConfig)) return {};
     const plugins = [];
     if (!isEmptyObject(bannerConfig)) {
-        if (bannerConfig.js) plugins.push(new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.BannerPlugin({
+        if (bannerConfig.js) plugins.push(new __rspack_external__rsbuild_core_1b356efc.rspack.BannerPlugin({
             banner: bannerConfig.js,
-            stage: __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE + 1,
+            stage: __rspack_external__rsbuild_core_1b356efc.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE + 1,
             raw: true,
             include: /\.(js|mjs|cjs)$/
         }));
-        if (bannerConfig.css) plugins.push(new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.BannerPlugin({
+        if (bannerConfig.css) plugins.push(new __rspack_external__rsbuild_core_1b356efc.rspack.BannerPlugin({
             banner: bannerConfig.css,
-            stage: __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE + 1,
+            stage: __rspack_external__rsbuild_core_1b356efc.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE + 1,
             raw: true,
             include: /\.(css)$/
         }));
     }
     if (!isEmptyObject(footerConfig)) {
-        if (footerConfig.js) plugins.push(new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.BannerPlugin({
+        if (footerConfig.js) plugins.push(new __rspack_external__rsbuild_core_1b356efc.rspack.BannerPlugin({
             banner: footerConfig.js,
-            stage: __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE + 1,
+            stage: __rspack_external__rsbuild_core_1b356efc.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE + 1,
             raw: true,
             footer: true,
             include: /\.(js|mjs|cjs)$/
         }));
-        if (footerConfig.css) plugins.push(new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.BannerPlugin({
+        if (footerConfig.css) plugins.push(new __rspack_external__rsbuild_core_1b356efc.rspack.BannerPlugin({
             banner: footerConfig.css,
-            stage: __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE + 1,
+            stage: __rspack_external__rsbuild_core_1b356efc.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE + 1,
             raw: true,
             footer: true,
             include: /\.(css)$/
@@ -1457,7 +1457,7 @@ function composePrintFileSizeConfig(bundle, target) {
     };
 }
 async function createConstantRsbuildConfig() {
-    return (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.defineConfig)({
+    return (0, __rspack_external__rsbuild_core_1b356efc.defineConfig)({
         performance: {
             chunkSplit: {
                 strategy: 'custom'
@@ -1533,11 +1533,11 @@ const composeFormatConfig = ({ format, bundle = true, umdName, pkgJson, enabledS
     };
     const experimentalEsmOutput = bundle && 'esm' === format && advancedEsm;
     const plugins = [
-        new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.experiments.RslibPlugin({
+        new __rspack_external__rsbuild_core_1b356efc.rspack.experiments.RslibPlugin({
             interceptApiPlugin: true,
             forceNodeShims: enabledShims.esm.__dirname || enabledShims.esm.__filename
         }),
-        experimentalEsmOutput && new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.experiments.EsmLibraryPlugin()
+        experimentalEsmOutput && new __rspack_external__rsbuild_core_1b356efc.rspack.experiments.EsmLibraryPlugin()
     ].filter(Boolean);
     switch(format){
         case 'esm':
@@ -1910,7 +1910,7 @@ const composeOutputFilenameConfig = (config, format, autoExtension, multiCompile
             }
         }
     };
-    const finalConfig = userJsFilename ? chunkFilename : (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.mergeRsbuildConfig)(chunkFilename, {
+    const finalConfig = userJsFilename ? chunkFilename : (0, __rspack_external__rsbuild_core_1b356efc.mergeRsbuildConfig)(chunkFilename, {
         output: {
             filename: {
                 js: defaultJsFilename
@@ -2084,6 +2084,7 @@ const composeBundlelessExternalConfig = (jsExtension, redirect, cssModulesAuto,
                         const { request, getResolve, context, contextInfo } = data;
                         if (!request || !getResolve || !context || !contextInfo) return void callback();
                         const { issuer } = contextInfo;
+                        const originExtension = extname(request);
                         if (!resolver) resolver = getResolve();
                         async function redirectPath(request) {
                             try {
@@ -2094,26 +2095,34 @@ const composeBundlelessExternalConfig = (jsExtension, redirect, cssModulesAuto,
                                 if (isSubpath) {
                                     resolvedRequest = normalizeSlash(node_path.relative(node_path.dirname(issuer), resolvedRequest));
                                     if (!resolvedRequest.startsWith('./') && !resolvedRequest.startsWith('../')) resolvedRequest = `./${resolvedRequest}`;
-                                    return resolvedRequest;
+                                    return {
+                                        path: resolvedRequest,
+                                        isResolved: true
+                                    };
                                 }
-                                return;
+                                return {
+                                    path: void 0,
+                                    isResolved: true
+                                };
                             } catch (_e) {
                                 logger.debug(`Failed to resolve module ${picocolors.green(`"${request}"`)} from ${picocolors.green(issuer)}. If it's an npm package, consider adding it to dependencies or peerDependencies in package.json to make it externalized.`);
-                                return request;
+                                return {
+                                    path: request,
+                                    isResolved: false
+                                };
                             }
                         }
                         if (issuer) {
                             let resolvedRequest = request;
-                            const redirectedPath = await redirectPath(resolvedRequest);
+                            const { path: redirectedPath, isResolved } = await redirectPath(resolvedRequest);
                             const cssExternal = await cssExternalHandler(resolvedRequest, callback, jsExtension, cssModulesAuto, styleRedirectPath, styleRedirectExtension, redirectedPath, issuer);
                             if (false !== cssExternal) return cssExternal;
                             if (void 0 === redirectedPath) return void callback(void 0, request);
                             if (jsRedirectPath) resolvedRequest = redirectedPath;
-                            if (resolvedRequest.startsWith('.')) {
+                            if (resolvedRequest.startsWith('.') && isResolved) {
                                 const ext = extname(resolvedRequest);
-                                if (ext) if (JS_EXTENSIONS_PATTERN.test(resolvedRequest)) {
-                                    if (jsRedirectExtension) resolvedRequest = resolvedRequest.replace(/\.[^.]+$/, jsExtension);
-                                } else {
+                                if (ext) if (JS_EXTENSIONS_PATTERN.test(resolvedRequest)) resolvedRequest = resolvedRequest.replace(/\.[^.]+$/, jsRedirectExtension ? jsExtension : JS_EXTENSIONS_PATTERN.test(originExtension) ? originExtension : '');
+                                else {
                                     resolvedRequest = assetRedirectPath ? redirectedPath : request;
                                     if (assetRedirectExtension) resolvedRequest = resolvedRequest.replace(/\.[^.]+$/, jsExtension);
                                 }
@@ -2276,7 +2285,7 @@ async function composeLibRsbuildConfig(config, multiCompilerIndex, root, sharedP
     const bannerFooterConfig = composeBannerFooterConfig(banner, footer);
     const decoratorsConfig = composeDecoratorsConfig(compilerOptions, config.source?.decorators?.version);
     const printFileSizeConfig = composePrintFileSizeConfig(bundle, target);
-    return (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.mergeRsbuildConfig)(bundleConfig, formatConfig, shimsConfig, syntaxConfig, externalHelpersConfig, outputFilenameConfig, targetConfig, externalsWarnConfig, userExternalsConfig, autoExternalConfig, targetExternalsConfig, bundlelessExternalConfig, entryConfig, cssConfig, assetConfig, entryChunkConfig, minifyConfig, dtsConfig, bannerFooterConfig, decoratorsConfig, printFileSizeConfig);
+    return (0, __rspack_external__rsbuild_core_1b356efc.mergeRsbuildConfig)(bundleConfig, formatConfig, shimsConfig, syntaxConfig, externalHelpersConfig, outputFilenameConfig, targetConfig, externalsWarnConfig, userExternalsConfig, autoExternalConfig, targetExternalsConfig, bundlelessExternalConfig, entryConfig, cssConfig, assetConfig, entryChunkConfig, minifyConfig, dtsConfig, bannerFooterConfig, decoratorsConfig, printFileSizeConfig);
 }
 async function composeCreateRsbuildConfig(rslibConfig) {
     const constantRsbuildConfig = await createConstantRsbuildConfig();
@@ -2284,7 +2293,7 @@ async function composeCreateRsbuildConfig(rslibConfig) {
     if (logLevel && !isDebug()) logger.level = logLevel;
     if (!Array.isArray(libConfigsArray) || 0 === libConfigsArray.length) throw new Error(`Expect "lib" field to be a non-empty array, but got: ${picocolors.cyan(JSON.stringify(libConfigsArray))}.`);
     const libConfigPromises = libConfigsArray.map(async (libConfig, index)=>{
-        const userConfig = (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.mergeRsbuildConfig)(sharedRsbuildConfig, libConfig);
+        const userConfig = (0, __rspack_external__rsbuild_core_1b356efc.mergeRsbuildConfig)(sharedRsbuildConfig, libConfig);
         const libRsbuildConfig = await composeLibRsbuildConfig(userConfig, libConfigsArray.length > 1 ? index : null, root, sharedPlugins);
         userConfig.source ??= {};
         userConfig.source.entry = {};
@@ -2292,7 +2301,7 @@ async function composeCreateRsbuildConfig(rslibConfig) {
         delete userConfig.output.externals;
         const config = {
             format: libConfig.format ?? 'esm',
-            config: (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.mergeRsbuildConfig)(constantRsbuildConfig, libRsbuildConfig, omit(userConfig, {
+            config: (0, __rspack_external__rsbuild_core_1b356efc.mergeRsbuildConfig)(constantRsbuildConfig, libRsbuildConfig, omit(userConfig, {
                 id: true,
                 bundle: true,
                 format: true,
@@ -2391,7 +2400,7 @@ const beforeRestart = async ({ filePath, clear = true } = {})=>{
 };
 async function build(config, options = {}) {
     const { environments } = await composeRsbuildEnvironments(config);
-    const rsbuildInstance = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.createRsbuild)({
+    const rsbuildInstance = await (0, __rspack_external__rsbuild_core_1b356efc.createRsbuild)({
         callerName: 'rslib',
         config: {
             mode: 'production',
@@ -2972,7 +2981,7 @@ const applyCliOptions = (config, options, root)=>{
 async function initConfig(options) {
     const cwd = process.cwd();
     const root = options.root ? getAbsolutePath(cwd, options.root) : cwd;
-    const envs = (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.loadEnv)({
+    const envs = (0, __rspack_external__rsbuild_core_1b356efc.loadEnv)({
         cwd: getEnvDir(root, options.envDir),
         mode: options.envMode
     });
@@ -3015,7 +3024,7 @@ async function initConfig(options) {
 }
 async function inspect(config, options = {}) {
     const { environments } = await composeRsbuildEnvironments(config);
-    const rsbuildInstance = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.createRsbuild)({
+    const rsbuildInstance = await (0, __rspack_external__rsbuild_core_1b356efc.createRsbuild)({
         callerName: 'rslib',
         config: {
             mode: 'production',
@@ -3051,7 +3060,7 @@ async function initMFRsbuild(config, options = {}) {
     }).map((env)=>env.id);
     if (!selectedEnvironmentIds.length) throw new Error(`No mf format found in ${options.lib ? `libs ${options.lib.map((lib)=>`"${lib}"`).join(', ')}` : 'your config'}, please check your config to ensure that the mf format is enabled correctly.`);
     const selectedEnvironments = pruneEnvironments(environments, selectedEnvironmentIds);
-    const rsbuildInstance = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.createRsbuild)({
+    const rsbuildInstance = await (0, __rspack_external__rsbuild_core_1b356efc.createRsbuild)({
         callerName: 'rslib',
         config: {
             mode: 'development',
@@ -3079,7 +3088,7 @@ const applyCommonOptions = (cli)=>{
 };
 function runCli() {
     const cli = dist('rslib');
-    cli.version("0.18.1");
+    cli.version("0.18.3");
     applyCommonOptions(cli);
     const buildDescription = `build the library for production ${picocolors.dim('(default if no command is given)')}`;
     const buildCommand = cli.command('', buildDescription).alias('build');
@@ -3195,9 +3204,9 @@ function prepareCli() {
     setupLogLevel();
     const { npm_execpath } = process.env;
     if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) logger.log();
-    logger.greet(`  Rslib v0.18.1\n`);
+    logger.greet(`  Rslib v0.18.3\n`);
 }
-const src_version = "0.18.1";
+const src_version = "0.18.3";
 export * as rsbuild from "@rsbuild/core";
 export { logger } from "../compiled/rslog/index.js";
 export { rspack } from "@rsbuild/core";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "description": "The Rsbuild-based library development tool.",
   "homepage": "https://rslib.rs",
   "bugs": {
@@ -36,8 +36,8 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rsbuild/core": "~1.6.8",
-    "rsbuild-plugin-dts": "0.18.1"
+    "@rsbuild/core": "~1.6.12",
+    "rsbuild-plugin-dts": "0.18.3"
   },
   "devDependencies": {
     "@module-federation/rsbuild-plugin": "^0.21.6",
@@ -45,13 +45,13 @@
     "cac": "^6.7.14",
     "chokidar": "^4.0.3",
     "fs-extra": "^11.3.2",
-    "memfs": "^4.51.0",
+    "memfs": "^4.51.1",
     "path-serializer": "0.5.1",
     "picocolors": "1.1.1",
     "prebundle": "1.6.0",
     "rsbuild-plugin-publint": "^0.3.3",
-    "rslib": "npm:@rslib/core@0.18.0",
-    "rslog": "^1.3.0",
+    "rslib": "npm:@rslib/core@0.18.2",
+    "rslog": "^1.3.2",
     "tinyglobby": "0.2.14",
     "tsconfck": "3.1.6",
     "typescript": "^5.9.3",