@modern-js/runtime 2.68.5 → 2.68.7

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

@@ -37,7 +37,7 @@ __export(context_exports, {
 });
 module.exports = __toCommonJS(context_exports);
 var import_runtime = require("./runtime");
-var import_serverPayload = require("./serverPayload.server");
+var import_serverPayload = require("./serverPayload/index");
 const globalContext = {};
 function getGlobalIsRscClient() {
   return globalContext.isRscClient;

package/dist/cjs/core/context/serverPayload/index.js

@@ -0,0 +1,34 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var serverPayload_exports = {};
+__export(serverPayload_exports, {
+  getServerPayload: () => getServerPayload,
+  setServerPayload: () => setServerPayload
+});
+module.exports = __toCommonJS(serverPayload_exports);
+const getServerPayload = () => {
+  return void 0;
+};
+const setServerPayload = (payload) => {
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getServerPayload,
+  setServerPayload
+});

package/dist/cjs/core/context/{serverPayload.server.js → serverPayload/index.server.js}

@@ -16,12 +16,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var serverPayload_server_exports = {};
-__export(serverPayload_server_exports, {
+var index_server_exports = {};
+__export(index_server_exports, {
   getServerPayload: () => getServerPayload,
   setServerPayload: () => setServerPayload
 });
-module.exports = __toCommonJS(serverPayload_server_exports);
+module.exports = __toCommonJS(index_server_exports);
 var import_node = require("@modern-js/runtime-utils/node");
 const getServerPayload = () => {
   const context = import_node.storage.useContext();

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

@@ -27,7 +27,7 @@ var import_request = require("@modern-js/runtime-utils/universal/request");
 var import_react = require("react");
 var import_context = require("../context");
 var import_runtime = require("../context/runtime");
-var import_serverPayload = require("../context/serverPayload.server");
+var import_serverPayload = require("../context/serverPayload/index");
 var import_loaderManager = require("../loader/loaderManager");
 var import_react2 = require("../react");
 var import_constants = require("./constants");

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

@@ -40,7 +40,7 @@ var import_react = __toESM(require("react"));
 var import_server = __toESM(require("react-dom/server"));
 var import_DocumentContext = require("../DocumentContext");
 var import_constants = require("../constants");
-const debug = (0, import_utils.createDebugger)("html_genarate");
+const debug = (0, import_utils.createDebugger)("html_generate");
 const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
   const entryDir = (_entrypoints_find = entrypoints.find((item) => item.entryName === entryName)) === null || _entrypoints_find === void 0 ? void 0 : _entrypoints_find.absoluteEntryDir;
@@ -159,7 +159,7 @@ const documentPlugin = () => ({
           partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
           partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
         }
-        html = html.replace(import_constants.TOP_PARTICALS_SEPARATOR, partialsContent.partialsTop).replace(import_constants.HEAD_PARTICALS_SEPARATOR, partialsContent.partialsHead).replace(import_constants.BODY_PARTICALS_SEPARATOR, partialsContent.partialsBody);
+        html = html.replace(import_constants.TOP_PARTICALS_SEPARATOR, () => partialsContent.partialsTop).replace(import_constants.HEAD_PARTICALS_SEPARATOR, () => partialsContent.partialsHead).replace(import_constants.BODY_PARTICALS_SEPARATOR, () => partialsContent.partialsBody);
         const links = [
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
         ].join("");
@@ -179,7 +179,7 @@ const documentPlugin = () => ({
         if (html.includes(import_constants.DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(import_constants.DOCUMENT_COMMENT_PLACEHOLDER_END)) {
           html = html.replace(new RegExp(`${import_constants.DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${import_constants.DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);
         }
-        const finalHtml = `<!DOCTYPE html>${html}`.replace(import_constants.DOCUMENT_META_PLACEHOLDER, metas).replace(import_constants.DOCUMENT_SSR_PLACEHOLDER, import_constants.HTML_SEPARATOR).replace(import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(import_constants.DOCUMENT_LINKS_PLACEHOLDER, links).replace(import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER, import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(import_constants.DOCUMENT_TITLE_PLACEHOLDER, titles);
+        const finalHtml = `<!DOCTYPE html>${html}`.replace(import_constants.DOCUMENT_META_PLACEHOLDER, () => metas).replace(import_constants.DOCUMENT_SSR_PLACEHOLDER, () => import_constants.HTML_SEPARATOR).replace(import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER, () => scripts).replace(import_constants.DOCUMENT_LINKS_PLACEHOLDER, () => links).replace(import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER, () => import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, () => import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(import_constants.DOCUMENT_TITLE_PLACEHOLDER, () => titles);
         return finalHtml;
       };
     };

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

@@ -44,7 +44,7 @@ var import_react = require("react");
 var import_common = require("../../common");
 var import_core = require("../../core");
 var import_context = require("../../core/context");
-var import_serverPayload = require("../../core/context/serverPayload.server");
+var import_serverPayload = require("../../core/context/serverPayload/index.server");
 var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts.node"));
 var import_hooks = require("./hooks");
 var import_rsc_router = require("./rsc-router");

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

@@ -101,6 +101,7 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
   const routeObjects = [];
   for (const route of routes) {
     if (route.type === "nested") {
+      var _route_config;
       const nestedRouteObject = {
         path: route.path,
         id: route.id,
@@ -108,7 +109,10 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
         action: route.action,
         hasErrorBoundary: route.hasErrorBoundary,
         shouldRevalidate: route.shouldRevalidate,
-        handle: route.handle,
+        handle: {
+          ...route.handle,
+          ...typeof route.config === "object" ? (_route_config = route.config) === null || _route_config === void 0 ? void 0 : _route_config.handle : {}
+        },
         index: route.index,
         hasClientLoader: !!route.clientData,
         Component: route.component ? route.component : void 0,

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

@@ -1,6 +1,6 @@
 import { RuntimeReactContext, getInitialContext } from "./runtime";
 var globalContext = {};
-import { getServerPayload, setServerPayload } from "./serverPayload.server";
+import { getServerPayload, setServerPayload } from "./serverPayload/index";
 function getGlobalIsRscClient() {
   return globalContext.isRscClient;
 }

package/dist/esm/core/context/serverPayload/index.js

@@ -0,0 +1,9 @@
+var getServerPayload = function() {
+  return void 0;
+};
+var setServerPayload = function(payload) {
+};
+export {
+  getServerPayload,
+  setServerPayload
+};

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

@@ -11,7 +11,7 @@ import { getPathname, parseCookie, parseHeaders, parseQuery } from "@modern-js/r
 import { Fragment } from "react";
 import { getGlobalAppInit, getGlobalInternalRuntimeContext, getGlobalRSCRoot } from "../context";
 import { getInitialContext } from "../context/runtime";
-import { getServerPayload } from "../context/serverPayload.server";
+import { getServerPayload } from "../context/serverPayload/index";
 import { createLoaderManager } from "../loader/loaderManager";
 import { createRoot } from "../react";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";

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

@@ -9,7 +9,7 @@ import React from "react";
 import ReactDomServer from "react-dom/server";
 import { DocumentContext } from "../DocumentContext";
 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_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, 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 debug = createDebugger("html_generate");
 var getDocumenByEntryName = function getDocumenByEntryName2(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
   var entryDir = (_entrypoints_find = entrypoints.find(function(item) {
@@ -173,7 +173,13 @@ var documentPlugin = function() {
                         partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
                         partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
                       }
-                      html = html.replace(TOP_PARTICALS_SEPARATOR, partialsContent.partialsTop).replace(HEAD_PARTICALS_SEPARATOR, partialsContent.partialsHead).replace(BODY_PARTICALS_SEPARATOR, partialsContent.partialsBody);
+                      html = html.replace(TOP_PARTICALS_SEPARATOR, function() {
+                        return partialsContent.partialsTop;
+                      }).replace(HEAD_PARTICALS_SEPARATOR, function() {
+                        return partialsContent.partialsHead;
+                      }).replace(BODY_PARTICALS_SEPARATOR, function() {
+                        return partialsContent.partialsBody;
+                      });
                       links = [
                         htmlWebpackPlugin.tags.headTags.filter(function(item) {
                           return item.tagName === "link";
@@ -205,7 +211,21 @@ var documentPlugin = function() {
                           return "".concat(decodeURIComponent($1));
                         });
                       }
-                      finalHtml = "<!DOCTYPE html>".concat(html).replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(DOCUMENT_TITLE_PLACEHOLDER, titles);
+                      finalHtml = "<!DOCTYPE html>".concat(html).replace(DOCUMENT_META_PLACEHOLDER, function() {
+                        return metas;
+                      }).replace(DOCUMENT_SSR_PLACEHOLDER, function() {
+                        return HTML_SEPARATOR;
+                      }).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, function() {
+                        return scripts;
+                      }).replace(DOCUMENT_LINKS_PLACEHOLDER, function() {
+                        return links;
+                      }).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, function() {
+                        return PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER];
+                      }).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, function() {
+                        return PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER];
+                      }).replace(DOCUMENT_TITLE_PLACEHOLDER, function() {
+                        return titles;
+                      });
                       return [
                         2,
                         finalHtml

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

@@ -14,7 +14,7 @@ import { useContext } from "react";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
 import { getGlobalEnableRsc, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
-import { setServerPayload } from "../../core/context/serverPayload.server";
+import { setServerPayload } from "../../core/context/serverPayload/index.server";
 import DeferredDataScripts from "./DeferredDataScripts.node";
 import { modifyRoutes as modifyRoutesHook, onBeforeCreateRoutes as onBeforeCreateRoutesHook } from "./hooks";
 import { RSCStaticRouter, createServerPayload, handleRSCRedirect, prepareRSCRoutes } from "./rsc-router";

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

@@ -87,6 +87,7 @@ function getRouteObjects(routes, param) {
     for (var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var route = _step.value;
       if (route.type === "nested") {
+        var _route_config;
         var nestedRouteObject = {
           path: route.path,
           id: route.id,
@@ -94,7 +95,7 @@ function getRouteObjects(routes, param) {
           action: route.action,
           hasErrorBoundary: route.hasErrorBoundary,
           shouldRevalidate: route.shouldRevalidate,
-          handle: route.handle,
+          handle: _object_spread({}, route.handle, _type_of(route.config) === "object" ? (_route_config = route.config) === null || _route_config === void 0 ? void 0 : _route_config.handle : {}),
           index: route.index,
           hasClientLoader: !!route.clientData,
           Component: route.component ? route.component : void 0,

package/dist/esm-node/core/context/index.js

@@ -1,6 +1,6 @@
 import { RuntimeReactContext, getInitialContext } from "./runtime";
 const globalContext = {};
-import { getServerPayload, setServerPayload } from "./serverPayload.server";
+import { getServerPayload, setServerPayload } from "./serverPayload/index";
 function getGlobalIsRscClient() {
   return globalContext.isRscClient;
 }

package/dist/esm-node/core/context/serverPayload/index.js

@@ -0,0 +1,9 @@
+const getServerPayload = () => {
+  return void 0;
+};
+const setServerPayload = (payload) => {
+};
+export {
+  getServerPayload,
+  setServerPayload
+};

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

@@ -4,7 +4,7 @@ import { getPathname, parseCookie, parseHeaders, parseQuery } from "@modern-js/r
 import { Fragment } from "react";
 import { getGlobalAppInit, getGlobalInternalRuntimeContext, getGlobalRSCRoot } from "../context";
 import { getInitialContext } from "../context/runtime";
-import { getServerPayload } from "../context/serverPayload.server";
+import { getServerPayload } from "../context/serverPayload/index";
 import { createLoaderManager } from "../loader/loaderManager";
 import { createRoot } from "../react";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";

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

@@ -5,7 +5,7 @@ import React from "react";
 import ReactDomServer from "react-dom/server";
 import { DocumentContext } from "../DocumentContext";
 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_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_TITLE_PLACEHOLDER, DOC_EXT, HEAD_PARTICALS_SEPARATOR, HTML_SEPARATOR, PLACEHOLDER_REPLACER_MAP, TOP_PARTICALS_SEPARATOR } from "../constants";
-const debug = createDebugger("html_genarate");
+const debug = createDebugger("html_generate");
 const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
   const entryDir = (_entrypoints_find = entrypoints.find((item) => item.entryName === entryName)) === null || _entrypoints_find === void 0 ? void 0 : _entrypoints_find.absoluteEntryDir;
@@ -124,7 +124,7 @@ const documentPlugin = () => ({
           partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
           partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
         }
-        html = html.replace(TOP_PARTICALS_SEPARATOR, partialsContent.partialsTop).replace(HEAD_PARTICALS_SEPARATOR, partialsContent.partialsHead).replace(BODY_PARTICALS_SEPARATOR, partialsContent.partialsBody);
+        html = html.replace(TOP_PARTICALS_SEPARATOR, () => partialsContent.partialsTop).replace(HEAD_PARTICALS_SEPARATOR, () => partialsContent.partialsHead).replace(BODY_PARTICALS_SEPARATOR, () => partialsContent.partialsBody);
         const links = [
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
         ].join("");
@@ -144,7 +144,7 @@ const documentPlugin = () => ({
         if (html.includes(DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(DOCUMENT_COMMENT_PLACEHOLDER_END)) {
           html = html.replace(new RegExp(`${DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);
         }
-        const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(DOCUMENT_TITLE_PLACEHOLDER, titles);
+        const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, () => metas).replace(DOCUMENT_SSR_PLACEHOLDER, () => HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, () => scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, () => links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, () => PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, () => PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(DOCUMENT_TITLE_PLACEHOLDER, () => titles);
         return finalHtml;
       };
     };

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

@@ -10,7 +10,7 @@ import { useContext } from "react";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
 import { getGlobalEnableRsc, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
-import { setServerPayload } from "../../core/context/serverPayload.server";
+import { setServerPayload } from "../../core/context/serverPayload/index.server";
 import DeferredDataScripts from "./DeferredDataScripts.node";
 import { modifyRoutes as modifyRoutesHook, onBeforeCreateRoutes as onBeforeCreateRoutesHook } from "./hooks";
 import { RSCStaticRouter, createServerPayload, handleRSCRedirect, prepareRSCRoutes } from "./rsc-router";

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

@@ -60,6 +60,7 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
   const routeObjects = [];
   for (const route of routes) {
     if (route.type === "nested") {
+      var _route_config;
       const nestedRouteObject = {
         path: route.path,
         id: route.id,
@@ -67,7 +68,10 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
         action: route.action,
         hasErrorBoundary: route.hasErrorBoundary,
         shouldRevalidate: route.shouldRevalidate,
-        handle: route.handle,
+        handle: {
+          ...route.handle,
+          ...typeof route.config === "object" ? (_route_config = route.config) === null || _route_config === void 0 ? void 0 : _route_config.handle : {}
+        },
         index: route.index,
         hasClientLoader: !!route.clientData,
         Component: route.component ? route.component : void 0,

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

@@ -1,37 +1,11 @@
 import type { InternalRuntimeContext } from '@modern-js/plugin-v2';
-import type { RouterState } from '@modern-js/runtime-utils/remix-router';
 import type { NestedRoute, PageRoute } from '@modern-js/types';
 import type React from 'react';
 import type { AppConfig } from '../../common';
 import type { RuntimeExtends } from '../plugin/types';
+import type { ServerPayload } from './serverPayload/index';
 export { type RuntimeContext, RuntimeReactContext, getInitialContext, } from './runtime';
-export type PayloadRoute = {
-    clientAction?: any;
-    clientLoader?: any;
-    element?: React.ReactNode;
-    errorElement?: React.ReactNode;
-    handle?: any;
-    hasAction: boolean;
-    hasErrorBoundary: boolean;
-    hasLoader: boolean;
-    id: string;
-    index?: boolean;
-    params: Record<string, string>;
-    parentId?: string;
-    path?: string;
-    pathname: string;
-    pathnameBase: string;
-    shouldRevalidate?: any;
-};
-export type ServerPayload = {
-    type: 'render';
-    actionData: RouterState['actionData'];
-    errors: RouterState['errors'];
-    loaderData: RouterState['loaderData'];
-    location: RouterState['location'];
-    routes: PayloadRoute[];
-    originalRoutes?: PayloadRoute[];
-};
+export type { ServerPayload, PayloadRoute } from './serverPayload/index';
 interface GlobalContext {
     entryName?: string;
     /**
@@ -63,7 +37,7 @@ interface GlobalContext {
     serverPayload?: ServerPayload;
     enableRsc?: boolean;
 }
-export { getServerPayload, setServerPayload } from './serverPayload.server';
+export { getServerPayload, setServerPayload, } from './serverPayload/index';
 export declare function getGlobalIsRscClient(): boolean | undefined;
 export declare function getGlobalEnableRsc(): boolean | undefined;
 export declare function setGlobalContext(context: Omit<GlobalContext, 'appConfig' | 'internalRuntimeContext'> & {

package/dist/types/core/context/{serverPayload.server.d.ts → serverPayload/index.d.ts}

@@ -1,3 +1,4 @@
-import type { ServerPayload } from './index';
+import type { PayloadRoute, ServerPayload } from './index.server';
+export type { ServerPayload, PayloadRoute };
 export declare const getServerPayload: () => ServerPayload | undefined;
 export declare const setServerPayload: (payload: ServerPayload) => void;

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

@@ -0,0 +1,30 @@
+import type { RouterState } from '@modern-js/runtime-utils/remix-router';
+export type PayloadRoute = {
+    clientAction?: any;
+    clientLoader?: any;
+    element?: React.ReactNode;
+    errorElement?: React.ReactNode;
+    handle?: any;
+    hasAction: boolean;
+    hasErrorBoundary: boolean;
+    hasLoader: boolean;
+    id: string;
+    index?: boolean;
+    params: Record<string, string>;
+    parentId?: string;
+    path?: string;
+    pathname: string;
+    pathnameBase: string;
+    shouldRevalidate?: any;
+};
+export type ServerPayload = {
+    type: 'render';
+    actionData: RouterState['actionData'];
+    errors: RouterState['errors'];
+    loaderData: RouterState['loaderData'];
+    location: RouterState['location'];
+    routes: PayloadRoute[];
+    originalRoutes?: PayloadRoute[];
+};
+export declare const getServerPayload: () => ServerPayload | undefined;
+export declare const setServerPayload: (payload: ServerPayload) => void;

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

@@ -21,7 +21,6 @@ export declare function getSSRConfigByEntry(entryName: string, ssr?: ServerUserC
     inlineScript?: boolean;
     disablePrerender?: boolean;
     unsafeHeaders?: string[];
-    scriptLoading?: "defer" | "blocking" | "module" | "async";
     loaderFailureMode?: "clientRender" | "errorBoundary";
 };
 export declare function getSSRMode(ssrConfig?: SSRConfig): 'string' | 'stream' | false;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.5",
+  "version": "2.68.7",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -219,13 +219,13 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.2",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.68.5",
-    "@modern-js/plugin-data-loader": "2.68.5",
-    "@modern-js/plugin-v2": "2.68.5",
-    "@modern-js/render": "2.68.5",
-    "@modern-js/runtime-utils": "2.68.5",
-    "@modern-js/types": "2.68.5",
-    "@modern-js/utils": "2.68.5"
+    "@modern-js/plugin": "2.68.7",
+    "@modern-js/plugin-data-loader": "2.68.7",
+    "@modern-js/plugin-v2": "2.68.7",
+    "@modern-js/runtime-utils": "2.68.7",
+    "@modern-js/render": "2.68.7",
+    "@modern-js/types": "2.68.7",
+    "@modern-js/utils": "2.68.7"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -233,7 +233,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.4.10",
+    "@rsbuild/core": "1.4.14",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -248,11 +248,11 @@
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5",
-    "webpack": "^5.99.8",
-    "@modern-js/app-tools": "2.68.5",
+    "webpack": "^5.101.0",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0",
-    "@modern-js/core": "2.68.5"
+    "@modern-js/app-tools": "2.68.7",
+    "@modern-js/core": "2.68.7"
   },
   "sideEffects": false,
   "publishConfig": {