@modern-js/prod-server 2.39.2 → 2.41.0

package/dist/cjs/libs/context/context.js

@@ -231,6 +231,7 @@ class ModernServerContext {
     (0, import_class_private_field_set._)(this, _urls, /* @__PURE__ */ new Map());
     (0, import_class_private_field_set._)(this, _queries, /* @__PURE__ */ new Map());
     this.serverTiming = new import_serverTiming.ServerTiming(this.res, (0, import_utils.cutNameByHyphen)((options === null || options === void 0 ? void 0 : options.metaName) || "modern-js"));
+    req.reporter && (this.reporter = req.reporter);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/workerServer.js

@@ -29,6 +29,7 @@ var import_hook_api = require("./libs/hook-api/index.worker");
 var import_route = require("./libs/route");
 var import_metrics = require("./libs/metrics");
 var import_reporter = require("./libs/reporter");
+const calcFallback = (metaName) => `x-${metaName.split(/[-_]/)[0]}-ssr-fallback`;
 class ReturnResponse {
   /**
   * Iterate a Object
@@ -91,7 +92,8 @@ const checkIsSent = (context) => {
 const middlewarePipeline = (0, import_plugin.createAsyncPipeline)();
 const createHandler = (manifest) => {
   const routeMgr = new import_route.RouteMatchManager();
-  const { pages, routes } = manifest;
+  const { pages, routes, options: manifestOpts } = manifest;
+  const { metaName = "modern-js", forceCSR = false } = manifestOpts || {};
   routeMgr.reset(routes);
   return async (options) => {
     var _page_serverHooks_afterMatch, _page_serverHooks;
@@ -103,6 +105,9 @@ const createHandler = (manifest) => {
     }
     const entryName = pageMatch.spec.urlPath;
     const page = pages[entryName];
+    if (forceCSR && url.searchParams.get("csr") === "1") {
+      return createResponse(page.template);
+    }
     const logger = (0, import_logger.createLogger)({
       level: "warn"
     });
@@ -122,6 +127,9 @@ const createHandler = (manifest) => {
         if (checkIsSent(hookContext)) {
           return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
         }
+        if (forceCSR && middlewarsHookContext.request.headers[calcFallback(metaName)]) {
+          return createResponse(page.template);
+        }
         const responseLike = {
           headers: {},
           statusCode: 200,
@@ -214,6 +222,7 @@ function createWorkerHookContext(url, logger, metrics, reporter) {
     reporter
   };
 }
+let appliedMiddlewares = false;
 function applyMiddlewares(ctx, middleware) {
   if (middleware) {
     const middlewares = (() => {
@@ -225,9 +234,12 @@ function applyMiddlewares(ctx, middleware) {
         ];
       }
     })();
-    middlewares.forEach((middleware2) => {
-      middlewarePipeline.use(middleware2);
-    });
+    if (!appliedMiddlewares) {
+      middlewares.forEach((middleware2) => {
+        middlewarePipeline.use(middleware2);
+      });
+      appliedMiddlewares = true;
+    }
     middlewarePipeline.run(ctx, {
       onLast: () => void 0
     });

package/dist/esm/libs/context/context.js

@@ -42,6 +42,7 @@ var ModernServerContext = /* @__PURE__ */ function() {
     _class_private_field_set(this, _urls, /* @__PURE__ */ new Map());
     _class_private_field_set(this, _queries, /* @__PURE__ */ new Map());
     this.serverTiming = new ServerTiming(this.res, cutNameByHyphen((options === null || options === void 0 ? void 0 : options.metaName) || "modern-js"));
+    req.reporter && (this.reporter = req.reporter);
   }
   _create_class(ModernServerContext2, [
     {

package/dist/esm/workerServer.js

@@ -10,6 +10,9 @@ import { createAfterMatchContext, createAfterRenderContext, createMiddlewareCont
 import { RouteMatchManager } from "./libs/route";
 import { metrics as defaultMetrics } from "./libs/metrics";
 import { defaultReporter } from "./libs/reporter";
+var calcFallback = function(metaName) {
+  return "x-".concat(metaName.split(/[-_]/)[0], "-ssr-fallback");
+};
 var ReturnResponse = /* @__PURE__ */ function() {
   "use strict";
   function ReturnResponse2(body, status) {
@@ -88,10 +91,11 @@ var checkIsSent = function(context) {
 var middlewarePipeline = createAsyncPipeline();
 var createHandler = function(manifest) {
   var routeMgr = new RouteMatchManager();
-  var pages = manifest.pages, routes = manifest.routes;
+  var pages = manifest.pages, routes = manifest.routes, manifestOpts = manifest.options;
+  var _ref = manifestOpts || {}, _ref_metaName = _ref.metaName, metaName = _ref_metaName === void 0 ? "modern-js" : _ref_metaName, _ref_forceCSR = _ref.forceCSR, forceCSR = _ref_forceCSR === void 0 ? false : _ref_forceCSR;
   routeMgr.reset(routes);
   return function() {
-    var _ref = _async_to_generator(function(options) {
+    var _ref2 = _async_to_generator(function(options) {
       var _page_serverHooks_afterMatch, _page_serverHooks, request, loadableStats, routeManifest, url, pageMatch, entryName, page, logger, metrics, reporter, hookContext, afterMatchHookContext, _page_serverHooks1, _page_serverHooks_afterRender, _page_serverHooks2, middlewarsHookContext, responseLike, params, baseUrl, serverRenderContext, body, afterRenderHookContext, e;
       function createServerRequest(url2, baseUrl2, request2, params2) {
         var pathname = url2.pathname, host = url2.host, searchParams = url2.searchParams;
@@ -125,6 +129,12 @@ var createHandler = function(manifest) {
             }
             entryName = pageMatch.spec.urlPath;
             page = pages[entryName];
+            if (forceCSR && url.searchParams.get("csr") === "1") {
+              return [
+                2,
+                createResponse(page.template)
+              ];
+            }
             logger = createLogger({
               level: "warn"
             });
@@ -162,6 +172,12 @@ var createHandler = function(manifest) {
                 new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers)
               ];
             }
+            if (forceCSR && middlewarsHookContext.request.headers[calcFallback(metaName)]) {
+              return [
+                2,
+                createResponse(page.template)
+              ];
+            }
             responseLike = {
               headers: {},
               statusCode: 200,
@@ -232,7 +248,7 @@ var createHandler = function(manifest) {
       });
     });
     return function(options) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 };
@@ -261,6 +277,7 @@ function createWorkerHookContext(url, logger, metrics, reporter) {
     reporter
   };
 }
+var appliedMiddlewares = false;
 function applyMiddlewares(ctx, middleware) {
   if (middleware) {
     var middlewares = function() {
@@ -272,9 +289,12 @@ function applyMiddlewares(ctx, middleware) {
         ];
       }
     }();
-    middlewares.forEach(function(middleware2) {
-      middlewarePipeline.use(middleware2);
-    });
+    if (!appliedMiddlewares) {
+      middlewares.forEach(function(middleware2) {
+        middlewarePipeline.use(middleware2);
+      });
+      appliedMiddlewares = true;
+    }
     middlewarePipeline.run(ctx, {
       onLast: function() {
         return void 0;

package/dist/esm-node/libs/context/context.js

@@ -198,6 +198,7 @@ class ModernServerContext {
     _class_private_field_set(this, _urls, /* @__PURE__ */ new Map());
     _class_private_field_set(this, _queries, /* @__PURE__ */ new Map());
     this.serverTiming = new ServerTiming(this.res, cutNameByHyphen((options === null || options === void 0 ? void 0 : options.metaName) || "modern-js"));
+    req.reporter && (this.reporter = req.reporter);
   }
 }
 export {

package/dist/esm-node/workerServer.js

@@ -5,6 +5,7 @@ import { createAfterMatchContext, createAfterRenderContext, createMiddlewareCont
 import { RouteMatchManager } from "./libs/route";
 import { metrics as defaultMetrics } from "./libs/metrics";
 import { defaultReporter } from "./libs/reporter";
+const calcFallback = (metaName) => `x-${metaName.split(/[-_]/)[0]}-ssr-fallback`;
 class ReturnResponse {
   /**
   * Iterate a Object
@@ -67,7 +68,8 @@ const checkIsSent = (context) => {
 const middlewarePipeline = createAsyncPipeline();
 const createHandler = (manifest) => {
   const routeMgr = new RouteMatchManager();
-  const { pages, routes } = manifest;
+  const { pages, routes, options: manifestOpts } = manifest;
+  const { metaName = "modern-js", forceCSR = false } = manifestOpts || {};
   routeMgr.reset(routes);
   return async (options) => {
     var _page_serverHooks_afterMatch, _page_serverHooks;
@@ -79,6 +81,9 @@ const createHandler = (manifest) => {
     }
     const entryName = pageMatch.spec.urlPath;
     const page = pages[entryName];
+    if (forceCSR && url.searchParams.get("csr") === "1") {
+      return createResponse(page.template);
+    }
     const logger = createLogger({
       level: "warn"
     });
@@ -98,6 +103,9 @@ const createHandler = (manifest) => {
         if (checkIsSent(hookContext)) {
           return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
         }
+        if (forceCSR && middlewarsHookContext.request.headers[calcFallback(metaName)]) {
+          return createResponse(page.template);
+        }
         const responseLike = {
           headers: {},
           statusCode: 200,
@@ -190,6 +198,7 @@ function createWorkerHookContext(url, logger, metrics, reporter) {
     reporter
   };
 }
+let appliedMiddlewares = false;
 function applyMiddlewares(ctx, middleware) {
   if (middleware) {
     const middlewares = (() => {
@@ -201,9 +210,12 @@ function applyMiddlewares(ctx, middleware) {
         ];
       }
     })();
-    middlewares.forEach((middleware2) => {
-      middlewarePipeline.use(middleware2);
-    });
+    if (!appliedMiddlewares) {
+      middlewares.forEach((middleware2) => {
+        middlewarePipeline.use(middleware2);
+      });
+      appliedMiddlewares = true;
+    }
     middlewarePipeline.run(ctx, {
       onLast: () => void 0
     });

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

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/4t_qqLOCFy4IT_CatFGOb/src/type" />
+/// <reference types=".dts-temp/MyKuaUY5TchUfAps6LPPb/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface, Reporter as ModernServerReporter, ServerTiming as ModernServerTiming } from '@modern-js/types';

package/dist/types/type.d.ts

@@ -5,12 +5,13 @@ import { IncomingMessage, Server, ServerResponse } from 'http';
 import { Readable } from 'stream';
 import { serverManager, ServerOptions } from '@modern-js/server-core';
 import type { ServerPlugin } from '@modern-js/server-core';
-import type { Metrics, Logger, NextFunction, ModernServerContext, InternalPlugins } from '@modern-js/types';
+import type { Metrics, Logger, NextFunction, ModernServerContext, InternalPlugins, Reporter } from '@modern-js/types';
 import type { ModernRouteInterface } from './libs/route';
 declare module 'http' {
   interface IncomingMessage {
     logger: Logger;
     metrics: Metrics;
+    reporter?: Reporter;
     body?: any;
   }
   interface OutgoingMessage {

package/dist/types/utils.d.ts

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

package/dist/types/workerServer.d.ts

@@ -50,6 +50,10 @@ export type Manifest = {
    */
   pages: Record<string, Page>;
   routes: ModernRouteInterface[];
+  options?: {
+    forceCSR?: boolean;
+    metaName?: string;
+  };
 };
 export declare const createHandler: (manifest: Manifest) => (options: HandlerOptions) => Promise<ReturnResponse>;
 export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.39.2",
+  "version": "2.41.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -63,24 +63,24 @@
     }
   },
   "dependencies": {
-    "@swc/helpers": "0.5.1",
-    "cookie": "^0.4.2",
+    "@swc/helpers": "0.5.3",
+    "cookie": "0.5.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
-    "http-proxy-middleware": "^2.0.1",
+    "http-proxy-middleware": "^2.0.4",
     "ignore-styles": "^5.0.1",
     "lru-cache": "^6.0.0",
     "merge-deep": "^3.0.3",
     "node-html-parser": "^6.1.5",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/plugin": "2.39.2",
-    "@modern-js/server-core": "2.39.2",
-    "@modern-js/utils": "2.39.2",
-    "@modern-js/runtime-utils": "2.39.2"
+    "@modern-js/plugin": "2.41.0",
+    "@modern-js/server-core": "2.41.0",
+    "@modern-js/utils": "2.41.0",
+    "@modern-js/runtime-utils": "2.41.0"
   },
   "devDependencies": {
-    "@types/cookie": "^0.4.1",
+    "@types/cookie": "0.5.1",
     "@types/etag": "^1.8.1",
     "@types/fresh": "^0.5.0",
     "@types/jest": "^29",
@@ -89,17 +89,17 @@
     "@types/node": "^14",
     "@types/serve-static": "^1.13.10",
     "@types/ws": "^8.5.5",
-    "axios": "^1.2.1",
+    "axios": "^1.6.0",
     "jest": "^29",
     "memfs": "^3.5.1",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "ws": "^8.13.0",
-    "@modern-js/server-core": "2.39.2",
-    "@modern-js/types": "2.39.2",
-    "@scripts/build": "2.39.2",
-    "@scripts/jest-config": "2.39.2"
+    "@modern-js/server-core": "2.41.0",
+    "@scripts/build": "2.41.0",
+    "@modern-js/types": "2.41.0",
+    "@scripts/jest-config": "2.41.0"
   },
   "sideEffects": false,
   "publishConfig": {