Merge branch 'main' into react_jsx_1204

Author: chenjiahan

.gitignore

@@ -23,3 +23,5 @@ test-results
 .nx/
 **/@mf-types
 **/@mf-types/**
+.env.local
+.env.*.local

examples/module-federation/mf-host/package.json

@@ -12,7 +12,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@module-federation/rsbuild-plugin": "^0.8.0",
+    "@module-federation/rsbuild-plugin": "^0.8.1",
     "@rsbuild/core": "~1.1.8",
     "@rsbuild/plugin-react": "^1.0.7",
     "@types/react": "^18.3.12",

examples/module-federation/mf-react-component/package.json

@@ -18,9 +18,9 @@
     "storybook": "storybook dev -p 6006"
   },
   "devDependencies": {
-    "@module-federation/enhanced": "^0.8.0",
-    "@module-federation/rsbuild-plugin": "^0.8.0",
-    "@module-federation/storybook-addon": "^3.0.11",
+    "@module-federation/enhanced": "^0.8.1",
+    "@module-federation/rsbuild-plugin": "^0.8.1",
+    "@module-federation/storybook-addon": "^3.0.12",
     "@rsbuild/plugin-react": "^1.0.7",
     "@rslib/core": "workspace:*",
     "@types/react": "^18.3.12",

examples/module-federation/mf-remote/package.json

@@ -12,7 +12,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@module-federation/rsbuild-plugin": "^0.8.0",
+    "@module-federation/rsbuild-plugin": "^0.8.1",
     "@rsbuild/core": "~1.1.8",
     "@rsbuild/plugin-react": "^1.0.7",
     "@types/react": "^18.3.12",

package.json

@@ -50,7 +50,7 @@
     "fs-extra": "^11.2.0",
     "nano-staged": "^0.8.0",
     "nx": "^20.1.4",
-    "prettier": "^3.4.1",
+    "prettier": "^3.4.2",
     "prettier-plugin-packagejson": "^2.5.6",
     "simple-git-hooks": "^2.11.1",
     "typescript": "^5.6.3",

packages/core/src/cli/commands.ts

@@ -2,14 +2,15 @@ import type { RsbuildMode } from '@rsbuild/core';
 import { type Command, program } from 'commander';
 import { logger } from '../utils/logger';
 import { build } from './build';
-import { loadRslibConfig } from './init';
+import { init } from './init';
 import { inspect } from './inspect';
 import { startMFDevServer } from './mf';
 import { watchFilesForRestart } from './restart';
 
 export type CommonOptions = {
   root?: string;
   config?: string;
+  envDir?: string;
   envMode?: string;
   lib?: string[];
 };
@@ -37,7 +38,8 @@ const applyCommonOptions = (command: Command) => {
     .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: string, previous: string[]) => {
@@ -64,13 +66,12 @@ export function runCli(): void {
     .action(async (options: BuildOptions) => {
       try {
         const cliBuild = async () => {
-          const { content: rslibConfig, filePath } =
-            await loadRslibConfig(options);
+          const { config, watchFiles } = await init(options);
 
-          await build(rslibConfig, options);
+          await build(config, options);
 
           if (options.watch) {
-            watchFilesForRestart([filePath], async () => {
+            watchFilesForRestart(watchFiles, async () => {
               await cliBuild();
             });
           }
@@ -100,8 +101,8 @@ export function runCli(): void {
     .action(async (options: InspectOptions) => {
       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,
@@ -119,12 +120,11 @@ export function runCli(): void {
     .action(async (options: CommonOptions) => {
       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);
+          await startMFDevServer(config);
 
-          watchFilesForRestart([filePath], async () => {
+          watchFilesForRestart(watchFiles, async () => {
             await cliMfDev();
           });
         };

packages/core/src/cli/init.ts

@@ -1,18 +1,51 @@
+import path from 'node:path';
+import { loadEnv } from '@rsbuild/core';
 import { loadConfig } from '../config';
 import type { RslibConfig } from '../types';
 import { getAbsolutePath } from '../utils/helper';
 import type { CommonOptions } from './commands';
+import { onBeforeRestart } from './restart';
 
-export async function loadRslibConfig(options: CommonOptions): Promise<{
-  content: RslibConfig;
-  filePath: string;
+const getEnvDir = (cwd: string, envDir?: string) => {
+  if (envDir) {
+    return path.isAbsolute(envDir) ? envDir : path.resolve(cwd, envDir);
+  }
+  return cwd;
+};
+
+export async function init(options: CommonOptions): Promise<{
+  config: RslibConfig;
+  configFilePath: string;
+  watchFiles: string[];
 }> {
   const cwd = process.cwd();
   const root = options.root ? getAbsolutePath(cwd, options.root) : cwd;
+  const envs = loadEnv({
+    cwd: getEnvDir(root, options.envDir),
+    mode: options.envMode,
+  });
+
+  onBeforeRestart(envs.cleanup);
 
-  return loadConfig({
+  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],
+  };
 }

packages/core/src/config.ts

@@ -583,6 +583,9 @@ const composeFormatConfig = ({
                     type: 'umd',
                   },
             },
+            optimization: {
+              nodeEnv: process.env.NODE_ENV,
+            },
           },
         },
       };

packages/core/tests/__snapshots__/config.test.ts.snap

@@ -640,6 +640,9 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
                 },
               },
             },
+            "optimization": {
+              "nodeEnv": "test",
+            },
             "output": {
               "asyncChunks": false,
               "library": {