@rsbuild/core 0.0.20 → 0.0.22

package/dist/plugins/fileSize.js

@@ -33,19 +33,18 @@ __export(fileSize_exports, {
 });
 module.exports = __toCommonJS(fileSize_exports);
 var import_path = __toESM(require("path"));
-var import_fs_extra = require("@rsbuild/shared/fs-extra");
 var import_shared = require("@rsbuild/shared");
-var import_filesize = __toESM(require("filesize"));
+var import_shared2 = require("@rsbuild/shared");
 var import_gzip_size = __toESM(require("gzip-size"));
 const filterAsset = (asset) => !/\.map$/.test(asset) && !/\.LICENSE\.txt$/.test(asset);
 const getAssetColor = (size) => {
   if (size > 300 * 1e3) {
-    return import_shared.color.red;
+    return import_shared2.color.red;
   }
   if (size > 100 * 1e3) {
-    return import_shared.color.yellow;
+    return import_shared2.color.yellow;
   }
-  return import_shared.color.green;
+  return import_shared2.color.green;
 };
 async function printHeader(longestFileLength, longestLabelLength) {
   const longestLengths = [longestFileLength, longestLabelLength];
@@ -57,11 +56,15 @@ async function printHeader(longestFileLength, longestLabelLength) {
     }
     return `${prev + curLabel}    `;
   }, "  ");
-  import_shared.logger.log(import_shared.color.bold(import_shared.color.blue(headerRow)));
+  import_shared2.logger.log(import_shared2.color.bold(import_shared2.color.blue(headerRow)));
 }
+const calcFileSize = (len) => {
+  const val = len / 1e3;
+  return `${val.toFixed(val < 1 ? 2 : 1)} kB`;
+};
 async function printFileSizes(stats, distPath) {
   const formatAsset = (asset) => {
-    const contents = import_fs_extra.fs.readFileSync(import_path.default.join(distPath, asset.name));
+    const contents = import_shared.fse.readFileSync(import_path.default.join(distPath, asset.name));
     const size = contents.length;
     const gzippedSize = import_gzip_size.default.sync(contents);
     return {
@@ -69,10 +72,8 @@ async function printFileSizes(stats, distPath) {
       folder: import_path.default.join(import_path.default.basename(distPath), import_path.default.dirname(asset.name)),
       name: import_path.default.basename(asset.name),
       gzippedSize,
-      sizeLabel: (0, import_filesize.default)(size, { round: 1 }),
-      gzipSizeLabel: getAssetColor(gzippedSize)(
-        (0, import_filesize.default)(gzippedSize, { round: 1 })
-      )
+      sizeLabel: calcFileSize(size),
+      gzipSizeLabel: getAssetColor(gzippedSize)(calcFileSize(gzippedSize))
     };
   };
   const multiStats = "stats" in stats ? stats.stats : [stats];
@@ -100,7 +101,7 @@ async function printFileSizes(stats, distPath) {
   const longestFileLength = Math.max(
     ...assets.map((a) => (a.folder + import_path.default.sep + a.name).length)
   );
-  import_shared.logger.info(`Production file sizes:
+  import_shared2.logger.info(`Production file sizes:
 `);
   printHeader(longestFileLength, longestLabelLength);
   let totalSize = 0;
@@ -116,21 +117,20 @@ async function printFileSizes(stats, distPath) {
       const rightPadding = " ".repeat(longestLabelLength - sizeLength);
       sizeLabel += rightPadding;
     }
-    let fileNameLabel = import_shared.color.dim(asset.folder + import_path.default.sep) + import_shared.color.cyan(asset.name);
+    let fileNameLabel = import_shared2.color.dim(asset.folder + import_path.default.sep) + import_shared2.color.cyan(asset.name);
     if (fileNameLength < longestFileLength) {
       const rightPadding = " ".repeat(longestFileLength - fileNameLength);
       fileNameLabel += rightPadding;
     }
-    import_shared.logger.log(`  ${fileNameLabel}    ${sizeLabel}    ${gzipSizeLabel}`);
+    import_shared2.logger.log(`  ${fileNameLabel}    ${sizeLabel}    ${gzipSizeLabel}`);
   });
-  const totalSizeLabel = `${import_shared.color.bold(import_shared.color.blue("Total size:"))}  ${(0, import_filesize.default)(
-    totalSize,
-    { round: 1 }
-  )}`;
-  const gzippedSizeLabel = `${import_shared.color.bold(
-    import_shared.color.blue("Gzipped size:")
-  )}  ${(0, import_filesize.default)(totalGzipSize, { round: 1 })}`;
-  import_shared.logger.log(`
+  const totalSizeLabel = `${import_shared2.color.bold(
+    import_shared2.color.blue("Total size:")
+  )}  ${calcFileSize(totalSize)}`;
+  const gzippedSizeLabel = `${import_shared2.color.bold(
+    import_shared2.color.blue("Gzipped size:")
+  )}  ${calcFileSize(totalGzipSize)}`;
+  import_shared2.logger.log(`
   ${totalSizeLabel}
   ${gzippedSizeLabel}
 `);
@@ -144,8 +144,8 @@ const pluginFileSize = () => ({
         try {
           await printFileSizes(stats, api.context.distPath);
         } catch (err) {
-          import_shared.logger.error("Failed to print file size.");
-          import_shared.logger.error(err);
+          import_shared2.logger.error("Failed to print file size.");
+          import_shared2.logger.error(err);
         }
       }
     });

package/dist/plugins/html.js

@@ -40,8 +40,6 @@ __export(html_exports, {
 module.exports = __toCommonJS(html_exports);
 var import_path = __toESM(require("path"));
 var import_shared = require("@rsbuild/shared");
-var import_fs_extra = require("@rsbuild/shared/fs-extra");
-var import_lodash = __toESM(require("lodash"));
 var import_HtmlBasicPlugin = require("../rspack-plugins/HtmlBasicPlugin");
 function getTitle(entryName, config) {
   return (0, import_shared.mergeChainedOptions)({
@@ -133,11 +131,13 @@ const applyInjectTags = (api) => {
   api.modifyBundlerChain(async (chain, { HtmlPlugin, CHAIN_ID }) => {
     const config = api.getNormalizedConfig();
     const tags = (0, import_shared.castArray)(config.html.tags).filter(Boolean);
-    const tagsByEntries = import_lodash.default.mapValues(
-      config.html.tagsByEntries,
-      (tags2) => (0, import_shared.castArray)(tags2).filter(Boolean)
+    const tagsByEntries = config.html.tagsByEntries || {};
+    Object.keys(tagsByEntries).forEach(
+      (key) => tagsByEntries[key] = (0, import_shared.castArray)(tagsByEntries[key]).filter(Boolean)
+    );
+    const shouldByEntries = Object.values(tagsByEntries).some(
+      (entry) => Array.isArray(entry) && entry.length > 0
     );
-    const shouldByEntries = import_lodash.default.some(tagsByEntries, "length");
     if (!tags.length && !shouldByEntries) {
       return;
     }
@@ -163,7 +163,6 @@ const applyInjectTags = (api) => {
 const pluginHtml = () => ({
   name: "plugin-html",
   setup(api) {
-    const routesInfo = [];
     api.modifyBundlerChain(
       async (chain, { HtmlPlugin, isProd, CHAIN_ID, target }) => {
         const config = api.getNormalizedConfig();
@@ -225,12 +224,6 @@ const pluginHtml = () => ({
                 entryValue
               }
             });
-            routesInfo.push({
-              urlPath: index === 0 ? "/" : `/${entryName}`,
-              entryName,
-              entryPath: filename,
-              isSPA: true
-            });
             chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).use(HtmlPlugin, [finalOptions]);
           })
         );
@@ -261,17 +254,6 @@ const pluginHtml = () => ({
         }
       }
     );
-    const emitRouteJson = async () => {
-      const routeFilePath = import_path.default.join(api.context.distPath, import_shared.ROUTE_SPEC_FILE);
-      if (!await (0, import_shared.isFileExists)(routeFilePath) && routesInfo.length) {
-        await import_fs_extra.fs.outputFile(
-          routeFilePath,
-          JSON.stringify({ routes: routesInfo }, null, 2)
-        );
-      }
-    };
-    api.onBeforeBuild(emitRouteJson);
-    api.onBeforeStartDevServer(emitRouteJson);
     applyInjectTags(api);
   }
 });

package/dist/plugins/index.js

@@ -46,7 +46,6 @@ const plugins = {
   inlineChunk: () => Promise.resolve().then(() => __toESM(require("./inlineChunk"))).then((m) => m.pluginInlineChunk()),
   bundleAnalyzer: () => Promise.resolve().then(() => __toESM(require("./bundleAnalyzer"))).then((m) => m.pluginBundleAnalyzer()),
   asset: () => Promise.resolve().then(() => __toESM(require("./asset"))).then((m) => m.pluginAsset()),
-  rem: () => Promise.resolve().then(() => __toESM(require("./rem"))).then((m) => m.pluginRem()),
   wasm: () => Promise.resolve().then(() => __toESM(require("./wasm"))).then((m) => m.pluginWasm()),
   moment: () => Promise.resolve().then(() => __toESM(require("./moment"))).then((m) => m.pluginMoment()),
   nodeAddons: () => Promise.resolve().then(() => __toESM(require("./nodeAddons"))).then((m) => m.pluginNodeAddons()),

package/dist/plugins/startUrl.js

@@ -80,7 +80,7 @@ async function openBrowser(url) {
     }
   }
   try {
-    const { default: open } = await Promise.resolve().then(() => __toESM(require("open")));
+    const { default: open } = await Promise.resolve().then(() => __toESM(require("../../compiled/open")));
     await open(url);
     return true;
   } catch (err) {
@@ -96,7 +96,7 @@ function pluginStartUrl() {
     name: "plugin-start-url",
     setup(api) {
       api.onAfterStartDevServer(async (params) => {
-        const { port } = params;
+        const { port, routes } = params;
         const config = api.getNormalizedConfig();
         const { startUrl, beforeStartUrl } = config.dev;
         const { open, https } = api.context.devServer || {};
@@ -106,8 +106,6 @@ function pluginStartUrl() {
         }
         const urls = [];
         if (startUrl === true || !startUrl) {
-          const { entry } = api.context;
-          const routes = (0, import_shared.formatRoutes)(entry);
           const protocol = https ? "https" : "http";
           urls.push(
             (0, import_shared.normalizeUrl)(`${protocol}://localhost:${port}/${routes[0].route}`)

package/dist/rspack-provider/core/createCompiler.d.ts

@@ -9,4 +9,4 @@ export declare function createCompiler({
   context: Context;
   rspackConfigs: RspackConfig[];
 }): Promise<import("@rspack/core").MultiCompiler>;
-export declare function startDevCompile(options: InitConfigsOptions, customCompiler?: RspackCompiler | RspackMultiCompiler): Promise<import("@rsbuild/shared").DevMiddleware>;
+export declare function createDevMiddleware(options: InitConfigsOptions, customCompiler?: RspackCompiler | RspackMultiCompiler): Promise<import("@rsbuild/shared").DevMiddleware>;

package/dist/rspack-provider/core/createCompiler.js

@@ -29,7 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var createCompiler_exports = {};
 __export(createCompiler_exports, {
   createCompiler: () => createCompiler,
-  startDevCompile: () => startDevCompile
+  createDevMiddleware: () => createDevMiddleware
 });
 module.exports = __toCommonJS(createCompiler_exports);
 var import_shared = require("@rsbuild/shared");
@@ -82,7 +82,7 @@ async function createCompiler({
   (0, import_shared.debug)("create compiler done");
   return compiler;
 }
-async function startDevCompile(options, customCompiler) {
+async function createDevMiddleware(options, customCompiler) {
   let compiler;
   if (customCompiler) {
     compiler = customCompiler;
@@ -98,5 +98,5 @@ async function startDevCompile(options, customCompiler) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createCompiler,
-  startDevCompile
+  createDevMiddleware
 });

package/dist/rspack-provider/core/initHooks.d.ts

@@ -1,5 +1,6 @@
 import { OnExitFn, OnAfterBuildFn, OnBeforeBuildFn, OnDevCompileDoneFn, ModifyRsbuildConfigFn, OnAfterStartDevServerFn, OnBeforeStartDevServerFn, OnAfterCreateCompilerFn, OnBeforeCreateCompilerFn, ModifyBundlerChainFn, type RspackConfig, type ModifyRspackConfigFn } from '@rsbuild/shared';
 import type { RsbuildConfig } from '../types';
+import type { Compiler, MultiCompiler } from '@rspack/core';
 export declare function initHooks(): {
   /** parameters are not bundler-related */
   onExitHook: import("@rsbuild/shared").AsyncHook<OnExitFn>;
@@ -11,7 +12,7 @@ export declare function initHooks(): {
   onBeforeBuildHook: import("@rsbuild/shared").AsyncHook<OnBeforeBuildFn<RspackConfig>>;
   modifyRspackConfigHook: import("@rsbuild/shared").AsyncHook<ModifyRspackConfigFn>;
   modifyRsbuildConfigHook: import("@rsbuild/shared").AsyncHook<ModifyRsbuildConfigFn<RsbuildConfig>>;
-  onAfterCreateCompilerHook: import("@rsbuild/shared").AsyncHook<OnAfterCreateCompilerFn<import("@rspack/core/dist/Compiler").Compiler | import("@rspack/core").MultiCompiler>>;
+  onAfterCreateCompilerHook: import("@rsbuild/shared").AsyncHook<OnAfterCreateCompilerFn<Compiler | MultiCompiler>>;
   onBeforeCreateCompilerHook: import("@rsbuild/shared").AsyncHook<OnBeforeCreateCompilerFn<RspackConfig>>;
   modifyBundlerChainHook: import("@rsbuild/shared").AsyncHook<ModifyBundlerChainFn>;
 };

package/dist/rspack-provider/plugins/css.js

@@ -90,11 +90,7 @@ async function applyBaseCSSRule({
     rule.use(CHAIN_ID.USE.CSS).loader((0, import_shared2.getCompiledPath)("css-loader")).options(cssLoaderOptions).end();
   } else {
     if (!isServer && !isWebWorker && enableCSSModuleTS) {
-      const { cssModules, disableCssModuleExtension } = config.output;
-      const cssModulesAuto = (0, import_shared.getCssModulesAutoRule)(
-        cssModules,
-        disableCssModuleExtension
-      );
+      const { cssModules } = config.output;
       rule.use(CHAIN_ID.USE.CSS_MODULES_TS).loader(
         import_path.default.resolve(
           __dirname,
@@ -103,7 +99,7 @@ async function applyBaseCSSRule({
       ).options({
         modules: {
           exportLocalsConvention: cssModules.exportLocalsConvention,
-          auto: cssModulesAuto
+          auto: cssModules.auto
         }
       }).end();
     }
@@ -129,10 +125,7 @@ const applyCSSModuleRule = (rules, ruleTest, config) => {
   if (ruleIndex === -1) {
     return;
   }
-  const cssModulesAuto = (0, import_shared.getCssModulesAutoRule)(
-    config.output.cssModules,
-    config.output.disableCssModuleExtension
-  );
+  const cssModulesAuto = config.output.cssModules.auto;
   if (!cssModulesAuto) {
     return;
   }

package/dist/rspack-provider/plugins/rspack-profile.js

@@ -35,18 +35,18 @@ module.exports = __toCommonJS(rspack_profile_exports);
 var import_path = __toESM(require("path"));
 var import_core = require("@rspack/core");
 var import_inspector = __toESM(require("inspector"));
-var import_fs_extra = require("@rsbuild/shared/fs-extra");
 var import_shared = require("@rsbuild/shared");
+var import_shared2 = require("@rsbuild/shared");
 const stopProfiler = (output, profileSession) => {
   if (!profileSession) {
     return;
   }
   profileSession.post("Profiler.stop", (error, param) => {
     if (error) {
-      import_shared.logger.error("Failed to generate JS CPU profile:", error);
+      import_shared2.logger.error("Failed to generate JS CPU profile:", error);
       return;
     }
-    import_fs_extra.fs.writeFileSync(output, JSON.stringify(param.profile));
+    import_shared.fse.writeFileSync(output, JSON.stringify(param.profile));
   });
 };
 const pluginRspackProfile = () => ({
@@ -70,7 +70,7 @@ const pluginRspackProfile = () => ({
     const cpuProfilePath = import_path.default.join(profileDir, "jscpuprofile.json");
     const loggingFilePath = import_path.default.join(profileDir, "logging.json");
     const onStart = () => {
-      import_fs_extra.fs.ensureDirSync(profileDir);
+      import_shared.fse.ensureDirSync(profileDir);
       if (enableProfileTrace) {
         (0, import_core.experimental_registerGlobalTrace)("trace", "chrome", traceFilePath);
       }
@@ -90,13 +90,13 @@ const pluginRspackProfile = () => ({
           logging: "verbose",
           loggingTrace: true
         });
-        import_fs_extra.fs.writeFileSync(loggingFilePath, JSON.stringify(logging));
+        import_shared.fse.writeFileSync(loggingFilePath, JSON.stringify(logging));
       }
     });
     api.onExit(() => {
       enableProfileTrace && (0, import_core.experimental_cleanupGlobalTrace)();
       stopProfiler(cpuProfilePath, profileSession);
-      import_shared.logger.info(`Saved Rspack profile file to ${profileDir}`);
+      import_shared2.logger.info(`Saved Rspack profile file to ${profileDir}`);
     });
   }
 });

package/dist/rspack-provider/plugins/swc.js

@@ -33,7 +33,6 @@ __export(swc_exports, {
 });
 module.exports = __toCommonJS(swc_exports);
 var import_shared = require("@rsbuild/shared");
-var import_lodash = require("lodash");
 var path = __toESM(require("path"));
 const builtinSwcLoaderName = "builtin:swc-loader";
 async function getDefaultSwcConfig(config, rootPath, target) {
@@ -72,7 +71,7 @@ const pluginSwc = () => ({
           isServer,
           isServiceWorker
         });
-        const rule = chain.module.rule(CHAIN_ID.RULE.JS).test((0, import_shared.mergeRegex)(import_shared.JS_REGEX, import_shared.TS_REGEX)).type("javascript/auto");
+        const rule = chain.module.rule(CHAIN_ID.RULE.JS).test(import_shared.SCRIPT_REGEX).type("javascript/auto");
         (0, import_shared.applyScriptCondition)({
           rule,
           config,
@@ -99,7 +98,7 @@ const pluginSwc = () => ({
         rule.use(CHAIN_ID.USE.SWC).loader(builtinSwcLoaderName).options(swcConfig);
         chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).mimetype({
           or: ["text/javascript", "application/javascript"]
-        }).use(CHAIN_ID.USE.SWC).loader(builtinSwcLoaderName).options((0, import_lodash.cloneDeep)(swcConfig));
+        }).use(CHAIN_ID.USE.SWC).loader(builtinSwcLoaderName).options((0, import_shared.cloneDeep)(swcConfig));
       }
     );
     api.modifyRspackConfig(async (config) => {

package/dist/rspack-provider/provider.js

@@ -73,15 +73,15 @@ function rspackProvider({
         });
       },
       async startDevServer(options) {
-        const { startDevCompile } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
+        const { createDevMiddleware } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
         return (0, import_server.startDevServer)(
           { context, pluginStore, rsbuildOptions },
-          startDevCompile,
+          createDevMiddleware,
           options
         );
       },
-      async preview() {
-        return (0, import_server.startProdServer)(context, context.config);
+      async preview(options) {
+        return (0, import_server.startProdServer)(context, context.config, options);
       },
       async build(options) {
         const { build: buildImpl, rspackBuild } = await Promise.resolve().then(() => __toESM(require("./core/build")));

package/dist/rspack-provider/rspackLoader/css-modules-typescript-pre-loader/postcss-icss-extract-plugin.d.ts

@@ -1,4 +1,4 @@
-import type { CssModuleLocalsConvention } from '@rsbuild/shared';
+import { type CssModuleLocalsConvention } from '@rsbuild/shared';
 import type { AcceptedPlugin as PostCSSPlugin } from 'postcss';
 export type PostcssParsePluginOptions = {
   exportLocalsConvention: CssModuleLocalsConvention;

package/dist/rspack-provider/rspackLoader/css-modules-typescript-pre-loader/postcss-icss-extract-plugin.js

@@ -22,16 +22,16 @@ __export(postcss_icss_extract_plugin_exports, {
 });
 module.exports = __toCommonJS(postcss_icss_extract_plugin_exports);
 var import_icss_utils = require("@rsbuild/shared/icss-utils");
-var import_lodash = require("lodash");
+var import_shared = require("@rsbuild/shared");
 const dashesCamelCase = (str) => str.replace(/-+(\w)/g, (_match, firstLetter) => firstLetter.toUpperCase());
 const getExportLocalsConvention = (name, exportLocalsConventionType) => {
   switch (exportLocalsConventionType) {
     case "camelCase": {
-      const camelName = (0, import_lodash.camelCase)(name);
-      return camelName === name ? [name] : [name, (0, import_lodash.camelCase)(name)];
+      const camelName = (0, import_shared.camelCase)(name);
+      return camelName === name ? [name] : [name, (0, import_shared.camelCase)(name)];
     }
     case "camelCaseOnly": {
-      return [(0, import_lodash.camelCase)(name)];
+      return [(0, import_shared.camelCase)(name)];
     }
     case "dashes": {
       const dashesCamelName = dashesCamelCase(name);

package/dist/rspack-provider/shared/fs.js

@@ -23,10 +23,10 @@ __export(fs_exports, {
 module.exports = __toCommonJS(fs_exports);
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
-var import_fs_extra = require("@rsbuild/shared/fs-extra");
+var import_shared2 = require("@rsbuild/shared");
 const getCompiledPath = (packageName) => {
   const providerCompilerPath = (0, import_path.join)(__dirname, "../../compiled", packageName);
-  if (import_fs_extra.fs.existsSync(providerCompilerPath)) {
+  if (import_shared2.fse.existsSync(providerCompilerPath)) {
     return providerCompilerPath;
   } else {
     return (0, import_shared.getSharedPkgCompiledPath)(packageName);

package/dist/rspack-provider/shared/plugin.js

@@ -54,7 +54,6 @@ const applyDefaultPlugins = (plugins) => (0, import_shared.awaitableGetter)([
   Promise.resolve().then(() => __toESM(require("../plugins/less"))).then((m) => m.pluginLess()),
   Promise.resolve().then(() => __toESM(require("../plugins/sass"))).then((m) => m.pluginSass()),
   Promise.resolve().then(() => __toESM(require("../plugins/minimize"))).then((m) => m.pluginMinimize()),
-  plugins.rem(),
   Promise.resolve().then(() => __toESM(require("../plugins/hmr"))).then((m) => m.pluginHMR()),
   Promise.resolve().then(() => __toESM(require("../plugins/progress"))).then((m) => m.pluginProgress()),
   Promise.resolve().then(() => __toESM(require("../plugins/swc"))).then((m) => m.pluginSwc()),
@@ -68,9 +67,7 @@ const applyDefaultPlugins = (plugins) => (0, import_shared.awaitableGetter)([
   plugins.networkPerformance(),
   plugins.preloadOrPrefetch(),
   plugins.performance(),
-  Promise.resolve().then(() => __toESM(require("../plugins/rspack-profile"))).then((m) => m.pluginRspackProfile()),
-  Promise.resolve().then(() => __toESM(require("../plugins/fallback"))).then((m) => m.pluginFallback())
-  // fallback should be the last plugin
+  Promise.resolve().then(() => __toESM(require("../plugins/rspack-profile"))).then((m) => m.pluginRspackProfile())
 ]);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/dev-middleware/index.d.ts

@@ -10,6 +10,7 @@ type Options = {
 export default class DevMiddleware extends EventEmitter {
   middleware?: DevMiddlewareAPI;
   private devOptions;
+  private devMiddleware?;
   private socketServer;
   constructor({
     dev,

package/dist/server/dev-middleware/index.js

@@ -40,7 +40,7 @@ function getHMRClientPath(client) {
   const host = (client == null ? void 0 : client.host) ? `&host=${client.host}` : "";
   const path = (client == null ? void 0 : client.path) ? `&path=${client.path}` : "";
   const port = (client == null ? void 0 : client.port) ? `&port=${client.port}` : "";
-  const clientEntry = `${require.resolve("@rsbuild/core/hmr-client")}?${host}${path}${port}${protocol}`;
+  const clientEntry = `${require.resolve("@rsbuild/core/client/hmr")}?${host}${path}${port}${protocol}`;
   return clientEntry;
 }
 class DevMiddleware extends import_events.EventEmitter {
@@ -48,11 +48,12 @@ class DevMiddleware extends import_events.EventEmitter {
     super();
     this.devOptions = dev;
     this.socketServer = new import_socketServer.default(dev);
-    if (devMiddleware) {
-      this.middleware = this.setupDevMiddleware(devMiddleware);
-    }
+    this.devMiddleware = devMiddleware;
   }
   init(app) {
+    if (this.devMiddleware) {
+      this.middleware = this.setupDevMiddleware(this.devMiddleware);
+    }
     app.on("listening", () => {
       this.socketServer.prepare(app);
     });

package/dist/server/devServer.d.ts

@@ -4,7 +4,7 @@
 import { Server } from 'http';
 import type { ListenOptions } from 'net';
 import { RsbuildDevServerOptions, CreateDevServerOptions, DevServerContext, StartDevServerOptions, StartServerResult } from '@rsbuild/shared';
-import connect from 'connect';
+import connect from '@rsbuild/shared/connect';
 export declare class RsbuildDevServer {
   private readonly dev;
   private readonly devMiddleware;
@@ -22,7 +22,7 @@ export declare class RsbuildDevServer {
 }
 export declare function startDevServer<Options extends {
   context: DevServerContext;
-}>(options: Options, startDevCompile: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevServerOptions['devMiddleware']>, {
+}>(options: Options, createDevMiddleware: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevServerOptions['devMiddleware']>, {
   open,
   compiler,
   printURLs,

package/dist/server/devServer.js

@@ -37,10 +37,11 @@ var import_https = require("https");
 var import_url = __toESM(require("url"));
 var import_shared = require("@rsbuild/shared");
 var import_dev_middleware = __toESM(require("./dev-middleware"));
-var import_connect = __toESM(require("connect"));
+var import_connect = __toESM(require("@rsbuild/shared/connect"));
 var import_proxy = require("./proxy");
 var import_middlewares = require("./middlewares");
 var import_path = require("path");
+var import_restart = require("./restart");
 class RsbuildDevServer {
   constructor(options) {
     this.middlewares = (0, import_connect.default)();
@@ -120,9 +121,8 @@ class RsbuildDevServer {
       })
     );
     if (dev.historyApiFallback) {
-      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
+      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("../../compiled/connect-history-api-fallback")));
       const historyApiFallbackMiddleware = connectHistoryApiFallback(
-        // @ts-expect-error
         typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
       );
       this.middlewares.use(historyApiFallbackMiddleware);
@@ -156,7 +156,7 @@ class RsbuildDevServer {
     this.app.close();
   }
 }
-async function startDevServer(options, startDevCompile, {
+async function startDevServer(options, createDevMiddleware, {
   open,
   compiler,
   printURLs = true,
@@ -164,7 +164,7 @@ async function startDevServer(options, startDevCompile, {
   logger: customLogger,
   getPortSilently
 } = {}) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "development";
   }
@@ -183,29 +183,33 @@ async function startDevServer(options, startDevCompile, {
   };
   const protocol = https ? "https" : "http";
   let urls = (0, import_shared.getAddressUrls)(protocol, port, (_a = rsbuildConfig.dev) == null ? void 0 : _a.host);
-  if (printURLs) {
-    if ((0, import_shared.isFunction)(printURLs)) {
-      urls = printURLs(urls);
-      if (!Array.isArray(urls)) {
-        throw new Error("Please return an array in the `printURLs` function.");
-      }
-    }
-    (0, import_shared.printServerURLs)(urls, options.context.entry, logger);
-  }
+  const routes = (0, import_shared.formatRoutes)(
+    options.context.entry,
+    (_c = (_b = rsbuildConfig.output) == null ? void 0 : _b.distPath) == null ? void 0 : _c.html
+  );
   (0, import_shared.debug)("create dev server");
-  const devMiddleware = await startDevCompile(options, compiler);
+  const devMiddleware = await createDevMiddleware(options, compiler);
   const server = new RsbuildDevServer({
     pwd: options.context.rootPath,
     devMiddleware,
     dev: devServerConfig,
     output: {
-      distPath: ((_c = (_b = rsbuildConfig.output) == null ? void 0 : _b.distPath) == null ? void 0 : _c.root) || import_shared.ROOT_DIST_DIR,
+      distPath: ((_e = (_d = rsbuildConfig.output) == null ? void 0 : _d.distPath) == null ? void 0 : _e.root) || import_shared.ROOT_DIST_DIR,
       assetPrefix: typeof devServerConfig.assetPrefix === "string" && !(0, import_shared.isURL)(devServerConfig.assetPrefix) ? devServerConfig.assetPrefix : ""
     }
   });
   (0, import_shared.debug)("create dev server done");
   await options.context.hooks.onBeforeStartDevServerHook.call();
   const httpServer = await server.createHTTPServer();
+  if (printURLs) {
+    if ((0, import_shared.isFunction)(printURLs)) {
+      urls = printURLs(urls);
+      if (!Array.isArray(urls)) {
+        throw new Error("Please return an array in the `printURLs` function.");
+      }
+    }
+    (0, import_shared.printServerURLs)(urls, routes, logger);
+  }
   await server.onInit(httpServer);
   (0, import_shared.debug)("listen dev server");
   return new Promise((resolve) => {
@@ -219,12 +223,16 @@ async function startDevServer(options, startDevCompile, {
           throw err;
         }
         (0, import_shared.debug)("listen dev server done");
-        await options.context.hooks.onAfterStartDevServerHook.call({ port });
+        await options.context.hooks.onAfterStartDevServerHook.call({
+          port,
+          routes
+        });
+        (0, import_restart.registerCleaner)(() => server.close());
         resolve({
           port,
           urls: urls.map((item) => item.url),
           server: {
-            close: () => {
+            close: async () => {
               server.close();
             }
           }

package/dist/server/prodServer.d.ts

@@ -2,8 +2,8 @@
 /// <reference types="node" />
 import type { ListenOptions } from 'net';
 import { Server } from 'http';
-import connect from 'connect';
-import { Context, RsbuildConfig, StartServerResult } from '@rsbuild/shared';
+import connect from '@rsbuild/shared/connect';
+import { Context, RsbuildConfig, StartServerResult, PreviewServerOptions } from '@rsbuild/shared';
 type RsbuildProdServerOptions = {
   pwd: string;
   output: {
@@ -23,5 +23,7 @@ export declare class RsbuildProdServer {
   listen(options?: number | ListenOptions | undefined, listener?: () => void): void;
   close(): void;
 }
-export declare function startProdServer(context: Context, rsbuildConfig: RsbuildConfig): Promise<StartServerResult>;
+export declare function startProdServer(context: Context, rsbuildConfig: RsbuildConfig, {
+  printURLs
+}?: PreviewServerOptions): Promise<StartServerResult>;
 export {};