@modern-js/server 2.35.1 → 2.36.0

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,136 +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() {
-  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 === 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,5 +1,4 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import { sep } from "path";
 import { EventEmitter } from "events";
 import SocketServer from "./socketServer";
 const noop = () => {
@@ -10,7 +9,7 @@ function getHMRClientPath(client) {
   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) {
@@ -60,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,7 +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 }) => {
+const createMockHandler = ({ pwd }) => {
   const exts = [
     ".ts",
     ".js"
@@ -46,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
+};

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

@@ -1,7 +1,7 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import fs from "fs";
 import crypto from "crypto";
-export class StatsCache {
+class StatsCache {
   add(files) {
     const { cachedHash, cachedSize } = this;
     for (const filename of files) {
@@ -54,3 +54,6 @@ export class StatsCache {
     _define_property(this, "cachedSize", {});
   }
 }
+export {
+  StatsCache
+};

package/dist/esm-node/index.js

@@ -1,9 +1,12 @@
 import { DevServer as Server } from "./server";
-export { Server };
-export default (options) => {
+var src_default = (options) => {
   if (options == null) {
     throw new Error("can not start server without options");
   }
   const server = new Server(options);
   return server.init();
 };
+export {
+  Server,
+  src_default as default
+};

package/dist/esm-node/server/devServer.js

@@ -11,7 +11,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 class ModernDevServer extends ModernServer {
+class ModernDevServer extends ModernServer {
   getDevOptions(options) {
     const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
     const defaultOptions = getDefaultDevOptions();
@@ -330,3 +330,6 @@ export class ModernDevServer extends ModernServer {
     enableRegister(this.pwd, this.conf);
   }
 }
+export {
+  ModernDevServer
+};

package/dist/esm-node/server/index.js

@@ -3,7 +3,7 @@ import { ModernDevServer } from "./devServer";
 const createDevServer = (options) => {
   return new ModernDevServer(options);
 };
-export class DevServer extends Server {
+class DevServer extends Server {
   constructor(options) {
     super(options);
     if (options.dev) {
@@ -11,3 +11,6 @@ export class DevServer extends Server {
     }
   }
 }
+export {
+  DevServer
+};

package/dist/esm-node/server/workerSSRRender.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 import { mime } from "@modern-js/utils";
 const PORT = 9230;
-export async function workerSSRRender(ctx, renderOptions, _runner) {
+async function workerSSRRender(ctx, renderOptions, _runner) {
   const { headers, params } = ctx;
   const { urlPath } = renderOptions;
   const url = `http://0.0.0.0:${PORT}/${urlPath}`;
@@ -16,3 +16,6 @@ export async function workerSSRRender(ctx, renderOptions, _runner) {
     contentType: mime.contentType("html")
   };
 }
+export {
+  workerSSRRender
+};

package/dist/esm-node/types.js

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.1",
+  "version": "2.36.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -32,10 +32,9 @@
     "./hmr-client": {
       "node": {
         "jsnext:source": "./src/dev-tools/dev-middleware/hmr-client/index.ts",
-        "import": "./dist/esm/dev-tools/dev-middleware/hmr-client/index.js",
         "require": "./dist/cjs/dev-tools/dev-middleware/hmr-client/index.js"
       },
-      "default": "./dist/esm/dev-tools/dev-middleware/hmr-client/index.js"
+      "default": "./dist/cjs/dev-tools/dev-middleware/hmr-client/index.js"
     }
   },
   "dependencies": {
@@ -48,11 +47,11 @@
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
     "axios": "^1.2.1",
-    "@modern-js/prod-server": "2.35.1",
-    "@modern-js/server-utils": "2.35.1",
-    "@modern-js/types": "2.35.1",
-    "@modern-js/utils": "2.35.1",
-    "@modern-js/runtime-utils": "2.35.1"
+    "@modern-js/runtime-utils": "2.36.0",
+    "@modern-js/prod-server": "2.36.0",
+    "@modern-js/server-utils": "2.36.0",
+    "@modern-js/types": "2.36.0",
+    "@modern-js/utils": "2.36.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -67,9 +66,9 @@
     "typescript": "^5",
     "webpack": "^5.88.1",
     "websocket": "^1",
-    "@modern-js/server-core": "2.35.1",
-    "@scripts/jest-config": "2.35.1",
-    "@scripts/build": "2.35.1"
+    "@modern-js/server-core": "2.36.0",
+    "@scripts/build": "2.36.0",
+    "@scripts/jest-config": "2.36.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",