@modern-js/prod-server 2.47.1 → 2.48.1

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { RouteMatcher } from "./matcher";
 class RouteMatchManager {
   // get all routes matches pathname
@@ -49,8 +48,7 @@ class RouteMatchManager {
     return bundles;
   }
   constructor() {
-    _define_property(this, "matchers", void 0);
-    _define_property(this, "specs", []);
+    this.specs = [];
     this.matchers = [];
   }
 }

package/dist/esm-node/libs/route/matcher.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { match, pathToRegexp, compile } from "path-to-regexp";
 import { ModernRoute } from "./route";
 const removeTailSlash = (s) => s.replace(/\/+$/, "");
@@ -80,10 +79,7 @@ class RouteMatcher {
     }
   }
   constructor(spec) {
-    _define_property(this, "spec", void 0);
-    _define_property(this, "urlPath", "");
-    _define_property(this, "urlMatcher", void 0);
-    _define_property(this, "urlReg", void 0);
+    this.urlPath = "";
     this.spec = spec;
     this.setupUrlPath();
   }

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

@@ -1,15 +1,6 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 class ModernRoute {
   constructor(routeSpec) {
-    _define_property(this, "entryName", void 0);
-    _define_property(this, "urlPath", void 0);
-    _define_property(this, "entryPath", void 0);
-    _define_property(this, "bundle", void 0);
-    _define_property(this, "isApi", void 0);
-    _define_property(this, "isSSR", void 0);
-    _define_property(this, "isSPA", void 0);
-    _define_property(this, "params", {});
-    _define_property(this, "responseHeaders", void 0);
+    this.params = {};
     this.entryName = routeSpec.entryName || "";
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || "";

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 const SERVER_TIMING = "Server-Timing";
 class ServerTiming {
   addServeTiming(name, dur, desc) {
@@ -9,8 +8,6 @@ class ServerTiming {
     return this;
   }
   constructor(res, meta) {
-    _define_property(this, "meta", void 0);
-    _define_property(this, "res", void 0);
     this.meta = meta;
     this.res = res;
   }

package/dist/esm-node/renderHtml.js

@@ -2,7 +2,6 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { OutgoingMessage } from "http";
 import { Readable } from "stream";
 import { Socket } from "net";
@@ -13,10 +12,6 @@ var require_renderHtml = __commonJS({
     class IncomingMessageLike extends Readable {
       constructor({ method, url, headers }) {
         super();
-        _define_property(this, "headers", void 0);
-        _define_property(this, "method", void 0);
-        _define_property(this, "url", void 0);
-        _define_property(this, "socket", void 0);
         this.socket = new Socket();
         this.headers = headers || {};
         this.headers.host = "localhost:8080";
@@ -33,8 +28,6 @@ var require_renderHtml = __commonJS({
       }
       constructor() {
         super();
-        _define_property(this, "statusCode", void 0);
-        _define_property(this, "data", void 0);
         this.statusCode = 200;
         this.data = [];
       }

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import path from "path";
 import { fs, createLogger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS, ensureAbsolutePath } from "@modern-js/utils";
 import { serverManager, AppContext, ConfigContext, loadPlugins } from "@modern-js/server-core";
@@ -176,12 +175,7 @@ class Server {
     }
   }
   constructor(options) {
-    _define_property(this, "options", void 0);
-    _define_property(this, "serverImpl", createProdServer);
-    _define_property(this, "server", void 0);
-    _define_property(this, "app", void 0);
-    _define_property(this, "runner", void 0);
-    _define_property(this, "serverConfig", void 0);
+    this.serverImpl = createProdServer;
     options.logger = options.logger || createLogger({
       level: "warn"
     });

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createServer } from "http";
 import path from "path";
 import { fs, isProd, isPromise, isWebOnly, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
@@ -327,7 +326,13 @@ class ModernServer {
     if (!renderResult) {
       return;
     }
-    const { contentStream: responseStream } = renderResult;
+    const { contentStream: responseStream, headers } = renderResult;
+    if (headers) {
+      for (const name in headers) {
+        const value = headers[name];
+        res.setHeader(name, value);
+      }
+    }
     let { content: response } = renderResult;
     if (route.entryName && responseStream) {
       responseStream.pipe(res);
@@ -458,25 +463,10 @@ class ModernServer {
     context.res.end(createErrorDocument(status, text));
   }
   constructor({ pwd, config, routes, staticGenerate, logger, metrics, runMode, proxyTarget, appContext }) {
-    _define_property(this, "pwd", void 0);
-    _define_property(this, "distDir", void 0);
-    _define_property(this, "workDir", void 0);
-    _define_property(this, "router", void 0);
-    _define_property(this, "conf", void 0);
-    _define_property(this, "handlers", []);
-    _define_property(this, "presetRoutes", void 0);
-    _define_property(this, "runner", void 0);
-    _define_property(this, "logger", void 0);
-    _define_property(this, "metrics", void 0);
-    _define_property(this, "runMode", void 0);
-    _define_property(this, "proxyTarget", void 0);
-    _define_property(this, "routeRenderHandler", void 0);
-    _define_property(this, "staticGenerate", void 0);
-    _define_property(this, "metaName", void 0);
-    _define_property(this, "loaderHandler", null);
-    _define_property(this, "frameWebHandler", null);
-    _define_property(this, "frameAPIHandler", null);
-    _define_property(this, "_handler", void 0);
+    this.handlers = [];
+    this.loaderHandler = null;
+    this.frameWebHandler = null;
+    this.frameAPIHandler = null;
     require("ignore-styles");
     this.pwd = pwd;
     this.distDir = path.resolve(pwd, config.output.path || "dist");

package/dist/esm-node/workerServer.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createAsyncPipeline } from "@modern-js/plugin";
 import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "./libs/hook-api/index.worker";
 import { RouteMatchManager } from "./libs/route";
@@ -51,9 +50,6 @@ class ReturnResponse {
     return this;
   }
   constructor(body, status, headers = {}) {
-    _define_property(this, "body", void 0);
-    _define_property(this, "status", void 0);
-    _define_property(this, "headers", void 0);
     this.body = body;
     this.status = status;
     this.headers = new Headers(headers);
@@ -103,7 +99,7 @@ const createHandler = (manifest) => {
     const route = pageMatch.generate(url.pathname);
     const hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
     const afterMatchHookContext = createAfterMatchContext(hookContext, entryName);
-    page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0);
+    await (page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0));
     if (checkIsSent(hookContext)) {
       return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
     }
@@ -152,7 +148,7 @@ const createHandler = (manifest) => {
         };
         const body = await page.serverRender(serverRenderContext);
         const afterRenderHookContext = createAfterRenderContext(hookContext, route, body);
-        (_page_serverHooks2 = page.serverHooks) === null || _page_serverHooks2 === void 0 ? void 0 : (_page_serverHooks_afterRender = _page_serverHooks2.afterRender) === null || _page_serverHooks_afterRender === void 0 ? void 0 : _page_serverHooks_afterRender.call(_page_serverHooks2, afterRenderHookContext, () => void 0);
+        await ((_page_serverHooks2 = page.serverHooks) === null || _page_serverHooks2 === void 0 ? void 0 : (_page_serverHooks_afterRender = _page_serverHooks2.afterRender) === null || _page_serverHooks_afterRender === void 0 ? void 0 : _page_serverHooks_afterRender.call(_page_serverHooks2, afterRenderHookContext, () => void 0));
         if (checkIsSent(hookContext)) {
           return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
         }
@@ -211,7 +207,7 @@ function createWorkerHookContext(url, logger, metrics, reporter) {
   };
 }
 let appliedMiddlewares = false;
-function applyMiddlewares(ctx, middleware) {
+async function applyMiddlewares(ctx, middleware) {
   if (middleware) {
     const middlewares = (() => {
       if (Array.isArray(middleware)) {
@@ -228,7 +224,7 @@ function applyMiddlewares(ctx, middleware) {
       });
       appliedMiddlewares = true;
     }
-    middlewarePipeline.run(ctx, {
+    await middlewarePipeline.run(ctx, {
       onLast: () => void 0
     });
   }

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

@@ -1,7 +1,6 @@
-/// <reference types="node" />
 /// <reference types="node/http" />
 /// <reference types="dist/types/type" />
 import { IncomingMessage } from 'http';
-import { type Readable } from 'stream';
 import { RenderFunction, SSRServerContext } from '../type';
-export declare function ssrCache(req: IncomingMessage, render: RenderFunction, ssrContext: SSRServerContext): Promise<string | Readable>;
+import { CacheResult } from './manager';
+export declare function ssrCache(req: IncomingMessage, render: RenderFunction, ssrContext: SSRServerContext): Promise<CacheResult>;

package/dist/types/libs/render/ssrCache/manager.d.ts

@@ -5,10 +5,16 @@ import { IncomingMessage } from 'http';
 import { Readable } from 'stream';
 import { CacheControl, Container } from '@modern-js/types';
 import { RenderFunction, SSRServerContext } from '../type';
+type CacheStatus = 'hit' | 'stale' | 'expired' | 'miss';
+export type CacheResult = {
+    data: string | Readable;
+    status?: CacheStatus;
+};
 export declare class CacheManager {
     private container;
     constructor(container: Container<string, string>);
-    getCacheResult(req: IncomingMessage, cacheControl: CacheControl, render: RenderFunction, ssrContext: SSRServerContext): Promise<string | Readable>;
+    getCacheResult(req: IncomingMessage, cacheControl: CacheControl, render: RenderFunction, ssrContext: SSRServerContext): Promise<CacheResult>;
     private processCache;
     private computedKey;
 }
+export {};

package/dist/types/type.d.ts

@@ -49,6 +49,7 @@ export type RenderResult = {
     contentType: string;
     contentStream?: Readable;
     statusCode?: number;
+    headers?: Record<string, string>;
     redirect?: boolean;
 };
 export type ConfWithBFF = {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.47.1",
+  "version": "2.48.1",
   "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.47.1",
-    "@modern-js/server-core": "2.47.1",
-    "@modern-js/runtime-utils": "2.47.1",
-    "@modern-js/utils": "2.47.1"
+    "@modern-js/plugin": "2.48.1",
+    "@modern-js/server-core": "2.48.1",
+    "@modern-js/utils": "2.48.1",
+    "@modern-js/runtime-utils": "2.48.1"
   },
   "devDependencies": {
     "@types/cookie": "0.5.1",
@@ -95,9 +95,9 @@
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "ws": "^8.13.0",
-    "@scripts/build": "2.47.1",
-    "@modern-js/types": "2.47.1",
-    "@scripts/jest-config": "2.47.1"
+    "@modern-js/types": "2.48.1",
+    "@scripts/build": "2.48.1",
+    "@scripts/jest-config": "2.48.1"
   },
   "sideEffects": false,
   "publishConfig": {