@modern-js/server 2.48.1 → 2.48.3

package/dist/cjs/server/devServer.js

@@ -43,65 +43,18 @@ var import_mock = require("../dev-tools/mock");
 var import_register = require("../dev-tools/register");
 var import_watcher = __toESM(require("../dev-tools/watcher"));
 var import_workerSSRRender = require("./workerSSRRender");
-const transformToRsbuildServerOptions = (dev) => {
-  var _dev_devMiddleware, _dev_before, _dev_after;
-  const rsbuildOptions = {
-    hmr: Boolean(dev.hot),
-    client: dev.client,
-    writeToDisk: (_dev_devMiddleware = dev.devMiddleware) === null || _dev_devMiddleware === void 0 ? void 0 : _dev_devMiddleware.writeToDisk,
-    compress: dev.compress,
-    headers: dev.headers,
-    historyApiFallback: dev.historyApiFallback,
-    proxy: dev.proxy,
-    publicDir: false
-  };
-  if (((_dev_before = dev.before) === null || _dev_before === void 0 ? void 0 : _dev_before.length) || ((_dev_after = dev.after) === null || _dev_after === void 0 ? void 0 : _dev_after.length)) {
-    rsbuildOptions.setupMiddlewares = [
-      ...dev.setupMiddlewares || [],
-      (middlewares) => {
-        middlewares.unshift(...dev.before || []);
-        middlewares.push(...dev.after || []);
-      }
-    ];
-  } else if (dev.setupMiddlewares) {
-    rsbuildOptions.setupMiddlewares = dev.setupMiddlewares;
-  }
-  return rsbuildOptions;
-};
 class ModernDevServer extends import_prod_server.ModernServer {
   getDevOptions(options) {
     const devOptions = options.dev;
     const defaultOptions = (0, import_constants.getDefaultDevOptions)();
     return (0, import_lodash.merge)(defaultOptions, devOptions);
   }
-  addMiddlewareHandler(handlers) {
-    handlers.forEach((handler) => {
-      this.addHandler((ctx, next) => {
-        const { req, res } = ctx;
-        return handler(req, res, next);
-      });
-    });
-  }
   // Complete the preparation of services
   async onInit(runner, app) {
     this.runner = runner;
-    const { dev, conf } = this;
-    const isUseStreamingSSR = (routes) => routes === null || routes === void 0 ? void 0 : routes.some((r) => r.isStream === true);
-    const isUseSSRPreload = () => {
-      const { server: { ssr, ssrByEntries } } = conf;
-      const checkUsePreload = (ssr2) => typeof ssr2 === "object" && Boolean(ssr2.preload);
-      return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some((ssr2) => checkUsePreload(ssr2));
-    };
-    const { middlewares: rsbuildMiddlewares, close, onUpgrade } = (
-      // https://github.com/web-infra-dev/rsbuild/blob/32fbb85e22158d5c4655505ce75e3452ce22dbb1/packages/shared/src/types/server.ts#L112
-      await this.getMiddlewares({
-        ...transformToRsbuildServerOptions(this.dev),
-        compress: !isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress,
-        htmlFallback: false,
-        publicDir: false
-      })
-    );
-    app.on("upgrade", onUpgrade);
+    const { dev } = this;
+    const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = this.getMiddlewares();
+    app.on("upgrade", onHTTPUpgrade);
     this.rsbuild.onDevCompileDone(({ stats }) => {
       if (stats.toJson({
         all: false
@@ -112,20 +65,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
       }
     });
     await this.applyDefaultMiddlewares();
-    rsbuildMiddlewares.forEach((middleware) => {
-      if (Array.isArray(middleware)) {
-        this.addHandler((ctx, next) => {
-          if (ctx.path === middleware[0]) {
-            return middleware[1](ctx.req, ctx.res, next);
-          }
-          return next();
-        });
-      } else {
-        this.addMiddlewareHandler([
-          middleware
-        ]);
-      }
-    });
+    this.addHandler((ctx, next) => rsbuildMiddlewares(ctx.req, ctx.res, next));
     this.closeCb.push(close);
     this.initFileReader();
     await super.onInit(runner, app);
@@ -138,9 +78,9 @@ class ModernDevServer extends import_prod_server.ModernServer {
     }
   }
   initFileReader() {
-    var _this_dev_devMiddleware, _this_dev;
+    var _this_dev;
     let isInit = false;
-    if (((_this_dev = this.dev) === null || _this_dev === void 0 ? void 0 : (_this_dev_devMiddleware = _this_dev.devMiddleware) === null || _this_dev_devMiddleware === void 0 ? void 0 : _this_dev_devMiddleware.writeToDisk) === false) {
+    if (((_this_dev = this.dev) === null || _this_dev === void 0 ? void 0 : _this_dev.writeToDisk) === false) {
       this.addHandler((ctx, next) => {
         var _ctx_res_locals;
         if (isInit) {

package/dist/esm/server/devServer.js

@@ -3,9 +3,6 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _get } from "@swc/helpers/_/_get";
 import { _ as _get_prototype_of } from "@swc/helpers/_/_get_prototype_of";
 import { _ as _inherits } from "@swc/helpers/_/_inherits";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _create_super } from "@swc/helpers/_/_create_super";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createServer } from "http";
@@ -20,31 +17,6 @@ import { createMockHandler } from "../dev-tools/mock";
 import { enableRegister } from "../dev-tools/register";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import { workerSSRRender } from "./workerSSRRender";
-var transformToRsbuildServerOptions = function(dev) {
-  var _dev_devMiddleware, _dev_before, _dev_after;
-  var rsbuildOptions = {
-    hmr: Boolean(dev.hot),
-    client: dev.client,
-    writeToDisk: (_dev_devMiddleware = dev.devMiddleware) === null || _dev_devMiddleware === void 0 ? void 0 : _dev_devMiddleware.writeToDisk,
-    compress: dev.compress,
-    headers: dev.headers,
-    historyApiFallback: dev.historyApiFallback,
-    proxy: dev.proxy,
-    publicDir: false
-  };
-  if (((_dev_before = dev.before) === null || _dev_before === void 0 ? void 0 : _dev_before.length) || ((_dev_after = dev.after) === null || _dev_after === void 0 ? void 0 : _dev_after.length)) {
-    rsbuildOptions.setupMiddlewares = _to_consumable_array(dev.setupMiddlewares || []).concat([
-      function(middlewares) {
-        var _middlewares, _middlewares1;
-        (_middlewares = middlewares).unshift.apply(_middlewares, _to_consumable_array(dev.before || []));
-        (_middlewares1 = middlewares).push.apply(_middlewares1, _to_consumable_array(dev.after || []));
-      }
-    ]);
-  } else if (dev.setupMiddlewares) {
-    rsbuildOptions.setupMiddlewares = dev.setupMiddlewares;
-  }
-  return rsbuildOptions;
-};
 var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
   "use strict";
   _inherits(ModernDevServer2, ModernServer2);
@@ -70,52 +42,20 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
     var defaultOptions = getDefaultDevOptions();
     return deepMerge(defaultOptions, devOptions);
   };
-  _proto.addMiddlewareHandler = function addMiddlewareHandler(handlers) {
-    var _this = this;
-    handlers.forEach(function(handler) {
-      _this.addHandler(function(ctx, next) {
-        var req = ctx.req, res = ctx.res;
-        return handler(req, res, next);
-      });
-    });
-  };
   _proto.onInit = function onInit(runner, app) {
     var _this = this;
     var _this1 = this, _superprop_get_onInit = function() {
       return _get(_get_prototype_of(ModernDevServer2.prototype), "onInit", _this);
     };
     return _async_to_generator(function() {
-      var dev, conf, isUseStreamingSSR, isUseSSRPreload, _ref, rsbuildMiddlewares, close, onUpgrade;
+      var dev, _this_getMiddlewares, rsbuildMiddlewares, close, onHTTPUpgrade;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
             _this1.runner = runner;
-            dev = _this1.dev, conf = _this1.conf;
-            isUseStreamingSSR = function(routes) {
-              return routes === null || routes === void 0 ? void 0 : routes.some(function(r) {
-                return r.isStream === true;
-              });
-            };
-            isUseSSRPreload = function() {
-              var _conf_server = conf.server, ssr = _conf_server.ssr, ssrByEntries = _conf_server.ssrByEntries;
-              var checkUsePreload = function(ssr2) {
-                return typeof ssr2 === "object" && Boolean(ssr2.preload);
-              };
-              return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some(function(ssr2) {
-                return checkUsePreload(ssr2);
-              });
-            };
-            return [
-              4,
-              _this1.getMiddlewares(_object_spread_props(_object_spread({}, transformToRsbuildServerOptions(_this1.dev)), {
-                compress: !isUseStreamingSSR(_this1.getRoutes()) && !isUseSSRPreload() && dev.compress,
-                htmlFallback: false,
-                publicDir: false
-              }))
-            ];
-          case 1:
-            _ref = _state.sent(), rsbuildMiddlewares = _ref.middlewares, close = _ref.close, onUpgrade = _ref.onUpgrade;
-            app.on("upgrade", onUpgrade);
+            dev = _this1.dev;
+            _this_getMiddlewares = _this1.getMiddlewares(), rsbuildMiddlewares = _this_getMiddlewares.middlewares, close = _this_getMiddlewares.close, onHTTPUpgrade = _this_getMiddlewares.onHTTPUpgrade;
+            app.on("upgrade", onHTTPUpgrade);
             _this1.rsbuild.onDevCompileDone(function(param) {
               var stats = param.stats;
               if (stats.toJson({
@@ -130,21 +70,10 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
               4,
               _this1.applyDefaultMiddlewares()
             ];
-          case 2:
+          case 1:
             _state.sent();
-            rsbuildMiddlewares.forEach(function(middleware) {
-              if (Array.isArray(middleware)) {
-                _this1.addHandler(function(ctx, next) {
-                  if (ctx.path === middleware[0]) {
-                    return middleware[1](ctx.req, ctx.res, next);
-                  }
-                  return next();
-                });
-              } else {
-                _this1.addMiddlewareHandler([
-                  middleware
-                ]);
-              }
+            _this1.addHandler(function(ctx, next) {
+              return rsbuildMiddlewares(ctx.req, ctx.res, next);
             });
             _this1.closeCb.push(close);
             _this1.initFileReader();
@@ -152,7 +81,7 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
               4,
               _superprop_get_onInit().call(_this1, runner, app)
             ];
-          case 3:
+          case 2:
             _state.sent();
             if (dev.watch) {
               _this1.startWatcher();
@@ -182,9 +111,9 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
     })();
   };
   _proto.initFileReader = function initFileReader() {
-    var _this_dev_devMiddleware, _this_dev;
+    var _this_dev;
     var isInit = false;
-    if (((_this_dev = this.dev) === null || _this_dev === void 0 ? void 0 : (_this_dev_devMiddleware = _this_dev.devMiddleware) === null || _this_dev_devMiddleware === void 0 ? void 0 : _this_dev_devMiddleware.writeToDisk) === false) {
+    if (((_this_dev = this.dev) === null || _this_dev === void 0 ? void 0 : _this_dev.writeToDisk) === false) {
       this.addHandler(function(ctx, next) {
         var _ctx_res_locals;
         if (isInit) {

package/dist/esm-node/server/devServer.js

@@ -10,65 +10,18 @@ import { createMockHandler } from "../dev-tools/mock";
 import { enableRegister } from "../dev-tools/register";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import { workerSSRRender } from "./workerSSRRender";
-const transformToRsbuildServerOptions = (dev) => {
-  var _dev_devMiddleware, _dev_before, _dev_after;
-  const rsbuildOptions = {
-    hmr: Boolean(dev.hot),
-    client: dev.client,
-    writeToDisk: (_dev_devMiddleware = dev.devMiddleware) === null || _dev_devMiddleware === void 0 ? void 0 : _dev_devMiddleware.writeToDisk,
-    compress: dev.compress,
-    headers: dev.headers,
-    historyApiFallback: dev.historyApiFallback,
-    proxy: dev.proxy,
-    publicDir: false
-  };
-  if (((_dev_before = dev.before) === null || _dev_before === void 0 ? void 0 : _dev_before.length) || ((_dev_after = dev.after) === null || _dev_after === void 0 ? void 0 : _dev_after.length)) {
-    rsbuildOptions.setupMiddlewares = [
-      ...dev.setupMiddlewares || [],
-      (middlewares) => {
-        middlewares.unshift(...dev.before || []);
-        middlewares.push(...dev.after || []);
-      }
-    ];
-  } else if (dev.setupMiddlewares) {
-    rsbuildOptions.setupMiddlewares = dev.setupMiddlewares;
-  }
-  return rsbuildOptions;
-};
 class ModernDevServer extends ModernServer {
   getDevOptions(options) {
     const devOptions = options.dev;
     const defaultOptions = getDefaultDevOptions();
     return deepMerge(defaultOptions, devOptions);
   }
-  addMiddlewareHandler(handlers) {
-    handlers.forEach((handler) => {
-      this.addHandler((ctx, next) => {
-        const { req, res } = ctx;
-        return handler(req, res, next);
-      });
-    });
-  }
   // Complete the preparation of services
   async onInit(runner, app) {
     this.runner = runner;
-    const { dev, conf } = this;
-    const isUseStreamingSSR = (routes) => routes === null || routes === void 0 ? void 0 : routes.some((r) => r.isStream === true);
-    const isUseSSRPreload = () => {
-      const { server: { ssr, ssrByEntries } } = conf;
-      const checkUsePreload = (ssr2) => typeof ssr2 === "object" && Boolean(ssr2.preload);
-      return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some((ssr2) => checkUsePreload(ssr2));
-    };
-    const { middlewares: rsbuildMiddlewares, close, onUpgrade } = (
-      // https://github.com/web-infra-dev/rsbuild/blob/32fbb85e22158d5c4655505ce75e3452ce22dbb1/packages/shared/src/types/server.ts#L112
-      await this.getMiddlewares({
-        ...transformToRsbuildServerOptions(this.dev),
-        compress: !isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress,
-        htmlFallback: false,
-        publicDir: false
-      })
-    );
-    app.on("upgrade", onUpgrade);
+    const { dev } = this;
+    const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = this.getMiddlewares();
+    app.on("upgrade", onHTTPUpgrade);
     this.rsbuild.onDevCompileDone(({ stats }) => {
       if (stats.toJson({
         all: false
@@ -79,20 +32,7 @@ class ModernDevServer extends ModernServer {
       }
     });
     await this.applyDefaultMiddlewares();
-    rsbuildMiddlewares.forEach((middleware) => {
-      if (Array.isArray(middleware)) {
-        this.addHandler((ctx, next) => {
-          if (ctx.path === middleware[0]) {
-            return middleware[1](ctx.req, ctx.res, next);
-          }
-          return next();
-        });
-      } else {
-        this.addMiddlewareHandler([
-          middleware
-        ]);
-      }
-    });
+    this.addHandler((ctx, next) => rsbuildMiddlewares(ctx.req, ctx.res, next));
     this.closeCb.push(close);
     this.initFileReader();
     await super.onInit(runner, app);
@@ -105,9 +45,9 @@ class ModernDevServer extends ModernServer {
     }
   }
   initFileReader() {
-    var _this_dev_devMiddleware, _this_dev;
+    var _this_dev;
     let isInit = false;
-    if (((_this_dev = this.dev) === null || _this_dev === void 0 ? void 0 : (_this_dev_devMiddleware = _this_dev.devMiddleware) === null || _this_dev_devMiddleware === void 0 ? void 0 : _this_dev_devMiddleware.writeToDisk) === false) {
+    if (((_this_dev = this.dev) === null || _this_dev === void 0 ? void 0 : _this_dev.writeToDisk) === false) {
       this.addHandler((ctx, next) => {
         var _ctx_res_locals;
         if (isInit) {

package/dist/types/server/devServer.d.ts

@@ -19,7 +19,6 @@ export declare class ModernDevServer extends ModernServer {
     private closeCb;
     constructor(options: ModernDevServerOptionsNew);
     private getDevOptions;
-    private addMiddlewareHandler;
     onInit(runner: ServerHookRunner, app: Server): Promise<void>;
     private initFileReader;
     close(): Promise<void>;

package/dist/types/types.d.ts

@@ -4,7 +4,7 @@
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { DevServerOptions, DevServerHttpsOptions, NextFunction } from '@modern-js/types';
 import type { ModernServerOptions } from '@modern-js/prod-server';
-import type { RsbuildInstance, DevServerAPIs, DevMiddlewaresConfig } from '@rsbuild/shared';
+import type { RsbuildInstance, RsbuildDevServer } from '@rsbuild/shared';
 export type { DevServerOptions, DevServerHttpsOptions };
 type Middleware = (req: IncomingMessage, res: ServerResponse, next: NextFunction) => Promise<void>;
 export type DevMiddlewareAPI = Middleware & {
@@ -40,9 +40,11 @@ export type ExtraOptions = {
 };
 export type ModernDevServerOptions = ModernServerOptions & ExtraOptions;
 export type ExtraOptionsNew = {
-    dev: Partial<DevServerOptions>;
+    dev: Pick<DevServerOptions, 'watch' | 'https'> & {
+        writeToDisk?: boolean | ((filename: string) => boolean);
+    };
     useSSRWorker?: boolean;
     rsbuild: RsbuildInstance;
-    getMiddlewares: (overrides?: DevMiddlewaresConfig) => ReturnType<DevServerAPIs['getMiddlewares']>;
+    getMiddlewares: () => Pick<RsbuildDevServer, 'middlewares' | 'onHTTPUpgrade' | 'close'>;
 };
 export type ModernDevServerOptionsNew = ModernServerOptions & ExtraOptionsNew;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.1",
+  "version": "2.48.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,14 +48,14 @@
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
     "axios": "^1.6.0",
-    "@modern-js/prod-server": "2.48.1",
-    "@modern-js/server-utils": "2.48.1",
-    "@modern-js/types": "2.48.1",
-    "@modern-js/utils": "2.48.1",
-    "@modern-js/runtime-utils": "2.48.1"
+    "@modern-js/prod-server": "2.48.3",
+    "@modern-js/server-utils": "2.48.3",
+    "@modern-js/types": "2.48.3",
+    "@modern-js/utils": "2.48.3",
+    "@modern-js/runtime-utils": "2.48.3"
   },
   "devDependencies": {
-    "@rsbuild/shared": "0.4.15",
+    "@rsbuild/shared": "0.5.1",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/jest": "^29",
     "@types/minimatch": "^3.0.5",
@@ -68,9 +68,9 @@
     "typescript": "^5",
     "webpack": "^5.89.0",
     "websocket": "^1",
-    "@modern-js/server-core": "2.48.1",
-    "@scripts/build": "2.48.1",
-    "@scripts/jest-config": "2.48.1"
+    "@modern-js/server-core": "2.48.3",
+    "@scripts/build": "2.48.3",
+    "@scripts/jest-config": "2.48.3"
   },
   "peerDependencies": {
     "devcert": "^1.2.2",