@modern-js/prod-server 2.32.2-alpha.1 → 2.33.0

package/CHANGELOG.md

@@ -1,13 +1,18 @@
 # @modern-js/prod-server
 
-## 2.32.2-alpha.0
+## 2.33.0
 
 ### Patch Changes
 
-- Updated dependencies [bc1f8daf0ff]
-  - @modern-js/utils@2.32.2-alpha.0
-  - @modern-js/server-core@2.32.2-alpha.0
-  - @modern-js/plugin@2.32.2-alpha.0
+- 1042583: fix(prod-server): set res.statusCode = 200 when routes matches success
+  fix(prod-server): 路由匹配成功后 设置 res.statusCode = 200
+- 3ba1682: fix(prod-server): optimize ssr preload
+  fix(prod-server): 优化 ssr preload
+- Updated dependencies [fd82137]
+- Updated dependencies [bc1f8da]
+  - @modern-js/utils@2.33.0
+  - @modern-js/server-core@2.33.0
+  - @modern-js/plugin@2.33.0
 
 ## 2.32.1
 

package/dist/cjs/libs/preload/parseLinks.js

@@ -17,7 +17,7 @@ const _remixrouter = require("@modern-js/utils/runtime/remix-router");
 const _runtimenode = require("@modern-js/utils/runtime-node");
 async function parseLinks({ pathname, distDir, template }) {
   const links = await parseLinksFromRoutes(pathname, distDir);
-  return links.length > 0 ? links : parseLinksFromHtml(template);
+  return links.concat(parseLinksFromHtml(template));
 }
 function parseLinksFromHtml(html) {
   const root = (0, _nodehtmlparser.parse)(html);

package/dist/cjs/libs/preload/transformLinks2String.js

@@ -11,10 +11,10 @@ Object.defineProperty(exports, "transformLinks2String", {
 const _flushServerHeader = require("./flushServerHeader");
 function transformLinks2String(links, preload) {
   if (typeof preload === "boolean") {
-    return links.map(({ uri, as }) => as ? `<${uri}>; rel=preload; as=${as}` : `<${uri}>; rel=preload`).join(", ");
+    return dedup(links).map(({ uri, as }) => as ? `<${uri}>; rel=preload; as=${as}` : `<${uri}>; rel=preload`).join(", ");
   }
   const { include, exclude, attributes } = preload;
-  const resolveLinks = addAttributes(removeExclude(addInclude(links, include), exclude), attributes);
+  const resolveLinks = addAttributes(dedup(removeExclude(addInclude(links, include), exclude)), attributes);
   return resolveLinks.join(", ");
   function addInclude(links2, include2) {
     var _include;
@@ -110,4 +110,14 @@ function transformLinks2String(links, preload) {
       return `<${uri}>; rel=preload`;
     });
   }
+  function dedup(links2) {
+    const set = /* @__PURE__ */ new Set();
+    return links2.filter(({ uri }) => {
+      if (set.has(uri)) {
+        return false;
+      }
+      set.add(uri);
+      return true;
+    });
+  }
 }

package/dist/cjs/server/modernServer.js

@@ -86,6 +86,7 @@ class ModernServer {
     if (!matched) {
       return null;
     }
+    res.statusCode = 200;
     const route = matched.generate(context.url);
     const result = await this.handleWeb(context, route);
     if (!result) {

package/dist/esm/libs/preload/parseLinks.js

@@ -24,7 +24,7 @@ function _parseLinks() {
           links = _state.sent();
           return [
             2,
-            links.length > 0 ? links : parseLinksFromHtml(template)
+            links.concat(parseLinksFromHtml(template))
           ];
       }
     });

package/dist/esm/libs/preload/transformLinks2String.js

@@ -106,13 +106,24 @@ export function transformLinks2String(links, preload) {
       return "<".concat(uri, ">; rel=preload");
     });
   };
+  var dedup = function dedup2(links2) {
+    var set = /* @__PURE__ */ new Set();
+    return links2.filter(function(param) {
+      var uri = param.uri;
+      if (set.has(uri)) {
+        return false;
+      }
+      set.add(uri);
+      return true;
+    });
+  };
   if (typeof preload === "boolean") {
-    return links.map(function(param) {
+    return dedup(links).map(function(param) {
       var uri = param.uri, as = param.as;
       return as ? "<".concat(uri, ">; rel=preload; as=").concat(as) : "<".concat(uri, ">; rel=preload");
     }).join(", ");
   }
   var include = preload.include, exclude = preload.exclude, attributes = preload.attributes;
-  var resolveLinks = addAttributes(removeExclude(addInclude(links, include), exclude), attributes);
+  var resolveLinks = addAttributes(dedup(removeExclude(addInclude(links, include), exclude)), attributes);
   return resolveLinks.join(", ");
 }

package/dist/esm/server/modernServer.js

@@ -176,6 +176,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                     null
                   ];
                 }
+                res.statusCode = 200;
                 route = matched.generate(context.url);
                 return [
                   4,

package/dist/esm-node/libs/preload/parseLinks.js

@@ -5,7 +5,7 @@ import { matchRoutes } from "@modern-js/utils/runtime/remix-router";
 import { matchEntry } from "@modern-js/utils/runtime-node";
 export async function parseLinks({ pathname, distDir, template }) {
   const links = await parseLinksFromRoutes(pathname, distDir);
-  return links.length > 0 ? links : parseLinksFromHtml(template);
+  return links.concat(parseLinksFromHtml(template));
 }
 function parseLinksFromHtml(html) {
   const root = htmlParse(html);

package/dist/esm-node/libs/preload/transformLinks2String.js

@@ -1,10 +1,10 @@
 import { transformToRegExp } from "./flushServerHeader";
 export function transformLinks2String(links, preload) {
   if (typeof preload === "boolean") {
-    return links.map(({ uri, as }) => as ? `<${uri}>; rel=preload; as=${as}` : `<${uri}>; rel=preload`).join(", ");
+    return dedup(links).map(({ uri, as }) => as ? `<${uri}>; rel=preload; as=${as}` : `<${uri}>; rel=preload`).join(", ");
   }
   const { include, exclude, attributes } = preload;
-  const resolveLinks = addAttributes(removeExclude(addInclude(links, include), exclude), attributes);
+  const resolveLinks = addAttributes(dedup(removeExclude(addInclude(links, include), exclude)), attributes);
   return resolveLinks.join(", ");
   function addInclude(links2, include2) {
     var _include;
@@ -100,4 +100,14 @@ export function transformLinks2String(links, preload) {
       return `<${uri}>; rel=preload`;
     });
   }
+  function dedup(links2) {
+    const set = /* @__PURE__ */ new Set();
+    return links2.filter(({ uri }) => {
+      if (set.has(uri)) {
+        return false;
+      }
+      set.add(uri);
+      return true;
+    });
+  }
 }

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

@@ -74,6 +74,7 @@ export class ModernServer {
     if (!matched) {
       return null;
     }
+    res.statusCode = 200;
     const route = matched.generate(context.url);
     const result = await this.handleWeb(context, route);
     if (!result) {

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/yEtXcyFXobiISlvWle5iM/src/type" />
+/// <reference types=".dts-temp/C8PtmgKJWh8V5V1ezLBNG/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/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/yEtXcyFXobiISlvWle5iM/src/type" />
+/// <reference types=".dts-temp/C8PtmgKJWh8V5V1ezLBNG/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.32.2-alpha.1",
+  "version": "2.33.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -74,9 +74,9 @@
     "node-html-parser": "^6.1.5",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/plugin": "2.32.2-alpha.1",
-    "@modern-js/utils": "2.32.2-alpha.1",
-    "@modern-js/server-core": "2.32.2-alpha.1"
+    "@modern-js/plugin": "2.33.0",
+    "@modern-js/server-core": "2.33.0",
+    "@modern-js/utils": "2.33.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -95,10 +95,10 @@
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "ws": "^8.13.0",
-    "@modern-js/server-core": "2.32.2-alpha.1",
-    "@modern-js/types": "2.32.2-alpha.1",
-    "@scripts/build": "2.32.1",
-    "@scripts/jest-config": "2.32.1"
+    "@modern-js/server-core": "2.33.0",
+    "@modern-js/types": "2.33.0",
+    "@scripts/build": "2.33.0",
+    "@scripts/jest-config": "2.33.0"
   },
   "sideEffects": false,
   "publishConfig": {