@bleedingdev/modern-js-runtime 3.2.0-ultramodern.120 → 3.2.0-ultramodern.121

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

@@ -1,4 +1,7 @@
 import "node:module";
+import { getRouterMatchedRouteIds } from "../../router/runtime/lifecycle.mjs";
+import { CHUNK_JS_PLACEHOLDER } from "./constants.mjs";
+import { safeReplace } from "./utils.mjs";
 function getScriptTags(template) {
     const scriptRegExp = /<script\b[^>]*\bsrc=(["'])(.*?)\1[^>]*><\/script>/g;
     return Array.from(template.matchAll(scriptRegExp)).map((match)=>({
@@ -16,6 +19,42 @@ function isEntryScript(src, entryName, asyncEntry) {
     const prefix = asyncEntry ? `async-${entryName}` : entryName;
     return basename === `${prefix}.js` || basename.startsWith(`${prefix}.`) || basename.startsWith(`${prefix}-`);
 }
+const dedupeByUrl = (chunks)=>{
+    const seen = new Set();
+    return chunks.filter((chunk)=>{
+        if (void 0 === chunk.url || '' === chunk.url || seen.has(chunk.url)) return false;
+        seen.add(chunk.url);
+        return true;
+    });
+};
+const isAsyncEntryScriptChunk = (chunk, entryName)=>{
+    if (void 0 === chunk.url || !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}-`);
+};
+function getRouteAssets(runtimeContext, routeManifest = runtimeContext.routeManifest) {
+    return routeManifest?.routeAssets;
+}
+function getMatchedRouteAssets(runtimeContext, routeManifest) {
+    const routeAssets = getRouteAssets(runtimeContext, routeManifest);
+    if (void 0 === routeAssets) return [];
+    const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
+    return matchedRouteIds.flatMap((routeId)=>routeAssets[routeId]?.assets ?? []);
+}
+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 dedupeByUrl([
+        ...asyncEntryDependencyChunks,
+        ...collectedChunks,
+        ...matchedRouteChunks,
+        ...asyncEntryScriptChunks
+    ]);
+};
 function injectBeforeHydrationEntryScript(template, scripts, entryName = 'index') {
     if ('' === scripts) return template;
     const scriptTags = getScriptTags(template);
@@ -23,4 +62,24 @@ function injectBeforeHydrationEntryScript(template, scripts, entryName = 'index'
     if (void 0 === target) return template;
     return `${template.slice(0, target.index)}${scripts}${template.slice(target.index)}`;
 }
-export { injectBeforeHydrationEntryScript };
+function replaceChunkJsPlaceholder(template, scripts, entryName, placeholder = CHUNK_JS_PLACEHOLDER) {
+    if ('' === scripts) return safeReplace(template, placeholder, '');
+    const withoutPlaceholder = safeReplace(template, placeholder, '');
+    const withEarlyScripts = injectBeforeHydrationEntryScript(withoutPlaceholder, scripts, entryName);
+    if (withEarlyScripts !== withoutPlaceholder) return withEarlyScripts;
+    return safeReplace(template, placeholder, scripts);
+}
+function createRouteHydrationScriptTags(runtimeContext, entryName, options = {}) {
+    const { nonce, template } = options;
+    const routeAssets = getRouteAssets(runtimeContext);
+    if (void 0 === routeAssets) return '';
+    const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
+    const assetEntries = [
+        ...matchedRouteIds.map((routeId)=>routeAssets[routeId]),
+        routeAssets[`async-${entryName}`]
+    ].filter((entry)=>void 0 !== entry);
+    const jsAssets = Array.from(new Set(assetEntries.flatMap((entry)=>(entry.assets ?? []).filter((asset)=>asset.endsWith('.js')))));
+    const nonceAttr = void 0 === nonce || '' === nonce ? '' : ` nonce="${nonce}"`;
+    return jsAssets.filter((asset)=>template?.includes(asset) !== true).map((asset)=>`<script src=${asset}${nonceAttr}></script>`).join(' ');
+}
+export { createRouteHydrationScriptTags, getMatchedRouteAssets, injectBeforeHydrationEntryScript, orderHydrationScriptChunks, replaceChunkJsPlaceholder };

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

@@ -1,9 +1,9 @@
 import "node:module";
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import { getRouterHydrationScripts, getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
+import { getRouterHydrationScripts } from "../../../router/runtime/lifecycle.mjs";
 import { SSR_DATA_JSON_ID } from "../../constants.mjs";
 import { SSR_DATA_PLACEHOLDER } from "../constants.mjs";
-import { injectBeforeHydrationEntryScript } from "../scriptOrder.mjs";
+import { createRouteHydrationScriptTags, replaceChunkJsPlaceholder } from "../scriptOrder.mjs";
 import { buildHtml } from "../shared.mjs";
 import { attributesToString, safeReplace } from "../utils.mjs";
 function buildShellAfterTemplate(afterAppTemplate, options) {
@@ -20,24 +20,12 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
         (template)=>injectJs(template, entryName, config.nonce)
     ];
     async function injectJs(template, entryName, nonce) {
-        const { routeManifest } = runtimeContext;
-        if (!routeManifest) return template;
-        const { routeAssets } = routeManifest;
-        if (!routeAssets) return template;
-        const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
-        const assetEntries = [
-            ...matchedRouteIds.map((routeId)=>routeAssets[routeId]),
-            routeAssets[`async-${entryName}`]
-        ].filter(Boolean);
-        const jsAssets = Array.from(new Set(assetEntries.flatMap((entry)=>(entry.assets ?? []).filter((asset)=>asset.endsWith('.js')))));
-        const nonceAttr = nonce ? ` nonce="${nonce}"` : '';
-        const jsChunkStr = jsAssets.filter((asset)=>!template.includes(asset)).map((asset)=>`<script src=${asset}${nonceAttr}></script>`).join(' ');
-        if (jsChunkStr) {
-            const withoutPlaceholder = safeReplace(template, '<!--<?- chunksMap.js ?>-->', '');
-            const withEarlyScripts = injectBeforeHydrationEntryScript(withoutPlaceholder, jsChunkStr, entryName);
-            return withEarlyScripts !== withoutPlaceholder ? withEarlyScripts : safeReplace(template, '<!--<?- chunksMap.js ?>-->', jsChunkStr);
-        }
-        return template;
+        const jsChunkStr = createRouteHydrationScriptTags(runtimeContext, entryName, {
+            nonce,
+            template
+        });
+        if (!jsChunkStr) return template;
+        return replaceChunkJsPlaceholder(template, jsChunkStr, entryName);
     }
     return buildHtml(afterAppTemplate, callbacks);
 }

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

@@ -23,12 +23,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-node/core/server/string/index.mjs

@@ -5,9 +5,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";
@@ -99,13 +99,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-node/core/server/string/loadable.mjs

@@ -1,7 +1,7 @@
 import "node:module";
 import { ChunkExtractor } from "@loadable/server";
-import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
 import { createFederatedCssLinks } from "../federatedCss.mjs";
+import { getMatchedRouteAssets, orderHydrationScriptChunks } from "../scriptOrder.mjs";
 import { attributesToString, checkIsNode } from "../utils.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
@@ -11,33 +11,15 @@ const extname = (uri)=>{
     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);
@@ -56,17 +38,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;

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

@@ -1,6 +1,6 @@
 import "node:module";
 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) {
@@ -90,7 +90,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-node/core/server/utils.mjs

@@ -13,17 +13,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];

package/dist/esm-node/exports/head.mjs

@@ -3,6 +3,7 @@ import "node:module";
 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',
@@ -12,6 +13,10 @@ const ATTRIBUTE_NAME_MAP = {
     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)=>{
@@ -19,6 +24,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)}"`);
@@ -47,18 +53,6 @@ const createTitleDatum = (title, attributes)=>({
             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('');
@@ -78,7 +72,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
@@ -88,8 +89,7 @@ const collectChildren = (children, draft)=>{
         }
     });
 };
-const collectHelmetProps = (current, props)=>{
-    const baseState = current ?? createEmptyHelmetState();
+const createHelmetRecord = (props)=>{
     const draft = {
         base: [
             ...void 0 !== props.base ? [
@@ -117,71 +117,132 @@ const collectHelmetProps = (current, props)=>{
         titleAttributes: props.titleAttributes ?? {}
     };
     collectChildren(props.children, draft);
-    const title = void 0 !== draft.title && '' !== draft.title && void 0 !== 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 (null !== runtimeContext && false === runtimeContext.isBrowser) {
-        runtimeContext._helmetContext ??= {};
-        runtimeContext._helmetContext.helmet = collectHelmetProps(runtimeContext._helmetContext.helmet ?? void 0, props);
+        collectServerHelmet(runtimeContext, props);
         return null;
     }
     return react.createElement(Helmet, props);

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

@@ -1,5 +1,31 @@
 import "node:module";
-export { Asset, Await, Block, CatchBoundary, CatchNotFound, ClientOnly, DEFAULT_PROTOCOL_ALLOWLIST, DefaultGlobalNotFound, ErrorComponent, FileRoute, FileRouteLoader, HeadContent, LazyRoute, Match, MatchRoute, Matches, Navigate, NotFoundRoute, RootRoute, Route, RouteApi, Router, RouterContextProvider, RouterProvider, ScriptOnce, Scripts, ScrollRestoration, SearchParamError, cleanPath, composeRewrites, createBrowserHistory, createControlledPromise, createFileRoute, createHashHistory, createHistory, createLazyFileRoute, createLazyRoute, createLink, createMemoryHistory, createRootRoute, createRootRouteWithContext, createRoute, createRouteMask, createRouter, createRouterConfig, createSerializationAdapter, deepEqual, defaultParseSearch, defaultStringifySearch, defer, functionalUpdate, getRouteApi, interpolatePath, isMatch, isNotFound, isPlainArray, isPlainObject, isRedirect, joinPaths, lazyFn, lazyRouteComponent, linkOptions, notFound, parseSearchWith, reactUse, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, rootRouteWithContext, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight, useAwaited, useBlocker, useCanGoBack, useChildMatches, useElementScrollRestoration, useHydrated, useLayoutEffect, useLinkProps, useLoaderData, useLoaderDeps, useLocation, useMatch, useMatchRoute, useMatches, useNavigate, useParams, useParentMatches, useRouteContext, useRouter, useRouterState, useSearch, useTags } from "@tanstack/react-router";
-export { Form, RouteActionResponseError, useFetcher } from "../router/runtime/tanstack/dataMutation.mjs";
-export { Outlet } from "../router/runtime/tanstack/outlet.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 };