@modern-js/server 2.15.0 → 2.16.0

package/dist/esm/server/index.js

@@ -1,92 +1,96 @@
-function _assertThisInitialized(self) {
-    if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
+function _assert_this_initialized(self) {
+  if (self === void 0) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+  return self;
 }
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
+function _class_call_check(instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
 }
-function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-        return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
+function _get_prototype_of(o) {
+  _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o2) {
+    return o2.__proto__ || Object.getPrototypeOf(o2);
+  };
+  return _get_prototype_of(o);
 }
 function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-        throw new TypeError("Super expression must either be null or a function");
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function");
+  }
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      writable: true,
+      configurable: true
     }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-        constructor: {
-            value: subClass,
-            writable: true,
-            configurable: true
-        }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
+  });
+  if (superClass)
+    _set_prototype_of(subClass, superClass);
 }
-function _possibleConstructorReturn(self, call) {
-    if (call && (_typeof(call) === "object" || typeof call === "function")) {
-        return call;
-    }
-    return _assertThisInitialized(self);
+function _possible_constructor_return(self, call) {
+  if (call && (_type_of(call) === "object" || typeof call === "function")) {
+    return call;
+  }
+  return _assert_this_initialized(self);
 }
-function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-        o.__proto__ = p;
-        return o;
-    };
-    return _setPrototypeOf(o, p);
+function _set_prototype_of(o, p) {
+  _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o2, p2) {
+    o2.__proto__ = p2;
+    return o2;
+  };
+  return _set_prototype_of(o, p);
 }
-var _typeof = function(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-};
-function _isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-    try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
+function _type_of(obj) {
+  "@swc/helpers - typeof";
+  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function _is_native_reflect_construct() {
+  if (typeof Reflect === "undefined" || !Reflect.construct)
+    return false;
+  if (Reflect.construct.sham)
+    return false;
+  if (typeof Proxy === "function")
+    return true;
+  try {
+    Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {
+    }));
+    return true;
+  } catch (e) {
+    return false;
+  }
 }
-function _createSuper(Derived) {
-    var hasNativeReflectConstruct = _isNativeReflectConstruct();
-    return function _createSuperInternal() {
-        var Super = _getPrototypeOf(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _getPrototypeOf(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possibleConstructorReturn(this, result);
-    };
+function _create_super(Derived) {
+  var hasNativeReflectConstruct = _is_native_reflect_construct();
+  return function _createSuperInternal() {
+    var Super = _get_prototype_of(Derived), result;
+    if (hasNativeReflectConstruct) {
+      var NewTarget = _get_prototype_of(this).constructor;
+      result = Reflect.construct(Super, arguments, NewTarget);
+    } else {
+      result = Super.apply(this, arguments);
+    }
+    return _possible_constructor_return(this, result);
+  };
 }
 import { Server } from "@modern-js/prod-server";
 import { ModernDevServer } from "./devServer";
 var createDevServer = function(options) {
-    return new ModernDevServer(options);
+  return new ModernDevServer(options);
 };
-var DevServer = /*#__PURE__*/ function(Server) {
-    "use strict";
-    _inherits(DevServer, Server);
-    var _super = _createSuper(DevServer);
-    function DevServer(options) {
-        _classCallCheck(this, DevServer);
-        var _this;
-        _this = _super.call(this, options);
-        if (options.dev) {
-            _this.serverImpl = createDevServer;
-        }
-        return _this;
+export var DevServer = /* @__PURE__ */ function(Server2) {
+  "use strict";
+  _inherits(DevServer2, Server2);
+  var _super = _create_super(DevServer2);
+  function DevServer2(options) {
+    _class_call_check(this, DevServer2);
+    var _this;
+    _this = _super.call(this, options);
+    if (options.dev) {
+      _this.serverImpl = createDevServer;
     }
-    return DevServer;
+    return _this;
+  }
+  return DevServer2;
 }(Server);
-export { DevServer };

package/dist/esm/types.js

@@ -1 +1 @@
-"use strict";
+export {};

package/dist/esm-node/constants.js

@@ -1,5 +1,5 @@
 import { HMR_SOCK_PATH } from "@modern-js/utils/universal/constants";
-const getDefaultDevOptions = () => {
+export const getDefaultDevOptions = () => {
   return {
     client: {
       path: HMR_SOCK_PATH,
@@ -11,12 +11,11 @@ const getDefaultDevOptions = () => {
       protocol: ""
     },
     https: false,
-    devMiddleware: { writeToDisk: true },
+    devMiddleware: {
+      writeToDisk: true
+    },
     watch: true,
     hot: true,
     liveReload: true
   };
 };
-export {
-  getDefaultDevOptions
-};

package/dist/esm-node/dev-tools/dev-middleware/hmr-client/createSocketUrl.js

@@ -1,5 +1,5 @@
 import { HMR_SOCK_PATH } from "@modern-js/utils/universal/constants";
-function createSocketUrl(resourceQuery) {
+export function createSocketUrl(resourceQuery) {
   const searchParams = resourceQuery.substr(1).split("&");
   const options = {};
   for (const pair of searchParams) {
@@ -9,12 +9,7 @@ function createSocketUrl(resourceQuery) {
   const currentLocation = self.location;
   return getSocketUrl(options, currentLocation);
 }
-function formatURL({
-  port,
-  protocol,
-  hostname,
-  pathname
-}) {
+export function formatURL({ port, protocol, hostname, pathname }) {
   if (window.URL) {
     const url = new URL("http://localhost");
     url.port = port;
@@ -35,7 +30,3 @@ function getSocketUrl(urlParts, location) {
     pathname: path || HMR_SOCK_PATH
   });
 }
-export {
-  createSocketUrl,
-  formatURL
-};

package/dist/esm-node/dev-tools/dev-middleware/hmr-client/index.js

@@ -1,150 +1,136 @@
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 import stripAnsi from "@modern-js/utils/strip-ansi";
 import { formatWebpackMessages } from "@modern-js/utils/universal/format-webpack";
 import { createSocketUrl } from "./createSocketUrl";
-var require_hmr_client = __commonJS({
-  "src/dev-tools/dev-middleware/hmr-client/index.ts"(exports, module) {
-    const hadRuntimeError = false;
-    const socketUrl = createSocketUrl(__resourceQuery);
-    const connection = new WebSocket(socketUrl);
-    connection.onopen = function() {
-      if (typeof console !== "undefined" && typeof console.debug === "function") {
-        console.debug("[HMR] connected.");
-      }
-    };
-    connection.onclose = function() {
-      if (typeof console !== "undefined" && typeof console.info === "function") {
-        console.debug("[HMR] disconnected. Refresh the page if necessary.");
-      }
-    };
-    let isFirstCompilation = true;
-    let mostRecentCompilationHash = null;
-    let hasCompileErrors = false;
-    function clearOutdatedErrors() {
-      if (typeof console !== "undefined" && typeof console.clear === "function") {
-        if (hasCompileErrors) {
-          console.clear();
-        }
-      }
-    }
-    function handleSuccess() {
-      clearOutdatedErrors();
-      const isHotUpdate = !isFirstCompilation;
-      isFirstCompilation = false;
-      hasCompileErrors = false;
-      if (isHotUpdate) {
-        tryApplyUpdates();
-      }
-    }
-    function handleWarnings(warnings) {
-      clearOutdatedErrors();
-      const isHotUpdate = !isFirstCompilation;
-      isFirstCompilation = false;
-      hasCompileErrors = false;
-      function printWarnings() {
-        const formatted = formatWebpackMessages({
-          warnings,
-          errors: []
-        });
-        if (typeof console !== "undefined" && typeof console.warn === "function") {
-          for (let i = 0; i < formatted.warnings.length; i++) {
-            if (i === 5) {
-              console.warn(
-                "There were more warnings in other files.\nYou can find a complete log in the terminal."
-              );
-              break;
-            }
-            console.warn(stripAnsi(formatted.warnings[i]));
-          }
-        }
-      }
-      printWarnings();
-      if (isHotUpdate) {
-        tryApplyUpdates();
-      }
+const hadRuntimeError = false;
+const socketUrl = createSocketUrl(__resourceQuery);
+const connection = new WebSocket(socketUrl);
+connection.onopen = function() {
+  if (typeof console !== "undefined" && typeof console.debug === "function") {
+    console.debug("[HMR] connected.");
+  }
+};
+connection.onclose = function() {
+  if (typeof console !== "undefined" && typeof console.info === "function") {
+    console.debug("[HMR] disconnected. Refresh the page if necessary.");
+  }
+};
+let isFirstCompilation = true;
+let mostRecentCompilationHash = null;
+let hasCompileErrors = false;
+function clearOutdatedErrors() {
+  if (typeof console !== "undefined" && typeof console.clear === "function") {
+    if (hasCompileErrors) {
+      console.clear();
     }
-    function handleErrors(errors) {
-      clearOutdatedErrors();
-      isFirstCompilation = false;
-      hasCompileErrors = true;
-      const formatted = formatWebpackMessages({
-        errors,
-        warnings: []
-      });
-      if (typeof console !== "undefined" && typeof console.error === "function") {
-        for (const error of formatted.errors) {
-          console.error(stripAnsi(error));
+  }
+}
+function handleSuccess() {
+  clearOutdatedErrors();
+  const isHotUpdate = !isFirstCompilation;
+  isFirstCompilation = false;
+  hasCompileErrors = false;
+  if (isHotUpdate) {
+    tryApplyUpdates();
+  }
+}
+function handleWarnings(warnings) {
+  clearOutdatedErrors();
+  const isHotUpdate = !isFirstCompilation;
+  isFirstCompilation = false;
+  hasCompileErrors = false;
+  function printWarnings() {
+    const formatted = formatWebpackMessages({
+      warnings,
+      errors: []
+    });
+    if (typeof console !== "undefined" && typeof console.warn === "function") {
+      for (let i = 0; i < formatted.warnings.length; i++) {
+        if (i === 5) {
+          console.warn("There were more warnings in other files.\nYou can find a complete log in the terminal.");
+          break;
         }
+        console.warn(stripAnsi(formatted.warnings[i]));
       }
     }
-    function handleAvailableHash(hash) {
-      mostRecentCompilationHash = hash;
-    }
-    connection.onmessage = function(e) {
-      const message = JSON.parse(e.data);
-      switch (message.type) {
-        case "hash":
-          handleAvailableHash(message.data);
-          break;
-        case "still-ok":
-        case "ok":
-          handleSuccess();
-          break;
-        case "content-changed":
-          window.location.reload();
-          break;
-        case "warnings":
-          handleWarnings(message.data);
-          break;
-        case "errors":
-          handleErrors(message.data);
-          break;
-        default:
-      }
-    };
-    function isUpdateAvailable() {
-      return mostRecentCompilationHash !== __webpack_hash__;
+  }
+  printWarnings();
+  if (isHotUpdate) {
+    tryApplyUpdates();
+  }
+}
+function handleErrors(errors) {
+  clearOutdatedErrors();
+  isFirstCompilation = false;
+  hasCompileErrors = true;
+  const formatted = formatWebpackMessages({
+    errors,
+    warnings: []
+  });
+  if (typeof console !== "undefined" && typeof console.error === "function") {
+    for (const error of formatted.errors) {
+      console.error(stripAnsi(error));
     }
-    function canApplyUpdates() {
-      return module.hot.status() === "idle";
+  }
+}
+function handleAvailableHash(hash) {
+  mostRecentCompilationHash = hash;
+}
+connection.onmessage = function(e) {
+  const message = JSON.parse(e.data);
+  switch (message.type) {
+    case "hash":
+      handleAvailableHash(message.data);
+      break;
+    case "still-ok":
+    case "ok":
+      handleSuccess();
+      break;
+    case "content-changed":
+      window.location.reload();
+      break;
+    case "warnings":
+      handleWarnings(message.data);
+      break;
+    case "errors":
+      handleErrors(message.data);
+      break;
+    default:
+  }
+};
+function isUpdateAvailable() {
+  return mostRecentCompilationHash !== __webpack_hash__;
+}
+function canApplyUpdates() {
+  return module.hot.status() === "idle";
+}
+function tryApplyUpdates() {
+  if (!module.hot) {
+    window.location.reload();
+    return;
+  }
+  if (!isUpdateAvailable() || !canApplyUpdates()) {
+    return;
+  }
+  function handleApplyUpdates(err, updatedModules) {
+    const wantsForcedReload = err || !updatedModules || hadRuntimeError;
+    if (wantsForcedReload) {
+      window.location.reload();
+      return;
     }
-    function tryApplyUpdates() {
-      if (!module.hot) {
-        window.location.reload();
-        return;
-      }
-      if (!isUpdateAvailable() || !canApplyUpdates()) {
-        return;
-      }
-      function handleApplyUpdates(err, updatedModules) {
-        const wantsForcedReload = err || !updatedModules || hadRuntimeError;
-        if (wantsForcedReload) {
-          window.location.reload();
-          return;
-        }
-        if (isUpdateAvailable()) {
-          tryApplyUpdates();
-        }
-      }
-      const result = module.hot.check(
-        /* autoApply */
-        true,
-        handleApplyUpdates
-      );
-      if (result == null ? void 0 : result.then) {
-        result.then(
-          (updatedModules) => {
-            handleApplyUpdates(null, updatedModules);
-          },
-          (err) => {
-            handleApplyUpdates(err, null);
-          }
-        );
-      }
+    if (isUpdateAvailable()) {
+      tryApplyUpdates();
     }
   }
-});
-export default require_hmr_client();
+  const result = module.hot.check(
+    /* autoApply */
+    true,
+    handleApplyUpdates
+  );
+  if (result === null || result === void 0 ? void 0 : result.then) {
+    result.then((updatedModules) => {
+      handleApplyUpdates(null, updatedModules);
+    }, (err) => {
+      handleApplyUpdates(err, null);
+    });
+  }
+}

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

@@ -1,31 +1,36 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import { EventEmitter } from "events";
 import SocketServer from "./socketServer";
 const noop = () => {
 };
 function getHMRClientPath(client) {
-  const protocol = (client == null ? void 0 : client.protocol) ? `&protocol=${client.protocol}` : "";
-  const host = (client == null ? void 0 : client.host) ? `&host=${client.host}` : "";
-  const path = (client == null ? void 0 : client.path) ? `&path=${client.path}` : "";
-  const port = (client == null ? void 0 : client.port) ? `&port=${client.port}` : "";
+  const protocol = (client === null || client === void 0 ? void 0 : client.protocol) ? `&protocol=${client.protocol}` : "";
+  const host = (client === null || client === void 0 ? void 0 : client.host) ? `&host=${client.host}` : "";
+  const path = (client === null || client === void 0 ? void 0 : client.path) ? `&path=${client.path}` : "";
+  const port = (client === null || client === void 0 ? void 0 : client.port) ? `&port=${client.port}` : "";
   const clientEntry = `${require.resolve("@modern-js/server/hmr-client")}?${host}${path}${port}${protocol}`;
   return clientEntry;
 }
 class DevMiddleware extends EventEmitter {
-  constructor({ dev, devMiddleware }) {
-    super();
-    this.devOptions = dev;
-    this.socketServer = new SocketServer(dev);
-    if (devMiddleware) {
-      this.middleware = this.setupDevMiddleware(devMiddleware);
-    }
-  }
   init(app) {
     app.on("listening", () => {
       this.socketServer.prepare(app);
     });
     app.on("close", async () => {
-      var _a;
-      (_a = this.middleware) == null ? void 0 : _a.close(noop);
+      var _this_middleware;
+      (_this_middleware = this.middleware) === null || _this_middleware === void 0 ? void 0 : _this_middleware.close(noop);
       this.socketServer.close();
     });
   }
@@ -53,7 +58,16 @@ class DevMiddleware extends EventEmitter {
     });
     return middleware;
   }
+  constructor({ dev, devMiddleware }) {
+    super();
+    _define_property(this, "middleware", void 0);
+    _define_property(this, "devOptions", void 0);
+    _define_property(this, "socketServer", void 0);
+    this.devOptions = dev;
+    this.socketServer = new SocketServer(dev);
+    if (devMiddleware) {
+      this.middleware = this.setupDevMiddleware(devMiddleware);
+    }
+  }
 }
-export {
-  DevMiddleware as default
-};
+export { DevMiddleware as default };

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

@@ -1,18 +1,26 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import ws from "ws";
 import { logger } from "@modern-js/utils";
 class SocketServer {
-  constructor(options) {
-    this.sockets = [];
-    this.timer = null;
-    this.options = options;
-  }
   // create socket, install socket handler, bind socket event
   prepare(app) {
-    var _a;
+    var _this_options_client;
     this.app = app;
     this.wsServer = new ws.Server({
       noServer: true,
-      path: (_a = this.options.client) == null ? void 0 : _a.path
+      path: (_this_options_client = this.options.client) === null || _this_options_client === void 0 ? void 0 : _this_options_client.path
     });
     this.app.on("upgrade", (req, sock, head) => {
       if (!this.wsServer.shouldHandle(req)) {
@@ -48,11 +56,17 @@ class SocketServer {
   // write message to each socket
   sockWrite(type, data) {
     this.sockets.forEach((socket) => {
-      this.send(socket, JSON.stringify({ type, data }));
+      this.send(socket, JSON.stringify({
+        type,
+        data
+      }));
     });
   }
   singleWrite(socket, type, data) {
-    this.send(socket, JSON.stringify({ type, data }));
+    this.send(socket, JSON.stringify({
+      type,
+      data
+    }));
   }
   close() {
     this.sockets.forEach((socket) => {
@@ -131,7 +145,14 @@ class SocketServer {
     }
     connection.send(message);
   }
+  constructor(options) {
+    _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.options = options;
+  }
 }
-export {
-  SocketServer as default
-};
+export { SocketServer as default };