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

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, markRoutes } 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();
@@ -81,7 +81,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           })
         });
         if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {
-          var _config_output1;
+          var _config_output1, _config_output2;
           const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
           const filtedRoutesForServer = filterRoutesForServer(routes);
           const routesForServerLoaderMatches = filterRoutesLoader(routes);
@@ -100,6 +100,16 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output1 = config2.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
           });
           await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, "utf8");
+          const mfServerRoutesCode = await templates.fileSystemRoutes({
+            metaName,
+            routes,
+            ssrMode: useSSG ? "string" : mode,
+            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+            entryName: entrypoint.entryName,
+            internalDirectory,
+            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output2 = config2.output) === null || _config_output2 === void 0 ? void 0 : _config_output2.splitRouteChunks
+          });
+          await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/mf-routes.js`), mfServerRoutesCode, "utf8");
         }
         const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
         if (serverLoaderCombined) {
@@ -111,25 +121,6 @@ const generateCode = async (appContext, config, entrypoints, api) => {
     }
   }
 };
-function markRoutes(routes, routeIds) {
-  return routes.map((route) => {
-    if (route.type !== "nested") {
-      return route;
-    }
-    if (route.children && route.children.length > 0) {
-      route.children = markRoutes(route.children, routeIds);
-    }
-    if (route.children && route.children.length > 0) {
-      route.inValidSSRRoute = route.children.every((child) => {
-        var _child_inValidSSRRoute;
-        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
-      });
-    } else if (route.id) {
-      route.inValidSSRRoute = !routeIds.includes(route.id);
-    }
-    return route;
-  });
-}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }

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/code.d.ts

@@ -1,6 +1,6 @@
 import type { AppTools, IAppContext, NormalizedConfig, RuntimePlugin } from '@modern-js/app-tools';
-import type { 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[];

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

@@ -1,7 +1,7 @@
-import type { CliPlugin, AppTools } from '@modern-js/app-tools';
-import { statePlugin } from '../state/cli';
-import { routerPlugin } from '../router/cli';
+import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import { documentPlugin } from '../document/cli';
+import { routerPlugin } from '../router/cli';
+import { statePlugin } from '../state/cli';
 import { ssrPlugin } from './ssr';
 export { isRuntimeEntry } from './entry';
 export { statePlugin, ssrPlugin, routerPlugin, documentPlugin };

package/dist/types/cli/ssr/index.d.ts

@@ -1,3 +1,3 @@
-import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 export declare const ssrPlugin: () => CliPlugin<AppTools>;
 export default ssrPlugin;

package/dist/types/common.d.ts

@@ -1,5 +1,5 @@
-import type { StateConfig } from './state';
 import type { Plugin } from './core/plugin';
+import type { StateConfig } from './state';
 export declare const isBrowser: () => boolean;
 export interface AppConfig {
     state?: StateConfig | boolean;

package/dist/types/config.d.ts

@@ -1,5 +1,5 @@
-import type { StateConfig } from './state';
 import type { RouterConfig } from './router';
+import type { StateConfig } from './state';
 export interface RuntimeUserConfig {
     runtime?: {
         state?: boolean | StateConfig;

package/dist/types/core/compatible.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Renderer } from 'react-dom';
-import type { hydrateRoot, createRoot } from 'react-dom/client';
+import type { createRoot, hydrateRoot } from 'react-dom/client';
 import { type RuntimeContext, type TRuntimeContext } from './context/runtime';
 import { type Plugin, type runtime } from './plugin';
 export type CreateAppOptions = {

package/dist/types/core/context/runtime.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import type { Store } from '@modern-js-reduck/store';
-import type { StaticHandlerContext, Router, RouterState } from '@modern-js/runtime-utils/remix-router';
+import type { Router, RouterState, StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
+import type { RouteManifest } from '../../router/runtime/types';
 import { createLoaderManager } from '../loader/loaderManager';
 import type { PluginRunner, runtime } from '../plugin';
-import type { RouteManifest } from '../../router/runtime/types';
 import type { SSRServerContext } from '../types';
 export interface BaseRuntimeContext {
     initialData?: Record<string, unknown>;

package/dist/types/core/plugin/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { runtime, type Plugin } from './base';
+import { type Plugin, runtime } from './base';
 export * from './base';
 export interface RuntimeConfig {
     plugins?: Plugin[];

package/dist/types/core/server/stream/afterTemplate.d.ts

@@ -1,7 +1,7 @@
-import { type SSRConfig } from '../shared';
 import type { RenderLevel } from '../../constants';
-import type { HandleRequestConfig } from '../requestHandler';
 import type { RuntimeContext } from '../../context';
+import type { HandleRequestConfig } from '../requestHandler';
+import { type SSRConfig } from '../shared';
 export type BuildShellAfterTemplateOptions = {
     runtimeContext: RuntimeContext;
     renderLevel: RenderLevel;

package/dist/types/core/server/stream/template.d.ts

@@ -1,5 +1,5 @@
-import { type BuildShellBeforeTemplateOptions } from './beforeTemplate';
 import { type BuildShellAfterTemplateOptions } from './afterTemplate';
+import { type BuildShellBeforeTemplateOptions } from './beforeTemplate';
 export type InjectTemplate = {
     shellBefore: string;
     shellAfter: string;

package/dist/types/core/server/string/loadable.d.ts

@@ -1,5 +1,5 @@
 import type { ReactElement } from 'react';
-import type { Collector, ChunkSet } from './types';
+import type { ChunkSet, Collector } from './types';
 declare module '@loadable/server' {
     interface ChunkExtractor {
         chunks: Chunk;

package/dist/types/core/server/string/prefetch.d.ts

@@ -1,8 +1,8 @@
 import type React from 'react';
 import type { LoaderResult } from '../../loader/loaderManager';
 import type { HandleRequestOptions } from '../requestHandler';
-import { type Tracer } from '../tracer';
 import type { SSRConfig } from '../shared';
+import { type Tracer } from '../tracer';
 export declare const prefetch: (App: React.ReactElement, request: Request, options: HandleRequestOptions, ssrConfig: SSRConfig, { onError, onTiming }: Tracer) => Promise<{
     initialData: Record<string, unknown> | undefined;
     i18nData: any;

package/dist/types/core/server/string/ssrData.d.ts

@@ -1,7 +1,7 @@
 import type { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
-import type { SSRConfig } from '../shared';
 import type { SSRServerContext } from '../../types';
-import type { Collector, ChunkSet } from './types';
+import type { SSRConfig } from '../shared';
+import type { ChunkSet, Collector } from './types';
 export interface SSRDataCreatorOptions {
     request: Request;
     prefetchData: Record<string, any>;

package/dist/types/core/server/string/styledComponent.d.ts

@@ -1,5 +1,5 @@
-import { ServerStyleSheet } from 'styled-components';
 import type { ReactElement } from 'react';
+import { ServerStyleSheet } from 'styled-components';
 import type { ChunkSet, Collector } from './types';
 export declare class StyledCollector implements Collector {
     #private;

package/dist/types/core/server/utils.d.ts

@@ -1,5 +1,5 @@
-import { type StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
 import type { ServerUserConfig } from '@modern-js/app-tools';
+import { type StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
 import type { SSRConfig } from './shared';
 export declare function attributesToString(attributes: Record<string, any>): string;
 /**

package/dist/types/core/types.d.ts

@@ -1,6 +1,6 @@
 import type { BaseSSRServerContext } from '@modern-js/types';
-import type { LoaderResult } from './loader/loaderManager';
 import type { RenderLevel } from './constants';
+import type { LoaderResult } from './loader/loaderManager';
 declare global {
     interface Window {
         _SSR_DATA?: SSRContainer;

package/dist/types/document/cli/index.d.ts

@@ -1,4 +1,4 @@
-import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import type { Entrypoint } from '@modern-js/types/cli';
 export declare const getDocumenByEntryName: (entrypoints: Entrypoint[], entryName: string, fallbackDir?: string) => string | undefined;
 export declare const documentPlugin: () => CliPlugin<AppTools>;

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-import type { StateConfig } from './state';
 import type { RouterConfig } from './router';
+import type { StateConfig } from './state';
 export type { Plugin } from './core';
 export type { AppConfig, RuntimeConfig } from './common';
 export { isBrowser } from './common';

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

@@ -1,5 +1,5 @@
+import type { AppNormalizedConfig, AppTools } from '@modern-js/app-tools';
 import type { IAppContext, PluginAPI } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
-import type { AppNormalizedConfig, AppTools } from '@modern-js/app-tools';
 export declare const generateCode: (appContext: IAppContext, config: AppNormalizedConfig<'shared'>, entrypoints: Entrypoint[], api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
 export declare function generatorRegisterCode(internalDirectory: string, entryName: string, code: string): void;

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

@@ -1,5 +1,5 @@
-import type { Entrypoint, NestedRouteForCli, PageRoute, RouteLegacy, SSRMode } from '@modern-js/types';
 import type { AppNormalizedConfig, IAppContext } from '@modern-js/app-tools';
+import type { Entrypoint, NestedRouteForCli, PageRoute, RouteLegacy, SSRMode } from '@modern-js/types';
 export declare const routesForServer: ({ routesForServerLoaderMatches, }: {
     routesForServerLoaderMatches: (NestedRouteForCli | PageRoute)[];
 }) => string;

package/dist/types/router/cli/handler.d.ts

@@ -1,6 +1,6 @@
-import type { Entrypoint } from '@modern-js/types';
-import type { PluginAPI } from '@modern-js/core';
 import type { AppTools } from '@modern-js/app-tools';
+import type { PluginAPI } from '@modern-js/core';
+import type { Entrypoint } from '@modern-js/types';
 export declare function handleModifyEntrypoints(api: PluginAPI<AppTools<'shared'>>, entrypoints: Entrypoint[]): Promise<Entrypoint[]>;
 export declare function handleGeneratorEntryCode(api: PluginAPI<AppTools<'shared'>>, entrypoints: Entrypoint[]): Promise<Entrypoint[]>;
 export declare function handleFileChange(api: PluginAPI<AppTools<'shared'>>, e: any): Promise<void>;

package/dist/types/router/cli/index.d.ts

@@ -1,4 +1,4 @@
-import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 export { isRouteEntry } from './entry';
 export { handleFileChange, handleModifyEntrypoints } from './handler';
 export declare const routerPlugin: () => CliPlugin<AppTools<'shared'>>;

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

@@ -1,5 +1,5 @@
-import React from 'react';
 import { type LinkProps as RouterLinkProps, type NavLinkProps as RouterNavLinkProps } from '@modern-js/runtime-utils/router';
+import React from 'react';
 export declare function composeEventHandlers<EventType extends React.SyntheticEvent | Event>(theirHandler: ((event: EventType) => any) | undefined, ourHandler: (event: EventType) => any): (event: EventType) => any;
 /**
  * Modified from https://github.com/remix-run/remix/blob/9a0601bd704d2f3ee622e0ddacab9b611eb0c5bc/packages/remix-react/components.tsx#L218

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

@@ -1,6 +1,6 @@
 import { useRouteLoaderData as useRouteData } from '@modern-js/runtime-utils/router';
 import { routerPlugin } from './plugin';
-import type { SingleRouteConfig, RouterConfig } from './types';
+import type { RouterConfig, SingleRouteConfig } from './types';
 export * from '@modern-js/runtime-utils/router';
 export type { SingleRouteConfig, RouterConfig };
 export { renderRoutes } from './utils';