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

package/CHANGELOG.md

@@ -1,13 +1,32 @@
 # @modern-js/server
 
-## 2.4.1-beta.0
+## 2.5.0
 
 ### Patch Changes
 
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- bb4e712: feat: support export config filed in mock file
+  feat: 支持从 mock 文件中导出 config
+- 6fca567: feat: support bff handle complete server, include page render
+  feat: 支持 bff 处理整个服务，包括页面渲染
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- f0b3d8c: fix: ts-node should compile scopeDir only
+  fix: ts-node 应该只编译 scopeDir 的文件
+- Updated dependencies [89ca6cc]
+- Updated dependencies [7cb8bb4]
+- Updated dependencies [6fca567]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
 - 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
+- Updated dependencies [169c58b]
+  - @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
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/dev-tools/dev-middleware/index.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-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 (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -35,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var dev_middleware_exports = {};
 __export(dev_middleware_exports, {
   default: () => DevMiddleware
@@ -85,11 +51,11 @@ class DevMiddleware extends import_events.EventEmitter {
     app.on("listening", () => {
       this.socketServer.prepare(app);
     });
-    app.on("close", () => __async(this, null, function* () {
+    app.on("close", async () => {
       var _a;
       (_a = this.middleware) == null ? void 0 : _a.close(noop);
       this.socketServer.close();
-    }));
+    });
   }
   sockWrite(type, data) {
     this.socketServer.sockWrite(type, data);
@@ -106,12 +72,13 @@ class DevMiddleware extends import_events.EventEmitter {
       }
     };
     const enableHMR = this.devOptions.hot || this.devOptions.liveReload;
-    const middleware = devMiddleware(__spreadValues({
+    const middleware = devMiddleware({
       headers: devOptions.headers,
       stats: false,
       callbacks,
-      hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0
-    }, devOptions.devMiddleware));
+      hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
+      ...devOptions.devMiddleware
+    });
     return middleware;
   }
 }

package/dist/{js/node → cjs}/dev-tools/https/index.js

@@ -15,40 +15,20 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var https_exports = {};
 __export(https_exports, {
   genHttpsOptions: () => genHttpsOptions
 });
 module.exports = __toCommonJS(https_exports);
 var import_utils = require("@modern-js/utils");
-const genHttpsOptions = (userOptions, pwd) => __async(void 0, null, function* () {
+const genHttpsOptions = async (userOptions, pwd) => {
   const httpsOptions = typeof userOptions === "boolean" ? {} : userOptions;
   if (!httpsOptions.key || !httpsOptions.cert) {
     let devcertPath;
     try {
       devcertPath = require.resolve("devcert", { paths: [pwd, __dirname] });
     } catch (err) {
-      const packageManager = yield (0, import_utils.getPackageManager)(pwd);
+      const packageManager = await (0, import_utils.getPackageManager)(pwd);
       const command = import_utils.chalk.yellow.bold(
         `${packageManager} install devcert@1.2.2 -D`
       );
@@ -61,11 +41,11 @@ const genHttpsOptions = (userOptions, pwd) => __async(void 0, null, function* ()
       throw new Error('[https] "devcert" is not found.');
     }
     const devcert = require(devcertPath);
-    const selfsign = yield devcert.certificateFor(["localhost"]);
+    const selfsign = await devcert.certificateFor(["localhost"]);
     return selfsign;
   }
   return httpsOptions;
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   genHttpsOptions

package/dist/{js/node → cjs}/dev-tools/mock/getMockData.js

@@ -1,24 +1,7 @@
 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 __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-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 (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -32,47 +15,26 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var getMockData_exports = {};
 __export(getMockData_exports, {
   default: () => getMockData_default,
   getMatched: () => getMatched
 });
 module.exports = __toCommonJS(getMockData_exports);
-var import_utils = require("@modern-js/utils");
 var import_path_to_regexp = require("path-to-regexp");
 const VALID_METHODS = ["get", "post", "put", "delete", "patch"];
 const BODY_PARSED_METHODS = ["post", "put", "delete", "patch"];
-const createFunctionDataHandler = (method, handler) => (context, next) => __async(void 0, null, function* () {
+const createFunctionDataHandler = (method, handler) => async (context, next) => {
   const { req, res } = context;
   return handler(req, res, next);
-});
+};
 const createStaticDataHandler = (method, handler) => (context) => {
   const { res } = context;
   res.setHeader("Content-Type", "application/json");
   res.end(JSON.stringify(handler));
 };
 const allowTypes = ["object", "function"];
-const normalizeConfig = (mockConfig) => Object.keys(mockConfig).reduce((acc, key) => {
+var getMockData_default = (mockConfig) => Object.keys(mockConfig).reduce((acc, key) => {
   const handler = mockConfig[key];
   const type = typeof handler;
   if (!allowTypes.includes(type)) {
@@ -82,13 +44,15 @@ const normalizeConfig = (mockConfig) => Object.keys(mockConfig).reduce((acc, key
   }
   const meta = parseKey(key);
   if (type === "object") {
-    acc.push(__spreadProps(__spreadValues({}, meta), {
+    acc.push({
+      ...meta,
       handler: createStaticDataHandler(meta.method, handler)
-    }));
+    });
   } else {
-    acc.push(__spreadProps(__spreadValues({}, meta), {
+    acc.push({
+      ...meta,
       handler: createFunctionDataHandler(meta.method, handler)
-    }));
+    });
   }
   return acc;
 }, []);
@@ -107,14 +71,6 @@ const parseKey = (key) => {
     path: key
   };
 };
-var getMockData_default = (filepath) => {
-  const mockModule = (0, import_utils.compatRequire)(filepath);
-  if (!mockModule) {
-    throw new Error(`Mock file ${filepath} parsed failed!`);
-  }
-  const data = normalizeConfig(mockModule);
-  return data;
-};
 const getMatched = (context, mockApiList) => {
   const { path: targetPathname, method: targetMethod } = context;
   const matched = mockApiList.find((mockApi) => {

package/dist/{js/node → cjs}/dev-tools/mock/index.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var mock_exports = {};
 __export(mock_exports, {
   createMockHandler: () => createMockHandler
@@ -63,11 +43,27 @@ const createMockHandler = ({ pwd }) => {
   if (!filepath) {
     return null;
   }
-  const apiList = (0, import_getMockData.default)(filepath);
+  const {
+    default: mockModule,
+    config
+  } = (0, import_utils.compatRequire)(filepath, false);
+  if ((config == null ? void 0 : config.enable) === false) {
+    return null;
+  }
+  if (!mockModule) {
+    throw new Error(`Mock file ${filepath} parsed failed!`);
+  }
+  const apiList = (0, import_getMockData.default)(mockModule);
   if (!apiList || apiList.length === 0) {
     return null;
   }
-  return (context, next) => __async(void 0, null, function* () {
+  return async (context, next) => {
+    if (typeof (config == null ? 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);
     if (!matched) {
@@ -75,7 +71,7 @@ const createMockHandler = ({ pwd }) => {
     }
     res.setHeader("Access-Control-Allow-Origin", "*");
     return matched.handler(context, next);
-  });
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/dev-tools/register/index.js

@@ -1,26 +1,9 @@
 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 __propIsEnum = Object.prototype.propertyIsEnumerable;
-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 (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -84,9 +67,10 @@ const enableRegister = (projectRoot, config) => {
       if (typeof tsPath === "string") {
         tsPath = [tsPath];
       }
-      return __spreadProps(__spreadValues({}, o), {
+      return {
+        ...o,
         [`${key}`]: tsPath
-      });
+      };
     }, {});
     tsConfigPaths.register({
       baseUrl: absoluteBaseUrl || "./",
@@ -94,6 +78,7 @@ const enableRegister = (projectRoot, config) => {
     });
     tsNode.register({
       project: tsconfigPath,
+      scope: true,
       files: true,
       transpileOnly: true,
       ignore: ["(?:^|/)node_modules/", `(?:^|/)${distPath}/`]
@@ -102,19 +87,21 @@ const enableRegister = (projectRoot, config) => {
     debug("use @babel/register");
     const babelConfig = (0, import_server_utils.resolveBabelConfig)(
       projectRoot,
-      __spreadProps(__spreadValues({}, config.source), {
+      {
+        ...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"
       }
     );
-    return require("@babel/register")(__spreadProps(__spreadValues({}, babelConfig), {
+    return require("@babel/register")({
+      ...babelConfig,
       only: [
         function(filePath) {
           if (filePath.includes(`node_modules${import_path.default.sep}.modern-js`)) {
@@ -129,7 +116,7 @@ const enableRegister = (projectRoot, config) => {
       babelrc: false,
       configFile: false,
       root: projectRoot
-    }));
+    });
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/{js/node → cjs}/dev-tools/watcher/index.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-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 (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -62,7 +48,9 @@ const getWatchedFiles = (watcher) => {
   return files;
 };
 const mergeWatchOptions = (options) => {
-  const watchOptions = __spreadValues({}, options);
+  const watchOptions = {
+    ...options
+  };
   if (watchOptions) {
     const { ignored } = watchOptions;
     const finalIgnored = ignored ? [
@@ -73,7 +61,10 @@ const mergeWatchOptions = (options) => {
       watchOptions.ignored = finalIgnored;
     }
   }
-  const finalWatchOptions = __spreadValues(__spreadValues({}, defaultWatchOptions), watchOptions);
+  const finalWatchOptions = {
+    ...defaultWatchOptions,
+    ...watchOptions
+  };
   return finalWatchOptions;
 };
 class Watcher {