@modern-js/prod-server 2.4.0 → 2.5.0

package/dist/{js/treeshaking → esm}/server/modern-server.js

@@ -257,14 +257,14 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function onInit(runner, app) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var ref, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp;
+                    var _conf_bff, _this_conf_server, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp, ssrConfig, forceCSR;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 _this.runner = runner;
                                 distDir = _this.distDir, staticGenerate = _this.staticGenerate, conf = _this.conf;
                                 debug("final server conf", _this.conf);
-                                _this.proxyHandler = createProxyHandler((ref = conf.bff) === null || ref === void 0 ? void 0 : ref.proxy);
+                                _this.proxyHandler = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
                                 if (_this.proxyHandler) {
                                     _this.proxyHandler.forEach(function(handler) {
                                         _this.addHandler(handler);
@@ -296,9 +296,12 @@ var ModernServer = /*#__PURE__*/ function() {
                                         target: distDir
                                     }
                                 ], _this.conf.output);
+                                ssrConfig = (_this_conf_server = _this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
+                                forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
                                 _this.routeRenderHandler = createRenderHandler({
                                     distDir: distDir,
-                                    staticGenerate: staticGenerate
+                                    staticGenerate: staticGenerate,
+                                    forceCSR: forceCSR
                                 });
                                 return [
                                     4,
@@ -393,8 +396,8 @@ var ModernServer = /*#__PURE__*/ function() {
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                req.logger = _this.logger;
-                                req.metrics = _this.metrics;
+                                req.logger = req.logger || _this.logger;
+                                req.metrics = req.metrics || _this.metrics;
                                 context = createContext(req, res);
                                 matched = _this.router.match(url || context.path);
                                 if (!matched) {
@@ -502,13 +505,13 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function prepareFrameHandler(options) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var workDir, runner, ref, onlyApi, onlyWeb, _ref, getMiddlewares, collector, ref1, pluginAPIExt, pluginWebExt, apiDir, serverDir, webExtension, apiExtension;
+                    var workDir, runner, _ref, onlyApi, onlyWeb, _createMiddlewareCollecter, getMiddlewares, collector, _getMiddlewares, pluginAPIExt, pluginWebExt, apiDir, serverDir, webExtension, apiExtension;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 workDir = _this.workDir, runner = _this.runner;
-                                ref = options || {}, onlyApi = ref.onlyApi, onlyWeb = ref.onlyWeb;
-                                _ref = createMiddlewareCollecter(), getMiddlewares = _ref.getMiddlewares, collector = _objectWithoutProperties(_ref, [
+                                _ref = options || {}, onlyApi = _ref.onlyApi, onlyWeb = _ref.onlyWeb;
+                                _createMiddlewareCollecter = createMiddlewareCollecter(), getMiddlewares = _createMiddlewareCollecter.getMiddlewares, collector = _objectWithoutProperties(_createMiddlewareCollecter, [
                                     "getMiddlewares"
                                 ]);
                                 return [
@@ -517,7 +520,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                 ];
                             case 1:
                                 _state.sent();
-                                ref1 = getMiddlewares(), pluginAPIExt = ref1.api, pluginWebExt = ref1.web;
+                                _getMiddlewares = getMiddlewares(), pluginAPIExt = _getMiddlewares.api, pluginWebExt = _getMiddlewares.web;
                                 apiDir = path.join(workDir, API_DIR);
                                 serverDir = path.join(workDir, SERVER_DIR);
                                 return [
@@ -606,7 +609,8 @@ var ModernServer = /*#__PURE__*/ function() {
                             runner.prepareApiServer({
                                 pwd: workDir,
                                 config: extension,
-                                prefix: Array.isArray(prefix) ? prefix[0] : prefix
+                                prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+                                render: _this.render.bind(_this)
                             }, {
                                 onLast: function() {
                                     return null;
@@ -715,7 +719,9 @@ var ModernServer = /*#__PURE__*/ function() {
                 var bundles = this.router.getBundles();
                 bundles.forEach(function(bundle) {
                     var filepath = path.join(distDir, bundle);
-                    require(filepath);
+                    if (fs.existsSync(filepath)) {
+                        require(filepath);
+                    }
                 });
             }
         },
@@ -731,7 +737,7 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function routeHandler(context) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var res, matched, route, afterMatchContext, _router, current, url, status, matched2, middlewareContext, renderResult, contentStream, response, afterRenderContext;
+                    var res, matched, route, afterMatchContext, _afterMatchContext_router, current, url, status, matched2, middlewareContext, renderResult, contentStream, response, afterRenderContext;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -778,7 +784,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                         2
                                     ];
                                 }
-                                _router = afterMatchContext.router, current = _router.current, url = _router.url, status = _router.status;
+                                _afterMatchContext_router = afterMatchContext.router, current = _afterMatchContext_router.current, url = _afterMatchContext_router.url, status = _afterMatchContext_router.status;
                                 if (url) {
                                     _this.redirect(res, url, status);
                                     return [
@@ -973,8 +979,8 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function requestHandler(req, res) {
                 var next = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : function() {};
                 res.statusCode = 200;
-                req.logger = this.logger;
-                req.metrics = this.metrics;
+                req.logger = req.logger || this.logger;
+                req.metrics = req.metrics || this.metrics;
                 var context;
                 try {
                     context = this.createContext(req, res);

package/dist/{js/treeshaking → esm}/utils.js

@@ -90,7 +90,7 @@ var useLocalPrefix = function(url) {
 };
 var getStaticReg = function() {
     var output = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, html = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var tmp = output.distPath, ref = tmp === void 0 ? {} : tmp, cssPath = ref.css, jsPath = ref.js, mediaPath = ref.media, _assetPrefix = output.assetPrefix, assetPrefix = _assetPrefix === void 0 ? "/" : _assetPrefix;
+    var tmp = output.distPath, _ref = tmp === void 0 ? {} : tmp, cssPath = _ref.css, jsPath = _ref.js, mediaPath = _ref.media, _output_assetPrefix = output.assetPrefix, assetPrefix = _output_assetPrefix === void 0 ? "/" : _output_assetPrefix;
     var favicon = html.favicon, faviconByEntries = html.faviconByEntries;
     var prefix = useLocalPrefix(assetPrefix) ? assetPrefix : "";
     var favicons = prepareFavicons(favicon, faviconByEntries);

package/dist/{js/treeshaking → esm}/worker-server.js

@@ -122,15 +122,20 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-var _request, _request1, _request2;
+var _ctx_request, _ctx_request1, _ctx_request2;
+import { Logger } from "./libs/logger";
 import { RouteMatchManager } from "./libs/route";
+import { metrics as defaultMetrics } from "./libs/metrics";
+var handleUrl = function(url) {
+    return url.replace(/^https?:\/\/.*?\//gi, "/");
+};
 var createHandler = function(manifest) {
     var routeMgr = new RouteMatchManager();
     var pages = manifest.pages, routes = manifest.routes;
     routeMgr.reset(routes);
     return function() {
         var _ref = _asyncToGenerator(function(ctx) {
-            var pageMatch, page, _query, _pathname, _params, params;
+            var pageMatch, page, _query, _pathname, _params, params, e;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -143,13 +148,26 @@ var createHandler = function(manifest) {
                             ];
                         }
                         page = pages[pageMatch.spec.urlPath];
-                        (_query = (_request = ctx.request).query) !== null && _query !== void 0 ? _query : _request.query = ctx.query;
-                        (_pathname = (_request1 = ctx.request).pathname) !== null && _pathname !== void 0 ? _pathname : _request1.pathname = ctx.pathname;
-                        (_params = (_request2 = ctx.request).params) !== null && _params !== void 0 ? _params : _request2.params = ctx.params;
+                        (_query = (_ctx_request = ctx.request).query) !== null && _query !== void 0 ? _query : _ctx_request.query = ctx.query;
+                        (_pathname = (_ctx_request1 = ctx.request).pathname) !== null && _pathname !== void 0 ? _pathname : _ctx_request1.pathname = ctx.pathname;
+                        (_params = (_ctx_request2 = ctx.request).params) !== null && _params !== void 0 ? _params : _ctx_request2.params = ctx.params;
                         params = pageMatch.parseURLParams(ctx.url);
+                        if (!page.serverRender) return [
+                            3,
+                            4
+                        ];
+                        _state.label = 1;
+                    case 1:
+                        _state.trys.push([
+                            1,
+                            3,
+                            ,
+                            4
+                        ]);
                         return [
                             4,
                             page.serverRender({
+                                entryName: page.entryName,
                                 template: page.template,
                                 query: ctx.query,
                                 request: ctx.request,
@@ -157,15 +175,53 @@ var createHandler = function(manifest) {
                                 pathname: ctx.pathname,
                                 req: ctx.request,
                                 res: ctx.response,
-                                params: ctx.params || params || {}
+                                params: ctx.params || params || {},
+                                logger: ctx.logger || new Logger({
+                                    level: "warn"
+                                }),
+                                metrics: ctx.metrics || defaultMetrics,
+                                loadableStats: ctx.loadableStats,
+                                routeManifest: ctx.routeManifest
                             })
                         ];
-                    case 1:
+                    case 2:
                         ctx.body = _state.sent();
                         ctx.status = 200;
                         return [
                             2
                         ];
+                    case 3:
+                        e = _state.sent();
+                        if (page.template) {
+                            ctx.body = page.template;
+                            ctx.status = 200;
+                            return [
+                                2
+                            ];
+                        } else {
+                            ctx.body = "404: not found";
+                            ctx.status = 404;
+                            return [
+                                2
+                            ];
+                        }
+                        return [
+                            3,
+                            4
+                        ];
+                    case 4:
+                        if (page.template) {
+                            ctx.body = page.template;
+                            ctx.status = 200;
+                            return [
+                                2
+                            ];
+                        }
+                        ctx.body = "404: not found";
+                        ctx.status = 404;
+                        return [
+                            2
+                        ];
                 }
             });
         });
@@ -174,4 +230,4 @@ var createHandler = function(manifest) {
         };
     }();
 };
-export { createHandler };
+export { createHandler, handleUrl };

package/dist/{js/modern → esm-node}/libs/hook-api/index.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-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));
 import cookie from "cookie";
 import { RouteAPI } from "./route";
 import { TemplateAPI } from "./template";
@@ -104,27 +85,31 @@ const base = (context) => {
 };
 const createAfterMatchContext = (context, entryName) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
+  return {
+    ...baseContext,
     router: new RouteAPI(entryName)
-  });
+  };
 };
 const createAfterRenderContext = (context, content) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
+  return {
+    ...baseContext,
     template: new TemplateAPI(content)
-  });
+  };
 };
 const createMiddlewareContext = (context) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
-    response: __spreadProps(__spreadValues({}, baseContext.response), {
+  return {
+    ...baseContext,
+    response: {
+      ...baseContext.response,
       locals: context.res.locals || {}
-    }),
+    },
     source: {
       req: context.req,
       res: context.res
     }
-  });
+  };
 };
 export {
   base,

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

@@ -0,0 +1,45 @@
+import * as path from "path";
+import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import mergeDeep from "merge-deep";
+const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
+  const serverConfigPath = path.join(distDirectory, serverConfigFile);
+  return `${serverConfigPath}.js`;
+};
+const requireConfig = (serverConfigPath) => {
+  if (fs.pathExistsSync(serverConfigPath)) {
+    return compatRequire(serverConfigPath);
+  }
+  return {};
+};
+const loadConfig = ({
+  cliConfig,
+  serverConfig,
+  resolvedConfigPath
+}) => {
+  let config = null;
+  if (process.env.NODE_ENV === "production") {
+    const resolvedConfig = requireConfig(resolvedConfigPath);
+    config = mergeDeep(
+      {
+        ...resolvedConfig,
+        plugins: []
+      },
+      serverConfig,
+      cliConfig
+    );
+  } else {
+    config = mergeDeep(
+      {
+        ...cliConfig,
+        plugins: []
+      },
+      serverConfig
+    );
+  }
+  return config;
+};
+export {
+  getServerConfigPath,
+  loadConfig,
+  requireConfig
+};

package/dist/esm-node/libs/logger.js

@@ -0,0 +1,98 @@
+const LOG_LEVEL = {
+  error: 0,
+  warn: 1,
+  info: 2,
+  debug: 3,
+  log: 4
+};
+const LOG_TYPES = {
+  error: {
+    color: "red",
+    label: "error",
+    level: "error"
+  },
+  info: {
+    color: "cyan",
+    label: "info",
+    level: "info"
+  },
+  success: {
+    color: "green",
+    label: "Success",
+    level: "info"
+  },
+  warn: {
+    color: "yellow",
+    label: "warn",
+    level: "warn"
+  },
+  debug: {
+    color: "red",
+    label: "debug",
+    level: "debug"
+  },
+  log: { level: "log" }
+};
+const DEFAULT_CONFIG = {
+  displayLabel: true,
+  uppercaseLabel: false
+};
+class Logger {
+  constructor(options = {}) {
+    this.level = options.level || LOG_TYPES.log.level;
+    this.config = { ...DEFAULT_CONFIG, ...options.config || {} };
+    this.types = {
+      ...LOG_TYPES,
+      ...options.types || {}
+    };
+    this.longestLabel = this.getLongestLabel();
+    Object.keys(this.types).forEach((type) => {
+      this[type] = this._log.bind(this, type);
+    });
+  }
+  _log(type, message, ...args) {
+    if (message === void 0 || message === null) {
+      console.log();
+      return;
+    }
+    if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
+      return;
+    }
+    let label = "";
+    let text = "";
+    const logType = this.types[type];
+    if (this.config.displayLabel && logType.label) {
+      label = this.config.uppercaseLabel ? logType.label.toUpperCase() : logType.label;
+      label = label.padEnd(this.longestLabel.length);
+    }
+    if (message instanceof Error) {
+      if (message.stack) {
+        const [name, ...rest] = message.stack.split("\n");
+        text = `${name}
+${rest.join("\n")}`;
+      } else {
+        text = message.message;
+      }
+    } else {
+      text = `${message}`;
+    }
+    const log = label.length > 0 ? `${label} ${text}` : text;
+    console.log(log, ...args);
+  }
+  getLongestLabel() {
+    let longestLabel = "";
+    Object.keys(this.types).forEach((type) => {
+      const { label = "" } = this.types[type];
+      if (label.length > longestLabel.length) {
+        longestLabel = label;
+      }
+    });
+    return longestLabel;
+  }
+}
+const logger = new Logger();
+logger.Logger = Logger;
+export {
+  Logger,
+  logger
+};

package/dist/{js/modern → esm-node}/libs/proxy.js

@@ -1,39 +1,3 @@
-var __defProp = Object.defineProperty;
-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 __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());
-  });
-};
 import { createProxyMiddleware } from "http-proxy-middleware";
 import { debug } from "../utils";
 function formatProxyOptions(proxyOptions) {
@@ -47,11 +11,12 @@ function formatProxyOptions(proxyOptions) {
         Object.keys(proxyOptions).reduce(
           (total, source) => {
             const option = proxyOptions[source];
-            total.push(__spreadValues({
+            total.push({
               context: source,
               changeOrigin: true,
-              logLevel: "warn"
-            }, typeof option === "string" ? { target: option } : option));
+              logLevel: "warn",
+              ...typeof option === "string" ? { target: option } : option
+            });
             return total;
           },
           []
@@ -71,7 +36,7 @@ const createProxyHandler = (proxyOptions) => {
   const formattedProxy = formatProxyOptions(proxyOptions);
   const middlewares = formattedProxy.map((option) => {
     const middleware = createProxyMiddleware(option.context, option);
-    return (ctx, next) => __async(void 0, null, function* () {
+    return async (ctx, next) => {
       const { req, res } = ctx;
       const bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
       if (typeof bypassUrl === "boolean") {
@@ -82,7 +47,7 @@ const createProxyHandler = (proxyOptions) => {
         return next();
       }
       middleware(req, res, next);
-    });
+    };
   });
   return middlewares;
 };

package/dist/esm-node/libs/render/cache/__tests__/cache.fun.test.js

@@ -0,0 +1,83 @@
+import url from "url";
+import { createCache, destroyCache } from "../spr";
+import {
+  cacheAddition,
+  connectFactor,
+  fname,
+  maybeSync,
+  namespaceHash,
+  valueFactory,
+  withCoalescedInvoke
+} from "../util";
+describe("test spr util functions", () => {
+  it("should return value correctly", () => {
+    expect(connectFactor("bar", "foo")).toBe("bar-foo");
+    expect(fname(1)).toBe("f1");
+    expect(namespaceHash("modern", "!@#$%^&")).toBe("modern/!@#$%^&");
+  });
+  it("should create or destroy instance correctly", () => {
+    const ins1 = createCache();
+    const ins2 = createCache();
+    expect(ins1 === ins2).toBe(true);
+    destroyCache();
+    const ins3 = createCache();
+    expect(ins1 === ins3).toBe(false);
+    expect(ins2 === ins3).toBe(false);
+  });
+  it("should return function correctly", () => {
+    const urlParams = (() => new url.URLSearchParams())();
+    urlParams.set("name", "modern");
+    const getParam = valueFactory(urlParams);
+    expect(getParam("name")).toBe("modern");
+    const headers = { age: "12345" };
+    const getHeader = valueFactory(headers);
+    expect(getHeader("age")).toBe("12345");
+  });
+  it("should add target html content", () => {
+    const contentNoHead = "<div>123</div>";
+    const html = cacheAddition(contentNoHead, Math.random().toString());
+    expect(html).toBe(contentNoHead);
+    const contentWithHead = "<head></head><div>123</div>";
+    const hash = Math.random().toString();
+    const htmlWithHead = cacheAddition(contentWithHead, hash);
+    expect(htmlWithHead).toBe(
+      `<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`
+    );
+  });
+  it("should only invoke func one time", async () => {
+    let index = 0;
+    const fn = withCoalescedInvoke(
+      async () => new Promise((resolve) => {
+        setTimeout(() => {
+          index += 1;
+          resolve(index);
+        }, 500);
+      })
+    );
+    const key = "test";
+    const [res1, res2] = await Promise.all([fn(key, []), fn(key, [])]);
+    expect(res1.isOrigin && res2.isOrigin).toBe(false);
+    expect(res1.isOrigin || res2.isOrigin).toBe(true);
+    expect(res1.value).toBe(1);
+    expect(res2.value).toBe(1);
+  });
+  it("should invoke sync or async", async () => {
+    const foo = "";
+    const async = await maybeSync(
+      () => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(foo);
+        }, 100);
+      })
+    )(false);
+    expect(async).toBeUndefined();
+    const sync = await maybeSync(
+      () => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(foo);
+        }, 100);
+      })
+    )(true);
+    expect(sync).toBe(foo);
+  });
+});