@rslib/core 0.1.2 → 0.1.3

package/dist/index.js

@@ -166,7 +166,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.3\n`);
 }
 const DEFAULT_CONFIG_NAME = 'rslib.config';
 const DEFAULT_CONFIG_EXTENSIONS = [
@@ -1807,6 +1807,9 @@ const composeFormatConfig = ({ format, bundle = true, umdName, pkgJson })=>{
                                 } : {
                                     type: 'umd'
                                 }
+                            },
+                            optimization: {
+                                nodeEnv: process.env.NODE_ENV
                             }
                         }
                     }
@@ -2368,14 +2371,37 @@ 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);
@@ -2426,13 +2452,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.3");
     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 +2470,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 +2486,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 +2502,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 +2518,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.3";
 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/package.json

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