@modern-js/server 2.35.0 → 2.36.0

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);
@@ -210,8 +210,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
               case 0:
                 pwd = _this.pwd, dev = _this.dev, devMiddleware = _this.devMiddleware, conf = _this.conf;
                 isUseStreamingSSR = function(routes) {
-                  var _routes;
-                  return (_routes = routes) === null || _routes === void 0 ? void 0 : _routes.some(function(r) {
+                  return routes === null || routes === void 0 ? void 0 : routes.some(function(r) {
                     return r.isStream === true;
                   });
                 };
@@ -274,7 +273,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
                   next();
                 });
                 _this.mockHandler = createMockHandler({
-                  pwd: pwd
+                  pwd
                 });
                 _this.addHandler(function(ctx, next) {
                   if (_this.mockHandler) {
@@ -445,7 +444,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
                     1
                   ];
                 _this1.mockHandler = createMockHandler({
-                  pwd: pwd
+                  pwd
                 });
                 return [
                   3,
@@ -461,7 +460,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
                 success = _this1.runner.onApiChange([
                   {
                     filename: filepath,
-                    event: event
+                    event
                   }
                 ]);
                 if (!(success !== true))
@@ -472,7 +471,7 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
                 return [
                   4,
                   _superprop_get_onServerChange().call(_this1, {
-                    filepath: filepath
+                    filepath
                   })
                 ];
               case 2:
@@ -599,11 +598,11 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
       key: "startWatcher",
       value: function startWatcher() {
         var _this = this;
-        var _appContext, _appContext1, _this_conf_server;
+        var _this_conf_server;
         var _this1 = this, pwd = _this1.pwd, distDir = _this1.distDir, appContext = _this1.appContext;
         var mock = AGGRED_DIR.mock;
-        var apiDir = ((_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.apiDirectory) || API_DIR;
-        var sharedDir = ((_appContext1 = appContext) === null || _appContext1 === void 0 ? void 0 : _appContext1.sharedDirectory) || SHARED_DIR;
+        var apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || API_DIR;
+        var sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || SHARED_DIR;
         var defaultWatched = [
           "".concat(mock, "/**/*"),
           "".concat(SERVER_DIR, "/**/*"),
@@ -627,8 +626,8 @@ export var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
             watcher.cleanDepCache(filepath);
           }
           _this.onServerChange({
-            filepath: filepath,
-            event: event
+            filepath,
+            event
           });
         });
         this.watcher = watcher;
@@ -637,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
+};

package/dist/esm/server/workerSSRRender.js

@@ -3,7 +3,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import axios from "axios";
 import { mime } from "@modern-js/utils";
 var PORT = 9230;
-export function workerSSRRender(ctx, renderOptions, _runner) {
+function workerSSRRender(ctx, renderOptions, _runner) {
   return _workerSSRRender.apply(this, arguments);
 }
 function _workerSSRRender() {
@@ -20,8 +20,8 @@ function _workerSSRRender() {
             axios.get(url, {
               timeout: 5e3,
               responseType: "text",
-              headers: headers,
-              params: params
+              headers,
+              params
             })
           ];
         case 1:
@@ -38,3 +38,6 @@ function _workerSSRRender() {
   });
   return _workerSSRRender.apply(this, arguments);
 }
+export {
+  workerSSRRender
+};

package/dist/esm/types.js

@@ -1 +0,0 @@
-export {};

package/dist/esm-node/constants.js

@@ -1,5 +1,5 @@
 import { HMR_SOCK_PATH } from "@modern-js/utils/universal/constants";
-export const getDefaultDevOptions = () => {
+const getDefaultDevOptions = () => {
   return {
     client: {
       path: HMR_SOCK_PATH,
@@ -20,3 +20,6 @@ export const getDefaultDevOptions = () => {
     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";
-export function createSocketUrl(resourceQuery) {
+function createSocketUrl(resourceQuery) {
   const searchParams = resourceQuery.substr(1).split("&");
   const options = {};
   for (const pair of searchParams) {
@@ -9,7 +9,7 @@ export function createSocketUrl(resourceQuery) {
   const currentLocation = self.location;
   return getSocketUrl(options, currentLocation);
 }
-export function formatURL({ port, protocol, hostname, pathname }) {
+function formatURL({ port, protocol, hostname, pathname }) {
   if (window.URL) {
     const url = new URL("http://localhost");
     url.port = port;
@@ -30,3 +30,7 @@ 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,137 +1,145 @@
+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";
-const hadRuntimeError = false;
-const socketUrl = createSocketUrl(__resourceQuery);
-const 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.");
-  }
-};
-let isFirstCompilation = true;
-let mostRecentCompilationHash = null;
-let hasCompileErrors = false;
-function clearOutdatedErrors() {
-  if (typeof console !== "undefined" && typeof console.clear === "function") {
-    if (hasCompileErrors) {
-      console.clear();
+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.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.");
+      }
+    };
+    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;
+    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]));
+          }
         }
-        console.warn(stripAnsi(formatted.warnings[i]));
+      }
+      printWarnings();
+      if (isHotUpdate) {
+        tryApplyUpdates();
       }
     }
-  }
-  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 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 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() {
-  var _result;
-  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 handleAvailableHash(hash) {
+      mostRecentCompilationHash = hash;
     }
-    if (isUpdateAvailable()) {
-      tryApplyUpdates();
+    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;
+        }
+        if (isUpdateAvailable()) {
+          tryApplyUpdates();
+        }
+      }
+      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);
+        });
+      }
     }
   }
-  const result = module.hot.check(
-    /* autoApply */
-    true,
-    handleApplyUpdates
-  );
-  if ((_result = result) === null || _result === void 0 ? void 0 : _result.then) {
-    result.then((updatedModules) => {
-      handleApplyUpdates(null, updatedModules);
-    }, (err) => {
-      handleApplyUpdates(err, null);
-    });
-  }
-}
+});
+export default require_hmr_client();

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

@@ -1,17 +1,15 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import { sep } from "path";
 import { EventEmitter } from "events";
 import SocketServer from "./socketServer";
 const noop = () => {
 };
 function getHMRClientPath(client) {
-  var _client, _client1, _client2, _client3;
-  const protocol = ((_client = client) === null || _client === void 0 ? void 0 : _client.protocol) ? `&protocol=${client.protocol}` : "";
-  const host = ((_client1 = client) === null || _client1 === void 0 ? void 0 : _client1.host) ? `&host=${client.host}` : "";
-  const path = ((_client2 = client) === null || _client2 === void 0 ? void 0 : _client2.path) ? `&path=${client.path}` : "";
-  const port = ((_client3 = client) === null || _client3 === void 0 ? void 0 : _client3.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.replace(`${sep}cjs${sep}dev-tools`, `${sep}esm${sep}dev-tools`);
+  return clientEntry;
 }
 class DevMiddleware extends EventEmitter {
   init(app) {
@@ -61,4 +59,6 @@ class DevMiddleware extends EventEmitter {
     }
   }
 }
-export { DevMiddleware as default };
+export {
+  DevMiddleware as default
+};

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

@@ -143,4 +143,6 @@ class SocketServer {
     this.options = options;
   }
 }
-export { SocketServer as default };
+export {
+  SocketServer as default
+};

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

@@ -1,5 +1,5 @@
 import { chalk, getPackageManager, logger } from "@modern-js/utils";
-export const genHttpsOptions = async (userOptions, pwd) => {
+const genHttpsOptions = async (userOptions, pwd) => {
   const httpsOptions = typeof userOptions === "boolean" ? {} : userOptions;
   if (!httpsOptions.key || !httpsOptions.cert) {
     let devcertPath;
@@ -25,3 +25,6 @@ export const genHttpsOptions = async (userOptions, pwd) => {
   }
   return httpsOptions;
 };
+export {
+  genHttpsOptions
+};

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

@@ -25,7 +25,7 @@ const allowTypes = [
   "object",
   "function"
 ];
-export default (mockConfig) => Object.keys(mockConfig).reduce((acc, key) => {
+var getMockData_default = (mockConfig) => Object.keys(mockConfig).reduce((acc, key) => {
   const handler = mockConfig[key];
   const type = typeof handler;
   if (!allowTypes.includes(type)) {
@@ -60,7 +60,7 @@ const parseKey = (key) => {
     path: key
   };
 };
-export const getMatched = (context, mockApiList) => {
+const getMatched = (context, mockApiList) => {
   const { path: targetPathname, method: targetMethod } = context;
   const matched = mockApiList.find((mockApi) => {
     const { method, path: pathname } = mockApi;
@@ -74,3 +74,7 @@ export const getMatched = (context, mockApiList) => {
   });
   return matched;
 };
+export {
+  getMockData_default as default,
+  getMatched
+};

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

@@ -2,8 +2,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 const createMockHandler = ({ pwd }) => {
-  var _config;
+const createMockHandler = ({ pwd }) => {
   const exts = [
     ".ts",
     ".js"
@@ -21,7 +20,7 @@ export const createMockHandler = ({ pwd }) => {
   }
   const mod = compatRequire(filepath, false);
   const { default: mockModule = mod, config } = mod;
-  if (((_config = config) === null || _config === void 0 ? void 0 : _config.enable) === false) {
+  if ((config === null || config === void 0 ? void 0 : config.enable) === false) {
     return null;
   }
   if (!mockModule) {
@@ -32,8 +31,7 @@ export const createMockHandler = ({ pwd }) => {
     return null;
   }
   return async (context, next) => {
-    var _config2;
-    if (typeof ((_config2 = config) === null || _config2 === void 0 ? void 0 : _config2.enable) === "function") {
+    if (typeof (config === null || config === void 0 ? void 0 : config.enable) === "function") {
       const enableMock = config.enable(context.req, context.res);
       if (!enableMock) {
         return next();
@@ -48,3 +46,6 @@ export const createMockHandler = ({ pwd }) => {
     return matched.handler(context, next);
   };
 };
+export {
+  createMockHandler
+};

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

@@ -12,7 +12,7 @@ const checkDep = (depName, paths) => {
   }
   return Boolean(packagePath);
 };
-export const enableRegister = (projectRoot, config) => {
+const enableRegister = (projectRoot, config) => {
   const registerDirs = [
     "./api",
     "./server",
@@ -107,3 +107,6 @@ export const enableRegister = (projectRoot, config) => {
     });
   }
 };
+export {
+  enableRegister
+};

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

@@ -1,13 +1,13 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import minimatch from "minimatch";
-export const defaultIgnores = [
+const defaultIgnores = [
   "**/coverage/**",
   "**/node_modules/**",
   "**/.*/**",
   "**/*.d.ts",
   "**/*.log"
 ];
-export class DependencyTree {
+class DependencyTree {
   getNode(path) {
     return this.tree.get(path);
   }
@@ -64,3 +64,7 @@ export class DependencyTree {
     ];
   }
 }
+export {
+  DependencyTree,
+  defaultIgnores
+};

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

@@ -3,12 +3,12 @@ import path from "path";
 import { fs, chokidar } from "@modern-js/utils";
 import { DependencyTree } from "./dependencyTree";
 import { StatsCache } from "./statsCache";
-export const defaultWatchOptions = {
+const defaultWatchOptions = {
   // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,
   ignored: /api\/typings\/.*/
 };
-export const getWatchedFiles = (watcher) => {
+const getWatchedFiles = (watcher) => {
   const watched = watcher.getWatched();
   const files = [];
   Object.keys(watched).forEach((dir) => {
@@ -18,7 +18,7 @@ export const getWatchedFiles = (watcher) => {
   });
   return files;
 };
-export const mergeWatchOptions = (options) => {
+const mergeWatchOptions = (options) => {
   const watchOptions = {
     ...options
   };
@@ -94,4 +94,9 @@ class Watcher {
     _define_property(this, "watcher", void 0);
   }
 }
-export { Watcher as default };
+export {
+  Watcher as default,
+  defaultWatchOptions,
+  getWatchedFiles,
+  mergeWatchOptions
+};