@modern-js/runtime 2.58.2-alpha.0 → 2.58.3

package/dist/esm-node/core/compatible.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useContext, useMemo } from "react";
 import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
+import React, { useContext, useMemo } from "react";
+import { hydrateRoot as ModernHydrateRoot } from "./browser/hydrate";
+import { getGlobalAppInit } from "./context";
 import { RuntimeReactContext } from "./context/runtime";
-import { registerPlugin } from "./plugin";
 import { createLoaderManager } from "./loader/loaderManager";
+import { registerPlugin } from "./plugin";
 import { getGlobalRunner } from "./plugin/runner";
-import { getGlobalAppInit } from "./context";
-import { hydrateRoot as ModernHydrateRoot } from "./browser/hydrate";
 import { wrapRuntimeContextProvider } from "./react/wrapper";
 const IS_REACT18 = process.env.IS_REACT18 === "true";
 function isClientArgs(id) {

package/dist/esm-node/core/context/runtime.js

@@ -1,5 +1,5 @@
-import { createContext } from "react";
 import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
+import { createContext } from "react";
 import { createLoaderManager } from "../loader/loaderManager";
 const RuntimeReactContext = createContext({});
 const ServerRouterContext = createContext({});

package/dist/esm-node/core/loader/loaderManager.js

@@ -24,7 +24,7 @@ const createLoader = (id, initialData = {
   reloading: false,
   data: void 0,
   error: void 0
-}, loaderFn, skip = false) => {
+}, loaderFn = () => Promise.resolve(), skip = false) => {
   let promise;
   let status = 0;
   let { data, error } = initialData;

package/dist/esm-node/core/loader/useLoader.js

@@ -1,5 +1,5 @@
-import { useContext, useRef, useMemo, useState, useCallback, useEffect } from "react";
 import invariant from "invariant";
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { RuntimeReactContext } from "../context/runtime";
 import { LoaderStatus } from "./loaderManager";
 const useLoader = (loaderFn, options = {

package/dist/esm-node/core/plugin/base.js

@@ -1,4 +1,4 @@
-import { createManager, createWaterfall, createAsyncInterruptWorkflow, createSyncParallelWorkflow, createContext } from "@modern-js/plugin";
+import { createAsyncInterruptWorkflow, createContext, createManager, createSyncParallelWorkflow, createWaterfall } from "@modern-js/plugin";
 const RuntimeConfigContext = createContext({});
 const useRuntimeConfigContext = () => RuntimeConfigContext.use().value;
 const wrapRoot = createWaterfall();

package/dist/esm-node/core/plugin/index.js

@@ -1,5 +1,5 @@
 import { merge } from "@modern-js/runtime-utils/merge";
-import { runtime, RuntimeConfigContext } from "./base";
+import { RuntimeConfigContext, runtime } from "./base";
 import { getGlobalRunner, setGlobalRunner } from "./runner";
 export * from "./base";
 function setupConfigContext() {

package/dist/esm-node/core/server/react/prerender/index.js

@@ -1,6 +1,6 @@
-import withSideEffect from "react-side-effect";
 import React, { createElement } from "react";
-import { getOutermostProperty, aggKeysFromPropsList, exist, aggMatchesFromPropsList } from "./util";
+import withSideEffect from "react-side-effect";
+import { aggKeysFromPropsList, aggMatchesFromPropsList, exist, getOutermostProperty } from "./util";
 const PROP_NAMES = {
   INTERVAL: "interval",
   STALE_LIMIT: "staleLimit",

package/dist/esm-node/core/server/requestHandler.js

@@ -1,11 +1,11 @@
 import { getPathname, parseCookie, parseHeaders, parseQuery } from "@modern-js/runtime-utils/universal/request";
-import { createRoot } from "../react";
 import { getGlobalAppInit } from "../context";
-import { getGlobalRunner } from "../plugin/runner";
 import { getInitialContext } from "../context/runtime";
 import { createLoaderManager } from "../loader/loaderManager";
-import { getSSRConfigByEntry, getSSRMode } from "./utils";
+import { getGlobalRunner } from "../plugin/runner";
+import { createRoot } from "../react";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";
+import { getSSRConfigByEntry, getSSRMode } from "./utils";
 function createSSRContext(request, options) {
   const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
   const { nonce } = config;
@@ -18,7 +18,10 @@ function createSSRContext(request, options) {
   const headersData = parseHeaders(request);
   const url = new URL(request.url);
   const host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
-  const protocal = `${headers.get("X-Forwarded-Proto") || url.protocol || "http"}:`;
+  let protocol = (headers.get("X-Forwarded-Proto") || url.protocol || "http").split(/\s*,\s*/, 1)[0];
+  if (!protocol.endsWith(":")) {
+    protocol += ":";
+  }
   const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   const ssrMode = getSSRMode(ssrConfig);
   const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
@@ -30,7 +33,7 @@ function createSSRContext(request, options) {
     logger,
     metrics,
     request: {
-      url: request.url.replace(url.host, host).replace(url.protocol, protocal),
+      url: request.url.replace(url.host, host).replace(url.protocol, protocol),
       baseUrl: route.urlPath,
       userAgent: headers.get("user-agent"),
       cookie,
@@ -60,6 +63,7 @@ function createSSRContext(request, options) {
 }
 const createRequestHandler = async (handleRequest) => {
   const requestHandler = async (request, options) => {
+    var _context_routerContext, _context_routerContext1;
     const Root = createRoot();
     const runner = getGlobalRunner();
     const { routeManifest } = options.resource;
@@ -107,6 +111,10 @@ const createRequestHandler = async (handleRequest) => {
       return void 0;
     };
     const initialData = await runBeforeRender(context);
+    if (((_context_routerContext = context.routerContext) === null || _context_routerContext === void 0 ? void 0 : _context_routerContext.statusCode) && ((_context_routerContext1 = context.routerContext) === null || _context_routerContext1 === void 0 ? void 0 : _context_routerContext1.statusCode) !== 200) {
+      var _context_routerContext2, _context_ssrContext;
+      (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.response.status((_context_routerContext2 = context.routerContext) === null || _context_routerContext2 === void 0 ? void 0 : _context_routerContext2.statusCode);
+    }
     context.initialData = initialData;
     const redirectResponse = getRedirectResponse(initialData);
     if (redirectResponse) {

package/dist/esm-node/core/server/stream/afterTemplate.js

@@ -1,7 +1,7 @@
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import { attributesToString, safeReplace } from "../utils";
 import { SSR_DATA_PLACEHOLDER } from "../constants";
 import { buildHtml } from "../shared";
+import { attributesToString, safeReplace } from "../utils";
 function buildShellAfterTemplate(afterAppTemplate, options) {
   const { request, config, ssrConfig, runtimeContext, renderLevel, entryName } = options;
   const callbacks = [

package/dist/esm-node/core/server/stream/beforeTemplate.js

@@ -1,9 +1,9 @@
-import ReactHelmet from "react-helmet";
 import { matchRoutes } from "@modern-js/runtime-utils/router";
-import { createReplaceHelemt } from "../helmet";
+import ReactHelmet from "react-helmet";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants";
-import { checkIsNode, safeReplace } from "../utils";
+import { createReplaceHelemt } from "../helmet";
 import { buildHtml } from "../shared";
+import { checkIsNode, safeReplace } from "../utils";
 const readAsset = async (chunk) => {
   const fs = await import("fs/promises");
   const path = await import("path");

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

@@ -1,11 +1,11 @@
 import { Transform } from "stream";
 import { createReadableStreamFromReadable } from "@modern-js/runtime-utils/node";
-import { ServerStyleSheet } from "styled-components";
 import checkIsBot from "isbot";
+import { ServerStyleSheet } from "styled-components";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { RenderLevel } from "../../constants";
-import { getTemplates } from "./template";
 import { ShellChunkStatus, getReadableStreamFromString } from "./shared";
+import { getTemplates } from "./template";
 const createReadableStreamFromElement = async (request, rootElement, options) => {
   const { renderToPipeableStream } = await import("react-dom/server");
   const { runtimeContext, htmlTemplate, config, ssrConfig, entryName } = options;

package/dist/esm-node/core/server/stream/createReadableStream.worker.js

@@ -1,7 +1,7 @@
-import { renderToReadableStream } from "react-dom/server";
 import checkIsBot from "isbot";
-import { RenderLevel } from "../../constants";
+import { renderToReadableStream } from "react-dom/server";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
+import { RenderLevel } from "../../constants";
 import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString } from "./shared";
 import { getTemplates } from "./template";
 const createReadableStreamFromElement = async (request, rootElement, options) => {

package/dist/esm-node/core/server/stream/shared.js

@@ -1,6 +1,6 @@
+import { run } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
 import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
-import { run } from "@modern-js/runtime-utils/node";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
 import { SSRErrors, SSRTimings, createOnError, createOnTiming } from "../tracer";
 import { getSSRConfigByEntry } from "../utils";

package/dist/esm-node/core/server/stream/template.js

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

package/dist/esm-node/core/server/string/index.js

@@ -1,19 +1,19 @@
-import ReactHelmet from "react-helmet";
-import ReactDomServer from "react-dom/server";
-import { time } from "@modern-js/runtime-utils/time";
 import { run } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
+import ReactDomServer from "react-dom/server";
+import ReactHelmet from "react-helmet";
+import { RenderLevel } from "../../constants";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
-import { createReplaceHelemt } from "../helmet";
-import { getSSRConfigByEntry, safeReplace } from "../utils";
 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, createOnError, createOnTiming } from "../tracer";
-import { RenderLevel } from "../../constants";
-import { SSRDataCollector } from "./ssrData";
+import { getSSRConfigByEntry, safeReplace } from "../utils";
 import { LoadableCollector } from "./loadable";
-import { StyledCollector } from "./styledComponent";
 import { prefetch } from "./prefetch";
+import { SSRDataCollector } from "./ssrData";
+import { StyledCollector } from "./styledComponent";
 const renderString = async (request, serverRoot, options) => {
   const headersData = parseHeaders(request);
   return run(headersData, async () => {
@@ -72,22 +72,22 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
   const end = time();
   let html = "";
   let helmetData;
-  if (chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH) {
-    try {
-      const finalApp = collectors.reduce((pre, creator) => {
-        var _creator_collect;
-        return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
-      }, App);
+  try {
+    const finalApp = collectors.reduce((pre, creator) => {
+      var _creator_collect;
+      return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
+    }, App);
+    if (chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH) {
       html = ReactDomServer.renderToString(finalApp);
-      helmetData = ReactHelmet.renderStatic();
       chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
-      await Promise.all(collectors.map((component) => component.effect()));
-      const cost = end();
-      onTiming(SSRTimings.RENDER_HTML, cost);
-    } catch (e) {
-      chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
-      onError(SSRErrors.RENDER_HTML, e);
     }
+    helmetData = ReactHelmet.renderStatic();
+    await Promise.all(collectors.map((component) => component.effect()));
+    const cost = end();
+    onTiming(SSRTimings.RENDER_HTML, cost);
+  } catch (e) {
+    chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
+    onError(SSRErrors.RENDER_HTML, e);
   }
   const { ssrScripts, cssChunk, jsChunk } = chunkSet;
   const finalHtml = await buildHtml(htmlTemplate, [

package/dist/esm-node/core/server/string/prefetch.js

@@ -1,8 +1,8 @@
-import { renderToStaticMarkup } from "react-dom/server";
-import { run } from "@modern-js/runtime-utils/node";
 import { ChunkExtractor } from "@loadable/server";
+import { run } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
 import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
+import { renderToStaticMarkup } from "react-dom/server";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
 import { SSRErrors, SSRTimings } from "../tracer";
 const prefetch = async (App, request, options, ssrConfig, { onError, onTiming }) => {

package/dist/esm-node/core/server/string/ssrData.js

@@ -4,8 +4,8 @@ import { _ as _class_private_field_set } from "@swc/helpers/_/_class_private_fie
 import { _ as _class_private_method_get } from "@swc/helpers/_/_class_private_method_get";
 import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_method_init";
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import { attributesToString, serializeErrors } from "../utils";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../../constants";
+import { attributesToString, serializeErrors } from "../utils";
 var _options = /* @__PURE__ */ new WeakMap(), _getSSRData = /* @__PURE__ */ new WeakSet(), _getSSRDataScripts = /* @__PURE__ */ new WeakSet();
 class SSRDataCollector {
   effect() {

package/dist/esm-node/document/Body.js

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

package/dist/esm-node/document/Comment.js

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

package/dist/esm-node/document/Head.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
 import { DocumentStructureContext } from "./DocumentStructureContext";
-import { Scripts } from "./Scripts";
 import { Links } from "./Links";
+import { Scripts } from "./Scripts";
 import { Title } from "./Title";
 import { DOCUMENT_META_PLACEHOLDER, HEAD_PARTICALS_SEPARATOR, TOP_PARTICALS_SEPARATOR } from "./constants";
 function Head(props) {

package/dist/esm-node/document/Root.js

@@ -1,6 +1,6 @@
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { useContext } from "react";
 import { omit } from "@modern-js/utils/lodash";
+import { useContext } from "react";
 import { DocumentContext } from "./DocumentContext";
 import { DOCUMENT_SSR_PLACEHOLDER } from "./constants";
 function Root(props) {

package/dist/esm-node/document/Script.js

@@ -1,5 +1,5 @@
 import { jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END } from "./constants";
+import { DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START } from "./constants";
 function Script(props) {
   const { content } = props;
   const contentStr = content.toString();

package/dist/esm-node/document/Style.js

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

package/dist/esm-node/document/cli/index.js

@@ -1,10 +1,10 @@
 import path from "path";
+import { fs, createDebugger, findExists } from "@modern-js/utils";
+import { build } from "esbuild";
 import React from "react";
 import ReactDomServer from "react-dom/server";
-import { build } from "esbuild";
-import { createDebugger, findExists, fs } from "@modern-js/utils";
 import { DocumentContext } from "../DocumentContext";
-import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, HTML_SEPARATOR, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_TITLE_PLACEHOLDER, TOP_PARTICALS_SEPARATOR, HEAD_PARTICALS_SEPARATOR, BODY_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_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";
 const debug = createDebugger("html_genarate");
 const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;

package/dist/esm-node/router/cli/code/getClientRoutes/getRoutes.js

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

package/dist/esm-node/router/cli/code/getClientRoutes/getRoutesLegacy.js

@@ -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, FILE_SYSTEM_ROUTES_LAYOUT } from "../../constants";
-import { replaceWithAlias } from "../utils";
 import { makeLegalIdentifier } from "../makeLegalIdentifier";
-import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
+import { replaceWithAlias } from "../utils";
+import { debug, findLayout, getRouteWeight, shouldSkip } from "./utils";
 const compName = (srcDirectory, filePath) => {
   const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
   return `Comp_${legalCompName}`;

package/dist/esm-node/router/cli/code/getClientRoutes/utils.js

@@ -1,6 +1,6 @@
 import path from "path";
-import { JS_EXTENSIONS, createDebugger, findExists, fs } from "@modern-js/utils";
-import { FILE_SYSTEM_ROUTES_LAYOUT, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX } from "../../constants";
+import { fs, JS_EXTENSIONS, createDebugger, findExists } from "@modern-js/utils";
+import { FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../../constants";
 const debug = createDebugger("get-client-routes");
 const findLayout = (dir) => findExists(JS_EXTENSIONS.map((ext) => path.resolve(dir, `${FILE_SYSTEM_ROUTES_LAYOUT}${ext}`)));
 const getRouteWeight = (route) => route === "*" ? 999 : route.split(":").length - 1;

package/dist/esm-node/router/cli/code/index.js

@@ -1,12 +1,12 @@
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, filterRoutesForServer, filterRoutesLoader } from "@modern-js/utils";
+import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
-import * as templates from "./templates";
+import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
-import { getServerLoadersFile, getServerCombinedModueFile } from "./utils";
 import { walk } from "./nestedRoutes";
+import * as templates from "./templates";
+import { getServerCombinedModueFile, getServerLoadersFile } from "./utils";
 const generateCode = async (appContext, config, entrypoints, api) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();

package/dist/esm-node/router/cli/code/nestedRoutes.js

@@ -1,5 +1,5 @@
 import * as path from "path";
-import { JS_EXTENSIONS, fs, normalizeToPosixPath } from "@modern-js/utils";
+import { fs, JS_EXTENSIONS, normalizeToPosixPath } from "@modern-js/utils";
 import { NESTED_ROUTE } from "../constants";
 import { getPathWithoutExt, hasAction, replaceWithAlias } from "./utils";
 const conventionNames = Object.values(NESTED_ROUTE);

package/dist/esm-node/router/cli/code/templates.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { findExists, formatImportPath, fs, getEntryOptions, isSSGEntry, slash } from "@modern-js/utils";
+import { fs, findExists, formatImportPath, getEntryOptions, isSSGEntry, slash } from "@modern-js/utils";
 import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, TEMP_LOADERS_DIR } from "../constants";
 import { getPathWithoutExt, getServerLoadersFile, parseModule, replaceWithAlias } from "./utils";
@@ -332,14 +332,21 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     if (!config.source.enableAsyncEntry) {
       return combinedModule;
     }
-    return `export default Promise.all([import("${slash(serverLoaderRuntime)}"),import("${slash(serverLoadersFile)}")]).then(res=>{
-      return res.reduce((sum,cur)=>{
-        return {
-          ...sum,
-          ...cur
-        }
-     },{})
-    })`;
+    return `
+    async function loadModules() {
+      const [moduleA, moduleB] = await Promise.all([
+        import("${slash(serverLoaderRuntime)}"),
+        import("${slash(serverLoadersFile)}")
+      ]);
+
+      return {
+        ...moduleA,
+        ...moduleB
+      };
+    }
+
+    export { loadModules };
+    `;
   }
   return null;
 }

package/dist/esm-node/router/cli/code/utils.js

@@ -1,8 +1,8 @@
 import fs from "fs";
 import path from "path";
-import { normalizeToPosixPath, fs as fse, JS_EXTENSIONS } from "@modern-js/utils";
-import { transform } from "esbuild";
+import { JS_EXTENSIONS, fs as fse, normalizeToPosixPath } from "@modern-js/utils";
 import { parse } from "es-module-lexer";
+import { transform } from "esbuild";
 import { ACTION_EXPORT_NAME, LOADER_EXPORT_NAME } from "../constants";
 const walkDirectory = (dir) => fs.readdirSync(dir).reduce((previous, filename) => {
   const filePath = path.join(dir, filename);

package/dist/esm-node/router/cli/entry.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { JS_EXTENSIONS, findExists, fs, isRouterV5 } from "@modern-js/utils";
+import { fs, JS_EXTENSIONS, findExists, isRouterV5 } from "@modern-js/utils";
 import { hasApp } from "../../cli/entry";
 import { FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR, PAGES_DIR_NAME } from "./constants";
 const hasPages = (dir) => fs.existsSync(path.join(dir, PAGES_DIR_NAME));

package/dist/esm-node/router/cli/handler.js

@@ -1,8 +1,8 @@
 import path from "path";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { modifyEntrypoints } from "./entry";
-import { isPageComponentFile } from "./code/utils";
 import * as templates from "./code/templates";
+import { isPageComponentFile } from "./code/utils";
+import { modifyEntrypoints } from "./entry";
 let originEntrypoints = [];
 async function handleModifyEntrypoints(api, entrypoints) {
   const config = api.useResolvedConfigContext();

package/dist/esm-node/router/cli/index.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { createRuntimeExportsUtils, filterRoutesForServer, fs, getEntryOptions, isRouterV5 as isV5, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, filterRoutesForServer, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";

package/dist/esm-node/router/runtime/DeferredDataScripts.node.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Suspense, useEffect, useRef, useMemo } from "react";
-import { Await, useAsyncError } from "@modern-js/runtime-utils/router";
 import { serializeJson } from "@modern-js/runtime-utils/node";
+import { Await, useAsyncError } from "@modern-js/runtime-utils/router";
+import { Suspense, useEffect, useMemo, useRef } from "react";
 import { serializeErrors } from "./utils";
 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}}))};`;
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;

package/dist/esm-node/router/runtime/PrefetchLink.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Link as RouterLink, NavLink as RouterNavLink, matchRoutes, useHref, useMatches, useResolvedPath } from "@modern-js/runtime-utils/router";
 import React, { useContext, useMemo } from "react";
-import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/runtime-utils/router";
 import { RuntimeReactContext } from "../../core";
 function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {

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

@@ -1,10 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useContext, useMemo } from "react";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation, useHref } from "@modern-js/runtime-utils/router";
-import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { merge } from "@modern-js/runtime-utils/merge";
-import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
+import { RouterProvider, createBrowserRouter, createHashRouter, createRoutesFromElements, useHref, useLocation, useMatches } from "@modern-js/runtime-utils/router";
+import { useContext, useMemo } from "react";
 import { RuntimeReactContext } from "../../core";
+import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
 let finalRouteConfig = {

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

@@ -1,18 +1,18 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useContext } from "react";
+import { merge } from "@modern-js/runtime-utils/merge";
+import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { StaticRouterProvider, createStaticRouter } from "@modern-js/runtime-utils/node/router";
 import { createStaticHandler } from "@modern-js/runtime-utils/remix-router";
-import { createStaticRouter, StaticRouterProvider } from "@modern-js/runtime-utils/node/router";
 import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
-import { reporterCtx, createRequestContext } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
-import { merge } from "@modern-js/runtime-utils/merge";
+import { useContext } from "react";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
 import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
-import { renderRoutes, urlJoin } from "./utils";
-import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import DeferredDataScripts from "./DeferredDataScripts.node";
+import { modifyRoutes as modifyRoutesHook } from "./hooks";
+import { renderRoutes, urlJoin } from "./utils";
 function createRemixReuqest(request) {
   const method = "GET";
   const { headers } = request;

package/dist/esm-node/router/runtime/utils.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Route, isRouteErrorResponse } from "@modern-js/runtime-utils/router";
-import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "@modern-js/runtime-utils/remix-router";
 import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
+import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "@modern-js/runtime-utils/remix-router";
+import { Route, isRouteErrorResponse } from "@modern-js/runtime-utils/router";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {

package/dist/esm-node/state/plugins.js

@@ -1,5 +1,5 @@
-import { plugin as effectsPlugin } from "@modern-js-reduck/plugin-effects";
 import autoActionsPlugin from "@modern-js-reduck/plugin-auto-actions";
+import { plugin as effectsPlugin } from "@modern-js-reduck/plugin-effects";
 import immerPlugin from "@modern-js-reduck/plugin-immutable";
 import { default as default2 } from "@modern-js-reduck/plugin-devtools";
 const effects = () => effectsPlugin;

package/dist/esm-node/state/runtime/plugin.js

@@ -1,11 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useContext } from "react";
-import { createStore } from "@modern-js-reduck/store";
 import { Provider } from "@modern-js-reduck/react";
+import { createStore } from "@modern-js-reduck/store";
 import { merge } from "@modern-js/runtime-utils/merge";
-import { immer, effects, autoActions, devtools } from "../plugins";
-import { RuntimeReactContext } from "../../core";
+import { useContext } from "react";
 import { isBrowser } from "../../common";
+import { RuntimeReactContext } from "../../core";
+import { autoActions, devtools, effects, immer } from "../plugins";
 const StatePluginHandleMap = {
   immer,
   effects,

package/dist/types/cli/alias.d.ts

@@ -1,4 +1,4 @@
-import { Entrypoint } from '@modern-js/types';
+import type { Entrypoint } from '@modern-js/types';
 import type { RsbuildPlugin } from '@rsbuild/core';
 export declare const builderPluginAlias: ({ entrypoints, internalDirectory, metaName, }: {
     entrypoints: Entrypoint[];

package/dist/types/cli/code.d.ts

@@ -1,6 +1,6 @@
 import type { AppTools, IAppContext, NormalizedConfig, RuntimePlugin } from '@modern-js/app-tools';
-import { Entrypoint } from '@modern-js/types';
 import type { MaybeAsync } from '@modern-js/plugin';
+import type { Entrypoint } from '@modern-js/types';
 export declare const generateCode: (entrypoints: Entrypoint[], appContext: IAppContext, config: NormalizedConfig<AppTools>, onCollectRuntimePlugins: (params: {
     entrypoint: Entrypoint;
     plugins: RuntimePlugin[];