@modern-js/server 2.15.1-alpha.0 → 2.17.0

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

@@ -1,45 +1,69 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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(
-  // 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
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var mock_exports = {};
-__export(mock_exports, {
-  createMockHandler: () => createMockHandler
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "createMockHandler", {
+  enumerable: true,
+  get: () => createMockHandler
 });
-module.exports = __toCommonJS(mock_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_prod_server = require("@modern-js/prod-server");
-var import_getMockData = __toESM(require("./getMockData"));
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _utils = require("@modern-js/utils");
+const _prodserver = require("@modern-js/prod-server");
+const _getMockData = /* @__PURE__ */ _interop_require_wildcard(require("./getMockData"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function")
+    return null;
+  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
+  return (_getRequireWildcardCache = function(nodeInterop2) {
+    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+  if (!nodeInterop && obj && obj.__esModule) {
+    return obj;
+  }
+  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+    return {
+      default: obj
+    };
+  }
+  var cache = _getRequireWildcardCache(nodeInterop);
+  if (cache && cache.has(obj)) {
+    return cache.get(obj);
+  }
+  var newObj = {};
+  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var key in obj) {
+    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+      if (desc && (desc.get || desc.set)) {
+        Object.defineProperty(newObj, key, desc);
+      } else {
+        newObj[key] = obj[key];
+      }
+    }
+  }
+  newObj.default = obj;
+  if (cache) {
+    cache.set(obj, newObj);
+  }
+  return newObj;
+}
 const createMockHandler = ({ pwd }) => {
-  const exts = [".ts", ".js"];
+  const exts = [
+    ".ts",
+    ".js"
+  ];
   let filepath = "";
   for (const ext of exts) {
-    const maybeMatch = import_path.default.join(pwd, `${import_prod_server.AGGRED_DIR.mock}/index${ext}`);
-    if (import_utils.fs.existsSync(maybeMatch)) {
+    const maybeMatch = _path.default.join(pwd, `${_prodserver.AGGRED_DIR.mock}/index${ext}`);
+    if (_utils.fs.existsSync(maybeMatch)) {
       filepath = maybeMatch;
       break;
     }
@@ -47,27 +71,27 @@ const createMockHandler = ({ pwd }) => {
   if (!filepath) {
     return null;
   }
-  const mod = (0, import_utils.compatRequire)(filepath, false);
+  const mod = (0, _utils.compatRequire)(filepath, false);
   const { default: mockModule = mod, config } = mod;
-  if ((config == null ? void 0 : config.enable) === false) {
+  if ((config === null || config === void 0 ? void 0 : config.enable) === false) {
     return null;
   }
   if (!mockModule) {
     throw new Error(`Mock file ${filepath} parsed failed!`);
   }
-  const apiList = (0, import_getMockData.default)(mockModule);
+  const apiList = (0, _getMockData.default)(mockModule);
   if (!apiList || apiList.length === 0) {
     return null;
   }
   return async (context, next) => {
-    if (typeof (config == null ? void 0 : config.enable) === "function") {
+    if (typeof (config === null || config === void 0 ? void 0 : config.enable) === "function") {
       const enableMock = config.enable(context.req, context.res);
       if (!enableMock) {
         return next();
       }
     }
     const { res } = context;
-    const matched = (0, import_getMockData.getMatched)(context, apiList);
+    const matched = (0, _getMockData.getMatched)(context, apiList);
     if (!matched) {
       return next();
     }
@@ -75,7 +99,3 @@ const createMockHandler = ({ pwd }) => {
     return matched.handler(context, next);
   };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createMockHandler
-});

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

@@ -1,39 +1,20 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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(
-  // 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
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var register_exports = {};
-__export(register_exports, {
-  enableRegister: () => enableRegister
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "enableRegister", {
+  enumerable: true,
+  get: () => enableRegister
 });
-module.exports = __toCommonJS(register_exports);
-var import_path = __toESM(require("path"));
-var import_server_utils = require("@modern-js/server-utils");
-var import_utils = require("@modern-js/utils");
-const debug = (0, import_utils.createDebugger)("server");
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _serverutils = require("@modern-js/server-utils");
+const _utils = require("@modern-js/utils");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const debug = (0, _utils.createDebugger)("server");
 const checkDep = (depName, paths) => {
   let packagePath = "";
   try {
@@ -45,31 +26,42 @@ const checkDep = (depName, paths) => {
   return Boolean(packagePath);
 };
 const enableRegister = (projectRoot, config) => {
-  var _a, _b, _c;
-  const registerDirs = ["./api", "./server", "./config/mock", "./shared"];
+  const registerDirs = [
+    "./api",
+    "./server",
+    "./config/mock",
+    "./shared"
+  ];
   const TS_CONFIG_FILENAME = `tsconfig.json`;
-  const tsconfigPath = import_path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
-  const isTsProject = import_utils.fs.existsSync(tsconfigPath);
-  const existTsNode = checkDep("ts-node", [projectRoot]);
-  const existTsConfigPaths = checkDep("tsconfig-paths", [projectRoot]);
+  const tsconfigPath = _path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
+  const isTsProject = _utils.fs.existsSync(tsconfigPath);
+  const existTsNode = checkDep("ts-node", [
+    projectRoot
+  ]);
+  const existTsConfigPaths = checkDep("tsconfig-paths", [
+    projectRoot
+  ]);
   if (isTsProject && existTsNode && existTsConfigPaths) {
+    var _config_output_distPath;
     debug("use ts-node");
-    const distPath = ((_a = config.output.distPath) == null ? void 0 : _a.root) || "dist";
+    const distPath = ((_config_output_distPath = config.output.distPath) === null || _config_output_distPath === void 0 ? void 0 : _config_output_distPath.root) || "dist";
     const tsNode = require("ts-node");
     const tsConfigPaths = require("tsconfig-paths");
     const { alias } = config.source;
-    const aliasConfig = (0, import_utils.getAliasConfig)(alias, {
+    const aliasConfig = (0, _utils.getAliasConfig)(alias, {
       appDirectory: projectRoot,
       tsconfigPath
     });
     const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
     const tsPaths = Object.keys(paths).reduce((o, key) => {
       let tsPath = paths[key];
-      if (typeof tsPath === "string" && import_path.default.isAbsolute(tsPath)) {
-        tsPath = import_path.default.relative(absoluteBaseUrl, tsPath);
+      if (typeof tsPath === "string" && _path.default.isAbsolute(tsPath)) {
+        tsPath = _path.default.relative(absoluteBaseUrl, tsPath);
       }
       if (typeof tsPath === "string") {
-        tsPath = [tsPath];
+        tsPath = [
+          tsPath
+        ];
       }
       return {
         ...o,
@@ -86,45 +78,42 @@ const enableRegister = (projectRoot, config) => {
       // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
       files: true,
       transpileOnly: true,
-      ignore: ["(?:^|/)node_modules/", `(?:^|/)${distPath}/`]
+      ignore: [
+        "(?:^|/)node_modules/",
+        `(?:^|/)${distPath}/`
+      ]
     });
   } else {
+    var _config_tools, _config_server;
     debug("use @babel/register");
-    const babelConfig = (0, import_server_utils.resolveBabelConfig)(
-      projectRoot,
-      {
-        ...config.source,
-        babelConfig: (_b = config.tools) == null ? void 0 : _b.babel,
-        server: {
-          compiler: (_c = config.server) == null ? void 0 : _c.compiler
-        }
-      },
-      {
-        tsconfigPath,
-        syntax: "es6+",
-        type: "commonjs"
+    const babelConfig = (0, _serverutils.resolveBabelConfig)(projectRoot, {
+      ...config.source,
+      babelConfig: (_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.babel,
+      server: {
+        compiler: (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.compiler
       }
-    );
+    }, {
+      tsconfigPath,
+      syntax: "es6+",
+      type: "commonjs"
+    });
     return require("@babel/register")({
       ...babelConfig,
       only: [
         function(filePath) {
-          if (filePath.includes(`node_modules${import_path.default.sep}.modern-js`)) {
+          if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {
             return true;
           }
-          return registerDirs.some(
-            (registerDir) => filePath.startsWith(import_path.default.join(projectRoot, registerDir))
-          );
+          return registerDirs.some((registerDir) => filePath.startsWith(_path.default.join(projectRoot, registerDir)));
         }
       ],
-      extensions: [".js", ".ts"],
+      extensions: [
+        ".js",
+        ".ts"
+      ],
       babelrc: false,
       configFile: false,
       root: projectRoot
     });
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  enableRegister
-});

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

@@ -1,37 +1,37 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _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(
-  // 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
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var dependencyTree_exports = {};
-__export(dependencyTree_exports, {
-  DependencyTree: () => DependencyTree,
-  defaultIgnores: () => defaultIgnores
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  defaultIgnores: () => defaultIgnores,
+  DependencyTree: () => DependencyTree
 });
-module.exports = __toCommonJS(dependencyTree_exports);
-var import_minimatch = __toESM(require("minimatch"));
+const _minimatch = /* @__PURE__ */ _interop_require_default(require("minimatch"));
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 const defaultIgnores = [
   "**/bower_components/**",
   "**/coverage/**",
@@ -41,25 +41,21 @@ const defaultIgnores = [
   "**/*.log"
 ];
 class DependencyTree {
-  constructor() {
-    this.tree = /* @__PURE__ */ new Map();
-    this.ignore = [...defaultIgnores];
-  }
   getNode(path) {
     return this.tree.get(path);
   }
   /**
-   * update dependency tree
-   *
-   * @param cache
-   */
+  * update dependency tree
+  *
+  * @param cache
+  */
   update(cache) {
     this.tree.clear();
     Object.keys(cache).forEach((path) => {
       if (!this.shouldIgnore(path)) {
-        const module2 = cache[path];
-        this.tree.set(module2.filename, {
-          module: module2,
+        const module = cache[path];
+        this.tree.set(module.filename, {
+          module,
           parent: /* @__PURE__ */ new Set(),
           children: /* @__PURE__ */ new Set()
         });
@@ -86,17 +82,18 @@ class DependencyTree {
     }
   }
   shouldIgnore(path) {
-    return !path || Boolean(
-      this.ignore.find(
-        (rule) => import_minimatch.default.match([path], rule, {
-          dot: true
-        }).length > 0
-      )
-    );
+    return !path || Boolean(this.ignore.find((rule) => _minimatch.default.match([
+      path
+    ], rule, {
+      dot: true
+    }).length > 0));
+  }
+  constructor() {
+    _define_property(this, "tree", void 0);
+    _define_property(this, "ignore", void 0);
+    this.tree = /* @__PURE__ */ new Map();
+    this.ignore = [
+      ...defaultIgnores
+    ];
   }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DependencyTree,
-  defaultIgnores
-});

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

@@ -1,42 +1,42 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _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(
-  // 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
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var watcher_exports = {};
-__export(watcher_exports, {
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   default: () => Watcher,
   defaultWatchOptions: () => defaultWatchOptions,
   getWatchedFiles: () => getWatchedFiles,
   mergeWatchOptions: () => mergeWatchOptions
 });
-module.exports = __toCommonJS(watcher_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_dependencyTree = require("./dependencyTree");
-var import_statsCache = require("./statsCache");
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _utils = require("@modern-js/utils");
+const _dependencyTree = require("./dependencyTree");
+const _statsCache = require("./statsCache");
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 const defaultWatchOptions = {
   // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,
@@ -47,7 +47,7 @@ const getWatchedFiles = (watcher) => {
   const files = [];
   Object.keys(watched).forEach((dir) => {
     watched[dir].forEach((fileName) => {
-      files.push(import_path.default.join(dir, fileName));
+      files.push(_path.default.join(dir, fileName));
     });
   });
   return files;
@@ -60,7 +60,9 @@ const mergeWatchOptions = (options) => {
     const { ignored } = watchOptions;
     const finalIgnored = ignored ? [
       defaultWatchOptions.ignored,
-      ...Array.isArray(ignored) ? ignored : [ignored]
+      ...Array.isArray(ignored) ? ignored : [
+        ignored
+      ]
     ] : ignored;
     if (finalIgnored) {
       watchOptions.ignored = finalIgnored;
@@ -73,26 +75,25 @@ const mergeWatchOptions = (options) => {
   return finalWatchOptions;
 };
 class Watcher {
-  constructor() {
-    this.dependencyTree = null;
-  }
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
     const filenames = watched.map((filename) => filename.replace(/\\/g, "/"));
-    const cache = new import_statsCache.StatsCache();
-    const watcher = import_utils.chokidar.watch(filenames, options);
+    const cache = new _statsCache.StatsCache();
+    const watcher = _utils.chokidar.watch(filenames, options);
     watcher.on("ready", () => {
       cache.add(getWatchedFiles(watcher));
     });
     watcher.on("change", (changed) => {
-      if (!import_utils.fs.existsSync(changed) || cache.isDiff(changed)) {
+      if (!_utils.fs.existsSync(changed) || cache.isDiff(changed)) {
         cache.refresh(changed);
         callback(changed, "change");
       }
     });
     watcher.on("add", (changed) => {
       if (!cache.has(changed)) {
-        cache.add([changed]);
+        cache.add([
+          changed
+        ]);
         callback(changed, "add");
       }
     });
@@ -103,15 +104,15 @@ class Watcher {
     this.watcher = watcher;
   }
   createDepTree() {
-    this.dependencyTree = new import_dependencyTree.DependencyTree();
+    this.dependencyTree = new _dependencyTree.DependencyTree();
   }
   updateDepTree() {
-    var _a;
-    (_a = this.dependencyTree) == null ? void 0 : _a.update(require.cache);
+    var _this_dependencyTree;
+    (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.update(require.cache);
   }
   cleanDepCache(filepath) {
-    var _a;
-    const node = (_a = this.dependencyTree) == null ? void 0 : _a.getNode(filepath);
+    var _this_dependencyTree;
+    const 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];
       for (const parentNode of node.parent.values()) {
@@ -122,10 +123,8 @@ class Watcher {
   close() {
     return this.watcher.close();
   }
+  constructor() {
+    _define_property(this, "dependencyTree", null);
+    _define_property(this, "watcher", void 0);
+  }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  defaultWatchOptions,
-  getWatchedFiles,
-  mergeWatchOptions
-});