@modern-js/server 2.35.1 → 2.36.0

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

@@ -1,153 +1,162 @@
+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 hadRuntimeError = false;
-var socketUrl = createSocketUrl(__resourceQuery);
-var connection = new WebSocket(socketUrl);
-connection.onopen = function() {
-  if (typeof console !== "undefined" && typeof console.info === "function") {
-    console.info("[HMR] connected.");
-  }
-};
-connection.onclose = function() {
-  if (typeof console !== "undefined" && typeof console.info === "function") {
-    console.info("[HMR] disconnected. Refresh the page if necessary.");
-  }
-};
-var isFirstCompilation = true;
-var mostRecentCompilationHash = null;
-var hasCompileErrors = false;
-function clearOutdatedErrors() {
-  if (typeof console !== "undefined" && typeof console.clear === "function") {
-    if (hasCompileErrors) {
-      console.clear();
-    }
-  }
-}
-function handleSuccess() {
-  clearOutdatedErrors();
-  var isHotUpdate = !isFirstCompilation;
-  isFirstCompilation = false;
-  hasCompileErrors = false;
-  if (isHotUpdate) {
-    tryApplyUpdates();
-  }
-}
-function handleWarnings(warnings) {
-  var printWarnings = function printWarnings2() {
-    var formatted = formatWebpackMessages({
-      warnings: warnings,
-      errors: []
-    });
-    if (typeof console !== "undefined" && typeof console.warn === "function") {
-      for (var 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;
+var require_hmr_client = __commonJS({
+  "src/dev-tools/dev-middleware/hmr-client/index.ts"(exports, module) {
+    var hadRuntimeError = false;
+    var socketUrl = createSocketUrl(__resourceQuery);
+    var connection = new WebSocket(socketUrl);
+    connection.onopen = function() {
+      if (typeof console !== "undefined" && typeof console.info === "function") {
+        console.info("[HMR] connected.");
+      }
+    };
+    connection.onclose = function() {
+      if (typeof console !== "undefined" && typeof console.info === "function") {
+        console.info("[HMR] disconnected. Refresh the page if necessary.");
+      }
+    };
+    var isFirstCompilation = true;
+    var mostRecentCompilationHash = null;
+    var hasCompileErrors = false;
+    function clearOutdatedErrors() {
+      if (typeof console !== "undefined" && typeof console.clear === "function") {
+        if (hasCompileErrors) {
+          console.clear();
         }
-        console.warn(stripAnsi(formatted.warnings[i]));
       }
     }
-  };
-  clearOutdatedErrors();
-  var isHotUpdate = !isFirstCompilation;
-  isFirstCompilation = false;
-  hasCompileErrors = false;
-  printWarnings();
-  if (isHotUpdate) {
-    tryApplyUpdates();
-  }
-}
-function handleErrors(errors) {
-  clearOutdatedErrors();
-  isFirstCompilation = false;
-  hasCompileErrors = true;
-  var formatted = formatWebpackMessages({
-    errors: errors,
-    warnings: []
-  });
-  if (typeof console !== "undefined" && typeof console.error === "function") {
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-    try {
-      for (var _iterator = formatted.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var error = _step.value;
-        console.error(stripAnsi(error));
+    function handleSuccess() {
+      clearOutdatedErrors();
+      var isHotUpdate = !isFirstCompilation;
+      isFirstCompilation = false;
+      hasCompileErrors = false;
+      if (isHotUpdate) {
+        tryApplyUpdates();
       }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
+    }
+    function handleWarnings(warnings) {
+      var printWarnings = function printWarnings2() {
+        var formatted = formatWebpackMessages({
+          warnings,
+          errors: []
+        });
+        if (typeof console !== "undefined" && typeof console.warn === "function") {
+          for (var 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]));
+          }
         }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
+      };
+      clearOutdatedErrors();
+      var isHotUpdate = !isFirstCompilation;
+      isFirstCompilation = false;
+      hasCompileErrors = false;
+      printWarnings();
+      if (isHotUpdate) {
+        tryApplyUpdates();
+      }
+    }
+    function handleErrors(errors) {
+      clearOutdatedErrors();
+      isFirstCompilation = false;
+      hasCompileErrors = true;
+      var formatted = formatWebpackMessages({
+        errors,
+        warnings: []
+      });
+      if (typeof console !== "undefined" && typeof console.error === "function") {
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+        try {
+          for (var _iterator = formatted.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+            var error = _step.value;
+            console.error(stripAnsi(error));
+          }
+        } catch (err) {
+          _didIteratorError = true;
+          _iteratorError = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+              _iterator.return();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
+          }
         }
       }
     }
-  }
-}
-function handleAvailableHash(hash) {
-  mostRecentCompilationHash = hash;
-}
-connection.onmessage = function(e) {
-  var 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() {
-  var handleApplyUpdates = function handleApplyUpdates2(err, updatedModules) {
-    var wantsForcedReload = err || !updatedModules || hadRuntimeError;
-    if (wantsForcedReload) {
-      window.location.reload();
-      return;
+    function handleAvailableHash(hash) {
+      mostRecentCompilationHash = hash;
     }
-    if (isUpdateAvailable()) {
-      tryApplyUpdates();
+    connection.onmessage = function(e) {
+      var 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() {
+      var handleApplyUpdates = function handleApplyUpdates2(err, updatedModules) {
+        var wantsForcedReload = err || !updatedModules || hadRuntimeError;
+        if (wantsForcedReload) {
+          window.location.reload();
+          return;
+        }
+        if (isUpdateAvailable()) {
+          tryApplyUpdates();
+        }
+      };
+      if (!module.hot) {
+        window.location.reload();
+        return;
+      }
+      if (!isUpdateAvailable() || !canApplyUpdates()) {
+        return;
+      }
+      var result = module.hot.check(
+        /* autoApply */
+        true,
+        handleApplyUpdates
+      );
+      if (result === null || result === void 0 ? void 0 : result.then) {
+        result.then(function(updatedModules) {
+          handleApplyUpdates(null, updatedModules);
+        }, function(err) {
+          handleApplyUpdates(err, null);
+        });
+      }
     }
-  };
-  if (!module.hot) {
-    window.location.reload();
-    return;
-  }
-  if (!isUpdateAvailable() || !canApplyUpdates()) {
-    return;
-  }
-  var result = module.hot.check(
-    /* autoApply */
-    true,
-    handleApplyUpdates
-  );
-  if (result === null || result === void 0 ? void 0 : result.then) {
-    result.then(function(updatedModules) {
-      handleApplyUpdates(null, updatedModules);
-    }, function(err) {
-      handleApplyUpdates(err, null);
-    });
   }
-}
+});
+export default require_hmr_client();

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

@@ -7,7 +7,6 @@ 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";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { sep } from "path";
 import { EventEmitter } from "events";
 import SocketServer from "./socketServer";
 var noop = function() {
@@ -18,7 +17,7 @@ function getHMRClientPath(client) {
   var path = (client === null || client === void 0 ? void 0 : client.path) ? "&path=".concat(client.path) : "";
   var port = (client === null || client === void 0 ? void 0 : client.port) ? "&port=".concat(client.port) : "";
   var clientEntry = "".concat(require.resolve("@modern-js/server/hmr-client"), "?").concat(host).concat(path).concat(port).concat(protocol);
-  return clientEntry.replace("".concat(sep, "cjs").concat(sep, "dev-tools"), "".concat(sep, "esm").concat(sep, "dev-tools"));
+  return clientEntry;
 }
 var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
   "use strict";
@@ -84,7 +83,7 @@ var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
         var middleware = devMiddleware(_object_spread({
           headers: devOptions.headers,
           stats: false,
-          callbacks: callbacks,
+          callbacks,
           hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
           serverSideRender: true
         }, devOptions.devMiddleware));
@@ -94,4 +93,6 @@ var DevMiddleware = /* @__PURE__ */ function(EventEmitter2) {
   ]);
   return DevMiddleware2;
 }(EventEmitter);
-export { DevMiddleware as default };
+export {
+  DevMiddleware as default
+};

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

@@ -72,8 +72,8 @@ var SocketServer = /* @__PURE__ */ function() {
           var _this = this;
           this.sockets.forEach(function(socket) {
             _this.send(socket, JSON.stringify({
-              type: type,
-              data: data
+              type,
+              data
             }));
           });
         }
@@ -83,8 +83,8 @@ var SocketServer = /* @__PURE__ */ function() {
       key: "singleWrite",
       value: function singleWrite(socket, type, data) {
         this.send(socket, JSON.stringify({
-          type: type,
-          data: data
+          type,
+          data
         }));
       }
     },
@@ -193,4 +193,6 @@ var SocketServer = /* @__PURE__ */ function() {
   ]);
   return SocketServer2;
 }();
-export { SocketServer as default };
+export {
+  SocketServer as default
+};

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

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { chalk, getPackageManager, logger } from "@modern-js/utils";
-export var genHttpsOptions = function() {
+var genHttpsOptions = function() {
   var _ref = _async_to_generator(function(userOptions, pwd) {
     var httpsOptions, devcertPath, err, packageManager, command, devcert, selfsign;
     return _ts_generator(this, function(_state) {
@@ -69,3 +69,6 @@ export var genHttpsOptions = function() {
     return _ref.apply(this, arguments);
   };
 }();
+export {
+  genHttpsOptions
+};

package/dist/esm/dev-tools/mock/getMockData.js

@@ -46,7 +46,7 @@ var allowTypes = [
   "object",
   "function"
 ];
-export default function(mockConfig) {
+function getMockData_default(mockConfig) {
   return Object.keys(mockConfig).reduce(function(acc, key) {
     var handler = mockConfig[key];
     var type = typeof handler === "undefined" ? "undefined" : _type_of(handler);
@@ -82,7 +82,7 @@ var parseKey = function(key) {
     path: key
   };
 };
-export var getMatched = function(context, mockApiList) {
+var getMatched = function(context, mockApiList) {
   var targetPathname = context.path, targetMethod = context.method;
   var matched = mockApiList.find(function(mockApi) {
     var method = mockApi.method, pathname = mockApi.path;
@@ -96,3 +96,7 @@ export var getMatched = function(context, mockApiList) {
   });
   return matched;
 };
+export {
+  getMockData_default as default,
+  getMatched
+};

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

@@ -4,7 +4,7 @@ import path from "path";
 import { compatRequire, fs } from "@modern-js/utils";
 import { AGGRED_DIR } from "@modern-js/prod-server";
 import getMockData, { getMatched } from "./getMockData";
-export var createMockHandler = function(param) {
+var createMockHandler = function(param) {
   var pwd = param.pwd;
   var exts = [
     ".ts",
@@ -83,3 +83,6 @@ export var createMockHandler = function(param) {
     };
   }();
 };
+export {
+  createMockHandler
+};

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

@@ -9,13 +9,13 @@ var checkDep = function(depName, paths) {
   var packagePath = "";
   try {
     packagePath = require.resolve(depName, {
-      paths: paths
+      paths
     });
   } catch (error) {
   }
   return Boolean(packagePath);
 };
-export var enableRegister = function(projectRoot, config) {
+var enableRegister = function(projectRoot, config) {
   var registerDirs = [
     "./api",
     "./server",
@@ -40,7 +40,7 @@ export var enableRegister = function(projectRoot, config) {
     var alias = config.source.alias;
     var aliasConfig = getAliasConfig(alias, {
       appDirectory: projectRoot,
-      tsconfigPath: tsconfigPath
+      tsconfigPath
     });
     var _aliasConfig_paths = aliasConfig.paths, paths = _aliasConfig_paths === void 0 ? {} : _aliasConfig_paths, _aliasConfig_absoluteBaseUrl = aliasConfig.absoluteBaseUrl, absoluteBaseUrl = _aliasConfig_absoluteBaseUrl === void 0 ? "./" : _aliasConfig_absoluteBaseUrl;
     var tsPaths = Object.keys(paths).reduce(function(o, key) {
@@ -81,7 +81,7 @@ export var enableRegister = function(projectRoot, config) {
         compiler: (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.compiler
       }
     }), {
-      tsconfigPath: tsconfigPath,
+      tsconfigPath,
       syntax: "es6+",
       type: "commonjs"
     });
@@ -106,3 +106,6 @@ export var enableRegister = function(projectRoot, config) {
     }));
   }
 };
+export {
+  enableRegister
+};

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

@@ -3,14 +3,14 @@ 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";
-export var defaultIgnores = [
+var defaultIgnores = [
   "**/coverage/**",
   "**/node_modules/**",
   "**/.*/**",
   "**/*.d.ts",
   "**/*.log"
 ];
-export var DependencyTree = /* @__PURE__ */ function() {
+var DependencyTree = /* @__PURE__ */ function() {
   "use strict";
   function DependencyTree2() {
     _class_call_check(this, DependencyTree2);
@@ -41,7 +41,7 @@ export var DependencyTree = /* @__PURE__ */ function() {
             if (!_this.shouldIgnore(path)) {
               var module = cache[path];
               _this.tree.set(module.filename, {
-                module: module,
+                module,
                 parent: /* @__PURE__ */ new Set(),
                 children: /* @__PURE__ */ new Set()
               });
@@ -103,3 +103,7 @@ export var DependencyTree = /* @__PURE__ */ function() {
   ]);
   return DependencyTree2;
 }();
+export {
+  DependencyTree,
+  defaultIgnores
+};

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

@@ -7,12 +7,12 @@ import path from "path";
 import { fs, chokidar } from "@modern-js/utils";
 import { DependencyTree } from "./dependencyTree";
 import { StatsCache } from "./statsCache";
-export var defaultWatchOptions = {
+var defaultWatchOptions = {
   // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,
   ignored: /api\/typings\/.*/
 };
-export var getWatchedFiles = function(watcher) {
+var getWatchedFiles = function(watcher) {
   var watched = watcher.getWatched();
   var files = [];
   Object.keys(watched).forEach(function(dir) {
@@ -22,7 +22,7 @@ export var getWatchedFiles = function(watcher) {
   });
   return files;
 };
-export var mergeWatchOptions = function(options) {
+var mergeWatchOptions = function(options) {
   var watchOptions = _object_spread({}, options);
   if (watchOptions) {
     var ignored = watchOptions.ignored;
@@ -131,4 +131,9 @@ var Watcher = /* @__PURE__ */ function() {
   ]);
   return Watcher2;
 }();
-export { Watcher as default };
+export {
+  Watcher as default,
+  defaultWatchOptions,
+  getWatchedFiles,
+  mergeWatchOptions
+};

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

@@ -3,7 +3,7 @@ import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import fs from "fs";
 import crypto from "crypto";
-export var StatsCache = /* @__PURE__ */ function() {
+var StatsCache = /* @__PURE__ */ function() {
   "use strict";
   function StatsCache2() {
     _class_call_check(this, StatsCache2);
@@ -96,3 +96,6 @@ export var StatsCache = /* @__PURE__ */ function() {
   ]);
   return StatsCache2;
 }();
+export {
+  StatsCache
+};

package/dist/esm/index.js

@@ -1,6 +1,5 @@
 import { DevServer as Server } from "./server";
-export { Server };
-export default function(options) {
+function src_default(options) {
   if (options == null) {
     throw new Error("can not start server without options");
   }
@@ -8,3 +7,7 @@ export default function(options) {
   return server.init();
 }
 ;
+export {
+  Server,
+  src_default as default
+};

package/dist/esm/server/devServer.js

@@ -22,7 +22,7 @@ import { enableRegister } from "../dev-tools/register";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import DevMiddleware from "../dev-tools/dev-middleware";
 import { workerSSRRender } from "./workerSSRRender";
-export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
+var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
   "use strict";
   _inherits(ModernDevServer2, ModernServer2);
   var _super = _create_super(ModernDevServer2);
@@ -98,8 +98,8 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
           }, serverOptions);
         });
         return {
-          befores: befores,
-          afters: afters
+          befores,
+          afters
         };
       }
     },
@@ -187,12 +187,12 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
             var forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
             return createRenderHandler({
               ssrRender: workerSSRRender,
-              distDir: distDir,
-              staticGenerate: staticGenerate,
-              conf: conf,
-              forceCSR: forceCSR,
+              distDir,
+              staticGenerate,
+              conf,
+              forceCSR,
               nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
-              metaName: metaName
+              metaName
             });
           }
           return _get(_get_prototype_of(ModernDevServer2.prototype), "getRenderHandler", this).call(this);
@@ -273,7 +273,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
                   next();
                 });
                 _this.mockHandler = createMockHandler({
-                  pwd: pwd
+                  pwd
                 });
                 _this.addHandler(function(ctx, next) {
                   if (_this.mockHandler) {
@@ -444,7 +444,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
                     1
                   ];
                 _this1.mockHandler = createMockHandler({
-                  pwd: pwd
+                  pwd
                 });
                 return [
                   3,
@@ -460,7 +460,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
                 success = _this1.runner.onApiChange([
                   {
                     filename: filepath,
-                    event: event
+                    event
                   }
                 ]);
                 if (!(success !== true))
@@ -471,7 +471,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
                 return [
                   4,
                   _superprop_get_onServerChange().call(_this1, {
-                    filepath: filepath
+                    filepath
                   })
                 ];
               case 2:
@@ -626,8 +626,8 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
             watcher.cleanDepCache(filepath);
           }
           _this.onServerChange({
-            filepath: filepath,
-            event: event
+            filepath,
+            event
           });
         });
         this.watcher = watcher;
@@ -636,3 +636,6 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
   ]);
   return ModernDevServer2;
 }(ModernServer);
+export {
+  ModernDevServer
+};

package/dist/esm/server/index.js

@@ -6,7 +6,7 @@ import { ModernDevServer } from "./devServer";
 var createDevServer = function(options) {
   return new ModernDevServer(options);
 };
-export var DevServer = /* @__PURE__ */ function(Server2) {
+var DevServer = /* @__PURE__ */ function(Server2) {
   "use strict";
   _inherits(DevServer2, Server2);
   var _super = _create_super(DevServer2);
@@ -21,3 +21,6 @@ export var DevServer = /* @__PURE__ */ function(Server2) {
   }
   return DevServer2;
 }(Server);
+export {
+  DevServer
+};