@modern-js/runtime 3.1.5 → 3.2.0

package/dist/cjs/cli/code.js

@@ -42,10 +42,24 @@ const external_constants_js_namespaceObject = require("./constants.js");
 const mode_js_namespaceObject = require("./ssr/mode.js");
 const external_template_js_namespaceObject = require("./template.js");
 const external_template_server_js_namespaceObject = require("./template.server.js");
+const normalizePreEntry = (preEntry)=>{
+    if (!preEntry) return [];
+    if (Array.isArray(preEntry)) return preEntry.filter((v)=>'string' == typeof v && v.length > 0);
+    if ('string' == typeof preEntry) return preEntry ? [
+        preEntry
+    ] : [];
+    return [];
+};
+const resolvePreEntryImportPath = ({ preEntry, appDirectory, srcDirectory, internalSrcAlias })=>{
+    const absPath = external_path_default().isAbsolute(preEntry) ? preEntry : external_path_default().resolve(appDirectory, preEntry);
+    if (absPath.startsWith(srcDirectory)) return (0, utils_namespaceObject.formatImportPath)(absPath.replace(srcDirectory, internalSrcAlias));
+    return (0, utils_namespaceObject.formatImportPath)(absPath);
+};
 const generateCode = async (entrypoints, appContext, config, hooks)=>{
     const { mountId } = config.html;
-    const { enableAsyncEntry } = config.source;
-    const { runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory, serverRoutes } = appContext;
+    const { enableAsyncEntry, enableAsyncPreEntry, preEntry } = config.source;
+    const shouldInjectAsyncPreEntry = !!enableAsyncEntry && !!enableAsyncPreEntry;
+    const { appDirectory, runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory, serverRoutes } = appContext;
     await Promise.all(entrypoints.map(async (entrypoint)=>{
         const { entryName, isAutoMount, entry, customEntry, customServerEntry, nestedRoutesEntry } = entrypoint;
         const { plugins: runtimePlugins } = await hooks._internalRuntimePlugins.call({
@@ -76,6 +90,21 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
                 isNestedRouter: entrypoint.nestedRoutesEntry
             });
+            if (shouldInjectAsyncPreEntry) {
+                const preEntries = normalizePreEntry(preEntry);
+                if (preEntries.length > 0) {
+                    const injected = preEntries.map((item)=>{
+                        const importPath = resolvePreEntryImportPath({
+                            preEntry: item,
+                            appDirectory,
+                            srcDirectory,
+                            internalSrcAlias
+                        });
+                        return `import '${importPath}';`;
+                    }).join('\n');
+                    indexCode = `${injected}\n${indexCode}`;
+                }
+            }
             const indexFile = external_path_default().resolve(internalDirectory, `./${entryName}/${external_constants_js_namespaceObject.ENTRY_POINT_FILE_NAME}`);
             await utils_namespaceObject.fs.outputFile(indexFile, indexCode, 'utf8');
             if (enableAsyncEntry) {

package/dist/cjs/cli/index.js

@@ -34,10 +34,10 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     default: ()=>cli,
-    routerPlugin: ()=>external_router_cli_index_js_namespaceObject.routerPlugin,
     documentPlugin: ()=>index_js_namespaceObject.documentPlugin,
-    runtimePlugin: ()=>runtimePlugin,
     isRuntimeEntry: ()=>external_entry_js_namespaceObject.isRuntimeEntry,
+    routerPlugin: ()=>external_router_cli_index_js_namespaceObject.routerPlugin,
+    runtimePlugin: ()=>runtimePlugin,
     ssrPlugin: ()=>external_ssr_index_js_namespaceObject.ssrPlugin
 });
 const external_path_namespaceObject = require("path");

package/dist/cjs/cli/template.js

@@ -33,14 +33,14 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    AppProxyForRSC: ()=>AppProxyForRSC,
     entryForCSRWithRSC: ()=>entryForCSRWithRSC,
     index: ()=>index,
-    AppProxyForRSC: ()=>AppProxyForRSC,
+    register: ()=>register,
     runtimeGlobalContext: ()=>runtimeGlobalContext,
-    runtimeRegister: ()=>runtimeRegister,
     runtimeGlobalContextForRSCClient: ()=>runtimeGlobalContextForRSCClient,
     runtimeGlobalContextForRSCServer: ()=>runtimeGlobalContextForRSCServer,
-    register: ()=>register
+    runtimeRegister: ()=>runtimeRegister
 });
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);

package/dist/cjs/cli/template.server.js

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    serverIndex: ()=>serverIndex,
-    entryForCSRWithRSC: ()=>entryForCSRWithRSC
+    entryForCSRWithRSC: ()=>entryForCSRWithRSC,
+    serverIndex: ()=>serverIndex
 });
 const utils_namespaceObject = require("@modern-js/utils");
 const SERVER_ENTRY = `

package/dist/cjs/core/browser/index.js

@@ -33,11 +33,11 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    hydrateWithReact18: ()=>hydrateWithReact18,
     hydrateWithReact17: ()=>hydrateWithReact17,
+    hydrateWithReact18: ()=>hydrateWithReact18,
     render: ()=>render,
-    renderWithReact18: ()=>renderWithReact18,
-    renderWithReact17: ()=>renderWithReact17
+    renderWithReact17: ()=>renderWithReact17,
+    renderWithReact18: ()=>renderWithReact18
 });
 const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const external_cookie_namespaceObject = require("cookie");

package/dist/cjs/core/context/index.js

@@ -25,21 +25,21 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     InternalRuntimeContext: ()=>external_runtime_js_namespaceObject.InternalRuntimeContext,
-    setServerPayload: ()=>index_js_namespaceObject.setServerPayload,
-    getGlobalLayoutApp: ()=>getGlobalLayoutApp,
+    RuntimeContext: ()=>external_runtime_js_namespaceObject.RuntimeContext,
+    getCurrentEntryName: ()=>getCurrentEntryName,
     getGlobalApp: ()=>getGlobalApp,
-    getGlobalEnableRsc: ()=>getGlobalEnableRsc,
-    setGlobalInternalRuntimeContext: ()=>setGlobalInternalRuntimeContext,
-    getInitialContext: ()=>external_runtime_js_namespaceObject.getInitialContext,
-    setGlobalContext: ()=>setGlobalContext,
     getGlobalBasename: ()=>getGlobalBasename,
-    getGlobalRSCRoot: ()=>getGlobalRSCRoot,
-    getGlobalIsRscClient: ()=>getGlobalIsRscClient,
-    getCurrentEntryName: ()=>getCurrentEntryName,
+    getGlobalEnableRsc: ()=>getGlobalEnableRsc,
     getGlobalInternalRuntimeContext: ()=>getGlobalInternalRuntimeContext,
-    RuntimeContext: ()=>external_runtime_js_namespaceObject.RuntimeContext,
+    getGlobalIsRscClient: ()=>getGlobalIsRscClient,
+    getGlobalLayoutApp: ()=>getGlobalLayoutApp,
+    getGlobalRSCRoot: ()=>getGlobalRSCRoot,
     getGlobalRoutes: ()=>getGlobalRoutes,
-    getServerPayload: ()=>index_js_namespaceObject.getServerPayload
+    getInitialContext: ()=>external_runtime_js_namespaceObject.getInitialContext,
+    getServerPayload: ()=>index_js_namespaceObject.getServerPayload,
+    setGlobalContext: ()=>setGlobalContext,
+    setGlobalInternalRuntimeContext: ()=>setGlobalInternalRuntimeContext,
+    setServerPayload: ()=>index_js_namespaceObject.setServerPayload
 });
 const external_runtime_js_namespaceObject = require("./runtime.js");
 const index_js_namespaceObject = require("./serverPayload/index.js");

package/dist/cjs/core/context/response/index.server.js

@@ -24,10 +24,10 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    redirect: ()=>redirect,
-    setStatus: ()=>setStatus,
     getResponseProxy: ()=>getResponseProxy,
-    setHeaders: ()=>setHeaders
+    redirect: ()=>redirect,
+    setHeaders: ()=>setHeaders,
+    setStatus: ()=>setStatus
 });
 const node_namespaceObject = require("@modern-js/runtime-utils/node");
 const getResponseProxy = ()=>{

package/dist/cjs/core/context/runtime.js

@@ -25,10 +25,10 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     InternalRuntimeContext: ()=>InternalRuntimeContext,
+    ReactRuntimeContext: ()=>ReactRuntimeContext,
     RuntimeContext: ()=>RuntimeContext,
-    useRuntimeContext: ()=>useRuntimeContext,
     getInitialContext: ()=>getInitialContext,
-    ReactRuntimeContext: ()=>ReactRuntimeContext
+    useRuntimeContext: ()=>useRuntimeContext
 });
 const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const external_react_namespaceObject = require("react");

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

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    helmetReplace: ()=>helmetReplace,
-    createReplaceHelemt: ()=>createReplaceHelemt
+    createReplaceHelemt: ()=>createReplaceHelemt,
+    helmetReplace: ()=>helmetReplace
 });
 const external_os_namespaceObject = require("os");
 const external_utils_js_namespaceObject = require("./utils.js");

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

@@ -24,9 +24,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>server,
     NoSSR: ()=>index_js_namespaceObject.NoSSR,
     NoSSRCache: ()=>index_js_namespaceObject.NoSSRCache,
+    default: ()=>server,
     ssr: ()=>ssr
 });
 const index_js_namespaceObject = require("./react/index.js");

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

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    NoSSRCache: ()=>external_no_ssr_cache_index_js_namespaceObject.NoSSRCache,
-    NoSSR: ()=>index_js_namespaceObject.NoSSR
+    NoSSR: ()=>index_js_namespaceObject.NoSSR,
+    NoSSRCache: ()=>external_no_ssr_cache_index_js_namespaceObject.NoSSRCache
 });
 const index_js_namespaceObject = require("./nossr/index.js");
 const external_no_ssr_cache_index_js_namespaceObject = require("./no-ssr-cache/index.js");

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

@@ -25,8 +25,8 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createRequestHandler: ()=>external_requestHandler_js_namespaceObject.createRequestHandler,
-    renderString: ()=>index_js_namespaceObject.renderString,
-    renderStreaming: ()=>external_stream_index_js_namespaceObject.renderStreaming
+    renderStreaming: ()=>external_stream_index_js_namespaceObject.renderStreaming,
+    renderString: ()=>index_js_namespaceObject.renderString
 });
 const index_js_namespaceObject = require("./string/index.js");
 const external_stream_index_js_namespaceObject = require("./stream/index.js");

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

@@ -99,7 +99,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                                 } else this.push(chunk);
                                 callback();
                             } catch (e) {
-                                e instanceof Error ? callback(e) : callback(new Error('Received unkown error when streaming'));
+                                e instanceof Error ? callback(e) : callback(new Error('Received unknown error when streaming'));
                             }
                         }
                     });

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

@@ -24,13 +24,13 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    escapeAttr: ()=>escapeAttr,
     buildDeferredDataScript: ()=>buildDeferredDataScript,
+    enqueueFromEntries: ()=>enqueueFromEntries,
+    escapeAttr: ()=>escapeAttr,
     isDeferredDataLike: ()=>isDeferredDataLike,
-    isRecord: ()=>isRecord,
-    toErrorInfo: ()=>toErrorInfo,
     isPromiseLike: ()=>isPromiseLike,
-    enqueueFromEntries: ()=>enqueueFromEntries
+    isRecord: ()=>isRecord,
+    toErrorInfo: ()=>toErrorInfo
 });
 const constants_js_namespaceObject = require("../../../router/runtime/constants.js");
 const HTML_ESCAPE_MAP = {

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

@@ -36,8 +36,8 @@ __webpack_require__.d(__webpack_exports__, {
     ShellChunkStatus: ()=>shared_ShellChunkStatus,
     createRenderStreaming: ()=>createRenderStreaming,
     encodeForWebStream: ()=>encodeForWebStream,
-    resolveStreamingMode: ()=>resolveStreamingMode,
-    getReadableStreamFromString: ()=>getReadableStreamFromString
+    getReadableStreamFromString: ()=>getReadableStreamFromString,
+    resolveStreamingMode: ()=>resolveStreamingMode
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const time_namespaceObject = require("@modern-js/runtime-utils/time");

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

@@ -24,12 +24,12 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    safeReplace: ()=>safeReplace,
-    getSSRConfigByEntry: ()=>getSSRConfigByEntry,
-    serializeErrors: ()=>serializeErrors,
     attributesToString: ()=>attributesToString,
     checkIsNode: ()=>checkIsNode,
-    getSSRMode: ()=>getSSRMode
+    getSSRConfigByEntry: ()=>getSSRConfigByEntry,
+    getSSRMode: ()=>getSSRMode,
+    safeReplace: ()=>safeReplace,
+    serializeErrors: ()=>serializeErrors
 });
 const router_namespaceObject = require("@modern-js/runtime-utils/router");
 function attributesToString(attributes) {

package/dist/cjs/document/Head.js

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    Head: ()=>Head,
-    DefaultHead: ()=>DefaultHead
+    DefaultHead: ()=>DefaultHead,
+    Head: ()=>Head
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");

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

@@ -33,8 +33,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    documentPlugin: ()=>documentPlugin,
     default: ()=>cli,
+    documentPlugin: ()=>documentPlugin,
     getDocumentByEntryName: ()=>getDocumentByEntryName
 });
 const external_module_namespaceObject = require("module");

package/dist/cjs/document/constants.js

@@ -24,29 +24,29 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    DOCUMENT_STYLE_PLACEHOLDER_END: ()=>DOCUMENT_STYLE_PLACEHOLDER_END,
-    PLACEHOLDER_REPLACER_MAP: ()=>PLACEHOLDER_REPLACER_MAP,
-    DOCUMENT_SCRIPTS_PLACEHOLDER: ()=>DOCUMENT_SCRIPTS_PLACEHOLDER,
-    TOP_PARTICALS_SEPARATOR: ()=>TOP_PARTICALS_SEPARATOR,
-    DOC_EXT: ()=>DOC_EXT,
+    BODY_PARTICALS_SEPARATOR: ()=>BODY_PARTICALS_SEPARATOR,
+    DOCUMENT_CHUNKSMAP_PLACEHOLDER: ()=>DOCUMENT_CHUNKSMAP_PLACEHOLDER,
+    DOCUMENT_COMMENT_PLACEHOLDER_END: ()=>DOCUMENT_COMMENT_PLACEHOLDER_END,
     DOCUMENT_COMMENT_PLACEHOLDER_START: ()=>DOCUMENT_COMMENT_PLACEHOLDER_START,
-    DOCUMENT_SSR_PLACEHOLDER: ()=>DOCUMENT_SSR_PLACEHOLDER,
-    DOCUMENT_TITLE_PLACEHOLDER: ()=>DOCUMENT_TITLE_PLACEHOLDER,
+    DOCUMENT_FILE_NAME: ()=>DOCUMENT_FILE_NAME,
     DOCUMENT_LINKS_PLACEHOLDER: ()=>DOCUMENT_LINKS_PLACEHOLDER,
-    DOCUMENT_SCRIPT_PLACEHOLDER_END: ()=>DOCUMENT_SCRIPT_PLACEHOLDER_END,
-    DOCUMENT_CHUNKSMAP_PLACEHOLDER: ()=>DOCUMENT_CHUNKSMAP_PLACEHOLDER,
+    DOCUMENT_META_PLACEHOLDER: ()=>DOCUMENT_META_PLACEHOLDER,
+    DOCUMENT_SCRIPTS_PLACEHOLDER: ()=>DOCUMENT_SCRIPTS_PLACEHOLDER,
+    DOCUMENT_SCRIPT_ATTRIBUTES_END: ()=>DOCUMENT_SCRIPT_ATTRIBUTES_END,
     DOCUMENT_SCRIPT_ATTRIBUTES_START: ()=>DOCUMENT_SCRIPT_ATTRIBUTES_START,
-    DOCUMENT_FILE_NAME: ()=>DOCUMENT_FILE_NAME,
+    DOCUMENT_SCRIPT_PLACEHOLDER_END: ()=>DOCUMENT_SCRIPT_PLACEHOLDER_END,
     DOCUMENT_SCRIPT_PLACEHOLDER_START: ()=>DOCUMENT_SCRIPT_PLACEHOLDER_START,
-    HEAD_PARTICALS_SEPARATOR: ()=>HEAD_PARTICALS_SEPARATOR,
-    BODY_PARTICALS_SEPARATOR: ()=>BODY_PARTICALS_SEPARATOR,
-    DOCUMENT_COMMENT_PLACEHOLDER_END: ()=>DOCUMENT_COMMENT_PLACEHOLDER_END,
     DOCUMENT_SSRDATASCRIPT_PLACEHOLDER: ()=>DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
+    DOCUMENT_SSR_PLACEHOLDER: ()=>DOCUMENT_SSR_PLACEHOLDER,
+    DOCUMENT_STYLE_PLACEHOLDER_END: ()=>DOCUMENT_STYLE_PLACEHOLDER_END,
     DOCUMENT_STYLE_PLACEHOLDER_START: ()=>DOCUMENT_STYLE_PLACEHOLDER_START,
-    DOCUMENT_META_PLACEHOLDER: ()=>DOCUMENT_META_PLACEHOLDER,
+    DOCUMENT_TITLE_PLACEHOLDER: ()=>DOCUMENT_TITLE_PLACEHOLDER,
+    DOC_EXT: ()=>DOC_EXT,
+    HEAD_PARTICALS_SEPARATOR: ()=>HEAD_PARTICALS_SEPARATOR,
     HTML_SEPARATOR: ()=>HTML_SEPARATOR,
-    DOCUMENT_SCRIPT_ATTRIBUTES_END: ()=>DOCUMENT_SCRIPT_ATTRIBUTES_END,
-    HTML_SSRDATASCRIPT_SEPARATOR: ()=>HTML_SSRDATASCRIPT_SEPARATOR
+    HTML_SSRDATASCRIPT_SEPARATOR: ()=>HTML_SSRDATASCRIPT_SEPARATOR,
+    PLACEHOLDER_REPLACER_MAP: ()=>PLACEHOLDER_REPLACER_MAP,
+    TOP_PARTICALS_SEPARATOR: ()=>TOP_PARTICALS_SEPARATOR
 });
 const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const DOC_EXT = [

package/dist/cjs/index.js

@@ -24,15 +24,15 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    isBrowser: ()=>external_common_js_namespaceObject.isBrowser,
-    setHeaders: ()=>response_index_js_namespaceObject.setHeaders,
-    getMonitors: ()=>index_js_namespaceObject.getMonitors,
     RuntimeContext: ()=>external_core_index_js_namespaceObject.RuntimeContext,
-    useRuntimeContext: ()=>external_core_index_js_namespaceObject.useRuntimeContext,
+    defineRuntimeConfig: ()=>external_core_index_js_namespaceObject.defineRuntimeConfig,
+    getMonitors: ()=>index_js_namespaceObject.getMonitors,
+    getRequest: ()=>request_index_js_namespaceObject.getRequest,
+    isBrowser: ()=>external_common_js_namespaceObject.isBrowser,
     redirect: ()=>response_index_js_namespaceObject.redirect,
+    setHeaders: ()=>response_index_js_namespaceObject.setHeaders,
     setStatus: ()=>response_index_js_namespaceObject.setStatus,
-    defineRuntimeConfig: ()=>external_core_index_js_namespaceObject.defineRuntimeConfig,
-    getRequest: ()=>request_index_js_namespaceObject.getRequest
+    useRuntimeContext: ()=>external_core_index_js_namespaceObject.useRuntimeContext
 });
 const external_common_js_namespaceObject = require("./common.js");
 const index_js_namespaceObject = require("./core/context/monitors/index.js");

package/dist/cjs/react-server.js

@@ -25,10 +25,10 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     getMonitors: ()=>monitors_index_js_namespaceObject.getMonitors,
+    getRequest: ()=>index_js_namespaceObject.getRequest,
     redirect: ()=>response_index_js_namespaceObject.redirect,
-    setStatus: ()=>response_index_js_namespaceObject.setStatus,
     setHeaders: ()=>response_index_js_namespaceObject.setHeaders,
-    getRequest: ()=>index_js_namespaceObject.getRequest
+    setStatus: ()=>response_index_js_namespaceObject.setStatus
 });
 const index_js_namespaceObject = require("./core/context/request/index.js");
 const monitors_index_js_namespaceObject = require("./core/context/monitors/index.js");

package/dist/cjs/router/cli/code/index.js

@@ -33,8 +33,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    generateRoutesForEntry: ()=>generateRoutesForEntry,
     generateCode: ()=>generateCode,
+    generateRoutesForEntry: ()=>generateRoutesForEntry,
     generatorRegisterCode: ()=>generatorRegisterCode,
     generatorServerRegisterCode: ()=>generatorServerRegisterCode
 });

package/dist/cjs/router/cli/code/nestedRoutes.js

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    optimizeRoute: ()=>optimizeRoute,
     getRouteId: ()=>getRouteId,
+    optimizeRoute: ()=>optimizeRoute,
     walk: ()=>walk
 });
 const external_path_namespaceObject = require("path");

package/dist/cjs/router/cli/code/templates.js

@@ -33,10 +33,10 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    ssrLoaderCombinedModule: ()=>ssrLoaderCombinedModule,
-    runtimeGlobalContext: ()=>runtimeGlobalContext,
+    fileSystemRoutes: ()=>fileSystemRoutes,
     routesForServer: ()=>routesForServer,
-    fileSystemRoutes: ()=>fileSystemRoutes
+    runtimeGlobalContext: ()=>runtimeGlobalContext,
+    ssrLoaderCombinedModule: ()=>ssrLoaderCombinedModule
 });
 const promises_namespaceObject = require("node:fs/promises");
 const external_path_namespaceObject = require("path");

package/dist/cjs/router/cli/code/utils.js

@@ -33,15 +33,15 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    parseModule: ()=>parseModule,
-    getServerCombinedModuleFile: ()=>getServerCombinedModuleFile,
-    hasLoader: ()=>hasLoader,
     getPathWithoutExt: ()=>getPathWithoutExt,
-    isPageComponentFile: ()=>isPageComponentFile,
+    getServerCombinedModuleFile: ()=>getServerCombinedModuleFile,
     getServerLoadersFile: ()=>getServerLoadersFile,
-    walkDirectory: ()=>walkDirectory,
     hasAction: ()=>hasAction,
-    replaceWithAlias: ()=>replaceWithAlias
+    hasLoader: ()=>hasLoader,
+    isPageComponentFile: ()=>isPageComponentFile,
+    parseModule: ()=>parseModule,
+    replaceWithAlias: ()=>replaceWithAlias,
+    walkDirectory: ()=>walkDirectory
 });
 const external_fs_namespaceObject = require("fs");
 var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);

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

@@ -33,11 +33,11 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    handleFileChange: ()=>external_handler_js_namespaceObject.handleFileChange,
     default: ()=>cli,
-    routerPlugin: ()=>routerPlugin,
+    handleFileChange: ()=>external_handler_js_namespaceObject.handleFileChange,
+    handleModifyEntrypoints: ()=>external_handler_js_namespaceObject.handleModifyEntrypoints,
     isRouteEntry: ()=>external_entry_js_namespaceObject.isRouteEntry,
-    handleModifyEntrypoints: ()=>external_handler_js_namespaceObject.handleModifyEntrypoints
+    routerPlugin: ()=>routerPlugin
 });
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);

package/dist/cjs/router/runtime/PrefetchLink.js

@@ -34,8 +34,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    NavLink: ()=>NavLink,
-    Link: ()=>PrefetchLink_Link
+    Link: ()=>PrefetchLink_Link,
+    NavLink: ()=>NavLink
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const router_namespaceObject = require("@modern-js/runtime-utils/router");

package/dist/cjs/router/runtime/constants.js

@@ -24,14 +24,14 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    runWindowFnStr: ()=>runWindowFnStr,
-    setupFnStr: ()=>setupFnStr,
-    runRouterDataFnStr: ()=>runRouterDataFnStr,
     initRouterDataAttrs: ()=>initRouterDataAttrs,
     mergeLoaderDataStr: ()=>mergeLoaderDataStr,
+    modernInline: ()=>modernInline,
     preResolvedFnStr: ()=>preResolvedFnStr,
     resolveFnStr: ()=>resolveFnStr,
-    modernInline: ()=>modernInline
+    runRouterDataFnStr: ()=>runRouterDataFnStr,
+    runWindowFnStr: ()=>runWindowFnStr,
+    setupFnStr: ()=>setupFnStr
 });
 const constants_js_namespaceObject = require("../../core/constants.js");
 const setupFnStr = "function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};";

package/dist/cjs/router/runtime/internal.js

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    modifyRoutes: ()=>external_plugin_js_namespaceObject.modifyRoutes,
     default: ()=>internal,
+    modifyRoutes: ()=>external_plugin_js_namespaceObject.modifyRoutes,
     renderRoutes: ()=>external_utils_js_namespaceObject.renderRoutes,
     routerPlugin: ()=>external_plugin_js_namespaceObject.routerPlugin
 });

package/dist/cjs/router/runtime/plugin.js

@@ -24,10 +24,10 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    modifyRoutes: ()=>modifyRoutes,
-    routerPlugin: ()=>routerPlugin,
+    beforeCreateRouter: ()=>beforeCreateRouter,
     finalRouteConfig: ()=>finalRouteConfig,
-    beforeCreateRouter: ()=>beforeCreateRouter
+    modifyRoutes: ()=>modifyRoutes,
+    routerPlugin: ()=>routerPlugin
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const merge_namespaceObject = require("@modern-js/runtime-utils/merge");

package/dist/cjs/router/runtime/plugin.node.js

@@ -50,7 +50,7 @@ var external_DeferredDataScripts_node_js_default = /*#__PURE__*/ __webpack_requi
 const external_hooks_js_namespaceObject = require("./hooks.js");
 const external_rsc_router_js_namespaceObject = require("./rsc-router.js");
 const external_utils_js_namespaceObject = require("./utils.js");
-function createRemixReuqest(request) {
+function createRemixRequest(request) {
     const method = 'GET';
     const { headers } = request;
     const controller = new AbortController();
@@ -98,7 +98,7 @@ const routerPlugin = (userConfig = {})=>({
                 const { query } = (0, router_namespaceObject.createStaticHandler)(routes, {
                     basename: _basename
                 });
-                const remixRequest = createRemixReuqest(context.ssrContext.request.raw);
+                const remixRequest = createRemixRequest(context.ssrContext.request.raw);
                 const end = (0, time_namespaceObject.time)();
                 const routerContext = await query(remixRequest, {
                     requestContext

package/dist/cjs/router/runtime/rsc-router.js

@@ -33,11 +33,11 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    RSCStaticRouter: ()=>RSCStaticRouter,
     createClientRouterFromPayload: ()=>createClientRouterFromPayload,
     createServerPayload: ()=>createServerPayload,
     handleRSCRedirect: ()=>handleRSCRedirect,
-    prepareRSCRoutes: ()=>prepareRSCRoutes,
-    RSCStaticRouter: ()=>RSCStaticRouter
+    prepareRSCRoutes: ()=>prepareRSCRoutes
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const client_namespaceObject = require("@modern-js/render/client");

package/dist/cjs/router/runtime/utils.js

@@ -34,14 +34,14 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createRouteObjectsFromConfig: ()=>createRouteObjectsFromConfig,
-    renderRoutes: ()=>renderRoutes,
-    getRouteComponents: ()=>getRouteComponents,
     deserializeErrors: ()=>deserializeErrors,
+    getLocation: ()=>getLocation,
+    getRouteComponents: ()=>getRouteComponents,
     getRouteObjects: ()=>getRouteObjects,
-    standardSlash: ()=>standardSlash,
-    urlJoin: ()=>urlJoin,
+    renderRoutes: ()=>renderRoutes,
     serializeErrors: ()=>serializeErrors,
-    getLocation: ()=>getLocation
+    standardSlash: ()=>standardSlash,
+    urlJoin: ()=>urlJoin
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const browser_namespaceObject = require("@modern-js/runtime-utils/browser");

package/dist/esm/cli/code.mjs

@@ -1,13 +1,27 @@
 import path from "path";
-import { fs } from "@modern-js/utils";
+import { formatImportPath, fs } from "@modern-js/utils";
 import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants.mjs";
 import { resolveSSRMode } from "./ssr/mode.mjs";
 import * as __rspack_external__template_mjs_d6ab8956 from "./template.mjs";
 import * as __rspack_external__template_server_mjs_38d6edb1 from "./template.server.mjs";
+const normalizePreEntry = (preEntry)=>{
+    if (!preEntry) return [];
+    if (Array.isArray(preEntry)) return preEntry.filter((v)=>'string' == typeof v && v.length > 0);
+    if ('string' == typeof preEntry) return preEntry ? [
+        preEntry
+    ] : [];
+    return [];
+};
+const resolvePreEntryImportPath = ({ preEntry, appDirectory, srcDirectory, internalSrcAlias })=>{
+    const absPath = path.isAbsolute(preEntry) ? preEntry : path.resolve(appDirectory, preEntry);
+    if (absPath.startsWith(srcDirectory)) return formatImportPath(absPath.replace(srcDirectory, internalSrcAlias));
+    return formatImportPath(absPath);
+};
 const generateCode = async (entrypoints, appContext, config, hooks)=>{
     const { mountId } = config.html;
-    const { enableAsyncEntry } = config.source;
-    const { runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory, serverRoutes } = appContext;
+    const { enableAsyncEntry, enableAsyncPreEntry, preEntry } = config.source;
+    const shouldInjectAsyncPreEntry = !!enableAsyncEntry && !!enableAsyncPreEntry;
+    const { appDirectory, runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory, serverRoutes } = appContext;
     await Promise.all(entrypoints.map(async (entrypoint)=>{
         const { entryName, isAutoMount, entry, customEntry, customServerEntry, nestedRoutesEntry } = entrypoint;
         const { plugins: runtimePlugins } = await hooks._internalRuntimePlugins.call({
@@ -38,6 +52,21 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
                 isNestedRouter: entrypoint.nestedRoutesEntry
             });
+            if (shouldInjectAsyncPreEntry) {
+                const preEntries = normalizePreEntry(preEntry);
+                if (preEntries.length > 0) {
+                    const injected = preEntries.map((item)=>{
+                        const importPath = resolvePreEntryImportPath({
+                            preEntry: item,
+                            appDirectory,
+                            srcDirectory,
+                            internalSrcAlias
+                        });
+                        return `import '${importPath}';`;
+                    }).join('\n');
+                    indexCode = `${injected}\n${indexCode}`;
+                }
+            }
             const indexFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_FILE_NAME}`);
             await fs.outputFile(indexFile, indexCode, 'utf8');
             if (enableAsyncEntry) {

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

@@ -71,7 +71,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                                 } else this.push(chunk);
                                 callback();
                             } catch (e) {
-                                e instanceof Error ? callback(e) : callback(new Error('Received unkown error when streaming'));
+                                e instanceof Error ? callback(e) : callback(new Error('Received unknown error when streaming'));
                             }
                         }
                     });

package/dist/esm/router/runtime/plugin.node.mjs

@@ -11,7 +11,7 @@ import DeferredDataScripts_node from "./DeferredDataScripts.node.mjs";
 import { modifyRoutes, onBeforeCreateRoutes } from "./hooks.mjs";
 import { RSCStaticRouter, createServerPayload, handleRSCRedirect, prepareRSCRoutes } from "./rsc-router.mjs";
 import { createRouteObjectsFromConfig, renderRoutes, urlJoin } from "./utils.mjs";
-function createRemixReuqest(request) {
+function createRemixRequest(request) {
     const method = 'GET';
     const { headers } = request;
     const controller = new AbortController();
@@ -59,7 +59,7 @@ const routerPlugin = (userConfig = {})=>({
                 const { query } = createStaticHandler(routes, {
                     basename: _basename
                 });
-                const remixRequest = createRemixReuqest(context.ssrContext.request.raw);
+                const remixRequest = createRemixRequest(context.ssrContext.request.raw);
                 const end = time();
                 const routerContext = await query(remixRequest, {
                     requestContext

package/dist/esm-node/cli/code.mjs

@@ -1,14 +1,28 @@
 import "node:module";
 import path from "path";
-import { fs } from "@modern-js/utils";
+import { formatImportPath, fs } from "@modern-js/utils";
 import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants.mjs";
 import { resolveSSRMode } from "./ssr/mode.mjs";
 import * as __rspack_external__template_mjs_d6ab8956 from "./template.mjs";
 import * as __rspack_external__template_server_mjs_38d6edb1 from "./template.server.mjs";
+const normalizePreEntry = (preEntry)=>{
+    if (!preEntry) return [];
+    if (Array.isArray(preEntry)) return preEntry.filter((v)=>'string' == typeof v && v.length > 0);
+    if ('string' == typeof preEntry) return preEntry ? [
+        preEntry
+    ] : [];
+    return [];
+};
+const resolvePreEntryImportPath = ({ preEntry, appDirectory, srcDirectory, internalSrcAlias })=>{
+    const absPath = path.isAbsolute(preEntry) ? preEntry : path.resolve(appDirectory, preEntry);
+    if (absPath.startsWith(srcDirectory)) return formatImportPath(absPath.replace(srcDirectory, internalSrcAlias));
+    return formatImportPath(absPath);
+};
 const generateCode = async (entrypoints, appContext, config, hooks)=>{
     const { mountId } = config.html;
-    const { enableAsyncEntry } = config.source;
-    const { runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory, serverRoutes } = appContext;
+    const { enableAsyncEntry, enableAsyncPreEntry, preEntry } = config.source;
+    const shouldInjectAsyncPreEntry = !!enableAsyncEntry && !!enableAsyncPreEntry;
+    const { appDirectory, runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory, serverRoutes } = appContext;
     await Promise.all(entrypoints.map(async (entrypoint)=>{
         const { entryName, isAutoMount, entry, customEntry, customServerEntry, nestedRoutesEntry } = entrypoint;
         const { plugins: runtimePlugins } = await hooks._internalRuntimePlugins.call({
@@ -39,6 +53,21 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 urlPath: serverRoutes.find((route)=>route.entryName === entryName)?.urlPath,
                 isNestedRouter: entrypoint.nestedRoutesEntry
             });
+            if (shouldInjectAsyncPreEntry) {
+                const preEntries = normalizePreEntry(preEntry);
+                if (preEntries.length > 0) {
+                    const injected = preEntries.map((item)=>{
+                        const importPath = resolvePreEntryImportPath({
+                            preEntry: item,
+                            appDirectory,
+                            srcDirectory,
+                            internalSrcAlias
+                        });
+                        return `import '${importPath}';`;
+                    }).join('\n');
+                    indexCode = `${injected}\n${indexCode}`;
+                }
+            }
             const indexFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_FILE_NAME}`);
             await fs.outputFile(indexFile, indexCode, 'utf8');
             if (enableAsyncEntry) {

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

@@ -72,7 +72,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                                 } else this.push(chunk);
                                 callback();
                             } catch (e) {
-                                e instanceof Error ? callback(e) : callback(new Error('Received unkown error when streaming'));
+                                e instanceof Error ? callback(e) : callback(new Error('Received unknown error when streaming'));
                             }
                         }
                     });

package/dist/esm-node/router/runtime/plugin.node.mjs

@@ -12,7 +12,7 @@ import DeferredDataScripts_node from "./DeferredDataScripts.node.mjs";
 import { modifyRoutes, onBeforeCreateRoutes } from "./hooks.mjs";
 import { RSCStaticRouter, createServerPayload, handleRSCRedirect, prepareRSCRoutes } from "./rsc-router.mjs";
 import { createRouteObjectsFromConfig, renderRoutes, urlJoin } from "./utils.mjs";
-function createRemixReuqest(request) {
+function createRemixRequest(request) {
     const method = 'GET';
     const { headers } = request;
     const controller = new AbortController();
@@ -60,7 +60,7 @@ const routerPlugin = (userConfig = {})=>({
                 const { query } = createStaticHandler(routes, {
                     basename: _basename
                 });
-                const remixRequest = createRemixReuqest(context.ssrContext.request.raw);
+                const remixRequest = createRemixRequest(context.ssrContext.request.raw);
                 const end = time();
                 const routerContext = await query(remixRequest, {
                     requestContext

package/dist/types/router/runtime/constants.d.ts

@@ -30,7 +30,7 @@ export declare const resolveFnStr = "function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].
 /**
    * update data for pre resolved promises
    * original function:
-   * function preResovledDeferredPromise(data, error) {
+   * function preResolvedDeferredPromise(data, error) {
     if(typeof error !== 'undefined'){
       return Promise.reject(new Error(error.message));
     }else{

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.5",
+  "version": "3.2.0",
   "engines": {
     "node": ">=20"
   },
@@ -204,8 +204,8 @@
     "@loadable/component": "5.16.7",
     "@loadable/server": "5.16.7",
     "@swc/helpers": "^0.5.17",
-    "@swc/core": "1.15.11",
-    "@swc/plugin-loadable-components": "^11.5.0",
+    "@swc/core": "1.15.33",
+    "@swc/plugin-loadable-components": "^11.9.0",
     "@types/loadable__component": "^5.13.10",
     "@types/react-helmet": "^6.1.11",
     "cookie": "0.7.2",
@@ -215,12 +215,12 @@
     "isbot": "3.8.0",
     "react-helmet": "^6.1.0",
     "react-is": "^18.3.1",
-    "@modern-js/render": "3.1.5",
-    "@modern-js/plugin": "3.1.5",
-    "@modern-js/plugin-data-loader": "3.1.5",
-    "@modern-js/runtime-utils": "3.1.5",
-    "@modern-js/types": "3.1.5",
-    "@modern-js/utils": "3.1.5"
+    "@modern-js/plugin": "3.2.0",
+    "@modern-js/plugin-data-loader": "3.2.0",
+    "@modern-js/render": "3.2.0",
+    "@modern-js/runtime-utils": "3.2.0",
+    "@modern-js/types": "3.2.0",
+    "@modern-js/utils": "3.2.0"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -229,20 +229,20 @@
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
     "@rsbuild/core": "2.0.0",
-    "@rslib/core": "0.21.2",
+    "@rslib/core": "0.21.4",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.37",
     "@types/loadable__server": "5.12.11",
     "@types/node": "^20",
-    "react": "^19.2.4",
-    "react-dom": "^19.2.4",
+    "react": "^19.2.6",
+    "react-dom": "^19.2.6",
     "ts-node": "^10.9.2",
     "typescript": "^5",
+    "@modern-js/app-tools": "3.2.0",
     "@modern-js/rslib": "2.68.10",
-    "@scripts/rstest-config": "2.66.0",
-    "@modern-js/app-tools": "3.1.5"
+    "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {