@rslib/core 0.13.2 → 0.14.0

package/compiled/tinyglobby/license

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Madeline Gurriarán
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/compiled/tinyglobby/package.json

@@ -0,0 +1 @@
+{"name":"tinyglobby","author":"Superchupu","version":"0.2.14","funding":{"url":"https://github.com/sponsors/SuperchupuDev"},"license":"MIT","types":"index.d.ts","type":"commonjs"}

package/dist/index.js

@@ -1,6 +1,6 @@
 import node_fs, { chmodSync, promises } from "node:fs";
 import node_path, { basename, dirname, extname, isAbsolute, join } from "node:path";
-import { glob } from "tinyglobby";
+import { glob } from "../compiled/tinyglobby/index.js";
 import { createRequire } from "node:module";
 import picocolors from "../compiled/picocolors/index.js";
 import { logger } from "../compiled/rslog/index.js";
@@ -18,6 +18,7 @@ const DEFAULT_CONFIG_EXTENSIONS = [
     '.cts'
 ];
 const SWC_HELPERS = '@swc/helpers';
+const SHEBANG_PREFIX = '#!';
 const SHEBANG_REGEX = /#!.*[\s\n\r]*$/;
 const REACT_DIRECTIVE_REGEX = /^['"]use (client|server)['"](;?)[\s\n\r]*$/;
 const DTS_EXTENSIONS = [
@@ -394,7 +395,7 @@ class EntryChunkPlugin {
                 const content = compiler.inputFileSystem.readFileSync(filename, {
                     encoding: 'utf-8'
                 });
-                if (content.startsWith("#!")) {
+                if (content.startsWith(SHEBANG_PREFIX)) {
                     const shebangMatch = matchFirstLine(content, SHEBANG_REGEX);
                     if (shebangMatch) this.shebangEntries[name] = shebangMatch;
                 }
@@ -509,6 +510,7 @@ const isDebug = ()=>{
     const values = process.env.DEBUG.toLocaleLowerCase().split(',');
     return [
         'rslib',
+        'rsbuild',
         'rs*',
         'rstack',
         '*'
@@ -1387,12 +1389,13 @@ const resolveConfigPath = (root, customConfig)=>{
     if (configFilePath) return configFilePath;
     throw new Error(`${DEFAULT_CONFIG_NAME} not found in ${root}`);
 };
-async function loadConfig({ cwd = process.cwd(), path, envMode }) {
+async function loadConfig({ cwd = process.cwd(), path, envMode, loader }) {
     const configFilePath = resolveConfigPath(cwd, path);
     const { content } = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.loadConfig)({
         cwd: dirname(configFilePath),
         path: configFilePath,
-        envMode
+        envMode,
+        loader
     });
     return {
         content: content,
@@ -1984,7 +1987,7 @@ const composeExternalsConfig = (format, externals)=>{
         }
     };
 };
-const composeAutoExtensionConfig = (config, format, autoExtension, pkgJson)=>{
+const composeOutputFilenameConfig = (config, format, autoExtension, multiCompilerIndex, pkgJson)=>{
     const { jsExtension, dtsExtension } = getDefaultExtension({
         format,
         pkgJson,
@@ -1995,17 +1998,38 @@ const composeAutoExtensionConfig = (config, format, autoExtension, pkgJson)=>{
         if ('string' == typeof filenameHash) return filenameHash ? `.[${filenameHash}]` : '';
         return filenameHash ? '.[contenthash:8]' : '';
     };
+    const inferChunkFilename = (filename)=>{
+        if ('function' != typeof filename) {
+            const hasName = filename.includes('[name]');
+            const hasId = filename.includes('[id]');
+            const hasChunkHash = filename.includes('[chunkhash]');
+            const hasContentHash = filename.includes('[contenthash]');
+            const multiCompilerPrefix = 'number' == typeof multiCompilerIndex ? `${multiCompilerIndex}~` : '';
+            if (hasChunkHash || hasContentHash || hasName || hasId) return filename.replace(/(^|\/)([^/]*(?:\?|$))/, `$1${multiCompilerPrefix}$2`);
+            return filename.replace(/(^|\/)([^/]*(?:\?|$))/, `$1${multiCompilerIndex}[id].$2`);
+        }
+    };
     const hash = getHash();
     const defaultJsFilename = `[name]${hash}${jsExtension}`;
     const userJsFilename = config.output?.filename?.js;
+    const defaultJsChunkFilename = inferChunkFilename(userJsFilename ?? defaultJsFilename);
     const finalJsExtension = 'string' == typeof userJsFilename && userJsFilename ? extname(userJsFilename) : jsExtension;
-    const finalConfig = userJsFilename ? {} : {
+    const chunkFilename = {
+        tools: {
+            rspack: {
+                output: {
+                    chunkFilename: defaultJsChunkFilename
+                }
+            }
+        }
+    };
+    const finalConfig = userJsFilename ? chunkFilename : (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.mergeRsbuildConfig)(chunkFilename, {
         output: {
             filename: {
                 js: defaultJsFilename
             }
         }
-    };
+    });
     return {
         config: finalConfig,
         jsExtension: finalJsExtension,
@@ -2313,7 +2337,7 @@ const composeExternalHelpersConfig = (externalHelpers, pkgJson)=>{
     }
     return defaultConfig;
 };
-async function composeLibRsbuildConfig(config, root, sharedPlugins) {
+async function composeLibRsbuildConfig(config, multiCompilerIndex, root, sharedPlugins) {
     checkMFPlugin(config, sharedPlugins);
     const rootPath = root ? getAbsolutePath(process.cwd(), root) : process.cwd();
     const pkgJson = readPackageJson(rootPath);
@@ -2329,7 +2353,7 @@ async function composeLibRsbuildConfig(config, root, sharedPlugins) {
     });
     const externalHelpersConfig = composeExternalHelpersConfig(externalHelpers, pkgJson);
     const userExternalsConfig = composeExternalsConfig(format, config.output?.externals);
-    const { config: autoExtensionConfig, jsExtension, dtsExtension } = composeAutoExtensionConfig(config, format, autoExtension, pkgJson);
+    const { config: outputFilenameConfig, jsExtension, dtsExtension } = composeOutputFilenameConfig(config, format, autoExtension, multiCompilerIndex, pkgJson);
     const { entryConfig, outBase } = await composeEntryConfig(config.source?.entry, config.bundle, rootPath, cssModulesAuto, config.outBase);
     const { config: bundlelessExternalConfig } = composeBundlelessExternalConfig(jsExtension, redirect, cssModulesAuto, bundle, outBase);
     const { config: targetConfig, externalsConfig: targetExternalsConfig, target } = composeTargetConfig(config.output?.target, format);
@@ -2353,15 +2377,16 @@ async function composeLibRsbuildConfig(config, root, sharedPlugins) {
     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)(formatConfig, shimsConfig, syntaxConfig, externalHelpersConfig, autoExtensionConfig, targetConfig, externalsWarnConfig, userExternalsConfig, autoExternalConfig, targetExternalsConfig, bundlelessExternalConfig, entryConfig, cssConfig, assetConfig, entryChunkConfig, minifyConfig, dtsConfig, bannerFooterConfig, decoratorsConfig, printFileSizeConfig);
+    return (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.mergeRsbuildConfig)(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();
-    const { lib: libConfigsArray, mode: _mode, root, plugins: sharedPlugins, dev: _dev, server: _server, ...sharedRsbuildConfig } = rslibConfig;
+    const { lib: libConfigsArray, mode: _mode, root, plugins: sharedPlugins, dev: _dev, server: _server, logLevel, ...sharedRsbuildConfig } = 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)=>{
+    const libConfigPromises = libConfigsArray.map(async (libConfig, index)=>{
         const userConfig = (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.mergeRsbuildConfig)(sharedRsbuildConfig, libConfig);
-        const libRsbuildConfig = await composeLibRsbuildConfig(userConfig, root, sharedPlugins);
+        const libRsbuildConfig = await composeLibRsbuildConfig(userConfig, libConfigsArray.length > 1 ? index : null, root, sharedPlugins);
         userConfig.source ??= {};
         userConfig.source.entry = {};
         userConfig.output ??= {};
@@ -2474,6 +2499,7 @@ async function build(config, options = {}) {
             plugins: config.plugins,
             dev: config.dev,
             server: config.server,
+            logLevel: isDebug() ? 'info' : config.logLevel,
             environments: pruneEnvironments(environments, options.lib)
         }
     });
@@ -2984,7 +3010,8 @@ async function init(options) {
     const { content: config, filePath: configFilePath } = await loadConfig({
         cwd: root,
         path: options.config,
-        envMode: options.envMode
+        envMode: options.envMode,
+        loader: options.configLoader
     });
     config.source ||= {};
     config.source.define = {
@@ -2992,6 +3019,7 @@ async function init(options) {
         ...config.source.define
     };
     if (options.root) config.root = root;
+    if (options.logLevel) config.logLevel = options.logLevel;
     return {
         config,
         configFilePath,
@@ -3011,6 +3039,7 @@ async function inspect(config, options = {}) {
             plugins: config.plugins,
             dev: config.dev,
             server: config.server,
+            logLevel: isDebug() ? 'info' : config.logLevel,
             environments: pruneEnvironments(environments, options.lib)
         }
     });
@@ -3043,6 +3072,7 @@ async function initMFRsbuild(config, options = {}) {
             plugins: config.plugins,
             dev: config.dev,
             server: config.server,
+            logLevel: isDebug() ? 'info' : config.logLevel,
             environments: selectedEnvironments
         }
     });
@@ -3051,7 +3081,9 @@ async function initMFRsbuild(config, options = {}) {
     return rsbuildInstance;
 }
 const applyCommonOptions = (cli)=>{
-    cli.option('-c, --config <config>', 'specify the configuration file, can be a relative or absolute path').option('-r, --root <root>', 'specify the project root directory, can be an absolute path or a path relative to cwd').option('--env-mode <mode>', 'specify the env mode to load the `.env.[mode]` file').option('--env-dir <dir>', 'specify the directory to load `.env` files').option('--lib <id>', 'specify the library (repeatable, e.g. --lib esm --lib cjs)', {
+    cli.option('-c, --config <config>', 'specify the configuration file, can be a relative or absolute path').option('-r, --root <root>', 'specify the project root directory, can be an absolute path or a path relative to cwd').option('--env-mode <mode>', 'specify the env mode to load the `.env.[mode]` file').option('--config-loader <loader>', 'Set the config file loader (auto | jiti | native)', {
+        default: 'auto'
+    }).option('--env-dir <dir>', 'specify the directory to load `.env` files').option('--log-level <level>', 'set the log level (info | warn | error | silent)').option('--lib <id>', 'specify the library (repeatable, e.g. --lib esm --lib cjs)', {
         type: [
             String
         ],
@@ -3061,7 +3093,7 @@ const applyCommonOptions = (cli)=>{
 function runCli() {
     const cli = dist('rslib');
     cli.help();
-    cli.version("0.13.2");
+    cli.version("0.14.0");
     applyCommonOptions(cli);
     const buildCommand = cli.command('build', 'build the library for production');
     const inspectCommand = cli.command('inspect', 'inspect the Rsbuild / Rspack configs of Rslib projects');
@@ -3128,12 +3160,24 @@ function initNodeEnv() {
         ].includes(command) ? 'production' : 'development';
     }
 }
+function setupLogLevel() {
+    const logLevelIndex = process.argv.findIndex((item)=>'--log-level' === item || '--logLevel' === item);
+    if (-1 !== logLevelIndex) {
+        const level = process.argv[logLevelIndex + 1];
+        if (level && [
+            'warn',
+            'error',
+            'silent'
+        ].includes(level) && !isDebug()) logger.level = level;
+    }
+}
 function prepareCli() {
     initNodeEnv();
+    setupLogLevel();
     const { npm_execpath } = process.env;
-    if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) console.log();
-    logger.greet(`  Rslib v0.13.2\n`);
+    if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) logger.log();
+    logger.greet(`  Rslib v0.14.0\n`);
 }
-const src_version = "0.13.2";
+const src_version = "0.14.0";
 var __webpack_exports__rspack = __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack;
 export { build, defineConfig, inspect, loadConfig, logger, prepareCli, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__ as rsbuild, runCli, startMFDevServer, composeCreateRsbuildConfig as unstable_composeCreateRsbuildConfig, src_version as version, __webpack_exports__rspack as rspack };

package/dist-types/cli/commands.d.ts

@@ -1,10 +1,13 @@
-import type { RsbuildMode } from '@rsbuild/core';
+import type { LogLevel, RsbuildMode } from '@rsbuild/core';
+import type { ConfigLoader } from '../config';
 export type CommonOptions = {
     root?: string;
     config?: string;
     envDir?: string;
     envMode?: string;
     lib?: string[];
+    configLoader?: ConfigLoader;
+    logLevel?: LogLevel;
 };
 export type BuildOptions = CommonOptions & {
     watch?: boolean;

package/dist-types/config.d.ts

@@ -8,10 +8,12 @@ export declare function defineConfig(config: RslibConfig): RslibConfig;
 export declare function defineConfig(config: RslibConfigSyncFn): RslibConfigSyncFn;
 export declare function defineConfig(config: RslibConfigAsyncFn): RslibConfigAsyncFn;
 export declare function defineConfig(config: RslibConfigExport): RslibConfigExport;
-export declare function loadConfig({ cwd, path, envMode, }: {
+export type ConfigLoader = 'auto' | 'jiti' | 'native';
+export declare function loadConfig({ cwd, path, envMode, loader, }: {
     cwd?: string;
     path?: string;
     envMode?: string;
+    loader?: ConfigLoader;
 }): Promise<{
     content: RslibConfig;
     filePath: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "description": "The Rsbuild-based library development tool.",
   "homepage": "https://rslib.rs",
   "bugs": {
@@ -36,23 +36,23 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rsbuild/core": "1.5.4",
-    "tinyglobby": "^0.2.15",
-    "rsbuild-plugin-dts": "0.13.2"
+    "@rsbuild/core": "~1.5.11",
+    "rsbuild-plugin-dts": "0.14.0"
   },
   "devDependencies": {
-    "@module-federation/rsbuild-plugin": "^0.18.4",
+    "@module-federation/rsbuild-plugin": "^0.19.1",
     "@types/fs-extra": "^11.0.4",
     "cac": "^6.7.14",
     "chokidar": "^4.0.3",
-    "fs-extra": "^11.3.1",
-    "memfs": "^4.38.3",
+    "fs-extra": "^11.3.2",
+    "memfs": "^4.43.0",
     "path-serializer": "0.5.1",
     "picocolors": "1.1.1",
     "prebundle": "1.4.2",
     "rsbuild-plugin-publint": "^0.3.3",
-    "rslib": "npm:@rslib/core@0.13.0",
+    "rslib": "npm:@rslib/core@0.13.3",
     "rslog": "^1.2.11",
+    "tinyglobby": "0.2.14",
     "tsconfck": "3.1.6",
     "typescript": "^5.9.2",
     "@rslib/tsconfig": "0.0.1"