@modern-js/prod-server 1.0.5 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @modern-js/prod-server
 
+## 1.1.0
+
+### Minor Changes
+
+- d2d1d6b2: feat: support server config
+
+### Patch Changes
+
+- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/utils@1.4.0
+  - @modern-js/server-core@1.3.0
+
+## 1.0.6
+
+### Patch Changes
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- 132f7b53: feat: move config declarations to @modern-js/core
+- Updated dependencies [bebb39b6]
+- Updated dependencies [132f7b53]
+  - @modern-js/server-core@1.2.5
+  - @modern-js/utils@1.3.7
+
 ## 1.0.5
 
 ### Patch Changes

package/dist/js/modern/libs/loadConfig.js

@@ -0,0 +1,54 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import * as path from 'path';
+import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
+import mergeDeep from 'merge-deep';
+import { debug } from "../utils";
+export const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
+  const serverConfigPath = path.join(distDirectory, serverConfigFile);
+  return `${serverConfigPath}.js`;
+};
+export const requireConfig = serverConfigPath => {
+  if (fs.pathExistsSync(serverConfigPath)) {
+    try {
+      return compatRequire(serverConfigPath);
+    } catch (error) {
+      debug(error);
+      return {};
+    }
+  }
+
+  return {};
+};
+/**
+ * 对配置进行合并，开发环境下,cliConfig 与 serverConfig 进行深合并
+ * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
+ * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
+ */
+
+export const loadConfig = ({
+  cliConfig,
+  serverConfig,
+  resolvedConfigPath
+}) => {
+  let config = null;
+
+  if (process.env.NODE_ENV === 'production') {
+    const resolvedConfig = requireConfig(resolvedConfigPath); // cli config has a higher priority,because it's an argument passed in.
+
+    config = mergeDeep(_objectSpread(_objectSpread({}, resolvedConfig), {}, {
+      plugins: [] // filter cli plugins
+
+    }), serverConfig, cliConfig);
+  } else {
+    config = mergeDeep(_objectSpread(_objectSpread({}, cliConfig), {}, {
+      plugins: []
+    }), serverConfig);
+  }
+
+  return config;
+};

package/dist/js/modern/libs/proxy.js

@@ -1,6 +1,9 @@
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { formatProxyOptions } from '@modern-js/utils';
+import { debug } from "../utils";
 export const createProxyHandler = proxyOptions => {
+  debug('createProxyHandler', proxyOptions);
+
   if (!proxyOptions) {
     return null;
   } // If it is not an array, it may be an object that uses the context attribute

package/dist/js/modern/libs/render/cache/index.js

@@ -46,8 +46,7 @@ export default ((renderFn, ctx) => {
     } else if (cacheFile.isStale) {
       // if file is stale, request async
       const render = withCoalescedInvoke(() => renderFn(context)).bind(null, namespaceHash('render', cacheFile.hash), []);
-      render() // eslint-disable-next-line promise/prefer-await-to-then
-      .then(res => {
+      render().then(res => {
         if (res.value && res.isOrigin) {
           const {
             cacheConfig
@@ -59,8 +58,7 @@ export default ((renderFn, ctx) => {
             sprCache.del(cacheContext, cacheHash);
           }
         }
-      }) // eslint-disable-next-line promise/prefer-await-to-then
-      .catch(e => {
+      }).catch(e => {
         sprCache.del(cacheContext, cacheHash);
         ctx.error(ERROR_DIGEST.ERENDER, e);
       });

package/dist/js/modern/libs/render/cache/spr.js

@@ -221,8 +221,7 @@ class CacheManager {
     let data = this.cache.get(cacheKey);
 
     if (!data) {
-      const caches = await createPageCaches(MAX_CACHE_EACH_REQ); // eslint-disable-next-line require-atomic-updates
-
+      const caches = await createPageCaches(MAX_CACHE_EACH_REQ);
       data = this.createCacheContent(cacheConfig, caches);
     }
 

package/dist/js/modern/libs/render/cache/util.js

@@ -39,7 +39,6 @@ export function withCoalescedInvoke(func) {
     const entry = globalInvokeCache.get(key);
 
     if (entry) {
-      // eslint-disable-next-line promise/prefer-await-to-then
       return entry.then(res => ({
         isOrigin: false,
         value: res.value
@@ -50,15 +49,13 @@ export function withCoalescedInvoke(func) {
       return func(...args);
     }
 
-    const future = __wrapper() // eslint-disable-next-line promise/prefer-await-to-then
-    .then(res => {
+    const future = __wrapper().then(res => {
       globalInvokeCache.delete(key);
       return {
         isOrigin: true,
         value: res
       };
-    }) // eslint-disable-next-line promise/prefer-await-to-then
-    .catch(err => {
+    }).catch(err => {
       globalInvokeCache.delete(key);
       throw err;
     });

package/dist/js/modern/server/index.js

@@ -6,8 +6,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import path from 'path';
 import { serverManager, AppContext, ConfigContext, loadPlugins } from '@modern-js/server-core';
-import { logger as defaultLogger, SHARED_DIR } from '@modern-js/utils';
+import { logger as defaultLogger, SHARED_DIR, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
 import { metrics as defaultMetrics } from "../libs/metrics";
+import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
+import { debug } from "../utils";
 import { createProdServer } from "./modern-server-split";
 export class Server {
   constructor(options) {
@@ -16,25 +18,99 @@ export class Server {
     this.server = void 0;
     this.app = void 0;
     this.runner = void 0;
+    this.serverConfig = void 0;
     options.logger = options.logger || defaultLogger;
     options.metrics = options.metrics || defaultMetrics;
     this.options = options;
+    this.serverConfig = {};
   }
+  /**
+   * 初始化顺序
+   * - 获取 server runtime config
+   * - 设置 context
+   * - 创建 hooksRunner
+   * - 合并插件，内置插件和 serverConfig 中配置的插件
+   * - 执行 config hook
+   * - 获取最终的配置
+   * - 设置配置到 context
+   * - 初始化 server
+   * - 执行 prepare hook
+   * - 执行 server init
+   */
+
 
   async init() {
     const {
       options
-    } = this; // initialize server
+    } = this;
+    this.initServerConfig(options);
+    await this.injectContext(this.runner, options); // initialize server runner
+
+    this.runner = await this.createHookRunner(); // init config and execute config hook
 
-    this.server = this.serverImpl(options); // create http-server
+    await this.initConfig(this.runner, options);
+    await this.injectContext(this.runner, options); // initialize server
 
-    this.app = await this.server.createHTTPServer(this.getRequestHandler()); // initialize server runner
+    this.server = this.serverImpl(options);
+    await this.runPrepareHook(this.runner); // create http-server
 
-    this.runner = await this.createHookRunner(); // runner can only be used after server init
+    this.app = await this.server.createHTTPServer(this.getRequestHandler()); // runner can only be used after server init
 
     await this.server.onInit(this.runner);
     return this;
   }
+  /**
+   * Execute config hooks
+   * @param runner
+   * @param options
+   */
+
+
+  runConfigHook(runner, serverConfig) {
+    const newServerConfig = runner.config(serverConfig || {});
+    return newServerConfig;
+  }
+
+  async runPrepareHook(runner) {
+    runner.prepare();
+  }
+
+  initServerConfig(options) {
+    var _options$config$outpu;
+
+    const {
+      pwd,
+      serverConfigFile
+    } = options;
+    const distDirectory = path.join(pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist');
+    const serverConfigPath = getServerConfigPath(distDirectory, serverConfigFile);
+    const serverConfig = requireConfig(serverConfigPath);
+    this.serverConfig = serverConfig;
+  }
+  /**
+   *
+   * merge cliConfig and serverConfig
+   */
+
+
+  async initConfig(runner, options) {
+    var _config$output;
+
+    const {
+      pwd,
+      config
+    } = options;
+    const {
+      serverConfig
+    } = this;
+    const finalServerConfig = this.runConfigHook(runner, serverConfig);
+    const resolvedConfigPath = path.join(pwd, (config === null || config === void 0 ? void 0 : (_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist', OUTPUT_CONFIG_FILE);
+    options.config = loadConfig({
+      cliConfig: config,
+      serverConfig: finalServerConfig,
+      resolvedConfigPath
+    });
+  }
 
   async close() {
     await this.server.onClose();
@@ -65,31 +141,43 @@ export class Server {
     serverManager.clear();
     const {
       options
-    } = this;
+    } = this; // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
+
     const {
       plugins = [],
       pwd,
       config
-    } = options; // server app context for serve plugin
+    } = options;
+    const serverPlugins = this.serverConfig.plugins || []; // server app context for serve plugin
 
-    const loadedPlugins = loadPlugins(plugins, pwd);
+    const loadedPlugins = loadPlugins(plugins.concat(serverPlugins), pwd);
+    debug('plugins', config.plugins, loadedPlugins);
     loadedPlugins.forEach(p => {
       serverManager.usePlugin(p);
-    });
+    }); // create runner
+
+    const hooksRunner = await serverManager.init({});
+    return hooksRunner;
+  }
+
+  async injectContext(runner, options) {
     const appContext = this.initAppContext();
+    const {
+      config,
+      pwd
+    } = options;
     serverManager.run(() => {
-      var _config$output;
+      var _config$output2;
 
       ConfigContext.set(config);
       AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-        distDirectory: path.join(pwd, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist')
+        distDirectory: path.join(pwd, ((_config$output2 = config.output) === null || _config$output2 === void 0 ? void 0 : _config$output2.path) || 'dist')
       }));
     });
-    return serverManager.init({});
   }
 
   initAppContext() {
-    var _config$output2;
+    var _config$output3;
 
     const {
       options
@@ -104,7 +192,7 @@ export class Server {
     }));
     return {
       appDirectory,
-      distDirectory: path.join(appDirectory, ((_config$output2 = config.output) === null || _config$output2 === void 0 ? void 0 : _config$output2.path) || 'dist'),
+      distDirectory: path.join(appDirectory, ((_config$output3 = config.output) === null || _config$output3 === void 0 ? void 0 : _config$output3.path) || 'dist'),
       sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
       plugins: serverPlugins
     };

package/dist/js/modern/server/modern-server.js

@@ -21,7 +21,7 @@ import clone from 'lodash.clone';
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler } from "../libs/serve-file";
-import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop } from "../utils";
+import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExtension, noop, debug } from "../utils";
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
@@ -73,6 +73,7 @@ export class ModernServer {
     this.distDir = path.join(pwd, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist');
     this.workDir = this.distDir;
     this.conf = config;
+    debug('server conf', this.conf);
     this.logger = logger;
     this.metrics = metrics;
     this.router = new RouteMatchManager();
@@ -98,7 +99,8 @@ export class ModernServer {
       ctx.res.setHeader('Access-Control-Allow-Origin', '*');
       ctx.res.setHeader('Access-Control-Allow-Credentials', 'false');
       next();
-    }); // proxy handler, each proxy has own handler
+    });
+    debug('final server conf', this.conf); // proxy handler, each proxy has own handler
 
     this.proxyHandler = createProxyHandler((_conf$bff = conf.bff) === null || _conf$bff === void 0 ? void 0 : _conf$bff.proxy);
 
@@ -223,7 +225,8 @@ export class ModernServer {
     }
 
     if (fs.existsSync(apiDir)) {
-      const mode = fs.existsSync(path.join(apiDir, AGGRED_DIR.lambda)) ? ApiServerMode.frame : ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
+      const mode = fs.existsSync(path.join(apiDir, AGGRED_DIR.lambda)) ? ApiServerMode.frame : ApiServerMode.func;
+      debug('exists api dir', mode); // if use lambda/, mean framework style of writing, then discard user extension
 
       const apiExtension = mergeExtension(pluginAPIExt);
       this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
@@ -324,7 +327,6 @@ export class ModernServer {
   }
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
-  // eslint-disable-next-line max-statements
 
 
   async routeHandler(context) {
@@ -416,8 +418,7 @@ export class ModernServer {
 
     res.setHeader('content-type', file.contentType);
     res.end(response);
-  } // eslint-disable-next-line max-statements
-
+  }
 
   async injectMicroFE(context, templateAPI) {
     var _conf$runtime, _conf$server;
@@ -509,8 +510,7 @@ export class ModernServer {
 
         if (!handler) {
           return next();
-        } // eslint-disable-next-line promise/prefer-await-to-then
-
+        }
 
         return handler(context, dispatch).catch(onError);
       };

package/dist/js/modern/utils.js

@@ -1,4 +1,6 @@
 import { compile } from 'path-to-regexp';
+import { createDebugger } from '@modern-js/utils';
+export const debug = createDebugger('prod-server');
 export const mergeExtension = users => {
   const output = [];
   return {

package/dist/js/node/libs/loadConfig.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.requireConfig = exports.loadConfig = exports.getServerConfigPath = void 0;
+
+var path = _interopRequireWildcard(require("path"));
+
+var _utils = require("@modern-js/utils");
+
+var _mergeDeep = _interopRequireDefault(require("merge-deep"));
+
+var _utils2 = require("../utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(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; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const getServerConfigPath = (distDirectory, serverConfigFile = _utils.DEFAULT_SERVER_CONFIG) => {
+  const serverConfigPath = path.join(distDirectory, serverConfigFile);
+  return `${serverConfigPath}.js`;
+};
+
+exports.getServerConfigPath = getServerConfigPath;
+
+const requireConfig = serverConfigPath => {
+  if (_utils.fs.pathExistsSync(serverConfigPath)) {
+    try {
+      return (0, _utils.compatRequire)(serverConfigPath);
+    } catch (error) {
+      (0, _utils2.debug)(error);
+      return {};
+    }
+  }
+
+  return {};
+};
+/**
+ * 对配置进行合并，开发环境下,cliConfig 与 serverConfig 进行深合并
+ * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
+ * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
+ */
+
+
+exports.requireConfig = requireConfig;
+
+const loadConfig = ({
+  cliConfig,
+  serverConfig,
+  resolvedConfigPath
+}) => {
+  let config = null;
+
+  if (process.env.NODE_ENV === 'production') {
+    const resolvedConfig = requireConfig(resolvedConfigPath); // cli config has a higher priority,because it's an argument passed in.
+
+    config = (0, _mergeDeep.default)(_objectSpread(_objectSpread({}, resolvedConfig), {}, {
+      plugins: [] // filter cli plugins
+
+    }), serverConfig, cliConfig);
+  } else {
+    config = (0, _mergeDeep.default)(_objectSpread(_objectSpread({}, cliConfig), {}, {
+      plugins: []
+    }), serverConfig);
+  }
+
+  return config;
+};
+
+exports.loadConfig = loadConfig;

package/dist/js/node/libs/proxy.js

@@ -9,7 +9,11 @@ var _httpProxyMiddleware = require("http-proxy-middleware");
 
 var _utils = require("@modern-js/utils");
 
+var _utils2 = require("../utils");
+
 const createProxyHandler = proxyOptions => {
+  (0, _utils2.debug)('createProxyHandler', proxyOptions);
+
   if (!proxyOptions) {
     return null;
   } // If it is not an array, it may be an object that uses the context attribute

package/dist/js/node/libs/render/cache/index.js

@@ -56,8 +56,7 @@ var _default = (renderFn, ctx) => {
     } else if (cacheFile.isStale) {
       // if file is stale, request async
       const render = (0, _util.withCoalescedInvoke)(() => renderFn(context)).bind(null, (0, _util.namespaceHash)('render', cacheFile.hash), []);
-      render() // eslint-disable-next-line promise/prefer-await-to-then
-      .then(res => {
+      render().then(res => {
         if (res.value && res.isOrigin) {
           const {
             cacheConfig
@@ -69,8 +68,7 @@ var _default = (renderFn, ctx) => {
             sprCache.del(cacheContext, cacheHash);
           }
         }
-      }) // eslint-disable-next-line promise/prefer-await-to-then
-      .catch(e => {
+      }).catch(e => {
         sprCache.del(cacheContext, cacheHash);
         ctx.error(_constants.ERROR_DIGEST.ERENDER, e);
       });

package/dist/js/node/libs/render/cache/spr.js

@@ -237,8 +237,7 @@ class CacheManager {
     let data = this.cache.get(cacheKey);
 
     if (!data) {
-      const caches = await (0, _pageCaches.createPageCaches)(MAX_CACHE_EACH_REQ); // eslint-disable-next-line require-atomic-updates
-
+      const caches = await (0, _pageCaches.createPageCaches)(MAX_CACHE_EACH_REQ);
       data = this.createCacheContent(cacheConfig, caches);
     }
 

package/dist/js/node/libs/render/cache/util.js

@@ -64,7 +64,6 @@ function withCoalescedInvoke(func) {
     const entry = globalInvokeCache.get(key);
 
     if (entry) {
-      // eslint-disable-next-line promise/prefer-await-to-then
       return entry.then(res => ({
         isOrigin: false,
         value: res.value
@@ -75,15 +74,13 @@ function withCoalescedInvoke(func) {
       return func(...args);
     }
 
-    const future = __wrapper() // eslint-disable-next-line promise/prefer-await-to-then
-    .then(res => {
+    const future = __wrapper().then(res => {
       globalInvokeCache.delete(key);
       return {
         isOrigin: true,
         value: res
       };
-    }) // eslint-disable-next-line promise/prefer-await-to-then
-    .catch(err => {
+    }).catch(err => {
       globalInvokeCache.delete(key);
       throw err;
     });