@modern-js/server 2.0.0-beta.4 → 2.0.0-beta.6

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

@@ -1,57 +1,18 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 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(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  ModernDevServer: () => ModernDevServer
-});
-module.exports = __toCommonJS(stdin_exports);
-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_constants = require("@modern-js/utils/constants");
-var import_constants2 = 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 __create2 = Object.create;
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames2 = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf2 = Object.getPrototypeOf;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __reflectGet = Reflect.get;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
+    if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
   if (__getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(b)) {
@@ -61,19 +22,24 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __copyProps2 = (to, from, except, desc) => {
+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 __getOwnPropNames2(from))
-      if (!__hasOwnProp2.call(to, key) && key !== except)
-        __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+    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 __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-  isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf2(cls), key, obj);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -94,6 +60,22 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var dev_server_exports = {};
+__export(dev_server_exports, {
+  ModernDevServer: () => ModernDevServer
+});
+module.exports = __toCommonJS(dev_server_exports);
+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_constants = require("@modern-js/utils/constants");
+var import_constants2 = 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"));
 class ModernDevServer extends import_prod_server.ModernServer {
   constructor(options) {
     super(options);
@@ -205,7 +187,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
         }
       });
       if (dev.historyApiFallback) {
-        const { default: connectHistoryApiFallback } = yield Promise.resolve().then(() => __toESM2(require("connect-history-api-fallback")));
+        const { default: connectHistoryApiFallback } = yield Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
         const historyApiFallbackMiddleware = connectHistoryApiFallback(
           typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
         );
@@ -323,3 +305,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
     this.watcher = watcher;
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ModernDevServer
+});

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

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var server_exports = {};
+__export(server_exports, {
   DevServer: () => DevServer
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(server_exports);
 var import_prod_server = require("@modern-js/prod-server");
 var import_dev_server = require("./dev-server");
 const createDevServer = (options) => {
@@ -33,3 +33,7 @@ class DevServer extends import_prod_server.Server {
     }
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DevServer
+});

package/dist/js/node/types.js

@@ -0,0 +1,15 @@
+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/js/treeshaking/dev-tools/dev-middleware/hmr-client/index.js

@@ -1,157 +1,157 @@
 var __getOwnPropNames = Object.getOwnPropertyNames;
-  var __commonJS = function(cb, mod) {
-      return 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/format";
-  import { createSocketUrl } from "./createSocketUrl";
-  var require_hmr_client = __commonJS({
-      "src/dev-tools/dev-middleware/hmr-client/index.ts": function(exports, module) {
-          var clearOutdatedErrors = function clearOutdatedErrors() {
-              if (typeof console !== "undefined" && typeof console.clear === "function") {
-                  if (hasCompileErrors) {
-                      console.clear();
-                  }
-              }
-          };
-          var handleSuccess = function handleSuccess() {
-              clearOutdatedErrors();
-              var isHotUpdate = !isFirstCompilation;
-              isFirstCompilation = false;
-              hasCompileErrors = false;
-              if (isHotUpdate) {
-                  tryApplyUpdates();
-              }
-          };
-          var handleWarnings = function handleWarnings(warnings) {
-              clearOutdatedErrors();
-              var isHotUpdate = !isFirstCompilation;
-              isFirstCompilation = false;
-              hasCompileErrors = false;
-              function printWarnings() {
-                  var formatted = formatWebpackMessages({
-                      warnings: warnings,
-                      errors: []
-                  });
-                  if (typeof console !== "undefined" && typeof console.warn === "function") {
-                      for(var i = 0; i < formatted.warnings.length; i++){
-                          if (i === 5) {
-                              console.warn("There were more warnings in other files. You can find a complete log in the terminal.");
-                              break;
-                          }
-                          console.warn(stripAnsi(formatted.warnings[i]));
-                      }
-                  }
-              }
-              printWarnings();
-              if (isHotUpdate) {
-                  tryApplyUpdates();
-              }
-          };
-          var handleErrors = function handleErrors(errors) {
-              clearOutdatedErrors();
-              isFirstCompilation = false;
-              hasCompileErrors = true;
-              var formatted = formatWebpackMessages({
-                  errors: errors,
-                  warnings: []
-              });
-              if (typeof console !== "undefined" && typeof console.error === "function") {
-                  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                  try {
-                      for(var _iterator = formatted.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                          var error = _step.value;
-                          console.error(stripAnsi(error));
-                      }
-                  } catch (err) {
-                      _didIteratorError = true;
-                      _iteratorError = err;
-                  } finally{
-                      try {
-                          if (!_iteratorNormalCompletion && _iterator.return != null) {
-                              _iterator.return();
-                          }
-                      } finally{
-                          if (_didIteratorError) {
-                              throw _iteratorError;
-                          }
-                      }
-                  }
-              }
-          };
-          var handleAvailableHash = function handleAvailableHash(hash) {
-              mostRecentCompilationHash = hash;
-          };
-          var isUpdateAvailable = function isUpdateAvailable() {
-              return mostRecentCompilationHash !== __webpack_hash__;
-          };
-          var canApplyUpdates = function canApplyUpdates() {
-              return module.hot.status() === "idle";
-          };
-          var hadRuntimeError = false;
-          var socketUrl = createSocketUrl(__resourceQuery);
-          var connection = new WebSocket(socketUrl);
-          connection.onclose = function() {
-              if (typeof console !== "undefined" && typeof console.info === "function") {
-                  console.info("The development server has disconnected. Refresh the page if necessary.");
-              }
-          };
-          var isFirstCompilation = true;
-          var mostRecentCompilationHash = null;
-          var hasCompileErrors = false;
-          connection.onmessage = function(e) {
-              var 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 tryApplyUpdates() {
-              if (!module.hot) {
-                  window.location.reload();
-                  return;
-              }
-              if (!isUpdateAvailable() || !canApplyUpdates()) {
-                  return;
-              }
-              function handleApplyUpdates(err, updatedModules) {
-                  var wantsForcedReload = err || !updatedModules || hadRuntimeError;
-                  if (wantsForcedReload) {
-                      window.location.reload();
-                      return;
-                  }
-                  if (isUpdateAvailable()) {
-                      tryApplyUpdates();
-                  }
-              }
-              var result = module.hot.check(true, handleApplyUpdates);
-              if (result === null || result === void 0 ? void 0 : result.then) {
-                  result.then(function(updatedModules) {
-                      handleApplyUpdates(null, updatedModules);
-                  }, function(err) {
-                      handleApplyUpdates(err, null);
-                  });
-              }
-          }
-      }
-  });
-  export default require_hmr_client();
+var __commonJS = function(cb, mod) {
+    return 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/format";
+import { createSocketUrl } from "./createSocketUrl";
+var require_hmr_client = __commonJS({
+    "src/dev-tools/dev-middleware/hmr-client/index.ts": function(exports, module) {
+        var clearOutdatedErrors = function clearOutdatedErrors() {
+            if (typeof console !== "undefined" && typeof console.clear === "function") {
+                if (hasCompileErrors) {
+                    console.clear();
+                }
+            }
+        };
+        var handleSuccess = function handleSuccess() {
+            clearOutdatedErrors();
+            var isHotUpdate = !isFirstCompilation;
+            isFirstCompilation = false;
+            hasCompileErrors = false;
+            if (isHotUpdate) {
+                tryApplyUpdates();
+            }
+        };
+        var handleWarnings = function handleWarnings(warnings) {
+            clearOutdatedErrors();
+            var isHotUpdate = !isFirstCompilation;
+            isFirstCompilation = false;
+            hasCompileErrors = false;
+            function printWarnings() {
+                var formatted = formatWebpackMessages({
+                    warnings: warnings,
+                    errors: []
+                });
+                if (typeof console !== "undefined" && typeof console.warn === "function") {
+                    for(var 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]));
+                    }
+                }
+            }
+            printWarnings();
+            if (isHotUpdate) {
+                tryApplyUpdates();
+            }
+        };
+        var handleErrors = function handleErrors(errors) {
+            clearOutdatedErrors();
+            isFirstCompilation = false;
+            hasCompileErrors = true;
+            var formatted = formatWebpackMessages({
+                errors: errors,
+                warnings: []
+            });
+            if (typeof console !== "undefined" && typeof console.error === "function") {
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = formatted.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var error = _step.value;
+                        console.error(stripAnsi(error));
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+            }
+        };
+        var handleAvailableHash = function handleAvailableHash(hash) {
+            mostRecentCompilationHash = hash;
+        };
+        var isUpdateAvailable = function isUpdateAvailable() {
+            return mostRecentCompilationHash !== __webpack_hash__;
+        };
+        var canApplyUpdates = function canApplyUpdates() {
+            return module.hot.status() === "idle";
+        };
+        var hadRuntimeError = false;
+        var socketUrl = createSocketUrl(__resourceQuery);
+        var connection = new WebSocket(socketUrl);
+        connection.onclose = function() {
+            if (typeof console !== "undefined" && typeof console.info === "function") {
+                console.info("The development server has disconnected.\nRefresh the page if necessary.");
+            }
+        };
+        var isFirstCompilation = true;
+        var mostRecentCompilationHash = null;
+        var hasCompileErrors = false;
+        connection.onmessage = function(e) {
+            var 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 tryApplyUpdates() {
+            if (!module.hot) {
+                window.location.reload();
+                return;
+            }
+            if (!isUpdateAvailable() || !canApplyUpdates()) {
+                return;
+            }
+            function handleApplyUpdates(err, updatedModules) {
+                var wantsForcedReload = err || !updatedModules || hadRuntimeError;
+                if (wantsForcedReload) {
+                    window.location.reload();
+                    return;
+                }
+                if (isUpdateAvailable()) {
+                    tryApplyUpdates();
+                }
+            }
+            var result = module.hot.check(true, handleApplyUpdates);
+            if (result === null || result === void 0 ? void 0 : result.then) {
+                result.then(function(updatedModules) {
+                    handleApplyUpdates(null, updatedModules);
+                }, function(err) {
+                    handleApplyUpdates(err, null);
+                });
+            }
+        }
+    }
+});
+export default require_hmr_client();

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,10 +35,10 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.0.0-beta.4",
-    "@modern-js/server-utils": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4"
+    "@modern-js/prod-server": "2.0.0-beta.6",
+    "@modern-js/server-utils": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -53,9 +53,9 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "websocket": "^1",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "@modern-js/server-core": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6"
   },
   "peerDependencies": {
     "ts-node": "^10.1.0",
@@ -76,7 +76,7 @@
   },
   "scripts": {
     "new": "modern-lib new",
-    "build": "modern-lib build && node ./temp-fix-hmr.js",
+    "build": "modern-lib build",
     "dev": "modern-lib build --watch",
     "test": "jest"
   }