@rsbuild/core 0.0.26 → 0.0.28

package/dist/cli/commands.js

@@ -49,7 +49,7 @@ async function init(options) {
   });
 }
 function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.0.26");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.0.28");
   import_commander.program.command("dev").option(`--open`, "open the page in browser on startup").option(
     "-c --config <config>",
     "specify the configuration file, can be a relative or absolute path"

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

package/dist/plugins/splitChunks.d.ts

@@ -1,4 +1,2 @@
 import type { RsbuildPlugin } from '../types';
-/** Expect to match path just like "./node_modules/react-router/" */
-export declare const createDependenciesRegExp: (...dependencies: (string | RegExp)[]) => RegExp;
 export declare function pluginSplitChunks(): RsbuildPlugin;

package/dist/plugins/splitChunks.js

@@ -28,7 +28,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var splitChunks_exports = {};
 __export(splitChunks_exports, {
-  createDependenciesRegExp: () => createDependenciesRegExp,
   pluginSplitChunks: () => pluginSplitChunks
 });
 module.exports = __toCommonJS(splitChunks_exports);
@@ -50,23 +49,15 @@ function getUserDefinedCacheGroups(forceSplitting) {
   });
   return cacheGroups;
 }
-const DEPENDENCY_MATCH_TEMPL = /[\\/]node_modules[\\/](<SOURCES>)[\\/]/.source;
-const createDependenciesRegExp = (...dependencies) => {
-  const sources = dependencies.map(
-    (d) => typeof d === "string" ? d : d.source
-  );
-  const expr = DEPENDENCY_MATCH_TEMPL.replace("<SOURCES>", sources.join("|"));
-  return new RegExp(expr);
-};
 function splitByExperience(ctx) {
   const { override, polyfill, defaultConfig, userDefinedCacheGroups } = ctx;
   const experienceCacheGroup = {};
   const packageRegExps = {
-    lodash: createDependenciesRegExp("lodash", "lodash-es"),
-    axios: createDependenciesRegExp("axios", /axios-.+/)
+    lodash: (0, import_shared.createDependenciesRegExp)("lodash", "lodash-es"),
+    axios: (0, import_shared.createDependenciesRegExp)("axios", /axios-.+/)
   };
   if (polyfill === "entry" || polyfill === "usage") {
-    packageRegExps.polyfill = createDependenciesRegExp(
+    packageRegExps.polyfill = (0, import_shared.createDependenciesRegExp)(
       "tslib",
       "core-js",
       "@babel/runtime",
@@ -233,6 +224,5 @@ function pluginSplitChunks() {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createDependenciesRegExp,
   pluginSplitChunks
 });

package/dist/rspack-provider/config.js

@@ -26,6 +26,7 @@ module.exports = __toCommonJS(config_exports);
 var import_shared = require("@rsbuild/shared");
 const createDefaultConfig = () => ({
   dev: (0, import_shared.getDefaultDevConfig)(),
+  server: (0, import_shared.getDefaultServerConfig)(),
   html: (0, import_shared.getDefaultHtmlConfig)(),
   source: (0, import_shared.getDefaultSourceConfig)(),
   output: (0, import_shared.getDefaultOutputConfig)(),

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

@@ -1,5 +1,4 @@
-import { type RspackConfig } from '@rsbuild/shared';
-import { type RspackCompiler, type RspackMultiCompiler } from '@rsbuild/shared';
+import { type RspackConfig, CreateDevMiddlewareReturns, type RspackCompiler, type RspackMultiCompiler } from '@rsbuild/shared';
 import { type InitConfigsOptions } from './initConfigs';
 import type { Context } from '../../types';
 export declare function createCompiler({
@@ -8,5 +7,5 @@ export declare function createCompiler({
 }: {
   context: Context;
   rspackConfigs: RspackConfig[];
-}): Promise<import("@rspack/core").MultiCompiler>;
-export declare function createDevMiddleware(options: InitConfigsOptions, customCompiler?: RspackCompiler | RspackMultiCompiler): Promise<import("@rsbuild/shared").DevMiddleware>;
+}): Promise<RspackCompiler | RspackMultiCompiler>;
+export declare function createDevMiddleware(options: InitConfigsOptions, customCompiler?: RspackCompiler | RspackMultiCompiler): Promise<CreateDevMiddlewareReturns>;

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

@@ -44,7 +44,7 @@ async function createCompiler({
     bundlerConfigs: rspackConfigs
   });
   const { rspack } = await Promise.resolve().then(() => __toESM(require("@rspack/core")));
-  const compiler = rspack(rspackConfigs);
+  const compiler = rspackConfigs.length === 1 ? rspack(rspackConfigs[0]) : rspack(rspackConfigs);
   let isFirstCompile = true;
   compiler.hooks.watchRun.tap("rsbuild:compiling", () => {
     import_shared.logger.start("Compiling...");
@@ -54,15 +54,22 @@ async function createCompiler({
       all: false,
       timings: true
     });
-    if (!stats.hasErrors() && obj.children) {
-      obj.children.forEach((c, index) => {
-        if (c.time) {
-          const time = (0, import_shared.prettyTime)(c.time / 1e3);
-          const target = Array.isArray(context.target) ? context.target[index] : context.target;
-          const name = import_shared.TARGET_ID_MAP[target || "web"];
-          import_shared.logger.ready(`${name} compiled in ${time}`);
-        }
-      });
+    const printTime = (c, index) => {
+      if (c.time) {
+        const time = (0, import_shared.prettyTime)(c.time / 1e3);
+        const target = Array.isArray(context.target) ? context.target[index] : context.target;
+        const name = import_shared.TARGET_ID_MAP[target || "web"];
+        import_shared.logger.ready(`${name} compiled in ${time}`);
+      }
+    };
+    if (!stats.hasErrors()) {
+      if (obj.children) {
+        obj.children.forEach((c, index) => {
+          printTime(c, index);
+        });
+      } else {
+        printTime(obj, 0);
+      }
     }
     const { message, level } = (0, import_shared.formatStats)(stats);
     if (level === "error") {
@@ -93,7 +100,10 @@ async function createDevMiddleware(options, customCompiler) {
       rspackConfigs
     });
   }
-  return (0, import_devMiddleware.getDevMiddleware)(compiler);
+  return {
+    devMiddleware: (0, import_devMiddleware.getDevMiddleware)(compiler),
+    compiler
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -64,7 +64,7 @@ function createContextByConfig(options, bundlerType, sourceConfig = {}, outputCo
     entry: sourceConfig.entry || // TODO: remove sourceConfig.entries in v0.2.0
     // compat with previous config
     sourceConfig.entries || getDefaultEntry(rootPath),
-    version: "0.0.26",
+    version: "0.0.28",
     target,
     rootPath,
     distPath,

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/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/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,18 +105,18 @@ 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);
       });
     }
     devMiddleware.init(app);
     devMiddleware.middleware && this.middlewares.use(devMiddleware.middleware);
+    const { distPath } = this.output;
     this.middlewares.use(
       (0, import_middlewares.getHtmlFallbackMiddleware)({
-        distPath: (0, import_path.join)(this.pwd, this.output.distPath),
-        assetPrefix: this.output.assetPrefix,
+        distPath: (0, import_path.isAbsolute)(distPath) ? distPath : (0, import_path.join)(this.pwd, distPath),
+        publicPath: this.output.publicPath,
         callback: devMiddleware.middleware
       })
     );
@@ -159,7 +159,7 @@ class RsbuildDevServer {
 }
 async function startDevServer(options, createDevMiddleware, {
   open,
-  compiler,
+  compiler: customCompiler,
   printURLs = true,
   strictPort = false,
   logger: customLogger,
@@ -189,14 +189,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.d.ts

@@ -3,13 +3,14 @@
 import type { ListenOptions } from 'net';
 import { Server } from 'http';
 import connect from '@rsbuild/shared/connect';
-import { Context, RsbuildConfig, StartServerResult, PreviewServerOptions } from '@rsbuild/shared';
+import { Context, RsbuildConfig, StartServerResult, PreviewServerOptions, ServerConfig } from '@rsbuild/shared';
 type RsbuildProdServerOptions = {
   pwd: string;
   output: {
     path: string;
     assetPrefix?: string;
   };
+  serverConfig: ServerConfig;
 };
 export declare class RsbuildProdServer {
   private app;

package/dist/server/prodServer.js

@@ -49,6 +49,15 @@ class RsbuildProdServer {
     await this.applyDefaultMiddlewares();
   }
   async applyDefaultMiddlewares() {
+    const { headers } = this.options.serverConfig;
+    if (headers) {
+      this.middlewares.use((_req, res, next) => {
+        for (const [key, value] of Object.entries(headers)) {
+          res.setHeader(key, value);
+        }
+        next();
+      });
+    }
     this.applyStaticAssetMiddleware();
     this.middlewares.use(import_middlewares.faviconFallbackMiddleware);
   }
@@ -103,7 +112,8 @@ async function startProdServer(context, rsbuildConfig, { printURLs = true } = {}
     output: {
       path: ((_c = (_b = rsbuildConfig.output) == null ? void 0 : _b.distPath) == null ? void 0 : _c.root) || import_shared.ROOT_DIST_DIR,
       assetPrefix: (_d = rsbuildConfig.output) == null ? void 0 : _d.assetPrefix
-    }
+    },
+    serverConfig: rsbuildConfig.server || {}
   });
   const httpServer = await server.createHTTPServer();
   await server.onInit(httpServer);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -60,12 +60,11 @@
   "dependencies": {
     "@rspack/core": "0.3.14",
     "core-js": "~3.32.2",
-    "html-webpack-plugin": "npm:html-rspack-plugin@5.5.5",
-    "http-proxy-middleware": "^2.0.1",
+    "html-webpack-plugin": "npm:html-rspack-plugin@5.5.7",
     "postcss": "8.4.31",
     "semver": "^7.5.4",
     "ws": "^8.2.0",
-    "@rsbuild/shared": "0.0.26"
+    "@rsbuild/shared": "0.0.28"
   },
   "devDependencies": {
     "@types/node": "^16",