@modern-js/prod-server 2.33.0 → 2.34.0

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

@@ -2,49 +2,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  transformToRegExp: function() {
-    return transformToRegExp;
-  },
-  shouldFlushServerHeader: function() {
-    return shouldFlushServerHeader;
-  },
-  flushServerHeader: function() {
+Object.defineProperty(exports, "flushServerHeader", {
+  enumerable: true,
+  get: function() {
     return flushServerHeader;
   }
 });
 const _parseLinks = require("./parseLinks");
 const _transformLinks2String = require("./transformLinks2String");
-function transformToRegExp(input) {
-  if (typeof input === "string") {
-    return new RegExp(input);
-  }
-  return input;
-}
-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;
-}
 async function flushServerHeader({ serverConf, ctx, distDir, template, headers }) {
   const { ssr: ssrConf } = serverConf || {};
   if (typeof ssrConf !== "object") {

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

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  transformToRegExp: function() {
+    return transformToRegExp;
+  },
+  shouldFlushServerHeader: function() {
+    return shouldFlushServerHeader;
+  }
+});
+function transformToRegExp(input) {
+  if (typeof input === "string") {
+    return new RegExp(input);
+  }
+  return input;
+}
+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/cjs/libs/preload/transformLinks2String.js

@@ -8,116 +8,127 @@ Object.defineProperty(exports, "transformLinks2String", {
     return transformLinks2String;
   }
 });
-const _flushServerHeader = require("./flushServerHeader");
+const _shouldFlushServerHeader = require("./shouldFlushServerHeader");
 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 }) => !(0, _flushServerHeader.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 }) => !(0, _shouldFlushServerHeader.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/cjs/libs/render/index.js

@@ -13,7 +13,7 @@ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildc
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const _constants = require("../../constants");
-const _preload = require("../preload");
+const _shouldFlushServerHeader = require("../preload/shouldFlushServerHeader");
 const _static = require("./static");
 const _reader = require("./reader");
 const _ssr = /* @__PURE__ */ _interop_require_wildcard._(require("./ssr"));
@@ -38,8 +38,9 @@ const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, s
     try {
       const userAgent = ctx.getReqHeader("User-Agent");
       const disablePreload = Boolean(ctx.headers[`x-${(0, _utils.cutNameByHyphen)(metaName)}-disable-preload`]);
-      if ((0, _preload.shouldFlushServerHeader)(conf.server, userAgent, disablePreload)) {
-        (0, _preload.flushServerHeader)({
+      if ((0, _shouldFlushServerHeader.shouldFlushServerHeader)(conf.server, userAgent, disablePreload)) {
+        const { flushServerHeader } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../preload")));
+        flushServerHeader({
           serverConf: conf.server,
           ctx,
           distDir,

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

@@ -2,29 +2,6 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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) {
-  var _ref = serverConf || {}, ssrConf = _ref.ssr;
-  if (disablePreload) {
-    return false;
-  }
-  if (typeof ssrConf === "object" && ssrConf.preload) {
-    if (typeof ssrConf.preload === "object") {
-      var userAgentFilter = ssrConf.preload.userAgentFilter;
-      if (userAgentFilter && userAgent) {
-        return !transformToRegExp(userAgentFilter).test(userAgent);
-      }
-      return true;
-    }
-    return true;
-  }
-  return false;
-}
 export function flushServerHeader(_) {
   return _flushServerHeader.apply(this, arguments);
 }

package/dist/esm/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) {
+  var _ref = serverConf || {}, ssrConf = _ref.ssr;
+  if (disablePreload) {
+    return false;
+  }
+  if (typeof ssrConf === "object" && ssrConf.preload) {
+    if (typeof ssrConf.preload === "object") {
+      var userAgentFilter = ssrConf.preload.userAgentFilter;
+      if (userAgentFilter && userAgent) {
+        return !transformToRegExp(userAgentFilter).test(userAgent);
+      }
+      return true;
+    }
+    return true;
+  }
+  return false;
+}

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

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