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

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

@@ -1,98 +1,223 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import path from 'path';
-import { fs, LOADABLE_STATS_FILE, mime, ROUTE_MINIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
-import cookie from 'cookie';
-import cache from "./cache";
-import { createLogger, createMetrics } from "./measure";
-export var render = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ctx, renderOptions, runner) {
-    var _ctx$res;
-    var urlPath, bundle, distDir, template, entryName, staticGenerate, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, serverRender, content, _context$redirection, url, _context$redirection$, status;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            urlPath = renderOptions.urlPath, bundle = renderOptions.bundle, distDir = renderOptions.distDir, template = renderOptions.template, entryName = renderOptions.entryName, staticGenerate = renderOptions.staticGenerate;
-            bundleJS = path.join(distDir, bundle);
-            loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
-            loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : '';
-            routesManifestUri = path.join(distDir, ROUTE_MINIFEST_FILE);
-            routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : undefined;
-            context = {
-              request: {
-                baseUrl: urlPath,
-                params: ctx.params,
-                pathname: ctx.path,
-                host: ctx.host,
-                query: ctx.query,
-                url: ctx.href,
-                cookieMap: cookie.parse(ctx.headers.cookie || ''),
-                headers: ctx.headers
-              },
-              response: {
-                setHeader: function setHeader(key, value) {
-                  return ctx.res.setHeader(key, value);
-                },
-                status: function status(code) {
-                  ctx.res.statusCode = code;
-                },
-                locals: ((_ctx$res = ctx.res) === null || _ctx$res === void 0 ? void 0 : _ctx$res.locals) || {}
-              },
-              redirection: {},
-              template: template,
-              loadableStats: loadableStats,
-              routeManifest: routeManifest,
-              // for streaming ssr
-              entryName: entryName,
-              staticGenerate: staticGenerate,
-              logger: undefined,
-              metrics: undefined,
-              req: ctx.req,
-              res: ctx.res
-            };
-            context.logger = createLogger(context, ctx.logger);
-            context.metrics = createMetrics(context, ctx.metrics);
-            runner.extendSSRContext(context);
-            serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
-            _context.next = 13;
-            return cache(serverRender, ctx)(context);
-          case 13:
-            content = _context.sent;
-            _context$redirection = context.redirection, url = _context$redirection.url, _context$redirection$ = _context$redirection.status, status = _context$redirection$ === void 0 ? 302 : _context$redirection$;
-            if (!url) {
-              _context.next = 17;
-              break;
+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);
             }
-            return _context.abrupt("return", {
-              content: url,
-              contentType: '',
-              statusCode: status,
-              redirect: true
-            });
-          case 17:
-            if (!(typeof content === 'string')) {
-              _context.next = 21;
-              break;
+            _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;
             }
-            return _context.abrupt("return", {
-              content: content,
-              contentType: mime.contentType('html')
-            });
-          case 21:
-            return _context.abrupt("return", {
-              content: '',
-              contentStream: content,
-              contentType: mime.contentType('html')
-            });
-          case 22:
-          case "end":
-            return _context.stop();
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
         }
-      }
-    }, _callee);
-  }));
-  return function render(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-}();
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import path from "path";
+import { fs, LOADABLE_STATS_FILE, mime, ROUTE_MINIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
+import cookie from "cookie";
+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;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    urlPath = renderOptions.urlPath, bundle = renderOptions.bundle, distDir = renderOptions.distDir, template = renderOptions.template, entryName = renderOptions.entryName, staticGenerate = renderOptions.staticGenerate;
+                    bundleJS = path.join(distDir, bundle);
+                    loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
+                    loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
+                    routesManifestUri = path.join(distDir, ROUTE_MINIFEST_FILE);
+                    routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
+                    context = {
+                        request: {
+                            baseUrl: urlPath,
+                            params: ctx.params,
+                            pathname: ctx.path,
+                            host: ctx.host,
+                            query: ctx.query,
+                            url: ctx.href,
+                            cookieMap: cookie.parse(ctx.headers.cookie || ""),
+                            headers: ctx.headers
+                        },
+                        response: {
+                            setHeader: function(key, value) {
+                                return ctx.res.setHeader(key, value);
+                            },
+                            status: function(code) {
+                                ctx.res.statusCode = code;
+                            },
+                            locals: ((ref = ctx.res) === null || ref === void 0 ? void 0 : ref.locals) || {}
+                        },
+                        redirection: {},
+                        template: template,
+                        loadableStats: loadableStats,
+                        routeManifest: routeManifest,
+                        entryName: entryName,
+                        staticGenerate: staticGenerate,
+                        logger: void 0,
+                        metrics: void 0,
+                        req: ctx.req,
+                        res: ctx.res
+                    };
+                    context.logger = createLogger(context, ctx.logger);
+                    context.metrics = createMetrics(context, ctx.metrics);
+                    runner.extendSSRContext(context);
+                    serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
+                    return [
+                        4,
+                        cache(serverRender, ctx)(context)
+                    ];
+                case 1:
+                    content = _state.sent();
+                    _redirection = context.redirection, url = _redirection.url, _status = _redirection.status, status = _status === void 0 ? 302 : _status;
+                    if (url) {
+                        return [
+                            2,
+                            {
+                                content: url,
+                                contentType: "",
+                                statusCode: status,
+                                redirect: true
+                            }
+                        ];
+                    }
+                    if (typeof content === "string") {
+                        return [
+                            2,
+                            {
+                                content: content,
+                                contentType: mime.contentType("html")
+                            }
+                        ];
+                    } else {
+                        return [
+                            2,
+                            {
+                                content: "",
+                                contentStream: content,
+                                contentType: mime.contentType("html")
+                            }
+                        ];
+                    }
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function render(ctx, renderOptions, runner) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export { render };

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

@@ -1,84 +1,216 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import path from 'path';
-import { mime } from '@modern-js/utils';
-import { readFile } from "./reader";
-export function handleDirectory(_x, _x2, _x3) {
-  return _handleDirectory.apply(this, arguments);
+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 _handleDirectory() {
-  _handleDirectory = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ctx, entryPath, urlPath) {
-    var pathname, filepath, content, contentType;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            pathname = ctx.path;
-            filepath = path.join(entryPath, trimLeft(pathname, urlPath)); // If can match accurately, always return the one that matches accurately
-            _context.next = 4;
-            return readFile(filepath);
-          case 4:
-            content = _context.sent;
-            contentType = mime.contentType(path.extname(filepath) || ''); // automatic addressing
-            if (content) {
-              _context.next = 22;
-              break;
-            }
-            if (!pathname.endsWith('/')) {
-              _context.next = 13;
-              break;
-            }
-            _context.next = 10;
-            return readFile("".concat(filepath, "index.html"));
-          case 10:
-            content = _context.sent;
-            _context.next = 21;
-            break;
-          case 13:
-            if (pathname.includes('.')) {
-              _context.next = 21;
-              break;
-            }
-            _context.next = 16;
-            return readFile("".concat(filepath, ".html"));
-          case 16:
-            content = _context.sent;
-            if (content) {
-              _context.next = 21;
-              break;
+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);
             }
-            _context.next = 20;
-            return readFile("".concat(filepath, "/index.html"));
-          case 20:
-            content = _context.sent;
-          case 21:
-            // set content-type as html
-            if (content) {
-              contentType = mime.contentType('html');
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
             }
-          case 22:
-            if (content) {
-              _context.next = 24;
-              break;
+            _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;
             }
-            return _context.abrupt("return", null);
-          case 24:
-            return _context.abrupt("return", {
-              content: content,
-              contentType: contentType || ''
-            });
-          case 25:
-          case "end":
-            return _context.stop();
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
         }
-      }
-    }, _callee);
-  }));
-  return _handleDirectory.apply(this, arguments);
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import path from "path";
+import { mime } from "@modern-js/utils";
+import { readFile } from "./reader";
+function handleDirectory(ctx, entryPath, urlPath) {
+    return _handleDirectory.apply(this, arguments);
+}
+function _handleDirectory() {
+    _handleDirectory = _asyncToGenerator(function(ctx, entryPath, urlPath) {
+        var pathname, filepath, content, contentType;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    pathname = ctx.path;
+                    filepath = path.join(entryPath, trimLeft(pathname, urlPath));
+                    return [
+                        4,
+                        readFile(filepath)
+                    ];
+                case 1:
+                    content = _state.sent();
+                    contentType = mime.contentType(path.extname(filepath) || "");
+                    if (!!content) return [
+                        3,
+                        7
+                    ];
+                    if (!pathname.endsWith("/")) return [
+                        3,
+                        3
+                    ];
+                    return [
+                        4,
+                        readFile("".concat(filepath, "index.html"))
+                    ];
+                case 2:
+                    content = _state.sent();
+                    return [
+                        3,
+                        6
+                    ];
+                case 3:
+                    if (!!pathname.includes(".")) return [
+                        3,
+                        6
+                    ];
+                    return [
+                        4,
+                        readFile("".concat(filepath, ".html"))
+                    ];
+                case 4:
+                    content = _state.sent();
+                    if (!!content) return [
+                        3,
+                        6
+                    ];
+                    return [
+                        4,
+                        readFile("".concat(filepath, "/index.html"))
+                    ];
+                case 5:
+                    content = _state.sent();
+                    _state.label = 6;
+                case 6:
+                    if (content) {
+                        contentType = mime.contentType("html");
+                    }
+                    _state.label = 7;
+                case 7:
+                    if (!content) {
+                        return [
+                            2,
+                            null
+                        ];
+                    }
+                    return [
+                        2,
+                        {
+                            content: content,
+                            contentType: contentType || ""
+                        }
+                    ];
+            }
+        });
+    });
+    return _handleDirectory.apply(this, arguments);
 }
-var trimLeft = function trimLeft(str, prefix) {
-  if (str.startsWith(prefix)) {
-    return str.substring(prefix.length);
-  }
-  return str;
-};
+var trimLeft = function(str, prefix) {
+    if (str.startsWith(prefix)) {
+        return str.substring(prefix.length);
+    }
+    return str;
+};
+export { handleDirectory };

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

@@ -1,6 +1,7 @@
-export var RenderLevel;
-(function (RenderLevel) {
-  RenderLevel[RenderLevel["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
-  RenderLevel[RenderLevel["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
-  RenderLevel[RenderLevel["SERVER_RENDER"] = 2] = "SERVER_RENDER";
-})(RenderLevel || (RenderLevel = {}));
+var RenderLevel = /* @__PURE__ */ function(RenderLevel2) {
+    RenderLevel2[RenderLevel2["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
+    RenderLevel2[RenderLevel2["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
+    RenderLevel2[RenderLevel2["SERVER_RENDER"] = 2] = "SERVER_RENDER";
+    return RenderLevel2;
+}(RenderLevel || {});
+export { RenderLevel };