@bleedingdev/modern-js-runtime 3.2.0-ultramodern.99 → 3.4.0-ultramodern.1

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

@@ -77,9 +77,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.length > 0) safeEnqueue(encodeForWebStream(afterMark));
                                 flushPendingScripts();
                             }
                         } else safeEnqueue(value);

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

@@ -22,12 +22,15 @@ function isPromiseLike(value) {
     return !!value && 'function' == typeof value.then;
 }
 function toErrorInfo(error) {
+    if ('production' === process.env.NODE_ENV) return {
+        message: 'Unexpected Server Error'
+    };
     if (error && 'object' == typeof error) {
         const maybeMsg = error.message;
         const maybeStack = error.stack;
         return {
             message: 'string' == typeof maybeMsg ? maybeMsg : String(maybeMsg ?? error),
-            stack: 'production' !== process.env.NODE_ENV ? maybeStack : void 0
+            stack: maybeStack
         };
     }
     return {

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

@@ -4,9 +4,9 @@ import server from "react-dom/server";
 import { RenderLevel } from "../../constants.mjs";
 import { getGlobalInternalRuntimeContext } from "../../context/index.mjs";
 import { wrapRuntimeContextProvider } from "../../react/wrapper.mjs";
-import { CHUNK_CSS_PLACEHOLDER, CHUNK_JS_PLACEHOLDER, HTML_PLACEHOLDER, SSR_DATA_PLACEHOLDER } from "../constants.mjs";
+import { CHUNK_CSS_PLACEHOLDER, HTML_PLACEHOLDER, SSR_DATA_PLACEHOLDER } from "../constants.mjs";
 import { createReplaceHelemt, getHelmetData } from "../helmet.mjs";
-import { injectBeforeHydrationEntryScript } from "../scriptOrder.mjs";
+import { replaceChunkJsPlaceholder } from "../scriptOrder.mjs";
 import { buildHtml } from "../shared.mjs";
 import { SSRErrors, SSRTimings } from "../tracer.mjs";
 import { getSSRConfigByEntry, safeReplace } from "../utils.mjs";
@@ -98,13 +98,7 @@ function createReplaceSSRDataScript(data) {
     return (template)=>safeReplace(template, SSR_DATA_PLACEHOLDER, data);
 }
 function createReplaceChunkJs(js, entryName) {
-    return (template)=>{
-        if (!js) return safeReplace(template, CHUNK_JS_PLACEHOLDER, '');
-        const withoutPlaceholder = safeReplace(template, CHUNK_JS_PLACEHOLDER, '');
-        const withEarlyScripts = injectBeforeHydrationEntryScript(withoutPlaceholder, js, entryName);
-        if (withEarlyScripts !== withoutPlaceholder) return withEarlyScripts;
-        return safeReplace(template, CHUNK_JS_PLACEHOLDER, js);
-    };
+    return (template)=>replaceChunkJsPlaceholder(template, js, entryName);
 }
 function createReplaceChunkCss(css) {
     return (template)=>safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);

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

@@ -1,39 +1,21 @@
 import { ChunkExtractor } from "@loadable/server";
-import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
 import { createFederatedCssLinks } from "../federatedCss.mjs";
-import { attributesToString, checkIsNode } from "../utils.mjs";
+import { getMatchedRouteAssets, orderHydrationScriptChunks } from "../scriptOrder.mjs";
+import { attributesToString, checkIsNode, hasStylesheetLink } from "../utils.mjs";
 const extname = (uri)=>{
     if ('string' != typeof uri || !uri.includes('.')) return '';
     return `.${uri?.split('.').pop()}` || '';
 };
 const generateChunks = (chunks, ext)=>chunks.filter((chunk)=>Boolean(chunk.url)).filter((chunk)=>extname(chunk.url).slice(1) === ext);
-const dedupeChunksByUrl = (chunks)=>{
-    const seen = new Set();
-    return chunks.filter((chunk)=>{
-        if (!chunk.url || seen.has(chunk.url)) return false;
-        seen.add(chunk.url);
-        return true;
+const routeAssetToChunk = (asset)=>({
+        chunk: asset,
+        filename: asset.replace(/^\//, ''),
+        linkType: 'preload',
+        path: asset,
+        scriptType: asset.endsWith('.css') ? 'style' : "script",
+        type: 'routeAsset',
+        url: asset
     });
-};
-const isAsyncEntryScriptChunk = (chunk, entryName)=>{
-    if (!chunk.url?.endsWith('.js')) return false;
-    const asyncEntryName = `async-${entryName}`;
-    const filename = chunk.filename || chunk.url;
-    const basename = filename.split('/').pop() || filename;
-    return basename === `${asyncEntryName}.js` || basename.startsWith(`${asyncEntryName}.`) || basename.startsWith(`${asyncEntryName}-`);
-};
-const orderHydrationScriptChunks = ({ asyncEntryChunks, collectedChunks, matchedRouteChunks, entryName })=>{
-    const asyncEntryScriptChunks = [];
-    const asyncEntryDependencyChunks = [];
-    for (const chunk of asyncEntryChunks)if (isAsyncEntryScriptChunk(chunk, entryName)) asyncEntryScriptChunks.push(chunk);
-    else asyncEntryDependencyChunks.push(chunk);
-    return dedupeChunksByUrl([
-        ...asyncEntryDependencyChunks,
-        ...collectedChunks,
-        ...matchedRouteChunks,
-        ...asyncEntryScriptChunks
-    ]);
-};
 const checkIsInline = (chunk, enableInline)=>{
     if ('production' !== process.env.NODE_ENV) return false;
     if (enableInline instanceof RegExp) return enableInline.test(chunk.url);
@@ -52,17 +34,8 @@ class LoadableCollector {
     }
     getMatchedRouteChunks() {
         const { routeManifest, runtimeContext } = this.options;
-        const routeAssets = routeManifest?.routeAssets;
-        if (!routeAssets) return [];
-        const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
-        return matchedRouteIds.flatMap((routeId)=>{
-            const routeAsset = routeAssets[routeId];
-            return (routeAsset?.assets ?? []).map((asset)=>({
-                    filename: asset.replace(/^\//, ''),
-                    path: asset,
-                    url: asset
-                }));
-        });
+        if (!routeManifest) return [];
+        return getMatchedRouteAssets(runtimeContext, routeManifest).map(routeAssetToChunk);
     }
     collect(comopnent) {
         const { stats, entryName } = this.options;
@@ -136,11 +109,7 @@ class LoadableCollector {
         const { template, chunkSet, config, moduleFederationCssAssets } = 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 emittedChunks = chunks.filter((chunk)=>!existedLinks.includes(chunk.url) && !this.existsAssets?.includes(chunk.path));
+        const emittedChunks = chunks.filter((chunk)=>!hasStylesheetLink(template, chunk.url) && !this.existsAssets?.includes(chunk.path));
         const css = await Promise.all(emittedChunks.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);
@@ -150,10 +119,7 @@ class LoadableCollector {
         chunkSet.cssChunk += createFederatedCssLinks(moduleFederationCssAssets, {
             template,
             attributes: this.generateAttributes(),
-            existingAssets: [
-                ...existedLinks,
-                ...emittedChunks.map((chunk)=>chunk.url)
-            ]
+            existingAssets: emittedChunks.map((chunk)=>chunk.url)
         });
     }
     generateAttributes(extraAtr = {}) {

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

@@ -1,5 +1,5 @@
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import { getRouterHydrationScripts } from "../../../router/runtime/lifecycle.mjs";
+import { getRouterHydrationScripts, getRouterServerSnapshot } from "../../../router/runtime/lifecycle.mjs";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../../constants.mjs";
 import { attributesToString, serializeErrors } from "../utils.mjs";
 function _check_private_redeclaration(obj, privateCollection) {
@@ -89,7 +89,7 @@ function getSSRData() {
 }
 function getRouterData() {
     const { routerContext, runtimeContext } = _class_private_field_get(this, _options);
-    const snapshotRouterData = runtimeContext.routerServerSnapshot?.routerData;
+    const snapshotRouterData = getRouterServerSnapshot(runtimeContext)?.routerData;
     if (snapshotRouterData) return {
         loaderData: snapshotRouterData.loaderData,
         errors: serializeErrors(snapshotRouterData.errors || null)

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

@@ -12,17 +12,40 @@ function serializeErrors(errors) {
     if (!errors) return null;
     const entries = Object.entries(errors);
     const serialized = {};
-    for (const [key, val] of entries)if (isRouteErrorResponse(val)) serialized[key] = {
-        ...val,
-        __type: 'RouteErrorResponse'
+    for (const [key, val] of entries)if (isRouteErrorResponse(val)) serialized[key] = serializeRouteErrorResponse(val);
+    else if (val instanceof Error) serialized[key] = serializeError(val);
+    else serialized[key] = val;
+    return serialized;
+}
+function shouldRedactServerError() {
+    return 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
+}
+function serializeError(error) {
+    if (shouldRedactServerError()) return {
+        message: 'Unexpected Server Error',
+        stack: void 0,
+        __type: 'Error'
     };
-    else if (val instanceof Error) serialized[key] = {
-        message: val.message,
-        stack: val.stack,
+    return {
+        message: error.message,
+        stack: error.stack,
         __type: 'Error'
     };
-    else serialized[key] = val;
-    return serialized;
+}
+function serializeRouteErrorResponse(error) {
+    if (!isRouteErrorResponse(error)) return error;
+    if (error.status >= 500 && shouldRedactServerError()) return {
+        status: error.status,
+        statusText: 'Internal Server Error',
+        data: 'Unexpected Server Error',
+        __type: 'RouteErrorResponse'
+    };
+    return {
+        status: error.status,
+        statusText: error.statusText,
+        data: error.data,
+        __type: 'RouteErrorResponse'
+    };
 }
 function getSSRConfigByEntry(entryName, ssr, ssrByEntries) {
     if (ssrByEntries?.[entryName]) return ssrByEntries[entryName];
@@ -36,4 +59,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 ({ htmlPlugin })=>{
+                return async (templateData)=>{
                     const config = api.getNormalizedConfig();
+                    const { compilation: _compilation, htmlPlugin, rspackConfig: _rspackConfig, ...templateParameters } = templateData;
                     const documentParams = getDocParams({
                         config: config,
                         entryName,
@@ -318,6 +319,7 @@ const documentPlugin = ()=>({
                     debug("entry %s's document jsx rendered html: %o", entryName, html);
                     const { partialsByEntrypoint } = api.getAppContext();
                     html = processPartials(html, entryName, partialsByEntrypoint || {});
+                    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);
                 };
@@ -328,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/exports/head.mjs

@@ -2,14 +2,20 @@
 import react from "react";
 import { Helmet, HelmetData, HelmetProvider } from "react-helmet-async";
 import { InternalRuntimeContext } from "../core/context/index.mjs";
+import { ensureHelmetContext } from "../core/context/helmetContext.mjs";
 const ATTRIBUTE_NAME_MAP = {
     charSet: 'charset',
     className: 'class',
     contentEditable: 'contenteditable',
     httpEquiv: 'http-equiv',
+    hrefLang: 'hreflang',
     itemProp: 'itemprop',
     tabIndex: 'tabindex'
 };
+const CONTENT_PROPERTIES = new Set([
+    'innerHTML',
+    'cssText'
+]);
 const escapeHtml = (value)=>String(value).replaceAll('&', '&amp;').replaceAll('"', '&quot;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
 const toHtmlAttributeName = (name)=>ATTRIBUTE_NAME_MAP[name] ?? name;
 const attributesToString = (attributes, includeHelmetAttribute = false)=>{
@@ -17,6 +23,7 @@ const attributesToString = (attributes, includeHelmetAttribute = false)=>{
     if (includeHelmetAttribute) pairs.push('data-rh="true"');
     for (const [name, value] of Object.entries(attributes ?? {})){
         if (false === value || null == value) continue;
+        if (CONTENT_PROPERTIES.has(name)) continue;
         const htmlName = toHtmlAttributeName(name);
         if (true === value) pairs.push(htmlName);
         else pairs.push(`${htmlName}="${escapeHtml(value)}"`);
@@ -40,23 +47,15 @@ const createAttributeDatum = (attributes)=>({
 const createTitleDatum = (title, attributes)=>({
         toComponent: ()=>[],
         toString: ()=>{
-            if (!title) return '';
+            if (void 0 === title || '' === title) return '';
             const attrs = attributesToString(attributes, true);
             return `<title ${attrs}>${escapeHtml(title)}</title>`;
         }
     });
-const createEmptyHelmetState = ()=>({
-        base: createDatum('base', []),
-        bodyAttributes: createAttributeDatum({}),
-        htmlAttributes: createAttributeDatum({}),
-        link: createDatum('link', []),
-        meta: createDatum('meta', []),
-        noscript: createDatum("noscript", []),
-        priority: createDatum('meta', []),
-        script: createDatum("script", []),
-        style: createDatum('style', []),
-        title: createTitleDatum(void 0, {})
-    });
+const normalizeHelmetTitle = (title)=>{
+    if ('string' == typeof title) return title;
+    if (Array.isArray(title)) return title.map((part)=>String(part)).join('');
+};
 const mergeAttributes = (current, next)=>({
         ...current,
         ...next ?? {}
@@ -72,7 +71,14 @@ const collectChildren = (children, draft)=>{
             draft.titleAttributes = mergeAttributes(draft.titleAttributes, props);
             return;
         }
-        if ('html' === child.type || 'body' === child.type) return;
+        if ('html' === child.type) {
+            draft.htmlAttributes = mergeAttributes(draft.htmlAttributes ?? {}, props);
+            return;
+        }
+        if ('body' === child.type) {
+            draft.bodyAttributes = mergeAttributes(draft.bodyAttributes ?? {}, props);
+            return;
+        }
         if ('base' === child.type || 'link' === child.type || 'meta' === child.type || "noscript" === child.type || "script" === child.type || 'style' === child.type) {
             const tag = {
                 ...props
@@ -82,11 +88,10 @@ const collectChildren = (children, draft)=>{
         }
     });
 };
-const collectHelmetProps = (current, props)=>{
-    const baseState = current ?? createEmptyHelmetState();
+const createHelmetRecord = (props)=>{
     const draft = {
         base: [
-            ...props.base ? [
+            ...void 0 !== props.base ? [
                 props.base
             ] : []
         ],
@@ -107,75 +112,136 @@ const collectHelmetProps = (current, props)=>{
         style: [
             ...props.style ?? []
         ],
-        title: 'string' == typeof props.title ? props.title : Array.isArray(props.title) ? props.title.join('') : void 0,
+        title: normalizeHelmetTitle(props.title),
         titleAttributes: props.titleAttributes ?? {}
     };
     collectChildren(props.children, draft);
-    const title = draft.title && props.titleTemplate ? props.titleTemplate.replaceAll('%s', draft.title) : draft.title ?? props.defaultTitle;
     return {
-        base: createDatum('base', [
-            ...baseState.__baseTags ?? [],
-            ...draft.base
-        ]),
-        bodyAttributes: createAttributeDatum(mergeAttributes(baseState.__bodyAttributes ?? {}, draft.bodyAttributes)),
-        htmlAttributes: createAttributeDatum(mergeAttributes(baseState.__htmlAttributes ?? {}, draft.htmlAttributes)),
-        link: createDatum('link', [
-            ...baseState.__linkTags ?? [],
-            ...draft.link
-        ]),
-        meta: createDatum('meta', [
-            ...baseState.__metaTags ?? [],
-            ...draft.meta
-        ]),
-        noscript: createDatum("noscript", [
-            ...baseState.__noscriptTags ?? [],
-            ...draft.noscript
-        ]),
-        priority: createDatum('meta', []),
-        script: createDatum("script", [
-            ...baseState.__scriptTags ?? [],
-            ...draft.script
-        ]),
-        style: createDatum('style', [
-            ...baseState.__styleTags ?? [],
-            ...draft.style
-        ]),
-        title: createTitleDatum(title ?? baseState.__title, mergeAttributes(baseState.__titleAttributes ?? {}, draft.titleAttributes)),
-        __baseTags: [
-            ...baseState.__baseTags ?? [],
-            ...draft.base
-        ],
-        __bodyAttributes: mergeAttributes(baseState.__bodyAttributes ?? {}, draft.bodyAttributes),
-        __htmlAttributes: mergeAttributes(baseState.__htmlAttributes ?? {}, draft.htmlAttributes),
-        __linkTags: [
-            ...baseState.__linkTags ?? [],
-            ...draft.link
-        ],
-        __metaTags: [
-            ...baseState.__metaTags ?? [],
-            ...draft.meta
-        ],
-        __noscriptTags: [
-            ...baseState.__noscriptTags ?? [],
-            ...draft.noscript
-        ],
-        __scriptTags: [
-            ...baseState.__scriptTags ?? [],
-            ...draft.script
-        ],
-        __styleTags: [
-            ...baseState.__styleTags ?? [],
-            ...draft.style
-        ],
-        __title: title ?? baseState.__title,
-        __titleAttributes: mergeAttributes(baseState.__titleAttributes ?? {}, draft.titleAttributes)
+        ...draft,
+        titleTemplate: props.titleTemplate,
+        defaultTitle: props.defaultTitle
     };
 };
+const getInnermostDefined = (records, pick)=>{
+    for(let i = records.length - 1; i >= 0; i -= 1){
+        const value = pick(records[i]);
+        if (void 0 !== value) return value;
+    }
+};
+const deriveTitle = (records)=>{
+    const innermostTitle = getInnermostDefined(records, (record)=>record.title);
+    const innermostTemplate = getInnermostDefined(records, (record)=>record.titleTemplate);
+    if (innermostTemplate && innermostTitle) return innermostTemplate.replaceAll('%s', innermostTitle);
+    return innermostTitle || getInnermostDefined(records, (record)=>record.defaultTitle);
+};
+const mergeRecordAttributes = (records, pick)=>records.reduce((merged, record)=>mergeAttributes(merged, pick(record)), {});
+const deriveBaseTags = (records)=>{
+    for(let i = records.length - 1; i >= 0; i -= 1){
+        const tags = records[i].base;
+        for(let j = tags.length - 1; j >= 0; j -= 1)if (tags[j].href) return [
+            tags[j]
+        ];
+    }
+    return [];
+};
+const TAG_PRIMARY_ATTRIBUTES = {
+    link: [
+        'rel',
+        'href'
+    ],
+    meta: [
+        'name',
+        'charset',
+        'http-equiv',
+        'property',
+        'itemprop'
+    ],
+    noscript: [
+        'innerHTML'
+    ],
+    script: [
+        'src',
+        'innerHTML'
+    ],
+    style: [
+        'cssText'
+    ]
+};
+const getPrimaryAttribute = (tagName, tag)=>{
+    const candidates = TAG_PRIMARY_ATTRIBUTES[tagName];
+    let selectedKey;
+    let selectedValue;
+    for (const [key, value] of Object.entries(tag)){
+        const normalizedKey = CONTENT_PROPERTIES.has(key) ? key : toHtmlAttributeName(key).toLowerCase();
+        if (candidates.includes(normalizedKey)) {
+            if ('rel' !== selectedKey || 'canonical' !== String(selectedValue).toLowerCase()) {
+                if ('rel' !== normalizedKey || 'stylesheet' !== String(value).toLowerCase()) {
+                    selectedKey = normalizedKey;
+                    selectedValue = value;
+                }
+            }
+        }
+    }
+    if (void 0 === selectedKey || !selectedValue) return;
+    return {
+        key: selectedKey,
+        value: String(selectedValue).toLowerCase()
+    };
+};
+const dedupeTags = (tagName, records)=>{
+    const approvedValues = new Map();
+    const approved = [];
+    for(let i = records.length - 1; i >= 0; i -= 1){
+        const instanceValues = new Map();
+        const kept = [];
+        for (const tag of records[i][tagName]){
+            const primary = getPrimaryAttribute(tagName, tag);
+            if (void 0 === primary) continue;
+            if (approvedValues.get(primary.key)?.has(primary.value)) continue;
+            let seen = instanceValues.get(primary.key);
+            if (void 0 === seen) {
+                seen = new Set();
+                instanceValues.set(primary.key, seen);
+            }
+            seen.add(primary.value);
+            kept.push(tag);
+        }
+        approved.unshift(...kept);
+        for (const [key, values] of instanceValues){
+            const target = approvedValues.get(key);
+            if (void 0 === target) approvedValues.set(key, values);
+            else for (const value of values)target.add(value);
+        }
+    }
+    return approved;
+};
+const deriveHelmetServerState = (records)=>({
+        base: createDatum('base', deriveBaseTags(records)),
+        bodyAttributes: createAttributeDatum(mergeRecordAttributes(records, (record)=>record.bodyAttributes)),
+        htmlAttributes: createAttributeDatum(mergeRecordAttributes(records, (record)=>record.htmlAttributes)),
+        link: createDatum('link', dedupeTags('link', records)),
+        meta: createDatum('meta', dedupeTags('meta', records)),
+        noscript: createDatum("noscript", dedupeTags("noscript", records)),
+        priority: createDatum('meta', []),
+        script: createDatum("script", dedupeTags("script", records)),
+        style: createDatum('style', dedupeTags('style', records)),
+        title: createTitleDatum(deriveTitle(records), mergeRecordAttributes(records, (record)=>record.titleAttributes))
+    });
+const serverHelmetRecords = new WeakMap();
+const collectServerHelmet = (runtimeContext, props)=>{
+    const helmetContext = ensureHelmetContext(runtimeContext);
+    let records = serverHelmetRecords.get(helmetContext);
+    if (void 0 === records) {
+        records = [];
+        serverHelmetRecords.set(helmetContext, records);
+    }
+    records.push(createHelmetRecord(props));
+    helmetContext.helmet = deriveHelmetServerState(records);
+};
 const head_Helmet = (props)=>{
     const runtimeContext = react.useContext(InternalRuntimeContext);
-    if (runtimeContext && !runtimeContext.isBrowser) {
-        runtimeContext._helmetContext ??= {};
-        runtimeContext._helmetContext.helmet = collectHelmetProps(runtimeContext._helmetContext.helmet ?? void 0, props);
+    if (null !== runtimeContext && false === runtimeContext.isBrowser) {
+        collectServerHelmet(runtimeContext, props);
         return null;
     }
     return react.createElement(Helmet, props);

package/dist/esm/exports/loadable.mjs

@@ -1,21 +1,27 @@
 import * as __rspack_external__loadable_component_0aaae075 from "@loadable/component";
 export * from "@loadable/component";
+function asLoadableNamespace(value) {
+    return 'object' == typeof value && null !== value ? value : {};
+}
 function resolveLoadable(module) {
-    const namespace = module;
-    const defaultExport = namespace.default;
+    const namespace = asLoadableNamespace(module);
+    const defaultExport = asLoadableNamespace(namespace.default);
     const candidates = [
         module,
         namespace.default,
         defaultExport?.default
     ];
     const loadable = candidates.find((candidate)=>'function' == typeof candidate);
-    if (!loadable) throw new TypeError('Modern.js runtime loadable export must resolve to a function');
+    if ('function' != typeof loadable) throw new TypeError('Modern.js runtime loadable export must resolve to a function');
     return loadable;
 }
 const loadable_loadable = resolveLoadable(__rspack_external__loadable_component_0aaae075);
-const lazy = __rspack_external__loadable_component_0aaae075.lazy ?? __rspack_external__loadable_component_0aaae075["default"]?.lazy ?? loadable_loadable.lazy;
-const loadableReady = __rspack_external__loadable_component_0aaae075.loadableReady ?? __rspack_external__loadable_component_0aaae075["default"]?.loadableReady ?? loadable_loadable.loadableReady;
-const __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = __rspack_external__loadable_component_0aaae075.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED ?? __rspack_external__loadable_component_0aaae075["default"]?.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED ?? loadable_loadable.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+const loadableNamespace = asLoadableNamespace(__rspack_external__loadable_component_0aaae075);
+const loadableDefaultNamespace = asLoadableNamespace(loadableNamespace.default);
+const callableLoadableNamespace = asLoadableNamespace(loadable_loadable);
+const lazy = loadableNamespace.lazy ?? loadableDefaultNamespace.lazy ?? callableLoadableNamespace.lazy;
+const loadableReady = loadableNamespace.loadableReady ?? loadableDefaultNamespace.loadableReady ?? callableLoadableNamespace.loadableReady;
+const __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = loadableNamespace.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED ?? loadableDefaultNamespace.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED ?? callableLoadableNamespace.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 const exports_loadable = loadable_loadable;
 export default exports_loadable;
 export { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, lazy, loadableReady };

package/dist/esm/exports/tanstack-router.mjs

@@ -1,3 +1,30 @@
-export * from "@tanstack/react-router";
-export { Form, RouteActionResponseError, useFetcher } from "../router/runtime/tanstack/dataMutation.mjs";
-export { Link, NavLink } from "../router/runtime/tanstack/prefetchLink.mjs";
+import { createElement } from "react";
+const COMPAT_BINDINGS_SLOT = Symbol.for('@modern-js/plugin-tanstack:runtime-compat-bindings');
+function readCompatBindings() {
+    return globalThis[COMPAT_BINDINGS_SLOT];
+}
+function resolveCompatBindings(exportName) {
+    const bindings = readCompatBindings();
+    if (void 0 === bindings) throw new Error(`[@modern-js/runtime] '${exportName}' from the deprecated '@modern-js/runtime/tanstack-router' alias is provided by @modern-js/plugin-tanstack. Install @modern-js/plugin-tanstack, add \`tanstackRouterPlugin()\` to the \`plugins\` array in modern.config.ts, and make sure '@modern-js/plugin-tanstack/runtime' is imported (e.g. in modern.runtime.ts) before '${exportName}' is used. Prefer importing '${exportName}' from '@modern-js/plugin-tanstack/runtime' directly.`);
+    return bindings;
+}
+const Link = (props)=>createElement(resolveCompatBindings('Link').Link, props);
+const NavLink = (props)=>createElement(resolveCompatBindings('NavLink').NavLink, props);
+const Outlet = ()=>createElement(resolveCompatBindings('Outlet').Outlet);
+const Form = (props)=>createElement(resolveCompatBindings('Form').Form, props);
+function useFetcher() {
+    return resolveCompatBindings('useFetcher').useFetcher();
+}
+function RouteActionResponseErrorPlaceholder() {}
+const RouteActionResponseError = new Proxy(RouteActionResponseErrorPlaceholder, {
+    construct (_target, args) {
+        const RealError = resolveCompatBindings('RouteActionResponseError').RouteActionResponseError;
+        return new RealError(...args);
+    },
+    get (target, property, receiver) {
+        const RealError = readCompatBindings()?.RouteActionResponseError;
+        if (void 0 !== RealError) return Reflect.get(RealError, property);
+        return Reflect.get(target, property, receiver);
+    }
+});
+export { Form, Link, NavLink, Outlet, RouteActionResponseError, useFetcher };