@modern-js/server 2.35.0 → 2.36.0

package/dist/cjs/server/devServer.js

@@ -1,33 +1,54 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "ModernDevServer", {
-  enumerable: true,
-  get: function() {
-    return ModernDevServer;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var devServer_exports = {};
+__export(devServer_exports, {
+  ModernDevServer: () => ModernDevServer
 });
-const _define_property = require("@swc/helpers/_/_define_property");
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-const _http = require("http");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _https = require("https");
-const _utils = require("@modern-js/utils");
-const _prodserver = require("@modern-js/prod-server");
-const _lodash = require("@modern-js/utils/lodash");
-const _constants = require("../constants");
-const _mock = require("../dev-tools/mock");
-const _register = require("../dev-tools/register");
-const _watcher = /* @__PURE__ */ _interop_require_wildcard._(require("../dev-tools/watcher"));
-const _devmiddleware = /* @__PURE__ */ _interop_require_default._(require("../dev-tools/dev-middleware"));
-const _workerSSRRender = require("./workerSSRRender");
-class ModernDevServer extends _prodserver.ModernServer {
+module.exports = __toCommonJS(devServer_exports);
+var import_define_property = require("@swc/helpers/_/_define_property");
+var import_http = require("http");
+var import_path = __toESM(require("path"));
+var import_https = require("https");
+var import_utils = require("@modern-js/utils");
+var import_prod_server = require("@modern-js/prod-server");
+var import_lodash = require("@modern-js/utils/lodash");
+var import_constants = require("../constants");
+var import_mock = require("../dev-tools/mock");
+var import_register = require("../dev-tools/register");
+var import_watcher = __toESM(require("../dev-tools/watcher"));
+var import_dev_middleware = __toESM(require("../dev-tools/dev-middleware"));
+var import_workerSSRRender = require("./workerSSRRender");
+class ModernDevServer extends import_prod_server.ModernServer {
   getDevOptions(options) {
     const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
-    const defaultOptions = (0, _constants.getDefaultDevOptions)();
-    return (0, _lodash.merge)(defaultOptions, devOptions);
+    const defaultOptions = (0, import_constants.getDefaultDevOptions)();
+    return (0, import_lodash.merge)(defaultOptions, devOptions);
   }
   addMiddlewareHandler(handlers) {
     handlers.forEach((handler) => {
@@ -87,8 +108,8 @@ class ModernDevServer extends _prodserver.ModernServer {
       const { distDir, staticGenerate, conf, metaName } = this;
       const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
       const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
-      return (0, _prodserver.createRenderHandler)({
-        ssrRender: _workerSSRRender.workerSSRRender,
+      return (0, import_prod_server.createRenderHandler)({
+        ssrRender: import_workerSSRRender.workerSSRRender,
         distDir,
         staticGenerate,
         conf,
@@ -101,17 +122,14 @@ class ModernDevServer extends _prodserver.ModernServer {
   }
   async applyDefaultMiddlewares(app) {
     const { pwd, dev, devMiddleware, conf } = this;
-    const isUseStreamingSSR = (routes) => {
-      var _routes;
-      return (_routes = routes) === null || _routes === void 0 ? void 0 : _routes.some((r) => r.isStream === true);
-    };
+    const isUseStreamingSSR = (routes) => routes === null || routes === void 0 ? void 0 : routes.some((r) => r.isStream === true);
     const isUseSSRPreload = () => {
       const { server: { ssr, ssrByEntries } } = conf;
       const checkUsePreload = (ssr2) => typeof ssr2 === "object" && Boolean(ssr2.preload);
       return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some((ssr2) => checkUsePreload(ssr2));
     };
     if (!isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress) {
-      const { default: compression } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("http-compression")));
+      const { default: compression } = await Promise.resolve().then(() => __toESM(require("http-compression")));
       this.addHandler((ctx, next) => {
         compression({
           gzip: true,
@@ -132,7 +150,7 @@ class ModernDevServer extends _prodserver.ModernServer {
       }
       next();
     });
-    this.mockHandler = (0, _mock.createMockHandler)({
+    this.mockHandler = (0, import_mock.createMockHandler)({
       pwd
     });
     this.addHandler((ctx, next) => {
@@ -143,7 +161,7 @@ class ModernDevServer extends _prodserver.ModernServer {
       }
     });
     if (dev.proxy) {
-      const { handlers, handleUpgrade } = (0, _prodserver.createProxyHandler)(dev.proxy);
+      const { handlers, handleUpgrade } = (0, import_prod_server.createProxyHandler)(dev.proxy);
       app && handleUpgrade(app);
       handlers.forEach((handler) => {
         this.addHandler(handler);
@@ -168,7 +186,7 @@ class ModernDevServer extends _prodserver.ModernServer {
       }
     });
     if (dev.historyApiFallback) {
-      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("connect-history-api-fallback")));
+      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
       const historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
       this.addHandler((ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next));
     }
@@ -188,9 +206,9 @@ class ModernDevServer extends _prodserver.ModernServer {
     if (devHttpsOption) {
       const { genHttpsOptions } = require("../dev-tools/https");
       const httpsOptions = await genHttpsOptions(devHttpsOption, this.pwd);
-      return (0, _https.createServer)(httpsOptions, handler);
+      return (0, import_https.createServer)(httpsOptions, handler);
     } else {
-      return (0, _http.createServer)(handler);
+      return (0, import_http.createServer)(handler);
     }
   }
   warmupSSRBundle() {
@@ -223,11 +241,11 @@ class ModernDevServer extends _prodserver.ModernServer {
   }
   async onServerChange({ filepath, event }) {
     const { pwd } = this;
-    const { mock } = _prodserver.AGGRED_DIR;
-    const mockPath = _path.default.normalize(_path.default.join(pwd, mock));
+    const { mock } = import_prod_server.AGGRED_DIR;
+    const mockPath = import_path.default.normalize(import_path.default.join(pwd, mock));
     this.runner.reset();
     if (filepath.startsWith(mockPath)) {
-      this.mockHandler = (0, _mock.createMockHandler)({
+      this.mockHandler = (0, import_mock.createMockHandler)({
         pwd
       });
     } else {
@@ -281,35 +299,35 @@ class ModernDevServer extends _prodserver.ModernServer {
     const { distDir } = this;
     const bundles = this.router.getBundles();
     bundles.forEach((bundle) => {
-      const filepath = _path.default.join(distDir, bundle);
+      const filepath = import_path.default.join(distDir, bundle);
       if (require.cache[filepath]) {
         delete require.cache[filepath];
       }
     });
-    const loadable = _path.default.join(distDir, _utils.LOADABLE_STATS_FILE);
+    const loadable = import_path.default.join(distDir, import_utils.LOADABLE_STATS_FILE);
     if (require.cache[loadable]) {
       delete require.cache[loadable];
     }
   }
   startWatcher() {
-    var _appContext, _appContext1, _this_conf_server;
+    var _this_conf_server;
     const { pwd, distDir, appContext } = this;
-    const { mock } = _prodserver.AGGRED_DIR;
-    const apiDir = ((_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.apiDirectory) || _utils.API_DIR;
-    const sharedDir = ((_appContext1 = appContext) === null || _appContext1 === void 0 ? void 0 : _appContext1.sharedDirectory) || _utils.SHARED_DIR;
+    const { mock } = import_prod_server.AGGRED_DIR;
+    const apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || import_utils.API_DIR;
+    const sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || import_utils.SHARED_DIR;
     const defaultWatched = [
       `${mock}/**/*`,
-      `${_utils.SERVER_DIR}/**/*`,
+      `${import_utils.SERVER_DIR}/**/*`,
       `${apiDir}/**`,
       `${sharedDir}/**/*`,
-      `${distDir}/${_utils.SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
+      `${distDir}/${import_utils.SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
     ];
-    const watchOptions = (0, _watcher.mergeWatchOptions)((_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.watchOptions);
+    const watchOptions = (0, import_watcher.mergeWatchOptions)((_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.watchOptions);
     const defaultWatchedPaths = defaultWatched.map((p) => {
-      const finalPath = _path.default.isAbsolute(p) ? p : _path.default.join(pwd, p);
-      return _path.default.normalize(finalPath);
+      const finalPath = import_path.default.isAbsolute(p) ? p : import_path.default.join(pwd, p);
+      return import_path.default.normalize(finalPath);
     });
-    const watcher = new _watcher.default();
+    const watcher = new import_watcher.default();
     watcher.createDepTree();
     watcher.listen(defaultWatchedPaths, watchOptions, (filepath, event) => {
       if (filepath.includes("-server-loaders.js")) {
@@ -328,20 +346,24 @@ class ModernDevServer extends _prodserver.ModernServer {
   }
   constructor(options) {
     super(options);
-    _define_property._(this, "mockHandler", null);
-    _define_property._(this, "dev", void 0);
-    _define_property._(this, "useWorkerSSR", void 0);
-    _define_property._(this, "appContext", void 0);
-    _define_property._(this, "devMiddleware", void 0);
-    _define_property._(this, "watcher", void 0);
+    (0, import_define_property._)(this, "mockHandler", null);
+    (0, import_define_property._)(this, "dev", void 0);
+    (0, import_define_property._)(this, "useWorkerSSR", void 0);
+    (0, import_define_property._)(this, "appContext", void 0);
+    (0, import_define_property._)(this, "devMiddleware", void 0);
+    (0, import_define_property._)(this, "watcher", void 0);
     this.appContext = options.appContext;
     this.workDir = this.pwd;
     this.useWorkerSSR = Boolean(options.useWorkerSSR);
     this.dev = this.getDevOptions(options);
-    this.devMiddleware = new _devmiddleware.default({
+    this.devMiddleware = new import_dev_middleware.default({
       dev: this.dev,
       devMiddleware: options.devMiddleware
     });
-    (0, _register.enableRegister)(this.pwd, this.conf);
+    (0, import_register.enableRegister)(this.pwd, this.conf);
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ModernDevServer
+});

package/dist/cjs/server/index.js

@@ -1,19 +1,32 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "DevServer", {
-  enumerable: true,
-  get: function() {
-    return DevServer;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  DevServer: () => DevServer
 });
-const _prodserver = require("@modern-js/prod-server");
-const _devServer = require("./devServer");
+module.exports = __toCommonJS(server_exports);
+var import_prod_server = require("@modern-js/prod-server");
+var import_devServer = require("./devServer");
 const createDevServer = (options) => {
-  return new _devServer.ModernDevServer(options);
+  return new import_devServer.ModernDevServer(options);
 };
-class DevServer extends _prodserver.Server {
+class DevServer extends import_prod_server.Server {
   constructor(options) {
     super(options);
     if (options.dev) {
@@ -21,3 +34,7 @@ class DevServer extends _prodserver.Server {
     }
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DevServer
+});

package/dist/cjs/server/workerSSRRender.js

@@ -1,22 +1,44 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "workerSSRRender", {
-  enumerable: true,
-  get: function() {
-    return workerSSRRender;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var workerSSRRender_exports = {};
+__export(workerSSRRender_exports, {
+  workerSSRRender: () => workerSSRRender
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _axios = /* @__PURE__ */ _interop_require_default._(require("axios"));
-const _utils = require("@modern-js/utils");
+module.exports = __toCommonJS(workerSSRRender_exports);
+var import_axios = __toESM(require("axios"));
+var import_utils = require("@modern-js/utils");
 const PORT = 9230;
 async function workerSSRRender(ctx, renderOptions, _runner) {
   const { headers, params } = ctx;
   const { urlPath } = renderOptions;
   const url = `http://0.0.0.0:${PORT}/${urlPath}`;
-  const resposne = await _axios.default.get(url, {
+  const resposne = await import_axios.default.get(url, {
     timeout: 5e3,
     responseType: "text",
     headers,
@@ -24,6 +46,10 @@ async function workerSSRRender(ctx, renderOptions, _runner) {
   });
   return {
     content: resposne.data,
-    contentType: _utils.mime.contentType("html")
+    contentType: import_utils.mime.contentType("html")
   };
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  workerSSRRender
+});

package/dist/cjs/types.js

@@ -1,4 +1,16 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/esm/constants.js

@@ -1,5 +1,5 @@
 import { HMR_SOCK_PATH } from "@modern-js/utils/universal/constants";
-export var getDefaultDevOptions = function() {
+var getDefaultDevOptions = function() {
   return {
     client: {
       path: HMR_SOCK_PATH,
@@ -20,3 +20,6 @@ export var getDefaultDevOptions = function() {
     liveReload: true
   };
 };
+export {
+  getDefaultDevOptions
+};

package/dist/esm/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) {
   var searchParams = resourceQuery.substr(1).split("&");
   var options = {};
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
@@ -26,7 +26,7 @@ export function createSocketUrl(resourceQuery) {
   var currentLocation = self.location;
   return getSocketUrl(options, currentLocation);
 }
-export function formatURL(param) {
+function formatURL(param) {
   var port = param.port, protocol = param.protocol, hostname = param.hostname, pathname = param.pathname;
   if (window.URL) {
     var url = new URL("http://localhost");
@@ -48,3 +48,7 @@ function getSocketUrl(urlParts, location) {
     pathname: path || HMR_SOCK_PATH
   });
 }
+export {
+  createSocketUrl,
+  formatURL
+};