@modern-js/runtime 2.58.2 → 2.58.3

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

@@ -33,20 +33,20 @@ __export(plugin_node_exports, {
 });
 module.exports = __toCommonJS(plugin_node_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_remix_router = require("@modern-js/runtime-utils/remix-router");
+var import_merge = require("@modern-js/runtime-utils/merge");
+var import_node = require("@modern-js/runtime-utils/node");
 var import_router = require("@modern-js/runtime-utils/node/router");
+var import_remix_router = require("@modern-js/runtime-utils/remix-router");
 var import_router2 = require("@modern-js/runtime-utils/router");
-var import_node = require("@modern-js/runtime-utils/node");
 var import_time = require("@modern-js/runtime-utils/time");
 var import_constants = require("@modern-js/utils/universal/constants");
-var import_merge = require("@modern-js/runtime-utils/merge");
+var import_react = require("react");
 var import_common = require("../../common");
 var import_core = require("../../core");
 var import_context = require("../../core/context");
-var import_utils = require("./utils");
-var import_hooks = require("./hooks");
 var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts.node"));
+var import_hooks = require("./hooks");
+var import_utils = require("./utils");
 function createRemixReuqest(request) {
   const method = "GET";
   const { headers } = request;

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

@@ -38,9 +38,9 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_router = require("@modern-js/runtime-utils/router");
-var import_remix_router = require("@modern-js/runtime-utils/remix-router");
 var import_browser = require("@modern-js/runtime-utils/browser");
+var import_remix_router = require("@modern-js/runtime-utils/remix-router");
+var import_router = require("@modern-js/runtime-utils/router");
 var import_DefaultNotFound = require("./DefaultNotFound");
 var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts"));
 function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {

package/dist/cjs/state/plugins.js

@@ -34,8 +34,8 @@ __export(plugins_exports, {
   immer: () => immer
 });
 module.exports = __toCommonJS(plugins_exports);
-var import_plugin_effects = require("@modern-js-reduck/plugin-effects");
 var import_plugin_auto_actions = __toESM(require("@modern-js-reduck/plugin-auto-actions"));
+var import_plugin_effects = require("@modern-js-reduck/plugin-effects");
 var import_plugin_immutable = __toESM(require("@modern-js-reduck/plugin-immutable"));
 var import_plugin_devtools = __toESM(require("@modern-js-reduck/plugin-devtools"));
 const effects = () => import_plugin_effects.plugin;

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

@@ -24,13 +24,13 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
+var import_react = require("@modern-js-reduck/react");
 var import_store = require("@modern-js-reduck/store");
-var import_react2 = require("@modern-js-reduck/react");
 var import_merge = require("@modern-js/runtime-utils/merge");
-var import_plugins = require("../plugins");
-var import_core = require("../../core");
+var import_react2 = require("react");
 var import_common = require("../../common");
+var import_core = require("../../core");
+var import_plugins = require("../plugins");
 __reExport(plugin_exports, require("../plugins"), module.exports);
 const StatePluginHandleMap = {
   immer: import_plugins.immer,
@@ -63,8 +63,8 @@ const statePlugin = (userConfig = {}) => ({
     return {
       wrapRoot(App) {
         const getStateApp = (props) => {
-          const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
-          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.Provider, {
+          const context = (0, import_react2.useContext)(import_core.RuntimeReactContext);
+          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Provider, {
             store: context.store,
             config: storeConfig,
             children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {

package/dist/esm/cli/code.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { fs } from "@modern-js/utils";
-import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME } from "./constants";
+import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants";
 import * as template from "./template";
 import * as serverTemplate from "./template.server";
 function getSSRMode(entry, config) {

package/dist/esm/cli/index.js

@@ -3,14 +3,14 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { isReact18 as checkIsReact18, cleanRequireCache, createRuntimeExportsUtils } from "@modern-js/utils";
-import { statePlugin } from "../state/cli";
-import { routerPlugin } from "../router/cli";
 import { documentPlugin } from "../document/cli";
-import { ssrPlugin } from "./ssr";
-import { isRuntimeEntry } from "./entry";
-import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME } from "./constants";
-import { generateCode } from "./code";
+import { routerPlugin } from "../router/cli";
+import { statePlugin } from "../state/cli";
 import { builderPluginAlias } from "./alias";
+import { generateCode } from "./code";
+import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME } from "./constants";
+import { isRuntimeEntry } from "./entry";
+import { ssrPlugin } from "./ssr";
 import { isRuntimeEntry as isRuntimeEntry2 } from "./entry";
 var runtimePlugin = function(params) {
   return {
@@ -122,10 +122,7 @@ var runtimePlugin = function(params) {
                 ]
               },
               bundlerChain: function(chain) {
-                chain.module.rule("modern-entry").test([
-                  /\.js$/,
-                  /\.jsx$/
-                ]).include.add(path.resolve(appDirectory, "node_modules", ".".concat(metaName))).end().sideEffects(true);
+                chain.module.rule("modern-entry").test(/\.jsx?$/).include.add(path.resolve(appDirectory, "node_modules", ".".concat(metaName))).end().sideEffects(true);
               },
               /**
               * Add IgnorePlugin to fix react-dom/client import error when use react17

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

@@ -2,8 +2,8 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-import crypto from "crypto";
 import { Buffer as Buffer2 } from "buffer";
+import crypto from "crypto";
 import * as t from "@babel/types";
 import { get } from "@modern-js/utils/lodash";
 var require_babel_plugin_ssr_loader_id = __commonJS({

package/dist/esm/cli/template.js

@@ -44,7 +44,7 @@ var runtimeRegister = function(param) {
 };
 var runtimeGlobalContext = function(param) {
   var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry;
-  return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace("entry.tsx", "App.tsx").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias)), "';\n\nsetGlobalContext({\n  App,\n});");
+  return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", "")), "';\n\nsetGlobalContext({\n  App,\n});");
 };
 export {
   index,

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

@@ -1,8 +1,8 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { normalizePathname } from "@modern-js/runtime-utils/url";
 import { loadableReady } from "@loadable/component";
+import { normalizePathname } from "@modern-js/runtime-utils/url";
 import { RenderLevel } from "../constants";
 import { wrapRuntimeContextProvider } from "../react/wrapper";
 import { WithCallback } from "./withCallback";

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

@@ -4,14 +4,14 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import cookieTool from "cookie";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
+import cookieTool from "cookie";
+import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
 import { getGlobalAppInit } from "../context";
 import { getInitialContext } from "../context/runtime";
 import { createLoaderManager } from "../loader/loaderManager";
 import { getGlobalRunner } from "../plugin/runner";
 import { wrapRuntimeContextProvider } from "../react/wrapper";
-import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
 import { hydrateRoot } from "./hydrate";
 var IS_REACT18 = process.env.IS_REACT18 === "true";
 var getQuery = function() {

package/dist/esm/core/browser/withCallback.js

@@ -1,4 +1,4 @@
-import { useRef, useLayoutEffect } from "react";
+import { useLayoutEffect, useRef } from "react";
 var WithCallback = function(param) {
   var callback = param.callback, children = param.children;
   var once = useRef(false);

package/dist/esm/core/compatible.js

@@ -4,14 +4,14 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
 var IS_REACT18 = process.env.IS_REACT18 === "true";
 function isClientArgs(id) {

package/dist/esm/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";
 var RuntimeReactContext = createContext({});
 var ServerRouterContext = createContext({});

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

@@ -2,8 +2,8 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-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";
 var useLoader = function(loaderFn) {

package/dist/esm/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";
 var RuntimeConfigContext = createContext({});
 var useRuntimeConfigContext = function() {
   return RuntimeConfigContext.use().value;

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

@@ -1,6 +1,6 @@
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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/core/server/react/prerender/index.js

@@ -5,9 +5,9 @@ import { _ as _inherits } from "@swc/helpers/_/_inherits";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _create_super } from "@swc/helpers/_/_create_super";
-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";
 var PROP_NAMES = {
   INTERVAL: "interval",
   STALE_LIMIT: "staleLimit",

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

@@ -5,13 +5,13 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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) {
   var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
   var nonce = config.nonce;
@@ -73,7 +73,7 @@ var createRequestHandler = function() {
     return _ts_generator(this, function(_state) {
       requestHandler = function() {
         var _ref2 = _async_to_generator(function(request, options) {
-          var Root, runner, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, redirectResponse, htmlTemplate, response;
+          var _context_routerContext, _context_routerContext1, Root, runner, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, _context_routerContext2, _context_ssrContext, redirectResponse, htmlTemplate, response;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
@@ -150,6 +150,10 @@ var createRequestHandler = function() {
                 ];
               case 1:
                 initialData = _state2.sent();
+                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) {
+                  ;
+                  (_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;
                 redirectResponse = getRedirectResponse(initialData);
                 if (redirectResponse) {

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

@@ -2,9 +2,9 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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) {
   var request = options.request, config = options.config, ssrConfig = options.ssrConfig, runtimeContext = options.runtimeContext, renderLevel = options.renderLevel, entryName = options.entryName;
   var callbacks = [

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

@@ -2,12 +2,12 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-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";
 var readAsset = function() {
   var _ref = _async_to_generator(function(chunk) {
     var fs, path, filepath;

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

@@ -4,12 +4,12 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
 var createReadableStreamFromElement = function() {
   var _ref = _async_to_generator(function(request, rootElement, options) {
     var renderToPipeableStream, runtimeContext, htmlTemplate, config, ssrConfig, entryName, shellChunkStatus, renderLevel, forceStream2String, isbot, onReady, sheet, chunkVec, root;

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

@@ -1,9 +1,9 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-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";
 var createReadableStreamFromElement = function() {

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

@@ -1,8 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+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/core/server/stream/template.js

@@ -1,8 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { buildShellBeforeTemplate } from "./beforeTemplate";
 import { buildShellAfterTemplate } from "./afterTemplate";
+import { buildShellBeforeTemplate } from "./beforeTemplate";
 var HTML_SEPARATOR = "<!--<?- html ?>-->";
 var getTemplates = function() {
   var _ref = _async_to_generator(function(htmlTemplate, options) {

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

@@ -1,22 +1,22 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-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";
 var renderString = function() {
   var _ref = _async_to_generator(function(request, serverRoot, options) {
     var headersData;

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

@@ -1,10 +1,10 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-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";
 var prefetch = function() {

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

@@ -6,8 +6,8 @@ import { _ as _class_private_method_get } from "@swc/helpers/_/_class_private_me
 import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_method_init";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 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();
 var SSRDataCollector = /* @__PURE__ */ function() {
   "use strict";

package/dist/esm/document/Body.js

@@ -3,9 +3,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 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) {
   var hasSetRoot = useContext(DocumentStructureContext).hasSetRoot;
   var children = props.children, rest = _object_without_properties(props, [

package/dist/esm/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) {
   var comment = props.comment, children = props.children;
   var commentStr = encodeURIComponent(children || comment || "");

package/dist/esm/document/Head.js

@@ -4,8 +4,8 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 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/document/Root.js

@@ -2,8 +2,8 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 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/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) {
   var content = props.content;
   var contentStr = content.toString();

package/dist/esm/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) {
   var content = props.content, children = props.children;
   var contentStr = children || content;

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

@@ -3,12 +3,12 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
 var debug = createDebugger("html_genarate");
 var getDocumenByEntryName = function getDocumenByEntryName2(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;

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

@@ -2,10 +2,10 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 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";
 var compName = function(srcDirectory, filePath) {
   var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
   return "Comp_".concat(legalCompName);

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

@@ -3,9 +3,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 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";
 var compName = function(srcDirectory, filePath) {
   var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
   return "Comp_".concat(legalCompName);

package/dist/esm/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";
 var debug = createDebugger("get-client-routes");
 var findLayout = function(dir) {
   return findExists(JS_EXTENSIONS.map(function(ext) {

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

@@ -1,14 +1,14 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
 var generateCode = function() {
   var _ref = _async_to_generator(function(appContext, config, entrypoints, api) {
     var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, oldVersion;

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

@@ -3,7 +3,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
 var conventionNames = Object.values(NESTED_ROUTE);

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

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
@@ -414,7 +414,7 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     if (!config.source.enableAsyncEntry) {
       return combinedModule;
     }
-    return 'export default Promise.all([import("'.concat(slash(serverLoaderRuntime), '"),import("').concat(slash(serverLoadersFile), '")]).then(res=>{\n      return res.reduce((sum,cur)=>{\n        return {\n          ...sum,\n          ...cur\n        }\n     },{})\n    })');
+    return '\n    async function loadModules() {\n      const [moduleA, moduleB] = await Promise.all([\n        import("'.concat(slash(serverLoaderRuntime), '"),\n        import("').concat(slash(serverLoadersFile), '")\n      ]);\n\n      return {\n        ...moduleA,\n        ...moduleB\n      };\n    }\n\n    export { loadModules };\n    ');
   }
   return null;
 }