@modern-js/server 2.40.1-alpha.0 → 2.41.0

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

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

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

@@ -34,7 +34,8 @@ 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 {
+var SocketServer;
+SocketServer = class SocketServer2 {
   // create socket, install socket handler, bind socket event
   prepare(app) {
     var _this_options_client;
@@ -175,4 +176,4 @@ class SocketServer {
     (0, import_define_property._)(this, "timer", null);
     this.options = options;
   }
-}
+};

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

@@ -53,11 +53,7 @@ const enableRegister = (projectRoot, config) => {
     "./shared"
   ];
   const TS_CONFIG_FILENAME = `tsconfig.json`;
-  let tsconfigPath = import_path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
-  const serverTsconfigPath = import_path.default.resolve(projectRoot, "tsconfig.server.json");
-  if (import_utils.fs.existsSync(serverTsconfigPath)) {
-    tsconfigPath = serverTsconfigPath;
-  }
+  const tsconfigPath = import_path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
   const isTsProject = import_utils.fs.existsSync(tsconfigPath);
   const existTsNode = checkDep("ts-node", [
     projectRoot

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

@@ -76,7 +76,8 @@ const mergeWatchOptions = (options) => {
   };
   return finalWatchOptions;
 };
-class Watcher {
+var Watcher;
+Watcher = class Watcher2 {
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
     const filenames = watched.map((filename) => filename.replace(/\\/g, "/"));
@@ -129,7 +130,7 @@ class Watcher {
     (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/esm/dev-tools/dev-middleware/hmr-client/index.js

@@ -40,7 +40,11 @@ var require_hmr_client = __commonJS({
       }
     }
     function handleWarnings(warnings) {
-      var printWarnings = function printWarnings2() {
+      clearOutdatedErrors();
+      var isHotUpdate = !isFirstCompilation;
+      isFirstCompilation = false;
+      hasCompileErrors = false;
+      function printWarnings() {
         var formatted = formatWebpackMessages({
           warnings,
           errors: []
@@ -54,11 +58,7 @@ var require_hmr_client = __commonJS({
             console.warn(stripAnsi(formatted.warnings[i]));
           }
         }
-      };
-      clearOutdatedErrors();
-      var isHotUpdate = !isFirstCompilation;
-      isFirstCompilation = false;
-      hasCompileErrors = false;
+      }
       printWarnings();
       if (isHotUpdate) {
         tryApplyUpdates();
@@ -127,7 +127,14 @@ var require_hmr_client = __commonJS({
       return module.hot.status() === "idle";
     }
     function tryApplyUpdates() {
-      var handleApplyUpdates = function handleApplyUpdates2(err, updatedModules) {
+      if (!module.hot) {
+        window.location.reload();
+        return;
+      }
+      if (!isUpdateAvailable() || !canApplyUpdates()) {
+        return;
+      }
+      function handleApplyUpdates(err, updatedModules) {
         var wantsForcedReload = err || !updatedModules || hadRuntimeError;
         if (wantsForcedReload) {
           window.location.reload();
@@ -136,13 +143,6 @@ var require_hmr_client = __commonJS({
         if (isUpdateAvailable()) {
           tryApplyUpdates();
         }
-      };
-      if (!module.hot) {
-        window.location.reload();
-        return;
-      }
-      if (!isUpdateAvailable() || !canApplyUpdates()) {
-        return;
       }
       var result = module.hot.check(
         /* autoApply */

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

@@ -19,7 +19,8 @@ function getHMRClientPath(client) {
   var clientEntry = "".concat(require.resolve("@modern-js/server/hmr-client"), "?").concat(host).concat(path).concat(port).concat(protocol);
   return clientEntry;
 }
-var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
+var DevMiddleware;
+DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
   "use strict";
   _inherits(DevMiddleware2, EventEmitter2);
   var _super = _create_super(DevMiddleware2);

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

@@ -3,7 +3,8 @@ 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() {
+var SocketServer;
+SocketServer = /* @__PURE__ */ function() {
   "use strict";
   function SocketServer2(options) {
     _class_call_check(this, SocketServer2);

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

@@ -24,10 +24,6 @@ var enableRegister = function(projectRoot, config) {
   ];
   var TS_CONFIG_FILENAME = "tsconfig.json";
   var tsconfigPath = path.resolve(projectRoot, TS_CONFIG_FILENAME);
-  var serverTsconfigPath = path.resolve(projectRoot, "tsconfig.server.json");
-  if (fs.existsSync(serverTsconfigPath)) {
-    tsconfigPath = serverTsconfigPath;
-  }
   var isTsProject = fs.existsSync(tsconfigPath);
   var existTsNode = checkDep("ts-node", [
     projectRoot

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

@@ -38,7 +38,8 @@ var mergeWatchOptions = function(options) {
   var finalWatchOptions = _object_spread({}, defaultWatchOptions, watchOptions);
   return finalWatchOptions;
 };
-var Watcher = /* @__PURE__ */ function() {
+var Watcher;
+Watcher = /* @__PURE__ */ function() {
   "use strict";
   function Watcher2() {
     _class_call_check(this, Watcher2);

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

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

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

@@ -1,7 +1,8 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import ws from "ws";
 import { logger } from "@modern-js/utils";
-class SocketServer {
+var SocketServer;
+SocketServer = class SocketServer2 {
   // create socket, install socket handler, bind socket event
   prepare(app) {
     var _this_options_client;
@@ -142,7 +143,7 @@ class SocketServer {
     _define_property(this, "timer", null);
     this.options = options;
   }
-}
+};
 export {
   SocketServer as default
 };

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

@@ -20,11 +20,7 @@ const enableRegister = (projectRoot, config) => {
     "./shared"
   ];
   const TS_CONFIG_FILENAME = `tsconfig.json`;
-  let tsconfigPath = path.resolve(projectRoot, TS_CONFIG_FILENAME);
-  const serverTsconfigPath = path.resolve(projectRoot, "tsconfig.server.json");
-  if (fs.existsSync(serverTsconfigPath)) {
-    tsconfigPath = serverTsconfigPath;
-  }
+  const tsconfigPath = path.resolve(projectRoot, TS_CONFIG_FILENAME);
   const isTsProject = fs.existsSync(tsconfigPath);
   const existTsNode = checkDep("ts-node", [
     projectRoot

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

@@ -40,7 +40,8 @@ const mergeWatchOptions = (options) => {
   };
   return finalWatchOptions;
 };
-class Watcher {
+var Watcher;
+Watcher = class Watcher2 {
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
     const filenames = watched.map((filename) => filename.replace(/\\/g, "/"));
@@ -93,7 +94,7 @@ class Watcher {
     _define_property(this, "dependencyTree", null);
     _define_property(this, "watcher", void 0);
   }
-}
+};
 export {
   Watcher as default,
   defaultWatchOptions,

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.40.1-alpha.0",
+  "version": "2.41.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -40,25 +40,25 @@
   "dependencies": {
     "@babel/core": "^7.23.2",
     "@babel/register": "^7.22.15",
-    "@swc/helpers": "0.5.1",
+    "@swc/helpers": "0.5.3",
     "connect-history-api-fallback": "^2.0.0",
     "http-compression": "1.0.6",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
-    "ws": "^8.2.0",
-    "axios": "^1.2.1",
-    "@modern-js/utils": "2.40.0",
-    "@modern-js/runtime-utils": "2.40.0",
-    "@modern-js/types": "2.40.0",
-    "@modern-js/prod-server": "2.40.0",
-    "@modern-js/server-utils": "2.40.0"
+    "ws": "^8.13.0",
+    "axios": "^1.6.0",
+    "@modern-js/prod-server": "2.41.0",
+    "@modern-js/server-utils": "2.41.0",
+    "@modern-js/types": "2.41.0",
+    "@modern-js/utils": "2.41.0",
+    "@modern-js/runtime-utils": "2.41.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/jest": "^29",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",
-    "@types/ws": "^7.4.7",
+    "@types/ws": "^8.5.5",
     "jest": "^29",
     "node-mocks-http": "^1.11.0",
     "ts-node": "^10.9.1",
@@ -66,9 +66,9 @@
     "typescript": "^5",
     "webpack": "^5.88.1",
     "websocket": "^1",
-    "@scripts/build": "2.40.0",
-    "@modern-js/server-core": "2.40.0",
-    "@scripts/jest-config": "2.40.0"
+    "@modern-js/server-core": "2.41.0",
+    "@scripts/build": "2.41.0",
+    "@scripts/jest-config": "2.41.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",