@modern-js/server 2.5.1-alpha.1 → 2.6.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @modern-js/server
 
+## 2.6.0
+
+### Patch Changes
+
+- ba6db6e: fix: filter data when http method is get
+  fix: 过滤 get 请求的 data
+- ba6db6e: fix: the dependency tree should be able to filter out node_modules files containing dot
+  fix: 依赖树应该能够过滤掉包含"."的 node_modules 文件
+- Updated dependencies [36164a2]
+- Updated dependencies [e1f799e]
+- Updated dependencies [7915ab3]
+- Updated dependencies [49fa0b1]
+- Updated dependencies [0fe658a]
+- Updated dependencies [62930b9]
+  - @modern-js/prod-server@2.6.0
+  - @modern-js/utils@2.6.0
+  - @modern-js/types@2.6.0
+  - @modern-js/server-utils@2.6.0
+
 ## 2.5.0
 
 ### Patch Changes

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

@@ -13,6 +13,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -141,7 +145,11 @@ function tryApplyUpdates() {
       tryApplyUpdates();
     }
   }
-  const result = module.hot.check(true, handleApplyUpdates);
+  const result = module.hot.check(
+    /* autoApply */
+    true,
+    handleApplyUpdates
+  );
   if (result == null ? void 0 : result.then) {
     result.then(
       (updatedModules) => {

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -34,6 +38,7 @@ class SocketServer {
     this.timer = null;
     this.options = options;
   }
+  // create socket, install socket handler, bind socket event
   prepare(app) {
     var _a;
     this.app = app;
@@ -72,6 +77,7 @@ class SocketServer {
     this.stats = stats;
     this.sendStats();
   }
+  // write message to each socket
   sockWrite(type, data) {
     this.sockets.forEach((socket) => {
       this.send(socket, JSON.stringify({ type, data }));
@@ -115,6 +121,7 @@ class SocketServer {
       this.sendStats(true);
     }
   }
+  // get standard stats
   getStats() {
     const curStats = this.stats;
     if (!curStats) {
@@ -130,6 +137,7 @@ class SocketServer {
     };
     return curStats.toJson(defaultStats);
   }
+  // determine what message should send by stats
   sendStats(force = false) {
     const stats = this.getStats();
     if (!stats) {
@@ -148,6 +156,7 @@ class SocketServer {
       return this.sockWrite("ok");
     }
   }
+  // send message to connecting socket
   send(connection, message) {
     if (connection.readyState !== 1) {
       return;

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -79,6 +83,7 @@ const enableRegister = (projectRoot, config) => {
     tsNode.register({
       project: tsconfigPath,
       scope: true,
+      // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
       files: true,
       transpileOnly: true,
       ignore: ["(?:^|/)node_modules/", `(?:^|/)${distPath}/`]

package/dist/cjs/dev-tools/watcher/dependency-tree.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -44,6 +48,11 @@ class DependencyTree {
   getNode(path) {
     return this.tree.get(path);
   }
+  /**
+   * update dependency tree
+   *
+   * @param cache
+   */
   update(cache) {
     this.tree.clear();
     Object.keys(cache).forEach((path) => {

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -34,6 +38,7 @@ var import_utils = require("@modern-js/utils");
 var import_dependency_tree = require("./dependency-tree");
 var import_stats_cache = require("./stats-cache");
 const defaultWatchOptions = {
+  // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,
   ignored: /api\/typings\/.*/
 };

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -87,6 +91,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
     });
     return { befores, afters };
   }
+  // Complete the preparation of services
   async onInit(runner, app) {
     this.runner = runner;
     const { dev } = this;

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

@@ -148,7 +148,7 @@ var require_hmr_client = __commonJS({
                     tryApplyUpdates();
                 }
             }
-            var result = module.hot.check(true, handleApplyUpdates);
+            var result = module.hot.check(/* autoApply */ true, handleApplyUpdates);
             if (result === null || result === void 0 ? void 0 : result.then) {
                 result.then(function(updatedModules) {
                     handleApplyUpdates(null, updatedModules);

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

@@ -46,6 +46,7 @@ var SocketServer = /*#__PURE__*/ function() {
     }
     _createClass(SocketServer, [
         {
+            // create socket, install socket handler, bind socket event
             key: "prepare",
             value: function prepare(app) {
                 var _this = this;
@@ -90,6 +91,7 @@ var SocketServer = /*#__PURE__*/ function() {
             }
         },
         {
+            // write message to each socket
             key: "sockWrite",
             value: function sockWrite(type, data) {
                 var _this = this;
@@ -153,6 +155,7 @@ var SocketServer = /*#__PURE__*/ function() {
             }
         },
         {
+            // get standard stats
             key: "getStats",
             value: function getStats() {
                 var curStats = this.stats;
@@ -171,6 +174,7 @@ var SocketServer = /*#__PURE__*/ function() {
             }
         },
         {
+            // determine what message should send by stats
             key: "sendStats",
             value: function sendStats() {
                 var force = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
@@ -195,6 +199,7 @@ var SocketServer = /*#__PURE__*/ function() {
             }
         },
         {
+            // send message to connecting socket
             key: "send",
             value: function send(connection, message) {
                 if (connection.readyState !== 1) {

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

@@ -110,6 +110,7 @@ var enableRegister = function(projectRoot, config) {
         tsNode.register({
             project: tsconfigPath,
             scope: true,
+            // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
             files: true,
             transpileOnly: true,
             ignore: [

package/dist/esm/dev-tools/watcher/dependency-tree.js

@@ -81,7 +81,11 @@ var DependencyTree = /*#__PURE__*/ function() {
             }
         },
         {
-            key: "update",
+            /**
+   * update dependency tree
+   *
+   * @param cache
+   */ key: "update",
             value: function update(cache) {
                 var _this = this;
                 this.tree.clear();

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

@@ -75,6 +75,7 @@ import { fs, chokidar } from "@modern-js/utils";
 import { DependencyTree } from "./dependency-tree";
 import { StatsCache } from "./stats-cache";
 var defaultWatchOptions = {
+    // 初始化的时候不触发 add、addDir 事件
     ignoreInitial: true,
     ignored: /api\/typings\/.*/
 };

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

@@ -432,7 +432,8 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
         },
         {
             key: "onInit",
-            value: function onInit(runner, app) {
+            value: // Complete the preparation of services
+            function onInit(runner, app) {
                 var _this = this;
                 var _this1 = this, _superprop_get_onInit = function() {
                     return _get(_getPrototypeOf(ModernDevServer.prototype), "onInit", _this);

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

@@ -129,7 +129,11 @@ var require_hmr_client = __commonJS({
           tryApplyUpdates();
         }
       }
-      const result = module.hot.check(true, handleApplyUpdates);
+      const result = module.hot.check(
+        /* autoApply */
+        true,
+        handleApplyUpdates
+      );
       if (result == null ? void 0 : result.then) {
         result.then(
           (updatedModules) => {

package/dist/esm-node/dev-tools/dev-middleware/socket-server.js

@@ -6,6 +6,7 @@ class SocketServer {
     this.timer = null;
     this.options = options;
   }
+  // create socket, install socket handler, bind socket event
   prepare(app) {
     var _a;
     this.app = app;
@@ -44,6 +45,7 @@ class SocketServer {
     this.stats = stats;
     this.sendStats();
   }
+  // write message to each socket
   sockWrite(type, data) {
     this.sockets.forEach((socket) => {
       this.send(socket, JSON.stringify({ type, data }));
@@ -87,6 +89,7 @@ class SocketServer {
       this.sendStats(true);
     }
   }
+  // get standard stats
   getStats() {
     const curStats = this.stats;
     if (!curStats) {
@@ -102,6 +105,7 @@ class SocketServer {
     };
     return curStats.toJson(defaultStats);
   }
+  // determine what message should send by stats
   sendStats(force = false) {
     const stats = this.getStats();
     if (!stats) {
@@ -120,6 +124,7 @@ class SocketServer {
       return this.sockWrite("ok");
     }
   }
+  // send message to connecting socket
   send(connection, message) {
     if (connection.readyState !== 1) {
       return;

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

@@ -51,6 +51,7 @@ const enableRegister = (projectRoot, config) => {
     tsNode.register({
       project: tsconfigPath,
       scope: true,
+      // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
       files: true,
       transpileOnly: true,
       ignore: ["(?:^|/)node_modules/", `(?:^|/)${distPath}/`]

package/dist/esm-node/dev-tools/watcher/dependency-tree.js

@@ -15,6 +15,11 @@ class DependencyTree {
   getNode(path) {
     return this.tree.get(path);
   }
+  /**
+   * update dependency tree
+   *
+   * @param cache
+   */
   update(cache) {
     this.tree.clear();
     Object.keys(cache).forEach((path) => {

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

@@ -3,6 +3,7 @@ import { fs, chokidar } from "@modern-js/utils";
 import { DependencyTree } from "./dependency-tree";
 import { StatsCache } from "./stats-cache";
 const defaultWatchOptions = {
+  // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,
   ignored: /api\/typings\/.*/
 };

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

@@ -68,6 +68,7 @@ class ModernDevServer extends ModernServer {
     });
     return { befores, afters };
   }
+  // Complete the preparation of services
   async onInit(runner, app) {
     this.runner = runner;
     const { dev } = this;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.1-alpha.1",
+  "version": "2.6.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -29,19 +29,16 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
-    "@modern-js/prod-server": "2.5.0",
-    "@modern-js/server-utils": "2.5.0",
-    "@modern-js/types": "2.5.0",
-    "@modern-js/utils": "2.5.0",
     "connect-history-api-fallback": "^2.0.0",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
-    "ws": "^8.2.0"
+    "ws": "^8.2.0",
+    "@modern-js/prod-server": "2.6.0",
+    "@modern-js/types": "2.6.0",
+    "@modern-js/server-utils": "2.6.0",
+    "@modern-js/utils": "2.6.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "2.5.0",
-    "@scripts/build": "2.5.0",
-    "@scripts/jest-config": "2.5.0",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/jest": "^27",
     "@types/minimatch": "^3.0.5",
@@ -53,7 +50,10 @@
     "tsconfig-paths": "4.1.1",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "websocket": "^1"
+    "websocket": "^1",
+    "@modern-js/server-core": "2.6.0",
+    "@scripts/jest-config": "2.6.0",
+    "@scripts/build": "2.6.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",

package/dist/js/modern/constants.js

@@ -1,19 +0,0 @@
-import { getIpv4Interfaces, HMR_SOCK_PATH } from "@modern-js/utils";
-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"
-    },
-    https: false,
-    devMiddleware: { writeToDisk: true },
-    watch: true,
-    hot: true,
-    liveReload: true
-  };
-};
-export {
-  getDefaultDevOptions
-};

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

@@ -1,41 +0,0 @@
-import { HMR_SOCK_PATH } from "@modern-js/utils/constants";
-function createSocketUrl(resourceQuery) {
-  const searchParams = resourceQuery.substr(1).split("&");
-  const options = {};
-  for (const pair of searchParams) {
-    const ary = pair.split("=");
-    options[ary[0]] = decodeURIComponent(ary[1]);
-  }
-  const currentLocation = self.location;
-  return getSocketUrl(options, currentLocation);
-}
-function formatURL({
-  port,
-  protocol,
-  hostname,
-  pathname
-}) {
-  if (window.URL) {
-    const url = new URL("http://localhost");
-    url.port = port;
-    url.hostname = hostname;
-    url.protocol = protocol;
-    url.pathname = pathname;
-    return url.toString();
-  }
-  const colon = protocol.indexOf(":") === -1 ? ":" : "";
-  return `${protocol}${colon}//${hostname}:${port}${pathname}`;
-}
-function getSocketUrl(urlParts, location) {
-  const { host, port, path, protocol } = urlParts;
-  return formatURL({
-    protocol: protocol || (location.protocol === "https:" ? "wss" : "ws"),
-    hostname: host || location.hostname,
-    port: port || location.port,
-    pathname: path || HMR_SOCK_PATH
-  });
-}
-export {
-  createSocketUrl,
-  formatURL
-};

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

@@ -1,143 +0,0 @@
-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/format";
-import { createSocketUrl } from "./createSocketUrl";
-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.onclose = function() {
-      if (typeof console !== "undefined" && typeof console.info === "function") {
-        console.info(
-          "The development server has disconnected.\nRefresh 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;
-            }
-            console.warn(stripAnsi(formatted.warnings[i]));
-          }
-        }
-      }
-      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 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;
-        }
-        if (isUpdateAvailable()) {
-          tryApplyUpdates();
-        }
-      }
-      const result = module.hot.check(true, handleApplyUpdates);
-      if (result == null ? void 0 : result.then) {
-        result.then(
-          (updatedModules) => {
-            handleApplyUpdates(null, updatedModules);
-          },
-          (err) => {
-            handleApplyUpdates(err, null);
-          }
-        );
-      }
-    }
-  }
-});
-export default require_hmr_client();