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

package/dist/cjs/cli/index.js

@@ -29,24 +29,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cli_exports = {};
 __export(cli_exports, {
   default: () => cli_default,
-  documentPlugin: () => import_cli3.documentPlugin,
+  documentPlugin: () => import_cli.documentPlugin,
   isRuntimeEntry: () => import_entry2.isRuntimeEntry,
   routerPlugin: () => import_cli2.routerPlugin,
   runtimePlugin: () => runtimePlugin,
   ssrPlugin: () => import_ssr.ssrPlugin,
-  statePlugin: () => import_cli.statePlugin
+  statePlugin: () => import_cli3.statePlugin
 });
 module.exports = __toCommonJS(cli_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_cli = require("../state/cli");
+var import_cli = require("../document/cli");
 var import_cli2 = require("../router/cli");
-var import_cli3 = require("../document/cli");
-var import_ssr = require("./ssr");
-var import_entry = require("./entry");
-var import_constants = require("./constants");
-var import_code = require("./code");
+var import_cli3 = require("../state/cli");
 var import_alias = require("./alias");
+var import_code = require("./code");
+var import_constants = require("./constants");
+var import_entry = require("./entry");
+var import_ssr = require("./ssr");
 var import_entry2 = require("./entry");
 const runtimePlugin = (params) => ({
   name: "@modern-js/runtime",
@@ -61,8 +61,8 @@ const runtimePlugin = (params) => ({
   usePlugins: (params === null || params === void 0 ? void 0 : params.plugins) || [
     (0, import_ssr.ssrPlugin)(),
     (0, import_cli2.routerPlugin)(),
-    (0, import_cli.statePlugin)(),
-    (0, import_cli3.documentPlugin)()
+    (0, import_cli3.statePlugin)(),
+    (0, import_cli.documentPlugin)()
   ],
   setup: (api) => {
     return {
@@ -142,10 +142,7 @@ const runtimePlugin = (params) => ({
               ]
             },
             bundlerChain: (chain) => {
-              chain.module.rule("modern-entry").test([
-                /\.js$/,
-                /\.jsx$/
-              ]).include.add(import_path.default.resolve(appDirectory, "node_modules", `.${metaName}`)).end().sideEffects(true);
+              chain.module.rule("modern-entry").test(/\.jsx?$/).include.add(import_path.default.resolve(appDirectory, "node_modules", `.${metaName}`)).end().sideEffects(true);
             },
             /**
             * Add IgnorePlugin to fix react-dom/client import error when use react17

package/dist/cjs/cli/ssr/babel-plugin-ssr-loader-id.js

@@ -21,8 +21,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var import_crypto = __toESM(require("crypto"));
 var import_buffer = require("buffer");
+var import_crypto = __toESM(require("crypto"));
 var t = __toESM(require("@babel/types"));
 var import_lodash = require("@modern-js/utils/lodash");
 const RUNTIME_PACKAGE_NAMES = [

package/dist/cjs/cli/template.js

@@ -89,7 +89,7 @@ const runtimeGlobalContext = ({ srcDirectory, internalSrcAlias, metaName, entry,
   return `import { setGlobalContext } from '@${metaName}/runtime/context'
 
 import App from '${// We need to get the path of App.tsx here, but the entry is `src/entry.tsx`
-  (0, import_utils.formatImportPath)(customEntry ? entry.replace("entry.tsx", "App.tsx").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias))}';
+  (0, import_utils.formatImportPath)(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", ""))}';
 
 setGlobalContext({
   App,

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

@@ -23,8 +23,8 @@ __export(hydrate_exports, {
 });
 module.exports = __toCommonJS(hydrate_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_url = require("@modern-js/runtime-utils/url");
 var import_component = require("@loadable/component");
+var import_url = require("@modern-js/runtime-utils/url");
 var import_constants = require("../constants");
 var import_wrapper = require("../react/wrapper");
 var import_withCallback = require("./withCallback");

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

@@ -31,14 +31,14 @@ __export(browser_exports, {
   render: () => render
 });
 module.exports = __toCommonJS(browser_exports);
-var import_cookie = __toESM(require("cookie"));
 var import_parsed = require("@modern-js/runtime-utils/parsed");
+var import_cookie = __toESM(require("cookie"));
+var import_constants = require("../constants");
 var import_context = require("../context");
 var import_runtime = require("../context/runtime");
 var import_loaderManager = require("../loader/loaderManager");
 var import_runner = require("../plugin/runner");
 var import_wrapper = require("../react/wrapper");
-var import_constants = require("../constants");
 var import_hydrate = require("./hydrate");
 const IS_REACT18 = process.env.IS_REACT18 === "true";
 const getQuery = () => window.location.search.substring(1).split("&").reduce((res, item) => {

package/dist/cjs/core/compatible.js

@@ -34,14 +34,14 @@ __export(compatible_exports, {
 });
 module.exports = __toCommonJS(compatible_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = __toESM(require("react"));
 var import_constants = require("@modern-js/utils/universal/constants");
+var import_react = __toESM(require("react"));
+var import_hydrate = require("./browser/hydrate");
+var import_context = require("./context");
 var import_runtime = require("./context/runtime");
-var import_plugin = require("./plugin");
 var import_loaderManager = require("./loader/loaderManager");
+var import_plugin = require("./plugin");
 var import_runner = require("./plugin/runner");
-var import_context = require("./context");
-var import_hydrate = require("./browser/hydrate");
 var import_wrapper = require("./react/wrapper");
 const IS_REACT18 = process.env.IS_REACT18 === "true";
 function isClientArgs(id) {

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

@@ -23,8 +23,8 @@ __export(runtime_exports, {
   getInitialContext: () => getInitialContext
 });
 module.exports = __toCommonJS(runtime_exports);
-var import_react = require("react");
 var import_constants = require("@modern-js/utils/universal/constants");
+var import_react = require("react");
 var import_loaderManager = require("../loader/loaderManager");
 const RuntimeReactContext = (0, import_react.createContext)({});
 const ServerRouterContext = (0, import_react.createContext)({});

package/dist/cjs/core/loader/useLoader.js

@@ -31,8 +31,8 @@ __export(useLoader_exports, {
   default: () => useLoader_default
 });
 module.exports = __toCommonJS(useLoader_exports);
-var import_react = require("react");
 var import_invariant = __toESM(require("invariant"));
+var import_react = require("react");
 var import_runtime = require("../context/runtime");
 var import_loaderManager = require("./loaderManager");
 const useLoader = (loaderFn, options = {

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

@@ -31,8 +31,8 @@ __export(prerender_exports, {
   PreRender: () => PreRender
 });
 module.exports = __toCommonJS(prerender_exports);
-var import_react_side_effect = __toESM(require("react-side-effect"));
 var import_react = __toESM(require("react"));
+var import_react_side_effect = __toESM(require("react-side-effect"));
 var import_util = require("./util");
 const PROP_NAMES = {
   INTERVAL: "interval",

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

@@ -22,13 +22,13 @@ __export(requestHandler_exports, {
 });
 module.exports = __toCommonJS(requestHandler_exports);
 var import_request = require("@modern-js/runtime-utils/universal/request");
-var import_react = require("../react");
 var import_context = require("../context");
-var import_runner = require("../plugin/runner");
 var import_runtime = require("../context/runtime");
 var import_loaderManager = require("../loader/loaderManager");
-var import_utils = require("./utils");
+var import_runner = require("../plugin/runner");
+var import_react = require("../react");
 var import_constants = require("./constants");
+var import_utils = require("./utils");
 function createSSRContext(request, options) {
   const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
   const { nonce } = config;
@@ -86,6 +86,7 @@ function createSSRContext(request, options) {
 }
 const createRequestHandler = async (handleRequest) => {
   const requestHandler = async (request, options) => {
+    var _context_routerContext, _context_routerContext1;
     const Root = (0, import_react.createRoot)();
     const runner = (0, import_runner.getGlobalRunner)();
     const { routeManifest } = options.resource;
@@ -133,6 +134,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/cjs/core/server/stream/afterTemplate.js

@@ -22,9 +22,9 @@ __export(afterTemplate_exports, {
 });
 module.exports = __toCommonJS(afterTemplate_exports);
 var import_node = require("@modern-js/runtime-utils/node");
-var import_utils = require("../utils");
 var import_constants = require("../constants");
 var import_shared = require("../shared");
+var import_utils = require("../utils");
 function buildShellAfterTemplate(afterAppTemplate, options) {
   const { request, config, ssrConfig, runtimeContext, renderLevel, entryName } = options;
   const callbacks = [

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

@@ -31,12 +31,12 @@ __export(beforeTemplate_exports, {
   buildShellBeforeTemplate: () => buildShellBeforeTemplate
 });
 module.exports = __toCommonJS(beforeTemplate_exports);
-var import_react_helmet = __toESM(require("react-helmet"));
 var import_router = require("@modern-js/runtime-utils/router");
-var import_helmet = require("../helmet");
+var import_react_helmet = __toESM(require("react-helmet"));
 var import_constants = require("../constants");
-var import_utils = require("../utils");
+var import_helmet = require("../helmet");
 var import_shared = require("../shared");
+var import_utils = require("../utils");
 const readAsset = async (chunk) => {
   const fs = await Promise.resolve().then(() => __toESM(require("fs/promises")));
   const path = await Promise.resolve().then(() => __toESM(require("path")));

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

@@ -33,12 +33,12 @@ __export(createReadableStream_exports, {
 module.exports = __toCommonJS(createReadableStream_exports);
 var import_stream = require("stream");
 var import_node = require("@modern-js/runtime-utils/node");
-var import_styled_components = require("styled-components");
 var import_isbot = __toESM(require("isbot"));
+var import_styled_components = require("styled-components");
 var import_common = require("../../../common");
 var import_constants = require("../../constants");
-var import_template = require("./template");
 var import_shared = require("./shared");
+var import_template = require("./template");
 const createReadableStreamFromElement = async (request, rootElement, options) => {
   const { renderToPipeableStream } = await Promise.resolve().then(() => __toESM(require("react-dom/server")));
   const { runtimeContext, htmlTemplate, config, ssrConfig, entryName } = options;

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

@@ -31,10 +31,10 @@ __export(createReadableStream_worker_exports, {
   createReadableStreamFromElement: () => createReadableStreamFromElement
 });
 module.exports = __toCommonJS(createReadableStream_worker_exports);
-var import_server = require("react-dom/server");
 var import_isbot = __toESM(require("isbot"));
-var import_constants = require("../../constants");
+var import_server = require("react-dom/server");
 var import_common = require("../../../common");
+var import_constants = require("../../constants");
 var import_shared = require("./shared");
 var import_template = require("./template");
 const createReadableStreamFromElement = async (request, rootElement, options) => {

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

@@ -24,9 +24,9 @@ __export(shared_exports, {
   getReadableStreamFromString: () => getReadableStreamFromString
 });
 module.exports = __toCommonJS(shared_exports);
+var import_node = require("@modern-js/runtime-utils/node");
 var import_time = require("@modern-js/runtime-utils/time");
 var import_request = require("@modern-js/runtime-utils/universal/request");
-var import_node = require("@modern-js/runtime-utils/node");
 var import_wrapper = require("../../react/wrapper");
 var import_tracer = require("../tracer");
 var import_utils = require("../utils");

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

@@ -21,8 +21,8 @@ __export(template_exports, {
   getTemplates: () => getTemplates
 });
 module.exports = __toCommonJS(template_exports);
-var import_beforeTemplate = require("./beforeTemplate");
 var import_afterTemplate = require("./afterTemplate");
+var import_beforeTemplate = require("./beforeTemplate");
 const HTML_SEPARATOR = "<!--<?- html ?>-->";
 const getTemplates = async (htmlTemplate, options) => {
   const [beforeAppTemplate = "", afterAppHtmlTemplate = ""] = htmlTemplate.split(HTML_SEPARATOR) || [];

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

@@ -31,22 +31,22 @@ __export(string_exports, {
   renderString: () => renderString
 });
 module.exports = __toCommonJS(string_exports);
-var import_react_helmet = __toESM(require("react-helmet"));
-var import_server = __toESM(require("react-dom/server"));
-var import_time = require("@modern-js/runtime-utils/time");
 var import_node = require("@modern-js/runtime-utils/node");
+var import_time = require("@modern-js/runtime-utils/time");
 var import_request = require("@modern-js/runtime-utils/universal/request");
+var import_server = __toESM(require("react-dom/server"));
+var import_react_helmet = __toESM(require("react-helmet"));
+var import_constants = require("../../constants");
 var import_wrapper = require("../../react/wrapper");
+var import_constants2 = require("../constants");
 var import_helmet = require("../helmet");
-var import_utils = require("../utils");
-var import_constants = require("../constants");
 var import_shared = require("../shared");
 var import_tracer = require("../tracer");
-var import_constants2 = require("../../constants");
-var import_ssrData = require("./ssrData");
+var import_utils = require("../utils");
 var import_loadable = require("./loadable");
-var import_styledComponent = require("./styledComponent");
 var import_prefetch = require("./prefetch");
+var import_ssrData = require("./ssrData");
+var import_styledComponent = require("./styledComponent");
 const renderString = async (request, serverRoot, options) => {
   const headersData = (0, import_request.parseHeaders)(request);
   return (0, import_node.run)(headersData, async () => {
@@ -60,7 +60,7 @@ const renderString = async (request, serverRoot, options) => {
     const { htmlTemplate, entryName, loadableStats, routeManifest } = resource;
     const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
     const chunkSet = {
-      renderLevel: import_constants2.RenderLevel.CLIENT_RENDER,
+      renderLevel: import_constants.RenderLevel.CLIENT_RENDER,
       ssrScripts: "",
       jsChunk: "",
       cssChunk: ""
@@ -68,9 +68,9 @@ const renderString = async (request, serverRoot, options) => {
     let prefetchData = {};
     try {
       prefetchData = await (0, import_prefetch.prefetch)(serverRoot, request, options, ssrConfig, tracer);
-      chunkSet.renderLevel = import_constants2.RenderLevel.SERVER_PREFETCH;
+      chunkSet.renderLevel = import_constants.RenderLevel.SERVER_PREFETCH;
     } catch (e) {
-      chunkSet.renderLevel = import_constants2.RenderLevel.CLIENT_RENDER;
+      chunkSet.renderLevel = import_constants.RenderLevel.CLIENT_RENDER;
       tracer.onError(import_tracer.SSRErrors.PRERENDER, e);
     }
     const collectors = [
@@ -110,16 +110,16 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
       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 >= import_constants2.RenderLevel.SERVER_PREFETCH) {
+    if (chunkSet.renderLevel >= import_constants.RenderLevel.SERVER_PREFETCH) {
       html = import_server.default.renderToString(finalApp);
-      chunkSet.renderLevel = import_constants2.RenderLevel.SERVER_RENDER;
+      chunkSet.renderLevel = import_constants.RenderLevel.SERVER_RENDER;
     }
     helmetData = import_react_helmet.default.renderStatic();
     await Promise.all(collectors.map((component) => component.effect()));
     const cost = end();
     onTiming(import_tracer.SSRTimings.RENDER_HTML, cost);
   } catch (e) {
-    chunkSet.renderLevel = import_constants2.RenderLevel.CLIENT_RENDER;
+    chunkSet.renderLevel = import_constants.RenderLevel.CLIENT_RENDER;
     onError(import_tracer.SSRErrors.RENDER_HTML, e);
   }
   const { ssrScripts, cssChunk, jsChunk } = chunkSet;
@@ -134,16 +134,16 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
   return finalHtml;
 }
 function createReplaceHtml(html) {
-  return (template) => (0, import_utils.safeReplace)(template, import_constants.HTML_PLACEHOLDER, html);
+  return (template) => (0, import_utils.safeReplace)(template, import_constants2.HTML_PLACEHOLDER, html);
 }
 function createReplaceSSRDataScript(data) {
-  return (template) => (0, import_utils.safeReplace)(template, import_constants.SSR_DATA_PLACEHOLDER, data);
+  return (template) => (0, import_utils.safeReplace)(template, import_constants2.SSR_DATA_PLACEHOLDER, data);
 }
 function createReplaceChunkJs(js) {
-  return (template) => (0, import_utils.safeReplace)(template, import_constants.CHUNK_JS_PLACEHOLDER, js);
+  return (template) => (0, import_utils.safeReplace)(template, import_constants2.CHUNK_JS_PLACEHOLDER, js);
 }
 function createReplaceChunkCss(css) {
-  return (template) => (0, import_utils.safeReplace)(template, import_constants.CHUNK_CSS_PLACEHOLDER, css);
+  return (template) => (0, import_utils.safeReplace)(template, import_constants2.CHUNK_CSS_PLACEHOLDER, css);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -21,11 +21,11 @@ __export(prefetch_exports, {
   prefetch: () => prefetch
 });
 module.exports = __toCommonJS(prefetch_exports);
-var import_server = require("react-dom/server");
+var import_server = require("@loadable/server");
 var import_node = require("@modern-js/runtime-utils/node");
-var import_server2 = require("@loadable/server");
 var import_time = require("@modern-js/runtime-utils/time");
 var import_request = require("@modern-js/runtime-utils/universal/request");
+var import_server2 = require("react-dom/server");
 var import_wrapper = require("../../react/wrapper");
 var import_tracer = require("../tracer");
 const prefetch = async (App, request, options, ssrConfig, { onError, onTiming }) => {
@@ -38,17 +38,17 @@ const prefetch = async (App, request, options, ssrConfig, { onError, onTiming })
       try {
         const end = (0, import_time.time)();
         if (loadableStats) {
-          const extractor = new import_server2.ChunkExtractor({
+          const extractor = new import_server.ChunkExtractor({
             stats: loadableStats,
             entrypoints: [
               entryName
             ].filter(Boolean)
           });
-          (0, import_server.renderToStaticMarkup)(extractor.collectChunks((0, import_wrapper.wrapRuntimeContextProvider)(App, Object.assign(context, {
+          (0, import_server2.renderToStaticMarkup)(extractor.collectChunks((0, import_wrapper.wrapRuntimeContextProvider)(App, Object.assign(context, {
             ssr: false
           }))));
         } else {
-          (0, import_server.renderToStaticMarkup)((0, import_wrapper.wrapRuntimeContextProvider)(App, Object.assign(context, {
+          (0, import_server2.renderToStaticMarkup)((0, import_wrapper.wrapRuntimeContextProvider)(App, Object.assign(context, {
             ssr: false
           })));
         }

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

@@ -27,8 +27,8 @@ var import_class_private_field_set = require("@swc/helpers/_/_class_private_fiel
 var import_class_private_method_get = require("@swc/helpers/_/_class_private_method_get");
 var import_class_private_method_init = require("@swc/helpers/_/_class_private_method_init");
 var import_node = require("@modern-js/runtime-utils/node");
-var import_utils = require("../utils");
 var import_constants = require("../../constants");
+var import_utils = require("../utils");
 var _options = /* @__PURE__ */ new WeakMap(), _getSSRData = /* @__PURE__ */ new WeakSet(), _getSSRDataScripts = /* @__PURE__ */ new WeakSet();
 class SSRDataCollector {
   effect() {

package/dist/cjs/document/Body.js

@@ -23,9 +23,9 @@ __export(Body_exports, {
 module.exports = __toCommonJS(Body_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
-var import_constants = require("./constants");
 var import_DocumentStructureContext = require("./DocumentStructureContext");
 var import_Root = require("./Root");
+var import_constants = require("./constants");
 function Body(props) {
   const { hasSetRoot } = (0, import_react.useContext)(import_DocumentStructureContext.DocumentStructureContext);
   const { children, ...rest } = props;

package/dist/cjs/document/Head.js

@@ -25,8 +25,8 @@ module.exports = __toCommonJS(Head_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_DocumentStructureContext = require("./DocumentStructureContext");
-var import_Scripts = require("./Scripts");
 var import_Links = require("./Links");
+var import_Scripts = require("./Scripts");
 var import_Title = require("./Title");
 var import_constants = require("./constants");
 function Head(props) {

package/dist/cjs/document/Root.js

@@ -23,8 +23,8 @@ __export(Root_exports, {
 });
 module.exports = __toCommonJS(Root_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
 var import_lodash = require("@modern-js/utils/lodash");
+var import_react = require("react");
 var import_DocumentContext = require("./DocumentContext");
 var import_constants = require("./constants");
 function Root(props) {

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

@@ -34,10 +34,10 @@ __export(cli_exports, {
 });
 module.exports = __toCommonJS(cli_exports);
 var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_esbuild = require("esbuild");
 var import_react = __toESM(require("react"));
 var import_server = __toESM(require("react-dom/server"));
-var import_esbuild = require("esbuild");
-var import_utils = require("@modern-js/utils");
 var import_DocumentContext = require("../DocumentContext");
 var import_constants = require("../constants");
 const debug = (0, import_utils.createDebugger)("html_genarate");

package/dist/cjs/router/cli/code/getClientRoutes/getRoutes.js

@@ -33,8 +33,8 @@ __export(getRoutes_exports, {
 module.exports = __toCommonJS(getRoutes_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_makeLegalIdentifier = require("../makeLegalIdentifier");
 var import_constants = require("../../constants");
+var import_makeLegalIdentifier = require("../makeLegalIdentifier");
 var import_utils2 = require("../utils");
 var import_utils3 = require("./utils");
 const compName = (srcDirectory, filePath) => {

package/dist/cjs/router/cli/code/getClientRoutes/getRoutesLegacy.js

@@ -34,8 +34,8 @@ module.exports = __toCommonJS(getRoutesLegacy_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_constants = require("../../constants");
-var import_utils2 = require("../utils");
 var import_makeLegalIdentifier = require("../makeLegalIdentifier");
+var import_utils2 = require("../utils");
 var import_utils3 = require("./utils");
 const compName = (srcDirectory, filePath) => {
   const legalCompName = (0, import_makeLegalIdentifier.makeLegalIdentifier)(import_path.default.relative(srcDirectory, filePath));

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

@@ -35,12 +35,12 @@ module.exports = __toCommonJS(code_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_lodash = require("@modern-js/utils/lodash");
-var import_constants = require("../constants");
-var import_constants2 = require("../../../cli/constants");
-var templates = __toESM(require("./templates"));
+var import_constants = require("../../../cli/constants");
+var import_constants2 = require("../constants");
 var import_getClientRoutes = require("./getClientRoutes");
-var import_utils2 = require("./utils");
 var import_nestedRoutes = require("./nestedRoutes");
+var templates = __toESM(require("./templates"));
+var import_utils2 = require("./utils");
 const generateCode = async (appContext, config, entrypoints, api) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
@@ -84,7 +84,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         const config2 = api.useResolvedConfigContext();
         const ssrByRouteIds = config2.server.ssrByRouteIds || [];
         const clonedRoutes = (0, import_lodash.cloneDeep)(initialRoutes);
-        const markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
+        const markedRoutes = ssrByRouteIds.length > 0 ? (0, import_utils.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
         const { routes } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
           routes: markedRoutes
@@ -115,7 +115,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           })
         });
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
-          var _config_output1;
+          var _config_output1, _config_output2;
           const routesServerFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
           const filtedRoutesForServer = (0, import_utils.filterRoutesForServer)(routes);
           const routesForServerLoaderMatches = (0, import_utils.filterRoutesLoader)(routes);
@@ -134,38 +134,29 @@ 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 import_utils.fs.outputFile(import_path.default.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 import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/mf-routes.js`), mfServerRoutesCode, "utf8");
         }
         const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
         if (serverLoaderCombined) {
           const serverLoaderFile = (0, import_utils2.getServerCombinedModueFile)(internalDirectory, entryName);
           await import_utils.fs.outputFile(serverLoaderFile, serverLoaderCombined);
         }
-        await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
+        await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants2.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
       }
     }
   }
 };
-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) {
-  import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants2.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
+  import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -368,14 +368,21 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     if (!config.source.enableAsyncEntry) {
       return combinedModule;
     }
-    return `export default Promise.all([import("${(0, import_utils.slash)(serverLoaderRuntime)}"),import("${(0, import_utils.slash)(serverLoadersFile)}")]).then(res=>{
-      return res.reduce((sum,cur)=>{
-        return {
-          ...sum,
-          ...cur
-        }
-     },{})
-    })`;
+    return `
+    async function loadModules() {
+      const [moduleA, moduleB] = await Promise.all([
+        import("${(0, import_utils.slash)(serverLoaderRuntime)}"),
+        import("${(0, import_utils.slash)(serverLoadersFile)}")
+      ]);
+
+      return {
+        ...moduleA,
+        ...moduleB
+      };
+    }
+
+    export { loadModules };
+    `;
   }
   return null;
 }

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

@@ -42,8 +42,8 @@ module.exports = __toCommonJS(utils_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_esbuild = require("esbuild");
 var import_es_module_lexer = require("es-module-lexer");
+var import_esbuild = require("esbuild");
 var import_constants = require("../constants");
 const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previous, filename) => {
   const filePath = import_path.default.join(dir, filename);

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

@@ -35,9 +35,9 @@ __export(handler_exports, {
 module.exports = __toCommonJS(handler_exports);
 var import_path = __toESM(require("path"));
 var import_lodash = require("@modern-js/utils/lodash");
-var import_entry = require("./entry");
-var import_utils = require("./code/utils");
 var templates = __toESM(require("./code/templates"));
+var import_utils = require("./code/utils");
+var import_entry = require("./entry");
 let originEntrypoints = [];
 async function handleModifyEntrypoints(api, entrypoints) {
   const config = api.useResolvedConfigContext();