@modern-js/server 2.42.1 → 2.43.0

package/dist/cjs/dev-tools/dev-middleware/index.js

@@ -44,8 +44,7 @@ function getHMRClientPath(client) {
   const clientEntry = `${require.resolve("@modern-js/server/hmr-client")}?${host}${path}${port}${protocol}`;
   return clientEntry;
 }
-var DevMiddleware;
-DevMiddleware = class DevMiddleware2 extends import_events.EventEmitter {
+class DevMiddleware extends import_events.EventEmitter {
   init(app) {
     app.on("listening", () => {
       this.socketServer.prepare(app);
@@ -92,4 +91,4 @@ DevMiddleware = class DevMiddleware2 extends import_events.EventEmitter {
       this.middleware = this.setupDevMiddleware(devMiddleware);
     }
   }
-};
+}

package/dist/cjs/dev-tools/dev-middleware/socketServer.js

@@ -34,8 +34,7 @@ module.exports = __toCommonJS(socketServer_exports);
 var import_define_property = require("@swc/helpers/_/_define_property");
 var import_ws = __toESM(require("ws"));
 var import_utils = require("@modern-js/utils");
-var SocketServer;
-SocketServer = class SocketServer2 {
+class SocketServer {
   // create socket, install socket handler, bind socket event
   prepare(app) {
     var _this_options_client;
@@ -176,4 +175,4 @@ SocketServer = class SocketServer2 {
     (0, import_define_property._)(this, "timer", null);
     this.options = options;
   }
-};
+}

package/dist/cjs/dev-tools/watcher/index.js

@@ -76,8 +76,7 @@ const mergeWatchOptions = (options) => {
   };
   return finalWatchOptions;
 };
-var Watcher;
-Watcher = class Watcher2 {
+class Watcher {
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
     const filenames = watched.map((filename) => filename.replace(/\\/g, "/"));
@@ -130,7 +129,7 @@ Watcher = class Watcher2 {
     (0, import_define_property._)(this, "dependencyTree", null);
     (0, import_define_property._)(this, "watcher", void 0);
   }
-};
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defaultWatchOptions,

package/dist/cjs/index.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   Server: () => import_server.DevServer,
+  ServerForRsbuild: () => import_server.DevServerForRsbuild,
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
@@ -32,5 +33,6 @@ var src_default = (options) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Server
+  Server,
+  ServerForRsbuild
 });

package/dist/cjs/server/devServer.js

@@ -38,15 +38,40 @@ var import_https = require("https");
 var import_utils = require("@modern-js/utils");
 var import_prod_server = require("@modern-js/prod-server");
 var import_lodash = require("@modern-js/utils/lodash");
+var import_fileReader = require("@modern-js/runtime-utils/fileReader");
 var import_constants = require("../constants");
 var import_mock = require("../dev-tools/mock");
 var import_register = require("../dev-tools/register");
 var import_watcher = __toESM(require("../dev-tools/watcher"));
-var import_dev_middleware = __toESM(require("../dev-tools/dev-middleware"));
 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 = typeof options.dev === "boolean" ? {} : options.dev;
+    const devOptions = options.dev;
     const defaultOptions = (0, import_constants.getDefaultDevOptions)();
     return (0, import_lodash.merge)(defaultOptions, devOptions);
   }
@@ -58,40 +83,39 @@ class ModernDevServer extends import_prod_server.ModernServer {
       });
     });
   }
-  applySetupMiddlewares() {
-    const setupMiddlewares = this.dev.setupMiddlewares || [];
-    const serverOptions = {
-      sockWrite: (type, data) => this.devMiddleware.sockWrite(type, data)
-    };
-    const befores = [];
-    const afters = [];
-    setupMiddlewares.forEach((handler) => {
-      handler({
-        unshift: (...handlers) => befores.unshift(...handlers),
-        push: (...handlers) => afters.push(...handlers)
-      }, serverOptions);
-    });
-    return {
-      befores,
-      afters
-    };
-  }
   // Complete the preparation of services
   async onInit(runner, app) {
     this.runner = runner;
-    const { dev } = this;
-    const { befores, afters } = this.applySetupMiddlewares();
-    const beforeHandlers = await this.setupBeforeDevMiddleware();
-    this.addMiddlewareHandler([
-      ...beforeHandlers,
-      ...befores
-    ]);
-    await this.applyDefaultMiddlewares(app);
-    const afterHandlers = await this.setupAfterDevMiddleware();
-    this.addMiddlewareHandler([
-      ...afters,
-      ...afterHandlers
-    ]);
+    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);
+    this.rsbuild.onDevCompileDone(({ stats }) => {
+      if (stats.toJson({
+        all: false
+      }).name !== "server") {
+        this.onRepack({
+          routes: this.getRoutes()
+        });
+      }
+    });
+    await this.applyDefaultMiddlewares();
+    this.addMiddlewareHandler(rsbuildMiddlewares);
+    this.closeCb.push(close);
+    this.initFileReader();
     await super.onInit(runner, app);
     if (dev.watch) {
       this.startWatcher();
@@ -101,6 +125,36 @@ class ModernDevServer extends import_prod_server.ModernServer {
       });
     }
   }
+  initFileReader() {
+    var _this_dev_devMiddleware, _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) {
+      this.addHandler((ctx, next) => {
+        var _ctx_res_locals;
+        if (isInit) {
+          return next();
+        }
+        isInit = true;
+        if (!((_ctx_res_locals = ctx.res.locals) === null || _ctx_res_locals === void 0 ? void 0 : _ctx_res_locals.webpack)) {
+          import_fileReader.fileReader.reset();
+          return next();
+        }
+        const { devMiddleware: webpackDevMid } = ctx.res.locals.webpack;
+        const { outputFileSystem } = webpackDevMid;
+        if (outputFileSystem) {
+          import_fileReader.fileReader.reset(outputFileSystem);
+        } else {
+          import_fileReader.fileReader.reset();
+        }
+        return next();
+      });
+    }
+  }
+  async close() {
+    for (const cb of this.closeCb) {
+      await cb();
+    }
+  }
   // override the ModernServer renderHandler logic
   getRenderHandler() {
     if (this.useWorkerSSR) {
@@ -120,36 +174,8 @@ class ModernDevServer extends import_prod_server.ModernServer {
     }
     return super.getRenderHandler();
   }
-  async applyDefaultMiddlewares(app) {
-    const { pwd, dev, devMiddleware, 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));
-    };
-    if (!isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress) {
-      const { default: compression } = await Promise.resolve().then(() => __toESM(require("http-compression")));
-      this.addHandler((ctx, next) => {
-        compression({
-          gzip: true,
-          brotli: false
-        })(ctx.req, ctx.res, next);
-      });
-    }
-    this.addHandler((ctx, next) => {
-      ctx.res.setHeader("Access-Control-Allow-Origin", "*");
-      if (ctx.path.includes("hot-update")) {
-        ctx.res.setHeader("Access-Control-Allow-Credentials", "false");
-      }
-      const confHeaders = dev.headers;
-      if (confHeaders) {
-        for (const [key, value] of Object.entries(confHeaders)) {
-          ctx.res.setHeader(key, value);
-        }
-      }
-      next();
-    });
+  async applyDefaultMiddlewares() {
+    const { pwd } = this;
     this.mockHandler = (0, import_mock.createMockHandler)({
       pwd
     });
@@ -160,43 +186,13 @@ class ModernDevServer extends import_prod_server.ModernServer {
         next();
       }
     });
-    if (dev.proxy) {
-      const { handlers, handleUpgrade } = (0, import_prod_server.createProxyHandler)(dev.proxy);
-      app && handleUpgrade(app);
-      handlers.forEach((handler) => {
-        this.addHandler(handler);
-      });
-    }
-    devMiddleware.init(app);
-    devMiddleware.on("change", (stats) => {
-      if (stats.toJson({
-        all: false
-      }).name !== "server") {
-        this.onRepack({
-          routes: this.getRoutes()
-        });
-      }
-    });
-    this.addHandler((ctx, next) => {
-      const { req, res } = ctx;
-      if (devMiddleware.middleware) {
-        devMiddleware.middleware(req, res, next);
-      } else {
-        next();
-      }
-    });
-    if (dev.historyApiFallback) {
-      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
-      const historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
-      this.addHandler((ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next));
-    }
   }
   onRepack(options = {}) {
     if (Array.isArray(options.routes)) {
       this.router.reset(this.filterRoutes(options.routes));
     }
     this.cleanSSRCache();
-    this.reader.updateFile();
+    import_fileReader.fileReader.reset();
     this.runner.repack();
     super.onRepack(options);
   }
@@ -213,32 +209,6 @@ class ModernDevServer extends import_prod_server.ModernServer {
   }
   warmupSSRBundle() {
   }
-  initReader() {
-    var _this_dev_devMiddleware, _this_dev;
-    let isInit = false;
-    if (this.devMiddleware && ((_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) {
-      this.addHandler((ctx, next) => {
-        if (isInit) {
-          return next();
-        }
-        isInit = true;
-        if (!ctx.res.locals.webpack) {
-          this.reader.init();
-          return next();
-        }
-        const { devMiddleware: webpackDevMid } = ctx.res.locals.webpack;
-        const { outputFileSystem } = webpackDevMid;
-        if (outputFileSystem) {
-          this.reader.init(outputFileSystem);
-        } else {
-          this.reader.init();
-        }
-        return next();
-      });
-    } else {
-      super.initReader();
-    }
-  }
   async onServerChange({ filepath, event }) {
     const { pwd } = this;
     const { mock } = import_prod_server.AGGRED_DIR;
@@ -273,28 +243,10 @@ class ModernDevServer extends import_prod_server.ModernServer {
     });
   }
   setupStaticMiddleware(_) {
-    return async (context, next) => {
+    return async (_context, next) => {
       return next();
     };
   }
-  async setupBeforeDevMiddleware() {
-    const { runner, conf, dev } = this;
-    const setupMids = dev.before || [];
-    const pluginMids = await runner.beforeDevServer(conf);
-    return [
-      ...setupMids,
-      ...pluginMids
-    ].flat();
-  }
-  async setupAfterDevMiddleware() {
-    const { runner, conf, dev } = this;
-    const setupMids = dev.after || [];
-    const pluginMids = await runner.afterDevServer(conf);
-    return [
-      ...pluginMids,
-      ...setupMids
-    ].flat();
-  }
   cleanSSRCache() {
     const { distDir } = this;
     const bundles = this.router.getBundles();
@@ -350,16 +302,16 @@ class ModernDevServer extends import_prod_server.ModernServer {
     (0, import_define_property._)(this, "dev", void 0);
     (0, import_define_property._)(this, "useWorkerSSR", void 0);
     (0, import_define_property._)(this, "appContext", void 0);
-    (0, import_define_property._)(this, "devMiddleware", void 0);
+    (0, import_define_property._)(this, "getMiddlewares", void 0);
+    (0, import_define_property._)(this, "rsbuild", void 0);
     (0, import_define_property._)(this, "watcher", void 0);
+    (0, import_define_property._)(this, "closeCb", []);
     this.appContext = options.appContext;
     this.workDir = this.pwd;
     this.useWorkerSSR = Boolean(options.useWorkerSSR);
     this.dev = this.getDevOptions(options);
-    this.devMiddleware = new import_dev_middleware.default({
-      dev: this.dev,
-      devMiddleware: options.devMiddleware
-    });
+    this.getMiddlewares = options.getMiddlewares;
+    this.rsbuild = options.rsbuild;
     (0, import_register.enableRegister)(this.pwd, this.conf);
   }
 }