@bleedingdev/modern-js-runtime 3.2.0-ultramodern.62 → 3.2.0-ultramodern.63

package/dist/esm/boundary-debugger/index.mjs

@@ -1,12 +1,14 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from "react";
 const defaultStorageKey = 'modernjs:boundary-debugger:enabled';
+const queryParamName = 'modern-boundaries';
+const boundarySelector = '[data-modern-boundary-id]';
 const defaultLabels = {
     cs: {
-        toggle: 'zobrazit hranice verticalů'
+        toggle: 'zobrazit hranice týmů'
     },
     en: {
-        toggle: 'show vertical boundaries'
+        toggle: 'show team boundaries'
     }
 };
 const palette = [
@@ -16,18 +18,64 @@ const palette = [
     '#7c8cff',
     '#29b6f6'
 ];
-const readEnabled = (storageKey, fallback)=>{
+const readStoredEnabled = (storageKey, fallback)=>{
     if ("u" < typeof window) return fallback;
-    const stored = window.localStorage.getItem(storageKey);
-    return null === stored ? fallback : 'true' === stored;
+    try {
+        const stored = window.localStorage.getItem(storageKey);
+        return null === stored ? fallback : 'true' === stored;
+    } catch  {
+        return fallback;
+    }
+};
+const writeStoredEnabled = (storageKey, enabled)=>{
+    if ("u" < typeof window) return;
+    try {
+        window.localStorage.setItem(storageKey, String(enabled));
+    } catch  {}
+};
+const parseEnabledOverride = (value)=>{
+    if (null === value) return;
+    const normalized = value.toLowerCase();
+    if ('1' === normalized || 'true' === normalized) return true;
+    if ('0' === normalized || 'false' === normalized) return false;
+};
+const readQueryEnabledOverride = ()=>{
+    if ("u" < typeof window) return;
+    try {
+        return parseEnabledOverride(new URLSearchParams(window.location.search).get(queryParamName));
+    } catch  {
+        return;
+    }
 };
 const detectLanguage = ()=>{
     if ("u" < typeof document) return 'en';
     const htmlLanguage = document.documentElement.lang;
     if (htmlLanguage) return htmlLanguage.split('-')[0] || 'en';
+    if ("u" < typeof window) return 'en';
     return window.location.pathname.split('/').filter(Boolean)[0] || 'en';
 };
-function BoundaryDebugger({ enabledByDefault = false, labels = defaultLabels, metadata, storageKey = defaultStorageKey }) {
+const hashBoundaryId = (id)=>{
+    let hash = 0;
+    for(let index = 0; index < id.length; index++)hash = 31 * hash + id.charCodeAt(index) >>> 0;
+    return hash;
+};
+const formatRectKey = (rect)=>[
+        Math.round(100 * rect.left) / 100,
+        Math.round(100 * rect.top) / 100,
+        Math.round(100 * rect.width) / 100,
+        Math.round(100 * rect.height) / 100
+    ].join(':');
+const getBoundaryId = (element)=>element.dataset.modernBoundaryId ?? element.dataset.mfRemote ?? element.getAttribute('data-mf-remote') ?? void 0;
+const collectBoundaryElements = (legacySelector)=>{
+    const elements = new Set();
+    for (const element of document.querySelectorAll(boundarySelector))elements.add(element);
+    if (!legacySelector) return Array.from(elements);
+    try {
+        for (const element of document.querySelectorAll(legacySelector))elements.add(element);
+    } catch  {}
+    return Array.from(elements);
+};
+function BoundaryDebugger({ controlMode = 'visible', enabledByDefault = false, labels = defaultLabels, legacySelector, metadata, storageKey = defaultStorageKey }) {
     const [mounted, setMounted] = useState(false);
     const [enabled, setEnabled] = useState(false);
     const [boxes, setBoxes] = useState([]);
@@ -42,17 +90,18 @@ function BoundaryDebugger({ enabledByDefault = false, labels = defaultLabels, me
         metadata
     ]);
     const language = mounted ? detectLanguage() : 'en';
-    const toggleLabel = labels[language]?.toggle ?? labels.en?.toggle ?? defaultLabels.en?.toggle ?? 'show vertical boundaries';
+    const toggleLabel = labels[language]?.toggle ?? labels.en?.toggle ?? defaultLabels.en?.toggle ?? 'show team boundaries';
     useEffect(()=>{
         setMounted(true);
-        setEnabled(readEnabled(storageKey, enabledByDefault));
+        const queryOverride = readQueryEnabledOverride();
+        setEnabled(queryOverride ?? readStoredEnabled(storageKey, enabledByDefault));
     }, [
         enabledByDefault,
         storageKey
     ]);
     useEffect(()=>{
         if (!mounted) return;
-        window.localStorage.setItem(storageKey, String(enabled));
+        writeStoredEnabled(storageKey, enabled);
     }, [
         enabled,
         mounted,
@@ -61,28 +110,38 @@ function BoundaryDebugger({ enabledByDefault = false, labels = defaultLabels, me
     useEffect(()=>{
         if (!enabled) return void setBoxes([]);
         const readBoxes = ()=>{
-            const nextBoxes = Array.from(document.querySelectorAll('[data-modern-boundary-id]')).map((element, index)=>{
-                const boundaryId = element.dataset.modernBoundaryId;
+            const seenBoxes = new Set();
+            const nextBoxes = collectBoundaryElements(legacySelector).map((element)=>{
+                const boundaryId = getBoundaryId(element);
                 if (!boundaryId) return;
                 const rect = element.getBoundingClientRect();
                 if (rect.width <= 0 || rect.height <= 0) return;
+                const rectKey = formatRectKey(rect);
+                const boxKey = `${boundaryId}:${rectKey}`;
+                if (seenBoxes.has(boxKey)) return;
+                seenBoxes.add(boxKey);
                 const boundary = boundaries.get(boundaryId);
-                const color = boundary?.color ?? palette[index % palette.length];
-                return {
+                const color = boundary?.color ?? palette[hashBoundaryId(boundaryId) % palette.length];
+                const label = boundary?.label ?? boundary?.appId ?? boundaryId;
+                const expose = element.dataset.modernMfExpose;
+                const detail = expose && expose !== label && expose !== boundaryId ? expose : void 0;
+                const box = {
                     color,
                     height: rect.height,
-                    id: `${boundaryId}-${index}`,
-                    label: boundary?.label ?? boundaryId,
+                    id: boxKey,
+                    label,
                     left: rect.left,
                     top: rect.top,
                     width: rect.width
                 };
+                if (detail) box.detail = detail;
+                return box;
             }).filter((box)=>void 0 !== box);
             setBoxes(nextBoxes);
         };
         readBoxes();
         const resizeObserver = "u" < typeof ResizeObserver ? void 0 : new ResizeObserver(readBoxes);
-        for (const element of document.querySelectorAll('[data-modern-boundary-id]'))resizeObserver?.observe(element);
+        for (const element of collectBoundaryElements(legacySelector))resizeObserver?.observe(element);
         const mutationObserver = new MutationObserver(readBoxes);
         mutationObserver.observe(document.body, {
             childList: true,
@@ -98,12 +157,14 @@ function BoundaryDebugger({ enabledByDefault = false, labels = defaultLabels, me
         };
     }, [
         boundaries,
-        enabled
+        enabled,
+        legacySelector
     ]);
     if (!mounted) return null;
+    const shouldRenderToggle = 'visible' === controlMode || 'hidden-when-off' === controlMode && enabled;
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
-            /*#__PURE__*/ jsxs("label", {
+            shouldRenderToggle ? /*#__PURE__*/ jsxs("label", {
                 style: {
                     alignItems: 'center',
                     background: 'rgba(255, 255, 255, 0.96)',
@@ -130,7 +191,7 @@ function BoundaryDebugger({ enabledByDefault = false, labels = defaultLabels, me
                         children: toggleLabel
                     })
                 ]
-            }),
+            }) : null,
             enabled ? /*#__PURE__*/ jsx("div", {
                 "aria-hidden": "true",
                 children: boxes.map((box)=>/*#__PURE__*/ jsx("div", {
@@ -146,19 +207,35 @@ function BoundaryDebugger({ enabledByDefault = false, labels = defaultLabels, me
                             width: box.width,
                             zIndex: 2147482999
                         },
-                        children: /*#__PURE__*/ jsx("span", {
+                        children: /*#__PURE__*/ jsxs("span", {
                             style: {
                                 background: box.color,
                                 borderRadius: 999,
                                 color: '#111827',
-                                font: '800 11px/1 system-ui, sans-serif',
+                                display: 'grid',
+                                font: '800 11px/1.1 system-ui, sans-serif',
+                                gap: 3,
+                                maxWidth: 'min(280px, calc(100vw - 24px))',
                                 padding: '5px 8px',
                                 position: 'absolute',
                                 right: 4,
                                 top: 4,
                                 whiteSpace: 'nowrap'
                             },
-                            children: box.label
+                            children: [
+                                /*#__PURE__*/ jsx("span", {
+                                    children: box.label
+                                }),
+                                box.detail ? /*#__PURE__*/ jsx("span", {
+                                    style: {
+                                        font: '700 10px/1.1 system-ui, sans-serif',
+                                        opacity: 0.82,
+                                        overflow: 'hidden',
+                                        textOverflow: 'ellipsis'
+                                    },
+                                    children: box.detail
+                                }) : null
+                            ]
                         })
                     }, box.id))
             }) : null

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

@@ -0,0 +1,13 @@
+import { attributesToString } from "./utils.mjs";
+const createFederatedCssLinks = (assets, options)=>{
+    if (!assets?.length) return '';
+    const seen = new Set(options.existingAssets || []);
+    const attributes = attributesToString(options.attributes || {});
+    const links = [];
+    for (const asset of assets)if (!(!asset || seen.has(asset) || options.template.includes(asset))) {
+        seen.add(asset);
+        links.push(`<link${attributes} href="${asset}" rel="stylesheet" />`);
+    }
+    return links.join('');
+};
+export { createFederatedCssLinks };

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

@@ -2,6 +2,7 @@ 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 { buildHtml } from "../shared.mjs";
 import { checkIsNode, safeReplace } from "../utils.mjs";
@@ -17,7 +18,7 @@ const checkIsInline = (chunk, enableInline)=>{
     return Boolean(enableInline);
 };
 async function buildShellBeforeTemplate(beforeAppTemplate, options) {
-    const { config, runtimeContext, styledComponentsStyleTags, entryName } = options;
+    const { config, runtimeContext, styledComponentsStyleTags, entryName, moduleFederationCssAssets } = options;
     const helmetData = react_helmet.renderStatic();
     const callbacks = [
         createReplaceHelemt(helmetData),
@@ -27,6 +28,10 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
     async function injectCss(template, entryName, styledComponentsStyleTags) {
         let css = await getCssChunks();
         if (styledComponentsStyleTags) css += styledComponentsStyleTags;
+        css += createFederatedCssLinks(moduleFederationCssAssets, {
+            template,
+            existingAssets: css.match(/href="([^"]+)"/g)?.map((item)=>item.replace(/^href="/, '').replace(/"$/, ''))
+        });
         return safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
         async function getCssChunks() {
             const { routeManifest, routerContext, routes } = runtimeContext;

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

@@ -2,6 +2,7 @@ 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 { buildHtml } from "../shared.mjs";
 import { safeReplace } from "../utils.mjs";
@@ -11,7 +12,7 @@ const checkIsInline = (chunk, enableInline)=>{
     return Boolean(enableInline);
 };
 async function buildShellBeforeTemplate(beforeAppTemplate, options) {
-    const { config, runtimeContext, styledComponentsStyleTags, entryName } = options;
+    const { config, runtimeContext, styledComponentsStyleTags, entryName, moduleFederationCssAssets } = options;
     const helmetData = react_helmet.renderStatic();
     const callbacks = [
         createReplaceHelemt(helmetData),
@@ -21,6 +22,10 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
     async function injectCss(template, entryName, styledComponentsStyleTags) {
         let css = await getCssChunks();
         if (styledComponentsStyleTags) css += styledComponentsStyleTags;
+        css += createFederatedCssLinks(moduleFederationCssAssets, {
+            template,
+            existingAssets: css.match(/href="([^"]+)"/g)?.map((item)=>item.replace(/^href="/, '').replace(/"$/, ''))
+        });
         return safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
         async function getCssChunks() {
             const { routeManifest, routerContext, routes } = runtimeContext;

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

@@ -15,7 +15,7 @@ const defaultExtender = {
 };
 const createReadableStreamFromElement = async (request, rootElement, options)=>{
     const { renderToPipeableStream } = await import("react-dom/server");
-    const { runtimeContext, htmlTemplate, config, ssrConfig, entryName } = options;
+    const { runtimeContext, htmlTemplate, config, ssrConfig, entryName, moduleFederationCssAssets } = options;
     let shellChunkStatus = ShellChunkStatus.START;
     let renderLevel = RenderLevel.SERVER_RENDER;
     const forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
@@ -52,6 +52,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                     runtimeContext,
                     config,
                     entryName,
+                    moduleFederationCssAssets,
                     styledComponentsStyleTags
                 }).then(({ shellAfter, shellBefore })=>{
                     const pendingScripts = [];
@@ -109,7 +110,8 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                     renderLevel,
                     runtimeContext,
                     entryName,
-                    config
+                    config,
+                    moduleFederationCssAssets
                 }).then(({ shellAfter, shellBefore })=>{
                     const fallbackHtml = `${shellBefore}${shellAfter}`;
                     const readableStream = getReadableStreamFromString(fallbackHtml);

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

@@ -8,14 +8,15 @@ import { getTemplates } from "./template.mjs";
 const createReadableStreamFromElement = async (request, rootElement, options)=>{
     let shellChunkStatus = ShellChunkStatus.START;
     const chunkVec = [];
-    const { htmlTemplate, runtimeContext, config, ssrConfig, entryName, rscManifest, rscRoot } = options;
+    const { htmlTemplate, runtimeContext, config, ssrConfig, entryName, moduleFederationCssAssets, rscManifest, rscRoot } = options;
     const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
         renderLevel: RenderLevel.SERVER_RENDER,
         runtimeContext,
         ssrConfig,
         request,
         config,
-        entryName
+        entryName,
+        moduleFederationCssAssets
     });
     try {
         const readableOriginal = await renderSSRStream(rootElement, {

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

@@ -63,7 +63,7 @@ function createRenderStreaming(createReadableStreamPromise) {
         const end = time();
         const { runtimeContext, config, resource } = options;
         const { onError, onTiming } = options;
-        const { htmlTemplate, entryName } = resource;
+        const { htmlTemplate, entryName, moduleFederationCssAssets } = resource;
         const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
         const StreamServerRootWrapper = ({ children })=>/*#__PURE__*/ jsxs(Fragment, {
                 children: [
@@ -83,6 +83,7 @@ function createRenderStreaming(createReadableStreamPromise) {
             runtimeContext,
             ssrConfig,
             entryName,
+            moduleFederationCssAssets,
             rscClientManifest: options.rscClientManifest,
             rscSSRManifest: options.rscSSRManifest,
             rscServerManifest: options.rscServerManifest,

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

@@ -19,7 +19,7 @@ const renderString = async (request, serverRoot, options)=>{
         onTiming
     };
     const routerContext = runtimeContext.routerContext;
-    const { htmlTemplate, entryName, loadableStats, routeManifest } = resource;
+    const { htmlTemplate, entryName, loadableStats, routeManifest, moduleFederationCssAssets } = resource;
     const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
     const chunkSet = {
         renderLevel: RenderLevel.CLIENT_RENDER,
@@ -35,6 +35,7 @@ const renderString = async (request, serverRoot, options)=>{
             runtimeContext,
             template: htmlTemplate,
             entryName,
+            moduleFederationCssAssets,
             chunkSet,
             config
         }),

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

@@ -1,5 +1,6 @@
 import { ChunkExtractor } from "@loadable/server";
 import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
+import { createFederatedCssLinks } from "../federatedCss.mjs";
 import { attributesToString, checkIsNode } from "../utils.mjs";
 const extname = (uri)=>{
     if ('string' != typeof uri || !uri.includes('.')) return '';
@@ -48,20 +49,21 @@ class LoadableCollector {
         return this.extractor.collectChunks(comopnent);
     }
     async effect() {
-        if (!this.extractor) return;
         const { extractor, options } = this;
         const { entryName, config } = options;
         const asyncChunks = [];
-        if (config.enableAsyncEntry) try {
+        if (extractor && config.enableAsyncEntry) try {
             asyncChunks.push(...extractor.getChunkAssets([
                 `async-${entryName}`
             ]));
         } catch (e) {}
-        const chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks)).concat(this.getMatchedRouteChunks());
+        const chunks = [].concat(asyncChunks).concat(extractor ? extractor.getChunkAssets(extractor.chunks) : []).concat(this.getMatchedRouteChunks());
         const scriptChunks = generateChunks(chunks, 'js');
         const styleChunks = generateChunks(chunks, 'css');
-        this.emitLoadableScripts(extractor);
-        await this.emitScriptAssets(scriptChunks);
+        if (extractor) {
+            this.emitLoadableScripts(extractor);
+            await this.emitScriptAssets(scriptChunks);
+        }
         await this.emitStyleAssets(styleChunks);
     }
     emitLoadableScripts(extractor) {
@@ -96,19 +98,28 @@ class LoadableCollector {
         chunkSet.jsChunk += scripts.filter((script)=>Boolean(script)).join('');
     }
     async emitStyleAssets(chunks) {
-        const { template, chunkSet, config, entryName } = this.options;
+        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 css = await Promise.all(chunks.filter((chunk)=>!existedLinks.includes(chunk.url) && !this.existsAssets?.includes(chunk.path)).map(async (chunk)=>{
+        const emittedChunks = chunks.filter((chunk)=>!existedLinks.includes(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);
             return link;
         }));
         chunkSet.cssChunk += css.filter((css)=>Boolean(css)).join('');
+        chunkSet.cssChunk += createFederatedCssLinks(moduleFederationCssAssets, {
+            template,
+            attributes: this.generateAttributes(),
+            existingAssets: [
+                ...existedLinks,
+                ...emittedChunks.map((chunk)=>chunk.url)
+            ]
+        });
     }
     generateAttributes(extraAtr = {}) {
         const { config } = this.options;

package/dist/esm/router/cli/code/tanstackTypes.mjs

@@ -77,10 +77,21 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
     const topLevel = rootModern ? rootModern.children || [] : routes;
     const imports = [];
     const statements = [];
+    const componentImportMap = new Map();
     const loaderImportMap = new Map();
     const usedRouteVarNames = new Set();
+    let componentIndex = 0;
     let loaderIndex = 0;
     let routeIndex = 0;
+    const getImportNameForComponent = (componentPath)=>{
+        if ('string' != typeof componentPath || 0 === componentPath.length) return null;
+        const existing = componentImportMap.get(componentPath);
+        if (existing) return existing;
+        const componentName = `component_${componentIndex++}`;
+        imports.push(`import ${componentName} from ${quote(componentPath)};`);
+        componentImportMap.set(componentPath, componentName);
+        return componentName;
+    };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
         const key = `${inline ? 'inline' : 'default'}:${hasAction ? 'action' : 'loader'}:${aliasedNoExtPath}`;
         const existing = loaderImportMap.get(key);
@@ -137,6 +148,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         const routeOpts = [
             `getParentRoute: () => ${parentVar},`
         ];
+        const componentName = getImportNameForComponent(route._component);
+        if (componentName) routeOpts.push(`component: ${componentName},`);
         if (isPathlessLayout(route)) {
             const id = route.id;
             routeOpts.push(`id: ${quote(id || 'pathless')},`);
@@ -174,6 +187,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             route
         })));
     const rootOpts = [];
+    const rootComponentName = getImportNameForComponent(rootModern?._component);
+    if (rootComponentName) rootOpts.push(`component: ${rootComponentName},`);
     if (rootLoaderName) rootOpts.push(`loader: modernLoaderToTanstack({ hasSplat: false }, ${rootLoaderName}),`);
     const routerGenTs = `/* eslint-disable */
 // This file is auto-generated by Modern.js. Do not edit manually.