@modern-js/prod-server 2.33.0 → 2.34.0

package/dist/esm/libs/render/index.js

@@ -3,7 +3,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { cutNameByHyphen, mime } from "@modern-js/utils";
 import { ERROR_DIGEST } from "../../constants";
-import { flushServerHeader, shouldFlushServerHeader } from "../preload";
+import { shouldFlushServerHeader } from "../preload/shouldFlushServerHeader";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
@@ -12,7 +12,7 @@ export var createRenderHandler = function(param) {
   var distDir = param.distDir, staticGenerate = param.staticGenerate, conf = param.conf, forceCSR = param.forceCSR, nonce = param.nonce, ssrRender = param.ssrRender, _param_metaName = param.metaName, metaName = _param_metaName === void 0 ? "modern-js" : _param_metaName;
   return function() {
     var _render = _async_to_generator(function(param2) {
-      var ctx, route, runner, entryPath, urlPath, entry, result, templatePath, content, useCSR, userAgent, disablePreload, ssrRenderOptions, result1, err;
+      var ctx, route, runner, entryPath, urlPath, entry, result, templatePath, content, useCSR, userAgent, disablePreload, flushServerHeader, ssrRenderOptions, result1, err;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -58,29 +58,40 @@ export var createRenderHandler = function(param) {
             if (!(route.isSSR && !useCSR))
               return [
                 3,
-                7
+                9
               ];
             _state.label = 4;
           case 4:
             _state.trys.push([
               4,
-              6,
+              8,
               ,
-              7
+              9
             ]);
             userAgent = ctx.getReqHeader("User-Agent");
             disablePreload = Boolean(ctx.headers["x-".concat(cutNameByHyphen(metaName), "-disable-preload")]);
-            if (shouldFlushServerHeader(conf.server, userAgent, disablePreload)) {
-              flushServerHeader({
-                serverConf: conf.server,
-                ctx: ctx,
-                distDir: distDir,
-                template: content.toString(),
-                headers: {
-                  "Content-Type": mime.contentType(path.extname(templatePath))
-                }
-              });
-            }
+            if (!shouldFlushServerHeader(conf.server, userAgent, disablePreload))
+              return [
+                3,
+                6
+              ];
+            return [
+              4,
+              import("../preload")
+            ];
+          case 5:
+            flushServerHeader = _state.sent().flushServerHeader;
+            flushServerHeader({
+              serverConf: conf.server,
+              ctx: ctx,
+              distDir: distDir,
+              template: content.toString(),
+              headers: {
+                "Content-Type": mime.contentType(path.extname(templatePath))
+              }
+            });
+            _state.label = 6;
+          case 6:
             ssrRenderOptions = {
               distDir: distDir,
               entryName: route.entryName,
@@ -102,21 +113,21 @@ export var createRenderHandler = function(param) {
                 nonce: nonce
               }, runner)
             ];
-          case 5:
+          case 7:
             result1 = _state.sent();
             return [
               2,
               result1
             ];
-          case 6:
+          case 8:
             err = _state.sent();
             ctx.error(ERROR_DIGEST.ERENDER, err.stack || err.message);
             ctx.res.set("x-modern-ssr-fallback", "1");
             return [
               3,
-              7
+              9
             ];
-          case 7:
+          case 9:
             return [
               2,
               {

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

@@ -1,28 +1,5 @@
 import { parseLinks } from "./parseLinks";
 import { transformLinks2String } from "./transformLinks2String";
-export function transformToRegExp(input) {
-  if (typeof input === "string") {
-    return new RegExp(input);
-  }
-  return input;
-}
-export function shouldFlushServerHeader(serverConf, userAgent, disablePreload) {
-  const { ssr: ssrConf } = serverConf || {};
-  if (disablePreload) {
-    return false;
-  }
-  if (typeof ssrConf === "object" && ssrConf.preload) {
-    if (typeof ssrConf.preload === "object") {
-      const { userAgentFilter } = ssrConf.preload;
-      if (userAgentFilter && userAgent) {
-        return !transformToRegExp(userAgentFilter).test(userAgent);
-      }
-      return true;
-    }
-    return true;
-  }
-  return false;
-}
 export async function flushServerHeader({ serverConf, ctx, distDir, template, headers }) {
   const { ssr: ssrConf } = serverConf || {};
   if (typeof ssrConf !== "object") {

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

@@ -0,0 +1,23 @@
+export function transformToRegExp(input) {
+  if (typeof input === "string") {
+    return new RegExp(input);
+  }
+  return input;
+}
+export function shouldFlushServerHeader(serverConf, userAgent, disablePreload) {
+  const { ssr: ssrConf } = serverConf || {};
+  if (disablePreload) {
+    return false;
+  }
+  if (typeof ssrConf === "object" && ssrConf.preload) {
+    if (typeof ssrConf.preload === "object") {
+      const { userAgentFilter } = ssrConf.preload;
+      if (userAgentFilter && userAgent) {
+        return !transformToRegExp(userAgentFilter).test(userAgent);
+      }
+      return true;
+    }
+    return true;
+  }
+  return false;
+}

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

@@ -1,113 +1,124 @@
-import { transformToRegExp } from "./flushServerHeader";
+import { transformToRegExp } from "./shouldFlushServerHeader";
 export function transformLinks2String(links, preload) {
   if (typeof preload === "boolean") {
-    return dedup(links).map(({ uri, as }) => as ? `<${uri}>; rel=preload; as=${as}` : `<${uri}>; rel=preload`).join(", ");
+    return transformLinkToString(dedup(links));
   }
   const { include, exclude, attributes } = preload;
-  const resolveLinks = addAttributes(dedup(removeExclude(addInclude(links, include), exclude)), attributes);
-  return resolveLinks.join(", ");
-  function addInclude(links2, include2) {
-    var _include;
-    const images = [
-      "gif",
-      "jpg",
-      "jpeg",
-      "png",
-      "webp",
-      "bmp",
-      "tiff",
-      "anpg",
-      "ico"
-    ];
-    const videos = [
-      "mp4",
-      "webm",
-      "ogm",
-      "ogv",
-      "ogg"
-    ];
-    const fonts = [
-      "woff",
-      "woff2",
-      "eot",
-      "ttf",
-      "otf"
-    ];
-    const includes = ((_include = include2) === null || _include === void 0 ? void 0 : _include.map((item) => {
-      if (typeof item === "string") {
-        const type = (() => {
-          if (item.endsWith(".js")) {
-            return "script";
-          }
-          if (item.endsWith(".css")) {
-            return "style";
-          }
-          if (images.some((image) => item.endsWith(`.${image}`))) {
-            return "image";
-          }
-          if (videos.some((video) => item.endsWith(`.${video}`))) {
-            return "video";
-          }
-          if (fonts.some((font) => item.endsWith(`.${font}`))) {
-            return "font";
-          }
-        })();
-        return {
-          uri: item,
-          as: type
-        };
-      }
+  const resolveLinks = transformLinkToString(addAttributes(dedup(removeExclude(addInclude(links, include), exclude)), attributes));
+  return resolveLinks;
+}
+function addInclude(links, include) {
+  var _include;
+  const images = [
+    "gif",
+    "jpg",
+    "jpeg",
+    "png",
+    "webp",
+    "bmp",
+    "tiff",
+    "anpg",
+    "ico"
+  ];
+  const videos = [
+    "mp4",
+    "webm",
+    "ogm",
+    "ogv",
+    "ogg"
+  ];
+  const fonts = [
+    "woff",
+    "woff2",
+    "eot",
+    "ttf",
+    "otf"
+  ];
+  const includes = ((_include = include) === null || _include === void 0 ? void 0 : _include.map((item) => {
+    if (typeof item === "string") {
+      const type = (() => {
+        if (item.endsWith(".js")) {
+          return "script";
+        }
+        if (item.endsWith(".css")) {
+          return "style";
+        }
+        if (images.some((image) => item.endsWith(`.${image}`))) {
+          return "image";
+        }
+        if (videos.some((video) => item.endsWith(`.${video}`))) {
+          return "video";
+        }
+        if (fonts.some((font) => item.endsWith(`.${font}`))) {
+          return "font";
+        }
+      })();
       return {
-        uri: item.url,
-        as: item.type
+        uri: item,
+        as: type
       };
-    })) || [];
-    return links2.concat(includes);
-  }
-  function removeExclude(links2, exclude2) {
-    return exclude2 ? links2.filter(({ uri }) => !transformToRegExp(exclude2).test(uri)) : links2;
-  }
-  function addAttributes(links2, attributes2) {
-    const parseAttributes = (_attributes) => {
-      return Object.entries(_attributes || {}).reduce((results, [key, value]) => {
-        if (typeof value === "boolean") {
-          value && results.push(`; ${key}`);
-          return results;
-        }
-        results.push(`; ${key}=${value}`);
-        return results;
-      }, []).join("");
+    }
+    return {
+      uri: item.url,
+      as: item.as,
+      rel: item.rel
     };
-    return links2.map(({ uri, as }) => {
-      if (as) {
-        const attributesStr = (() => {
-          const { style, script, image, font } = attributes2 || {};
-          switch (as) {
-            case "script":
-              return parseAttributes(script);
-            case "style":
-              return parseAttributes(style);
-            case "image":
-              return parseAttributes(image);
-            case "font":
-              return parseAttributes(font);
-            default:
-              return "";
-          }
-        })();
-        return `<${uri}>; rel=preload; as=${as}${attributesStr}`;
-      }
-      return `<${uri}>; rel=preload`;
-    });
-  }
-  function dedup(links2) {
-    const set = /* @__PURE__ */ new Set();
-    return links2.filter(({ uri }) => {
-      if (set.has(uri)) {
-        return false;
+  })) || [];
+  return links.concat(includes);
+}
+function removeExclude(links, exclude) {
+  return exclude ? links.filter(({ uri }) => !transformToRegExp(exclude).test(uri)) : links;
+}
+function addAttributes(links, attributes) {
+  const parseAttributes = (_attributes) => {
+    return Object.entries(_attributes || {}).reduce((results, [key, value]) => {
+      if (typeof value === "boolean") {
+        value && results.push(`; ${key}`);
+        return results;
       }
-      set.add(uri);
-      return true;
-    });
-  }
+      results.push(`; ${key}=${value}`);
+      return results;
+    }, []).join("");
+  };
+  return links.map((link) => {
+    const { as } = link;
+    if (as) {
+      const attributesStr = (() => {
+        const { style, script, image, font } = attributes || {};
+        switch (as) {
+          case "script":
+            return parseAttributes(script);
+          case "style":
+            return parseAttributes(style);
+          case "image":
+            return parseAttributes(image);
+          case "font":
+            return parseAttributes(font);
+          default:
+            return "";
+        }
+      })();
+      return {
+        ...link,
+        rest: attributesStr
+      };
+    }
+    return link;
+  });
+}
+function dedup(links) {
+  const set = /* @__PURE__ */ new Set();
+  return links.filter(({ uri }) => {
+    if (set.has(uri)) {
+      return false;
+    }
+    set.add(uri);
+    return true;
+  });
+}
+function transformLinkToString(links) {
+  return links.map(({ uri, as, rel: originalRel, rest }) => {
+    const rel = originalRel || "preload";
+    return as ? `<${uri}>; rel=${rel}; as=${as}${rest || ""}` : `<${uri}>; rel=${rel}${rest || ""}`;
+  }).join(", ");
 }

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

@@ -1,7 +1,7 @@
 import path from "path";
 import { cutNameByHyphen, mime } from "@modern-js/utils";
 import { ERROR_DIGEST } from "../../constants";
-import { flushServerHeader, shouldFlushServerHeader } from "../preload";
+import { shouldFlushServerHeader } from "../preload/shouldFlushServerHeader";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
@@ -27,6 +27,7 @@ export const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, n
       const userAgent = ctx.getReqHeader("User-Agent");
       const disablePreload = Boolean(ctx.headers[`x-${cutNameByHyphen(metaName)}-disable-preload`]);
       if (shouldFlushServerHeader(conf.server, userAgent, disablePreload)) {
+        const { flushServerHeader } = await import("../preload");
         flushServerHeader({
           serverConf: conf.server,
           ctx,

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/C8PtmgKJWh8V5V1ezLBNG/src/type" />
+/// <reference types=".dts-temp/ASqVe7K5k9dk3xex6qada/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/libs/preload/flushServerHeader.d.ts

@@ -2,8 +2,6 @@
 import { OutgoingHttpHeaders } from 'http';
 import { ServerOptions } from '@modern-js/server-core';
 import { ModernServerContext } from '@modern-js/types';
-export declare function transformToRegExp(input: string | RegExp): RegExp;
-export declare function shouldFlushServerHeader(serverConf: ServerOptions['server'], userAgent?: string, disablePreload?: boolean): boolean;
 export interface FlushServerHeaderOptions {
   ctx: ModernServerContext;
   distDir: string;

package/dist/types/libs/preload/parseLinks.d.ts

@@ -1,6 +1,9 @@
 export interface Link {
   uri: string;
+  rel?: string;
   as?: 'script' | 'style' | 'image' | 'video' | 'font' | string;
+  /** rest str(like attributes) that need add to link */
+  rest?: string;
 }
 export interface ParseLinksOptions {
   distDir: string;

package/dist/types/libs/preload/shouldFlushServerHeader.d.ts

@@ -0,0 +1,3 @@
+import type { ServerOptions } from '@modern-js/server-core';
+export declare function transformToRegExp(input: string | RegExp): RegExp;
+export declare function shouldFlushServerHeader(serverConf: ServerOptions['server'], userAgent?: string, disablePreload?: boolean): boolean;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/C8PtmgKJWh8V5V1ezLBNG/src/type" />
+/// <reference types=".dts-temp/ASqVe7K5k9dk3xex6qada/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.33.0",
+  "version": "2.34.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.33.0",
-    "@modern-js/server-core": "2.33.0",
-    "@modern-js/utils": "2.33.0"
+    "@modern-js/plugin": "2.34.0",
+    "@modern-js/server-core": "2.34.0",
+    "@modern-js/utils": "2.34.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.33.0",
-    "@modern-js/types": "2.33.0",
-    "@scripts/build": "2.33.0",
-    "@scripts/jest-config": "2.33.0"
+    "@modern-js/server-core": "2.34.0",
+    "@modern-js/types": "2.34.0",
+    "@scripts/build": "2.34.0",
+    "@scripts/jest-config": "2.34.0"
   },
   "sideEffects": false,
   "publishConfig": {