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

package/dist/cjs/cli/code.js

@@ -36,7 +36,7 @@ var import_utils = require("@modern-js/utils");
 var import_constants = require("./constants");
 var template = __toESM(require("./template"));
 var serverTemplate = __toESM(require("./template.server"));
-function getSSRMode(entry = import_utils.MAIN_ENTRY_NAME, config) {
+function getSSRMode(entry, config) {
   const { ssr, ssrByEntries } = config.server;
   if (config.output.ssg) {
     return "string";

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

@@ -86,6 +86,7 @@ const ssrPlugin = () => ({
     "@modern-js/runtime"
   ],
   setup: (api) => {
+    const appContext = api.useAppContext();
     return {
       // for bundle
       config() {
@@ -123,7 +124,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/cjs/core/browser/index.js

@@ -41,24 +41,43 @@ 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) => {
+  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: import_cookie.default.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: import_cookie.default.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/cjs/core/loader/loaderManager.js

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

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

@@ -22,7 +22,7 @@ __export(requestHandler_exports, {
 });
 module.exports = __toCommonJS(requestHandler_exports);
 var import_request = require("@modern-js/runtime-utils/universal/request");
-var import_react2 = require("../react");
+var import_react = require("../react");
 var import_context = require("../context");
 var import_runner = require("../plugin/runner");
 var import_runtime = require("../context/runtime");
@@ -41,7 +41,10 @@ function createSSRContext(request, options) {
   const headersData = (0, import_request.parseHeaders)(request);
   const url = new URL(request.url);
   const host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
-  const protocal = `${headers.get("X-Forwarded-Proto") || url.protocol || "http"}:`;
+  let protocol = (headers.get("X-Forwarded-Proto") || url.protocol || "http").split(/\s*,\s*/, 1)[0];
+  if (!protocol.endsWith(":")) {
+    protocol += ":";
+  }
   const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
   const ssrMode = (0, import_utils.getSSRMode)(ssrConfig);
   const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
@@ -53,7 +56,7 @@ function createSSRContext(request, options) {
     logger,
     metrics,
     request: {
-      url: request.url.replace(url.host, host).replace(url.protocol, protocal),
+      url: request.url.replace(url.host, host).replace(url.protocol, protocol),
       baseUrl: route.urlPath,
       userAgent: headers.get("user-agent"),
       cookie,
@@ -83,7 +86,7 @@ function createSSRContext(request, options) {
 }
 const createRequestHandler = async (handleRequest) => {
   const requestHandler = async (request, options) => {
-    const Root = (0, import_react2.createRoot)();
+    const Root = (0, import_react.createRoot)();
     const runner = (0, import_runner.getGlobalRunner)();
     const { routeManifest } = options.resource;
     const context = (0, import_runtime.getInitialContext)(runner, false, routeManifest);

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

@@ -105,22 +105,22 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
   const end = (0, import_time.time)();
   let html = "";
   let helmetData;
-  if (chunkSet.renderLevel >= import_constants2.RenderLevel.SERVER_PREFETCH) {
-    try {
-      const finalApp = collectors.reduce((pre, creator) => {
-        var _creator_collect;
-        return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
-      }, App);
+  try {
+    const finalApp = collectors.reduce((pre, creator) => {
+      var _creator_collect;
+      return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
+    }, App);
+    if (chunkSet.renderLevel >= import_constants2.RenderLevel.SERVER_PREFETCH) {
       html = import_server.default.renderToString(finalApp);
-      helmetData = import_react_helmet.default.renderStatic();
       chunkSet.renderLevel = import_constants2.RenderLevel.SERVER_RENDER;
-      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;
-      onError(import_tracer.SSRErrors.RENDER_HTML, e);
     }
+    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;
+    onError(import_tracer.SSRErrors.RENDER_HTML, e);
   }
   const { ssrScripts, cssChunk, jsChunk } = chunkSet;
   const finalHtml = await (0, import_shared.buildHtml)(htmlTemplate, [

package/dist/esm/cli/code.js

@@ -1,12 +1,11 @@
 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 { MAIN_ENTRY_NAME, fs } from "@modern-js/utils";
+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 * as template from "./template";
 import * as serverTemplate from "./template.server";
-function getSSRMode() {
-  var entry = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : MAIN_ENTRY_NAME, config = arguments.length > 1 ? arguments[1] : void 0;
+function getSSRMode(entry, config) {
   var _config_server = config.server, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries;
   if (config.output.ssg) {
     return "string";

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

@@ -1,3 +1,5 @@
+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 { LOADABLE_STATS_FILE, isUseSSRBundle } from "@modern-js/utils";
 var hasStringSSREntry = function(userConfig) {
@@ -75,6 +77,7 @@ var ssrPlugin = function() {
       "@modern-js/runtime"
     ],
     setup: function(api) {
+      var appContext = api.useAppContext();
       return {
         // for bundle
         config: function config() {
@@ -112,7 +115,19 @@ var ssrPlugin = function() {
               }
             },
             tools: {
-              babel: babelHandler
+              babel: babelHandler,
+              bundlerChain: function(chain, param) {
+                var isServer = param.isServer;
+                if (isServer && appContext.moduleType === "module") {
+                  chain.output.libraryTarget("module").set("chunkFormat", "module");
+                  chain.output.library({
+                    type: "module"
+                  });
+                  chain.experiments(_object_spread_props(_object_spread({}, chain.get("experiments")), {
+                    outputModule: true
+                  }));
+                }
+              }
             }
           };
         }

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

@@ -2,6 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 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 { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import cookieTool from "cookie";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
@@ -13,21 +14,39 @@ 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() {
+  return window.location.search.substring(1).split("&").reduce(function(res, item) {
+    var _item_split = _sliced_to_array(item.split("="), 2), key = _item_split[0], value = _item_split[1];
+    if (key) {
+      res[key] = value;
+    }
+    return res;
+  }, {});
+};
 function getSSRData() {
+  var _ssrData_context, _ssrData_context1, _ssrRequest_headers;
   var ssrData = window._SSR_DATA;
-  if (ssrData) {
-    var finalSSRData = _object_spread_props(_object_spread({}, ssrData), {
-      context: _object_spread_props(_object_spread({}, ssrData.context), {
-        request: _object_spread_props(_object_spread({}, ssrData.context.request), {
-          cookieMap: cookieTool.parse(document.cookie || "") || {},
-          cookie: document.cookie || "",
-          userAgent: navigator.userAgent,
-          referer: document.referrer
-        })
+  var ssrRequest = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_context = ssrData.context) === null || _ssrData_context === void 0 ? void 0 : _ssrData_context.request;
+  var finalSSRData = _object_spread_props(_object_spread({}, ssrData || {
+    renderLevel: 0,
+    mode: "string"
+  }), {
+    context: _object_spread_props(_object_spread({}, (ssrData === null || ssrData === void 0 ? void 0 : ssrData.context) || {}), {
+      request: _object_spread_props(_object_spread({}, (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: _object_spread({}, 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" && _instanceof(id, HTMLElement);

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

@@ -30,7 +30,9 @@ var createLoader = function(id) {
     reloading: false,
     data: void 0,
     error: void 0
-  }, loaderFn = arguments.length > 2 ? arguments[2] : void 0, skip = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
+  }, loaderFn = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : function() {
+    return Promise.resolve();
+  }, skip = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
   var promise;
   var status = 0;
   var data = initialData.data, error = initialData.error;

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

@@ -24,7 +24,10 @@ function createSSRContext(request, options) {
   var headersData = parseHeaders(request);
   var url = new URL(request.url);
   var host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
-  var protocal = "".concat(headers.get("X-Forwarded-Proto") || url.protocol || "http", ":");
+  var protocol = (headers.get("X-Forwarded-Proto") || url.protocol || "http").split(/\s*,\s*/, 1)[0];
+  if (!protocol.endsWith(":")) {
+    protocol += ":";
+  }
   var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   var ssrMode = getSSRMode(ssrConfig);
   var loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
@@ -36,7 +39,7 @@ function createSSRContext(request, options) {
     logger,
     metrics,
     request: {
-      url: request.url.replace(url.host, host).replace(url.protocol, protocal),
+      url: request.url.replace(url.host, host).replace(url.protocol, protocol),
       baseUrl: route.urlPath,
       userAgent: headers.get("user-agent"),
       cookie,

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

@@ -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-node/cli/code.js

@@ -1,9 +1,9 @@
 import path from "path";
-import { MAIN_ENTRY_NAME, fs } from "@modern-js/utils";
+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 * 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/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/core/browser/index.js

@@ -8,24 +8,43 @@ 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/loader/loaderManager.js

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

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

@@ -18,7 +18,10 @@ function createSSRContext(request, options) {
   const headersData = parseHeaders(request);
   const url = new URL(request.url);
   const host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
-  const protocal = `${headers.get("X-Forwarded-Proto") || url.protocol || "http"}:`;
+  let protocol = (headers.get("X-Forwarded-Proto") || url.protocol || "http").split(/\s*,\s*/, 1)[0];
+  if (!protocol.endsWith(":")) {
+    protocol += ":";
+  }
   const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   const ssrMode = getSSRMode(ssrConfig);
   const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
@@ -30,7 +33,7 @@ function createSSRContext(request, options) {
     logger,
     metrics,
     request: {
-      url: request.url.replace(url.host, host).replace(url.protocol, protocal),
+      url: request.url.replace(url.host, host).replace(url.protocol, protocol),
       baseUrl: route.urlPath,
       userAgent: headers.get("user-agent"),
       cookie,

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

@@ -72,22 +72,22 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
   const end = time();
   let html = "";
   let helmetData;
-  if (chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH) {
-    try {
-      const finalApp = collectors.reduce((pre, creator) => {
-        var _creator_collect;
-        return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
-      }, App);
+  try {
+    const finalApp = collectors.reduce((pre, creator) => {
+      var _creator_collect;
+      return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
+    }, App);
+    if (chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH) {
       html = ReactDomServer.renderToString(finalApp);
-      helmetData = ReactHelmet.renderStatic();
       chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
-      await Promise.all(collectors.map((component) => component.effect()));
-      const cost = end();
-      onTiming(SSRTimings.RENDER_HTML, cost);
-    } catch (e) {
-      chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
-      onError(SSRErrors.RENDER_HTML, e);
     }
+    helmetData = ReactHelmet.renderStatic();
+    await Promise.all(collectors.map((component) => component.effect()));
+    const cost = end();
+    onTiming(SSRTimings.RENDER_HTML, cost);
+  } catch (e) {
+    chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
+    onError(SSRErrors.RENDER_HTML, e);
   }
   const { ssrScripts, cssChunk, jsChunk } = chunkSet;
   const finalHtml = await buildHtml(htmlTemplate, [

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

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

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

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

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

@@ -1,5 +1,5 @@
-import React from 'react';
-import { Root } from 'react-dom/client';
-import { RuntimeContext } from '../context';
+import type React from 'react';
+import type { Root } from 'react-dom/client';
+import type { RuntimeContext } from '../context';
 export declare const isReact18: () => boolean;
 export declare function hydrateRoot(App: React.ReactElement, context: RuntimeContext, ModernRender: (App: React.ReactElement) => Promise<HTMLElement | Root>, ModernHydrate: (App: React.ReactElement, callback?: () => void) => Promise<HTMLElement | Root>): Promise<HTMLElement | Root>;

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

@@ -1,3 +1,3 @@
-import React from 'react';
+import type React from 'react';
 export type RenderFunc = typeof render;
 export declare function render(App: React.ReactElement, id?: HTMLElement | string): Promise<HTMLElement | import("react-dom/client").Root>;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import type React from 'react';
 export declare const WithCallback: React.FC<{
     callback: () => void;
     children: React.ReactElement;

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

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

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

@@ -1,5 +1,5 @@
 import type React from 'react';
-import { AppConfig, RuntimeConfig } from '../common';
+import type { AppConfig, RuntimeConfig } from '../common';
 export declare const getConfig: (Component: React.ComponentType<any>) => AppConfig | undefined;
 /**
  * @deprecated

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { NestedRoute, PageRoute } from '@modern-js/types';
-import { AppConfig } from '../../common';
+import type { AppConfig } from '../../common';
 export { RuntimeReactContext, type RuntimeContext, getInitialContext, } from './runtime';
 interface GlobalContext {
     /**

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

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

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

@@ -1,4 +1,4 @@
-import { LoaderOptions } from './useLoader';
+import type { LoaderOptions } from './useLoader';
 export declare enum LoaderStatus {
     idle = 0,
     loading = 1,
@@ -12,7 +12,7 @@ export type LoaderResult = {
     error: any;
     _error?: any;
 };
-declare const createLoader: (id: string, initialData: Partial<LoaderResult> | undefined, loaderFn: () => Promise<any>, skip?: boolean) => {
+declare const createLoader: (id: string, initialData?: Partial<LoaderResult>, loaderFn?: () => Promise<any>, skip?: boolean) => {
     readonly result: {
         loading: boolean;
         reloading: boolean;

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import { PluginOptions, Setup } from '@modern-js/plugin';
-import { RuntimeContext, TRuntimeContext } from '../context/runtime';
+import { type PluginOptions, type Setup } from '@modern-js/plugin';
+import type { RuntimeContext, TRuntimeContext } from '../context/runtime';
 import type { RuntimeConfig } from './index';
 export declare const RuntimeConfigContext: import("@modern-js/plugin").Context<RuntimeConfig>;
 export declare const useRuntimeConfigContext: () => RuntimeConfig;

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

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

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { PluginRunner } from './base';
+import { type PluginRunner } from './base';
 export declare function setGlobalRunner(runner: PluginRunner): void;
 export declare function getGlobalRunner(): import("@modern-js/plugin").ToRunners<{
     beforeRender: import("@modern-js/plugin").AsyncInterruptWorkflow<import("..").RuntimeContext, void>;

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

@@ -1,2 +1,2 @@
-import React from 'react';
+import type React from 'react';
 export declare function createRoot(UserApp?: React.ComponentType | null): React.ComponentType<any>;

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

@@ -1,3 +1,3 @@
 import React from 'react';
-import { RuntimeContext } from '../context';
+import { type RuntimeContext } from '../context';
 export declare function wrapRuntimeContextProvider(App: React.ReactElement, contextValue: RuntimeContext): React.FunctionComponentElement<React.ProviderProps<RuntimeContext>>;

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

@@ -1,3 +1,3 @@
-import { HelmetData } from 'react-helmet';
+import type { HelmetData } from 'react-helmet';
 export declare function createReplaceHelemt(helmetData?: HelmetData): (template: string) => string;
 export declare function helmetReplace(content: string, helmetData: HelmetData): string;

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

@@ -1,4 +1,4 @@
-import { Plugin } from '../plugin';
+import type { Plugin } from '../plugin';
 export { PreRender, NoSSR } from './react';
 export declare const ssr: (_config: any) => Plugin;
 export default ssr;

package/dist/types/core/server/react/nossr/index.d.ts

@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react';
+import React, { type ReactElement } from 'react';
 export declare const NoSSR: (props: React.PropsWithChildren<{
     fallback?: ReactElement | string;
 }>) => React.FunctionComponentElement<{

package/dist/types/core/server/react/prerender/util.d.ts

@@ -1,4 +1,4 @@
-import { GeneralizedProps, MetaKeyMap, MetaKeyMatch } from './type';
+import type { GeneralizedProps, MetaKeyMap, MetaKeyMatch } from './type';
 export declare const getInnermostProperty: (propsList: GeneralizedProps[], propName: string) => any;
 export declare const getOutermostProperty: (propsList: GeneralizedProps[], propName: string) => any;
 export declare const aggKeysFromPropsList: (propsList: GeneralizedProps[], propName: string) => MetaKeyMap;

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

@@ -1,6 +1,6 @@
-import { RequestHandler, RequestHandlerOptions } from '@modern-js/app-tools';
-import React from 'react';
-import { RuntimeContext } from '../context';
+import type { RequestHandler, RequestHandlerOptions } from '@modern-js/app-tools';
+import type React from 'react';
+import { type RuntimeContext } from '../context';
 export type { RequestHandlerConfig as HandleRequestConfig } from '@modern-js/app-tools';
 export type HandleRequestOptions = Exclude<RequestHandlerOptions, 'staticGenerate'> & {
     runtimeContext: RuntimeContext;

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

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

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

@@ -1,5 +1,5 @@
-import { RuntimeContext } from '../../context';
-import { HandleRequestConfig } from '../requestHandler';
+import type { RuntimeContext } from '../../context';
+import type { HandleRequestConfig } from '../requestHandler';
 export interface BuildShellBeforeTemplateOptions {
     runtimeContext: RuntimeContext;
     entryName: string;

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

@@ -1,2 +1,2 @@
-import { CreateReadableStreamFromElement } from './shared';
+import { type CreateReadableStreamFromElement } from './shared';
 export declare const createReadableStreamFromElement: CreateReadableStreamFromElement;

package/dist/types/core/server/stream/createReadableStream.worker.d.ts

@@ -1,2 +1,2 @@
-import { CreateReadableStreamFromElement } from './shared';
+import { type CreateReadableStreamFromElement } from './shared';
 export declare const createReadableStreamFromElement: CreateReadableStreamFromElement;

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

@@ -1,6 +1,6 @@
-import React from 'react';
-import { RuntimeContext } from '../../context';
-import { HandleRequestConfig } from '../requestHandler';
+import type React from 'react';
+import type { RuntimeContext } from '../../context';
+import type { HandleRequestConfig } from '../requestHandler';
 import type { RenderStreaming, SSRConfig } from '../shared';
 export type CreateReadableStreamFromElementOptions = {
     runtimeContext: RuntimeContext;

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

@@ -1,2 +1,2 @@
-import { RenderString } from '../shared';
+import { type RenderString } from '../shared';
 export declare const renderString: RenderString;

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
-import { ReactElement } from 'react';
-import { RenderLevel } from '../../constants';
+import type { ReactElement } from 'react';
+import type { RenderLevel } from '../../constants';
 export interface Collector {
     collect?: (comopnent: ReactElement) => ReactElement;
     effect: () => void | Promise<void>;

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

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

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

@@ -1,4 +1,4 @@
-import { BaseSSRServerContext } from '@modern-js/types';
+import type { BaseSSRServerContext } from '@modern-js/types';
 import type { LoaderResult } from './loader/loaderManager';
 import type { RenderLevel } from './constants';
 declare global {

package/dist/types/document/DocumentStructureContext.d.ts

@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import React, { type ReactNode } from 'react';
 type DocumentStructureContextProps = {
     hasSetHead?: boolean;
     hasSetScripts?: boolean;

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

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

package/dist/types/exports/server.d.ts

@@ -1,4 +1,4 @@
-import { AfterMatchContext, AfterRenderContext, MiddlewareContext, NextFunction } from '@modern-js/types';
+import type { AfterMatchContext, AfterRenderContext, MiddlewareContext, NextFunction } from '@modern-js/types';
 export type { Container, CacheControl, CacheOptionProvider, CacheOption, UnstableMiddlewareContext, UnstableMiddleware, UnstableNext, MonitorEvent, Monitors, CoreMonitor, LogEvent, LogLevel, TimingEvent, } from '@modern-js/types';
 export declare const hook: (attacher: ({ addMiddleware, afterMatch, afterRender, }: {
     addMiddleware: (mid: Middleware) => void;

package/dist/types/index.d.ts

@@ -6,4 +6,4 @@ export { isBrowser } from './common';
 export type { BaseRuntimeContext, RuntimeContext, BaseTRuntimeContext, } from './core/context/runtime';
 export type { RuntimeUserConfig } from './config';
 export { createApp, useLoader, bootstrap, RuntimeReactContext, defineConfig, defineRuntimeConfig, useRuntimeContext, } from './core';
-export { StateConfig, RouterConfig };
+export type { StateConfig, RouterConfig };

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

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

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

@@ -1,4 +1,4 @@
-import { Entrypoint } from '@modern-js/types';
+import type { Entrypoint } from '@modern-js/types';
 export declare const hasPages: (dir: string) => boolean;
 export declare const hasNestedRoutes: (dir: string) => boolean;
 export declare const isRouteEntry: (dir: string) => string | false;

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

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

package/dist/types/router/runtime/DeferredDataScripts.node.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
+import type { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
 /**
  * DeferredDataScripts only renders in server side,
  * it doesn't need to be hydrated in client side.

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

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

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

@@ -1,3 +1,3 @@
-import { RouteObject } from '@modern-js/runtime-utils/router';
+import type { RouteObject } from '@modern-js/runtime-utils/router';
 declare const modifyRoutes: import("@modern-js/plugin").Waterfall<RouteObject[]>;
 export { modifyRoutes };

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

@@ -1,4 +1,4 @@
-import { Plugin } from '../../core';
+import { type Plugin } from '../../core';
 import type { RouterConfig, Routes } from './types';
 export declare let finalRouteConfig: RouterConfig['routesConfig'];
 export declare let beforeCreateRouter: boolean;

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type Module from 'module';
-import { ShouldRevalidateFunction } from '@modern-js/runtime-utils/remix-router';
+import type { ShouldRevalidateFunction } from '@modern-js/runtime-utils/remix-router';
 export declare const createShouldRevalidate: (routeId: string) => ShouldRevalidateFunction;
 export declare const handleRouteModule: (routeModule: Module, routeId: string) => Module;
 export declare const handleRouteModuleError: (error: Error) => null;

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { RouteProps, RouteObject, Params } from '@modern-js/runtime-utils/router';
-import { PageRoute, NestedRoute } from '@modern-js/types';
+import type { PageRoute, NestedRoute } from '@modern-js/types';
 import type { RequestContext } from '@modern-js/runtime-utils/node';
 declare global {
     interface Window {

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

@@ -1,7 +1,7 @@
-import React from 'react';
+import type React from 'react';
 import type { Reporter, NestedRoute, PageRoute, SSRMode } from '@modern-js/types';
 import { type StaticHandlerContext, type Router } from '@modern-js/runtime-utils/remix-router';
-import { RouterConfig } from './types';
+import type { RouterConfig } from './types';
 export declare function getRouteComponents(routes: (NestedRoute | PageRoute)[], { globalApp, ssrMode, props, reporter, }: {
     globalApp?: React.ComponentType<any>;
     ssrMode?: SSRMode;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import type React from 'react';
 import { useLocation, useNavigate } from '@modern-js/runtime-utils/router';
 export interface WithRouterProps {
     location: ReturnType<typeof useLocation>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.2-alpha.0",
+  "version": "2.58.2",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -199,11 +199,11 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.58.1",
-    "@modern-js/plugin-data-loader": "2.58.1",
-    "@modern-js/types": "2.58.1",
-    "@modern-js/utils": "2.58.1",
-    "@modern-js/runtime-utils": "2.58.1"
+    "@modern-js/plugin": "2.58.2",
+    "@modern-js/plugin-data-loader": "2.58.2",
+    "@modern-js/utils": "2.58.2",
+    "@modern-js/types": "2.58.2",
+    "@modern-js/runtime-utils": "2.58.2"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -211,7 +211,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.0.1-beta.13",
+    "@rsbuild/core": "1.0.1-beta.14",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.5.1",
     "@types/invariant": "^2.2.30",
@@ -226,15 +226,16 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@modern-js/app-tools": "2.58.1",
-    "@modern-js/core": "2.58.1",
-    "@scripts/build": "2.58.1",
-    "@scripts/jest-config": "2.58.1"
+    "@modern-js/core": "2.58.2",
+    "@modern-js/app-tools": "2.58.2",
+    "@scripts/build": "2.58.2",
+    "@scripts/jest-config": "2.58.2"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "dev": "modern-lib build --watch",

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { StateConfig } from '../dist/types';
+import type { StateConfig } from '../dist/types';
 
 declare module '@modern-js/app-tools' {
   interface RuntimeUserConfig {

package/types/router.d.ts

@@ -1,4 +1,4 @@
-import { RouterConfig } from '../dist/types';
+import type { RouterConfig } from '../dist/types';
 import '../dist/types/router';
 
 declare module '@modern-js/app-tools' {