@modern-js/server 2.3.0 → 2.4.1-beta.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @modern-js/server
 
+## 2.4.1-beta.0
+
+### Patch Changes
+
+- Updated dependencies [11c053b]
+  - @modern-js/prod-server@2.4.1-beta.0
+  - @modern-js/utils@2.4.1-beta.0
+  - @modern-js/server-utils@2.4.1-beta.0
+
+## 2.4.0
+
+### Patch Changes
+
+- d19484c: feat(hmr-client): add HMR connected log
+
+  feat(hmr-client): add HMR 连接成功的日志
+
+- Updated dependencies [98a2733]
+- Updated dependencies [8c2db5f]
+  - @modern-js/utils@2.4.0
+  - @modern-js/prod-server@2.4.0
+  - @modern-js/server-utils@2.4.0
+  - @modern-js/types@2.4.0
+
 ## 2.3.0
 
 ### Patch Changes

package/README.md

@@ -1,30 +1,26 @@
-
 <p align="center">
   <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
 </p>
+
+<h1 align="center">Modern.js</h1>
+
 <p align="center">
-现代 Web 工程体系
-  <br/>
-  <a href="https://modernjs.dev" target="blank">
-    modernjs.dev
-  </a>
-</p>
-<p align="center">
-  The meta-framework suite designed from scratch for frontend-focused modern web development
+  A Progressive React Framework for modern web development.
 </p>
 
-# Introduction
-
-> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
+## Getting Started
 
-- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
+Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js.
 
-## Getting Started
+## Documentation
 
-- [Quick Start](https://modernjs.dev/docs/start)
-- [Guides](https://modernjs.dev/docs/guides)
-- [API References](https://modernjs.dev/docs/apis)
+- [English Documentation](https://modernjs.dev/en/)
+- [中文文档](https://modernjs.dev)
 
 ## Contributing
 
-- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)
+Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+
+## License
+
+Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).

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

@@ -10,11 +10,14 @@ var require_hmr_client = __commonJS({
     const hadRuntimeError = false;
     const socketUrl = createSocketUrl(__resourceQuery);
     const connection = new WebSocket(socketUrl);
+    connection.onopen = function() {
+      if (typeof console !== "undefined" && typeof console.debug === "function") {
+        console.debug("[HMR] connected.");
+      }
+    };
     connection.onclose = function() {
       if (typeof console !== "undefined" && typeof console.info === "function") {
-        console.info(
-          "The development server has disconnected.\nRefresh the page if necessary."
-        );
+        console.debug("[HMR] disconnected. Refresh the page if necessary.");
       }
     };
     let isFirstCompilation = true;

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

@@ -22,11 +22,14 @@ var import_createSocketUrl = require("./createSocketUrl");
 const hadRuntimeError = false;
 const socketUrl = (0, import_createSocketUrl.createSocketUrl)(__resourceQuery);
 const connection = new WebSocket(socketUrl);
+connection.onopen = function() {
+  if (typeof console !== "undefined" && typeof console.debug === "function") {
+    console.debug("[HMR] connected.");
+  }
+};
 connection.onclose = function() {
   if (typeof console !== "undefined" && typeof console.info === "function") {
-    console.info(
-      "The development server has disconnected.\nRefresh the page if necessary."
-    );
+    console.debug("[HMR] disconnected. Refresh the page if necessary.");
   }
 };
 let isFirstCompilation = true;

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

@@ -95,9 +95,14 @@ var require_hmr_client = __commonJS({
         var hadRuntimeError = false;
         var socketUrl = createSocketUrl(__resourceQuery);
         var connection = new WebSocket(socketUrl);
+        connection.onopen = function() {
+            if (typeof console !== "undefined" && typeof console.debug === "function") {
+                console.debug("[HMR] connected.");
+            }
+        };
         connection.onclose = function() {
             if (typeof console !== "undefined" && typeof console.info === "function") {
-                console.info("The development server has disconnected.\nRefresh the page if necessary.");
+                console.debug("[HMR] disconnected. Refresh the page if necessary.");
             }
         };
         var isFirstCompilation = true;

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

@@ -275,9 +275,9 @@ var DevMiddleware = /*#__PURE__*/ function(EventEmitter) {
                 });
                 var _this1 = this;
                 app.on("close", /*#__PURE__*/ _asyncToGenerator(function() {
-                    var ref;
+                    var _this_middleware;
                     return __generator(this, function(_state) {
-                        (ref = _this1.middleware) === null || ref === void 0 ? void 0 : ref.close(noop);
+                        (_this_middleware = _this1.middleware) === null || _this_middleware === void 0 ? void 0 : _this_middleware.close(noop);
                         _this1.socketServer.close();
                         return [
                             2

package/dist/js/treeshaking/dev-tools/dev-middleware/socket-server.js

@@ -49,11 +49,11 @@ var SocketServer = /*#__PURE__*/ function() {
             key: "prepare",
             value: function prepare(app) {
                 var _this = this;
-                var ref;
+                var _this_options_client;
                 this.app = app;
                 this.wsServer = new ws.Server({
                     noServer: true,
-                    path: (ref = this.options.client) === null || ref === void 0 ? void 0 : ref.path
+                    path: (_this_options_client = this.options.client) === null || _this_options_client === void 0 ? void 0 : _this_options_client.path
                 });
                 this.app.on("upgrade", function(req, sock, head) {
                     if (!_this.wsServer.shouldHandle(req)) {

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

@@ -80,9 +80,9 @@ var enableRegister = function(projectRoot, config) {
         projectRoot
     ]);
     if (isTsProject && existTsNode && existTsConfigPaths) {
-        var ref;
+        var _config_output_distPath;
         debug("use ts-node");
-        var distPath = ((ref = config.output.distPath) === null || ref === void 0 ? void 0 : ref.root) || "dist";
+        var distPath = ((_config_output_distPath = config.output.distPath) === null || _config_output_distPath === void 0 ? void 0 : _config_output_distPath.root) || "dist";
         var tsNode = require("ts-node");
         var tsConfigPaths = require("tsconfig-paths");
         var alias = config.source.alias;
@@ -90,7 +90,7 @@ var enableRegister = function(projectRoot, config) {
             appDirectory: projectRoot,
             tsconfigPath: tsconfigPath
         });
-        var _paths = aliasConfig.paths, paths = _paths === void 0 ? {} : _paths, _absoluteBaseUrl = aliasConfig.absoluteBaseUrl, absoluteBaseUrl = _absoluteBaseUrl === void 0 ? "./" : _absoluteBaseUrl;
+        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) {
             var tsPath = paths[key];
             if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
@@ -117,12 +117,12 @@ var enableRegister = function(projectRoot, config) {
             ]
         });
     } else {
-        var ref1, ref2;
+        var _config_tools, _config_server;
         debug("use @babel/register");
         var babelConfig = resolveBabelConfig(projectRoot, _objectSpreadProps(_objectSpread({}, config.source), {
-            babelConfig: (ref1 = config.tools) === null || ref1 === void 0 ? void 0 : ref1.babel,
+            babelConfig: (_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.babel,
             server: {
-                compiler: (ref2 = config.server) === null || ref2 === void 0 ? void 0 : ref2.compiler
+                compiler: (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.compiler
             }
         }), {
             tsconfigPath: tsconfigPath,

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

@@ -154,15 +154,15 @@ var Watcher = /*#__PURE__*/ function() {
         {
             key: "updateDepTree",
             value: function updateDepTree() {
-                var ref;
-                (ref = this.dependencyTree) === null || ref === void 0 ? void 0 : ref.update(require.cache);
+                var _this_dependencyTree;
+                (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.update(require.cache);
             }
         },
         {
             key: "cleanDepCache",
             value: function cleanDepCache(filepath) {
-                var ref;
-                var node = (ref = this.dependencyTree) === null || ref === void 0 ? void 0 : ref.getNode(filepath);
+                var _this_dependencyTree;
+                var node = (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.getNode(filepath);
                 if (node && require.cache[filepath]) {
                     delete require.cache[filepath];
                     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/dist/js/treeshaking/dev-tools/watcher/stats-cache.js

@@ -43,7 +43,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "add",
             value: function add(files) {
-                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
+                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
                 var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                 try {
                     for(var _iterator = files[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -75,7 +75,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "refresh",
             value: function refresh(filename) {
-                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
+                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
                 if (fs.existsSync(filename)) {
                     var stats = fs.statSync(filename);
                     if (stats.isFile()) {
@@ -97,7 +97,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "isDiff",
             value: function isDiff(filename) {
-                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
+                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
                 var stats = fs.statSync(filename);
                 var hash = cachedHash[filename];
                 var size = cachedSize[filename];

package/dist/js/treeshaking/server/dev-server.js

@@ -438,13 +438,13 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                     return _get(_getPrototypeOf(ModernDevServer.prototype), "onInit", _this);
                 };
                 return _asyncToGenerator(function() {
-                    var dev, ref, befores, afters, beforeHandlers, afterHandlers;
+                    var dev, _this_applySetupMiddlewares, befores, afters, beforeHandlers, afterHandlers;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 _this1.runner = runner;
                                 dev = _this1.dev;
-                                ref = _this1.applySetupMiddlewares(), befores = ref.befores, afters = ref.afters;
+                                _this_applySetupMiddlewares = _this1.applySetupMiddlewares(), befores = _this_applySetupMiddlewares.befores, afters = _this_applySetupMiddlewares.afters;
                                 return [
                                     4,
                                     _this1.setupBeforeDevMiddleware()
@@ -474,13 +474,13 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                 if (dev.watch) {
                                     _this1.startWatcher();
                                     app.on("close", /*#__PURE__*/ _asyncToGenerator(function() {
-                                        var ref;
+                                        var _this_watcher;
                                         return __generator(this, function(_state) {
                                             switch(_state.label){
                                                 case 0:
                                                     return [
                                                         4,
-                                                        (ref = _this1.watcher) === null || ref === void 0 ? void 0 : ref.close()
+                                                        (_this_watcher = _this1.watcher) === null || _this_watcher === void 0 ? void 0 : _this_watcher.close()
                                                     ];
                                                 case 1:
                                                     _state.sent();
@@ -504,7 +504,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             value: function applyDefaultMiddlewares(app) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var pwd, dev, devMiddleware, proxyHandlers, ref, connectHistoryApiFallback, historyApiFallbackMiddleware;
+                    var pwd, dev, devMiddleware, proxyHandlers, _ref, connectHistoryApiFallback, historyApiFallbackMiddleware;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -519,7 +519,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                         try {
                                             for(var _iterator = Object.entries(confHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                                var _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
+                                                var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
                                                 ctx.res.setHeader(key, value);
                                             }
                                         } catch (err) {
@@ -582,7 +582,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                     import("connect-history-api-fallback")
                                 ];
                             case 1:
-                                ref = _state.sent(), connectHistoryApiFallback = ref.default;
+                                _ref = _state.sent(), connectHistoryApiFallback = _ref.default;
                                 historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
                                 _this.addHandler(function(ctx, next) {
                                     return historyApiFallbackMiddleware(ctx.req, ctx.res, next);
@@ -765,8 +765,8 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             key: "startWatcher",
             value: function startWatcher() {
                 var _this = this;
-                var ref;
-                var ref1 = this, pwd = ref1.pwd, distDir = ref1.distDir;
+                var _this_conf_server;
+                var _this1 = this, pwd = _this1.pwd, distDir = _this1.distDir;
                 var mock = AGGRED_DIR.mock;
                 var defaultWatched = [
                     "".concat(mock, "/**/*"),
@@ -775,7 +775,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                     "".concat(SHARED_DIR, "/**/*"),
                     "".concat(distDir, "/").concat(SERVER_BUNDLE_DIRECTORY, "/*-server-loaders.js")
                 ];
-                var watchOptions = mergeWatchOptions((ref = this.conf.server) === null || ref === void 0 ? void 0 : ref.watchOptions);
+                var watchOptions = mergeWatchOptions((_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.watchOptions);
                 var defaultWatchedPaths = defaultWatched.map(function(p) {
                     var finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
                     return path.normalize(finalPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/server",
-  "description": "The meta-framework suite designed from scratch for frontend-focused modern web development.",
+  "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/modern-js-dev/modern.js/issues",
   "repository": "modern-js-dev/modern.js",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.3.0",
+  "version": "2.4.1-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,10 +34,10 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.3.0",
-    "@modern-js/server-utils": "2.3.0",
-    "@modern-js/types": "2.3.0",
-    "@modern-js/utils": "2.3.0"
+    "@modern-js/prod-server": "2.4.1-beta.0",
+    "@modern-js/server-utils": "2.4.1-beta.0",
+    "@modern-js/types": "2.4.0",
+    "@modern-js/utils": "2.4.1-beta.0"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -52,9 +52,9 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "websocket": "^1",
-    "@modern-js/server-core": "2.3.0",
-    "@scripts/jest-config": "2.3.0",
-    "@scripts/build": "2.3.0"
+    "@modern-js/server-core": "2.4.1-beta.0",
+    "@scripts/jest-config": "2.4.0",
+    "@scripts/build": "2.4.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",