@modern-js/server 2.48.0 → 2.48.2

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 {

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

@@ -1,6 +1,4 @@
 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 _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import minimatch from "minimatch";
 var defaultIgnores = [
@@ -14,93 +12,74 @@ var DependencyTree = /* @__PURE__ */ function() {
   "use strict";
   function DependencyTree2() {
     _class_call_check(this, DependencyTree2);
-    _define_property(this, "tree", void 0);
-    _define_property(this, "ignore", void 0);
     this.tree = /* @__PURE__ */ new Map();
     this.ignore = _to_consumable_array(defaultIgnores);
   }
-  _create_class(DependencyTree2, [
-    {
-      key: "getNode",
-      value: function getNode(path) {
-        return this.tree.get(path);
+  var _proto = DependencyTree2.prototype;
+  _proto.getNode = function getNode(path) {
+    return this.tree.get(path);
+  };
+  _proto.update = function update(cache) {
+    var _this = this;
+    this.tree.clear();
+    Object.keys(cache).forEach(function(path) {
+      if (!_this.shouldIgnore(path)) {
+        var module = cache[path];
+        _this.tree.set(module.filename, {
+          module,
+          parent: /* @__PURE__ */ new Set(),
+          children: /* @__PURE__ */ new Set()
+        });
       }
-    },
-    {
-      key: "update",
-      value: (
-        /**
-        * update dependency tree
-        *
-        * @param cache
-        */
-        function update(cache) {
-          var _this = this;
-          this.tree.clear();
-          Object.keys(cache).forEach(function(path) {
-            if (!_this.shouldIgnore(path)) {
-              var module = cache[path];
-              _this.tree.set(module.filename, {
-                module,
-                parent: /* @__PURE__ */ new Set(),
-                children: /* @__PURE__ */ new Set()
-              });
-            }
-          });
-          var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-          try {
-            var _this1 = this, _loop = function() {
-              var treeNode = _step.value;
-              var parent = treeNode.module.parent;
-              var children = treeNode.module.children;
-              if (parent && !_this1.shouldIgnore(parent.filename)) {
-                var parentTreeNode = _this1.tree.get(parent.filename);
-                if (parentTreeNode) {
-                  treeNode.parent.add(parentTreeNode);
-                }
-              }
-              children.forEach(function(child) {
-                if (!_this.shouldIgnore(child.filename)) {
-                  var childTreeNode = _this.tree.get(child.filename);
-                  if (childTreeNode) {
-                    treeNode.children.add(childTreeNode);
-                    childTreeNode.parent.add(treeNode);
-                  }
-                }
-              });
-            };
-            for (var _iterator = this.tree.values()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)
-              _loop();
-          } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-              }
-            } finally {
-              if (_didIteratorError) {
-                throw _iteratorError;
-              }
+    });
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+    try {
+      var _this1 = this, _loop = function() {
+        var treeNode = _step.value;
+        var parent = treeNode.module.parent;
+        var children = treeNode.module.children;
+        if (parent && !_this1.shouldIgnore(parent.filename)) {
+          var parentTreeNode = _this1.tree.get(parent.filename);
+          if (parentTreeNode) {
+            treeNode.parent.add(parentTreeNode);
+          }
+        }
+        children.forEach(function(child) {
+          if (!_this.shouldIgnore(child.filename)) {
+            var childTreeNode = _this.tree.get(child.filename);
+            if (childTreeNode) {
+              treeNode.children.add(childTreeNode);
+              childTreeNode.parent.add(treeNode);
             }
           }
+        });
+      };
+      for (var _iterator = this.tree.values()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)
+        _loop();
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
         }
-      )
-    },
-    {
-      key: "shouldIgnore",
-      value: function shouldIgnore(path) {
-        return !path || Boolean(this.ignore.find(function(rule) {
-          return minimatch.match([
-            path
-          ], rule, {
-            dot: true
-          }).length > 0;
-        }));
       }
     }
-  ]);
+  };
+  _proto.shouldIgnore = function shouldIgnore(path) {
+    return !path || Boolean(this.ignore.find(function(rule) {
+      return minimatch.match([
+        path
+      ], rule, {
+        dot: true
+      }).length > 0;
+    }));
+  };
   return DependencyTree2;
 }();
 export {

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

@@ -1,6 +1,4 @@
 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 _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import path from "path";
@@ -42,93 +40,76 @@ var Watcher = /* @__PURE__ */ function() {
   "use strict";
   function Watcher2() {
     _class_call_check(this, Watcher2);
-    _define_property(this, "dependencyTree", null);
-    _define_property(this, "watcher", void 0);
+    this.dependencyTree = null;
   }
-  _create_class(Watcher2, [
-    {
-      key: "listen",
-      value: function listen(files, options, callback) {
-        var watched = files.filter(Boolean);
-        var filenames = watched.map(function(filename) {
-          return filename.replace(/\\/g, "/");
-        });
-        var cache = new StatsCache();
-        var watcher = chokidar.watch(filenames, options);
-        watcher.on("ready", function() {
-          cache.add(getWatchedFiles(watcher));
-        });
-        watcher.on("change", function(changed) {
-          if (!fs.existsSync(changed) || cache.isDiff(changed)) {
-            cache.refresh(changed);
-            callback(changed, "change");
-          }
-        });
-        watcher.on("add", function(changed) {
-          if (!cache.has(changed)) {
-            cache.add([
-              changed
-            ]);
-            callback(changed, "add");
-          }
-        });
-        watcher.on("unlink", function(changed) {
-          cache.del(changed);
-          callback(changed, "unlink");
-        });
-        this.watcher = watcher;
-      }
-    },
-    {
-      key: "createDepTree",
-      value: function createDepTree() {
-        this.dependencyTree = new DependencyTree();
+  var _proto = Watcher2.prototype;
+  _proto.listen = function listen(files, options, callback) {
+    var watched = files.filter(Boolean);
+    var filenames = watched.map(function(filename) {
+      return filename.replace(/\\/g, "/");
+    });
+    var cache = new StatsCache();
+    var watcher = chokidar.watch(filenames, options);
+    watcher.on("ready", function() {
+      cache.add(getWatchedFiles(watcher));
+    });
+    watcher.on("change", function(changed) {
+      if (!fs.existsSync(changed) || cache.isDiff(changed)) {
+        cache.refresh(changed);
+        callback(changed, "change");
       }
-    },
-    {
-      key: "updateDepTree",
-      value: function updateDepTree() {
-        var _this_dependencyTree;
-        (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.update(require.cache);
+    });
+    watcher.on("add", function(changed) {
+      if (!cache.has(changed)) {
+        cache.add([
+          changed
+        ]);
+        callback(changed, "add");
       }
-    },
-    {
-      key: "cleanDepCache",
-      value: function cleanDepCache(filepath) {
-        var _this_dependencyTree;
-        var node = (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.getNode(filepath);
-        if (node && require.cache[filepath]) {
-          delete require.cache[filepath];
-          var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-          try {
-            for (var _iterator = node.parent.values()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-              var parentNode = _step.value;
-              this.cleanDepCache(parentNode.module.filename);
-            }
-          } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-              }
-            } finally {
-              if (_didIteratorError) {
-                throw _iteratorError;
-              }
-            }
+    });
+    watcher.on("unlink", function(changed) {
+      cache.del(changed);
+      callback(changed, "unlink");
+    });
+    this.watcher = watcher;
+  };
+  _proto.createDepTree = function createDepTree() {
+    this.dependencyTree = new DependencyTree();
+  };
+  _proto.updateDepTree = function updateDepTree() {
+    var _this_dependencyTree;
+    (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.update(require.cache);
+  };
+  _proto.cleanDepCache = function cleanDepCache(filepath) {
+    var _this_dependencyTree;
+    var node = (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.getNode(filepath);
+    if (node && require.cache[filepath]) {
+      delete require.cache[filepath];
+      var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+      try {
+        for (var _iterator = node.parent.values()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var parentNode = _step.value;
+          this.cleanDepCache(parentNode.module.filename);
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
           }
         }
       }
-    },
-    {
-      key: "close",
-      value: function close() {
-        return this.watcher.close();
-      }
     }
-  ]);
+  };
+  _proto.close = function close() {
+    return this.watcher.close();
+  };
   return Watcher2;
 }();
 export {