@modern-js/prod-server 2.21.0 → 2.21.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/prod-server
 
+## 2.21.1
+
+### Patch Changes
+
+- 78e3ac8: fix(prod-server): worker ssr should pass baseUrl & url by request.
+  fix(prod-server): worker ssr 通过 request 应该传递 baseUrl & url .
+- 2728724: fix(prod-server): the ssr render maybe get invalid url, like `http:///`
+  fix(prod-server): ssr 渲染函数可能获得非法 url, 类似 `http:///`
+  - @modern-js/server-core@2.21.1
+  - @modern-js/utils@2.21.1
+
 ## 2.21.0
 
 ### Patch Changes

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

@@ -104,7 +104,7 @@ class ModernServerContext {
     if (!host) {
       host = this.getReqHeader("Host");
     }
-    return host.split(/\s*,\s*/, 1)[0] || "";
+    return host.split(/\s*,\s*/, 1)[0] || "undefined";
   }
   get protocol() {
     if (this.req.socket.encrypted) {

package/dist/cjs/workerServer.js

@@ -85,8 +85,9 @@ const createHandler = (manifest) => {
           }
         };
         const params = pageMatch.parseURLParams(url.pathname) || {};
+        const { urlPath: baseUrl } = pageMatch;
         const serverRenderContext = {
-          request: createServerRequest(url, request, params),
+          request: createServerRequest(url, baseUrl, request, params),
           response: responseLike,
           loadableStats,
           routeManifest,
@@ -111,7 +112,7 @@ const createHandler = (manifest) => {
     }
     console.warn(`Can't not page(${pageMatch.spec.urlPath}) serverRender`);
     return createResponse(page.template);
-    function createServerRequest(url2, request2, params) {
+    function createServerRequest(url2, baseUrl, request2, params) {
       const { pathname, host, searchParams } = url2;
       const { headers: rawHeaders } = request2;
       const headers = {};
@@ -120,6 +121,8 @@ const createHandler = (manifest) => {
       });
       const query = Object.fromEntries(searchParams);
       return {
+        url: url2.href,
+        baseUrl,
         pathname,
         host,
         headers,

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

@@ -160,7 +160,7 @@ export var ModernServerContext = /* @__PURE__ */ function() {
         if (!host) {
           host = this.getReqHeader("Host");
         }
-        return host.split(/\s*,\s*/, 1)[0] || "";
+        return host.split(/\s*,\s*/, 1)[0] || "undefined";
       }
     },
     {

package/dist/esm/workerServer.js

@@ -71,8 +71,8 @@ export var createHandler = function(manifest) {
   routeMgr.reset(routes);
   return function() {
     var _ref = _async_to_generator(function(options) {
-      var request, loadableStats, routeManifest, url, pageMatch, page, responseLike, params, serverRenderContext, body, e;
-      function createServerRequest(url2, request2, params2) {
+      var request, loadableStats, routeManifest, url, pageMatch, page, responseLike, params, baseUrl, serverRenderContext, body, e;
+      function createServerRequest(url2, baseUrl2, request2, params2) {
         var pathname = url2.pathname, host = url2.host, searchParams = url2.searchParams;
         var rawHeaders = request2.headers;
         var headers = {};
@@ -81,6 +81,8 @@ export var createHandler = function(manifest) {
         });
         var query = Object.fromEntries(searchParams);
         return {
+          url: url2.href,
+          baseUrl: baseUrl2,
           pathname: pathname,
           host: host,
           headers: headers,
@@ -126,8 +128,9 @@ export var createHandler = function(manifest) {
               }
             };
             params = pageMatch.parseURLParams(url.pathname) || {};
+            baseUrl = pageMatch.urlPath;
             serverRenderContext = {
-              request: createServerRequest(url, request, params),
+              request: createServerRequest(url, baseUrl, request, params),
               response: responseLike,
               loadableStats: loadableStats,
               routeManifest: routeManifest,

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

@@ -95,7 +95,7 @@ export class ModernServerContext {
     if (!host) {
       host = this.getReqHeader("Host");
     }
-    return host.split(/\s*,\s*/, 1)[0] || "";
+    return host.split(/\s*,\s*/, 1)[0] || "undefined";
   }
   get protocol() {
     if (this.req.socket.encrypted) {

package/dist/esm-node/workerServer.js

@@ -70,8 +70,9 @@ export const createHandler = (manifest) => {
           }
         };
         const params = pageMatch.parseURLParams(url.pathname) || {};
+        const { urlPath: baseUrl } = pageMatch;
         const serverRenderContext = {
-          request: createServerRequest(url, request, params),
+          request: createServerRequest(url, baseUrl, request, params),
           response: responseLike,
           loadableStats,
           routeManifest,
@@ -96,7 +97,7 @@ export const createHandler = (manifest) => {
     }
     console.warn(`Can't not page(${pageMatch.spec.urlPath}) serverRender`);
     return createResponse(page.template);
-    function createServerRequest(url2, request2, params) {
+    function createServerRequest(url2, baseUrl, request2, params) {
       const { pathname, host, searchParams } = url2;
       const { headers: rawHeaders } = request2;
       const headers = {};
@@ -105,6 +106,8 @@ export const createHandler = (manifest) => {
       });
       const query = Object.fromEntries(searchParams);
       return {
+        url: url2.href,
+        baseUrl,
         pathname,
         host,
         headers,

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/dQl0PkddbjYymDTKBgvwm/src/type" />
+/// <reference types=".dts-temp/tNQNz5diNrmZleL5wsuCm/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';

package/dist/types/utils.d.ts

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.21.0",
+  "version": "2.21.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -61,8 +61,8 @@
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.21.0",
-    "@modern-js/server-core": "2.21.0"
+    "@modern-js/utils": "2.21.1",
+    "@modern-js/server-core": "2.21.1"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -78,10 +78,10 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^5",
-    "@modern-js/types": "2.21.0",
-    "@modern-js/server-core": "2.21.0",
-    "@scripts/jest-config": "2.21.0",
-    "@scripts/build": "2.21.0"
+    "@modern-js/types": "2.21.1",
+    "@modern-js/server-core": "2.21.1",
+    "@scripts/jest-config": "2.21.1",
+    "@scripts/build": "2.21.1"
   },
   "sideEffects": false,
   "publishConfig": {