@bleedingdev/modern-js-runtime 3.2.0-ultramodern.82 → 3.2.0-ultramodern.84

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

@@ -1,6 +1,191 @@
 import "node:module";
 "use client";
-import react_helmet, { Helmet } from "react-helmet";
-const head = react_helmet;
-export default head;
-export { Helmet };
+import react from "react";
+import { Helmet, HelmetData, HelmetProvider } from "react-helmet-async";
+import { InternalRuntimeContext } from "../core/context/index.mjs";
+const ATTRIBUTE_NAME_MAP = {
+    charSet: 'charset',
+    className: 'class',
+    contentEditable: 'contenteditable',
+    httpEquiv: 'http-equiv',
+    itemProp: 'itemprop',
+    tabIndex: 'tabindex'
+};
+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)=>{
+    const pairs = [];
+    if (includeHelmetAttribute) pairs.push('data-rh="true"');
+    for (const [name, value] of Object.entries(attributes ?? {})){
+        if (false === value || null == value) continue;
+        const htmlName = toHtmlAttributeName(name);
+        if (true === value) pairs.push(htmlName);
+        else pairs.push(`${htmlName}="${escapeHtml(value)}"`);
+    }
+    return pairs.join(' ');
+};
+const createDatum = (tagName, tags)=>({
+        toComponent: ()=>[],
+        toString: ()=>tags.map((tag)=>{
+                const attrs = attributesToString(tag, true);
+                if ("script" === tagName && 'string' == typeof tag.innerHTML) return `<script ${attrs}>${tag.innerHTML}</script>`;
+                if ('style' === tagName && 'string' == typeof tag.cssText) return `<style ${attrs}>${tag.cssText}</style>`;
+                if ("noscript" === tagName && 'string' == typeof tag.innerHTML) return `<noscript ${attrs}>${tag.innerHTML}</noscript>`;
+                return `<${tagName} ${attrs}>`;
+            }).join('')
+    });
+const createAttributeDatum = (attributes)=>({
+        toComponent: ()=>attributes,
+        toString: ()=>attributesToString(attributes)
+    });
+const createTitleDatum = (title, attributes)=>({
+        toComponent: ()=>[],
+        toString: ()=>{
+            if (!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 mergeAttributes = (current, next)=>({
+        ...current,
+        ...next ?? {}
+    });
+const collectChildren = (children, draft)=>{
+    react.Children.forEach(children, (child)=>{
+        if (!react.isValidElement(child)) return;
+        if (child.type === react.Fragment) return void collectChildren(child.props.children, draft);
+        if ('string' != typeof child.type) return;
+        const { children: nestedChildren, ...props } = child.props;
+        if ('title' === child.type) {
+            draft.title = react.Children.toArray(nestedChildren).join('');
+            draft.titleAttributes = mergeAttributes(draft.titleAttributes, props);
+            return;
+        }
+        if ('html' === child.type || 'body' === child.type) return;
+        if ('base' === child.type || 'link' === child.type || 'meta' === child.type || "noscript" === child.type || "script" === child.type || 'style' === child.type) {
+            const tag = {
+                ...props
+            };
+            if (("script" === child.type || 'style' === child.type || "noscript" === child.type) && 'string' == typeof nestedChildren) tag['style' === child.type ? 'cssText' : 'innerHTML'] = nestedChildren;
+            draft[child.type].push(tag);
+        }
+    });
+};
+const collectHelmetProps = (current, props)=>{
+    const baseState = current ?? createEmptyHelmetState();
+    const draft = {
+        base: [
+            ...props.base ? [
+                props.base
+            ] : []
+        ],
+        bodyAttributes: props.bodyAttributes,
+        htmlAttributes: props.htmlAttributes,
+        link: [
+            ...props.link ?? []
+        ],
+        meta: [
+            ...props.meta ?? []
+        ],
+        noscript: [
+            ...props.noscript ?? []
+        ],
+        script: [
+            ...props.script ?? []
+        ],
+        style: [
+            ...props.style ?? []
+        ],
+        title: 'string' == typeof props.title ? props.title : Array.isArray(props.title) ? props.title.join('') : void 0,
+        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)
+    };
+};
+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);
+        return null;
+    }
+    return react.createElement(Helmet, props);
+};
+const head = {
+    Helmet: head_Helmet,
+    HelmetData: HelmetData,
+    HelmetProvider: HelmetProvider
+};
+const exports_head = head;
+export default exports_head;
+export { HelmetData, HelmetProvider, head_Helmet as Helmet };

package/dist/esm-node/router/runtime/tanstack/routeTree.mjs

@@ -45,12 +45,19 @@ function isModernDeferredData(value) {
 function normalizeModernLoaderResult(result) {
     return isModernDeferredData(result) ? result.data : result;
 }
-function pickRouteModuleComponent(routeModule) {
+function pickRouteModuleComponent(routeModule, seen = new Set()) {
     if ('function' == typeof routeModule || routeModule && 'object' == typeof routeModule && '$$typeof' in routeModule) return routeModule;
     if (!routeModule || 'object' != typeof routeModule) return;
+    if (seen.has(routeModule)) return;
+    seen.add(routeModule);
     const module = routeModule;
-    const component = module.default || module.Component;
-    if ('function' == typeof component || component && 'object' == typeof component && '$$typeof' in component) return component;
+    for (const candidate of [
+        module.default,
+        module.Component
+    ]){
+        const component = pickRouteModuleComponent(candidate, seen);
+        if (component) return component;
+    }
 }
 function createServerLazyImportComponent(lazyImport, fallbackComponent) {
     if ("u" > typeof document) return fallbackComponent;

package/dist/esm-node/ssr/serverRender/renderToString/entry.mjs

@@ -2,10 +2,10 @@ import "node:module";
 import { sanitizeSSRPayload, serializeJson } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
 import react from "react";
-import react_helmet from "react-helmet";
+import { HelmetProvider } from "react-helmet-async";
+import { getHelmetData, helmetReplace } from "../../../core/server/helmet.mjs";
 import { serializeErrors } from "../../../router/runtime/utils.mjs";
 import prefetch from "../../prefetch";
-import helmet from "../helmet";
 import { SSRErrors, SSRTimings } from "../tracker";
 import { RenderLevel } from "../types.mjs";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, attributesToString } from "../utils";
@@ -61,8 +61,8 @@ class Entry {
             createReplaceSSRDataScript(ssrDataScripts),
             ...this.htmlModifiers
         ]);
-        const helmetData = react_helmet.renderStatic();
-        return helmetData ? helmet(html, helmetData) : html;
+        const helmetData = getHelmetData(context);
+        return helmetData ? helmetReplace(html, helmetData) : html;
     }
     async prefetch(context) {
         let prefetchData;
@@ -83,11 +83,14 @@ class Entry {
         const end = time();
         const { ssrContext } = context;
         try {
-            const App = react.createElement(this.App, {
+            const helmetContext = context._helmetContext ??= {};
+            const App = react.createElement(HelmetProvider, {
+                context: helmetContext
+            }, react.createElement(this.App, {
                 context: Object.assign(context, {
                     ssr: true
                 })
-            });
+            }));
             html = await createRender(App).addCollector(createStyledCollector(this.result)).addCollector(createLoadableCollector({
                 stats: ssrContext.loadableStats,
                 result: this.result,

package/dist/types/core/context/runtime.d.ts

@@ -1,4 +1,5 @@
 import type { RouteObject, StaticHandlerContext } from '@modern-js/runtime-utils/router';
+import type { HelmetServerState } from 'react-helmet-async';
 import type { InternalRouterRuntimeState, InternalRouterServerSnapshot, RouteManifest, RouterFramework } from '../../router/runtime/types';
 import type { RequestContext, SSRServerContext } from '../types';
 export interface TRuntimeContext {
@@ -28,6 +29,9 @@ export interface TInternalRuntimeContext extends TRuntimeContext {
     ssrContext?: SSRServerContext;
     _internalContext?: any;
     _internalRouterBaseName?: any;
+    _helmetContext?: {
+        helmet?: HelmetServerState | null;
+    };
 }
 export declare const InternalRuntimeContext: import("react").Context<TInternalRuntimeContext>;
 export declare const RuntimeContext: import("react").Context<TRuntimeContext>;

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

@@ -1,3 +1,5 @@
-import type { HelmetData } from 'react-helmet';
-export declare function createReplaceHelemt(helmetData?: HelmetData): (template: string) => string;
-export declare function helmetReplace(content: string, helmetData: HelmetData): string;
+import type { HelmetServerState } from 'react-helmet-async';
+import type { TInternalRuntimeContext } from '../context';
+export declare function getHelmetData(runtimeContext: TInternalRuntimeContext): HelmetServerState | undefined;
+export declare function createReplaceHelemt(helmetData?: HelmetServerState): (template: string) => string;
+export declare function helmetReplace(content: string, helmetData: HelmetServerState): string;

package/dist/types/exports/head.d.ts

@@ -1,4 +1,11 @@
-import head from 'react-helmet';
+import React from 'react';
+import { Helmet as AsyncHelmet, HelmetData, type HelmetDatum, type HelmetHTMLBodyDatum, type HelmetHTMLElementDatum, type HelmetProps, HelmetProvider, type HelmetServerState, type HelmetTags } from 'react-helmet-async';
+export declare const Helmet: (props: React.PropsWithChildren<HelmetProps>) => React.CElement<React.PropsWithChildren<HelmetProps>, AsyncHelmet> | null;
+declare const head: {
+    Helmet: (props: React.PropsWithChildren<HelmetProps>) => React.CElement<React.PropsWithChildren<HelmetProps>, AsyncHelmet> | null;
+    HelmetData: typeof HelmetData;
+    HelmetProvider: typeof HelmetProvider;
+};
 export default head;
-export type { HelmetData, HelmetDatum, HelmetHTMLBodyDatum, HelmetHTMLElementDatum, HelmetProps, HelmetPropsToState, HelmetTags, } from 'react-helmet';
-export { Helmet } from 'react-helmet';
+export type { HelmetDatum, HelmetHTMLBodyDatum, HelmetHTMLElementDatum, HelmetProps, HelmetServerState as HelmetData, HelmetTags, };
+export { HelmetData, HelmetProvider };

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.0-ultramodern.82",
+  "version": "3.2.0-ultramodern.84",
   "engines": {
     "node": ">=20"
   },
@@ -220,26 +220,25 @@
     "@loadable/component": "5.16.7",
     "@loadable/server": "5.16.7",
     "@swc/core": "1.15.40",
-    "@swc/helpers": "^0.5.21",
+    "@swc/helpers": "^0.5.23",
     "@swc/plugin-loadable-components": "^11.10.0",
     "@tanstack/react-router": "1.170.8",
     "@tanstack/router-core": "1.171.6",
     "@types/loadable__component": "^5.13.10",
-    "@types/react-helmet": "^6.1.11",
     "cookie": "1.1.1",
     "entities": "^8.0.0",
     "es-module-lexer": "^2.1.0",
     "esbuild": "^0.28.0",
     "invariant": "^2.2.4",
     "isbot": "5.1.40",
-    "react-helmet": "^6.1.0",
+    "react-helmet-async": "3.0.0",
     "react-is": "^19.2.6",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.82",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.82",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.82",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.82",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.82",
-    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.2.0-ultramodern.82"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.84",
+    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.2.0-ultramodern.84",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.84",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.84",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.84",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.84"
   },
   "peerDependencies": {
     "react": "^19.2.6",
@@ -258,7 +257,7 @@
     "@typescript/native-preview": "7.0.0-dev.20260527.2",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.82",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.84",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,