@modern-js/server 2.13.4 → 2.15.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @modern-js/server
 
+## 2.15.0
+
+### Patch Changes
+
+- @modern-js/prod-server@2.15.0
+- @modern-js/server-utils@2.15.0
+- @modern-js/types@2.15.0
+- @modern-js/utils@2.15.0
+
+## 2.14.0
+
+### Patch Changes
+
+- 4779152: fix(utils): the esm format files should be generate for the client
+
+  fix(utils): 应该为客户端使用，生成 esm 格式的文件
+
+- 1f34dba: fix(devServer): using current host and port to create HMR connection
+
+  fix(devServer): 建立 HMR 连接时默认使用当前 host 和 port
+
+- Updated dependencies [4779152]
+- Updated dependencies [8a3c693]
+- Updated dependencies [9321bef]
+- Updated dependencies [9b45c58]
+- Updated dependencies [52d0cb1]
+- Updated dependencies [60a81d0]
+- Updated dependencies [dacef96]
+- Updated dependencies [16399fd]
+  - @modern-js/utils@2.14.0
+  - @modern-js/server-utils@2.14.0
+  - @modern-js/types@2.14.0
+  - @modern-js/prod-server@2.14.0
+
 ## 2.13.4
 
 ### Patch Changes

package/dist/cjs/constants.js

@@ -20,15 +20,17 @@ __export(constants_exports, {
   getDefaultDevOptions: () => getDefaultDevOptions
 });
 module.exports = __toCommonJS(constants_exports);
-var import_utils = require("@modern-js/utils");
 var import_constants = require("@modern-js/utils/universal/constants");
 const getDefaultDevOptions = () => {
-  const network = (0, import_utils.getIpv4Interfaces)().find((item) => !item.internal);
   return {
     client: {
-      port: "8080",
       path: import_constants.HMR_SOCK_PATH,
-      host: (network == null ? void 0 : network.address) || "localhost"
+      // By default it is set to the port number of the dev server
+      port: "",
+      // By default it is set to "location.hostname"
+      host: "",
+      // By default it is set to "location.protocol === 'https:' ? 'wss' : 'ws'""
+      protocol: ""
     },
     https: false,
     devMiddleware: { writeToDisk: true },

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

@@ -39,7 +39,7 @@ function getHMRClientPath(client) {
   const host = (client == null ? void 0 : client.host) ? `&host=${client.host}` : "";
   const path = (client == null ? void 0 : client.path) ? `&path=${client.path}` : "";
   const port = (client == null ? void 0 : client.port) ? `&port=${client.port}` : "";
-  const clientEntry = `${require.resolve("./hmr-client")}?${host}${path}${port}${protocol}`;
+  const clientEntry = `${require.resolve("@modern-js/server/hmr-client")}?${host}${path}${port}${protocol}`;
   return clientEntry;
 }
 class DevMiddleware extends import_events.EventEmitter {

package/dist/cjs/server/devServer.js

@@ -36,6 +36,7 @@ var import_https = require("https");
 var import_utils = require("@modern-js/utils");
 var import_prod_server = require("@modern-js/prod-server");
 var import_constants = require("@modern-js/utils/constants");
+var import_lodash = require("@modern-js/utils/lodash");
 var import_constants2 = require("../constants");
 var import_mock = require("../dev-tools/mock");
 var import_register = require("../dev-tools/register");
@@ -57,14 +58,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
   getDevOptions(options) {
     const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
     const defaultOptions = (0, import_constants2.getDefaultDevOptions)();
-    return {
-      ...defaultOptions,
-      ...devOptions,
-      client: {
-        ...defaultOptions.client,
-        ...devOptions == null ? void 0 : devOptions.client
-      }
-    };
+    return (0, import_lodash.merge)(defaultOptions, devOptions);
   }
   addMiddlewareHandler(handlers) {
     handlers.forEach((handler) => {

package/dist/esm/constants.js

@@ -1,14 +1,14 @@
-import { getIpv4Interfaces } from "@modern-js/utils";
 import { HMR_SOCK_PATH } from "@modern-js/utils/universal/constants";
 var getDefaultDevOptions = function() {
-    var network = getIpv4Interfaces().find(function(item) {
-        return !item.internal;
-    });
     return {
         client: {
-            port: "8080",
             path: HMR_SOCK_PATH,
-            host: (network === null || network === void 0 ? void 0 : network.address) || "localhost"
+            // By default it is set to the port number of the dev server
+            port: "",
+            // By default it is set to "location.hostname"
+            host: "",
+            // By default it is set to "location.protocol === 'https:' ? 'wss' : 'ws'""
+            protocol: ""
         },
         https: false,
         devMiddleware: {

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

@@ -243,7 +243,7 @@ function getHMRClientPath(client) {
     var host = (client === null || client === void 0 ? void 0 : client.host) ? "&host=".concat(client.host) : "";
     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("./hmr-client"), "?").concat(host).concat(path).concat(port).concat(protocol);
+    var clientEntry = "".concat(require.resolve("@modern-js/server/hmr-client"), "?").concat(host).concat(path).concat(port).concat(protocol);
     return clientEntry;
 }
 var DevMiddleware = /*#__PURE__*/ function(EventEmitter) {

package/dist/esm/server/devServer.js

@@ -144,45 +144,6 @@ function _nonIterableRest() {
 function _nonIterableSpread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _objectSpread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
-        });
-    }
-    return target;
-}
-function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
-    }
-    return keys;
-}
-function _objectSpreadProps(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
-}
 function _possibleConstructorReturn(self, call) {
     if (call && (_typeof(call) === "object" || typeof call === "function")) {
         return call;
@@ -346,6 +307,7 @@ import { createServer as createHttpsServer } from "https";
 import { API_DIR, SERVER_BUNDLE_DIRECTORY, SERVER_DIR, SHARED_DIR } from "@modern-js/utils";
 import { createProxyHandler, ModernServer, AGGRED_DIR } from "@modern-js/prod-server";
 import { LOADABLE_STATS_FILE } from "@modern-js/utils/constants";
+import { merge as deepMerge } from "@modern-js/utils/lodash";
 import { getDefaultDevOptions } from "../constants";
 import { createMockHandler } from "../dev-tools/mock";
 import { enableRegister } from "../dev-tools/register";
@@ -380,9 +342,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             value: function getDevOptions(options) {
                 var devOptions = typeof options.dev === "boolean" ? {} : options.dev;
                 var defaultOptions = getDefaultDevOptions();
-                return _objectSpreadProps(_objectSpread({}, defaultOptions, devOptions), {
-                    client: _objectSpread({}, defaultOptions.client, devOptions === null || devOptions === void 0 ? void 0 : devOptions.client)
-                });
+                return deepMerge(defaultOptions, devOptions);
             }
         },
         {

package/dist/esm-node/constants.js

@@ -1,12 +1,14 @@
-import { getIpv4Interfaces } from "@modern-js/utils";
 import { HMR_SOCK_PATH } from "@modern-js/utils/universal/constants";
 const getDefaultDevOptions = () => {
-  const network = getIpv4Interfaces().find((item) => !item.internal);
   return {
     client: {
-      port: "8080",
       path: HMR_SOCK_PATH,
-      host: (network == null ? void 0 : network.address) || "localhost"
+      // By default it is set to the port number of the dev server
+      port: "",
+      // By default it is set to "location.hostname"
+      host: "",
+      // By default it is set to "location.protocol === 'https:' ? 'wss' : 'ws'""
+      protocol: ""
     },
     https: false,
     devMiddleware: { writeToDisk: true },

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

@@ -7,7 +7,7 @@ function getHMRClientPath(client) {
   const host = (client == null ? void 0 : client.host) ? `&host=${client.host}` : "";
   const path = (client == null ? void 0 : client.path) ? `&path=${client.path}` : "";
   const port = (client == null ? void 0 : client.port) ? `&port=${client.port}` : "";
-  const clientEntry = `${require.resolve("./hmr-client")}?${host}${path}${port}${protocol}`;
+  const clientEntry = `${require.resolve("@modern-js/server/hmr-client")}?${host}${path}${port}${protocol}`;
   return clientEntry;
 }
 class DevMiddleware extends EventEmitter {

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

@@ -13,6 +13,7 @@ import {
   AGGRED_DIR
 } from "@modern-js/prod-server";
 import { LOADABLE_STATS_FILE } from "@modern-js/utils/constants";
+import { merge as deepMerge } from "@modern-js/utils/lodash";
 import { getDefaultDevOptions } from "../constants";
 import { createMockHandler } from "../dev-tools/mock";
 import { enableRegister } from "../dev-tools/register";
@@ -34,14 +35,7 @@ class ModernDevServer extends ModernServer {
   getDevOptions(options) {
     const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
     const defaultOptions = getDefaultDevOptions();
-    return {
-      ...defaultOptions,
-      ...devOptions,
-      client: {
-        ...defaultOptions.client,
-        ...devOptions == null ? void 0 : devOptions.client
-      }
-    };
+    return deepMerge(defaultOptions, devOptions);
   }
   addMiddlewareHandler(handlers) {
     handlers.forEach((handler) => {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.13.4",
+  "version": "2.15.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -24,6 +24,14 @@
         "require": "./dist/cjs/index.js"
       },
       "default": "./dist/esm/index.js"
+    },
+    "./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"
     }
   },
   "dependencies": {
@@ -33,10 +41,10 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.13.4",
-    "@modern-js/server-utils": "2.13.4",
-    "@modern-js/types": "2.13.4",
-    "@modern-js/utils": "2.13.4"
+    "@modern-js/prod-server": "2.15.0",
+    "@modern-js/server-utils": "2.15.0",
+    "@modern-js/types": "2.15.0",
+    "@modern-js/utils": "2.15.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -51,9 +59,9 @@
     "typescript": "^4",
     "webpack": "^5.76.2",
     "websocket": "^1",
-    "@modern-js/server-core": "2.13.4",
-    "@scripts/build": "2.13.4",
-    "@scripts/jest-config": "2.13.4"
+    "@modern-js/server-core": "2.15.0",
+    "@scripts/build": "2.15.0",
+    "@scripts/jest-config": "2.15.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",