@modern-js/server 0.0.0-nightly-20231213170638 → 0.0.0-nightly-20231215170639

package/dist/esm/server/devServer.js

@@ -6,7 +6,8 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 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 _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+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";
@@ -14,14 +15,38 @@ import { createServer } from "http";
 import path from "path";
 import { createServer as createHttpsServer } from "https";
 import { API_DIR, SERVER_BUNDLE_DIRECTORY, SERVER_DIR, SHARED_DIR, LOADABLE_STATS_FILE } from "@modern-js/utils";
-import { createProxyHandler, ModernServer, AGGRED_DIR, createRenderHandler } from "@modern-js/prod-server";
+import { ModernServer, AGGRED_DIR, createRenderHandler } from "@modern-js/prod-server";
 import { merge as deepMerge } from "@modern-js/utils/lodash";
 import { getDefaultDevOptions } from "../constants";
 import { createMockHandler } from "../dev-tools/mock";
 import { enableRegister } from "../dev-tools/register";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
-import DevMiddleware from "../dev-tools/dev-middleware";
 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);
@@ -34,16 +59,16 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
     _define_property(_assert_this_initialized(_this), "dev", void 0);
     _define_property(_assert_this_initialized(_this), "useWorkerSSR", void 0);
     _define_property(_assert_this_initialized(_this), "appContext", void 0);
-    _define_property(_assert_this_initialized(_this), "devMiddleware", void 0);
+    _define_property(_assert_this_initialized(_this), "getMiddlewares", void 0);
+    _define_property(_assert_this_initialized(_this), "rsbuild", void 0);
     _define_property(_assert_this_initialized(_this), "watcher", void 0);
+    _define_property(_assert_this_initialized(_this), "closeCb", []);
     _this.appContext = options.appContext;
     _this.workDir = _this.pwd;
     _this.useWorkerSSR = Boolean(options.useWorkerSSR);
     _this.dev = _this.getDevOptions(options);
-    _this.devMiddleware = new DevMiddleware({
-      dev: _this.dev,
-      devMiddleware: options.devMiddleware
-    });
+    _this.getMiddlewares = options.getMiddlewares;
+    _this.rsbuild = options.rsbuild;
     enableRegister(_this.pwd, _this.conf);
     return _this;
   }
@@ -68,41 +93,6 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
         });
       }
     },
-    {
-      key: "applySetupMiddlewares",
-      value: function applySetupMiddlewares() {
-        var _this = this;
-        var setupMiddlewares = this.dev.setupMiddlewares || [];
-        var serverOptions = {
-          sockWrite: function(type, data) {
-            return _this.devMiddleware.sockWrite(type, data);
-          }
-        };
-        var befores = [];
-        var afters = [];
-        setupMiddlewares.forEach(function(handler) {
-          var _befores, _afters;
-          handler({
-            unshift: function() {
-              for (var _len = arguments.length, handlers = new Array(_len), _key = 0; _key < _len; _key++) {
-                handlers[_key] = arguments[_key];
-              }
-              return (_befores = befores).unshift.apply(_befores, _to_consumable_array(handlers));
-            },
-            push: function() {
-              for (var _len = arguments.length, handlers = new Array(_len), _key = 0; _key < _len; _key++) {
-                handlers[_key] = arguments[_key];
-              }
-              return (_afters = afters).push.apply(_afters, _to_consumable_array(handlers));
-            }
-          }, serverOptions);
-        });
-        return {
-          befores,
-          afters
-        };
-      }
-    },
     {
       key: "onInit",
       value: (
@@ -113,38 +103,60 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
             return _get(_get_prototype_of(ModernDevServer2.prototype), "onInit", _this);
           };
           return _async_to_generator(function() {
-            var dev, _this_applySetupMiddlewares, befores, afters, beforeHandlers, afterHandlers;
+            var dev, conf, isUseStreamingSSR, isUseSSRPreload, _ref, rsbuildMiddlewares, close, onUpgrade;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   _this1.runner = runner;
-                  dev = _this1.dev;
-                  _this_applySetupMiddlewares = _this1.applySetupMiddlewares(), befores = _this_applySetupMiddlewares.befores, afters = _this_applySetupMiddlewares.afters;
+                  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.setupBeforeDevMiddleware()
+                    _this1.getMiddlewares(_object_spread_props(_object_spread({}, transformToRsbuildServerOptions(_this1.dev)), {
+                      compress: !isUseStreamingSSR(_this1.getRoutes()) && !isUseSSRPreload() && dev.compress,
+                      htmlFallback: false,
+                      publicDir: false
+                    }))
                   ];
                 case 1:
-                  beforeHandlers = _state.sent();
-                  _this1.addMiddlewareHandler(_to_consumable_array(beforeHandlers).concat(_to_consumable_array(befores)));
+                  _ref = _state.sent(), rsbuildMiddlewares = _ref.middlewares, close = _ref.close, onUpgrade = _ref.onUpgrade;
+                  app.on("upgrade", onUpgrade);
+                  _this1.rsbuild.onDevCompileDone(function(param) {
+                    var stats = param.stats;
+                    if (stats.toJson({
+                      all: false
+                    }).name !== "server") {
+                      _this1.onRepack({
+                        routes: _this1.getRoutes()
+                      });
+                    }
+                  });
                   return [
                     4,
-                    _this1.applyDefaultMiddlewares(app)
+                    _this1.applyDefaultMiddlewares()
                   ];
                 case 2:
                   _state.sent();
-                  return [
-                    4,
-                    _this1.setupAfterDevMiddleware()
-                  ];
-                case 3:
-                  afterHandlers = _state.sent();
-                  _this1.addMiddlewareHandler(_to_consumable_array(afters).concat(_to_consumable_array(afterHandlers)));
+                  _this1.addMiddlewareHandler(rsbuildMiddlewares);
+                  _this1.closeCb.push(close);
                   return [
                     4,
                     _superprop_get_onInit().call(_this1, runner, app)
                   ];
-                case 4:
+                case 3:
                   _state.sent();
                   if (dev.watch) {
                     _this1.startWatcher();
@@ -175,6 +187,81 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
         }
       )
     },
+    {
+      key: "close",
+      value: function close() {
+        var _this = this;
+        return _async_to_generator(function() {
+          var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cb, err;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+                _state.label = 1;
+              case 1:
+                _state.trys.push([
+                  1,
+                  6,
+                  7,
+                  8
+                ]);
+                _iterator = _this.closeCb[Symbol.iterator]();
+                _state.label = 2;
+              case 2:
+                if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
+                  return [
+                    3,
+                    5
+                  ];
+                cb = _step.value;
+                return [
+                  4,
+                  cb()
+                ];
+              case 3:
+                _state.sent();
+                _state.label = 4;
+              case 4:
+                _iteratorNormalCompletion = true;
+                return [
+                  3,
+                  2
+                ];
+              case 5:
+                return [
+                  3,
+                  8
+                ];
+              case 6:
+                err = _state.sent();
+                _didIteratorError = true;
+                _iteratorError = err;
+                return [
+                  3,
+                  8
+                ];
+              case 7:
+                try {
+                  if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                  }
+                } finally {
+                  if (_didIteratorError) {
+                    throw _iteratorError;
+                  }
+                }
+                return [
+                  7
+                ];
+              case 8:
+                return [
+                  2
+                ];
+            }
+          });
+        })();
+      }
+    },
     {
       key: "getRenderHandler",
       value: (
@@ -201,133 +288,25 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
     },
     {
       key: "applyDefaultMiddlewares",
-      value: function applyDefaultMiddlewares(app) {
+      value: function applyDefaultMiddlewares() {
         var _this = this;
         return _async_to_generator(function() {
-          var pwd, dev, devMiddleware, conf, isUseStreamingSSR, isUseSSRPreload, _ref, compression, _createProxyHandler, handlers, handleUpgrade, _ref1, connectHistoryApiFallback, historyApiFallbackMiddleware;
+          var pwd;
           return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                pwd = _this.pwd, dev = _this.dev, devMiddleware = _this.devMiddleware, conf = _this.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);
-                  });
-                };
-                if (!(!isUseStreamingSSR(_this.getRoutes()) && !isUseSSRPreload() && dev.compress))
-                  return [
-                    3,
-                    2
-                  ];
-                return [
-                  4,
-                  import("http-compression")
-                ];
-              case 1:
-                _ref = _state.sent(), compression = _ref.default;
-                _this.addHandler(function(ctx, next) {
-                  compression({
-                    gzip: true,
-                    brotli: false
-                  })(ctx.req, ctx.res, next);
-                });
-                _state.label = 2;
-              case 2:
-                _this.addHandler(function(ctx, next) {
-                  ctx.res.setHeader("Access-Control-Allow-Origin", "*");
-                  if (ctx.path.includes("hot-update")) {
-                    ctx.res.setHeader("Access-Control-Allow-Credentials", "false");
-                  }
-                  var confHeaders = dev.headers;
-                  if (confHeaders) {
-                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-                    try {
-                      for (var _iterator = Object.entries(confHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-                        var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], value = _step_value[1];
-                        ctx.res.setHeader(key, value);
-                      }
-                    } catch (err) {
-                      _didIteratorError = true;
-                      _iteratorError = err;
-                    } finally {
-                      try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                          _iterator.return();
-                        }
-                      } finally {
-                        if (_didIteratorError) {
-                          throw _iteratorError;
-                        }
-                      }
-                    }
-                  }
-                  next();
-                });
-                _this.mockHandler = createMockHandler({
-                  pwd
-                });
-                _this.addHandler(function(ctx, next) {
-                  if (_this.mockHandler) {
-                    _this.mockHandler(ctx, next);
-                  } else {
-                    next();
-                  }
-                });
-                if (dev.proxy) {
-                  _createProxyHandler = createProxyHandler(dev.proxy), handlers = _createProxyHandler.handlers, handleUpgrade = _createProxyHandler.handleUpgrade;
-                  app && handleUpgrade(app);
-                  handlers.forEach(function(handler) {
-                    _this.addHandler(handler);
-                  });
-                }
-                devMiddleware.init(app);
-                devMiddleware.on("change", function(stats) {
-                  if (stats.toJson({
-                    all: false
-                  }).name !== "server") {
-                    _this.onRepack({
-                      routes: _this.getRoutes()
-                    });
-                  }
-                });
-                _this.addHandler(function(ctx, next) {
-                  var req = ctx.req, res = ctx.res;
-                  if (devMiddleware.middleware) {
-                    devMiddleware.middleware(req, res, next);
-                  } else {
-                    next();
-                  }
-                });
-                if (!dev.historyApiFallback)
-                  return [
-                    3,
-                    4
-                  ];
-                return [
-                  4,
-                  import("connect-history-api-fallback")
-                ];
-              case 3:
-                _ref1 = _state.sent(), connectHistoryApiFallback = _ref1.default;
-                historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
-                _this.addHandler(function(ctx, next) {
-                  return historyApiFallbackMiddleware(ctx.req, ctx.res, next);
-                });
-                _state.label = 4;
-              case 4:
-                return [
-                  2
-                ];
-            }
+            pwd = _this.pwd;
+            _this.mockHandler = createMockHandler({
+              pwd
+            });
+            _this.addHandler(function(ctx, next) {
+              if (_this.mockHandler) {
+                _this.mockHandler(ctx, next);
+              } else {
+                next();
+              }
+            });
+            return [
+              2
+            ];
           });
         })();
       }
@@ -397,13 +376,14 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
         var _this = this;
         var _this_dev_devMiddleware, _this_dev;
         var 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) {
+        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(function(ctx, next) {
+            var _ctx_res_locals;
             if (isInit) {
               return next();
             }
             isInit = true;
-            if (!ctx.res.locals.webpack) {
+            if (!((_ctx_res_locals = ctx.res.locals) === null || _ctx_res_locals === void 0 ? void 0 : _ctx_res_locals.webpack)) {
               _this.reader.init();
               return next();
             }
@@ -511,7 +491,7 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
       key: "setupStaticMiddleware",
       value: function setupStaticMiddleware(_) {
         return function() {
-          var _ref = _async_to_generator(function(context, next) {
+          var _ref = _async_to_generator(function(_context, next) {
             return _ts_generator(this, function(_state) {
               return [
                 2,
@@ -519,64 +499,12 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
               ];
             });
           });
-          return function(context, next) {
+          return function(_context, next) {
             return _ref.apply(this, arguments);
           };
         }();
       }
     },
-    {
-      key: "setupBeforeDevMiddleware",
-      value: function setupBeforeDevMiddleware() {
-        var _this = this;
-        return _async_to_generator(function() {
-          var runner, conf, dev, setupMids, pluginMids;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                runner = _this.runner, conf = _this.conf, dev = _this.dev;
-                setupMids = dev.before || [];
-                return [
-                  4,
-                  runner.beforeDevServer(conf)
-                ];
-              case 1:
-                pluginMids = _state.sent();
-                return [
-                  2,
-                  _to_consumable_array(setupMids).concat(_to_consumable_array(pluginMids)).flat()
-                ];
-            }
-          });
-        })();
-      }
-    },
-    {
-      key: "setupAfterDevMiddleware",
-      value: function setupAfterDevMiddleware() {
-        var _this = this;
-        return _async_to_generator(function() {
-          var runner, conf, dev, setupMids, pluginMids;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                runner = _this.runner, conf = _this.conf, dev = _this.dev;
-                setupMids = dev.after || [];
-                return [
-                  4,
-                  runner.afterDevServer(conf)
-                ];
-              case 1:
-                pluginMids = _state.sent();
-                return [
-                  2,
-                  _to_consumable_array(pluginMids).concat(_to_consumable_array(setupMids)).flat()
-                ];
-            }
-          });
-        })();
-      }
-    },
     {
       key: "cleanSSRCache",
       value: function cleanSSRCache() {