@rsbuild/core 0.2.8 → 0.2.10

package/dist/cli/commands.js

@@ -47,7 +47,7 @@ async function init({
   }
   try {
     const root = process.cwd();
-    const { publicVars } = await (0, import_loadEnv.loadEnv)({ cwd: root });
+    const { publicVars } = (0, import_loadEnv.loadEnv)({ cwd: root });
     const config = await (0, import_config.loadConfig)({
       cwd: root,
       path: commonOpts.config
@@ -83,7 +83,7 @@ async function init({
   }
 }
 function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.2.8");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.2.10");
   import_commander.program.command("dev").option("--open", "open the page in browser on startup").option(
     "--port <port>",
     "specify a port number for Rsbuild Server to listen"

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.2.8"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"0.2.10"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.d.ts

@@ -2,6 +2,7 @@
  * The methods and types exported from this file are considered as
  * the public API of @rsbuild/core.
  */
+export { loadEnv } from './loadEnv';
 export { createRsbuild } from './createRsbuild';
 export { loadConfig, defineConfig } from './cli/config';
 export { logger, mergeRsbuildConfig } from '@rsbuild/shared';

package/dist/index.js

@@ -21,10 +21,12 @@ __export(src_exports, {
   createRsbuild: () => import_createRsbuild.createRsbuild,
   defineConfig: () => import_config.defineConfig,
   loadConfig: () => import_config.loadConfig,
+  loadEnv: () => import_loadEnv.loadEnv,
   logger: () => import_shared.logger,
   mergeRsbuildConfig: () => import_shared.mergeRsbuildConfig
 });
 module.exports = __toCommonJS(src_exports);
+var import_loadEnv = require("./loadEnv");
 var import_createRsbuild = require("./createRsbuild");
 var import_config = require("./cli/config");
 var import_shared = require("@rsbuild/shared");
@@ -33,6 +35,7 @@ var import_shared = require("@rsbuild/shared");
   createRsbuild,
   defineConfig,
   loadConfig,
+  loadEnv,
   logger,
   mergeRsbuildConfig
 });

package/dist/loadEnv.d.ts

@@ -2,7 +2,7 @@ export declare const getEnvFiles: () => string[];
 export declare function loadEnv({ cwd, prefixes, }?: {
     cwd?: string;
     prefixes?: string[];
-}): Promise<{
+}): {
     parsed: Record<string, string>;
     publicVars: Record<string, string>;
-}>;
+};

package/dist/loadEnv.js

@@ -35,30 +35,23 @@ module.exports = __toCommonJS(loadEnv_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
+var import_restart = require("./server/restart");
+var import_dotenv = require("../compiled/dotenv");
+var import_dotenv_expand = require("../compiled/dotenv-expand");
 const getEnvFiles = () => {
   const { NODE_ENV } = process.env;
   return [".env", ".env.local", `.env.${NODE_ENV}`, `.env.${NODE_ENV}.local`];
 };
-let lastParsed;
-async function loadEnv({
+function loadEnv({
   cwd = process.cwd(),
   prefixes = ["PUBLIC_"]
 } = {}) {
-  const { parse } = await Promise.resolve().then(() => __toESM(require("../compiled/dotenv")));
-  const { expand } = await Promise.resolve().then(() => __toESM(require("../compiled/dotenv-expand")));
   const envPaths = getEnvFiles().map((filename) => (0, import_path.join)(cwd, filename)).filter(import_shared.isFileSync);
   const parsed = {};
   envPaths.forEach((envPath) => {
-    Object.assign(parsed, parse(import_fs.default.readFileSync(envPath)));
+    Object.assign(parsed, (0, import_dotenv.parse)(import_fs.default.readFileSync(envPath)));
   });
-  if (lastParsed) {
-    Object.keys(lastParsed).forEach((key) => {
-      if (process.env[key] === lastParsed[key]) {
-        delete process.env[key];
-      }
-    });
-  }
-  expand({ parsed });
+  (0, import_dotenv_expand.expand)({ parsed });
   const publicVars = {};
   Object.keys(process.env).forEach((key) => {
     const val = process.env[key];
@@ -66,7 +59,15 @@ async function loadEnv({
       publicVars[`process.env.${key}`] = JSON.stringify(val);
     }
   });
-  lastParsed = parsed;
+  if ((0, import_shared.isDev)()) {
+    (0, import_restart.onBeforeRestartServer)(() => {
+      Object.keys(parsed).forEach((key) => {
+        if (process.env[key] === parsed[key]) {
+          delete process.env[key];
+        }
+      });
+    });
+  }
   return {
     parsed,
     publicVars

package/dist/plugins/splitChunks.js

@@ -98,10 +98,8 @@ function splitByModule(ctx) {
       vendors: {
         priority: -10,
         test: import_shared.NODE_MODULES_REGEX,
-        // TODO: not support in rspack
-        // @ts-expect-error
         name(module2) {
-          return (0, import_shared.getPackageNameFromModulePath)(module2.context);
+          return module2 ? (0, import_shared.getPackageNameFromModulePath)(module2.context) : void 0;
         }
       },
       ...override.cacheGroups

package/dist/provider/core/createContext.js

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

package/dist/server/devServer.js

@@ -164,18 +164,16 @@ async function startDevServer(options, createDevMiddleware, {
         }
         (0, import_shared.debug)("listen dev server done");
         await serverAPIs.afterStart();
-        const onClose = async () => {
+        const closeServer = async () => {
           await devMiddlewares.close();
           httpServer.close();
         };
-        (0, import_restart.registerCleaner)(onClose);
+        (0, import_restart.onBeforeRestartServer)(closeServer);
         resolve({
           port,
           urls: urls.map((item) => item.url),
           server: {
-            close: async () => {
-              await onClose();
-            }
+            close: closeServer
           }
         });
       }

package/dist/server/restart.d.ts

@@ -2,7 +2,7 @@ type Cleaner = () => Promise<unknown> | unknown;
 /**
  * Add a cleaner to handle side effects
  */
-export declare const registerCleaner: (cleaner: Cleaner) => void;
+export declare const onBeforeRestartServer: (cleaner: Cleaner) => void;
 export declare const restartDevServer: ({ filePath }: {
     filePath: string;
 }) => Promise<void>;

package/dist/server/restart.js

@@ -28,15 +28,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var restart_exports = {};
 __export(restart_exports, {
-  registerCleaner: () => registerCleaner,
+  onBeforeRestartServer: () => onBeforeRestartServer,
   restartDevServer: () => restartDevServer
 });
 module.exports = __toCommonJS(restart_exports);
 var import_path = __toESM(require("path"));
 var import_shared = require("@rsbuild/shared");
 var import_commands = require("../cli/commands");
-const cleaners = [];
-const registerCleaner = (cleaner) => {
+let cleaners = [];
+const onBeforeRestartServer = (cleaner) => {
   cleaners.push(cleaner);
 };
 const clearConsole = () => {
@@ -51,6 +51,7 @@ const restartDevServer = async ({ filePath }) => {
 `);
   for (const cleaner of cleaners) {
     await cleaner();
+    cleaners = [];
   }
   const rsbuild = await (0, import_commands.init)({ isRestart: true });
   if (!rsbuild) {
@@ -60,6 +61,6 @@ const restartDevServer = async ({ filePath }) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  registerCleaner,
+  onBeforeRestartServer,
   restartDevServer
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -60,7 +60,7 @@
     "core-js": "~3.32.2",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.5.7",
     "postcss": "8.4.31",
-    "@rsbuild/shared": "0.2.8"
+    "@rsbuild/shared": "0.2.10"
   },
   "devDependencies": {
     "@types/node": "16.x",