@modern-js/prod-server 2.4.0 → 2.5.0

package/dist/{js/node → cjs}/worker-server.js

@@ -15,37 +15,23 @@ 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 worker_server_exports = {};
 __export(worker_server_exports, {
-  createHandler: () => createHandler
+  createHandler: () => createHandler,
+  handleUrl: () => handleUrl
 });
 module.exports = __toCommonJS(worker_server_exports);
+var import_logger = require("./libs/logger");
 var import_route = require("./libs/route");
+var import_metrics = require("./libs/metrics");
+const handleUrl = (url) => {
+  return url.replace(/^https?:\/\/.*?\//gi, "/");
+};
 const createHandler = (manifest) => {
   const routeMgr = new import_route.RouteMatchManager();
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
-  return (ctx) => __async(void 0, null, function* () {
+  return async (ctx) => {
     var _a, _b, _c, _d, _e, _f;
     const pageMatch = routeMgr.match(ctx.url);
     if (!pageMatch) {
@@ -58,20 +44,50 @@ const createHandler = (manifest) => {
     (_d = (_c = ctx.request).pathname) != null ? _d : _c.pathname = ctx.pathname;
     (_f = (_e = ctx.request).params) != null ? _f : _e.params = ctx.params;
     const params = pageMatch.parseURLParams(ctx.url);
-    ctx.body = yield page.serverRender({
-      template: page.template,
-      query: ctx.query,
-      request: ctx.request,
-      response: ctx.response,
-      pathname: ctx.pathname,
-      req: ctx.request,
-      res: ctx.response,
-      params: ctx.params || params || {}
-    });
-    ctx.status = 200;
-  });
+    if (page.serverRender) {
+      try {
+        ctx.body = await page.serverRender({
+          entryName: page.entryName,
+          template: page.template,
+          query: ctx.query,
+          request: ctx.request,
+          response: ctx.response,
+          pathname: ctx.pathname,
+          req: ctx.request,
+          res: ctx.response,
+          params: ctx.params || params || {},
+          logger: ctx.logger || new import_logger.Logger({
+            level: "warn"
+          }),
+          metrics: ctx.metrics || import_metrics.metrics,
+          loadableStats: ctx.loadableStats,
+          routeManifest: ctx.routeManifest
+        });
+        ctx.status = 200;
+        return;
+      } catch (e) {
+        if (page.template) {
+          ctx.body = page.template;
+          ctx.status = 200;
+          return;
+        } else {
+          ctx.body = "404: not found";
+          ctx.status = 404;
+          return;
+        }
+      }
+    }
+    if (page.template) {
+      ctx.body = page.template;
+      ctx.status = 200;
+      return;
+    }
+    ctx.body = "404: not found";
+    ctx.status = 404;
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createHandler
+  createHandler,
+  handleUrl
 });

package/dist/{js/treeshaking → esm}/libs/context/context.js

@@ -75,7 +75,7 @@ var ModernServerContext = /*#__PURE__*/ function() {
             key: "bind",
             value: function bind() {
                 var _this = this;
-                var ref = this, req = ref.req, res = ref.res;
+                var _this1 = this, req = _this1.req, res = _this1.res;
                 req.get = function(key) {
                     return _this.getReqHeader(key);
                 };
@@ -140,7 +140,7 @@ var ModernServerContext = /*#__PURE__*/ function() {
         {
             key: "fresh",
             get: function get() {
-                var ref = this, status = ref.status, res = ref.res, method = ref.method;
+                var _this = this, status = _this.status, res = _this.res, method = _this.method;
                 if ("GET" !== method && "HEAD" !== method) {
                     return false;
                 }

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

@@ -198,7 +198,7 @@ var Response = /*#__PURE__*/ function() {
             key: "raw",
             value: function raw(body, options) {
                 var _this = this;
-                var ref = options || {}, status = ref.status, _headers = ref.headers, headers = _headers === void 0 ? {} : _headers;
+                var _ref = options || {}, status = _ref.status, _ref_headers = _ref.headers, headers = _ref_headers === void 0 ? {} : _ref_headers;
                 Object.entries(headers).forEach(function(param) {
                     var _param = _slicedToArray(param, 2), key = _param[0], value = _param[1];
                     _this.res.setHeader(key, value);

package/dist/esm/libs/logger.js

@@ -0,0 +1,205 @@
+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 _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+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;
+    }
+}
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+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]);
+        });
+    }
+    return target;
+}
+function _toArray(arr) {
+    return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest();
+}
+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);
+}
+var LOG_LEVEL = {
+    error: 0,
+    warn: 1,
+    info: 2,
+    debug: 3,
+    log: 4
+};
+var 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"
+    }
+};
+var DEFAULT_CONFIG = {
+    displayLabel: true,
+    uppercaseLabel: false
+};
+var Logger = /*#__PURE__*/ function() {
+    "use strict";
+    function Logger() {
+        var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+        var _this = this;
+        _classCallCheck(this, Logger);
+        _defineProperty(this, "level", void 0);
+        _defineProperty(this, "config", void 0);
+        _defineProperty(this, "types", void 0);
+        _defineProperty(this, "longestLabel", void 0);
+        this.level = options.level || LOG_TYPES.log.level;
+        this.config = _objectSpread({}, DEFAULT_CONFIG, options.config || {});
+        this.types = _objectSpread({}, LOG_TYPES, options.types || {});
+        this.longestLabel = this.getLongestLabel();
+        Object.keys(this.types).forEach(function(type) {
+            _this[type] = _this._log.bind(_this, type);
+        });
+    }
+    _createClass(Logger, [
+        {
+            key: "_log",
+            value: function _log(type, message) {
+                for(var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++){
+                    args[_key - 2] = arguments[_key];
+                }
+                var _console;
+                if (message === void 0 || message === null) {
+                    console.log();
+                    return;
+                }
+                if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
+                    return;
+                }
+                var label = "";
+                var text = "";
+                var 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 (_instanceof(message, Error)) {
+                    if (message.stack) {
+                        var _message_stack_split = _toArray(message.stack.split("\n")), name = _message_stack_split[0], rest = _message_stack_split.slice(1);
+                        text = "".concat(name, "\n").concat(rest.join("\n"));
+                    } else {
+                        text = message.message;
+                    }
+                } else {
+                    text = "".concat(message);
+                }
+                var log = label.length > 0 ? "".concat(label, " ").concat(text) : text;
+                (_console = console).log.apply(_console, [
+                    log
+                ].concat(_toConsumableArray(args)));
+            }
+        },
+        {
+            key: "getLongestLabel",
+            value: function getLongestLabel() {
+                var _this = this;
+                var longestLabel = "";
+                Object.keys(this.types).forEach(function(type) {
+                    var _this_types_type = _this.types[type], _this_types_type_label = _this_types_type.label, label = _this_types_type_label === void 0 ? "" : _this_types_type_label;
+                    if (label.length > longestLabel.length) {
+                        longestLabel = label;
+                    }
+                });
+                return longestLabel;
+            }
+        }
+    ]);
+    return Logger;
+}();
+var logger = new Logger();
+logger.Logger = Logger;
+export { Logger, logger };

package/dist/{js/treeshaking → esm}/libs/render/cache/__tests__/cache.fun.test.js

@@ -209,7 +209,7 @@ describe("test spr util functions", function() {
         expect(htmlWithHead).toBe('<head><meta name="x-moden-spr" content="'.concat(hash, '"></head><div>123</div>'));
     });
     it("should only invoke func one time", /*#__PURE__*/ _asyncToGenerator(function() {
-        var index, fn, key, ref, res1, res2;
+        var index, fn, key, _ref, res1, res2;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -236,10 +236,10 @@ describe("test spr util functions", function() {
                         ])
                     ];
                 case 1:
-                    ref = _slicedToArray.apply(void 0, [
+                    _ref = _slicedToArray.apply(void 0, [
                         _state.sent(),
                         2
-                    ]), res1 = ref[0], res2 = ref[1];
+                    ]), res1 = _ref[0], res2 = _ref[1];
                     expect(res1.isOrigin && res2.isOrigin).toBe(false);
                     expect(res1.isOrigin || res2.isOrigin).toBe(true);
                     expect(res1.value).toBe(1);

package/dist/{js/treeshaking → esm}/libs/render/cache/__tests__/cache.test.js

@@ -517,7 +517,7 @@ describe("cache", function() {
         });
     }));
     it("should match cache correctly", /*#__PURE__*/ _asyncToGenerator(function() {
-        var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheable, baseCacheable, matchOne, other, _requestOpt, requestOpt, cacheConfig, content, context, matchContext, cacheResult, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, notMatch, notMatchContext, nothing, err, err;
+        var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheable, baseCacheable, matchOne, other, _baseCacheable_requestOpt, requestOpt, cacheConfig, content, context, matchContext, cacheResult, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, notMatch, notMatchContext, nothing, err, err;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -541,7 +541,7 @@ describe("cache", function() {
                     ];
                     cacheable = _step.value;
                     _cacheable = _toArray(cacheable), baseCacheable = _cacheable[0], matchOne = _cacheable[1], other = _cacheable.slice(2);
-                    _requestOpt = baseCacheable.requestOpt, requestOpt = _requestOpt === void 0 ? {} : _requestOpt, cacheConfig = baseCacheable.cacheConfig, content = baseCacheable.content;
+                    _baseCacheable_requestOpt = baseCacheable.requestOpt, requestOpt = _baseCacheable_requestOpt === void 0 ? {} : _baseCacheable_requestOpt, cacheConfig = baseCacheable.cacheConfig, content = baseCacheable.content;
                     context = {
                         entry: "",
                         pathname: requestOpt.url,

package/dist/{js/treeshaking → esm}/libs/render/cache/spr.js

@@ -205,8 +205,8 @@ var CacheManager = /*#__PURE__*/ function() {
             max: Math.min(MAX_SIZE_EACH_CLUSTER, 600) * 1024 * 1024,
             length: function length(n) {
                 var len = n.caches.keys().reduce(function(total, cur) {
-                    var ref;
-                    return total + (((ref = n.caches.peek(cur)) === null || ref === void 0 ? void 0 : ref.size) || 0);
+                    var _n_caches_peek;
+                    return total + (((_n_caches_peek = n.caches.peek(cur)) === null || _n_caches_peek === void 0 ? void 0 : _n_caches_peek.size) || 0);
                 }, 1);
                 return len;
             }
@@ -266,9 +266,9 @@ var CacheManager = /*#__PURE__*/ function() {
         {
             key: "queryFactor",
             value: function queryFactor(context, data) {
-                var ref, ref1;
-                var queryKeys = (ref = data.includes) === null || ref === void 0 ? void 0 : ref.query;
-                var queryMatches = (ref1 = data.matches) === null || ref1 === void 0 ? void 0 : ref1.query;
+                var _data_includes, _data_matches;
+                var queryKeys = (_data_includes = data.includes) === null || _data_includes === void 0 ? void 0 : _data_includes.query;
+                var queryMatches = (_data_matches = data.matches) === null || _data_matches === void 0 ? void 0 : _data_matches.query;
                 if (!queryKeys || queryKeys.length === 0) {
                     return null;
                 }
@@ -280,9 +280,9 @@ var CacheManager = /*#__PURE__*/ function() {
         {
             key: "headerFactor",
             value: function headerFactor(context, data) {
-                var ref, ref1;
-                var headerKeys = (ref = data.includes) === null || ref === void 0 ? void 0 : ref.header;
-                var headerMatches = (ref1 = data.matches) === null || ref1 === void 0 ? void 0 : ref1.header;
+                var _data_includes, _data_matches;
+                var headerKeys = (_data_includes = data.includes) === null || _data_includes === void 0 ? void 0 : _data_includes.header;
+                var headerMatches = (_data_matches = data.matches) === null || _data_matches === void 0 ? void 0 : _data_matches.header;
                 if (!headerKeys || headerKeys.length === 0) {
                     return null;
                 }

package/dist/{js/treeshaking → esm}/libs/render/index.js

@@ -129,10 +129,10 @@ import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
 var createRenderHandler = function(param) {
-    var distDir = param.distDir, staticGenerate = param.staticGenerate;
+    var distDir = param.distDir, staticGenerate = param.staticGenerate, forceCSR = param.forceCSR;
     return function() {
         var _render = _asyncToGenerator(function(param) {
-            var ctx, route, runner, entryPath, urlPath, entry, result, templatePath, content, result1, err;
+            var ctx, route, runner, entryPath, urlPath, entry, result, templatePath, content, useCSR, result1, err;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -176,7 +176,8 @@ var createRenderHandler = function(param) {
                                 null
                             ];
                         }
-                        if (!route.isSSR) return [
+                        useCSR = forceCSR && ctx.query.csr;
+                        if (!(route.isSSR && !useCSR)) return [
                             3,
                             7
                         ];

package/dist/{js/treeshaking → esm}/libs/render/measure.js

@@ -85,7 +85,7 @@ function _unsupportedIterableToArray(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 _ref = request || {}, _ref_pathname = _ref.pathname, pathname = _ref_pathname === void 0 ? "" : _ref_pathname;
     var emitTimer = function(name, cost) {
         var tags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
         metrics.emitTimer(name, cost, _objectSpreadProps(_objectSpread({}, tags), {
@@ -107,7 +107,7 @@ var createMetrics = function(context, metrics) {
 };
 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 _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(message) {
         for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
             args[_key - 1] = arguments[_key];

package/dist/{js/treeshaking → esm}/libs/render/ssr.js

@@ -129,7 +129,7 @@ import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
 var render = function() {
     var _ref = _asyncToGenerator(function(ctx, renderOptions, runner) {
-        var ref, urlPath, bundle, distDir, template, entryName, staticGenerate, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, serverRender, content, _redirection, url, _status, status;
+        var _ctx_res, urlPath, bundle, distDir, template, entryName, staticGenerate, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, serverRender, content, _context_redirection, url, _context_redirection_status, status;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -157,7 +157,7 @@ var render = function() {
                             status: function(code) {
                                 ctx.res.statusCode = code;
                             },
-                            locals: ((ref = ctx.res) === null || ref === void 0 ? void 0 : ref.locals) || {}
+                            locals: ((_ctx_res = ctx.res) === null || _ctx_res === void 0 ? void 0 : _ctx_res.locals) || {}
                         },
                         redirection: {},
                         template: template,
@@ -180,7 +180,7 @@ var render = function() {
                     ];
                 case 1:
                     content = _state.sent();
-                    _redirection = context.redirection, url = _redirection.url, _status = _redirection.status, status = _status === void 0 ? 302 : _status;
+                    _context_redirection = context.redirection, url = _context_redirection.url, _context_redirection_status = _context_redirection.status, status = _context_redirection_status === void 0 ? 302 : _context_redirection_status;
                     if (url) {
                         return [
                             2,

package/dist/{js/treeshaking → esm}/libs/route/matcher.js

@@ -89,9 +89,9 @@ var RouteMatcher = /*#__PURE__*/ function() {
                 if (!this.urlReg) {
                     return this.urlPath.length;
                 } else {
-                    var ref;
+                    var _result_;
                     var result = this.urlReg.exec(pathname);
-                    return (result === null || result === void 0 ? void 0 : (ref = result[0]) === null || ref === void 0 ? void 0 : ref.length) || null;
+                    return (result === null || result === void 0 ? void 0 : (_result_ = result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
                 }
             }
         },

package/dist/{js/treeshaking → esm}/libs/serve-file.js

@@ -147,10 +147,10 @@ var createStaticFileHandler = function(rules) {
     var output = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
     return function() {
         var _ref = _asyncToGenerator(function(context, next) {
-            var requestUrl, req, res, _assetPrefix, assetPrefix, hitRule, resume;
+            var requestUrl, req, res, _output_assetPrefix, assetPrefix, hitRule, resume;
             return __generator(this, function(_state) {
                 requestUrl = context.url, req = context.req, res = context.res;
-                _assetPrefix = output.assetPrefix, assetPrefix = _assetPrefix === void 0 ? "/" : _assetPrefix;
+                _output_assetPrefix = output.assetPrefix, assetPrefix = _output_assetPrefix === void 0 ? "/" : _output_assetPrefix;
                 hitRule = rules.find(function(item) {
                     if (isString(item.path) && requestUrl.startsWith(item.path)) {
                         return true;

package/dist/{js/treeshaking → esm}/server/index.js

@@ -417,13 +417,13 @@ var Server = /*#__PURE__*/ function() {
             value: function createHookRunner() {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var options, _internalPlugins, internalPlugins, pwd, _plugins, plugins, serverPlugins, loadedPlugins, hooksRunner;
+                    var options, _options_internalPlugins, internalPlugins, pwd, _options_plugins, plugins, serverPlugins, loadedPlugins, hooksRunner;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 serverManager.clear();
                                 options = _this.options;
-                                _internalPlugins = options.internalPlugins, internalPlugins = _internalPlugins === void 0 ? INTERNAL_SERVER_PLUGINS : _internalPlugins, pwd = options.pwd, _plugins = options.plugins, plugins = _plugins === void 0 ? [] : _plugins;
+                                _options_internalPlugins = options.internalPlugins, internalPlugins = _options_internalPlugins === void 0 ? INTERNAL_SERVER_PLUGINS : _options_internalPlugins, pwd = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins;
                                 serverPlugins = _this.serverConfig.plugins || [];
                                 loadedPlugins = loadPlugins(pwd, _toConsumableArray(serverPlugins).concat(_toConsumableArray(plugins)), {
                                     internalPlugins: internalPlugins
@@ -471,7 +471,7 @@ var Server = /*#__PURE__*/ function() {
             key: "initAppContext",
             value: function initAppContext() {
                 var options = this.options;
-                var appDirectory = options.pwd, _plugins = options.plugins, plugins = _plugins === void 0 ? [] : _plugins, config = options.config;
+                var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config;
                 var serverPlugins = plugins.map(function(p) {
                     return {
                         server: p