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

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

@@ -133,23 +133,12 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                     console.warn(warningMessage);
                 }
                 const isModuleFederationAppSSR = hasServerRendering && hasExplicitMfSsrFlag && !isCloudflareWorkerSSR;
-                const useModuleFederationNodeOutput = hasServerRendering && isModuleFederationAppSSR && isNodeEnvironmentTarget(config.output.target);
                 const ssrEnv = userConfig.deploy?.worker?.ssr || userConfig.server?.rsc ? 'edge' : 'node';
                 const appContext = modernAPI.getAppContext();
                 const { appDirectory, entrypoints } = appContext;
-                const serverBundlerChain = useModuleFederationNodeOutput ? (chain)=>{
-                    chain.target('async-node');
-                    chain.output.module(false);
-                    chain.output.chunkFormat('commonjs');
-                    chain.output.chunkLoading('async-node');
-                    chain.output.library({
-                        ...chain.output.get('library') || {},
-                        type: 'commonjs-module'
-                    });
-                } : void 0;
                 const useLoadablePlugin = (0, utils_namespaceObject.isUseSSRBundle)(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig, appDirectory, entrypoints);
                 const outputConfig = {
-                    module: isServerEnvironment && !useModuleFederationNodeOutput && (outputModule || 'workerSSR' === name && userConfig.deploy?.target === 'cloudflare')
+                    module: isServerEnvironment && (outputModule || 'workerSSR' === name && userConfig.deploy?.target === 'cloudflare')
                 };
                 const useLoadableComponents = (0, utils_namespaceObject.isUseSSRBundle)(userConfig) && checkUseStringSSR(userConfig, appDirectory, entrypoints);
                 return mergeEnvironmentConfig(config, {
@@ -162,13 +151,13 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                     },
                     output: outputConfig,
                     tools: {
-                        bundlerChain: serverBundlerChain || (useLoadablePlugin ? (chain)=>{
+                        bundlerChain: useLoadablePlugin ? (chain)=>{
                             chain.plugin('loadable').use(external_loadable_bundler_plugin_js_default(), [
                                 {
                                     filename: utils_namespaceObject.LOADABLE_STATS_FILE
                                 }
                             ]);
-                        } : void 0),
+                        } : void 0,
                         swc: useLoadableComponents ? {
                             jsc: {
                                 experimental: {

package/dist/cjs/core/react/wrapper.js

@@ -27,9 +27,12 @@ __webpack_require__.d(__webpack_exports__, {
     wrapRuntimeContextProvider: ()=>wrapRuntimeContextProvider
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const external_react_helmet_async_namespaceObject = require("react-helmet-async");
 const index_js_namespaceObject = require("../context/index.js");
 function wrapRuntimeContextProvider(App, contextValue) {
-    const { isBrowser, initialData, routes, routerFramework, context, routeManifest, routerRuntime, routerInstance, routerHydrationScript, routerMatchedRouteIds, routerServerSnapshot, routerContext, unstable_getBlockNavState, ssrContext, _internalContext, _internalRouterBaseName, ...rest } = contextValue;
+    const { isBrowser, initialData, routes, routerFramework, context, routeManifest, routerRuntime, routerInstance, routerHydrationScript, routerMatchedRouteIds, routerServerSnapshot, routerContext, unstable_getBlockNavState, ssrContext, _internalContext, _internalRouterBaseName, _helmetContext, ...rest } = contextValue;
+    const internalContextValue = contextValue;
+    internalContextValue._helmetContext ??= {};
     const runtimeContextValue = {
         isBrowser,
         initialData,
@@ -39,10 +42,13 @@ function wrapRuntimeContextProvider(App, contextValue) {
         ...rest
     };
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.InternalRuntimeContext.Provider, {
-        value: contextValue,
+        value: internalContextValue,
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.RuntimeContext.Provider, {
             value: runtimeContextValue,
-            children: App
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_react_helmet_async_namespaceObject.HelmetProvider, {
+                context: internalContextValue._helmetContext,
+                children: App
+            })
         })
     });
 }

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

@@ -25,6 +25,7 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createReplaceHelemt: ()=>createReplaceHelemt,
+    getHelmetData: ()=>getHelmetData,
     helmetReplace: ()=>helmetReplace
 });
 const external_utils_js_namespaceObject = require("./utils.js");
@@ -34,6 +35,9 @@ const RE_BODY_ATTR = /<body[^>]*>/;
 const RE_LAST_IN_HEAD = /<\/head>/;
 const RE_TITLE = /<title[^>]*>([\s\S\n\r]*?)<\/title>/;
 const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/;
+function getHelmetData(runtimeContext) {
+    return runtimeContext._helmetContext?.helmet ?? void 0;
+}
 function createReplaceHelemt(helmetData) {
     return helmetData ? (template)=>helmetReplace(template, helmetData) : (tempalte)=>tempalte;
 }
@@ -65,9 +69,11 @@ function helmetReplace(content, helmetData) {
     return (0, external_utils_js_namespaceObject.safeReplace)(result, RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }
 exports.createReplaceHelemt = __webpack_exports__.createReplaceHelemt;
+exports.getHelmetData = __webpack_exports__.getHelmetData;
 exports.helmetReplace = __webpack_exports__.helmetReplace;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createReplaceHelemt",
+    "getHelmetData",
     "helmetReplace"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

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

@@ -1,14 +1,5 @@
 "use strict";
 var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.n = (module)=>{
-        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
-        __webpack_require__.d(getter, {
-            a: getter
-        });
-        return getter;
-    };
-})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -36,8 +27,6 @@ __webpack_require__.d(__webpack_exports__, {
     buildShellBeforeTemplate: ()=>buildShellBeforeTemplate
 });
 const router_namespaceObject = require("@modern-js/runtime-utils/router");
-const external_react_helmet_namespaceObject = require("react-helmet");
-var external_react_helmet_default = /*#__PURE__*/ __webpack_require__.n(external_react_helmet_namespaceObject);
 const lifecycle_js_namespaceObject = require("../../../router/runtime/lifecycle.js");
 const external_constants_js_namespaceObject = require("../constants.js");
 const external_federatedCss_js_namespaceObject = require("../federatedCss.js");
@@ -57,7 +46,7 @@ const checkIsInline = (chunk, enableInline)=>{
 };
 async function buildShellBeforeTemplate(beforeAppTemplate, options) {
     const { config, runtimeContext, styledComponentsStyleTags, entryName, moduleFederationCssAssets } = options;
-    const helmetData = external_react_helmet_default().renderStatic();
+    const helmetData = (0, external_helmet_js_namespaceObject.getHelmetData)(runtimeContext);
     const callbacks = [
         (0, external_helmet_js_namespaceObject.createReplaceHelemt)(helmetData),
         (template)=>injectCss(template, entryName, styledComponentsStyleTags)

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

@@ -1,14 +1,5 @@
 "use strict";
 var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.n = (module)=>{
-        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
-        __webpack_require__.d(getter, {
-            a: getter
-        });
-        return getter;
-    };
-})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -36,8 +27,6 @@ __webpack_require__.d(__webpack_exports__, {
     buildShellBeforeTemplate: ()=>buildShellBeforeTemplate
 });
 const router_namespaceObject = require("@modern-js/runtime-utils/router");
-const external_react_helmet_namespaceObject = require("react-helmet");
-var external_react_helmet_default = /*#__PURE__*/ __webpack_require__.n(external_react_helmet_namespaceObject);
 const lifecycle_js_namespaceObject = require("../../../router/runtime/lifecycle.js");
 const external_constants_js_namespaceObject = require("../constants.js");
 const external_federatedCss_js_namespaceObject = require("../federatedCss.js");
@@ -51,7 +40,7 @@ const checkIsInline = (chunk, enableInline)=>{
 };
 async function buildShellBeforeTemplate(beforeAppTemplate, options) {
     const { config, runtimeContext, styledComponentsStyleTags, entryName, moduleFederationCssAssets } = options;
-    const helmetData = external_react_helmet_default().renderStatic();
+    const helmetData = (0, external_helmet_js_namespaceObject.getHelmetData)(runtimeContext);
     const callbacks = [
         (0, external_helmet_js_namespaceObject.createReplaceHelemt)(helmetData),
         (template)=>injectCss(template, entryName, styledComponentsStyleTags)

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

@@ -63,11 +63,14 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
         if (extender.modifyRootElement) processedRootElement = extender.modifyRootElement(processedRootElement);
     });
     const chunkVec = [];
+    let hasStartedPipe = false;
     return new Promise((resolve)=>{
         const { pipe: reactStreamingPipe } = renderToPipeableStream(processedRootElement, {
             nonce: config.nonce,
             identifierPrefix: constants_namespaceObject.SSR_HYDRATION_ID_PREFIX,
             [onReady] () {
+                if (hasStartedPipe) return;
+                hasStartedPipe = true;
                 let styledComponentsStyleTags = '';
                 extenders.forEach((extender)=>{
                     if (extender.getStyleTags) styledComponentsStyleTags += extender.getStyleTags();

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

@@ -39,8 +39,6 @@ const time_namespaceObject = require("@modern-js/runtime-utils/time");
 const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const server_namespaceObject = require("react-dom/server");
 var server_default = /*#__PURE__*/ __webpack_require__.n(server_namespaceObject);
-const external_react_helmet_namespaceObject = require("react-helmet");
-var external_react_helmet_default = /*#__PURE__*/ __webpack_require__.n(external_react_helmet_namespaceObject);
 const external_constants_js_namespaceObject = require("../../constants.js");
 const index_js_namespaceObject = require("../../context/index.js");
 const wrapper_js_namespaceObject = require("../../react/wrapper.js");
@@ -52,12 +50,12 @@ const external_utils_js_namespaceObject = require("../utils.js");
 const external_loadable_js_namespaceObject = require("./loadable.js");
 const external_ssrData_js_namespaceObject = require("./ssrData.js");
 const renderString = async (request, serverRoot, options)=>{
-    const { resource, runtimeContext, config, onError, onTiming } = options;
+    const { resource, runtimeContext: runtimeContext1, config, onError, onTiming } = options;
     const tracer = {
         onError,
         onTiming
     };
-    const routerContext = runtimeContext.routerContext;
+    const routerContext = runtimeContext1.routerContext;
     const { htmlTemplate, entryName, loadableStats, routeManifest, moduleFederationCssAssets } = resource;
     const ssrConfig = (0, external_utils_js_namespaceObject.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
     const chunkSet = {
@@ -71,7 +69,7 @@ const renderString = async (request, serverRoot, options)=>{
             stats: loadableStats,
             nonce: config.nonce,
             routeManifest,
-            runtimeContext,
+            runtimeContext: runtimeContext1,
             template: htmlTemplate,
             entryName,
             moduleFederationCssAssets,
@@ -79,10 +77,10 @@ const renderString = async (request, serverRoot, options)=>{
             config
         }),
         new external_ssrData_js_namespaceObject.SSRDataCollector({
-            runtimeContext,
+            runtimeContext: runtimeContext1,
             request,
             ssrConfig,
-            ssrContext: runtimeContext.ssrContext,
+            ssrContext: runtimeContext1.ssrContext,
             chunkSet,
             routerContext,
             nonce: config.nonce,
@@ -95,10 +93,10 @@ const renderString = async (request, serverRoot, options)=>{
         chunkSet
     });
     for (const c of extraCollectors)if (c) collectors.unshift(c);
-    const rootElement = (0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(serverRoot, Object.assign(runtimeContext, {
+    const rootElement = (0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(serverRoot, Object.assign(runtimeContext1, {
         ssr: true
     }));
-    const html = await generateHtml(rootElement, htmlTemplate, chunkSet, collectors, runtimeContext.ssrContext?.htmlModifiers || [], tracer);
+    const html = await generateHtml(rootElement, htmlTemplate, chunkSet, collectors, runtimeContext1.ssrContext?.htmlModifiers || [], tracer);
     return html;
 };
 async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, { onError, onTiming }) {
@@ -111,7 +109,7 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
             identifierPrefix: constants_namespaceObject.SSR_HYDRATION_ID_PREFIX
         });
         chunkSet.renderLevel = external_constants_js_namespaceObject.RenderLevel.SERVER_RENDER;
-        helmetData = external_react_helmet_default().renderStatic();
+        helmetData = (0, external_helmet_js_namespaceObject.getHelmetData)(runtimeContext);
         const cost = end();
         onTiming(external_tracer_js_namespaceObject.SSRTimings.RENDER_HTML, cost);
     } catch (e) {

package/dist/cjs/exports/head.js

@@ -34,16 +34,207 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    Helmet: ()=>external_react_helmet_namespaceObject.Helmet,
-    default: ()=>head
+    Helmet: ()=>Helmet,
+    HelmetData: ()=>external_react_helmet_async_namespaceObject.HelmetData,
+    HelmetProvider: ()=>external_react_helmet_async_namespaceObject.HelmetProvider,
+    default: ()=>exports_head
 });
-const external_react_helmet_namespaceObject = require("react-helmet");
-var external_react_helmet_default = /*#__PURE__*/ __webpack_require__.n(external_react_helmet_namespaceObject);
-const head = external_react_helmet_default();
+const external_react_namespaceObject = require("react");
+var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
+const external_react_helmet_async_namespaceObject = require("react-helmet-async");
+const index_js_namespaceObject = require("../core/context/index.js");
+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)=>{
+    external_react_default().Children.forEach(children, (child)=>{
+        if (!external_react_default().isValidElement(child)) return;
+        if (child.type === external_react_default().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 = external_react_default().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 Helmet = (props)=>{
+    const runtimeContext = external_react_default().useContext(index_js_namespaceObject.InternalRuntimeContext);
+    if (runtimeContext && !runtimeContext.isBrowser) {
+        runtimeContext._helmetContext ??= {};
+        runtimeContext._helmetContext.helmet = collectHelmetProps(runtimeContext._helmetContext.helmet ?? void 0, props);
+        return null;
+    }
+    return external_react_default().createElement(external_react_helmet_async_namespaceObject.Helmet, props);
+};
+const head = {
+    Helmet,
+    HelmetData: external_react_helmet_async_namespaceObject.HelmetData,
+    HelmetProvider: external_react_helmet_async_namespaceObject.HelmetProvider
+};
+const exports_head = head;
 exports.Helmet = __webpack_exports__.Helmet;
+exports.HelmetData = __webpack_exports__.HelmetData;
+exports.HelmetProvider = __webpack_exports__.HelmetProvider;
 exports["default"] = __webpack_exports__["default"];
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "Helmet",
+    "HelmetData",
+    "HelmetProvider",
     "default"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/router/runtime/tanstack/routeTree.js

@@ -74,12 +74,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/cjs/ssr/serverRender/renderToString/entry.js

@@ -39,13 +39,11 @@ const node_namespaceObject = require("@modern-js/runtime-utils/node");
 const time_namespaceObject = require("@modern-js/runtime-utils/time");
 const external_react_namespaceObject = require("react");
 var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
-const external_react_helmet_namespaceObject = require("react-helmet");
-var external_react_helmet_default = /*#__PURE__*/ __webpack_require__.n(external_react_helmet_namespaceObject);
+const external_react_helmet_async_namespaceObject = require("react-helmet-async");
+const helmet_js_namespaceObject = require("../../../core/server/helmet.js");
 const utils_js_namespaceObject = require("../../../router/runtime/utils.js");
 const external_prefetch_namespaceObject = require("../../prefetch");
 var external_prefetch_default = /*#__PURE__*/ __webpack_require__.n(external_prefetch_namespaceObject);
-const external_helmet_namespaceObject = require("../helmet");
-var external_helmet_default = /*#__PURE__*/ __webpack_require__.n(external_helmet_namespaceObject);
 const external_tracker_namespaceObject = require("../tracker");
 const external_types_js_namespaceObject = require("../types.js");
 const external_utils_namespaceObject = require("../utils");
@@ -101,8 +99,8 @@ class Entry {
             (0, external_buildHtml_namespaceObject.createReplaceSSRDataScript)(ssrDataScripts),
             ...this.htmlModifiers
         ]);
-        const helmetData = external_react_helmet_default().renderStatic();
-        return helmetData ? external_helmet_default()(html, helmetData) : html;
+        const helmetData = (0, helmet_js_namespaceObject.getHelmetData)(context);
+        return helmetData ? (0, helmet_js_namespaceObject.helmetReplace)(html, helmetData) : html;
     }
     async prefetch(context) {
         let prefetchData;
@@ -123,11 +121,14 @@ class Entry {
         const end = (0, time_namespaceObject.time)();
         const { ssrContext } = context;
         try {
-            const App = external_react_default().createElement(this.App, {
+            const helmetContext = context._helmetContext ??= {};
+            const App = external_react_default().createElement(external_react_helmet_async_namespaceObject.HelmetProvider, {
+                context: helmetContext
+            }, external_react_default().createElement(this.App, {
                 context: Object.assign(context, {
                     ssr: true
                 })
-            });
+            }));
             html = await (0, external_render_namespaceObject.createRender)(App).addCollector((0, external_styledComponent_namespaceObject.createStyledCollector)(this.result)).addCollector((0, external_loadable_namespaceObject.createLoadableCollector)({
                 stats: ssrContext.loadableStats,
                 result: this.result,

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

@@ -92,23 +92,12 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                     console.warn(warningMessage);
                 }
                 const isModuleFederationAppSSR = hasServerRendering && hasExplicitMfSsrFlag && !isCloudflareWorkerSSR;
-                const useModuleFederationNodeOutput = hasServerRendering && isModuleFederationAppSSR && isNodeEnvironmentTarget(config.output.target);
                 const ssrEnv = userConfig.deploy?.worker?.ssr || userConfig.server?.rsc ? 'edge' : 'node';
                 const appContext = modernAPI.getAppContext();
                 const { appDirectory, entrypoints } = appContext;
-                const serverBundlerChain = useModuleFederationNodeOutput ? (chain)=>{
-                    chain.target('async-node');
-                    chain.output.module(false);
-                    chain.output.chunkFormat('commonjs');
-                    chain.output.chunkLoading('async-node');
-                    chain.output.library({
-                        ...chain.output.get('library') || {},
-                        type: 'commonjs-module'
-                    });
-                } : void 0;
                 const useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig, appDirectory, entrypoints);
                 const outputConfig = {
-                    module: isServerEnvironment && !useModuleFederationNodeOutput && (outputModule || 'workerSSR' === name && userConfig.deploy?.target === 'cloudflare')
+                    module: isServerEnvironment && (outputModule || 'workerSSR' === name && userConfig.deploy?.target === 'cloudflare')
                 };
                 const useLoadableComponents = isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig, appDirectory, entrypoints);
                 return mergeEnvironmentConfig(config, {
@@ -121,13 +110,13 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                     },
                     output: outputConfig,
                     tools: {
-                        bundlerChain: serverBundlerChain || (useLoadablePlugin ? (chain)=>{
+                        bundlerChain: useLoadablePlugin ? (chain)=>{
                             chain.plugin('loadable').use(loadable_bundler_plugin, [
                                 {
                                     filename: LOADABLE_STATS_FILE
                                 }
                             ]);
-                        } : void 0),
+                        } : void 0,
                         swc: useLoadableComponents ? {
                             jsc: {
                                 experimental: {

package/dist/esm/core/react/wrapper.mjs

@@ -1,7 +1,10 @@
 import { jsx } from "react/jsx-runtime";
+import { HelmetProvider } from "react-helmet-async";
 import { InternalRuntimeContext, RuntimeContext } from "../context/index.mjs";
 function wrapRuntimeContextProvider(App, contextValue) {
-    const { isBrowser, initialData, routes, routerFramework, context, routeManifest, routerRuntime, routerInstance, routerHydrationScript, routerMatchedRouteIds, routerServerSnapshot, routerContext, unstable_getBlockNavState, ssrContext, _internalContext, _internalRouterBaseName, ...rest } = contextValue;
+    const { isBrowser, initialData, routes, routerFramework, context, routeManifest, routerRuntime, routerInstance, routerHydrationScript, routerMatchedRouteIds, routerServerSnapshot, routerContext, unstable_getBlockNavState, ssrContext, _internalContext, _internalRouterBaseName, _helmetContext, ...rest } = contextValue;
+    const internalContextValue = contextValue;
+    internalContextValue._helmetContext ??= {};
     const runtimeContextValue = {
         isBrowser,
         initialData,
@@ -11,10 +14,13 @@ function wrapRuntimeContextProvider(App, contextValue) {
         ...rest
     };
     return /*#__PURE__*/ jsx(InternalRuntimeContext.Provider, {
-        value: contextValue,
+        value: internalContextValue,
         children: /*#__PURE__*/ jsx(RuntimeContext.Provider, {
             value: runtimeContextValue,
-            children: App
+            children: /*#__PURE__*/ jsx(HelmetProvider, {
+                context: internalContextValue._helmetContext,
+                children: App
+            })
         })
     });
 }

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

@@ -5,6 +5,9 @@ const RE_BODY_ATTR = /<body[^>]*>/;
 const RE_LAST_IN_HEAD = /<\/head>/;
 const RE_TITLE = /<title[^>]*>([\s\S\n\r]*?)<\/title>/;
 const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/;
+function getHelmetData(runtimeContext) {
+    return runtimeContext._helmetContext?.helmet ?? void 0;
+}
 function createReplaceHelemt(helmetData) {
     return helmetData ? (template)=>helmetReplace(template, helmetData) : (tempalte)=>tempalte;
 }
@@ -35,4 +38,4 @@ function helmetReplace(content, helmetData) {
     ].reduce((pre, cur)=>pre + (cur.length > 0 ? `  ${cur}${EOL}` : ''), '');
     return safeReplace(result, RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }
-export { createReplaceHelemt, helmetReplace };
+export { createReplaceHelemt, getHelmetData, helmetReplace };

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

@@ -1,9 +1,8 @@
 import { matchRoutes } from "@modern-js/runtime-utils/router";
-import react_helmet from "react-helmet";
 import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants.mjs";
 import { createFederatedCssLinks } from "../federatedCss.mjs";
-import { createReplaceHelemt } from "../helmet.mjs";
+import { createReplaceHelemt, getHelmetData } from "../helmet.mjs";
 import { buildHtml } from "../shared.mjs";
 import { checkIsNode, safeReplace } from "../utils.mjs";
 const readAsset = async (chunk)=>{
@@ -19,7 +18,7 @@ const checkIsInline = (chunk, enableInline)=>{
 };
 async function buildShellBeforeTemplate(beforeAppTemplate, options) {
     const { config, runtimeContext, styledComponentsStyleTags, entryName, moduleFederationCssAssets } = options;
-    const helmetData = react_helmet.renderStatic();
+    const helmetData = getHelmetData(runtimeContext);
     const callbacks = [
         createReplaceHelemt(helmetData),
         (template)=>injectCss(template, entryName, styledComponentsStyleTags)