@rsbuild/core 0.2.2 → 0.2.3

package/dist/cli/commands.js

@@ -84,7 +84,7 @@ async function init({
   }
 }
 function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.2.2");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.2.3");
   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.2"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"0.2.3"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/loadEnv.js

@@ -39,6 +39,7 @@ const getEnvFiles = () => {
   const { NODE_ENV } = process.env;
   return [".env", ".env.local", `.env.${NODE_ENV}`, `.env.${NODE_ENV}.local`];
 };
+let lastParsed;
 async function loadEnv({
   cwd = process.cwd(),
   prefixes = ["PUBLIC_"]
@@ -50,6 +51,13 @@ async function loadEnv({
   envPaths.forEach((envPath) => {
     Object.assign(parsed, 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 });
   const publicVars = {};
   Object.keys(process.env).forEach((key) => {
@@ -58,6 +66,7 @@ async function loadEnv({
       publicVars[`process.env.${key}`] = JSON.stringify(val);
     }
   });
+  lastParsed = parsed;
   return {
     parsed,
     publicVars

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.2",
+    version: "0.2.3",
     rootPath,
     distPath,
     cachePath,

package/dist/server/{compiler-dev-middleware/index.d.ts → compilerDevMiddleware.d.ts}

@@ -8,7 +8,12 @@ type Options = {
   dev: RsbuildDevMiddlewareOptions['dev'];
   devMiddleware?: CustomDevMiddleware;
 };
-export default class DevMiddleware {
+/**
+ * Setup compiler-related logic:
+ * 1. setup webpack-dev-middleware
+ * 2. establish webSocket connect
+ */
+export declare class CompilerDevMiddleware {
   middleware?: DevMiddlewareAPI;
   private devOptions;
   private devMiddleware?;

package/dist/server/{compiler-dev-middleware/index.js → compilerDevMiddleware.js}

@@ -26,12 +26,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var compiler_dev_middleware_exports = {};
-__export(compiler_dev_middleware_exports, {
-  default: () => DevMiddleware
+var compilerDevMiddleware_exports = {};
+__export(compilerDevMiddleware_exports, {
+  CompilerDevMiddleware: () => CompilerDevMiddleware
 });
-module.exports = __toCommonJS(compiler_dev_middleware_exports);
-var import_socketServer = __toESM(require("./socketServer"));
+module.exports = __toCommonJS(compilerDevMiddleware_exports);
+var import_socketServer = require("./socketServer");
 const noop = () => {
 };
 function getHMRClientPath(client) {
@@ -42,11 +42,11 @@ function getHMRClientPath(client) {
   const clientEntry = `${require.resolve("@rsbuild/core/client/hmr")}?${host}${path}${port}${protocol}`;
   return clientEntry;
 }
-class DevMiddleware {
+class CompilerDevMiddleware {
   constructor({ dev, devMiddleware, publicPaths }) {
     this.devOptions = dev;
     this.publicPaths = publicPaths;
-    this.socketServer = new import_socketServer.default(dev);
+    this.socketServer = new import_socketServer.SocketServer(dev);
     this.devMiddleware = devMiddleware;
   }
   init() {
@@ -89,7 +89,7 @@ class DevMiddleware {
       writeToDisk: devOptions.writeToDisk
     });
     const warp = async (req, res, next) => {
-      const url = req.url;
+      const { url } = req;
       const assetPrefix = url && publicPaths.find((prefix) => url.startsWith(prefix));
       if (assetPrefix && assetPrefix !== "/") {
         req.url = url.slice(assetPrefix.length - 1);
@@ -105,3 +105,7 @@ class DevMiddleware {
     return warp;
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CompilerDevMiddleware
+});

package/dist/server/devServer.js

@@ -36,7 +36,7 @@ var import_shared = require("@rsbuild/shared");
 var import_connect = __toESM(require("@rsbuild/shared/connect"));
 var import_restart = require("./restart");
 var import_httpServer = require("./httpServer");
-var import_devMiddlewares = require("./devMiddlewares");
+var import_getDevMiddlewares = require("./getDevMiddlewares");
 var import_middlewares = require("./middlewares");
 async function getServerAPIs(options, createDevMiddleware, {
   compiler: customCompiler,
@@ -76,7 +76,7 @@ async function getServerAPIs(options, createDevMiddleware, {
         routes: params.routes || defaultRoutes
       });
     },
-    getMiddlewares: async (overrides = {}) => await (0, import_devMiddlewares.getMiddlewares)({
+    getMiddlewares: async (overrides = {}) => await (0, import_getDevMiddlewares.getMiddlewares)({
       pwd: options.context.rootPath,
       devMiddleware,
       dev: {

package/dist/server/{devMiddlewares.d.ts → getDevMiddlewares.d.ts}

@@ -1,4 +1,4 @@
-import { RequestHandler, RsbuildDevMiddlewareOptions, UpgradeEvent } from '@rsbuild/shared';
+import type { UpgradeEvent, RequestHandler, RsbuildDevMiddlewareOptions } from '@rsbuild/shared';
 export declare const getMiddlewares: (options: RsbuildDevMiddlewareOptions) => Promise<{
   close: () => Promise<void>;
   onUpgrade: UpgradeEvent;

package/dist/server/{devMiddlewares.js → getDevMiddlewares.js}

@@ -26,13 +26,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var devMiddlewares_exports = {};
-__export(devMiddlewares_exports, {
+var getDevMiddlewares_exports = {};
+__export(getDevMiddlewares_exports, {
   getMiddlewares: () => getMiddlewares
 });
-module.exports = __toCommonJS(devMiddlewares_exports);
+module.exports = __toCommonJS(getDevMiddlewares_exports);
 var import_url = __toESM(require("url"));
-var import_compiler_dev_middleware = __toESM(require("./compiler-dev-middleware"));
+var import_compilerDevMiddleware = require("./compilerDevMiddleware");
 var import_middlewares = require("./middlewares");
 var import_path = require("path");
 const applySetupMiddlewares = (dev, devMiddleware) => {
@@ -132,7 +132,7 @@ const applyDefaultMiddlewares = async ({
 };
 const getMiddlewares = async (options) => {
   const middlewares = [];
-  const devMiddleware = new import_compiler_dev_middleware.default({
+  const devMiddleware = new import_compilerDevMiddleware.CompilerDevMiddleware({
     dev: options.dev,
     publicPaths: options.output.publicPaths,
     devMiddleware: options.devMiddleware

package/dist/server/httpServer.js

@@ -32,15 +32,12 @@ __export(httpServer_exports, {
 });
 module.exports = __toCommonJS(httpServer_exports);
 const createHttpServer = async (options) => {
-  let app;
   if (options.https) {
-    const { createServer } = await Promise.resolve().then(() => __toESM(require("https")));
-    app = createServer(options.https, options.middlewares);
-  } else {
-    const { createServer } = await Promise.resolve().then(() => __toESM(require("http")));
-    app = createServer(options.middlewares);
+    const { createServer: createServer2 } = await Promise.resolve().then(() => __toESM(require("https")));
+    return createServer2(options.https, options.middlewares);
   }
-  return app;
+  const { createServer } = await Promise.resolve().then(() => __toESM(require("http")));
+  return createServer(options.middlewares);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/{compiler-dev-middleware/socketServer.d.ts → socketServer.d.ts}

@@ -2,9 +2,9 @@
 /// <reference types="node" />
 import type { IncomingMessage } from 'http';
 import type { Socket } from 'net';
-import ws from '../../../compiled/ws';
+import ws from '../../compiled/ws';
 import { type Stats, type RsbuildDevMiddlewareOptions } from '@rsbuild/shared';
-export default class SocketServer {
+export declare class SocketServer {
   private wsServer;
   private readonly sockets;
   private readonly options;

package/dist/server/{compiler-dev-middleware/socketServer.js → socketServer.js}

@@ -28,10 +28,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var socketServer_exports = {};
 __export(socketServer_exports, {
-  default: () => SocketServer
+  SocketServer: () => SocketServer
 });
 module.exports = __toCommonJS(socketServer_exports);
-var import_ws = __toESM(require("../../../compiled/ws"));
+var import_ws = __toESM(require("../../compiled/ws"));
 var import_shared = require("@rsbuild/shared");
 class SocketServer {
   constructor(options) {
@@ -146,11 +146,11 @@ class SocketServer {
     this.sockWrite("hash", stats.hash);
     if (stats.errors && stats.errors.length > 0) {
       return this.sockWrite("errors", stats.errors);
-    } else if (stats.warnings && stats.warnings.length > 0) {
+    }
+    if (stats.warnings && stats.warnings.length > 0) {
       return this.sockWrite("warnings", stats.warnings);
-    } else {
-      return this.sockWrite("ok");
     }
+    return this.sockWrite("ok");
   }
   // send message to connecting socket
   send(connection, message) {
@@ -160,3 +160,7 @@ class SocketServer {
     connection.send(message);
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SocketServer
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -56,11 +56,11 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rspack/core": "0.4.2",
+    "@rspack/core": "0.4.3",
     "core-js": "~3.32.2",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.5.7",
     "postcss": "8.4.31",
-    "@rsbuild/shared": "0.2.2"
+    "@rsbuild/shared": "0.2.3"
   },
   "devDependencies": {
     "@types/node": "16.x",