@modern-js/runtime 2.24.0 → 2.24.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @modern-js/runtime
 
+## 2.24.1
+
+### Patch Changes
+
+- 13354d3356: fix(runtime): ssr link tag add attrs error
+  fix(runtime): ssr link 标签添加错误的属性
+  - @modern-js/plugin@2.24.1
+  - @modern-js/types@2.24.1
+  - @modern-js/utils@2.24.1
+
 ## 2.24.0
 
 ### Patch Changes

package/dist/cjs/ssr/serverRender/renderToString/loadable.js

@@ -9,8 +9,7 @@ Object.defineProperty(exports, "toHtml", {
   }
 });
 const _server = require("@loadable/server");
-const _utils = require("../../utils");
-const _utils1 = require("../utils");
+const _utils = require("../utils");
 const extname = (uri) => {
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
@@ -18,7 +17,7 @@ const extname = (uri) => {
   return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
 };
 const toHtml = (jsx, renderer, next) => {
-  const { stats, result: { chunksMap }, host, config = {}, nonce } = renderer;
+  const { stats, result: { chunksMap }, config = {}, nonce } = renderer;
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
@@ -30,12 +29,12 @@ const toHtml = (jsx, renderer, next) => {
   });
   const html = next(extractor.collectChunks(jsx));
   const chunks = extractor.getChunkAssets(extractor.chunks);
-  chunksMap.js = (chunksMap.js || "") + (0, _utils1.getLoadableScripts)(extractor);
+  chunksMap.js = (chunksMap.js || "") + (0, _utils.getLoadableScripts)(extractor);
   for (const v of chunks) {
     const fileType = extname(v.url).slice(1);
     const attributes = {};
     const { crossorigin, scriptLoading = "defer" } = config;
-    if (crossorigin && (0, _utils.isCrossOrigin)(v.url, host)) {
+    if (crossorigin) {
       attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
     }
     switch (scriptLoading) {
@@ -49,10 +48,11 @@ const toHtml = (jsx, renderer, next) => {
     }
     if (fileType === "js") {
       attributes.nonce = nonce;
-      const attrsStr = (0, _utils1.attributesToString)(attributes);
+      const attrsStr = (0, _utils.attributesToString)(attributes);
       chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
     } else if (fileType === "css") {
-      chunksMap[fileType] += `<link${attributes} href="${v.url}" rel="stylesheet" />`;
+      const attrsStr = (0, _utils.attributesToString)(attributes);
+      chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;
     }
   }
   return html;

package/dist/cjs/ssr/utils.js

@@ -21,9 +21,6 @@ _export(exports, {
   },
   mockResponse: function() {
     return mockResponse;
-  },
-  isCrossOrigin: function() {
-    return isCrossOrigin;
   }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
@@ -75,12 +72,3 @@ const mockResponse = () => {
     }
   };
 };
-const isCrossOrigin = (url = "", base) => {
-  if (url.startsWith("/") || url.startsWith("./")) {
-    return false;
-  } else if (!url.includes(base)) {
-    return true;
-  } else {
-    return false;
-  }
-};

package/dist/esm/ssr/serverRender/renderToString/loadable.js

@@ -1,5 +1,4 @@
 import { ChunkExtractor } from "@loadable/server";
-import { isCrossOrigin } from "../../utils";
 import { attributesToString, getLoadableScripts } from "../utils";
 var extname = function(uri) {
   if (typeof uri !== "string" || !uri.includes(".")) {
@@ -8,7 +7,7 @@ var extname = function(uri) {
   return ".".concat(uri === null || uri === void 0 ? void 0 : uri.split(".").pop()) || "";
 };
 export var toHtml = function(jsx, renderer, next) {
-  var stats = renderer.stats, chunksMap = renderer.result.chunksMap, host = renderer.host, _renderer_config = renderer.config, config = _renderer_config === void 0 ? {} : _renderer_config, nonce = renderer.nonce;
+  var stats = renderer.stats, chunksMap = renderer.result.chunksMap, _renderer_config = renderer.config, config = _renderer_config === void 0 ? {} : _renderer_config, nonce = renderer.nonce;
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
@@ -28,7 +27,7 @@ export var toHtml = function(jsx, renderer, next) {
       var fileType = extname(v.url).slice(1);
       var attributes = {};
       var crossorigin = config.crossorigin, _config_scriptLoading = config.scriptLoading, scriptLoading = _config_scriptLoading === void 0 ? "defer" : _config_scriptLoading;
-      if (crossorigin && isCrossOrigin(v.url, host)) {
+      if (crossorigin) {
         attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
       }
       switch (scriptLoading) {
@@ -45,7 +44,8 @@ export var toHtml = function(jsx, renderer, next) {
         var attrsStr = attributesToString(attributes);
         chunksMap[fileType] += "<script".concat(attrsStr, ' src="').concat(v.url, '"></script>');
       } else if (fileType === "css") {
-        chunksMap[fileType] += "<link".concat(attributes, ' href="').concat(v.url, '" rel="stylesheet" />');
+        var attrsStr1 = attributesToString(attributes);
+        chunksMap[fileType] += "<link".concat(attrsStr1, ' href="').concat(v.url, '" rel="stylesheet" />');
       }
     }
   } catch (err) {

package/dist/esm/ssr/utils.js

@@ -51,13 +51,3 @@ export var mockResponse = function() {
     }
   };
 };
-export var isCrossOrigin = function() {
-  var url = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", base = arguments.length > 1 ? arguments[1] : void 0;
-  if (url.startsWith("/") || url.startsWith("./")) {
-    return false;
-  } else if (!url.includes(base)) {
-    return true;
-  } else {
-    return false;
-  }
-};

package/dist/esm-node/ssr/serverRender/renderToString/loadable.js

@@ -1,5 +1,4 @@
 import { ChunkExtractor } from "@loadable/server";
-import { isCrossOrigin } from "../../utils";
 import { attributesToString, getLoadableScripts } from "../utils";
 const extname = (uri) => {
   if (typeof uri !== "string" || !uri.includes(".")) {
@@ -8,7 +7,7 @@ const extname = (uri) => {
   return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
 };
 export const toHtml = (jsx, renderer, next) => {
-  const { stats, result: { chunksMap }, host, config = {}, nonce } = renderer;
+  const { stats, result: { chunksMap }, config = {}, nonce } = renderer;
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
@@ -25,7 +24,7 @@ export const toHtml = (jsx, renderer, next) => {
     const fileType = extname(v.url).slice(1);
     const attributes = {};
     const { crossorigin, scriptLoading = "defer" } = config;
-    if (crossorigin && isCrossOrigin(v.url, host)) {
+    if (crossorigin) {
       attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
     }
     switch (scriptLoading) {
@@ -42,7 +41,8 @@ export const toHtml = (jsx, renderer, next) => {
       const attrsStr = attributesToString(attributes);
       chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
     } else if (fileType === "css") {
-      chunksMap[fileType] += `<link${attributes} href="${v.url}" rel="stylesheet" />`;
+      const attrsStr = attributesToString(attributes);
+      chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;
     }
   }
   return html;

package/dist/esm-node/ssr/utils.js

@@ -46,12 +46,3 @@ export const mockResponse = () => {
     }
   };
 };
-export const isCrossOrigin = (url = "", base) => {
-  if (url.startsWith("/") || url.startsWith("./")) {
-    return false;
-  } else if (!url.includes(base)) {
-    return true;
-  } else {
-    return false;
-  }
-};

package/dist/types/ssr/utils.d.ts

@@ -7,5 +7,4 @@ export declare const mockResponse: () => {
   setHeader(): void;
   status(): void;
   readonly locals: {};
-};
-export declare const isCrossOrigin: (url: string | undefined, base: string) => boolean;
+};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.24.0",
+  "version": "2.24.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -169,9 +169,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.24.0",
-    "@modern-js/utils": "2.24.0",
-    "@modern-js/types": "2.24.0"
+    "@modern-js/types": "2.24.1",
+    "@modern-js/utils": "2.24.1",
+    "@modern-js/plugin": "2.24.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -192,11 +192,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.82.1",
-    "@modern-js/app-tools": "2.24.0",
-    "@modern-js/core": "2.24.0",
-    "@modern-js/server-core": "2.24.0",
-    "@scripts/build": "2.24.0",
-    "@scripts/jest-config": "2.24.0"
+    "@modern-js/core": "2.24.1",
+    "@modern-js/server-core": "2.24.1",
+    "@modern-js/app-tools": "2.24.1",
+    "@scripts/build": "2.24.1",
+    "@scripts/jest-config": "2.24.1"
   },
   "sideEffects": false,
   "modernConfig": {},