@modern-js/prod-server 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/js/treeshaking/libs/render/index.js

@@ -1,100 +1,233 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import path from 'path';
-import { fs, mime } from '@modern-js/utils';
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import path from "path";
+import { fs, mime } from "@modern-js/utils";
 import { ERROR_DIGEST } from "../../constants";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
-import { supportModern, getModernEntry } from "./modern";
-export var createRenderHandler = function createRenderHandler(_ref) {
-  var distDir = _ref.distDir,
-    staticGenerate = _ref.staticGenerate;
-  return /*#__PURE__*/function () {
-    var _render = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
-      var ctx, route, runner, entryPath, urlPath, entry, result, modernEntry, useModern, templatePath, content, _result;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              ctx = _ref2.ctx, route = _ref2.route, runner = _ref2.runner;
-              if (!ctx.resHasHandled()) {
-                _context.next = 3;
-                break;
-              }
-              return _context.abrupt("return", null);
-            case 3:
-              entryPath = route.entryPath, urlPath = route.urlPath;
-              entry = path.join(distDir, entryPath);
-              if (route.isSPA) {
-                _context.next = 10;
-                break;
-              }
-              _context.next = 8;
-              return handleDirectory(ctx, entry, urlPath);
-            case 8:
-              result = _context.sent;
-              return _context.abrupt("return", result);
-            case 10:
-              // only spa can use es6-html
-              modernEntry = getModernEntry(entry);
-              useModern =
-              // route.enableModernMode &&
-              supportModern(ctx) && fs.existsSync(modernEntry);
-              templatePath = useModern ? modernEntry : entry;
-              if (fs.existsSync(templatePath)) {
-                _context.next = 15;
-                break;
-              }
-              throw new Error("Could not find template file: ".concat(templatePath));
-            case 15:
-              _context.next = 17;
-              return readFile(templatePath);
-            case 17:
-              content = _context.sent;
-              if (content) {
-                _context.next = 20;
-                break;
-              }
-              return _context.abrupt("return", null);
-            case 20:
-              if (!route.isSSR) {
-                _context.next = 32;
-                break;
-              }
-              _context.prev = 21;
-              _context.next = 24;
-              return ssr.render(ctx, {
-                distDir: distDir,
-                entryName: route.entryName,
-                urlPath: route.urlPath,
-                bundle: route.bundle,
-                template: content.toString(),
-                staticGenerate: staticGenerate
-              }, runner);
-            case 24:
-              _result = _context.sent;
-              return _context.abrupt("return", _result);
-            case 28:
-              _context.prev = 28;
-              _context.t0 = _context["catch"](21);
-              ctx.error(ERROR_DIGEST.ERENDER, _context.t0.stack || _context.t0.message);
-              ctx.res.setHeader('x-modern-ssr-fallback', '1');
-            case 32:
-              return _context.abrupt("return", {
-                content: content,
-                contentType: mime.contentType(path.extname(templatePath))
-              });
-            case 33:
-            case "end":
-              return _context.stop();
-          }
+var createRenderHandler = function(param) {
+    var distDir = param.distDir, staticGenerate = param.staticGenerate;
+    return function() {
+        var _render = _asyncToGenerator(function(param) {
+            var ctx, route, runner, entryPath, urlPath, entry, result, templatePath, content, result1, err;
+            return __generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        ctx = param.ctx, route = param.route, runner = param.runner;
+                        if (ctx.resHasHandled()) {
+                            return [
+                                2,
+                                null
+                            ];
+                        }
+                        entryPath = route.entryPath, urlPath = route.urlPath;
+                        entry = path.join(distDir, entryPath);
+                        if (!!route.isSPA) return [
+                            3,
+                            2
+                        ];
+                        return [
+                            4,
+                            handleDirectory(ctx, entry, urlPath)
+                        ];
+                    case 1:
+                        result = _state.sent();
+                        return [
+                            2,
+                            result
+                        ];
+                    case 2:
+                        templatePath = entry;
+                        if (!fs.existsSync(templatePath)) {
+                            throw new Error("Could not find template file: ".concat(templatePath));
+                        }
+                        return [
+                            4,
+                            readFile(templatePath)
+                        ];
+                    case 3:
+                        content = _state.sent();
+                        if (!content) {
+                            return [
+                                2,
+                                null
+                            ];
+                        }
+                        if (!route.isSSR) return [
+                            3,
+                            7
+                        ];
+                        _state.label = 4;
+                    case 4:
+                        _state.trys.push([
+                            4,
+                            6,
+                            ,
+                            7
+                        ]);
+                        return [
+                            4,
+                            ssr.render(ctx, {
+                                distDir: distDir,
+                                entryName: route.entryName,
+                                urlPath: route.urlPath,
+                                bundle: route.bundle,
+                                template: content.toString(),
+                                staticGenerate: staticGenerate
+                            }, runner)
+                        ];
+                    case 5:
+                        result1 = _state.sent();
+                        return [
+                            2,
+                            result1
+                        ];
+                    case 6:
+                        err = _state.sent();
+                        ctx.error(ERROR_DIGEST.ERENDER, err.stack || err.message);
+                        ctx.res.setHeader("x-modern-ssr-fallback", "1");
+                        return [
+                            3,
+                            7
+                        ];
+                    case 7:
+                        return [
+                            2,
+                            {
+                                content: content,
+                                contentType: mime.contentType(path.extname(templatePath))
+                            }
+                        ];
+                }
+            });
+        });
+        function render(_) {
+            return _render.apply(this, arguments);
         }
-      }, _callee, null, [[21, 28]]);
-    }));
-    function render(_x) {
-      return _render.apply(this, arguments);
-    }
-    return render;
-  }();
-};
+        return render;
+    }();
+};
+export { createRenderHandler };

package/dist/js/treeshaking/libs/render/measure.js

@@ -1,61 +1,146 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-/* eslint-disable no-param-reassign */
-
-import { headersWithoutCookie } from "../../utils";
-export var createMetrics = function createMetrics(context, metrics) {
-  var entry = context.entryName,
-    request = context.request;
-  var _ref = request || {},
-    _ref$pathname = _ref.pathname,
-    pathname = _ref$pathname === void 0 ? '' : _ref$pathname;
-  var emitTimer = function emitTimer(name, cost) {
-    var tags = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    metrics.emitTimer(name, cost, _objectSpread(_objectSpread({}, tags), {}, {
-      pathname: pathname,
-      entry: entry
-    }));
-  };
-  var emitCounter = function emitCounter(name, counter) {
-    var tags = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    metrics.emitCounter(name, counter, _objectSpread(_objectSpread({}, tags), {}, {
-      pathname: pathname,
-      entry: entry
-    }));
-  };
-  return {
-    emitTimer: emitTimer,
-    emitCounter: emitCounter
-  };
-};
-export var createLogger = function createLogger(serverContext, logger) {
-  var request = serverContext.request || {};
-  var _request$headers = request.headers,
-    headers = _request$headers === void 0 ? {} : _request$headers,
-    _request$pathname = request.pathname,
-    pathname = _request$pathname === void 0 ? '' : _request$pathname;
-  var debug = function debug(message) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+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;
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
     }
-    logger.debug.apply(logger, ["SSR Debug - ".concat(message, ", req.url = %s")].concat(args, [pathname]));
-  };
-  var info = function info(message) {
-    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-      args[_key2 - 1] = arguments[_key2];
+}
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
     }
-    logger.info.apply(logger, ["SSR Info - ".concat(message, ", req.url = %s")].concat(args, [pathname]));
-  };
-  var error = function error(message, e) {
-    if (!e) {
-      e = message;
-      message = '';
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
     }
-    logger.error("SSR Error - ".concat(message, ", error = %s, req.url = %s, req.headers = %o"), e instanceof Error ? e.stack || e.message : e, pathname, headersWithoutCookie(headers));
-  };
-  return {
-    error: error,
-    info: info,
-    debug: debug
-  };
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+import { headersWithoutCookie } from "../../utils";
+var createMetrics = function(context, metrics) {
+    var entry = context.entryName, request = context.request;
+    var ref = request || {}, _pathname = ref.pathname, pathname = _pathname === void 0 ? "" : _pathname;
+    var emitTimer = function(name, cost) {
+        var tags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+        metrics.emitTimer(name, cost, _objectSpreadProps(_objectSpread({}, tags), {
+            pathname: pathname,
+            entry: entry
+        }));
+    };
+    var emitCounter = function(name, counter) {
+        var tags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+        metrics.emitCounter(name, counter, _objectSpreadProps(_objectSpread({}, tags), {
+            pathname: pathname,
+            entry: entry
+        }));
+    };
+    return {
+        emitTimer: emitTimer,
+        emitCounter: emitCounter
+    };
+};
+var createLogger = function(serverContext, logger) {
+    var request = serverContext.request || {};
+    var _headers = request.headers, headers = _headers === void 0 ? {} : _headers, _pathname = request.pathname, pathname = _pathname === void 0 ? "" : _pathname;
+    var debug = function(message) {
+        for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
+            args[_key - 1] = arguments[_key];
+        }
+        var _logger;
+        (_logger = logger).debug.apply(_logger, [
+            "SSR Debug - ".concat(message, ", req.url = %s")
+        ].concat(_toConsumableArray(args), [
+            pathname
+        ]));
+    };
+    var info = function(message) {
+        for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
+            args[_key - 1] = arguments[_key];
+        }
+        var _logger;
+        (_logger = logger).info.apply(_logger, [
+            "SSR Info - ".concat(message, ", req.url = %s")
+        ].concat(_toConsumableArray(args), [
+            pathname
+        ]));
+    };
+    var error = function(message, e) {
+        if (!e) {
+            e = message;
+            message = "";
+        }
+        logger.error("SSR Error - ".concat(message, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, pathname, headersWithoutCookie(headers));
+    };
+    return {
+        error: error,
+        info: info,
+        debug: debug
+    };
 };
-/* eslint-enable no-param-reassign */
+export { createLogger, createMetrics };