@rsbuild/core 0.3.4 → 0.3.5

package/dist/cli/commands.d.ts

@@ -1,6 +1,7 @@
 import type { RsbuildMode } from '..';
 export type CommonOptions = {
     config?: string;
+    envMode?: string;
     open?: boolean | string;
     host?: string;
     port?: number;

package/dist/cli/commands.js

@@ -49,12 +49,25 @@ async function init({
   }
   try {
     const root = process.cwd();
-    const envs = (0, import_loadEnv.loadEnv)({ cwd: root });
-    (0, import_shared.isDev)() && (0, import_restart.onBeforeRestartServer)(envs.cleanup);
-    const config = await (0, import_config.loadConfig)({
+    const envs = (0, import_loadEnv.loadEnv)({
+      cwd: root,
+      mode: cliOptions?.envMode
+    });
+    if ((0, import_shared.isDev)()) {
+      (0, import_restart.onBeforeRestartServer)(envs.cleanup);
+    }
+    const { content: config, filePath: configFilePath } = await (0, import_config.loadConfigV2)({
       cwd: root,
       path: commonOpts.config
     });
+    const command = process.argv[2];
+    if (command === "dev") {
+      const files = [...envs.filePaths];
+      if (configFilePath) {
+        files.push(configFilePath);
+      }
+      (0, import_config.watchFiles)(files);
+    }
     const { createRsbuild } = await Promise.resolve().then(() => __toESM(require("../createRsbuild")));
     config.source || (config.source = {});
     config.source.define = {
@@ -85,18 +98,29 @@ async function init({
     }
   }
 }
-function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.3.4");
-  import_commander.program.command("dev").option("-o --open [url]", "open the page in browser on startup").option(
-    "--port <port>",
-    "specify a port number for Rsbuild Server to listen"
-  ).option(
-    "--host <host>",
-    "specify the host that the Rsbuild Server listens to"
-  ).option(
+const applyCommonOptions = (command) => {
+  command.option(
     "-c --config <config>",
     "specify the configuration file, can be a relative or absolute path"
-  ).description("starting the dev server").action(async (options) => {
+  ).option(
+    "--env-mode <mode>",
+    "specify the env mode to load the `.env.[mode]` file"
+  );
+};
+const applyServerOptions = (command) => {
+  command.option("-o --open [url]", "open the page in browser on startup").option("--port <port>", "specify a port number for server to listen").option("--host <host>", "specify the host that the server listens to");
+};
+function runCli() {
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.3.5");
+  const devCommand = import_commander.program.command("dev");
+  const buildCommand = import_commander.program.command("build");
+  const previewCommand = import_commander.program.command("preview");
+  const inspectCommand = import_commander.program.command("inspect");
+  [devCommand, buildCommand, previewCommand, inspectCommand].forEach(
+    applyCommonOptions
+  );
+  [devCommand, previewCommand].forEach(applyServerOptions);
+  devCommand.description("starting the dev server").action(async (options) => {
     try {
       const rsbuild = await init({ cliOptions: options });
       await rsbuild?.startDevServer();
@@ -106,10 +130,7 @@ function runCli() {
       process.exit(1);
     }
   });
-  import_commander.program.command("build").option("-w --watch", "turn on watch mode, watch for changes and rebuild").option(
-    "-c --config <config>",
-    "specify the configuration file, can be a relative or absolute path"
-  ).description("build the app for production").action(async (options) => {
+  buildCommand.option("-w --watch", "turn on watch mode, watch for changes and rebuild").description("build the app for production").action(async (options) => {
     try {
       const rsbuild = await init({ cliOptions: options });
       await rsbuild?.build({
@@ -121,16 +142,7 @@ function runCli() {
       process.exit(1);
     }
   });
-  import_commander.program.command("preview").option("-o --open [url]", "open the page in browser on startup").option(
-    "--port <port>",
-    "specify a port number for Rsbuild Server to listen"
-  ).option(
-    "--host <host>",
-    "specify the host that the Rsbuild Server listens to"
-  ).option(
-    "-c --config <config>",
-    "specify the configuration file, can be a relative or absolute path"
-  ).description("preview the production build locally").action(async (options) => {
+  previewCommand.description("preview the production build locally").action(async (options) => {
     try {
       const rsbuild = await init({ cliOptions: options });
       if (rsbuild && !(0, import_fs.existsSync)(rsbuild.context.distPath)) {
@@ -147,10 +159,7 @@ function runCli() {
       process.exit(1);
     }
   });
-  import_commander.program.command("inspect").description("inspect the Rspack and Rsbuild configs").option("--env <env>", "specify env mode", "development").option("--output <output>", "specify inspect content output path", "/").option("--verbose", "show full function definitions in output").option(
-    "-c --config <config>",
-    "specify the configuration file, can be a relative or absolute path"
-  ).action(async (options) => {
+  inspectCommand.description("inspect the Rspack and Rsbuild configs").option("--env <env>", "specify env mode", "development").option("--output <output>", "specify inspect content output path", "/").option("--verbose", "show full function definitions in output").action(async (options) => {
     try {
       const rsbuild = await init({ cliOptions: options });
       await rsbuild?.inspectConfig({

package/dist/cli/config.d.ts

@@ -14,7 +14,16 @@ export declare function defineConfig(config: RsbuildConfig): RsbuildConfig;
 export declare function defineConfig(config: RsbuildConfigSyncFn): RsbuildConfigSyncFn;
 export declare function defineConfig(config: RsbuildConfigAsyncFn): RsbuildConfigAsyncFn;
 export declare function defineConfig(config: RsbuildConfigExport): RsbuildConfigExport;
+export declare function watchFiles(files: string[]): Promise<void>;
+export declare function loadConfigByPath(configFile: string): Promise<RsbuildConfig>;
 export declare function loadConfig({ cwd, path, }: {
     cwd: string;
     path?: string;
 }): Promise<RsbuildConfig>;
+export declare function loadConfigV2({ cwd, path, }: {
+    cwd: string;
+    path?: string;
+}): Promise<{
+    content: RsbuildConfig;
+    filePath: string | null;
+}>;

package/dist/cli/config.js

@@ -29,13 +29,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var config_exports = {};
 __export(config_exports, {
   defineConfig: () => defineConfig,
-  loadConfig: () => loadConfig
+  loadConfig: () => loadConfig,
+  loadConfigByPath: () => loadConfigByPath,
+  loadConfigV2: () => loadConfigV2,
+  watchFiles: () => watchFiles
 });
 module.exports = __toCommonJS(config_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
-var import_loadEnv = require("../loadEnv");
 var import_restart = require("../server/restart");
 function defineConfig(config) {
   return config;
@@ -65,10 +67,12 @@ const resolveConfigPath = (root, customConfig) => {
   }
   return null;
 };
-async function watchConfig(root, configFile) {
+async function watchFiles(files) {
+  if (!files.length) {
+    return;
+  }
   const chokidar = await Promise.resolve().then(() => __toESM(require("@rsbuild/shared/chokidar")));
-  const envFiles = (0, import_loadEnv.getEnvFiles)().map((filename) => (0, import_path.join)(root, filename));
-  const watcher = chokidar.watch([configFile, ...envFiles], {
+  const watcher = chokidar.watch(files, {
     // do not trigger add for initial files
     ignoreInitial: true,
     // If watching fails due to read permissions, the errors will be suppressed silently.
@@ -86,14 +90,7 @@ async function watchConfig(root, configFile) {
   watcher.on("change", callback);
   watcher.on("unlink", callback);
 }
-async function loadConfig({
-  cwd,
-  path
-}) {
-  const configFile = resolveConfigPath(cwd, path);
-  if (!configFile) {
-    return {};
-  }
+async function loadConfigByPath(configFile) {
   try {
     const { default: jiti } = await Promise.resolve().then(() => __toESM(require("@rsbuild/shared/jiti")));
     const loadConfig2 = jiti(__filename, {
@@ -102,12 +99,9 @@ async function loadConfig({
       requireCache: false,
       interopDefault: true
     });
-    const command = process.argv[2];
-    if (command === "dev") {
-      watchConfig(cwd, configFile);
-    }
     const configExport = loadConfig2(configFile);
     if (typeof configExport === "function") {
+      const command = process.argv[2];
       const params = {
         env: (0, import_shared.getNodeEnv)(),
         command
@@ -124,8 +118,37 @@ async function loadConfig({
     throw err;
   }
 }
+async function loadConfig({
+  cwd,
+  path
+}) {
+  const configFile = resolveConfigPath(cwd, path);
+  if (!configFile) {
+    return {};
+  }
+  return loadConfigByPath(configFile);
+}
+async function loadConfigV2({
+  cwd,
+  path
+}) {
+  const configFile = resolveConfigPath(cwd, path);
+  if (!configFile) {
+    return {
+      content: {},
+      filePath: configFile
+    };
+  }
+  return {
+    content: await loadConfigByPath(configFile),
+    filePath: configFile
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defineConfig,
-  loadConfig
+  loadConfig,
+  loadConfigByPath,
+  loadConfigV2,
+  watchFiles
 });

package/dist/cli/prepare.js

@@ -34,7 +34,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js")) {
     console.log();
   }
-  import_rslog.logger.greet(`  ${`Rsbuild v${"0.3.4"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"0.3.5"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.js

@@ -38,7 +38,7 @@ var import_createRsbuild = require("./createRsbuild");
 var import_config = require("./cli/config");
 var import_shared = require("@rsbuild/shared");
 var import_constants = require("./constants");
-const version = "0.3.4";
+const version = "0.3.5";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_BABEL_NAME,

package/dist/loadEnv.d.ts

@@ -1,9 +1,27 @@
-export declare const getEnvFiles: () => string[];
-export declare function loadEnv({ cwd, prefixes, }?: {
+export type LoadEnvOptions = {
+    /**
+     * The root path to load the env file
+     * @default process.cwd()
+     */
     cwd?: string;
+    /**
+     * Used to specify the name of the .env.[mode] file
+     * @default process.env.NODE_ENV
+     */
+    mode?: string;
+    /**
+     * The prefix of public variables
+     * @default ['PUBLIC_']
+     */
     prefixes?: string[];
-}): {
+};
+export declare function loadEnv({ cwd, mode, prefixes, }?: LoadEnvOptions): {
+    /** All environment variables in the .env file */
     parsed: Record<string, string>;
+    /** The absolute paths to all env files */
+    filePaths: string[];
+    /** Environment variables that start with prefixes */
     publicVars: Record<string, string>;
+    /** Clear the environment variables mounted on `process.env` */
     cleanup: () => void;
 };

package/dist/loadEnv.js

@@ -28,7 +28,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var loadEnv_exports = {};
 __export(loadEnv_exports, {
-  getEnvFiles: () => getEnvFiles,
   loadEnv: () => loadEnv
 });
 module.exports = __toCommonJS(loadEnv_exports);
@@ -37,17 +36,20 @@ var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
 var import_dotenv = require("../compiled/dotenv");
 var import_dotenv_expand = require("../compiled/dotenv-expand");
-const getEnvFiles = () => {
-  const nodeEnv = (0, import_shared.getNodeEnv)();
-  return [".env", ".env.local", `.env.${nodeEnv}`, `.env.${nodeEnv}.local`];
-};
 function loadEnv({
   cwd = process.cwd(),
+  mode = (0, import_shared.getNodeEnv)(),
   prefixes = ["PUBLIC_"]
 } = {}) {
-  const envPaths = getEnvFiles().map((filename) => (0, import_path.join)(cwd, filename)).filter(import_shared.isFileSync);
+  const filenames = [
+    ".env",
+    ".env.local",
+    `.env.${mode}`,
+    `.env.${mode}.local`
+  ];
+  const filePaths = filenames.map((filename) => (0, import_path.join)(cwd, filename)).filter(import_shared.isFileSync);
   const parsed = {};
-  envPaths.forEach((envPath) => {
+  filePaths.forEach((envPath) => {
     Object.assign(parsed, (0, import_dotenv.parse)(import_fs.default.readFileSync(envPath)));
   });
   (0, import_dotenv_expand.expand)({ parsed });
@@ -71,12 +73,12 @@ function loadEnv({
   };
   return {
     parsed,
-    publicVars,
-    cleanup
+    cleanup,
+    filePaths,
+    publicVars
   };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getEnvFiles,
   loadEnv
 });

package/dist/plugins/server.js

@@ -37,10 +37,18 @@ const pluginServer = () => ({
         if (!import_shared.fse.existsSync(publicDir)) {
           return;
         }
-        await import_shared.fse.copy(publicDir, api.context.distPath, {
-          // dereference symlinks
-          dereference: true
-        });
+        try {
+          await import_shared.fse.copy(publicDir, api.context.distPath, {
+            // dereference symlinks
+            dereference: true
+          });
+        } catch (err) {
+          if (err instanceof Error) {
+            err.message = `Copy public dir (${publicDir}) to dist failed:
+${err.message}`;
+          }
+          throw err;
+        }
       }
     });
   }

package/dist/provider/core/createContext.js

@@ -43,7 +43,7 @@ async function createContextByConfig(options, bundlerType, config = {}) {
   const context = {
     entry: config.source?.entry || {},
     targets: config.output?.targets || [],
-    version: "0.3.4",
+    version: "0.3.5",
     rootPath,
     distPath,
     cachePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -57,7 +57,7 @@
     "core-js": "~3.32.2",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.5.7",
     "postcss": "^8.4.33",
-    "@rsbuild/shared": "0.3.4"
+    "@rsbuild/shared": "0.3.5"
   },
   "devDependencies": {
     "@types/node": "16.x",