@rslib/core 0.1.2 → 0.1.4

package/dist/index.js

@@ -128,10 +128,13 @@ function isPluginIncluded(pluginName, plugins) {
         return false;
     }));
 }
-function checkMFPlugin(config) {
+function checkMFPlugin(config, sharedPlugins) {
     if ('mf' !== config.format) return true;
     // https://github.com/module-federation/core/blob/4e5c4b96ee45899f3ba5904b8927768980d5ad0e/packages/rsbuild-plugin/src/cli/index.ts#L17
-    const added = isPluginIncluded('rsbuild:module-federation-enhanced', config.plugins);
+    const added = isPluginIncluded('rsbuild:module-federation-enhanced', [
+        ...sharedPlugins || [],
+        ...config.plugins || []
+    ]);
     if (!added) {
         __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.warn(`${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js__["default"].green('format: "mf"')} should be used with ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js__["default"].blue('@module-federation/rsbuild-plugin')}", consider installing and adding it to plugins. Check the documentation (https://module-federation.io/guide/basic/rsbuild.html#rslib-module) to get started with "mf" output.`);
         process.exit(1);
@@ -150,6 +153,7 @@ function debounce(func, wait) {
 /**
  * Check if running in a TTY context
  */ const isTTY = (type = 'stdout')=>('stdin' === type ? process.stdin.isTTY : process.stdout.isTTY) && !process.env.CI;
+const isIntermediateOutputFormat = (format)=>'cjs' === format || 'esm' === format;
 // setup the logger level
 if (process.env.DEBUG) __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.level = 'verbose';
 function initNodeEnv() {
@@ -166,7 +170,7 @@ function prepareCli() {
     // Some package managers automatically output a blank line, some do not.
     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__.logger.greet(`  Rslib v0.1.2\n`);
+    __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.greet(`  Rslib v0.1.4\n`);
 }
 const DEFAULT_CONFIG_NAME = 'rslib.config';
 const DEFAULT_CONFIG_EXTENSIONS = [
@@ -1519,9 +1523,11 @@ const composeExternalsWarnConfig = (format, ...externalsArray)=>{
         }
     };
 };
+const getAutoExternalDefaultValue = (format, autoExternal)=>autoExternal ?? isIntermediateOutputFormat(format);
 const composeAutoExternalConfig = (options)=>{
-    const { autoExternal, pkgJson, userExternals } = options;
-    if (!autoExternal) return {};
+    const { format, pkgJson, userExternals } = options;
+    const autoExternal = getAutoExternalDefaultValue(format, options.autoExternal);
+    if (false === autoExternal) return {};
     if (!pkgJson) {
         __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.warn('autoExternal configuration will not be applied due to read package.json failed');
         return {};
@@ -1582,7 +1588,8 @@ function composeMinifyConfig(config) {
                             toplevel: 'mf' !== format
                         },
                         format: {
-                            comments: 'all'
+                            comments: 'some',
+                            preserve_annotations: true
                         }
                     }
                 }
@@ -1807,6 +1814,9 @@ const composeFormatConfig = ({ format, bundle = true, umdName, pkgJson })=>{
                                 } : {
                                     type: 'umd'
                                 }
+                            },
+                            optimization: {
+                                nodeEnv: process.env.NODE_ENV
                             }
                         }
                     }
@@ -2099,7 +2109,7 @@ const composeBundleConfig = (jsExtension, redirect, cssModulesAuto, bundle)=>{
     };
 };
 const composeDtsConfig = async (libConfig, dtsExtension)=>{
-    const { autoExternal, banner, footer } = libConfig;
+    const { format, autoExternal, banner, footer } = libConfig;
     let { dts } = libConfig;
     if (false === dts || void 0 === dts) return {};
     // DTS default to bundleless whether js is bundle or not
@@ -2116,7 +2126,7 @@ const composeDtsConfig = async (libConfig, dtsExtension)=>{
                 build: dts?.build,
                 abortOnError: dts?.abortOnError,
                 dtsExtension: dts?.autoExtension ? dtsExtension : '.d.ts',
-                autoExternal,
+                autoExternal: getAutoExternalDefaultValue(format, autoExternal),
                 banner: banner?.dts,
                 footer: footer?.dts
             })
@@ -2201,14 +2211,14 @@ const composeExternalHelpersConfig = (externalHelpers, pkgJson)=>{
     }
     return defaultConfig;
 };
-async function composeLibRsbuildConfig(config) {
-    checkMFPlugin(config);
+async function composeLibRsbuildConfig(config, sharedPlugins) {
+    checkMFPlugin(config, sharedPlugins);
     // Get the absolute path of the root directory to align with Rsbuild's default behavior
     const rootPath = config.root ? getAbsolutePath(process.cwd(), config.root) : process.cwd();
     const pkgJson = readPackageJson(rootPath);
     const { compilerOptions } = await loadTsconfig(rootPath, config.source?.tsconfigPath);
     const cssModulesAuto = config.output?.cssModules?.auto ?? true;
-    const { format, shims, bundle = true, banner = {}, footer = {}, autoExtension = true, autoExternal = true, externalHelpers = false, redirect = {}, umdName } = config;
+    const { format, shims, bundle = true, banner = {}, footer = {}, autoExtension = true, autoExternal, externalHelpers = false, redirect = {}, umdName } = config;
     const { rsbuildConfig: shimsConfig, enabledShims } = composeShimsConfig(format, shims);
     const formatConfig = composeFormatConfig({
         format: format,
@@ -2223,6 +2233,7 @@ async function composeLibRsbuildConfig(config) {
     const { config: targetConfig, target } = composeTargetConfig(config.output?.target, format);
     const syntaxConfig = composeSyntaxConfig(target, config?.syntax);
     const autoExternalConfig = composeAutoExternalConfig({
+        format: format,
         autoExternal,
         pkgJson,
         userExternals: config.output?.externals
@@ -2241,13 +2252,13 @@ async function composeLibRsbuildConfig(config) {
 }
 async function composeCreateRsbuildConfig(rslibConfig) {
     const constantRsbuildConfig = await createConstantRsbuildConfig();
-    const { lib: libConfigsArray, ...sharedRsbuildConfig } = rslibConfig;
+    const { lib: libConfigsArray, plugins: sharedPlugins, ...sharedRsbuildConfig } = rslibConfig;
     if (!libConfigsArray) throw new Error(`Expect lib field to be an array, but got ${libConfigsArray}.`);
     const libConfigPromises = libConfigsArray.map(async (libConfig)=>{
         const userConfig = (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.mergeRsbuildConfig)(sharedRsbuildConfig, libConfig);
         // Merge the configuration of each environment based on the shared Rsbuild
         // configuration and Lib configuration in the settings.
-        const libRsbuildConfig = await composeLibRsbuildConfig(userConfig);
+        const libRsbuildConfig = await composeLibRsbuildConfig(userConfig, sharedPlugins);
         // Reset certain fields because they will be completely overridden by the upcoming merge.
         // We don't want to retain them in the final configuration.
         // The reset process should occur after merging the library configuration.
@@ -2358,6 +2369,7 @@ async function build(config, options = {}) {
     const environments = await composeRsbuildEnvironments(config);
     const rsbuildInstance = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.createRsbuild)({
         rsbuildConfig: {
+            plugins: config.plugins,
             environments: pruneEnvironments(environments, options.lib)
         }
     });
@@ -2368,19 +2380,43 @@ async function build(config, options = {}) {
     else await buildInstance.close();
     return rsbuildInstance;
 }
-async function loadRslibConfig(options) {
+const getEnvDir = (cwd, envDir)=>{
+    if (envDir) return __WEBPACK_EXTERNAL_MODULE_node_path__["default"].isAbsolute(envDir) ? envDir : __WEBPACK_EXTERNAL_MODULE_node_path__["default"].resolve(cwd, envDir);
+    return cwd;
+};
+async function init(options) {
     const cwd = process.cwd();
     const root = options.root ? getAbsolutePath(cwd, options.root) : cwd;
-    return loadConfig({
+    const envs = (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.loadEnv)({
+        cwd: getEnvDir(root, options.envDir),
+        mode: options.envMode
+    });
+    onBeforeRestart(envs.cleanup);
+    const { content: config, filePath: configFilePath } = await loadConfig({
         cwd: root,
         path: options.config,
         envMode: options.envMode
     });
+    config.source ||= {};
+    config.source.define = {
+        ...envs.publicVars,
+        ...config.source.define
+    };
+    if (options.root) config.root = root;
+    return {
+        config,
+        configFilePath,
+        watchFiles: [
+            configFilePath,
+            ...envs.filePaths
+        ]
+    };
 }
 async function inspect(config, options = {}) {
     const environments = await composeRsbuildEnvironments(config);
     const rsbuildInstance = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.createRsbuild)({
         rsbuildConfig: {
+            plugins: config.plugins,
             environments: pruneEnvironments(environments, options.lib)
         }
     });
@@ -2403,7 +2439,13 @@ async function initMFRsbuild(rslibConfig) {
     return;
     mfRsbuildConfig.config = changeEnvToDev(mfRsbuildConfig.config);
     const rsbuildInstance = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.createRsbuild)({
-        rsbuildConfig: mfRsbuildConfig.config
+        rsbuildConfig: {
+            ...mfRsbuildConfig.config,
+            plugins: [
+                ...rslibConfig.plugins || [],
+                ...mfRsbuildConfig.config.plugins || []
+            ]
+        }
     });
     const devServer = await rsbuildInstance.startDevServer();
     onBeforeRestart(devServer.server.close);
@@ -2426,13 +2468,13 @@ function changeEnvToDev(rsbuildConfig) {
     });
 }
 const applyCommonOptions = (command)=>{
-    command.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');
+    command.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');
 };
 const repeatableOption = (value, previous)=>(previous ?? []).concat([
         value
     ]);
 function runCli() {
-    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.name('rslib').usage('<command> [options]').version("0.1.2");
+    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.name('rslib').usage('<command> [options]').version("0.1.4");
     const buildCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.command('build');
     const inspectCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.command('inspect');
     const mfDevCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.command('mf dev');
@@ -2444,11 +2486,9 @@ function runCli() {
     buildCommand.option('--lib <id>', 'build the specified library (may be repeated)', repeatableOption).option('-w --watch', 'turn on watch mode, watch for changes and rebuild').description('build the library for production').action(async (options)=>{
         try {
             const cliBuild = async ()=>{
-                const { content: rslibConfig, filePath } = await loadRslibConfig(options);
-                await build(rslibConfig, options);
-                if (options.watch) watchFilesForRestart([
-                    filePath
-                ], async ()=>{
+                const { config, watchFiles } = await init(options);
+                await build(config, options);
+                if (options.watch) watchFilesForRestart(watchFiles, async ()=>{
                     await cliBuild();
                 });
             };
@@ -2462,8 +2502,8 @@ function runCli() {
     inspectCommand.description('inspect the Rsbuild / Rspack configs of Rslib projects').option('--lib <id>', 'inspect the specified library (may be repeated)', repeatableOption).option('--output <output>', 'specify inspect content output path', '.rsbuild').option('--verbose', 'show full function definitions in output').action(async (options)=>{
         try {
             // TODO: inspect should output Rslib's config
-            const { content: rslibConfig } = await loadRslibConfig(options);
-            await inspect(rslibConfig, {
+            const { config } = await init(options);
+            await inspect(config, {
                 lib: options.lib,
                 mode: options.mode,
                 output: options.output,
@@ -2478,12 +2518,10 @@ function runCli() {
     mfDevCommand.description('start Rsbuild dev server of Module Federation format').action(async (options)=>{
         try {
             const cliMfDev = async ()=>{
-                const { content: rslibConfig, filePath } = await loadRslibConfig(options);
+                const { config, watchFiles } = await init(options);
                 // TODO: support lib option in mf dev server
-                await startMFDevServer(rslibConfig);
-                watchFilesForRestart([
-                    filePath
-                ], async ()=>{
+                await startMFDevServer(config);
+                watchFilesForRestart(watchFiles, async ()=>{
                     await cliMfDev();
                 });
             };
@@ -2496,6 +2534,6 @@ function runCli() {
     });
     __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.parse();
 }
-const src_rslib_entry_version = "0.1.2";
+const src_rslib_entry_version = "0.1.4";
 var __webpack_exports__logger = __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.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-types/cli/commands.d.ts

@@ -2,6 +2,7 @@ import type { RsbuildMode } from '@rsbuild/core';
 export type CommonOptions = {
     root?: string;
     config?: string;
+    envDir?: string;
     envMode?: string;
     lib?: string[];
 };

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

@@ -1,6 +1,7 @@
 import type { RslibConfig } from '../types';
 import type { CommonOptions } from './commands';
-export declare function loadRslibConfig(options: CommonOptions): Promise<{
-    content: RslibConfig;
-    filePath: string;
+export declare function init(options: CommonOptions): Promise<{
+    config: RslibConfig;
+    configFilePath: string;
+    watchFiles: string[];
 }>;

package/dist-types/config.d.ts

@@ -1,5 +1,5 @@
 import { type EnvironmentConfig, type RsbuildConfig } from '@rsbuild/core';
-import type { AutoExternal, BannerAndFooter, LibConfig, PkgJson, RsbuildConfigEntry, RsbuildConfigWithLibInfo, RslibConfig, RslibConfigAsyncFn, RslibConfigExport, RslibConfigSyncFn } from './types';
+import type { AutoExternal, BannerAndFooter, Format, LibConfig, PkgJson, RsbuildConfigEntry, RsbuildConfigWithLibInfo, RslibConfig, RslibConfigAsyncFn, RslibConfigExport, RslibConfigSyncFn } from './types';
 /**
  * This function helps you to autocomplete configuration types.
  * It accepts a Rslib config object, or a function that returns a config.
@@ -17,7 +17,8 @@ export declare function loadConfig({ cwd, path, envMode, }: {
     filePath: string;
 }>;
 export declare const composeAutoExternalConfig: (options: {
-    autoExternal: AutoExternal;
+    format: Format;
+    autoExternal?: AutoExternal;
     pkgJson?: PkgJson;
     userExternals?: NonNullable<RsbuildConfig["output"]>["externals"];
 }) => RsbuildConfig;

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

@@ -67,7 +67,7 @@ export interface LibConfig extends RsbuildConfig {
     autoExtension?: boolean;
     /**
      * Whether to automatically externalize dependencies of different dependency types and do not bundle them.
-     * @defaultValue `true`
+     * @defaultValue `true` when {@link format} is `cjs` or `esm`, `false` when {@link format} is `umd` or `mf`.
      * @see {@link https://lib.rsbuild.dev/config/lib/auto-external}
      */
     autoExternal?: AutoExternal;
@@ -90,13 +90,13 @@ export interface LibConfig extends RsbuildConfig {
      */
     externalHelpers?: boolean;
     /**
-     * Inject content into the top of each JS, CSS or DTS file.
+     * Inject content into the top of each JavaScript, CSS or DTS file.
      * @defaultValue `{}`
      * @see {@link https://lib.rsbuild.dev/config/lib/banner}
      */
     banner?: BannerAndFooter;
     /**
-     * Inject content into the bottom of each JS, CSS or DTS file.
+     * Inject content into the bottom of each JavaScript, CSS or DTS file.
      * @defaultValue `{}`
      * @see {@link https://lib.rsbuild.dev/config/lib/footer}
      */

package/dist-types/utils/helper.d.ts

@@ -1,6 +1,6 @@
 import type { RsbuildPlugins } from '@rsbuild/core';
 import color from 'picocolors';
-import type { LibConfig, PkgJson } from '../types';
+import type { Format, LibConfig, PkgJson } from '../types';
 /**
  * Node.js built-in modules.
  * Copied from https://github.com/webpack/webpack/blob/dd44b206a9c50f4b4cb4d134e1a0bd0387b159a3/lib/node/NodeTargetPlugin.js#L12-L72
@@ -14,10 +14,11 @@ export declare const isEmptyObject: (obj: object) => boolean;
 export declare function pick<T, U extends keyof T>(obj: T, keys: ReadonlyArray<U>): Pick<T, U>;
 export declare function omit<T extends object, U extends keyof T>(obj: T, keysObj: Record<U, boolean>): Omit<T, keyof U>;
 export declare function isPluginIncluded(pluginName: string, plugins?: RsbuildPlugins): boolean;
-export declare function checkMFPlugin(config: LibConfig): boolean;
+export declare function checkMFPlugin(config: LibConfig, sharedPlugins?: RsbuildPlugins): boolean;
 export declare function debounce<T extends (...args: any[]) => void>(func: T, wait: number): (...args: Parameters<T>) => void;
 /**
  * Check if running in a TTY context
  */
 export declare const isTTY: (type?: "stdin" | "stdout") => boolean;
+export declare const isIntermediateOutputFormat: (format: Format) => boolean;
 export { color };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "The Rsbuild-based library development tool.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {
@@ -32,19 +32,19 @@
     "compiled"
   ],
   "dependencies": {
-    "@rsbuild/core": "~1.1.7",
+    "@rsbuild/core": "~1.1.10",
     "tinyglobby": "^0.2.10",
-    "rsbuild-plugin-dts": "0.1.2"
+    "rsbuild-plugin-dts": "0.1.4"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "chokidar": "^4.0.1",
     "commander": "^12.1.0",
     "fs-extra": "^11.2.0",
-    "memfs": "^4.14.1",
+    "memfs": "^4.15.0",
     "picocolors": "1.1.1",
     "prebundle": "1.2.5",
-    "rslib": "npm:@rslib/core@0.1.1",
+    "rslib": "npm:@rslib/core@0.1.3",
     "rslog": "^1.2.3",
     "tsconfck": "3.1.4",
     "typescript": "^5.6.3",