@modern-js/runtime 3.3.0 → 3.5.0

package/dist/cjs/core/server/stream/beforeTemplate.js

@@ -86,7 +86,7 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
             if (asyncEntry) matchedRouteManifests?.push(asyncEntry);
             const cssChunks = matchedRouteManifests ? matchedRouteManifests?.reduce((chunks, routeManifest)=>{
                 const { referenceCssAssets = [] } = routeManifest;
-                const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !template.includes(asset));
+                const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !(0, external_utils_js_namespaceObject.hasStylesheetLink)(template, asset));
                 return [
                     ...chunks,
                     ..._cssChunks

package/dist/cjs/core/server/stream/createReadableStream.js

@@ -92,12 +92,14 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                             try {
                                 if (shellChunkStatus !== external_shared_js_namespaceObject.ShellChunkStatus.FINISH) {
                                     chunkVec.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-                                    const chunkStr = chunk.toString('utf-8');
-                                    if (chunkStr.includes(external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK)) {
-                                        let concatedChunk = Buffer.concat(chunkVec).toString('utf-8');
-                                        concatedChunk = concatedChunk.replace(external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK, '');
+                                    const concatedChunk = Buffer.concat(chunkVec).toString('utf-8');
+                                    const markerIndex = concatedChunk.indexOf(external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK);
+                                    if (-1 !== markerIndex) {
+                                        const beforeMark = concatedChunk.slice(0, markerIndex);
+                                        const afterMark = concatedChunk.slice(markerIndex + external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK.length);
                                         shellChunkStatus = external_shared_js_namespaceObject.ShellChunkStatus.FINISH;
-                                        this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
+                                        this.push(`${shellBefore}${beforeMark}${shellAfter}`);
+                                        if (afterMark) this.push(afterMark);
                                         if (pendingScripts.length > 0) for (const s of pendingScripts)this.push(s);
                                     }
                                 } else this.push(chunk);

package/dist/cjs/core/server/stream/createReadableStream.worker.js

@@ -107,9 +107,13 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                         if (shellChunkStatus !== external_shared_js_namespaceObject.ShellChunkStatus.FINISH) {
                             chunkVec.push(new TextDecoder().decode(value));
                             const concatedChunk = chunkVec.join('');
-                            if (concatedChunk.includes(external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK)) {
+                            const markerIndex = concatedChunk.indexOf(external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK);
+                            if (-1 !== markerIndex) {
+                                const beforeMark = concatedChunk.slice(0, markerIndex);
+                                const afterMark = concatedChunk.slice(markerIndex + external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK.length);
                                 shellChunkStatus = external_shared_js_namespaceObject.ShellChunkStatus.FINISH;
-                                safeEnqueue((0, external_shared_js_namespaceObject.encodeForWebStream)(`${shellBefore}${concatedChunk.replace(external_common_js_namespaceObject.ESCAPED_SHELL_STREAM_END_MARK, '')}${shellAfter}`));
+                                safeEnqueue((0, external_shared_js_namespaceObject.encodeForWebStream)(`${shellBefore}${beforeMark}${shellAfter}`));
+                                if (afterMark) safeEnqueue((0, external_shared_js_namespaceObject.encodeForWebStream)(afterMark));
                                 flushPendingScripts();
                             }
                         } else safeEnqueue(value);

package/dist/cjs/core/server/string/loadable.js

@@ -116,11 +116,7 @@ class LoadableCollector {
         const { template, chunkSet, config, entryName } = this.options;
         const { inlineStyles } = config;
         const atrributes = (0, external_utils_js_namespaceObject.attributesToString)(this.generateAttributes());
-        const linkRegExp = /<link .*?href="([^"]+)".*?>/g;
-        const matchs = template.matchAll(linkRegExp);
-        const existedLinks = [];
-        for (const match of matchs)existedLinks.push(match[1]);
-        const css = await Promise.all(chunks.filter((chunk)=>!existedLinks.includes(chunk.url) && !this.existsAssets?.includes(chunk.path)).map(async (chunk)=>{
+        const css = await Promise.all(chunks.filter((chunk)=>!(0, external_utils_js_namespaceObject.hasStylesheetLink)(template, chunk.url) && !this.existsAssets?.includes(chunk.path)).map(async (chunk)=>{
             const link = `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
             if ((0, external_utils_js_namespaceObject.checkIsNode)() && checkIsInline(chunk, inlineStyles)) return readAsset(chunk).then((content)=>`<style>${content}</style>`).catch((_)=>link);
             return link;

package/dist/cjs/core/server/utils.js

@@ -32,6 +32,7 @@ __webpack_require__.d(__webpack_exports__, {
     checkIsNode: ()=>checkIsNode,
     getSSRConfigByEntry: ()=>getSSRConfigByEntry,
     getSSRMode: ()=>getSSRMode,
+    hasStylesheetLink: ()=>hasStylesheetLink,
     safeReplace: ()=>safeReplace,
     serializeErrors: ()=>serializeErrors
 });
@@ -73,10 +74,31 @@ function getSSRMode(ssrConfig) {
     const result = ssrConfig?.mode === 'string' ? 'string' : 'stream';
     return result;
 }
+const getLinkAttributes = (linkTag)=>{
+    const attributes = new Map();
+    const attributeRegExp = /([^\s"'<>/=]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+)))?/g;
+    let match;
+    while(match = attributeRegExp.exec(linkTag)){
+        const [, name, doubleQuotedValue, singleQuotedValue, unquotedValue] = match;
+        if ('link' === name.toLowerCase()) continue;
+        attributes.set(name.toLowerCase(), doubleQuotedValue ?? singleQuotedValue ?? unquotedValue ?? '');
+    }
+    return attributes;
+};
+const hasStylesheetLink = (template, href)=>{
+    const linkTags = template.match(/<link\b[^>]*>/gi) ?? [];
+    return linkTags.some((linkTag)=>{
+        const attributes = getLinkAttributes(linkTag);
+        const linkHref = attributes.get('href');
+        const rel = attributes.get('rel');
+        return linkHref === href && rel?.split(/\s+/).some((relToken)=>'stylesheet' === relToken.toLowerCase());
+    });
+};
 exports.attributesToString = __webpack_exports__.attributesToString;
 exports.checkIsNode = __webpack_exports__.checkIsNode;
 exports.getSSRConfigByEntry = __webpack_exports__.getSSRConfigByEntry;
 exports.getSSRMode = __webpack_exports__.getSSRMode;
+exports.hasStylesheetLink = __webpack_exports__.hasStylesheetLink;
 exports.safeReplace = __webpack_exports__.safeReplace;
 exports.serializeErrors = __webpack_exports__.serializeErrors;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
@@ -84,6 +106,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "checkIsNode",
     "getSSRConfigByEntry",
     "getSSRMode",
+    "hasStylesheetLink",
     "safeReplace",
     "serializeErrors"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/document/cli/index.js

@@ -340,12 +340,13 @@ const documentPlugin = ()=>({
                 processedHtml = processCommentPlaceholders(processedHtml);
                 return `<!DOCTYPE html>${processedHtml}`.replace(external_constants_js_namespaceObject.DOCUMENT_META_PLACEHOLDER, ()=>metas).replace(external_constants_js_namespaceObject.DOCUMENT_SSR_PLACEHOLDER, ()=>external_constants_js_namespaceObject.HTML_SEPARATOR).replace(external_constants_js_namespaceObject.DOCUMENT_SCRIPTS_PLACEHOLDER, ()=>scripts).replace(external_constants_js_namespaceObject.DOCUMENT_LINKS_PLACEHOLDER, ()=>links).replace(external_constants_js_namespaceObject.DOCUMENT_CHUNKSMAP_PLACEHOLDER, ()=>external_constants_js_namespaceObject.PLACEHOLDER_REPLACER_MAP[external_constants_js_namespaceObject.DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(external_constants_js_namespaceObject.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, ()=>external_constants_js_namespaceObject.PLACEHOLDER_REPLACER_MAP[external_constants_js_namespaceObject.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(external_constants_js_namespaceObject.DOCUMENT_TITLE_PLACEHOLDER, ()=>titles);
             };
-            const documentEntry = (entryName, templateParameters)=>{
+            const documentEntry = (entryName)=>{
                 const { entrypoints, internalDirectory, appDirectory } = api.getAppContext();
                 const documentFilePath = getDocumentByEntryName(entrypoints, entryName, appDirectory);
                 if (!documentFilePath) return null;
                 return async (templateData)=>{
                     const config = api.getNormalizedConfig();
+                    const { compilation: _compilation, htmlPlugin, rspackConfig: _rspackConfig, ...templateParameters } = templateData;
                     const documentParams = getDocParams({
                         config: config,
                         entryName,
@@ -363,7 +364,6 @@ const documentPlugin = ()=>({
                     debug("entry %s's document jsx rendered html: %o", entryName, html);
                     const { partialsByEntrypoint } = api.getAppContext();
                     html = processPartials(html, entryName, partialsByEntrypoint || {});
-                    const htmlPlugin = templateData.htmlPlugin || templateData.htmlWebpackPlugin || templateData.htmlRspackPlugin;
                     if (!htmlPlugin) throw new Error('Failed to get HTML plugin tags from template parameters.');
                     const { scripts, links, metas, titles } = extractHtmlTags(htmlPlugin, templateParameters);
                     return processPlaceholders(html, config, scripts, links, metas, titles);
@@ -375,10 +375,7 @@ const documentPlugin = ()=>({
                 return {
                     tools: {
                         htmlPlugin: (options, entry)=>{
-                            const hackParameters = 'function' == typeof options?.templateParameters ? options?.templateParameters({}, {}, {}, {}) : {
-                                ...options?.templateParameters
-                            };
-                            const templateContent = documentEntry(entry.entryName, hackParameters);
+                            const templateContent = documentEntry(entry.entryName);
                             const documentHtmlOptions = templateContent ? {
                                 templateContent,
                                 inject: false

package/dist/esm/core/server/stream/beforeTemplate.mjs

@@ -3,7 +3,7 @@ import react_helmet from "react-helmet";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants.mjs";
 import { createReplaceHelemt } from "../helmet.mjs";
 import { buildHtml } from "../shared.mjs";
-import { checkIsNode, safeReplace } from "../utils.mjs";
+import { checkIsNode, hasStylesheetLink, safeReplace } from "../utils.mjs";
 const readAsset = async (chunk)=>{
     const fs = await import("fs/promises");
     const path = await import("path");
@@ -44,7 +44,7 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
             if (asyncEntry) matchedRouteManifests?.push(asyncEntry);
             const cssChunks = matchedRouteManifests ? matchedRouteManifests?.reduce((chunks, routeManifest)=>{
                 const { referenceCssAssets = [] } = routeManifest;
-                const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !template.includes(asset));
+                const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !hasStylesheetLink(template, asset));
                 return [
                     ...chunks,
                     ..._cssChunks

package/dist/esm/core/server/stream/createReadableStream.mjs

@@ -60,12 +60,14 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                             try {
                                 if (shellChunkStatus !== ShellChunkStatus.FINISH) {
                                     chunkVec.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-                                    const chunkStr = chunk.toString('utf-8');
-                                    if (chunkStr.includes(ESCAPED_SHELL_STREAM_END_MARK)) {
-                                        let concatedChunk = Buffer.concat(chunkVec).toString('utf-8');
-                                        concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, '');
+                                    const concatedChunk = Buffer.concat(chunkVec).toString('utf-8');
+                                    const markerIndex = concatedChunk.indexOf(ESCAPED_SHELL_STREAM_END_MARK);
+                                    if (-1 !== markerIndex) {
+                                        const beforeMark = concatedChunk.slice(0, markerIndex);
+                                        const afterMark = concatedChunk.slice(markerIndex + ESCAPED_SHELL_STREAM_END_MARK.length);
                                         shellChunkStatus = ShellChunkStatus.FINISH;
-                                        this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
+                                        this.push(`${shellBefore}${beforeMark}${shellAfter}`);
+                                        if (afterMark) this.push(afterMark);
                                         if (pendingScripts.length > 0) for (const s of pendingScripts)this.push(s);
                                     }
                                 } else this.push(chunk);

package/dist/esm/core/server/stream/createReadableStream.worker.mjs

@@ -75,9 +75,13 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                         if (shellChunkStatus !== ShellChunkStatus.FINISH) {
                             chunkVec.push(new TextDecoder().decode(value));
                             const concatedChunk = chunkVec.join('');
-                            if (concatedChunk.includes(ESCAPED_SHELL_STREAM_END_MARK)) {
+                            const markerIndex = concatedChunk.indexOf(ESCAPED_SHELL_STREAM_END_MARK);
+                            if (-1 !== markerIndex) {
+                                const beforeMark = concatedChunk.slice(0, markerIndex);
+                                const afterMark = concatedChunk.slice(markerIndex + ESCAPED_SHELL_STREAM_END_MARK.length);
                                 shellChunkStatus = ShellChunkStatus.FINISH;
-                                safeEnqueue(encodeForWebStream(`${shellBefore}${concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, '')}${shellAfter}`));
+                                safeEnqueue(encodeForWebStream(`${shellBefore}${beforeMark}${shellAfter}`));
+                                if (afterMark) safeEnqueue(encodeForWebStream(afterMark));
                                 flushPendingScripts();
                             }
                         } else safeEnqueue(value);

package/dist/esm/core/server/string/loadable.mjs

@@ -1,5 +1,5 @@
 import { ChunkExtractor } from "@loadable/server";
-import { attributesToString, checkIsNode } from "../utils.mjs";
+import { attributesToString, checkIsNode, hasStylesheetLink } from "../utils.mjs";
 const extname = (uri)=>{
     if ('string' != typeof uri || !uri.includes('.')) return '';
     return `.${uri?.split('.').pop()}` || '';
@@ -84,11 +84,7 @@ class LoadableCollector {
         const { template, chunkSet, config, entryName } = this.options;
         const { inlineStyles } = config;
         const atrributes = attributesToString(this.generateAttributes());
-        const linkRegExp = /<link .*?href="([^"]+)".*?>/g;
-        const matchs = template.matchAll(linkRegExp);
-        const existedLinks = [];
-        for (const match of matchs)existedLinks.push(match[1]);
-        const css = await Promise.all(chunks.filter((chunk)=>!existedLinks.includes(chunk.url) && !this.existsAssets?.includes(chunk.path)).map(async (chunk)=>{
+        const css = await Promise.all(chunks.filter((chunk)=>!hasStylesheetLink(template, chunk.url) && !this.existsAssets?.includes(chunk.path)).map(async (chunk)=>{
             const link = `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
             if (checkIsNode() && checkIsInline(chunk, inlineStyles)) return readAsset(chunk).then((content)=>`<style>${content}</style>`).catch((_)=>link);
             return link;

package/dist/esm/core/server/utils.mjs

@@ -36,4 +36,24 @@ function getSSRMode(ssrConfig) {
     const result = ssrConfig?.mode === 'string' ? 'string' : 'stream';
     return result;
 }
-export { attributesToString, checkIsNode, getSSRConfigByEntry, getSSRMode, safeReplace, serializeErrors };
+const getLinkAttributes = (linkTag)=>{
+    const attributes = new Map();
+    const attributeRegExp = /([^\s"'<>/=]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+)))?/g;
+    let match;
+    while(match = attributeRegExp.exec(linkTag)){
+        const [, name, doubleQuotedValue, singleQuotedValue, unquotedValue] = match;
+        if ('link' === name.toLowerCase()) continue;
+        attributes.set(name.toLowerCase(), doubleQuotedValue ?? singleQuotedValue ?? unquotedValue ?? '');
+    }
+    return attributes;
+};
+const hasStylesheetLink = (template, href)=>{
+    const linkTags = template.match(/<link\b[^>]*>/gi) ?? [];
+    return linkTags.some((linkTag)=>{
+        const attributes = getLinkAttributes(linkTag);
+        const linkHref = attributes.get('href');
+        const rel = attributes.get('rel');
+        return linkHref === href && rel?.split(/\s+/).some((relToken)=>'stylesheet' === relToken.toLowerCase());
+    });
+};
+export { attributesToString, checkIsNode, getSSRConfigByEntry, getSSRMode, hasStylesheetLink, safeReplace, serializeErrors };

package/dist/esm/document/cli/index.mjs

@@ -295,12 +295,13 @@ const documentPlugin = ()=>({
                 processedHtml = processCommentPlaceholders(processedHtml);
                 return `<!DOCTYPE html>${processedHtml}`.replace(DOCUMENT_META_PLACEHOLDER, ()=>metas).replace(DOCUMENT_SSR_PLACEHOLDER, ()=>HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, ()=>scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, ()=>links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, ()=>PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, ()=>PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(DOCUMENT_TITLE_PLACEHOLDER, ()=>titles);
             };
-            const documentEntry = (entryName, templateParameters)=>{
+            const documentEntry = (entryName)=>{
                 const { entrypoints, internalDirectory, appDirectory } = api.getAppContext();
                 const documentFilePath = getDocumentByEntryName(entrypoints, entryName, appDirectory);
                 if (!documentFilePath) return null;
                 return async (templateData)=>{
                     const config = api.getNormalizedConfig();
+                    const { compilation: _compilation, htmlPlugin, rspackConfig: _rspackConfig, ...templateParameters } = templateData;
                     const documentParams = getDocParams({
                         config: config,
                         entryName,
@@ -318,7 +319,6 @@ const documentPlugin = ()=>({
                     debug("entry %s's document jsx rendered html: %o", entryName, html);
                     const { partialsByEntrypoint } = api.getAppContext();
                     html = processPartials(html, entryName, partialsByEntrypoint || {});
-                    const htmlPlugin = templateData.htmlPlugin || templateData.htmlWebpackPlugin || templateData.htmlRspackPlugin;
                     if (!htmlPlugin) throw new Error('Failed to get HTML plugin tags from template parameters.');
                     const { scripts, links, metas, titles } = extractHtmlTags(htmlPlugin, templateParameters);
                     return processPlaceholders(html, config, scripts, links, metas, titles);
@@ -330,10 +330,7 @@ const documentPlugin = ()=>({
                 return {
                     tools: {
                         htmlPlugin: (options, entry)=>{
-                            const hackParameters = 'function' == typeof options?.templateParameters ? options?.templateParameters({}, {}, {}, {}) : {
-                                ...options?.templateParameters
-                            };
-                            const templateContent = documentEntry(entry.entryName, hackParameters);
+                            const templateContent = documentEntry(entry.entryName);
                             const documentHtmlOptions = templateContent ? {
                                 templateContent,
                                 inject: false

package/dist/esm-node/core/server/stream/beforeTemplate.mjs

@@ -4,7 +4,7 @@ import react_helmet from "react-helmet";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants.mjs";
 import { createReplaceHelemt } from "../helmet.mjs";
 import { buildHtml } from "../shared.mjs";
-import { checkIsNode, safeReplace } from "../utils.mjs";
+import { checkIsNode, hasStylesheetLink, safeReplace } from "../utils.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
 var beforeTemplate_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
@@ -48,7 +48,7 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
             if (asyncEntry) matchedRouteManifests?.push(asyncEntry);
             const cssChunks = matchedRouteManifests ? matchedRouteManifests?.reduce((chunks, routeManifest)=>{
                 const { referenceCssAssets = [] } = routeManifest;
-                const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !template.includes(asset));
+                const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !hasStylesheetLink(template, asset));
                 return [
                     ...chunks,
                     ..._cssChunks

package/dist/esm-node/core/server/stream/createReadableStream.mjs

@@ -61,12 +61,14 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                             try {
                                 if (shellChunkStatus !== ShellChunkStatus.FINISH) {
                                     chunkVec.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-                                    const chunkStr = chunk.toString('utf-8');
-                                    if (chunkStr.includes(ESCAPED_SHELL_STREAM_END_MARK)) {
-                                        let concatedChunk = Buffer.concat(chunkVec).toString('utf-8');
-                                        concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, '');
+                                    const concatedChunk = Buffer.concat(chunkVec).toString('utf-8');
+                                    const markerIndex = concatedChunk.indexOf(ESCAPED_SHELL_STREAM_END_MARK);
+                                    if (-1 !== markerIndex) {
+                                        const beforeMark = concatedChunk.slice(0, markerIndex);
+                                        const afterMark = concatedChunk.slice(markerIndex + ESCAPED_SHELL_STREAM_END_MARK.length);
                                         shellChunkStatus = ShellChunkStatus.FINISH;
-                                        this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
+                                        this.push(`${shellBefore}${beforeMark}${shellAfter}`);
+                                        if (afterMark) this.push(afterMark);
                                         if (pendingScripts.length > 0) for (const s of pendingScripts)this.push(s);
                                     }
                                 } else this.push(chunk);

package/dist/esm-node/core/server/stream/createReadableStream.worker.mjs

@@ -76,9 +76,13 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                         if (shellChunkStatus !== ShellChunkStatus.FINISH) {
                             chunkVec.push(new TextDecoder().decode(value));
                             const concatedChunk = chunkVec.join('');
-                            if (concatedChunk.includes(ESCAPED_SHELL_STREAM_END_MARK)) {
+                            const markerIndex = concatedChunk.indexOf(ESCAPED_SHELL_STREAM_END_MARK);
+                            if (-1 !== markerIndex) {
+                                const beforeMark = concatedChunk.slice(0, markerIndex);
+                                const afterMark = concatedChunk.slice(markerIndex + ESCAPED_SHELL_STREAM_END_MARK.length);
                                 shellChunkStatus = ShellChunkStatus.FINISH;
-                                safeEnqueue(encodeForWebStream(`${shellBefore}${concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, '')}${shellAfter}`));
+                                safeEnqueue(encodeForWebStream(`${shellBefore}${beforeMark}${shellAfter}`));
+                                if (afterMark) safeEnqueue(encodeForWebStream(afterMark));
                                 flushPendingScripts();
                             }
                         } else safeEnqueue(value);

package/dist/esm-node/core/server/string/loadable.mjs

@@ -1,6 +1,6 @@
 import "node:module";
 import { ChunkExtractor } from "@loadable/server";
-import { attributesToString, checkIsNode } from "../utils.mjs";
+import { attributesToString, checkIsNode, hasStylesheetLink } from "../utils.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
 var loadable_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
@@ -88,11 +88,7 @@ class LoadableCollector {
         const { template, chunkSet, config, entryName } = this.options;
         const { inlineStyles } = config;
         const atrributes = attributesToString(this.generateAttributes());
-        const linkRegExp = /<link .*?href="([^"]+)".*?>/g;
-        const matchs = template.matchAll(linkRegExp);
-        const existedLinks = [];
-        for (const match of matchs)existedLinks.push(match[1]);
-        const css = await Promise.all(chunks.filter((chunk)=>!existedLinks.includes(chunk.url) && !this.existsAssets?.includes(chunk.path)).map(async (chunk)=>{
+        const css = await Promise.all(chunks.filter((chunk)=>!hasStylesheetLink(template, chunk.url) && !this.existsAssets?.includes(chunk.path)).map(async (chunk)=>{
             const link = `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
             if (checkIsNode() && checkIsInline(chunk, inlineStyles)) return readAsset(chunk).then((content)=>`<style>${content}</style>`).catch((_)=>link);
             return link;

package/dist/esm-node/core/server/utils.mjs

@@ -37,4 +37,24 @@ function getSSRMode(ssrConfig) {
     const result = ssrConfig?.mode === 'string' ? 'string' : 'stream';
     return result;
 }
-export { attributesToString, checkIsNode, getSSRConfigByEntry, getSSRMode, safeReplace, serializeErrors };
+const getLinkAttributes = (linkTag)=>{
+    const attributes = new Map();
+    const attributeRegExp = /([^\s"'<>/=]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+)))?/g;
+    let match;
+    while(match = attributeRegExp.exec(linkTag)){
+        const [, name, doubleQuotedValue, singleQuotedValue, unquotedValue] = match;
+        if ('link' === name.toLowerCase()) continue;
+        attributes.set(name.toLowerCase(), doubleQuotedValue ?? singleQuotedValue ?? unquotedValue ?? '');
+    }
+    return attributes;
+};
+const hasStylesheetLink = (template, href)=>{
+    const linkTags = template.match(/<link\b[^>]*>/gi) ?? [];
+    return linkTags.some((linkTag)=>{
+        const attributes = getLinkAttributes(linkTag);
+        const linkHref = attributes.get('href');
+        const rel = attributes.get('rel');
+        return linkHref === href && rel?.split(/\s+/).some((relToken)=>'stylesheet' === relToken.toLowerCase());
+    });
+};
+export { attributesToString, checkIsNode, getSSRConfigByEntry, getSSRMode, hasStylesheetLink, safeReplace, serializeErrors };

package/dist/esm-node/document/cli/index.mjs

@@ -297,12 +297,13 @@ const documentPlugin = ()=>({
                 processedHtml = processCommentPlaceholders(processedHtml);
                 return `<!DOCTYPE html>${processedHtml}`.replace(DOCUMENT_META_PLACEHOLDER, ()=>metas).replace(DOCUMENT_SSR_PLACEHOLDER, ()=>HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, ()=>scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, ()=>links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, ()=>PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, ()=>PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(DOCUMENT_TITLE_PLACEHOLDER, ()=>titles);
             };
-            const documentEntry = (entryName, templateParameters)=>{
+            const documentEntry = (entryName)=>{
                 const { entrypoints, internalDirectory, appDirectory } = api.getAppContext();
                 const documentFilePath = getDocumentByEntryName(entrypoints, entryName, appDirectory);
                 if (!documentFilePath) return null;
                 return async (templateData)=>{
                     const config = api.getNormalizedConfig();
+                    const { compilation: _compilation, htmlPlugin, rspackConfig: _rspackConfig, ...templateParameters } = templateData;
                     const documentParams = getDocParams({
                         config: config,
                         entryName,
@@ -320,7 +321,6 @@ const documentPlugin = ()=>({
                     debug("entry %s's document jsx rendered html: %o", entryName, html);
                     const { partialsByEntrypoint } = api.getAppContext();
                     html = processPartials(html, entryName, partialsByEntrypoint || {});
-                    const htmlPlugin = templateData.htmlPlugin || templateData.htmlWebpackPlugin || templateData.htmlRspackPlugin;
                     if (!htmlPlugin) throw new Error('Failed to get HTML plugin tags from template parameters.');
                     const { scripts, links, metas, titles } = extractHtmlTags(htmlPlugin, templateParameters);
                     return processPlaceholders(html, config, scripts, links, metas, titles);
@@ -332,10 +332,7 @@ const documentPlugin = ()=>({
                 return {
                     tools: {
                         htmlPlugin: (options, entry)=>{
-                            const hackParameters = 'function' == typeof options?.templateParameters ? options?.templateParameters({}, {}, {}, {}) : {
-                                ...options?.templateParameters
-                            };
-                            const templateContent = documentEntry(entry.entryName, hackParameters);
+                            const templateContent = documentEntry(entry.entryName);
                             const documentHtmlOptions = templateContent ? {
                                 templateContent,
                                 inject: false

package/dist/types/core/server/utils.d.ts

@@ -23,3 +23,10 @@ export declare function getSSRConfigByEntry(entryName: string, ssr?: ServerUserC
     loaderFailureMode?: "clientRender" | "errorBoundary";
 };
 export declare function getSSRMode(ssrConfig?: SSRConfig): 'string' | 'stream' | false;
+/**
+ * Whether the template already contains a `<link rel="stylesheet">` for `href`.
+ * Other link rels (e.g. `<link rel="prefetch">` emitted by `performance.prefetch`,
+ * or `<link rel="preload" as="style">`) may reference the same css URL but do not
+ * apply styles, so they must not block stylesheet injection during SSR.
+ */
+export declare const hasStylesheetLink: (template: string, href: string) => boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.3.0",
+  "version": "3.5.0",
   "engines": {
     "node": ">=20"
   },
@@ -203,7 +203,7 @@
   "dependencies": {
     "@loadable/component": "5.16.7",
     "@loadable/server": "5.16.7",
-    "@swc/core": "1.15.40",
+    "@swc/core": "1.15.41",
     "@swc/helpers": "^0.5.17",
     "@swc/plugin-loadable-components": "^11.12.0",
     "@types/loadable__component": "^5.13.10",
@@ -215,12 +215,12 @@
     "isbot": "3.8.0",
     "react-helmet": "^6.1.0",
     "react-is": "^18.3.1",
-    "@modern-js/plugin": "3.3.0",
-    "@modern-js/render": "3.3.0",
-    "@modern-js/plugin-data-loader": "3.3.0",
-    "@modern-js/runtime-utils": "3.3.0",
-    "@modern-js/types": "3.3.0",
-    "@modern-js/utils": "3.3.0"
+    "@modern-js/plugin": "3.5.0",
+    "@modern-js/plugin-data-loader": "3.5.0",
+    "@modern-js/render": "3.5.0",
+    "@modern-js/runtime-utils": "3.5.0",
+    "@modern-js/types": "3.5.0",
+    "@modern-js/utils": "3.5.0"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -228,8 +228,8 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "2.0.10",
-    "@rslib/core": "0.22.0",
+    "@rsbuild/core": "2.1.0",
+    "@rslib/core": "0.23.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/cookie": "0.6.0",
@@ -240,7 +240,7 @@
     "react-dom": "^19.2.7",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/app-tools": "3.3.0",
+    "@modern-js/app-tools": "3.5.0",
     "@modern-js/rslib": "2.68.10",
     "@scripts/rstest-config": "2.66.0"
   },