@rsbuild/core 0.5.7 → 0.5.9

package/dist/cli/commands.js

@@ -39,7 +39,7 @@ 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.5.7");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.5.9");
   const devCommand = import_commander.program.command("dev");
   const buildCommand = import_commander.program.command("build");
   const previewCommand = import_commander.program.command("preview");

package/dist/cli/prepare.js

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

package/dist/index.d.ts

@@ -11,4 +11,4 @@ export { mergeRsbuildConfig } from './mergeConfig';
 export { PLUGIN_SWC_NAME, PLUGIN_CSS_NAME, PLUGIN_SASS_NAME, PLUGIN_LESS_NAME, PLUGIN_STYLUS_NAME, } from './constants';
 export type { Rspack } from './provider';
 export type { RsbuildConfig, DevConfig, HtmlConfig, ToolsConfig, SourceConfig, ServerConfig, OutputConfig, SecurityConfig, PerformanceConfig, ModuleFederationConfig, NormalizedConfig, NormalizedDevConfig, NormalizedHtmlConfig, NormalizedToolsConfig, NormalizedSourceConfig, NormalizedServerConfig, NormalizedOutputConfig, NormalizedSecurityConfig, NormalizedPerformanceConfig, NormalizedModuleFederationConfig, RsbuildPlugin, RsbuildPlugins, RsbuildPluginAPI, } from './types';
-export type { RsbuildMode, RsbuildEntry, RsbuildTarget, RsbuildContext, RsbuildInstance, CreateRsbuildOptions, InspectConfigOptions, OnExitFn, OnAfterBuildFn, OnAfterCreateCompilerFn, OnAfterStartDevServerFn, OnAfterStartProdServerFn, OnBeforeBuildFn, OnBeforeStartDevServerFn, OnBeforeStartProdServerFn, OnBeforeCreateCompilerFn, OnCloseDevServerFn, OnDevCompileDoneFn, ModifyRsbuildConfigFn, } from '@rsbuild/shared';
+export type { RsbuildMode, RsbuildEntry, RsbuildTarget, RsbuildContext, RsbuildInstance, CreateRsbuildOptions, InspectConfigOptions, OnExitFn, OnAfterBuildFn, OnAfterCreateCompilerFn, OnAfterStartDevServerFn, OnAfterStartProdServerFn, OnBeforeBuildFn, OnBeforeStartDevServerFn, OnBeforeStartProdServerFn, OnBeforeCreateCompilerFn, OnCloseDevServerFn, OnDevCompileDoneFn, ModifyBundlerChainFn, ModifyRspackConfigFn, ModifyRsbuildConfigFn, TransformFn, TransformHandler, } from '@rsbuild/shared';

package/dist/index.js

@@ -38,7 +38,7 @@ var import_config = require("./config");
 var import_shared = require("@rsbuild/shared");
 var import_mergeConfig = require("./mergeConfig");
 var import_constants = require("./constants");
-const version = "0.5.7";
+const version = "0.5.9";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,

package/dist/plugins/networkPerformance.js

@@ -31,27 +31,26 @@ __export(networkPerformance_exports, {
   pluginNetworkPerformance: () => pluginNetworkPerformance
 });
 module.exports = __toCommonJS(networkPerformance_exports);
+var import_shared = require("@rsbuild/shared");
 const pluginNetworkPerformance = () => ({
   name: "rsbuild:network-performance",
   setup(api) {
-    api.modifyBundlerChain(
-      async (chain, { CHAIN_ID, isServer, isWebWorker, isServiceWorker }) => {
-        const config = api.getNormalizedConfig();
-        const {
-          performance: { dnsPrefetch, preconnect }
-        } = config;
-        if (isServer || isWebWorker || isServiceWorker) {
-          return;
-        }
-        const { HtmlNetworkPerformancePlugin } = await Promise.resolve().then(() => __toESM(require("../rspack/HtmlNetworkPerformancePlugin")));
-        if (dnsPrefetch) {
-          chain.plugin(CHAIN_ID.PLUGIN.HTML_DNS_PREFETCH).use(HtmlNetworkPerformancePlugin, [dnsPrefetch, "dnsPrefetch"]);
-        }
-        if (preconnect) {
-          chain.plugin(CHAIN_ID.PLUGIN.HTML_PRECONNECT).use(HtmlNetworkPerformancePlugin, [preconnect, "preconnect"]);
-        }
+    api.modifyBundlerChain(async (chain, { CHAIN_ID, target }) => {
+      const config = api.getNormalizedConfig();
+      const {
+        performance: { dnsPrefetch, preconnect }
+      } = config;
+      if ((0, import_shared.isHtmlDisabled)(config, target)) {
+        return;
       }
-    );
+      const { HtmlNetworkPerformancePlugin } = await Promise.resolve().then(() => __toESM(require("../rspack/HtmlNetworkPerformancePlugin")));
+      if (dnsPrefetch) {
+        chain.plugin(CHAIN_ID.PLUGIN.HTML_DNS_PREFETCH).use(HtmlNetworkPerformancePlugin, [dnsPrefetch, "dnsPrefetch"]);
+      }
+      if (preconnect) {
+        chain.plugin(CHAIN_ID.PLUGIN.HTML_PRECONNECT).use(HtmlNetworkPerformancePlugin, [preconnect, "preconnect"]);
+      }
+    });
   }
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/provider/createContext.js

@@ -44,7 +44,7 @@ async function createContextByConfig(options, bundlerType, config = {}) {
   const context = {
     entry: (0, import_entry.getEntryObject)(config, "web"),
     targets: config.output?.targets || [],
-    version: "0.5.7",
+    version: "0.5.9",
     rootPath,
     distPath,
     cachePath,

package/dist/rspack/transformLoader.js

@@ -37,7 +37,8 @@ async function transform(source, map) {
     resource: this.resource,
     resourcePath: this.resourcePath,
     resourceQuery: this.resourceQuery,
-    addDependency: this.addDependency
+    addDependency: this.addDependency,
+    emitFile: this.emitFile
   });
   if (result === null || result === void 0) {
     return bypass();

package/dist/server/compilerDevMiddleware.d.ts

@@ -2,10 +2,11 @@
 /// <reference types="node" />
 import type { IncomingMessage } from 'node:http';
 import type { Socket } from 'node:net';
-import type { DevMiddlewaresConfig, DevMiddlewareAPI, DevMiddleware as CustomDevMiddleware } from '@rsbuild/shared';
+import type { DevMiddlewareAPI, ServerConfig, DevConfig, DevMiddleware as CustomDevMiddleware } from '@rsbuild/shared';
 type Options = {
     publicPaths: string[];
-    dev: DevMiddlewaresConfig;
+    dev: DevConfig;
+    server: ServerConfig;
     devMiddleware: CustomDevMiddleware;
 };
 /**
@@ -16,10 +17,11 @@ type Options = {
 export declare class CompilerDevMiddleware {
     middleware: DevMiddlewareAPI;
     private devOptions;
+    private serverOptions;
     private devMiddleware;
     private publicPaths;
     private socketServer;
-    constructor({ dev, devMiddleware, publicPaths }: Options);
+    constructor({ dev, server, devMiddleware, publicPaths }: Options);
     init(): void;
     upgrade(req: IncomingMessage, sock: Socket, head: any): void;
     close(): void;

package/dist/server/compilerDevMiddleware.js

@@ -47,13 +47,15 @@ function getHMRClientPath(client = {}) {
   return clientEntry;
 }
 class CompilerDevMiddleware {
-  constructor({ dev, devMiddleware, publicPaths }) {
+  constructor({ dev, server, devMiddleware, publicPaths }) {
     __publicField(this, "middleware");
     __publicField(this, "devOptions");
+    __publicField(this, "serverOptions");
     __publicField(this, "devMiddleware");
     __publicField(this, "publicPaths");
     __publicField(this, "socketServer");
     this.devOptions = dev;
+    this.serverOptions = server;
     this.publicPaths = publicPaths;
     this.socketServer = new import_socketServer.SocketServer(dev);
     this.devMiddleware = devMiddleware;
@@ -76,7 +78,7 @@ class CompilerDevMiddleware {
     this.socketServer.sockWrite(type, data);
   }
   setupDevMiddleware(devMiddleware, publicPaths) {
-    const { devOptions } = this;
+    const { devOptions, serverOptions } = this;
     const callbacks = {
       onInvalid: () => {
         this.socketServer.sockWrite("invalid");
@@ -87,7 +89,7 @@ class CompilerDevMiddleware {
     };
     const injectClient = this.devOptions.hmr || this.devOptions.liveReload;
     const middleware = devMiddleware({
-      headers: devOptions.headers,
+      headers: serverOptions.headers,
       publicPath: "/",
       stats: false,
       callbacks,

package/dist/server/devServer.js

@@ -48,7 +48,7 @@ async function createDevServer(options, createDevMiddleware, {
   }
   (0, import_shared.debug)("create dev server");
   const rsbuildConfig = options.context.config;
-  const { devServerConfig, port, host, https } = await (0, import_helper.getDevOptions)({
+  const { devConfig, serverConfig, port, host, https } = await (0, import_helper.getDevOptions)({
     rsbuildConfig,
     getPortSilently
   });
@@ -70,7 +70,8 @@ async function createDevServer(options, createDevMiddleware, {
     const { CompilerDevMiddleware } = await Promise.resolve().then(() => __toESM(require("./compilerDevMiddleware")));
     const publicPaths = (0, import_shared.isMultiCompiler)(compiler) ? compiler.compilers.map(import_shared.getPublicPathFromCompiler) : [(0, import_shared.getPublicPathFromCompiler)(compiler)];
     const compilerDevMiddleware = new CompilerDevMiddleware({
-      dev: devServerConfig,
+      dev: devConfig,
+      server: serverConfig,
       publicPaths,
       devMiddleware
     });
@@ -92,7 +93,7 @@ async function createDevServer(options, createDevMiddleware, {
         port,
         routes,
         protocol,
-        printUrls: devServerConfig.printUrls
+        printUrls: serverConfig.printUrls
       });
     });
   } else {
@@ -101,14 +102,15 @@ async function createDevServer(options, createDevMiddleware, {
       port,
       routes,
       protocol,
-      printUrls: devServerConfig.printUrls
+      printUrls: serverConfig.printUrls
     });
   }
   const compileMiddlewareAPI = runCompile ? await startCompile() : void 0;
   const devMiddlewares = await (0, import_getDevMiddlewares.getMiddlewares)({
     pwd: options.context.rootPath,
     compileMiddlewareAPI,
-    dev: devServerConfig,
+    dev: devConfig,
+    server: serverConfig,
     output: {
       distPath: rsbuildConfig.output?.distPath?.root || import_shared.ROOT_DIST_DIR
     }
@@ -126,7 +128,7 @@ async function createDevServer(options, createDevMiddleware, {
     middlewares,
     listen: async () => {
       const httpServer = await (0, import_httpServer.createHttpServer)({
-        https: devServerConfig.https,
+        https: serverConfig.https,
         middlewares
       });
       (0, import_shared.debug)("listen dev server");

package/dist/server/getDevMiddlewares.d.ts

@@ -1,7 +1,8 @@
-import type { Middlewares, UpgradeEvent, DevMiddlewaresConfig, CompileMiddlewareAPI } from '@rsbuild/shared';
+import type { Middlewares, UpgradeEvent, ServerConfig, CompileMiddlewareAPI, DevConfig } from '@rsbuild/shared';
 export type RsbuildDevMiddlewareOptions = {
     pwd: string;
-    dev: DevMiddlewaresConfig;
+    dev: DevConfig;
+    server: ServerConfig;
     compileMiddlewareAPI?: CompileMiddlewareAPI;
     output: {
         distPath: string;

package/dist/server/getDevMiddlewares.js

@@ -55,13 +55,13 @@ const applySetupMiddlewares = (dev, compileMiddlewareAPI) => {
 };
 const applyDefaultMiddlewares = async ({
   middlewares,
-  dev,
+  server,
   compileMiddlewareAPI,
   output,
   pwd
 }) => {
   const upgradeEvents = [];
-  if (dev.compress) {
+  if (server.compress) {
     const { default: compression } = await Promise.resolve().then(() => __toESM(require("../../compiled/http-compression")));
     middlewares.push((req, res, next) => {
       compression({
@@ -76,7 +76,7 @@ const applyDefaultMiddlewares = async ({
     if (path?.includes("hot-update")) {
       res.setHeader("Access-Control-Allow-Credentials", "false");
     }
-    const confHeaders = dev.headers;
+    const confHeaders = server.headers;
     if (confHeaders) {
       for (const [key, value] of Object.entries(confHeaders)) {
         res.setHeader(key, value);
@@ -84,10 +84,10 @@ const applyDefaultMiddlewares = async ({
     }
     next();
   });
-  if (dev.proxy) {
+  if (server.proxy) {
     const { createProxyMiddleware } = await Promise.resolve().then(() => __toESM(require("./proxy")));
     const { middlewares: proxyMiddlewares, upgrade } = createProxyMiddleware(
-      dev.proxy
+      server.proxy
     );
     upgradeEvents.push(upgrade);
     for (const middleware of proxyMiddlewares) {
@@ -110,9 +110,9 @@ const applyDefaultMiddlewares = async ({
       }
     });
   }
-  if (dev.publicDir !== false && dev.publicDir?.name) {
+  if (server.publicDir !== false && server.publicDir?.name) {
     const { default: sirv } = await Promise.resolve().then(() => __toESM(require("../../compiled/sirv")));
-    const { name } = dev.publicDir;
+    const { name } = server.publicDir;
     const publicDir = (0, import_node_path.isAbsolute)(name) ? name : (0, import_node_path.join)(pwd, name);
     const assetMiddleware = sirv(publicDir, {
       etag: true,
@@ -125,13 +125,13 @@ const applyDefaultMiddlewares = async ({
     (0, import_middlewares.getHtmlFallbackMiddleware)({
       distPath: (0, import_node_path.isAbsolute)(distPath) ? distPath : (0, import_node_path.join)(pwd, distPath),
       callback: compileMiddlewareAPI.middleware,
-      htmlFallback: dev.htmlFallback
+      htmlFallback: server.htmlFallback
     })
   );
-  if (dev.historyApiFallback) {
+  if (server.historyApiFallback) {
     const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("../../compiled/connect-history-api-fallback")));
     const historyApiFallbackMiddleware = connectHistoryApiFallback(
-      dev.historyApiFallback === true ? {} : dev.historyApiFallback
+      server.historyApiFallback === true ? {} : server.historyApiFallback
     );
     middlewares.push(historyApiFallbackMiddleware);
     compileMiddlewareAPI?.middleware && middlewares.push(compileMiddlewareAPI.middleware);
@@ -159,6 +159,7 @@ const getMiddlewares = async (options) => {
   const { onUpgrade } = await applyDefaultMiddlewares({
     middlewares,
     dev: options.dev,
+    server: options.server,
     compileMiddlewareAPI,
     output: options.output,
     pwd: options.pwd

package/dist/server/helper.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Routes, DevConfig, PrintUrls, RsbuildEntry, RsbuildConfig, OutputStructure } from '@rsbuild/shared';
 export declare const formatRoutes: (entry: RsbuildEntry, prefix: string | undefined, outputStructure: OutputStructure | undefined) => Routes;
 export declare function printServerURLs({ urls: originalUrls, port, routes, protocol, printUrls, }: {
@@ -46,37 +45,8 @@ export declare const getDevOptions: ({ rsbuildConfig, getPortSilently, }: {
     rsbuildConfig: RsbuildConfig;
     getPortSilently?: boolean | undefined;
 }) => Promise<{
-    devServerConfig: {
-        hmr?: boolean | undefined;
-        liveReload?: boolean | undefined;
-        startUrl?: string | boolean | string[] | undefined;
-        beforeStartUrl?: import("@rsbuild/shared").ArrayOrNot<() => void | Promise<void>> | undefined;
-        assetPrefix?: string | boolean | undefined;
-        progressBar?: boolean | import("@rsbuild/shared").ProgressBarConfig | undefined;
-        client?: {
-            path?: string | undefined;
-            port?: string | undefined;
-            host?: string | undefined;
-            protocol?: "ws" | "wss" | undefined;
-            overlay?: boolean | undefined;
-        } | undefined;
-        setupMiddlewares?: ((middlewares: {
-            unshift: (...handlers: import("@rsbuild/shared").RequestHandler[]) => void;
-            push: (...handlers: import("@rsbuild/shared").RequestHandler[]) => void;
-        }, server: import("@rsbuild/shared").ServerAPIs) => void)[] | undefined;
-        writeToDisk?: boolean | ((filename: string) => boolean) | undefined;
-        compress?: boolean | undefined;
-        publicDir?: import("@rsbuild/shared").PublicDir | undefined;
-        port?: number | undefined;
-        https?: import("https").ServerOptions | undefined;
-        host?: string | undefined;
-        headers?: Record<string, string | string[]> | undefined;
-        htmlFallback?: import("@rsbuild/shared").HtmlFallback | undefined;
-        historyApiFallback?: boolean | import("@rsbuild/shared").HistoryApiFallbackOptions | undefined;
-        proxy?: import("@rsbuild/shared").ProxyOptions | undefined;
-        strictPort?: boolean | undefined;
-        printUrls?: PrintUrls | undefined;
-    };
+    devConfig: DevConfig;
+    serverConfig: import("@rsbuild/shared").ServerConfig;
     port: number;
     host: string;
     https: boolean;

package/dist/server/helper.js

@@ -215,10 +215,8 @@ const getDevOptions = async ({
   });
   const devConfig = mergeDevOptions({ rsbuildConfig, port });
   return {
-    devServerConfig: {
-      ...serverConfig,
-      ...devConfig
-    },
+    devConfig,
+    serverConfig,
     port,
     host,
     https

package/dist/server/socketServer.d.ts

@@ -3,14 +3,14 @@
 import type { IncomingMessage } from 'node:http';
 import type { Socket } from 'node:net';
 import ws from '../../compiled/ws';
-import { type Stats, type DevMiddlewaresConfig } from '@rsbuild/shared';
+import { type Stats, type DevConfig } from '@rsbuild/shared';
 export declare class SocketServer {
     private wsServer;
     private readonly sockets;
     private readonly options;
     private stats?;
     private timer;
-    constructor(options: DevMiddlewaresConfig);
+    constructor(options: DevConfig);
     upgrade(req: IncomingMessage, sock: Socket, head: any): void;
     prepare(): void;
     updateStats(stats: Stats): void;

package/package.json

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