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

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;
@@ -128,11 +128,6 @@ function _generateHtml() {
           onError = param.onError, onTiming = param.onTiming;
           end = time();
           html = "";
-          if (!(chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH))
-            return [
-              3,
-              4
-            ];
           _state.label = 1;
         case 1:
           _state.trys.push([
@@ -145,9 +140,11 @@ function _generateHtml() {
             var _creator_collect;
             return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
           }, App);
-          html = ReactDomServer.renderToString(finalApp);
+          if (chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH) {
+            html = ReactDomServer.renderToString(finalApp);
+            chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
+          }
           helmetData = ReactHelmet.renderStatic();
-          chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
           return [
             4,
             Promise.all(collectors.map(function(component) {

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;
 }

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

@@ -4,9 +4,9 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
 var walkDirectory = function(dir) {
   return fs.readdirSync(dir).reduce(function(previous, filename) {

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

@@ -1,7 +1,7 @@
 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 { 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";
 var hasPages = function(dir) {

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

@@ -2,9 +2,9 @@ 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 { 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";
 var originEntrypoints = [];
 function handleModifyEntrypoints(api, entrypoints) {
   return _handleModifyEntrypoints.apply(this, arguments);

package/dist/esm/router/cli/index.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 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/router/runtime/DeferredDataScripts.node.js

@@ -1,8 +1,8 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 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";
 var 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}}))};";
 var 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/router/runtime/PrefetchLink.js

@@ -4,8 +4,8 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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 function(event) {

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

@@ -2,12 +2,12 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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";
 var finalRouteConfig = {

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

@@ -4,20 +4,20 @@ 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, 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) {
   var method = "GET";
   var headers = request.headers;

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

@@ -4,9 +4,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 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, param) {

package/dist/esm/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";
 var effects = function() {

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

@@ -1,13 +1,13 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 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";
 var StatePluginHandleMap = {
   immer,
   effects,

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

@@ -1,9 +1,9 @@
 import path from "path";
-import { MAIN_ENTRY_NAME, 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 { fs } from "@modern-js/utils";
+import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants";
 import * as template from "./template";
 import * as serverTemplate from "./template.server";
-function getSSRMode(entry = MAIN_ENTRY_NAME, config) {
+function getSSRMode(entry, config) {
   const { ssr, ssrByEntries } = config.server;
   if (config.output.ssg) {
     return "string";

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

@@ -1,13 +1,13 @@
 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";
 const runtimePlugin = (params) => ({
   name: "@modern-js/runtime",
@@ -103,10 +103,7 @@ const runtimePlugin = (params) => ({
               ]
             },
             bundlerChain: (chain) => {
-              chain.module.rule("modern-entry").test([
-                /\.js$/,
-                /\.jsx$/
-              ]).include.add(path.resolve(appDirectory, "node_modules", `.${metaName}`)).end().sideEffects(true);
+              chain.module.rule("modern-entry").test(/\.jsx?$/).include.add(path.resolve(appDirectory, "node_modules", `.${metaName}`)).end().sideEffects(true);
             },
             /**
             * Add IgnorePlugin to fix react-dom/client import error when use react17

package/dist/esm-node/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-node/cli/ssr/index.js

@@ -52,6 +52,7 @@ const ssrPlugin = () => ({
     "@modern-js/runtime"
   ],
   setup: (api) => {
+    const appContext = api.useAppContext();
     return {
       // for bundle
       config() {
@@ -89,7 +90,19 @@ const ssrPlugin = () => ({
             }
           },
           tools: {
-            babel: babelHandler
+            babel: babelHandler,
+            bundlerChain: (chain, { isServer }) => {
+              if (isServer && appContext.moduleType === "module") {
+                chain.output.libraryTarget("module").set("chunkFormat", "module");
+                chain.output.library({
+                  type: "module"
+                });
+                chain.experiments({
+                  ...chain.get("experiments"),
+                  outputModule: true
+                });
+              }
+            }
           }
         };
       }

package/dist/esm-node/cli/template.js

@@ -53,7 +53,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`
-  formatImportPath(customEntry ? entry.replace("entry.tsx", "App.tsx").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias))}';
+  formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", ""))}';
 
 setGlobalContext({
   App,

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

@@ -1,6 +1,6 @@
 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-node/core/browser/index.js

@@ -1,31 +1,50 @@
-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";
 const IS_REACT18 = process.env.IS_REACT18 === "true";
+const getQuery = () => window.location.search.substring(1).split("&").reduce((res, item) => {
+  const [key, value] = item.split("=");
+  if (key) {
+    res[key] = value;
+  }
+  return res;
+}, {});
 function getSSRData() {
+  var _ssrData_context, _ssrData_context1, _ssrRequest_headers;
   const ssrData = window._SSR_DATA;
-  if (ssrData) {
-    const finalSSRData = {
-      ...ssrData,
-      context: {
-        ...ssrData.context,
-        request: {
-          ...ssrData.context.request,
-          cookieMap: cookieTool.parse(document.cookie || "") || {},
-          cookie: document.cookie || "",
-          userAgent: navigator.userAgent,
-          referer: document.referrer
-        }
+  const ssrRequest = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_context = ssrData.context) === null || _ssrData_context === void 0 ? void 0 : _ssrData_context.request;
+  const finalSSRData = {
+    ...ssrData || {
+      renderLevel: 0,
+      mode: "string"
+    },
+    context: {
+      ...(ssrData === null || ssrData === void 0 ? void 0 : ssrData.context) || {},
+      request: {
+        ...(ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_context1 = ssrData.context) === null || _ssrData_context1 === void 0 ? void 0 : _ssrData_context1.request) || {},
+        params: (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.params) || {},
+        host: (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.host) || location.host,
+        pathname: (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.pathname) || location.pathname,
+        headers: (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.headers) || {},
+        cookieMap: cookieTool.parse(document.cookie || "") || {},
+        cookie: document.cookie || "",
+        userAgent: (ssrRequest === null || ssrRequest === void 0 ? void 0 : (_ssrRequest_headers = ssrRequest.headers) === null || _ssrRequest_headers === void 0 ? void 0 : _ssrRequest_headers["user-agent"]) || navigator.userAgent,
+        referer: document.referrer,
+        query: {
+          ...getQuery(),
+          ...(ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.query) || {}
+        },
+        url: location.href
       }
-    };
-    return finalSSRData;
-  }
+    }
+  };
+  return finalSSRData;
 }
 function isClientArgs(id) {
   return typeof id === "undefined" || typeof id === "string" || typeof HTMLElement !== "undefined" && id instanceof HTMLElement;

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

@@ -1,4 +1,4 @@
-import { useRef, useLayoutEffect } from "react";
+import { useLayoutEffect, useRef } from "react";
 const WithCallback = ({ callback, children }) => {
   const once = useRef(false);
   useLayoutEffect(() => {