@modern-js/server 2.48.0 → 2.48.1

package/dist/cjs/constants.js

@@ -31,7 +31,7 @@ const getDefaultDevOptions = () => {
       // By default it is set to "location.hostname"
       host: "",
       // By default it is set to "location.protocol === 'https:' ? 'wss' : 'ws'""
-      protocol: ""
+      protocol: void 0
     },
     https: false,
     devMiddleware: {

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

@@ -31,7 +31,6 @@ __export(dev_middleware_exports, {
   default: () => DevMiddleware
 });
 module.exports = __toCommonJS(dev_middleware_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_events = require("events");
 var import_socketServer = __toESM(require("./socketServer"));
 const noop = () => {
@@ -82,9 +81,6 @@ class DevMiddleware extends import_events.EventEmitter {
   }
   constructor({ dev, devMiddleware }) {
     super();
-    (0, import_define_property._)(this, "middleware", void 0);
-    (0, import_define_property._)(this, "devOptions", void 0);
-    (0, import_define_property._)(this, "socketServer", void 0);
     this.devOptions = dev;
     this.socketServer = new import_socketServer.default(dev);
     if (devMiddleware) {

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

@@ -31,7 +31,6 @@ __export(socketServer_exports, {
   default: () => SocketServer
 });
 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");
 class SocketServer {
@@ -167,12 +166,8 @@ class SocketServer {
     connection.send(message);
   }
   constructor(options) {
-    (0, import_define_property._)(this, "wsServer", void 0);
-    (0, import_define_property._)(this, "sockets", []);
-    (0, import_define_property._)(this, "options", void 0);
-    (0, import_define_property._)(this, "app", void 0);
-    (0, import_define_property._)(this, "stats", void 0);
-    (0, import_define_property._)(this, "timer", null);
+    this.sockets = [];
+    this.timer = null;
     this.options = options;
   }
 }

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

@@ -32,7 +32,6 @@ __export(dependencyTree_exports, {
   defaultIgnores: () => defaultIgnores
 });
 module.exports = __toCommonJS(dependencyTree_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_minimatch = __toESM(require("minimatch"));
 const defaultIgnores = [
   "**/coverage/**",
@@ -90,8 +89,6 @@ class DependencyTree {
     }).length > 0));
   }
   constructor() {
-    (0, import_define_property._)(this, "tree", void 0);
-    (0, import_define_property._)(this, "ignore", void 0);
     this.tree = /* @__PURE__ */ new Map();
     this.ignore = [
       ...defaultIgnores

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

@@ -34,7 +34,6 @@ __export(watcher_exports, {
   mergeWatchOptions: () => mergeWatchOptions
 });
 module.exports = __toCommonJS(watcher_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_dependencyTree = require("./dependencyTree");
@@ -126,8 +125,7 @@ class Watcher {
     return this.watcher.close();
   }
   constructor() {
-    (0, import_define_property._)(this, "dependencyTree", null);
-    (0, import_define_property._)(this, "watcher", void 0);
+    this.dependencyTree = null;
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -31,7 +31,6 @@ __export(statsCache_exports, {
   StatsCache: () => StatsCache
 });
 module.exports = __toCommonJS(statsCache_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_fs = __toESM(require("fs"));
 var import_crypto = __toESM(require("crypto"));
 class StatsCache {
@@ -83,8 +82,8 @@ class StatsCache {
     return import_crypto.default.createHash("md5").update(import_fs.default.readFileSync(filename)).digest("hex");
   }
   constructor() {
-    (0, import_define_property._)(this, "cachedHash", {});
-    (0, import_define_property._)(this, "cachedSize", {});
+    this.cachedHash = {};
+    this.cachedSize = {};
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/server/devServer.js

@@ -31,7 +31,6 @@ __export(devServer_exports, {
   ModernDevServer: () => ModernDevServer
 });
 module.exports = __toCommonJS(devServer_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_http = require("http");
 var import_path = __toESM(require("path"));
 var import_https = require("https");
@@ -170,7 +169,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
   }
   // override the ModernServer renderHandler logic
   getRenderHandler() {
-    if (this.useWorkerSSR) {
+    if (this.useSSRWorker) {
       var _this_conf_server, _conf_security;
       const { distDir, staticGenerate, conf, metaName } = this;
       const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
@@ -311,17 +310,11 @@ class ModernDevServer extends import_prod_server.ModernServer {
   }
   constructor(options) {
     super(options);
-    (0, import_define_property._)(this, "mockHandler", null);
-    (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, "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.mockHandler = null;
+    this.closeCb = [];
     this.appContext = options.appContext;
     this.workDir = this.pwd;
-    this.useWorkerSSR = Boolean(options.useWorkerSSR);
+    this.useSSRWorker = Boolean(options.useSSRWorker);
     this.dev = this.getDevOptions(options);
     this.getMiddlewares = options.getMiddlewares;
     this.rsbuild = options.rsbuild;

package/dist/cjs/server/devServerOld.js

@@ -31,7 +31,6 @@ __export(devServerOld_exports, {
   ModernDevServer: () => ModernDevServer
 });
 module.exports = __toCommonJS(devServerOld_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_http = require("http");
 var import_path = __toESM(require("path"));
 var import_https = require("https");
@@ -105,7 +104,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
   }
   // override the ModernServer renderHandler logic
   getRenderHandler() {
-    if (this.useWorkerSSR) {
+    if (this.useSSRWorker) {
       var _this_conf_server, _conf_security;
       const { distDir, staticGenerate, conf, metaName } = this;
       const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
@@ -329,15 +328,10 @@ class ModernDevServer extends import_prod_server.ModernServer {
   }
   constructor(options) {
     super(options);
-    (0, import_define_property._)(this, "mockHandler", null);
-    (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, "watcher", void 0);
+    this.mockHandler = null;
     this.appContext = options.appContext;
     this.workDir = this.pwd;
-    this.useWorkerSSR = Boolean(options.useWorkerSSR);
+    this.useSSRWorker = Boolean(options.useSSRWorker);
     this.dev = this.getDevOptions(options);
     this.devMiddleware = new import_dev_middleware.default({
       dev: this.dev,

package/dist/cjs/server/workerSSRRender.js

@@ -37,7 +37,7 @@ const PORT = 9230;
 async function workerSSRRender(ctx, renderOptions, _runner) {
   const { headers, params } = ctx;
   const { urlPath } = renderOptions.route;
-  const url = `http://0.0.0.0:${PORT}/${urlPath}`;
+  const url = urlPath.startsWith("/") ? `http://0.0.0.0:${PORT}${urlPath}` : `http://0.0.0.0:${PORT}/${urlPath}`;
   const resposne = await import_axios.default.get(url, {
     timeout: 5e3,
     responseType: "text",

package/dist/esm/constants.js

@@ -8,7 +8,7 @@ var getDefaultDevOptions = function() {
       // By default it is set to "location.hostname"
       host: "",
       // By default it is set to "location.protocol === 'https:' ? 'wss' : 'ws'""
-      protocol: ""
+      protocol: void 0
     },
     https: false,
     devMiddleware: {

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

@@ -1,8 +1,5 @@
-import { _ as _assert_this_initialized } from "@swc/helpers/_/_assert_this_initialized";
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _inherits } from "@swc/helpers/_/_inherits";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _create_super } from "@swc/helpers/_/_create_super";
@@ -28,9 +25,6 @@ var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
     _class_call_check(this, DevMiddleware2);
     var _this;
     _this = _super.call(this);
-    _define_property(_assert_this_initialized(_this), "middleware", void 0);
-    _define_property(_assert_this_initialized(_this), "devOptions", void 0);
-    _define_property(_assert_this_initialized(_this), "socketServer", void 0);
     _this.devOptions = dev;
     _this.socketServer = new SocketServer(dev);
     if (devMiddleware) {
@@ -38,59 +32,49 @@ var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
     }
     return _this;
   }
-  _create_class(DevMiddleware2, [
-    {
-      key: "init",
-      value: function init(app) {
-        var _this = this;
-        app.on("listening", function() {
-          _this.socketServer.prepare(app);
-        });
-        var _this1 = this;
-        app.on("close", /* @__PURE__ */ _async_to_generator(function() {
-          var _this_middleware;
-          return _ts_generator(this, function(_state) {
-            (_this_middleware = _this1.middleware) === null || _this_middleware === void 0 ? void 0 : _this_middleware.close(noop);
-            _this1.socketServer.close();
-            return [
-              2
-            ];
-          });
-        }));
+  var _proto = DevMiddleware2.prototype;
+  _proto.init = function init(app) {
+    var _this = this;
+    app.on("listening", function() {
+      _this.socketServer.prepare(app);
+    });
+    var _this1 = this;
+    app.on("close", /* @__PURE__ */ _async_to_generator(function() {
+      var _this_middleware;
+      return _ts_generator(this, function(_state) {
+        (_this_middleware = _this1.middleware) === null || _this_middleware === void 0 ? void 0 : _this_middleware.close(noop);
+        _this1.socketServer.close();
+        return [
+          2
+        ];
+      });
+    }));
+  };
+  _proto.sockWrite = function sockWrite(type, data) {
+    this.socketServer.sockWrite(type, data);
+  };
+  _proto.setupDevMiddleware = function setupDevMiddleware(devMiddleware) {
+    var _this = this;
+    var devOptions = this.devOptions;
+    var callbacks = {
+      onInvalid: function() {
+        _this.socketServer.sockWrite("invalid");
+      },
+      onDone: function(stats) {
+        _this.socketServer.updateStats(stats);
+        _this.emit("change", stats);
       }
-    },
-    {
-      key: "sockWrite",
-      value: function sockWrite(type, data) {
-        this.socketServer.sockWrite(type, data);
-      }
-    },
-    {
-      key: "setupDevMiddleware",
-      value: function setupDevMiddleware(devMiddleware) {
-        var _this = this;
-        var devOptions = this.devOptions;
-        var callbacks = {
-          onInvalid: function() {
-            _this.socketServer.sockWrite("invalid");
-          },
-          onDone: function(stats) {
-            _this.socketServer.updateStats(stats);
-            _this.emit("change", stats);
-          }
-        };
-        var enableHMR = this.devOptions.hot || this.devOptions.liveReload;
-        var middleware = devMiddleware(_object_spread({
-          headers: devOptions.headers,
-          stats: false,
-          callbacks,
-          hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
-          serverSideRender: true
-        }, devOptions.devMiddleware));
-        return middleware;
-      }
-    }
-  ]);
+    };
+    var enableHMR = this.devOptions.hot || this.devOptions.liveReload;
+    var middleware = devMiddleware(_object_spread({
+      headers: devOptions.headers,
+      stats: false,
+      callbacks,
+      hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
+      serverSideRender: true
+    }, devOptions.devMiddleware));
+    return middleware;
+  };
   return DevMiddleware2;
 }(EventEmitter);
 export {

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

@@ -1,196 +1,147 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import ws from "ws";
 import { logger } from "@modern-js/utils";
 var SocketServer = /* @__PURE__ */ function() {
   "use strict";
   function SocketServer2(options) {
     _class_call_check(this, SocketServer2);
-    _define_property(this, "wsServer", void 0);
-    _define_property(this, "sockets", []);
-    _define_property(this, "options", void 0);
-    _define_property(this, "app", void 0);
-    _define_property(this, "stats", void 0);
-    _define_property(this, "timer", null);
+    this.sockets = [];
+    this.timer = null;
     this.options = options;
   }
-  _create_class(SocketServer2, [
-    {
-      key: "prepare",
-      value: (
-        // create socket, install socket handler, bind socket event
-        function prepare(app) {
-          var _this = this;
-          var _this_options_client;
-          this.app = app;
-          this.wsServer = new ws.Server({
-            noServer: true,
-            path: (_this_options_client = this.options.client) === null || _this_options_client === void 0 ? void 0 : _this_options_client.path
-          });
-          this.app.on("upgrade", function(req, sock, head) {
-            if (!_this.wsServer.shouldHandle(req)) {
-              return;
-            }
-            _this.wsServer.handleUpgrade(req, sock, head, function(connection) {
-              _this.wsServer.emit("connection", connection, req);
-            });
-          });
-          this.wsServer.on("error", function(err) {
-            logger.error(err);
-          });
-          this.timer = setInterval(function() {
-            _this.wsServer.clients.forEach(function(socket) {
-              var extWs = socket;
-              if (!extWs.isAlive) {
-                extWs.terminate();
-              } else {
-                extWs.isAlive = false;
-                extWs.ping(function() {
-                });
-              }
-            });
-          }, 3e4);
-          this.wsServer.on("connection", function(socket) {
-            _this.onConnect(socket);
-          });
-        }
-      )
-    },
-    {
-      key: "updateStats",
-      value: function updateStats(stats) {
-        this.stats = stats;
-        this.sendStats();
+  var _proto = SocketServer2.prototype;
+  _proto.prepare = function prepare(app) {
+    var _this = this;
+    var _this_options_client;
+    this.app = app;
+    this.wsServer = new ws.Server({
+      noServer: true,
+      path: (_this_options_client = this.options.client) === null || _this_options_client === void 0 ? void 0 : _this_options_client.path
+    });
+    this.app.on("upgrade", function(req, sock, head) {
+      if (!_this.wsServer.shouldHandle(req)) {
+        return;
       }
-    },
-    {
-      key: "sockWrite",
-      value: (
-        // write message to each socket
-        function sockWrite(type, data) {
-          var _this = this;
-          this.sockets.forEach(function(socket) {
-            _this.send(socket, JSON.stringify({
-              type,
-              data
-            }));
+      _this.wsServer.handleUpgrade(req, sock, head, function(connection) {
+        _this.wsServer.emit("connection", connection, req);
+      });
+    });
+    this.wsServer.on("error", function(err) {
+      logger.error(err);
+    });
+    this.timer = setInterval(function() {
+      _this.wsServer.clients.forEach(function(socket) {
+        var extWs = socket;
+        if (!extWs.isAlive) {
+          extWs.terminate();
+        } else {
+          extWs.isAlive = false;
+          extWs.ping(function() {
           });
         }
-      )
-    },
-    {
-      key: "singleWrite",
-      value: function singleWrite(socket, type, data) {
-        this.send(socket, JSON.stringify({
-          type,
-          data
-        }));
-      }
-    },
-    {
-      key: "close",
-      value: function close() {
-        this.sockets.forEach(function(socket) {
-          socket.close();
-        });
-        if (this.timer) {
-          clearInterval(this.timer);
-          this.timer = null;
-        }
-      }
-    },
-    {
-      key: "onConnect",
-      value: function onConnect(socket) {
-        var _this = this;
-        var connection = socket;
-        connection.isAlive = true;
-        connection.on("pong", function() {
-          connection.isAlive = true;
-        });
-        if (!connection) {
-          return;
-        }
-        this.sockets.push(connection);
-        connection.on("close", function() {
-          var idx = _this.sockets.indexOf(connection);
-          if (idx >= 0) {
-            _this.sockets.splice(idx, 1);
-          }
-        });
-        if (this.options.hot) {
-          this.singleWrite(connection, "hot");
-        }
-        if (this.options.liveReload) {
-          this.singleWrite(connection, "liveReload");
-        }
-        if (this.stats) {
-          this.sendStats(true);
-        }
+      });
+    }, 3e4);
+    this.wsServer.on("connection", function(socket) {
+      _this.onConnect(socket);
+    });
+  };
+  _proto.updateStats = function updateStats(stats) {
+    this.stats = stats;
+    this.sendStats();
+  };
+  _proto.sockWrite = function sockWrite(type, data) {
+    var _this = this;
+    this.sockets.forEach(function(socket) {
+      _this.send(socket, JSON.stringify({
+        type,
+        data
+      }));
+    });
+  };
+  _proto.singleWrite = function singleWrite(socket, type, data) {
+    this.send(socket, JSON.stringify({
+      type,
+      data
+    }));
+  };
+  _proto.close = function close() {
+    this.sockets.forEach(function(socket) {
+      socket.close();
+    });
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  };
+  _proto.onConnect = function onConnect(socket) {
+    var _this = this;
+    var connection = socket;
+    connection.isAlive = true;
+    connection.on("pong", function() {
+      connection.isAlive = true;
+    });
+    if (!connection) {
+      return;
+    }
+    this.sockets.push(connection);
+    connection.on("close", function() {
+      var idx = _this.sockets.indexOf(connection);
+      if (idx >= 0) {
+        _this.sockets.splice(idx, 1);
       }
-    },
-    {
-      key: "getStats",
-      value: (
-        // get standard stats
-        function getStats() {
-          var curStats = this.stats;
-          if (!curStats) {
-            return null;
-          }
-          var defaultStats = {
-            all: false,
-            hash: true,
-            assets: true,
-            warnings: true,
-            errors: true,
-            errorDetails: false
-          };
-          return curStats.toJson(defaultStats);
-        }
-      )
-    },
-    {
-      key: "sendStats",
-      value: (
-        // determine what message should send by stats
-        function sendStats() {
-          var force = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
-          var stats = this.getStats();
-          if (!stats) {
-            return null;
-          }
-          var shouldEmit = !force && stats && (!stats.errors || stats.errors.length === 0) && stats.assets && stats.assets.every(function(asset) {
-            return !asset.emitted;
-          });
-          if (shouldEmit) {
-            return this.sockWrite("still-ok");
-          }
-          this.sockWrite("hash", stats.hash);
-          if (stats.errors && stats.errors.length > 0) {
-            return this.sockWrite("errors", stats.errors);
-          } else if (stats.warnings && stats.warnings.length > 0) {
-            return this.sockWrite("warnings", stats.warnings);
-          } else {
-            return this.sockWrite("ok");
-          }
-        }
-      )
-    },
-    {
-      key: "send",
-      value: (
-        // send message to connecting socket
-        function send(connection, message) {
-          if (connection.readyState !== 1) {
-            return;
-          }
-          connection.send(message);
-        }
-      )
+    });
+    if (this.options.hot) {
+      this.singleWrite(connection, "hot");
+    }
+    if (this.options.liveReload) {
+      this.singleWrite(connection, "liveReload");
+    }
+    if (this.stats) {
+      this.sendStats(true);
+    }
+  };
+  _proto.getStats = function getStats() {
+    var curStats = this.stats;
+    if (!curStats) {
+      return null;
+    }
+    var defaultStats = {
+      all: false,
+      hash: true,
+      assets: true,
+      warnings: true,
+      errors: true,
+      errorDetails: false
+    };
+    return curStats.toJson(defaultStats);
+  };
+  _proto.sendStats = function sendStats() {
+    var force = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
+    var stats = this.getStats();
+    if (!stats) {
+      return null;
+    }
+    var shouldEmit = !force && stats && (!stats.errors || stats.errors.length === 0) && stats.assets && stats.assets.every(function(asset) {
+      return !asset.emitted;
+    });
+    if (shouldEmit) {
+      return this.sockWrite("still-ok");
+    }
+    this.sockWrite("hash", stats.hash);
+    if (stats.errors && stats.errors.length > 0) {
+      return this.sockWrite("errors", stats.errors);
+    } else if (stats.warnings && stats.warnings.length > 0) {
+      return this.sockWrite("warnings", stats.warnings);
+    } else {
+      return this.sockWrite("ok");
+    }
+  };
+  _proto.send = function send(connection, message) {
+    if (connection.readyState !== 1) {
+      return;
     }
-  ]);
+    connection.send(message);
+  };
   return SocketServer2;
 }();
 export {