@modern-js/runtime 3.0.0-alpha.1 → 3.0.0

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

@@ -1,11 +1,10 @@
 import { renderSSRStream } from "@modern-js/render/ssr";
 import { storage } from "@modern-js/runtime-utils/node";
-import isbot_0 from "isbot";
-import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
-import { RenderLevel } from "../../constants";
-import { enqueueFromEntries } from "./deferredScript";
-import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString } from "./shared";
-import { getTemplates } from "./template";
+import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common.mjs";
+import { RenderLevel } from "../../constants.mjs";
+import { enqueueFromEntries } from "./deferredScript.mjs";
+import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode } from "./shared.mjs";
+import { getTemplates } from "./template.mjs";
 const createReadableStreamFromElement = async (request, rootElement, options)=>{
     let shellChunkStatus = ShellChunkStatus.START;
     const chunkVec = [];
@@ -33,9 +32,9 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
         readableOriginal.allReady.then(()=>{
             options?.onAllReady?.();
         });
-        const isbot = isbot_0(request.headers.get('user-agent'));
-        const isSsgRender = 'true' === request.headers.get('x-modern-ssg-render');
-        if (isbot || isSsgRender) await readableOriginal.allReady;
+        const forceStreamToString = Boolean("u" > typeof process && process.env?.MODERN_JS_STREAM_TO_STRING);
+        const { waitForAllReady } = resolveStreamingMode(request, forceStreamToString);
+        if (waitForAllReady) await readableOriginal.allReady;
         const reader = readableOriginal.getReader();
         const stream = new ReadableStream({
             start (controller) {

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

@@ -1,4 +1,4 @@
-import { runRouterDataFnStr } from "../../../router/runtime/constants";
+import { runRouterDataFnStr } from "../../../router/runtime/constants.mjs";
 const HTML_ESCAPE_MAP = {
     '&': '&',
     '<': '&lt;',

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

@@ -1,4 +1,4 @@
-import { createRenderStreaming } from "./shared";
-const createReadableStreamFromElement = 'edge' === process.env.MODERN_SSR_ENV ? import("./createReadableStream.worker.mjs").then((m)=>m.createReadableStreamFromElement) : import("./createReadableStream").then((m)=>m.createReadableStreamFromElement);
+import { createRenderStreaming } from "./shared.mjs";
+const createReadableStreamFromElement = 'edge' === process.env.MODERN_SSR_ENV ? import("./createReadableStream.worker.mjs").then((m)=>m.createReadableStreamFromElement) : import("./createReadableStream.mjs").then((m)=>m.createReadableStreamFromElement);
 const renderStreaming = createRenderStreaming(createReadableStreamFromElement);
 export { renderStreaming };

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

@@ -1,14 +1,47 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { time } from "@modern-js/runtime-utils/time";
-import { JSX_SHELL_STREAM_END_MARK } from "../../../common";
-import { wrapRuntimeContextProvider } from "../../react/wrapper";
-import { SSRErrors, SSRTimings } from "../tracer";
-import { getSSRConfigByEntry } from "../utils";
+import isbot from "isbot";
+import { JSX_SHELL_STREAM_END_MARK } from "../../../common.mjs";
+import { wrapRuntimeContextProvider } from "../../react/wrapper.mjs";
+import { SSRErrors, SSRTimings } from "../tracer.mjs";
+import { getSSRConfigByEntry } from "../utils.mjs";
 var shared_ShellChunkStatus = /*#__PURE__*/ function(ShellChunkStatus) {
     ShellChunkStatus[ShellChunkStatus["START"] = 0] = "START";
     ShellChunkStatus[ShellChunkStatus["FINISH"] = 1] = "FINISH";
     return ShellChunkStatus;
 }({});
+const SHOULD_STREAM_ALL_HEADER = 'x-should-stream-all';
+function parseShouldStreamAllFlag(value) {
+    if (!value) return;
+    const normalized = value.trim().toLowerCase();
+    if ('false' === normalized) return false;
+    return true;
+}
+function resolveStreamingMode(request, forceStreamToString) {
+    const shouldStreamAll = parseShouldStreamAllFlag(request.headers.get(SHOULD_STREAM_ALL_HEADER));
+    const isSsgRender = 'true' === request.headers.get('x-modern-ssg-render');
+    const isBot = isbot(request.headers.get('user-agent'));
+    if (shouldStreamAll) return {
+        onReady: 'onAllReady',
+        waitForAllReady: true
+    };
+    if (forceStreamToString) return {
+        onReady: 'onAllReady',
+        waitForAllReady: true
+    };
+    if (isBot) return {
+        onReady: 'onAllReady',
+        waitForAllReady: true
+    };
+    if (isSsgRender) return {
+        onReady: 'onAllReady',
+        waitForAllReady: true
+    };
+    return {
+        onReady: 'onShellReady',
+        waitForAllReady: false
+    };
+}
 let encoder;
 function encodeForWebStream(thing) {
     if (!encoder) encoder = new TextEncoder();
@@ -72,4 +105,4 @@ function createRenderStreaming(createReadableStreamPromise) {
         return stream;
     };
 }
-export { shared_ShellChunkStatus as ShellChunkStatus, createRenderStreaming, encodeForWebStream, getReadableStreamFromString };
+export { shared_ShellChunkStatus as ShellChunkStatus, createRenderStreaming, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode };

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

@@ -1,5 +1,5 @@
-import { buildShellAfterTemplate } from "./afterTemplate";
-import { buildShellBeforeTemplate } from "./beforeTemplate";
+import { buildShellAfterTemplate } from "./afterTemplate.mjs";
+import { buildShellBeforeTemplate } from "./beforeTemplate.mjs";
 const HTML_SEPARATOR = '<!--<?- html ?>-->';
 const getTemplates = async (htmlTemplate, options)=>{
     const [beforeAppTemplate = '', afterAppHtmlTemplate = ''] = htmlTemplate.split(HTML_SEPARATOR) || [];

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

@@ -1,16 +1,16 @@
 import { time } from "@modern-js/runtime-utils/time";
 import server from "react-dom/server";
 import react_helmet from "react-helmet";
-import { RenderLevel } from "../../constants";
-import { getGlobalInternalRuntimeContext } from "../../context";
-import { wrapRuntimeContextProvider } from "../../react/wrapper";
-import { CHUNK_CSS_PLACEHOLDER, CHUNK_JS_PLACEHOLDER, HTML_PLACEHOLDER, SSR_DATA_PLACEHOLDER } from "../constants";
-import { createReplaceHelemt } from "../helmet";
-import { buildHtml } from "../shared";
-import { SSRErrors, SSRTimings } from "../tracer";
-import { getSSRConfigByEntry, safeReplace } from "../utils";
-import { LoadableCollector } from "./loadable";
-import { SSRDataCollector } from "./ssrData";
+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 { createReplaceHelemt } from "../helmet.mjs";
+import { buildHtml } from "../shared.mjs";
+import { SSRErrors, SSRTimings } from "../tracer.mjs";
+import { getSSRConfigByEntry, safeReplace } from "../utils.mjs";
+import { LoadableCollector } from "./loadable.mjs";
+import { SSRDataCollector } from "./ssrData.mjs";
 const renderString = async (request, serverRoot, options)=>{
     const { resource, runtimeContext, config, onError, onTiming } = options;
     const tracer = {

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

@@ -1,5 +1,5 @@
 import { ChunkExtractor } from "@loadable/server";
-import { attributesToString, checkIsNode } from "../utils";
+import { attributesToString, checkIsNode } from "../utils.mjs";
 const extname = (uri)=>{
     if ('string' != typeof uri || !uri.includes('.')) return '';
     return `.${uri?.split('.').pop()}` || '';

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

@@ -1,6 +1,6 @@
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../../constants";
-import { attributesToString, serializeErrors } from "../utils";
+import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../../constants.mjs";
+import { attributesToString, serializeErrors } from "../utils.mjs";
 function _check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
 }

package/dist/esm/document/Body.mjs

@@ -1,8 +1,8 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
-import { DocumentStructureContext } from "./DocumentStructureContext";
-import { DefaultRoot } from "./Root";
-import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants";
+import { DocumentStructureContext } from "./DocumentStructureContext.mjs";
+import { DefaultRoot } from "./Root.mjs";
+import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants.mjs";
 function Body(props) {
     const { hasSetRoot } = useContext(DocumentStructureContext);
     const { children, ...rest } = props;

package/dist/esm/document/Comment.mjs

@@ -1,6 +1,6 @@
 import { Fragment, jsxs } from "react/jsx-runtime";
 import "react";
-import { DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_COMMENT_PLACEHOLDER_START } from "./constants";
+import { DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_COMMENT_PLACEHOLDER_START } from "./constants.mjs";
 function Comment(props) {
     const { comment, children } = props;
     const commentStr = encodeURIComponent(children || comment || '');

package/dist/esm/document/Head.mjs

@@ -1,10 +1,10 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
-import { DocumentStructureContext } from "./DocumentStructureContext";
-import { Links } from "./Links";
-import { Scripts } from "./Scripts";
-import { Title } from "./Title";
-import { DOCUMENT_META_PLACEHOLDER, HEAD_PARTICALS_SEPARATOR, TOP_PARTICALS_SEPARATOR } from "./constants";
+import { DocumentStructureContext } from "./DocumentStructureContext.mjs";
+import { Links } from "./Links.mjs";
+import { Scripts } from "./Scripts.mjs";
+import { Title } from "./Title.mjs";
+import { DOCUMENT_META_PLACEHOLDER, HEAD_PARTICALS_SEPARATOR, TOP_PARTICALS_SEPARATOR } from "./constants.mjs";
 function Head(props) {
     const { hasSetScripts, hasSetLinks, hasSetTitle } = useContext(DocumentStructureContext);
     const { children, ...rest } = props;

package/dist/esm/document/Html.mjs

@@ -1,8 +1,8 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import "react";
-import { Body } from "./Body";
-import { DocumentStructureContext } from "./DocumentStructureContext";
-import { Head } from "./Head";
+import { Body } from "./Body.mjs";
+import { DocumentStructureContext } from "./DocumentStructureContext.mjs";
+import { Head } from "./Head.mjs";
 function findTargetChildByName(tag, children) {
     return children.find((item)=>getEleType(item) === tag);
 }

package/dist/esm/document/Links.mjs

@@ -1,6 +1,6 @@
 import { Fragment, jsx } from "react/jsx-runtime";
 import "react";
-import { DOCUMENT_LINKS_PLACEHOLDER } from "./constants";
+import { DOCUMENT_LINKS_PLACEHOLDER } from "./constants.mjs";
 function Links() {
     return /*#__PURE__*/ jsx(Fragment, {
         children: DOCUMENT_LINKS_PLACEHOLDER

package/dist/esm/document/Root.mjs

@@ -1,8 +1,8 @@
 import { jsxs } from "react/jsx-runtime";
 import { omit } from "@modern-js/utils/lodash";
 import { useContext } from "react";
-import { DocumentContext } from "./DocumentContext";
-import { DOCUMENT_SSR_PLACEHOLDER } from "./constants";
+import { DocumentContext } from "./DocumentContext.mjs";
+import { DOCUMENT_SSR_PLACEHOLDER } from "./constants.mjs";
 function Root(props) {
     const { rootId, children, ...rest } = props;
     const legalProperties = omit(rest, 'id');

package/dist/esm/document/Script.mjs

@@ -1,6 +1,6 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { renderToString } from "react-dom/server";
-import { DOCUMENT_SCRIPT_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START } from "./constants";
+import { DOCUMENT_SCRIPT_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START } from "./constants.mjs";
 function Script(props) {
     const { content, ...rests } = props;
     const contentStr = content?.toString();

package/dist/esm/document/Scripts.mjs

@@ -1,6 +1,6 @@
 import { Fragment, jsx } from "react/jsx-runtime";
 import "react";
-import { DOCUMENT_SCRIPTS_PLACEHOLDER } from "./constants";
+import { DOCUMENT_SCRIPTS_PLACEHOLDER } from "./constants.mjs";
 function Scripts() {
     return /*#__PURE__*/ jsx(Fragment, {
         children: `${DOCUMENT_SCRIPTS_PLACEHOLDER}`

package/dist/esm/document/Style.mjs

@@ -1,6 +1,6 @@
 import { Fragment, jsxs } from "react/jsx-runtime";
 import "react";
-import { DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START } from "./constants";
+import { DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START } from "./constants.mjs";
 function Style(props) {
     const { content, children } = props;
     const contentStr = children || content;

package/dist/esm/document/Title.mjs

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import { DOCUMENT_TITLE_PLACEHOLDER } from "./constants";
+import { DOCUMENT_TITLE_PLACEHOLDER } from "./constants.mjs";
 function Title() {
     return /*#__PURE__*/ jsx("title", {
         children: DOCUMENT_TITLE_PLACEHOLDER

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

@@ -1,8 +1,8 @@
 import module_0, { builtinModules } from "module";
 import path from "path";
-import { createDebugger, findExists, fs } from "@modern-js/utils";
+import { createDebugger, findExists, fs, logger } from "@modern-js/utils";
 import { decodeHTML } from "entities";
-import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_FILE_NAME, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_META_PLACEHOLDER, DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_SCRIPT_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_TITLE_PLACEHOLDER, DOC_EXT, HEAD_PARTICALS_SEPARATOR, HTML_SEPARATOR, PLACEHOLDER_REPLACER_MAP, TOP_PARTICALS_SEPARATOR } from "../constants";
+import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_FILE_NAME, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_META_PLACEHOLDER, DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_SCRIPT_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_TITLE_PLACEHOLDER, DOC_EXT, HEAD_PARTICALS_SEPARATOR, HTML_SEPARATOR, PLACEHOLDER_REPLACER_MAP, TOP_PARTICALS_SEPARATOR } from "../constants.mjs";
 const debug = createDebugger('document');
 const entryName2DocCode = new Map();
 const CONSTANTS = {
@@ -96,12 +96,13 @@ const applyExternalsPlugin = (child, compiler)=>{
         EXTERNAL_MAPPINGS
     ]).apply(child);
 };
-const generateEntryCode = (docPath, _entryName)=>`var React = require('react');
-var ReactDomServer = require('react-dom/server');
-var exp = require(${JSON.stringify(docPath)});
-var DocumentContext = require('@meta/runtime/document').DocumentContext;
-
-var Document = exp && exp.default;
+const generateEntryCode = (docPath, _entryName)=>{
+    const runtimeAPI = require.resolve('../');
+    const esmRuntimeAPI = runtimeAPI.replace("cjs", "esm").replace(/.js$/, '.mjs');
+    return `import React from 'react';
+import ReactDomServer from 'react-dom/server';
+import Document from ${JSON.stringify(docPath)};
+import { DocumentContext } from ${JSON.stringify(esmRuntimeAPI)};
 
 // expose to global for host to consume
 var g = (typeof globalThis !== 'undefined' ? globalThis : global);
@@ -118,7 +119,8 @@ function render(documentParams) {
 
 g.__MODERN_DOC_RENDERERS__[${JSON.stringify(_entryName)}] = render;
 
-module.exports = { render: render };`;
+export default { render: render };`;
+};
 const processChildCompilation = async (entryName, docPath, compilation, compiler, appDirectory, internalDirectory)=>new Promise((resolve, reject)=>{
         const outFile = path.posix.join(CONSTANTS.DOCUMENT_OUTPUT_DIR, `${CONSTANTS.HTML_OUTPUT_PREFIX}${entryName}${CONSTANTS.HTML_OUTPUT_SUFFIX}`);
         const child = compilation.createChildCompiler(`${CONSTANTS.CHILD_COMPILER_PREFIX}${entryName}`, {
@@ -139,31 +141,48 @@ const processChildCompilation = async (entryName, docPath, compilation, compiler
                     name: `${CONSTANTS.CHILD_COMPILER_PREFIX}${entryName}`
                 }).apply(child);
                 child.runAsChild((err, _entries, childCompilation)=>{
-                    if (err) return reject(err);
+                    if (err) {
+                        logger.error(`Document child compiler failed for entry "${entryName}": ${err.message}`);
+                        return reject(err);
+                    }
                     try {
                         if (!childCompilation) throw new Error('Child compilation is undefined');
                         const asset = childCompilation.assets[outFile] || childCompilation.getAsset?.(outFile)?.source;
                         const code = 'function' == typeof asset?.source ? asset.source().toString() : 'string' == typeof asset ? asset : asset?.buffer?.().toString?.() || '';
-                        if (code) {
-                            entryName2DocCode.set(entryName, code);
-                            debug('Document child compiler: cached injected bundle for %s', entryName);
-                        } else debug('Document child compiler: empty asset for %s', entryName);
+                        if (!code) {
+                            const errorMsg = `Document child compiler produced empty output for entry "${entryName}". Please check your Document component for syntax errors.`;
+                            logger.error(errorMsg);
+                            reject(new Error(errorMsg));
+                            return;
+                        }
+                        entryName2DocCode.set(entryName, code);
+                        debug('Document child compiler: cached injected bundle for %s', entryName);
                         resolve();
                     } catch (e) {
-                        reject(e);
+                        const err = e;
+                        logger.error(`Document child compiler failed to process output for entry "${entryName}": ${err.message}`);
+                        reject(err);
                     }
                 });
             } catch (e) {
-                reject(e);
+                const err = e;
+                logger.error(`Document child compiler failed to initialize for entry "${entryName}": ${err.message}`);
+                reject(err);
             }
         };
         try {
             fs.ensureFile(tempEntry).then(()=>{
                 const entryCode = generateEntryCode(docPath, entryName);
                 return fs.writeFile(tempEntry, entryCode);
-            }).then(finalize).catch((e)=>reject(e));
+            }).then(finalize).catch((e)=>{
+                const err = e;
+                logger.error(`Document child compiler failed to prepare entry file for "${entryName}": ${err.message}`);
+                reject(err);
+            });
         } catch (e) {
-            reject(e);
+            const err = e;
+            logger.error(`Document child compiler failed to create entry directory for "${entryName}": ${err.message}`);
+            reject(err);
         }
     });
 const documentPlugin = ()=>({
@@ -189,7 +208,10 @@ const documentPlugin = ()=>({
                             }
                             await Promise.all(tasks);
                         } catch (e) {
+                            const err = e;
+                            logger.error(`Document child compiler failed: ${err.message}`);
                             debug('Document child compiler make hook failed: %o', e);
+                            throw err;
                         }
                     });
                 }
@@ -197,21 +219,13 @@ const documentPlugin = ()=>({
                     this.name = 'ModernJsDocumentChildCompilerPlugin';
                 }
             }
-            api.config(()=>{
-                const documentPath = require.resolve('../');
-                return {
-                    resolve: {
-                        alias: {
-                            '@meta/runtime/document$': documentPath.replace(`${path.sep}cjs${path.sep}`, `${path.sep}esm${path.sep}`).replace(/.js$/, '.mjs')
-                        }
-                    },
+            api.config(()=>({
                     tools: {
                         bundlerChain: (chain)=>{
                             chain.plugin('modernjs-document-child-compiler').use(ModernJsDocumentChildCompilerPlugin, []);
                         }
                     }
-                };
-            });
+                }));
             const getDocParams = (params)=>{
                 const { config, templateParameters, entryName } = params;
                 return {
@@ -230,11 +244,13 @@ const documentPlugin = ()=>({
                     renderer: globalRenderer
                 };
                 const cached = entryName2DocCode.get(entryName);
-                if (!cached) throw new Error(`Failed to load Document bundle for entry "${entryName}". This is likely because the Document component compilation failed or the bundle was not generated correctly. Please check your Document component implementation.`);
+                if (!cached) throw new Error(`Document bundle not found for entry "${entryName}". The Document component compilation may have failed.`);
                 const filename = path.join(internalDirectory, `./${CONSTANTS.DOCUMENT_OUTPUT_DIR}/${CONSTANTS.HTML_OUTPUT_PREFIX}${entryName}${CONSTANTS.HTML_OUTPUT_SUFFIX}`);
                 requireFromString(cached, filename);
+                const renderer = renderers[entryName];
+                if (!renderer) throw new Error(`Document renderer not found for entry "${entryName}". Please ensure your Document component exports a valid default component.`);
                 return {
-                    renderer: renderers[entryName]
+                    renderer
                 };
             };
             const processPartials = (html, entryName, partialsByEntrypoint)=>{
@@ -250,17 +266,17 @@ const documentPlugin = ()=>({
                 }
                 return html.replace(TOP_PARTICALS_SEPARATOR, ()=>partialsContent.partialsTop).replace(HEAD_PARTICALS_SEPARATOR, ()=>partialsContent.partialsHead).replace(BODY_PARTICALS_SEPARATOR, ()=>partialsContent.partialsBody);
             };
-            const extractHtmlTags = (htmlWebpackPlugin, templateParameters)=>{
+            const extractHtmlTags = (htmlPlugin, templateParameters)=>{
                 const scripts = [
-                    htmlWebpackPlugin.tags.headTags.filter((item)=>"script" === item.tagName).join(''),
-                    htmlWebpackPlugin.tags.bodyTags.toString()
+                    htmlPlugin.tags.headTags.filter((item)=>"script" === item.tagName).join(''),
+                    htmlPlugin.tags.bodyTags.toString()
                 ].join('');
-                const links = htmlWebpackPlugin.tags.headTags.filter((item)=>'link' === item.tagName).join('');
+                const links = htmlPlugin.tags.headTags.filter((item)=>'link' === item.tagName).join('');
                 const metas = [
                     templateParameters.meta,
-                    htmlWebpackPlugin.tags.headTags.filter((item)=>"script" !== item.tagName && 'link' !== item.tagName && 'title' !== item.tagName).join('')
+                    htmlPlugin.tags.headTags.filter((item)=>"script" !== item.tagName && 'link' !== item.tagName && 'title' !== item.tagName).join('')
                 ].join('');
-                const titles = htmlWebpackPlugin.tags.headTags.filter((item)=>'title' === item.tagName).join('').replace('<title>', '').replace('</title>', '');
+                const titles = htmlPlugin.tags.headTags.filter((item)=>'title' === item.tagName).join('').replace('<title>', '').replace('</title>', '');
                 return {
                     scripts,
                     links,
@@ -279,19 +295,26 @@ const documentPlugin = ()=>({
                 const { entrypoints, internalDirectory, appDirectory } = api.getAppContext();
                 const documentFilePath = getDocumentByEntryName(entrypoints, entryName, appDirectory);
                 if (!documentFilePath) return null;
-                return async ({ htmlWebpackPlugin })=>{
+                return async ({ htmlPlugin })=>{
                     const config = api.getNormalizedConfig();
                     const documentParams = getDocParams({
                         config: config,
                         entryName,
                         templateParameters
                     });
-                    const { renderer } = await loadRender(entryName, internalDirectory);
-                    let html = renderer?.(documentParams);
+                    let html;
+                    try {
+                        const { renderer } = await loadRender(entryName, internalDirectory);
+                        html = renderer(documentParams);
+                    } catch (error) {
+                        const err = error;
+                        logger.error(`Failed to render Document for entry "${entryName}": ${err.message}`);
+                        throw err;
+                    }
                     debug("entry %s's document jsx rendered html: %o", entryName, html);
                     const { partialsByEntrypoint } = api.getAppContext();
                     html = processPartials(html, entryName, partialsByEntrypoint || {});
-                    const { scripts, links, metas, titles } = extractHtmlTags(htmlWebpackPlugin, templateParameters);
+                    const { scripts, links, metas, titles } = extractHtmlTags(htmlPlugin, templateParameters);
                     return processPlaceholders(html, config, scripts, links, metas, titles);
                 };
             };

package/dist/esm/document/index.mjs

@@ -1,12 +1,12 @@
-export * from "./Html";
-export * from "./DocumentContext";
-export * from "./DocumentStructureContext";
-export * from "./Head";
-export * from "./Body";
-export * from "./Root";
-export * from "./Links";
-export * from "./Comment";
-export * from "./Style";
-export * from "./Scripts";
-export * from "./Script";
-export * from "./constants";
+export * from "./Html.mjs";
+export * from "./DocumentContext.mjs";
+export * from "./DocumentStructureContext.mjs";
+export * from "./Head.mjs";
+export * from "./Body.mjs";
+export * from "./Root.mjs";
+export * from "./Links.mjs";
+export * from "./Comment.mjs";
+export * from "./Style.mjs";
+export * from "./Scripts.mjs";
+export * from "./Script.mjs";
+export * from "./constants.mjs";

package/dist/esm/index.mjs

@@ -1,6 +1,6 @@
-import { isBrowser } from "./common";
-import { getMonitors } from "./core/context/monitors";
-import { getRequest } from "./core/context/request";
-import { redirect, setHeaders, setStatus } from "./core/context/response";
-import { RuntimeContext, defineRuntimeConfig, useRuntimeContext } from "./core";
+import { isBrowser } from "./common.mjs";
+import { getMonitors } from "./core/context/monitors/index.mjs";
+import { getRequest } from "./core/context/request/index.mjs";
+import { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";
+import { RuntimeContext, defineRuntimeConfig, useRuntimeContext } from "./core/index.mjs";
 export { RuntimeContext, defineRuntimeConfig, getMonitors, getRequest, isBrowser, redirect, setHeaders, setStatus, useRuntimeContext };

package/dist/esm/internal.mjs

@@ -1,2 +1,2 @@
-import { InternalRuntimeContext } from "./core/context/runtime";
+import { InternalRuntimeContext } from "./core/context/runtime.mjs";
 export { InternalRuntimeContext };

package/dist/esm/react-server.mjs

@@ -1,4 +1,4 @@
-import { getRequest } from "./core/context/request";
-import { getMonitors } from "./core/context/monitors";
-import { redirect, setHeaders, setStatus } from "./core/context/response";
+import { getRequest } from "./core/context/request/index.mjs";
+import { getMonitors } from "./core/context/monitors/index.mjs";
+import { redirect, setHeaders, setStatus } from "./core/context/response/index.mjs";
 export { getMonitors, getRequest, redirect, setHeaders, setStatus };

package/dist/esm/router/cli/code/getClientRoutes/getRoutes.mjs

@@ -1,9 +1,9 @@
 import path from "path";
 import { fs } from "@modern-js/utils";
-import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX } from "../../constants";
-import { makeLegalIdentifier } from "../makeLegalIdentifier";
-import { replaceWithAlias } from "../utils";
-import { debug, getRouteWeight, shouldSkip } from "./utils";
+import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX } from "../../constants.mjs";
+import { makeLegalIdentifier } from "../makeLegalIdentifier.mjs";
+import { replaceWithAlias } from "../utils.mjs";
+import { debug, getRouteWeight, shouldSkip } from "./utils.mjs";
 const compName = (srcDirectory, filePath)=>{
     const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
     return `Comp_${legalCompName}`;

package/dist/esm/router/cli/code/getClientRoutes/index.mjs

@@ -1,2 +1,2 @@
-import { getClientRoutes } from "./getRoutes";
+import { getClientRoutes } from "./getRoutes.mjs";
 export { getClientRoutes };

package/dist/esm/router/cli/code/getClientRoutes/utils.mjs

@@ -1,6 +1,6 @@
 import path from "path";
 import { JS_EXTENSIONS, createDebugger, fs } from "@modern-js/utils";
-import { FILE_SYSTEM_ROUTES_IGNORED_REGEX } from "../../constants";
+import { FILE_SYSTEM_ROUTES_IGNORED_REGEX } from "../../constants.mjs";
 const debug = createDebugger('get-client-routes');
 const getRouteWeight = (route)=>'*' === route ? 999 : route.split(':').length - 1;
 const shouldSkip = (file)=>{

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

@@ -1,12 +1,12 @@
 import path from "path";
 import { filterRoutesForServer, filterRoutesLoader, fs, getEntryOptions, isUseRsc, isUseSSRBundle, logger, markRoutes } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
-import { resolveSSRMode } from "../../../cli/ssr/mode";
-import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
-import { walk } from "./nestedRoutes";
-import { fileSystemRoutes, routesForServer, ssrLoaderCombinedModule } from "./templates";
-import { getServerCombinedModueFile, getServerLoadersFile } from "./utils";
+import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants.mjs";
+import { resolveSSRMode } from "../../../cli/ssr/mode.mjs";
+import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants.mjs";
+import { walk } from "./nestedRoutes.mjs";
+import { fileSystemRoutes, routesForServer, ssrLoaderCombinedModule } from "./templates.mjs";
+import { getServerCombinedModueFile, getServerLoadersFile } from "./utils.mjs";
 async function generateRoutesForEntry(entrypoint, appContext) {
     const routes = [];
     if (entrypoint.nestedRoutesEntry) {
@@ -26,10 +26,10 @@ async function generateRoutesForEntry(entrypoint, appContext) {
     const fileRoutes = routes.length > 0 ? Array.isArray(routes) ? routes : [
         routes
     ] : [];
-    const { discoverAndParseConfigRoutes } = await import("../config-routes/parseRouteConfig");
+    const { discoverAndParseConfigRoutes } = await import("../config-routes/parseRouteConfig.mjs");
     const configRoutesData = await discoverAndParseConfigRoutes(entrypoint, appContext, fileRoutes);
     if (configRoutesData) {
-        const { processConfigRoutes } = await import("../config-routes/converter");
+        const { processConfigRoutes } = await import("../config-routes/converter.mjs");
         const processedConfigRoutes = await processConfigRoutes(configRoutesData.routes, entrypoint.entryName, entrypoint.isMainEntry || false, path.dirname(configRoutesData.filePath), {
             name: appContext.internalSrcAlias,
             basename: appContext.srcDirectory
@@ -62,7 +62,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
             if (pageRoutesEntry || nestedRoutesEntry) {
                 const initialRoutes = [];
                 const generatedRoutes = await generateRoutesForEntry(entrypoint, appContext);
-                const { normalizeRoutes: removeComponentFields } = await import("../config-routes/converter");
+                const { normalizeRoutes: removeComponentFields } = await import("../config-routes/converter.mjs");
                 const normalizedRoutes = removeComponentFields(generatedRoutes);
                 for (const route of normalizedRoutes)initialRoutes.unshift(route);
                 const ssrByRouteIds = config.server.ssrByRouteIds || [];

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

@@ -1,8 +1,8 @@
 import path from "path";
 import { fs } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { modifyEntrypoints } from "../entry";
-import { generateRoutesForEntry } from "./index";
+import { modifyEntrypoints } from "../entry.mjs";
+import { generateRoutesForEntry } from "./index.mjs";
 function convertRouteToInspectFormat(route) {
     const inspectRoute = {
         path: route.path ?? void 0,