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

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

@@ -2,52 +2,14 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  ModernServer: () => ModernServer
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_http = require("http");
-var import_util = __toESM(require("util"));
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_route = require("../libs/route");
-var import_render = require("../libs/render");
-var import_serve_file = require("../libs/serve-file");
-var import_utils2 = require("../utils");
-var reader = __toESM(require("../libs/render/reader"));
-var import_proxy = require("../libs/proxy");
-var import_context = require("../libs/context");
-var import_template = require("../libs/hook-api/template");
-var import_constants = require("../constants");
-var import_hook_api = require("../libs/hook-api");
-var __defProp2 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+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 (__hasOwnProp2.call(b, prop))
+    if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
   if (__getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(b)) {
@@ -59,7 +21,7 @@ var __spreadValues = (a, b) => {
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
   if (source != null && __getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(source)) {
@@ -68,6 +30,23 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -88,6 +67,24 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var modern_server_exports = {};
+__export(modern_server_exports, {
+  ModernServer: () => ModernServer
+});
+module.exports = __toCommonJS(modern_server_exports);
+var import_http = require("http");
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_route = require("../libs/route");
+var import_render = require("../libs/render");
+var import_serve_file = require("../libs/serve-file");
+var import_utils2 = require("../utils");
+var reader = __toESM(require("../libs/render/reader"));
+var import_proxy = require("../libs/proxy");
+var import_context = require("../libs/context");
+var import_template = require("../libs/hook-api/template");
+var import_constants = require("../constants");
+var import_hook_api = require("../libs/hook-api");
 const API_DIR = "./api";
 const SERVER_DIR = "./server";
 class ModernServer {
@@ -226,11 +223,7 @@ class ModernServer {
     return [];
   }
   addHandler(handler) {
-    if (handler[Symbol.toStringTag] === "AsyncFunction") {
-      this.handlers.push(handler);
-    } else {
-      this.handlers.push(import_util.default.promisify(handler));
-    }
+    this.handlers.push(handler);
   }
   render404(context) {
     context.error(import_constants.ERROR_DIGEST.ENOTF, "404 Not Found");
@@ -479,7 +472,14 @@ class ModernServer {
         if (!handler) {
           return next();
         }
-        return handler(context, dispatch).catch(onError);
+        try {
+          const result = handler(context, dispatch);
+          if ((0, import_utils.isPromise)(result)) {
+            return result.catch(onError);
+          }
+        } catch (e) {
+          return onError(e);
+        }
       };
       const onError = (err) => {
         this.onError(context, err);
@@ -547,3 +547,7 @@ class ModernServer {
     });
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ModernServer
+});

package/dist/js/node/type.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var type_exports = {};
+module.exports = __toCommonJS(type_exports);

package/dist/js/node/utils.js

@@ -1,7 +1,21 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,8 +29,8 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var utils_exports = {};
+__export(utils_exports, {
   createErrorDocument: () => createErrorDocument,
   createMiddlewareCollecter: () => createMiddlewareCollecter,
   debug: () => debug,
@@ -28,24 +42,8 @@ __export(stdin_exports, {
   prepareFavicons: () => prepareFavicons,
   useLocalPrefix: () => useLocalPrefix
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@modern-js/utils");
-var __defProp2 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.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;
-};
 const debug = (0, import_utils.createDebugger)("prod-server");
 const mergeExtension = (users) => {
   const output = [];
@@ -153,3 +151,16 @@ const headersWithoutCookie = (headers) => {
 const isRedirect = (code) => {
   return [301, 302, 307, 308].includes(code);
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createErrorDocument,
+  createMiddlewareCollecter,
+  debug,
+  getStaticReg,
+  headersWithoutCookie,
+  isRedirect,
+  mergeExtension,
+  noop,
+  prepareFavicons,
+  useLocalPrefix
+});

package/dist/js/node/worker-server.js

@@ -15,12 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  createHandler: () => createHandler
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_route = require("./libs/route");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -41,6 +35,12 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var worker_server_exports = {};
+__export(worker_server_exports, {
+  createHandler: () => createHandler
+});
+module.exports = __toCommonJS(worker_server_exports);
+var import_route = require("./libs/route");
 const createHandler = (manifest) => {
   const routeMgr = new import_route.RouteMatchManager();
   const { pages, routes } = manifest;
@@ -71,3 +71,7 @@ const createHandler = (manifest) => {
     ctx.status = 200;
   });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createHandler
+});

package/dist/js/treeshaking/libs/hook-api/index.js

@@ -196,9 +196,9 @@ var Response = /*#__PURE__*/ function() {
         },
         {
             key: "raw",
-            value: function raw(body, param) {
-                var status = param.status, headers = param.headers;
+            value: function raw(body, options) {
                 var _this = this;
+                var ref = options || {}, status = ref.status, _headers = ref.headers, headers = _headers === void 0 ? {} : _headers;
                 Object.entries(headers).forEach(function(param) {
                     var _param = _slicedToArray(param, 2), key = _param[0], value = _param[1];
                     _this.res.setHeader(key, value);
@@ -216,6 +216,7 @@ var Request = /*#__PURE__*/ function() {
     "use strict";
     function Request(ctx) {
         _classCallCheck(this, Request);
+        _defineProperty(this, "url", void 0);
         _defineProperty(this, "host", void 0);
         _defineProperty(this, "pathname", void 0);
         _defineProperty(this, "query", void 0);
@@ -223,6 +224,7 @@ var Request = /*#__PURE__*/ function() {
         _defineProperty(this, "cookie", void 0);
         _defineProperty(this, "cookies", void 0);
         _defineProperty(this, "_cookie", void 0);
+        this.url = ctx.url;
         this.host = ctx.host;
         this.pathname = ctx.path;
         this.query = ctx.query;

package/dist/js/treeshaking/server/index.js

@@ -1,3 +1,11 @@
+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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -59,6 +67,12 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
+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] : {};
@@ -98,6 +112,17 @@ function _objectSpreadProps(target, source) {
     }
     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);
+}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -392,15 +417,15 @@ var Server = /*#__PURE__*/ function() {
             value: function createHookRunner() {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var options, _internalPlugins, internalPlugins, pwd, serverPlugins, loadedPlugins, hooksRunner;
+                    var options, _internalPlugins, internalPlugins, pwd, _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;
+                                _internalPlugins = options.internalPlugins, internalPlugins = _internalPlugins === void 0 ? INTERNAL_SERVER_PLUGINS : _internalPlugins, pwd = options.pwd, _plugins = options.plugins, plugins = _plugins === void 0 ? [] : _plugins;
                                 serverPlugins = _this.serverConfig.plugins || [];
-                                loadedPlugins = loadPlugins(pwd, serverPlugins, {
+                                loadedPlugins = loadPlugins(pwd, _toConsumableArray(serverPlugins).concat(_toConsumableArray(plugins)), {
                                     internalPlugins: internalPlugins
                                 });
                                 debug("plugins", loadedPlugins);

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

@@ -197,9 +197,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { createServer } from "http";
-import util from "util";
 import path from "path";
-import { fs, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { fs, isPromise, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serve-file";
@@ -456,11 +455,7 @@ var ModernServer = /*#__PURE__*/ function() {
         {
             key: "addHandler",
             value: function addHandler(handler) {
-                if (handler[Symbol.toStringTag] === "AsyncFunction") {
-                    this.handlers.push(handler);
-                } else {
-                    this.handlers.push(util.promisify(handler));
-                }
+                this.handlers.push(handler);
             }
         },
         {
@@ -957,7 +952,14 @@ var ModernServer = /*#__PURE__*/ function() {
                         if (!handler) {
                             return next();
                         }
-                        return handler(context, dispatch).catch(onError);
+                        try {
+                            var result = handler(context, dispatch);
+                            if (isPromise(result)) {
+                                return result.catch(onError);
+                            }
+                        } catch (e) {
+                            return onError(e);
+                        }
                     };
                     var onError = function(err) {
                         _this.onError(context, err);

package/dist/types/libs/context/context.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/_VeSDfBDMu7WwU3gpNBE5/src/type" />
+/// <reference types=".dts-temp/Itwx-pHxmgYitwqD7Jzx4/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { URL } from 'url';
 import qs from 'querystring';

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/_VeSDfBDMu7WwU3gpNBE5/src/type" />
+/// <reference types=".dts-temp/Itwx-pHxmgYitwqD7Jzx4/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -56,8 +56,8 @@
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4"
+    "@modern-js/utils": "2.0.0-beta.7",
+    "@modern-js/server-core": "2.0.0-beta.7"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -72,10 +72,10 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^4",
-    "@modern-js/types": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4"
+    "@modern-js/types": "2.0.0-beta.7",
+    "@modern-js/server-core": "2.0.0-beta.7",
+    "@scripts/build": "2.0.0-beta.7",
+    "@scripts/jest-config": "2.0.0-beta.7"
   },
   "sideEffects": false,
   "publishConfig": {