@rsbuild/core 0.0.25 → 0.0.27

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

@@ -1,5 +1,11 @@
-import { type CreateRsbuildOptions } from '@rsbuild/shared';
-import type { Context, RsbuildConfig } from '../../types';
+import { RsbuildConfig, type Context as BaseContext, type BundlerType, type SourceConfig, type OutputConfig, type NormalizedConfig, type CreateRsbuildOptions } from '@rsbuild/shared';
+import type { Context } from '../../types';
+/**
+ * Create context by config.
+ */
+export declare function createContextByConfig(options: Required<CreateRsbuildOptions>, bundlerType: BundlerType, sourceConfig?: SourceConfig, outputConfig?: OutputConfig): BaseContext;
+export declare function updateContextByNormalizedConfig(context: BaseContext, config: NormalizedConfig): void;
+export declare function createPublicContext(context: BaseContext): Readonly<BaseContext>;
 /**
  * Generate the actual context used in the build,
  * which can have a lot of overhead and take some side effects.

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

@@ -18,16 +18,98 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createContext_exports = {};
 __export(createContext_exports, {
-  createContext: () => createContext
+  createContext: () => createContext,
+  createContextByConfig: () => createContextByConfig,
+  createPublicContext: () => createPublicContext,
+  updateContextByNormalizedConfig: () => updateContextByNormalizedConfig
 });
 module.exports = __toCommonJS(createContext_exports);
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
 var import_initHooks = require("./initHooks");
-var import_defaults = require("../config/defaults");
+var import_config = require("../config");
+function getDefaultEntry(root) {
+  const files = [
+    // Most projects are using typescript now.
+    // So we put `.ts` as the first one to improve performance.
+    "ts",
+    "js",
+    "tsx",
+    "jsx",
+    ".mjs",
+    ".cjs"
+  ].map((ext) => (0, import_path.join)(root, `src/index.${ext}`));
+  const entryFile = (0, import_shared.findExists)(files);
+  if (entryFile) {
+    return {
+      index: entryFile
+    };
+  }
+  return {};
+}
+function createContextByConfig(options, bundlerType, sourceConfig = {}, outputConfig = {}) {
+  const { cwd, target } = options;
+  const rootPath = cwd;
+  const distPath = (0, import_shared.getAbsoluteDistPath)(cwd, outputConfig);
+  const cachePath = (0, import_path.join)(rootPath, "node_modules", ".cache");
+  if (sourceConfig.entries) {
+    import_shared.logger.warn(
+      "[Rsbuild] `source.entries` option has been renamed to `source.entry`, please update the Rsbuild config."
+    );
+    import_shared.logger.warn(
+      "[Rsbuild] `source.entries` option will be removed in Rsbuild v0.2.0."
+    );
+  }
+  const context = {
+    entry: sourceConfig.entry || // TODO: remove sourceConfig.entries in v0.2.0
+    // compat with previous config
+    sourceConfig.entries || getDefaultEntry(rootPath),
+    version: "0.0.27",
+    target,
+    rootPath,
+    distPath,
+    cachePath,
+    bundlerType
+  };
+  return context;
+}
+function updateContextByNormalizedConfig(context, config) {
+  context.distPath = (0, import_shared.getAbsoluteDistPath)(context.rootPath, config.output);
+  if (config.source.entry) {
+    context.entry = config.source.entry;
+  }
+}
+function createPublicContext(context) {
+  const exposedKeys = [
+    "entry",
+    "target",
+    "version",
+    "rootPath",
+    "distPath",
+    "devServer",
+    "cachePath",
+    "configPath",
+    "tsconfigPath",
+    "bundlerType"
+  ];
+  return new Proxy(context, {
+    get(target, prop) {
+      if (exposedKeys.includes(prop)) {
+        return target[prop];
+      }
+      return void 0;
+    },
+    set(_, prop) {
+      import_shared.logger.error(
+        `Context is readonly, you can not assign to the "context.${prop}" prop.`
+      );
+      return true;
+    }
+  });
+}
 async function createContext(options, userRsbuildConfig) {
-  const rsbuildConfig = (0, import_defaults.withDefaultConfig)(userRsbuildConfig);
-  const context = (0, import_shared.createContextByConfig)(
+  const rsbuildConfig = (0, import_config.withDefaultConfig)(userRsbuildConfig);
+  const context = createContextByConfig(
     options,
     "rspack",
     rsbuildConfig.source,
@@ -44,5 +126,8 @@ async function createContext(options, userRsbuildConfig) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createContext
+  createContext,
+  createContextByConfig,
+  createPublicContext,
+  updateContextByNormalizedConfig
 });

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

@@ -1,4 +1,4 @@
-import { type PluginStore, type CreateRsbuildOptions } from '@rsbuild/shared';
+import { type PluginStore, type RspackConfig, type CreateRsbuildOptions } from '@rsbuild/shared';
 import type { Context } from '../../types';
 export type InitConfigsOptions = {
   context: Context;
@@ -10,5 +10,5 @@ export declare function initConfigs({
   pluginStore,
   rsbuildOptions
 }: InitConfigsOptions): Promise<{
-  rspackConfigs: import("@rsbuild/shared").RspackConfig[];
+  rspackConfigs: RspackConfig[];
 }>;

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

@@ -22,9 +22,10 @@ __export(initConfigs_exports, {
 });
 module.exports = __toCommonJS(initConfigs_exports);
 var import_shared = require("@rsbuild/shared");
+var import_createContext = require("./createContext");
 var import_inspectConfig = require("./inspectConfig");
 var import_rspackConfig = require("./rspackConfig");
-var import_normalize = require("../config/normalize");
+var import_config = require("../config");
 async function modifyRsbuildConfig(context) {
   (0, import_shared.debug)("modify Rsbuild config");
   const [modified] = await context.hooks.modifyRsbuildConfigHook.call(
@@ -44,8 +45,8 @@ async function initConfigs({
     pluginStore
   });
   await modifyRsbuildConfig(context);
-  context.normalizedConfig = (0, import_normalize.normalizeConfig)(context.config);
-  (0, import_shared.updateContextByNormalizedConfig)(context, context.normalizedConfig);
+  context.normalizedConfig = (0, import_config.normalizeConfig)(context.config);
+  (0, import_createContext.updateContextByNormalizedConfig)(context, context.normalizedConfig);
   const targets = (0, import_shared.castArray)(rsbuildOptions.target);
   const rspackConfigs = await Promise.all(
     targets.map((target) => (0, import_rspackConfig.generateRspackConfig)({ target, context }))

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

@@ -22,12 +22,13 @@ __export(initPlugins_exports, {
 });
 module.exports = __toCommonJS(initPlugins_exports);
 var import_shared = require("@rsbuild/shared");
+var import_createContext = require("./createContext");
 function getPluginAPI({
   context,
   pluginStore
 }) {
   const { hooks } = context;
-  const publicContext = (0, import_shared.createPublicContext)(context);
+  const publicContext = (0, import_createContext.createPublicContext)(context);
   const getRsbuildConfig = () => {
     if (!context.normalizedConfig) {
       throw new Error(

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

@@ -104,9 +104,6 @@ async function getChainUtils(target) {
     HtmlPlugin
   };
 }
-const convertToRspackConfig = (config) => {
-  return config;
-};
 async function generateRspackConfig({
   target,
   context
@@ -121,7 +118,7 @@ async function generateRspackConfig({
       ProvidePlugin
     }
   });
-  let rspackConfig = convertToRspackConfig(chain.toConfig());
+  let rspackConfig = chain.toConfig();
   rspackConfig = await modifyRspackConfig(
     context,
     rspackConfig,

package/dist/rspack-provider/index.d.ts

@@ -1,4 +1,5 @@
-export { getRspackVersion } from './shared/rspackVersion';
+export { getRspackVersion } from './shared';
 export { rspackProvider } from './provider';
 export type { RspackProvider } from './provider';
-export type { Rspack, RspackConfig } from '@rsbuild/shared';
+export type { Rspack, RspackConfig } from '@rsbuild/shared';
+export { createPublicContext, createContextByConfig, updateContextByNormalizedConfig } from './core/createContext';

package/dist/rspack-provider/index.js

@@ -18,14 +18,21 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var rspack_provider_exports = {};
 __export(rspack_provider_exports, {
-  getRspackVersion: () => import_rspackVersion.getRspackVersion,
-  rspackProvider: () => import_provider.rspackProvider
+  createContextByConfig: () => import_createContext.createContextByConfig,
+  createPublicContext: () => import_createContext.createPublicContext,
+  getRspackVersion: () => import_shared.getRspackVersion,
+  rspackProvider: () => import_provider.rspackProvider,
+  updateContextByNormalizedConfig: () => import_createContext.updateContextByNormalizedConfig
 });
 module.exports = __toCommonJS(rspack_provider_exports);
-var import_rspackVersion = require("./shared/rspackVersion");
+var import_shared = require("./shared");
 var import_provider = require("./provider");
+var import_createContext = require("./core/createContext");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  createContextByConfig,
+  createPublicContext,
   getRspackVersion,
-  rspackProvider
+  rspackProvider,
+  updateContextByNormalizedConfig
 });

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

@@ -45,7 +45,6 @@ async function applyBaseCSSRule({
   utils: { target, isProd, isServer, isWebWorker, CHAIN_ID },
   importLoaders = 1
 }) {
-  const enableExtractCSS = (0, import_shared.isUseCssExtract)(config, target);
   const enableSourceMap = (0, import_shared.isUseCssSourceMap)(config);
   const enableCSSModuleTS = Boolean(config.output.enableCssModuleTSDeclaration);
   const browserslist = await (0, import_shared.getBrowserslistWithDefault)(
@@ -53,7 +52,6 @@ async function applyBaseCSSRule({
     config,
     target
   );
-  const enableCssMinify = !enableExtractCSS && isProd;
   if (!enableNativeCss(config)) {
     const localIdentName = (0, import_shared.getCssModuleLocalIdentName)(config, isProd);
     const cssLoaderOptions = (0, import_shared.getCssLoaderOptions)({
@@ -91,12 +89,7 @@ async function applyBaseCSSRule({
   } else {
     if (!isServer && !isWebWorker && enableCSSModuleTS) {
       const { cssModules } = config.output;
-      rule.use(CHAIN_ID.USE.CSS_MODULES_TS).loader(
-        import_path.default.resolve(
-          __dirname,
-          "../rspackLoader/css-modules-typescript-pre-loader"
-        )
-      ).options({
+      rule.use(CHAIN_ID.USE.CSS_MODULES_TS).loader(import_path.default.resolve(__dirname, "../css-modules-typescript-pre-loader")).options({
         modules: {
           exportLocalsConvention: cssModules.exportLocalsConvention,
           auto: cssModules.auto
@@ -109,8 +102,7 @@ async function applyBaseCSSRule({
     const postcssLoaderOptions = (0, import_shared.getPostcssConfig)({
       enableSourceMap,
       browserslist,
-      config,
-      enableCssMinify
+      config
     });
     rule.use(CHAIN_ID.USE.POSTCSS).loader((0, import_shared2.getCompiledPath)("postcss-loader")).options(postcssLoaderOptions).end();
   }

package/dist/rspack-provider/provider.js

@@ -35,17 +35,16 @@ var import_shared = require("@rsbuild/shared");
 var import_createContext = require("./core/createContext");
 var import_initConfigs = require("./core/initConfigs");
 var import_initPlugins = require("./core/initPlugins");
-var import_plugin = require("./shared/plugin");
-var import_rspackVersion = require("./shared/rspackVersion");
+var import_shared2 = require("./shared");
 function rspackProvider({
   rsbuildConfig: originalRsbuildConfig
 }) {
   const rsbuildConfig = (0, import_shared.pickRsbuildConfig)(originalRsbuildConfig);
   return async ({ pluginStore, rsbuildOptions, plugins }) => {
-    if (!await (0, import_rspackVersion.isSatisfyRspackMinimumVersion)()) {
+    if (!await (0, import_shared2.isSatisfyRspackMinimumVersion)()) {
       throw new Error(
         `The current Rspack version does not meet the requirements, the minimum supported version of Rspack is ${import_shared.color.green(
-          import_rspackVersion.supportedRspackMinimumVersion
+          import_shared2.supportedRspackMinimumVersion
         )}`
       );
     }
@@ -55,9 +54,9 @@ function rspackProvider({
     return {
       bundler: "rspack",
       pluginAPI,
-      publicContext: (0, import_shared.createPublicContext)(context),
+      publicContext: (0, import_createContext.createPublicContext)(context),
       async applyDefaultPlugins() {
-        pluginStore.addPlugins(await (0, import_plugin.applyDefaultPlugins)(plugins));
+        pluginStore.addPlugins(await (0, import_shared2.applyDefaultPlugins)(plugins));
       },
       async createCompiler() {
         const { createCompiler } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));

package/dist/rspack-provider/shared.d.ts

@@ -0,0 +1,8 @@
+import { RsbuildPlugin } from '../types';
+import { Plugins } from '@rsbuild/shared';
+export declare const applyDefaultPlugins: (plugins: Plugins) => import("@rsbuild/shared").AwaitableGetter<RsbuildPlugin>;
+export declare const getRspackVersion: () => Promise<string>;
+export declare const supportedRspackMinimumVersion = "0.3.6";
+export declare const isSatisfyRspackMinimumVersion: (customVersion?: string) => Promise<boolean>;
+export declare const getCompiledPath: (packageName: string) => string;
+export declare const BUILTIN_LOADER = "builtin:";

package/dist/rspack-provider/shared.js

@@ -0,0 +1,116 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var shared_exports = {};
+__export(shared_exports, {
+  BUILTIN_LOADER: () => BUILTIN_LOADER,
+  applyDefaultPlugins: () => applyDefaultPlugins,
+  getCompiledPath: () => getCompiledPath,
+  getRspackVersion: () => getRspackVersion,
+  isSatisfyRspackMinimumVersion: () => isSatisfyRspackMinimumVersion,
+  supportedRspackMinimumVersion: () => supportedRspackMinimumVersion
+});
+module.exports = __toCommonJS(shared_exports);
+var import_path = require("path");
+var import_shared = require("@rsbuild/shared");
+var import_shared2 = require("@rsbuild/shared");
+var import_shared3 = require("@rsbuild/shared");
+const applyDefaultPlugins = (plugins) => (0, import_shared3.awaitableGetter)([
+  Promise.resolve().then(() => __toESM(require("./plugins/transition"))).then((m) => m.pluginTransition()),
+  Promise.resolve().then(() => __toESM(require("./plugins/basic"))).then((m) => m.pluginBasic()),
+  plugins.entry(),
+  // plugins.cache(),
+  plugins.target(),
+  Promise.resolve().then(() => __toESM(require("./plugins/output"))).then((m) => m.pluginOutput()),
+  plugins.devtool(),
+  Promise.resolve().then(() => __toESM(require("./plugins/resolve"))).then((m) => m.pluginResolve()),
+  plugins.fileSize(),
+  // cleanOutput plugin should before the html plugin
+  plugins.cleanOutput(),
+  plugins.asset(),
+  plugins.html(),
+  plugins.wasm(),
+  plugins.moment(),
+  plugins.nodeAddons(),
+  plugins.define(),
+  Promise.resolve().then(() => __toESM(require("./plugins/css"))).then((m) => m.pluginCss()),
+  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()),
+  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()),
+  plugins.externals(),
+  plugins.toml(),
+  plugins.yaml(),
+  plugins.splitChunks(),
+  plugins.startUrl(),
+  plugins.inlineChunk(),
+  plugins.bundleAnalyzer(),
+  plugins.networkPerformance(),
+  plugins.preloadOrPrefetch(),
+  plugins.performance(),
+  Promise.resolve().then(() => __toESM(require("./plugins/rspackProfile"))).then((m) => m.pluginRspackProfile())
+]);
+const getRspackVersion = async () => {
+  try {
+    const core = require.resolve("@rspack/core");
+    const pkg = await Promise.resolve().then(() => __toESM(require((0, import_path.join)(core, "../../package.json"))));
+    return pkg == null ? void 0 : pkg.version;
+  } catch (err) {
+    console.error(err);
+    return "";
+  }
+};
+const supportedRspackMinimumVersion = "0.3.6";
+const isSatisfyRspackMinimumVersion = async (customVersion) => {
+  let version = customVersion || await getRspackVersion();
+  const semver = await Promise.resolve().then(() => __toESM(require("semver")));
+  if (version.includes("-canary")) {
+    version = version.split("-canary")[0];
+  }
+  return version ? semver.lte(supportedRspackMinimumVersion, version) : true;
+};
+const getCompiledPath = (packageName) => {
+  const providerCompilerPath = (0, import_path.join)(__dirname, "../../compiled", packageName);
+  if (import_shared2.fse.existsSync(providerCompilerPath)) {
+    return providerCompilerPath;
+  } else {
+    return (0, import_shared.getSharedPkgCompiledPath)(packageName);
+  }
+};
+const BUILTIN_LOADER = "builtin:";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUILTIN_LOADER,
+  applyDefaultPlugins,
+  getCompiledPath,
+  getRspackVersion,
+  isSatisfyRspackMinimumVersion,
+  supportedRspackMinimumVersion
+});

package/dist/server/devServer.d.ts

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

package/dist/server/devServer.js

@@ -105,8 +105,7 @@ class RsbuildDevServer {
       next();
     });
     if (dev.proxy) {
-      const { middlewares, handleUpgrade } = (0, import_proxy.createProxyMiddleware)(dev.proxy);
-      app && handleUpgrade(app);
+      const { middlewares } = (0, import_proxy.createProxyMiddleware)(dev.proxy, app);
       middlewares.forEach((middleware) => {
         this.middlewares.use(middleware);
       });
@@ -116,7 +115,7 @@ class RsbuildDevServer {
     this.middlewares.use(
       (0, import_middlewares.getHtmlFallbackMiddleware)({
         distPath: (0, import_path.join)(this.pwd, this.output.distPath),
-        assetPrefix: this.output.assetPrefix,
+        publicPath: this.output.publicPath,
         callback: devMiddleware.middleware
       })
     );
@@ -159,7 +158,7 @@ class RsbuildDevServer {
 }
 async function startDevServer(options, createDevMiddleware, {
   open,
-  compiler,
+  compiler: customCompiler,
   printURLs = true,
   strictPort = false,
   logger: customLogger,
@@ -189,14 +188,18 @@ async function startDevServer(options, createDevMiddleware, {
     (_c = (_b = rsbuildConfig.output) == null ? void 0 : _b.distPath) == null ? void 0 : _c.html
   );
   (0, import_shared.debug)("create dev server");
-  const devMiddleware = await createDevMiddleware(options, compiler);
+  const { devMiddleware, compiler } = await createDevMiddleware(
+    options,
+    customCompiler
+  );
+  const publicPath = compiler.compilers ? (0, import_shared.getPublicPathFromCompiler)(compiler.compilers[0]) : (0, import_shared.getPublicPathFromCompiler)(compiler);
   const server = new RsbuildDevServer({
     pwd: options.context.rootPath,
     devMiddleware,
     dev: devServerConfig,
     output: {
       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 : ""
+      publicPath
     }
   });
   (0, import_shared.debug)("create dev server done");

package/dist/server/middlewares.d.ts

@@ -3,6 +3,6 @@ export declare const faviconFallbackMiddleware: Middleware;
 export declare const notFoundMiddleware: Middleware;
 export declare const getHtmlFallbackMiddleware: (params: {
   distPath: string;
-  assetPrefix: string;
+  publicPath: string;
   callback?: Middleware;
 }) => Middleware;

package/dist/server/middlewares.js

@@ -48,7 +48,7 @@ const notFoundMiddleware = (_req, res, _next) => {
   res.statusCode = 404;
   res.end();
 };
-const getHtmlFallbackMiddleware = ({ assetPrefix, distPath, callback }) => {
+const getHtmlFallbackMiddleware = ({ publicPath, distPath, callback }) => {
   return (req, res, next) => {
     if (
       // Only accept GET or HEAD
@@ -69,7 +69,7 @@ const getHtmlFallbackMiddleware = ({ assetPrefix, distPath, callback }) => {
     const tryRewrite = (filePath, newUrl) => {
       var _a;
       if (outputFileSystem.existsSync(filePath) && callback) {
-        newUrl = (0, import_shared.urlJoin)(assetPrefix, newUrl);
+        newUrl = (0, import_shared.urlJoin)(publicPath, newUrl);
         (_a = import_shared.debug) == null ? void 0 : _a(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
         req.url = newUrl;
         return callback(req, res, (...args) => {

package/dist/server/prodServer.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(prodServer_exports);
 var import_http = require("http");
 var import_connect = __toESM(require("@rsbuild/shared/connect"));
 var import_path = require("path");
-var import_sirv = __toESM(require("sirv"));
+var import_sirv = __toESM(require("../../compiled/sirv"));
 var import_shared = require("@rsbuild/shared");
 var import_middlewares = require("./middlewares");
 class RsbuildProdServer {

package/dist/server/proxy.d.ts

@@ -1,9 +1,8 @@
 import http from 'http';
-import { RequestHandler } from 'http-proxy-middleware';
-import { ProxyDetail, RequestHandler as Middleware, RsbuildProxyOptions } from '@rsbuild/shared';
+import { RequestHandler } from '@rsbuild/shared/http-proxy-middleware';
+import { type ProxyDetail, type RequestHandler as Middleware, type RsbuildProxyOptions } from '@rsbuild/shared';
 export declare function formatProxyOptions(proxyOptions: RsbuildProxyOptions): ProxyDetail[];
 export type HttpUpgradeHandler = NonNullable<RequestHandler['upgrade']>;
-export declare const createProxyMiddleware: (proxyOptions: RsbuildProxyOptions) => {
+export declare const createProxyMiddleware: (proxyOptions: RsbuildProxyOptions, app: http.Server) => {
   middlewares: Middleware[];
-  handleUpgrade: (server: http.Server) => void;
 };

package/dist/server/proxy.js

@@ -22,7 +22,8 @@ __export(proxy_exports, {
   formatProxyOptions: () => formatProxyOptions
 });
 module.exports = __toCommonJS(proxy_exports);
-var import_http_proxy_middleware2 = require("http-proxy-middleware/dist/http-proxy-middleware");
+var import_http_proxy_middleware = require("@rsbuild/shared/http-proxy-middleware");
+var import_shared = require("@rsbuild/shared");
 function formatProxyOptions(proxyOptions) {
   var _a;
   const ret = [];
@@ -45,45 +46,42 @@ function formatProxyOptions(proxyOptions) {
       ret.push(opts);
     }
   }
-  const handleError = (err, _req, _res, _target) => {
-    console.error(err);
-  };
+  const handleError = (err) => import_shared.logger.error(err);
   for (const opts of ret) {
     (_a = opts.onError) != null ? _a : opts.onError = handleError;
   }
   return ret;
 }
-const createProxyMiddleware = (proxyOptions) => {
+const createProxyMiddleware = (proxyOptions, app) => {
   const formattedOptionsList = formatProxyOptions(proxyOptions);
-  const proxies = [];
+  const proxyMiddlewares = [];
   const middlewares = [];
   for (const opts of formattedOptionsList) {
-    const proxy = new import_http_proxy_middleware2.HttpProxyMiddleware(opts.context, opts);
+    const proxyMiddleware = (0, import_http_proxy_middleware.createProxyMiddleware)(opts.context, opts);
     const middleware = async (req, res, next) => {
       const bypassUrl = typeof opts.bypass === "function" ? opts.bypass(req, res, opts) : null;
-      if (typeof bypassUrl === "boolean") {
+      if (bypassUrl === false) {
         res.statusCode = 404;
         next();
       } else if (typeof bypassUrl === "string") {
         req.url = bypassUrl;
         next();
       } else {
-        proxy.middleware(req, res, next);
+        proxyMiddleware(req, res, next);
       }
     };
-    proxies.push(proxy);
     middlewares.push(middleware);
+    proxyMiddlewares.push(proxyMiddleware);
   }
-  const handleUpgrade = (server) => {
-    for (const proxy of proxies) {
-      const raw = proxy;
-      if (raw.proxyOptions.ws === true && !raw.wsInternalSubscribed) {
-        server.on("upgrade", raw.handleUpgrade);
-        raw.wsInternalSubscribed = true;
+  const handleUpgrade = (req, socket, head) => {
+    for (const middleware of proxyMiddlewares) {
+      if (typeof middleware.upgrade === "function") {
+        middleware.upgrade(req, socket, head);
       }
     }
   };
-  return { middlewares, handleUpgrade };
+  app.on("upgrade", handleUpgrade);
+  return { middlewares };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/restart.js

@@ -34,7 +34,7 @@ __export(restart_exports, {
 module.exports = __toCommonJS(restart_exports);
 var import_path = __toESM(require("path"));
 var import_shared = require("@rsbuild/shared");
-var import_run = require("../cli/run");
+var import_commands = require("../cli/commands");
 const cleaners = [];
 const registerCleaner = (cleaner) => {
   cleaners.push(cleaner);
@@ -52,9 +52,7 @@ const restartDevServer = async ({ filePath }) => {
   for (const cleaner of cleaners) {
     await cleaner();
   }
-  const rsbuild = await (0, import_run.runCli)({
-    isRestart: true
-  });
+  const rsbuild = await (0, import_commands.init)();
   await rsbuild.startDevServer();
 };
 // Annotate the CommonJS export names for ESM import in node: