@modern-js/prod-server 2.9.1-alpha.0 → 2.11.0

package/dist/esm/server/modernServer.js

@@ -111,13 +111,13 @@ var __generator = this && this.__generator || function(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([
@@ -206,7 +206,6 @@ import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExte
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
-import { templateInjectableStream } from "../libs/hook-api/template";
 import { AGGRED_DIR, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE } from "../constants";
 import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "../libs/hook-api";
 var SERVER_DIR = "./server";
@@ -232,7 +231,7 @@ var ModernServer = /*#__PURE__*/ function() {
         _defineProperty(this, "reader", reader);
         _defineProperty(this, "proxyTarget", void 0);
         _defineProperty(this, "routeRenderHandler", void 0);
-        _defineProperty(this, "beforeRouteHandler", null);
+        _defineProperty(this, "loaderHandler", null);
         _defineProperty(this, "frameWebHandler", null);
         _defineProperty(this, "frameAPIHandler", null);
         _defineProperty(this, "proxyHandler", null);
@@ -287,7 +286,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 return [
                                     4,
-                                    _this.prepareBeforeRouteHandler(usageRoutes, distDir)
+                                    _this.prepareLoaderHandler(usageRoutes, distDir)
                                 ];
                             case 2:
                                 _state.sent();
@@ -306,7 +305,6 @@ var ModernServer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 _this.addHandler(_this.setupStaticMiddleware((_this_conf_output = _this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));
                                 _this.addHandler(faviconFallbackHandler);
-                                _this.addBeforeRouteHandler();
                                 _this.addHandler(_this.routeHandler.bind(_this));
                                 _this.compose();
                                 return [
@@ -322,45 +320,6 @@ var ModernServer = /*#__PURE__*/ function() {
             key: "onRepack",
             value: function onRepack(_) {}
         },
-        {
-            key: "addBeforeRouteHandler",
-            value: function addBeforeRouteHandler() {
-                var _this = this;
-                this.addHandler(function() {
-                    var _ref = _asyncToGenerator(function(context, next) {
-                        return __generator(this, function(_state) {
-                            switch(_state.label){
-                                case 0:
-                                    if (!_this.beforeRouteHandler) return [
-                                        3,
-                                        2
-                                    ];
-                                    return [
-                                        4,
-                                        _this.beforeRouteHandler(context)
-                                    ];
-                                case 1:
-                                    _state.sent();
-                                    if (_this.isSend(context.res)) {
-                                        return [
-                                            2
-                                        ];
-                                    }
-                                    _state.label = 2;
-                                case 2:
-                                    return [
-                                        2,
-                                        next()
-                                    ];
-                            }
-                        });
-                    });
-                    return function(context, next) {
-                        return _ref.apply(this, arguments);
-                    };
-                }());
-            }
-        },
         {
             key: "onServerChange",
             value: function onServerChange(param) {
@@ -416,6 +375,12 @@ var ModernServer = /*#__PURE__*/ function() {
                                         null
                                     ];
                                 }
+                                if (result.contentStream) {
+                                    return [
+                                        2,
+                                        result.contentStream
+                                    ];
+                                }
                                 return [
                                     2,
                                     result.content.toString()
@@ -470,8 +435,8 @@ var ModernServer = /*#__PURE__*/ function() {
             }
         },
         {
-            key: "prepareBeforeRouteHandler",
-            value: function prepareBeforeRouteHandler(specs, distDir) {
+            key: "prepareLoaderHandler",
+            value: function prepareLoaderHandler(specs, distDir) {
                 var _this = this;
                 return _asyncToGenerator(function() {
                     var runner, handler;
@@ -481,7 +446,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                 runner = _this.runner;
                                 return [
                                     4,
-                                    runner.preparebeforeRouteHandler({
+                                    runner.prepareLoaderHandler({
                                         serverRoutes: specs,
                                         distDir: distDir
                                     }, {
@@ -492,7 +457,7 @@ var ModernServer = /*#__PURE__*/ function() {
                                 ];
                             case 1:
                                 handler = _state.sent();
-                                _this.beforeRouteHandler = handler;
+                                _this.loaderHandler = handler;
                                 return [
                                     2
                                 ];
@@ -718,15 +683,78 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function handleWeb(context, route) {
                 var _this = this;
                 return _asyncToGenerator(function() {
+                    var res, renderResult;
                     return __generator(this, function(_state) {
-                        return [
-                            2,
-                            _this.routeRenderHandler({
-                                ctx: context,
-                                route: route,
-                                runner: _this.runner
-                            })
-                        ];
+                        switch(_state.label){
+                            case 0:
+                                res = context.res;
+                                if (!_this.loaderHandler) return [
+                                    3,
+                                    2
+                                ];
+                                return [
+                                    4,
+                                    _this.loaderHandler(context)
+                                ];
+                            case 1:
+                                _state.sent();
+                                if (_this.isSend(res)) {
+                                    return [
+                                        2,
+                                        null
+                                    ];
+                                }
+                                _state.label = 2;
+                            case 2:
+                                context.setParams(route.params);
+                                context.setServerData("router", {
+                                    baseUrl: route.urlPath,
+                                    params: route.params
+                                });
+                                if (route.responseHeaders) {
+                                    Object.keys(route.responseHeaders).forEach(function(key) {
+                                        var value = route.responseHeaders[key];
+                                        if (value) {
+                                            context.res.setHeader(key, value);
+                                        }
+                                    });
+                                }
+                                return [
+                                    4,
+                                    _this.routeRenderHandler({
+                                        ctx: context,
+                                        route: route,
+                                        runner: _this.runner
+                                    })
+                                ];
+                            case 3:
+                                renderResult = _state.sent();
+                                if (!renderResult) {
+                                    _this.render404(context);
+                                    return [
+                                        2,
+                                        null
+                                    ];
+                                }
+                                if (renderResult.redirect) {
+                                    _this.redirect(res, renderResult.content, renderResult.statusCode);
+                                    return [
+                                        2,
+                                        null
+                                    ];
+                                }
+                                if (_this.isSend(res)) {
+                                    return [
+                                        2,
+                                        null
+                                    ];
+                                }
+                                res.setHeader("content-type", renderResult.contentType);
+                                return [
+                                    2,
+                                    renderResult
+                                ];
+                        }
                     });
                 })();
             }
@@ -771,7 +799,7 @@ var ModernServer = /*#__PURE__*/ function() {
             function routeHandler(context) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var res, matched, route, afterMatchContext, _afterMatchContext_router, current, url, status, matched2, middlewareContext, renderResult, contentStream, response, afterRenderContext;
+                    var res, matched, route, afterMatchContext, _afterMatchContext_router, current, url, status, matched2, middlewareContext, renderResult, responseStream, response, afterRenderContext;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -798,6 +826,10 @@ var ModernServer = /*#__PURE__*/ function() {
                                     2
                                 ];
                             case 2:
+                                if (!route.entryName) return [
+                                    3,
+                                    5
+                                ];
                                 afterMatchContext = createAfterMatchContext(context, route.entryName);
                                 if (!(_this.runMode === RUN_MODE.FULL)) return [
                                     3,
@@ -835,14 +867,11 @@ var ModernServer = /*#__PURE__*/ function() {
                                     }
                                     route = matched2.generate(context.url);
                                 }
-                                context.setParams(route.params);
-                                context.setServerData("router", {
-                                    baseUrl: route.urlPath,
-                                    params: route.params
-                                });
+                                _state.label = 5;
+                            case 5:
                                 if (!_this.frameWebHandler) return [
                                     3,
-                                    6
+                                    7
                                 ];
                                 res.locals = res.locals || {};
                                 middlewareContext = createMiddlewareContext(context);
@@ -850,66 +879,43 @@ var ModernServer = /*#__PURE__*/ function() {
                                     4,
                                     _this.frameWebHandler(middlewareContext)
                                 ];
-                            case 5:
+                            case 6:
                                 _state.sent();
                                 res.locals = _objectSpread({}, res.locals, middlewareContext.response.locals);
-                                _state.label = 6;
-                            case 6:
                                 if (_this.isSend(res)) {
                                     return [
                                         2
                                     ];
                                 }
-                                if (route.responseHeaders) {
-                                    Object.keys(route.responseHeaders).forEach(function(key) {
-                                        var value = route.responseHeaders[key];
-                                        if (value) {
-                                            context.res.setHeader(key, value);
-                                        }
-                                    });
-                                }
+                                _state.label = 7;
+                            case 7:
                                 return [
                                     4,
                                     _this.handleWeb(context, route)
                                 ];
-                            case 7:
+                            case 8:
                                 renderResult = _state.sent();
                                 if (!renderResult) {
-                                    _this.render404(context);
-                                    return [
-                                        2
-                                    ];
-                                }
-                                if (renderResult.redirect) {
-                                    _this.redirect(res, renderResult.content, renderResult.statusCode);
                                     return [
                                         2
                                     ];
                                 }
-                                if (_this.isSend(res)) {
-                                    return [
-                                        2
-                                    ];
-                                }
-                                res.setHeader("content-type", renderResult.contentType);
-                                contentStream = renderResult.contentStream;
-                                if (contentStream) {
-                                    contentStream.pipe(templateInjectableStream({
-                                        prependHead: route.entryName ? "<script>window._SERVER_DATA=".concat(JSON.stringify(context.serverData), "</script>") : void 0
-                                    })).pipe(res);
+                                responseStream = renderResult.contentStream;
+                                response = renderResult.content;
+                                if (route.entryName && responseStream) {
+                                    responseStream.pipe(res);
                                     return [
                                         2
                                     ];
                                 }
-                                response = renderResult.content;
                                 if (!route.entryName) return [
                                     3,
-                                    10
+                                    11
                                 ];
                                 afterRenderContext = createAfterRenderContext(context, response.toString());
                                 if (!(_this.runMode === RUN_MODE.FULL)) return [
                                     3,
-                                    9
+                                    10
                                 ];
                                 return [
                                     4,
@@ -917,19 +923,18 @@ var ModernServer = /*#__PURE__*/ function() {
                                         onLast: noop
                                     })
                                 ];
-                            case 8:
-                                _state.sent();
-                                _state.label = 9;
                             case 9:
+                                _state.sent();
+                                _state.label = 10;
+                            case 10:
                                 if (_this.isSend(res)) {
                                     return [
                                         2
                                     ];
                                 }
-                                afterRenderContext.template.prependHead("<script>window._SERVER_DATA=".concat(JSON.stringify(context.serverData), "</script>"));
                                 response = afterRenderContext.template.get();
-                                _state.label = 10;
-                            case 10:
+                                _state.label = 11;
+                            case 11:
                                 res.end(response);
                                 return [
                                     2

package/dist/esm-node/libs/hook-api/index.js

@@ -4,13 +4,9 @@ import { TemplateAPI } from "./template";
 class Response {
   constructor(res) {
     this.res = res;
-    this._cookie = cookie.parse(res.getHeader("set-cookie") || "");
     this.cookies = {
-      get: this.getCookie.bind(this),
       set: this.setCookie.bind(this),
-      delete: this.deleteCookie.bind(this),
-      clear: this.clearCookie.bind(this),
-      apply: this.applyCookie.bind(this)
+      clear: this.clearCookie.bind(this)
     };
   }
   get(key) {
@@ -22,29 +18,14 @@ class Response {
   status(code) {
     this.res.statusCode = code;
   }
-  getCookie(key) {
-    return this._cookie[key];
-  }
-  setCookie(key, value) {
-    this._cookie[key] = value;
-  }
-  deleteCookie(key) {
-    if (this._cookie[key]) {
-      delete this._cookie[key];
-    }
+  setCookie(key, value, options) {
+    const cookieValue = this.res.getHeader("set-cookie");
+    const fmt = Array.isArray(cookieValue) ? cookieValue : [cookieValue].filter(Boolean);
+    fmt.push(cookie.serialize(key, value, options));
+    this.res.setHeader("set-cookie", fmt.length === 1 ? fmt[0] : fmt);
   }
   clearCookie() {
-    this._cookie = {};
-  }
-  applyCookie() {
-    const str = Object.entries(this._cookie).map(([key, value]) => {
-      return cookie.serialize(key, value);
-    }).join("; ");
-    if (str) {
-      this.res.setHeader("set-cookie", str);
-    } else {
-      this.res.removeHeader("set-cookie");
-    }
+    this.res.removeHeader("set-cookie");
   }
   raw(body, options) {
     const { status, headers = {} } = options || {};

package/dist/esm-node/libs/render/index.js

@@ -4,6 +4,7 @@ import { ERROR_DIGEST } from "../../constants";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
+import { injectSeverData } from "./utils";
 const createRenderHandler = ({
   distDir,
   staticGenerate,
@@ -55,7 +56,7 @@ const createRenderHandler = ({
     }
   }
   return {
-    content,
+    content: route.entryName ? injectSeverData(content.toString(), ctx) : content,
     contentType: mime.contentType(path.extname(templatePath))
   };
 };

package/dist/esm-node/libs/render/ssr.js

@@ -1,13 +1,13 @@
 import path from "path";
+import { fs, mime } from "@modern-js/utils";
 import {
-  fs,
   LOADABLE_STATS_FILE,
-  mime,
-  ROUTE_MINIFEST_FILE,
+  ROUTE_MANIFEST_FILE,
   SERVER_RENDER_FUNCTION_NAME
-} from "@modern-js/utils";
+} from "@modern-js/utils/constants";
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
+import { injectServerDataStream, injectSeverData } from "./utils";
 const render = async (ctx, renderOptions, runner) => {
   var _a;
   const {
@@ -22,7 +22,7 @@ const render = async (ctx, renderOptions, runner) => {
   const bundleJS = path.join(distDir, bundle);
   const loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
   const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
-  const routesManifestUri = path.join(distDir, ROUTE_MINIFEST_FILE);
+  const routesManifestUri = path.join(distDir, ROUTE_MANIFEST_FILE);
   const routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
   const context = {
     request: {
@@ -72,13 +72,13 @@ const render = async (ctx, renderOptions, runner) => {
   }
   if (typeof content === "string") {
     return {
-      content,
+      content: injectSeverData(content, ctx),
       contentType: mime.contentType("html")
     };
   } else {
     return {
       content: "",
-      contentStream: content,
+      contentStream: injectServerDataStream(content, ctx),
       contentType: mime.contentType("html")
     };
   }

package/dist/esm-node/libs/render/utils.js

@@ -0,0 +1,23 @@
+import { TemplateAPI, templateInjectableStream } from "../hook-api/template";
+const injectSeverData = (content, context) => {
+  const template = new TemplateAPI(content);
+  template.prependHead(
+    `<script>window._SERVER_DATA=${JSON.stringify(
+      context.serverData
+    )}</script>`
+  );
+  return template.get();
+};
+const injectServerDataStream = (content, context) => {
+  return content.pipe(
+    templateInjectableStream({
+      prependHead: `<script>window._SERVER_DATA=${JSON.stringify(
+        context.serverData
+      )}</script>`
+    })
+  );
+};
+export {
+  injectServerDataStream,
+  injectSeverData
+};

package/dist/esm-node/server/index.js

@@ -174,7 +174,7 @@ class Server {
     const serverEnv = process.env.MODERN_ENV;
     const defaultEnvPath = path.resolve(appDirectory, `.env`);
     const serverEnvPath = path.resolve(appDirectory, `.env.${serverEnv}`);
-    for (const envPath of [defaultEnvPath, serverEnvPath]) {
+    for (const envPath of [serverEnvPath, defaultEnvPath]) {
       if (await fs.pathExists(envPath) && !(await fs.stat(envPath)).isDirectory()) {
         const envConfig = dotenv.config({ path: envPath });
         dotenvExpand(envConfig);