@modern-js/prod-server 2.4.1-beta.0 → 2.5.1-alpha.0

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

@@ -116,7 +116,7 @@ class ModernServer {
   }
   onInit(runner, app) {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b;
       this.runner = runner;
       const { distDir, staticGenerate, conf } = this;
       debug("final server conf", this.conf);
@@ -148,9 +148,12 @@ class ModernServer {
         ],
         this.conf.output
       );
+      const ssrConfig = (_b = this.conf.server) == null ? void 0 : _b.ssr;
+      const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
       this.routeRenderHandler = createRenderHandler({
         distDir,
-        staticGenerate
+        staticGenerate,
+        forceCSR
       });
       yield this.setupBeforeProdMiddleware();
       this.addHandler(this.staticFileHandler);
@@ -187,8 +190,8 @@ class ModernServer {
   }
   render(req, res, url) {
     return __async(this, null, function* () {
-      req.logger = this.logger;
-      req.metrics = this.metrics;
+      req.logger = req.logger || this.logger;
+      req.metrics = req.metrics || this.metrics;
       const context = createContext(req, res);
       const matched = this.router.match(url || context.path);
       if (!matched) {
@@ -281,7 +284,8 @@ class ModernServer {
         {
           pwd: workDir,
           config: extension,
-          prefix: Array.isArray(prefix) ? prefix[0] : prefix
+          prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+          render: this.render.bind(this)
         },
         { onLast: () => null }
       );
@@ -327,7 +331,9 @@ class ModernServer {
     const bundles = this.router.getBundles();
     bundles.forEach((bundle) => {
       const filepath = path.join(distDir, bundle);
-      require(filepath);
+      if (fs.existsSync(filepath)) {
+        require(filepath);
+      }
     });
   }
   createContext(req, res, options = {}) {
@@ -486,8 +492,8 @@ class ModernServer {
   requestHandler(req, res, next = () => {
   }) {
     res.statusCode = 200;
-    req.logger = this.logger;
-    req.metrics = this.metrics;
+    req.logger = req.logger || this.logger;
+    req.metrics = req.metrics || this.metrics;
     let context;
     try {
       context = this.createContext(req, res);

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

@@ -54,7 +54,8 @@ var import_reader = require("./reader");
 var ssr = __toESM(require("./ssr"));
 const createRenderHandler = ({
   distDir,
-  staticGenerate
+  staticGenerate,
+  forceCSR
 }) => function render(_0) {
   return __async(this, arguments, function* ({
     ctx,
@@ -78,7 +79,8 @@ const createRenderHandler = ({
     if (!content) {
       return null;
     }
-    if (route.isSSR) {
+    const useCSR = forceCSR && ctx.query.csr;
+    if (route.isSSR && !useCSR) {
       try {
         const result = yield ssr.render(
           ctx,

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

@@ -120,7 +120,7 @@ class ModernServer {
   }
   onInit(runner, app) {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b;
       this.runner = runner;
       const { distDir, staticGenerate, conf } = this;
       (0, import_utils2.debug)("final server conf", this.conf);
@@ -152,9 +152,12 @@ class ModernServer {
         ],
         this.conf.output
       );
+      const ssrConfig = (_b = this.conf.server) == null ? void 0 : _b.ssr;
+      const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
       this.routeRenderHandler = (0, import_render.createRenderHandler)({
         distDir,
-        staticGenerate
+        staticGenerate,
+        forceCSR
       });
       yield this.setupBeforeProdMiddleware();
       this.addHandler(this.staticFileHandler);
@@ -191,8 +194,8 @@ class ModernServer {
   }
   render(req, res, url) {
     return __async(this, null, function* () {
-      req.logger = this.logger;
-      req.metrics = this.metrics;
+      req.logger = req.logger || this.logger;
+      req.metrics = req.metrics || this.metrics;
       const context = (0, import_context.createContext)(req, res);
       const matched = this.router.match(url || context.path);
       if (!matched) {
@@ -285,7 +288,8 @@ class ModernServer {
         {
           pwd: workDir,
           config: extension,
-          prefix: Array.isArray(prefix) ? prefix[0] : prefix
+          prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+          render: this.render.bind(this)
         },
         { onLast: () => null }
       );
@@ -331,7 +335,9 @@ class ModernServer {
     const bundles = this.router.getBundles();
     bundles.forEach((bundle) => {
       const filepath = import_path.default.join(distDir, bundle);
-      require(filepath);
+      if (import_utils.fs.existsSync(filepath)) {
+        require(filepath);
+      }
     });
   }
   createContext(req, res, options = {}) {
@@ -490,8 +496,8 @@ class ModernServer {
   requestHandler(req, res, next = () => {
   }) {
     res.statusCode = 200;
-    req.logger = this.logger;
-    req.metrics = this.metrics;
+    req.logger = req.logger || this.logger;
+    req.metrics = req.metrics || this.metrics;
     let context;
     try {
       context = this.createContext(req, res);

package/dist/js/treeshaking/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/server/modern-server.js

@@ -257,7 +257,7 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function onInit(runner, app) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var _conf_bff, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp;
+                    var _conf_bff, _this_conf_server, distDir, staticGenerate, conf, usageRoutes, staticPathRegExp, ssrConfig, forceCSR;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -296,9 +296,12 @@ var ModernServer = /*#__PURE__*/ function() {
                                         target: distDir
                                     }
                                 ], _this.conf.output);
+                                ssrConfig = (_this_conf_server = _this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
+                                forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
                                 _this.routeRenderHandler = createRenderHandler({
                                     distDir: distDir,
-                                    staticGenerate: staticGenerate
+                                    staticGenerate: staticGenerate,
+                                    forceCSR: forceCSR
                                 });
                                 return [
                                     4,
@@ -393,8 +396,8 @@ var ModernServer = /*#__PURE__*/ function() {
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                req.logger = _this.logger;
-                                req.metrics = _this.metrics;
+                                req.logger = req.logger || _this.logger;
+                                req.metrics = req.metrics || _this.metrics;
                                 context = createContext(req, res);
                                 matched = _this.router.match(url || context.path);
                                 if (!matched) {
@@ -606,7 +609,8 @@ var ModernServer = /*#__PURE__*/ function() {
                             runner.prepareApiServer({
                                 pwd: workDir,
                                 config: extension,
-                                prefix: Array.isArray(prefix) ? prefix[0] : prefix
+                                prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+                                render: _this.render.bind(_this)
                             }, {
                                 onLast: function() {
                                     return null;
@@ -715,7 +719,9 @@ var ModernServer = /*#__PURE__*/ function() {
                 var bundles = this.router.getBundles();
                 bundles.forEach(function(bundle) {
                     var filepath = path.join(distDir, bundle);
-                    require(filepath);
+                    if (fs.existsSync(filepath)) {
+                        require(filepath);
+                    }
                 });
             }
         },
@@ -973,8 +979,8 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function requestHandler(req, res) {
                 var next = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : function() {};
                 res.statusCode = 200;
-                req.logger = this.logger;
-                req.metrics = this.metrics;
+                req.logger = req.logger || this.logger;
+                req.metrics = req.metrics || this.metrics;
                 var context;
                 try {
                     context = this.createContext(req, res);

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/lM3iZKWPu2jm0FkDHIE8Y/src/type" />
+/// <reference types=".dts-temp/8rnsll2mo9ytj_poqlbk_/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { URL } from 'url';
 import qs from 'querystring';

package/dist/types/libs/render/index.d.ts

@@ -3,10 +3,12 @@ import { RenderResult, ServerHookRunner } from '../../type';
 import { ModernRoute } from '../route';
 export declare const createRenderHandler: ({
   distDir,
-  staticGenerate
+  staticGenerate,
+  forceCSR
 }: {
   distDir: string;
   staticGenerate: boolean;
+  forceCSR?: boolean | undefined;
 }) => ({
   ctx,
   route,

package/dist/types/utils.d.ts

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

package/package.json

@@ -11,28 +11,27 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm-node/index.js",
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/treeshaking/index.js"
+      "default": "./dist/esm/index.js"
     },
     "./worker": {
       "node": {
         "jsnext:source": "./src/worker-server.ts",
-        "import": "./dist/js/modern/worker-server.js",
-        "require": "./dist/js/node/worker-server.js"
+        "import": "./dist/esm-node/worker-server.js",
+        "require": "./dist/cjs/worker-server.js"
       },
-      "default": "./dist/js/treeshaking/worker-server.js"
+      "default": "./dist/esm/worker-server.js"
     }
   },
   "typesVersions": {
@@ -46,6 +45,8 @@
     }
   },
   "dependencies": {
+    "@modern-js/utils": "2.5.0",
+    "@modern-js/server-core": "2.5.1-alpha.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
     "cookie": "^0.4.2",
@@ -54,11 +55,13 @@
     "lru-cache": "^6.0.0",
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
-    "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.4.1-beta.0",
-    "@modern-js/server-core": "2.4.1-beta.0"
+    "serve-static": "^1.14.1"
   },
   "devDependencies": {
+    "@modern-js/types": "2.5.0",
+    "@modern-js/server-core": "2.5.1-alpha.0",
+    "@scripts/jest-config": "2.5.0",
+    "@scripts/build": "2.5.0",
     "@types/cookie": "^0.4.1",
     "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",
@@ -71,11 +74,7 @@
     "jest": "^27",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
-    "typescript": "^4",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/server-core": "2.4.1-beta.0",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0"
+    "typescript": "^4"
   },
   "sideEffects": false,
   "publishConfig": {