@modern-js/prod-server 2.39.1 → 2.40.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

@@ -91,7 +91,7 @@ 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;
   routeMgr.reset(routes);
   return async (options) => {
     var _page_serverHooks_afterMatch, _page_serverHooks;
@@ -103,6 +103,9 @@ const createHandler = (manifest) => {
     }
     const entryName = pageMatch.spec.urlPath;
     const page = pages[entryName];
+    if (manifestOpts.forceCSR && url.searchParams.get("csr") === "1") {
+      return createResponse(page.template);
+    }
     const logger = (0, import_logger.createLogger)({
       level: "warn"
     });

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

@@ -88,7 +88,7 @@ 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, tmp = manifest.options, manifestOpts = tmp === void 0 ? {} : tmp;
   routeMgr.reset(routes);
   return function() {
     var _ref = _async_to_generator(function(options) {
@@ -125,6 +125,12 @@ var createHandler = function(manifest) {
             }
             entryName = pageMatch.spec.urlPath;
             page = pages[entryName];
+            if (manifestOpts.forceCSR && url.searchParams.get("csr") === "1") {
+              return [
+                2,
+                createResponse(page.template)
+              ];
+            }
             logger = createLogger({
               level: "warn"
             });

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

@@ -67,7 +67,7 @@ const checkIsSent = (context) => {
 const middlewarePipeline = createAsyncPipeline();
 const createHandler = (manifest) => {
   const routeMgr = new RouteMatchManager();
-  const { pages, routes } = manifest;
+  const { pages, routes, options: manifestOpts = {} } = manifest;
   routeMgr.reset(routes);
   return async (options) => {
     var _page_serverHooks_afterMatch, _page_serverHooks;
@@ -79,6 +79,9 @@ const createHandler = (manifest) => {
     }
     const entryName = pageMatch.spec.urlPath;
     const page = pages[entryName];
+    if (manifestOpts.forceCSR && url.searchParams.get("csr") === "1") {
+      return createResponse(page.template);
+    }
     const logger = createLogger({
       level: "warn"
     });

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/4mNiCACUpBcnHGiDFotjN/src/type" />
+/// <reference types=".dts-temp/x-wr1AtAisepvCMvqMiIW/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/4mNiCACUpBcnHGiDFotjN/src/type" />
+/// <reference types=".dts-temp/x-wr1AtAisepvCMvqMiIW/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,9 @@ export type Manifest = {
    */
   pages: Record<string, Page>;
   routes: ModernRouteInterface[];
+  options?: {
+    forceCSR?: boolean;
+  };
 };
 export declare const createHandler: (manifest: Manifest) => (options: HandlerOptions) => Promise<ReturnResponse>;
 export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.39.1",
+  "version": "2.40.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -74,10 +74,10 @@
     "node-html-parser": "^6.1.5",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/plugin": "2.39.1",
-    "@modern-js/server-core": "2.39.1",
-    "@modern-js/utils": "2.39.1",
-    "@modern-js/runtime-utils": "2.39.1"
+    "@modern-js/plugin": "2.40.0",
+    "@modern-js/server-core": "2.40.0",
+    "@modern-js/utils": "2.40.0",
+    "@modern-js/runtime-utils": "2.40.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -96,10 +96,10 @@
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "ws": "^8.13.0",
-    "@modern-js/server-core": "2.39.1",
-    "@modern-js/types": "2.39.1",
-    "@scripts/build": "2.39.1",
-    "@scripts/jest-config": "2.39.1"
+    "@modern-js/server-core": "2.40.0",
+    "@modern-js/types": "2.40.0",
+    "@scripts/build": "2.40.0",
+    "@scripts/jest-config": "2.40.0"
   },
   "sideEffects": false,
   "publishConfig": {