@bleedingdev/modern-js-runtime 3.9.0-ultramodern.8 → 3.9.3-ultramodern.1

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

@@ -48,8 +48,8 @@ const assetToChunk = (asset)=>({
     });
 const checkIsInline = (chunk, enableInline)=>{
     if ('production' !== process.env.NODE_ENV) return false;
-    if (enableInline instanceof RegExp) return enableInline.test(chunk.url);
-    return Boolean(enableInline);
+    else if (enableInline instanceof RegExp) return enableInline.test(chunk.url);
+    else return Boolean(enableInline);
 };
 const readAsset = async (chunk)=>{
     const fs = await import("fs/promises");
@@ -142,7 +142,7 @@ class LoadableCollector {
         const scripts = await Promise.all(chunks.filter((chunk)=>!existedScript.includes(chunk.url) && !this.existsAssets?.includes(chunk.path)).map(async (chunk)=>{
             const script = `<script${attributes} src="${chunk.url}"></script>`;
             if ((0, external_utils_js_namespaceObject.checkIsNode)() && checkIsInline(chunk, inlineStyles)) return readAsset(chunk).then((content)=>`<script>${content}</script>`).catch((_)=>script);
-            return script;
+            else return script;
         }));
         chunkSet.jsChunk += scripts.filter((script)=>Boolean(script)).join('');
     }
@@ -159,7 +159,7 @@ class LoadableCollector {
         const css = await Promise.all(emittedChunks.map(async (chunk)=>{
             const link = `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
             if ((0, external_utils_js_namespaceObject.checkIsNode)() && checkIsInline(chunk, inlineStyles)) return readAsset(chunk).then((content)=>`<style>${content}</style>`).catch((_)=>link);
-            return link;
+            else return link;
         }));
         chunkSet.cssChunk += css.filter((css)=>Boolean(css)).join('');
         this.stylesheetInfo.emittedAssets = emittedChunks.map((chunk)=>chunk.url);

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

@@ -40,6 +40,7 @@ __webpack_require__.d(__webpack_exports__, {
     default: ()=>cli,
     documentPlugin: ()=>documentPlugin,
     getDocumentByEntryName: ()=>getDocumentByEntryName,
+    getDocumentTempEntry: ()=>getDocumentTempEntry,
     processScriptPlaceholders: ()=>processScriptPlaceholders
 });
 const utils_namespaceObject = require("@modern-js/utils");
@@ -170,6 +171,7 @@ g.__MODERN_DOC_RENDERERS__[${JSON.stringify(_entryName)}] = render;
 
 export default { render: render };`;
 };
+const getDocumentTempEntry = (internalDirectory, compilerName, entryName)=>external_path_default().join(internalDirectory, CONSTANTS.DOCUMENT_OUTPUT_DIR, compilerName ?? '', `${CONSTANTS.TEMP_ENTRY_PREFIX}${entryName}.js`);
 const processChildCompilation = async (entryName, docPath, compilation, compiler, appDirectory, internalDirectory)=>new Promise((resolve, reject)=>{
         const outFile = external_path_default().posix.join(CONSTANTS.DOCUMENT_OUTPUT_DIR, `${CONSTANTS.HTML_OUTPUT_PREFIX}${entryName}${CONSTANTS.HTML_OUTPUT_SUFFIX}`);
         const child = compilation.createChildCompiler(`${CONSTANTS.CHILD_COMPILER_PREFIX}${entryName}`, {
@@ -180,8 +182,7 @@ const processChildCompilation = async (entryName, docPath, compilation, compiler
         }, []);
         configureChildCompiler(child, compiler, appDirectory);
         applyExternalsPlugin(child, compiler);
-        const entryDir = external_path_default().join(internalDirectory, CONSTANTS.DOCUMENT_OUTPUT_DIR);
-        const tempEntry = external_path_default().join(entryDir, `${CONSTANTS.TEMP_ENTRY_PREFIX}${entryName}.js`);
+        const tempEntry = getDocumentTempEntry(internalDirectory, compiler.name, entryName);
         const finalize = ()=>{
             try {
                 const EntryPlugin = compiler.rspack?.EntryPlugin;
@@ -248,6 +249,7 @@ const documentPlugin = ()=>({
                             const tasks = [];
                             for (const ep of entrypoints || []){
                                 const entryName = ep.entryName;
+                                if (!this.htmlEntryNames.has(entryName)) continue;
                                 const docPath = getDocumentByEntryName(entrypoints, entryName, appDirectory);
                                 if (docPath) {
                                     compilation.fileDependencies?.add?.(docPath);
@@ -264,14 +266,19 @@ const documentPlugin = ()=>({
                         }
                     });
                 }
-                constructor(){
+                constructor(htmlEntryNames){
+                    this.htmlEntryNames = htmlEntryNames;
                     this.name = 'ModernJsDocumentChildCompilerPlugin';
                 }
             }
             api.config(()=>({
                     tools: {
-                        bundlerChain: (chain)=>{
-                            chain.plugin('modernjs-document-child-compiler').use(ModernJsDocumentChildCompilerPlugin, []);
+                        bundlerChain: (chain, { environment })=>{
+                            const htmlEntryNames = new Set(Object.keys(environment.htmlPaths));
+                            if (0 === htmlEntryNames.size) return;
+                            chain.plugin('modernjs-document-child-compiler').use(ModernJsDocumentChildCompilerPlugin, [
+                                htmlEntryNames
+                            ]);
                         }
                     }
                 }));
@@ -394,11 +401,13 @@ const cli = documentPlugin;
 exports["default"] = __webpack_exports__["default"];
 exports.documentPlugin = __webpack_exports__.documentPlugin;
 exports.getDocumentByEntryName = __webpack_exports__.getDocumentByEntryName;
+exports.getDocumentTempEntry = __webpack_exports__.getDocumentTempEntry;
 exports.processScriptPlaceholders = __webpack_exports__.processScriptPlaceholders;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "default",
     "documentPlugin",
     "getDocumentByEntryName",
+    "getDocumentTempEntry",
     "processScriptPlaceholders"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/exports/head.js

@@ -41,12 +41,12 @@ __webpack_require__.d(__webpack_exports__, {
     Helmet: ()=>Helmet,
     default: ()=>exports_head
 });
+const context_namespaceObject = require("@modern-js/runtime/context");
 const external_react_namespaceObject = require("react");
 var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
 const external_react_helmet_async_namespaceObject = require("react-helmet-async");
-const runtime_js_namespaceObject = require("../core/context/runtime.js");
 const Helmet = (props)=>{
-    const resolveComponent = external_react_default().useContext(runtime_js_namespaceObject.RuntimeComponentResolverContext);
+    const resolveComponent = external_react_default().useContext(context_namespaceObject.RuntimeComponentResolverContext);
     const Component = resolveComponent?.(external_react_helmet_async_namespaceObject.Helmet, {
         name: 'head.Helmet'
     }) ?? external_react_helmet_async_namespaceObject.Helmet;

package/dist/cjs/internal.js

@@ -28,9 +28,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    InternalRuntimeContext: ()=>runtime_js_namespaceObject.InternalRuntimeContext
+    InternalRuntimeContext: ()=>context_namespaceObject.InternalRuntimeContext
 });
-const runtime_js_namespaceObject = require("./core/context/runtime.js");
+const context_namespaceObject = require("@modern-js/runtime/context");
 exports.InternalRuntimeContext = __webpack_exports__.InternalRuntimeContext;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "InternalRuntimeContext"

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

@@ -76,8 +76,7 @@ const optimizeRoute = (routeTree)=>{
                 children: optimizedChildren
             }
         ];
-    }
-    {
+    } else {
         const newRoutes = children.map((child)=>{
             const routePath = routeTree.path ? `${routeTree.path}${child.path ? `/${child.path}` : ''}` : child.path || '';
             const newRoute = {

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

@@ -396,7 +396,7 @@ const runtimeGlobalContext = async ({ entryName, metaName, srcDirectory, nestedR
                 source: rootLayout.toString(),
                 filename: rootLayoutFile
             });
-            const hasAppInit = moduleExports.some((e)=>e.n === external_constants_js_namespaceObject.APP_INIT_EXPORTED);
+            const hasAppInit = moduleExports.some((e)=>'reexport-all' !== e.type && e.name === external_constants_js_namespaceObject.APP_INIT_EXPORTED);
             const layoutPath = (0, utils_namespaceObject.formatImportPath)((0, external_utils_js_namespaceObject.getPathWithoutExt)((0, external_utils_js_namespaceObject.replaceWithAlias)(srcDirectory, rootLayoutFile, internalSrcAlias)));
             if (hasAppInit) imports.push(`import { init as appInit } from '${layoutPath}';`);
             else imports.push("let appInit;");
@@ -422,7 +422,7 @@ const runtimeGlobalContext = async ({ entryName, metaName, srcDirectory, nestedR
         enableRsc: true,
       });
     `;
-    return `${imports.join('\n')}
+    else return `${imports.join('\n')}
 
     import { routes } from '${routesImportPath}';
 

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

@@ -61,7 +61,7 @@ const walkDirectory = (dir)=>external_fs_default().readdirSync(dir).reduce((prev
             ...previous,
             ...walkDirectory(filePath)
         ];
-        return [
+        else return [
             ...previous,
             filePath
         ];
@@ -78,7 +78,7 @@ const isPageComponentFile = (filePath)=>{
 };
 const replaceWithAlias = (base, filePath, alias)=>{
     if (filePath.includes(base)) return (0, utils_namespaceObject.normalizeToPosixPath)(external_path_default().join(alias, external_path_default().relative(base, filePath)));
-    return filePath;
+    else return filePath;
 };
 const parseModule = async ({ source, filename })=>{
     let content = source;
@@ -98,6 +98,7 @@ const parseModule = async ({ source, filename })=>{
         });
         content = result.code;
     }
+    await (0, external_es_module_lexer_namespaceObject.init)();
     return (0, external_es_module_lexer_namespaceObject.parse)(content);
 };
 const hasLoader = async (filename, source)=>{
@@ -108,7 +109,7 @@ const hasLoader = async (filename, source)=>{
             source: content.toString(),
             filename
         });
-        return moduleExports.some((e)=>e.n === external_constants_js_namespaceObject.LOADER_EXPORT_NAME);
+        return moduleExports.some((e)=>'reexport-all' !== e.type && e.name === external_constants_js_namespaceObject.LOADER_EXPORT_NAME);
     }
     return false;
 };
@@ -120,7 +121,7 @@ const hasAction = async (filename, source)=>{
             source: content.toString(),
             filename
         });
-        return moduleExports.some((e)=>e.n === external_constants_js_namespaceObject.ACTION_EXPORT_NAME);
+        return moduleExports.some((e)=>'reexport-all' !== e.type && e.name === external_constants_js_namespaceObject.ACTION_EXPORT_NAME);
     }
     return false;
 };

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

@@ -60,7 +60,8 @@ const DeferredDataScripts = (props)=>{
     }, []);
     const deferredScripts = (0, external_react_namespaceObject.useMemo)(()=>{
         if (!staticContext) return null;
-        const activeDeferreds = node_namespaceObject.storage.useContext().activeDeferreds;
+        const requestStorage = node_namespaceObject.storage.useContext();
+        const activeDeferreds = requestStorage.activeDeferreds;
         const _ROUTER_DATA = {
             loaderData: staticContext.loaderData,
             errors: (0, external_utils_js_namespaceObject.serializeErrors)(staticContext.errors)
@@ -73,6 +74,7 @@ const DeferredDataScripts = (props)=>{
         const deferredDataScripts = [];
         const initialScripts = Array.from(activeDeferreds.entries()).map(([routeId, deferredData])=>{
             const pendingKeys = new Set(deferredData.pendingKeys);
+            requestStorage.deferredScriptKeys?.set(routeId, Array.from(pendingKeys));
             const { deferredKeys } = deferredData;
             const deferredKeyPromiseManifests = deferredKeys.map((key)=>{
                 if (pendingKeys.has(key)) return {
@@ -83,7 +85,7 @@ const DeferredDataScripts = (props)=>{
                         (0, node_namespaceObject.serializeJson)(key)
                     ]
                 };
-                {
+                else {
                     const trackedPromise = deferredData.data[key];
                     if (void 0 !== trackedPromise._error) {
                         const error = toDeferredErrorInfo(trackedPromise._error);
@@ -95,15 +97,16 @@ const DeferredDataScripts = (props)=>{
                                 (0, node_namespaceObject.serializeJson)(error)
                             ]
                         };
+                    } else {
+                        if (void 0 === trackedPromise._data) throw new Error(`The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`);
+                        return {
+                            key,
+                            routerDataFnName: 'p',
+                            routerDataFnArgs: [
+                                (0, node_namespaceObject.serializeJson)(trackedPromise._data)
+                            ]
+                        };
                     }
-                    if (void 0 === trackedPromise._data) throw new Error(`The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`);
-                    return {
-                        key,
-                        routerDataFnName: 'p',
-                        routerDataFnArgs: [
-                            (0, node_namespaceObject.serializeJson)(trackedPromise._data)
-                        ]
-                    };
                 }
             });
             return {

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

@@ -70,10 +70,10 @@ __webpack_require__.d(__webpack_exports__, {
     NavLink: ()=>NavLink
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const context_namespaceObject = require("@modern-js/runtime/context");
 const router_namespaceObject = require("@modern-js/runtime-utils/router");
 const external_react_namespaceObject = require("react");
 var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
-const index_js_namespaceObject = require("../../core/context/index.js");
 const getWebpackChunkLoader = ()=>__webpack_chunk_load__;
 const getWebpackPublicPath = ()=>{
     try {
@@ -200,7 +200,7 @@ const getDataHref = (route, pathname, basename)=>{
 };
 const PrefetchPageLinks = ({ path, includeData })=>{
     const { pathname } = path;
-    const context = (0, external_react_namespaceObject.useContext)(index_js_namespaceObject.InternalRuntimeContext);
+    const context = (0, external_react_namespaceObject.useContext)(context_namespaceObject.InternalRuntimeContext);
     const { routeManifest, routes } = context;
     const { routeAssets } = routeManifest || {};
     const policy = context.linkPrefetchPolicy;
@@ -254,7 +254,7 @@ const PrefetchPageLinks = ({ path, includeData })=>{
 };
 const PrefetchDataLinks = ({ matches, path, routeManifest })=>{
     const { pathname, search, hash } = path;
-    const policy = (0, external_react_namespaceObject.useContext)(index_js_namespaceObject.InternalRuntimeContext).linkPrefetchPolicy;
+    const policy = (0, external_react_namespaceObject.useContext)(context_namespaceObject.InternalRuntimeContext).linkPrefetchPolicy;
     const currentMatches = (0, router_namespaceObject.useMatches)();
     const basename = (0, router_namespaceObject.useHref)('/');
     const dataHrefs = (0, external_react_namespaceObject.useMemo)(()=>matches?.filter((match, index)=>{
@@ -287,7 +287,7 @@ const PrefetchDataLinks = ({ matches, path, routeManifest })=>{
 };
 const createPrefetchLink = (Link)=>/*#__PURE__*/ (external_react_default()).forwardRef(({ to, prefetch, preload, ...props }, forwardedRef)=>{
         const isAbsolute = 'string' == typeof to && ABSOLUTE_URL_REGEX.test(to);
-        const policy = (0, external_react_namespaceObject.useContext)(index_js_namespaceObject.InternalRuntimeContext).linkPrefetchPolicy;
+        const policy = (0, external_react_namespaceObject.useContext)(context_namespaceObject.InternalRuntimeContext).linkPrefetchPolicy;
         const [shouldPrefetch, shouldPreload, prefetchHandlers, setViewportElement] = usePrefetchBehavior(prefetch, preload, props, policy);
         const setAnchorRef = external_react_default().useCallback((element)=>{
             setViewportElement(element);

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

@@ -37,13 +37,12 @@ __webpack_require__.d(__webpack_exports__, {
     routerProviderRegistryHooks: ()=>routerProviderRegistryHooks
 });
 const plugin_namespaceObject = require("@modern-js/plugin");
-const createRouterSyncHook = ()=>(0, plugin_namespaceObject.createSyncHook)();
-const modifyRoutes = createRouterSyncHook();
-const onBeforeCreateRoutes = createRouterSyncHook();
-const onBeforeCreateRouter = createRouterSyncHook();
-const onAfterCreateRouter = createRouterSyncHook();
-const onBeforeHydrateRouter = createRouterSyncHook();
-const onAfterHydrateRouter = createRouterSyncHook();
+const modifyRoutes = (0, plugin_namespaceObject.createSyncHook)();
+const onBeforeCreateRoutes = (0, plugin_namespaceObject.createSyncHook)();
+const onBeforeCreateRouter = (0, plugin_namespaceObject.createSyncHook)();
+const onAfterCreateRouter = (0, plugin_namespaceObject.createSyncHook)();
+const onBeforeHydrateRouter = (0, plugin_namespaceObject.createSyncHook)();
+const onAfterHydrateRouter = (0, plugin_namespaceObject.createSyncHook)();
 const routerProviderRegistryHooks = {
     modifyRoutes,
     onBeforeCreateRoutes,

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

@@ -34,11 +34,11 @@ __webpack_require__.d(__webpack_exports__, {
     routerPlugin: ()=>routerPlugin
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const context_namespaceObject = require("@modern-js/runtime/context");
 const merge_namespaceObject = require("@modern-js/runtime-utils/merge");
 const router_namespaceObject = require("@modern-js/runtime-utils/router");
 const url_namespaceObject = require("@modern-js/runtime-utils/url");
 const external_react_namespaceObject = require("react");
-const index_js_namespaceObject = require("../../core/context/index.js");
 const external_hooks_js_namespaceObject = require("./hooks.js");
 const external_PrefetchLink_js_namespaceObject = require("./PrefetchLink.js");
 const external_rsc_router_js_namespaceObject = require("./rsc-router.js");
@@ -92,8 +92,8 @@ const routerPlugin = (userConfig = {})=>({
                 const mergedConfig = (0, merge_namespaceObject.merge)(api.getRuntimeConfig().router || {}, userConfig);
                 const { serverBase = [], supportHtml5History = true, basename = '', routesConfig, createRoutes } = mergedConfig;
                 finalRouteConfig = {
-                    routes: (0, index_js_namespaceObject.getGlobalRoutes)(),
-                    globalApp: (0, index_js_namespaceObject.getGlobalLayoutApp)(),
+                    routes: (0, context_namespaceObject.getGlobalRoutes)(),
+                    globalApp: (0, context_namespaceObject.getGlobalLayoutApp)(),
                     ...routesConfig
                 };
                 if (!finalRouteConfig.routes && !createRoutes) return App;
@@ -101,24 +101,20 @@ const routerPlugin = (userConfig = {})=>({
                     const match = serverBase.find((baseUrl)=>isSegmentPrefix(pathname, baseUrl));
                     return match || '/';
                 };
-                let cachedRouter = null;
+                const routerCache = new WeakMap();
                 const RouterWrapper = (props)=>{
-                    const routerResult = useRouterCreation(("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, index_js_namespaceObject.getGlobalEnableRsc)()) ? {
+                    const routerResult = useRouterCreation(("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, context_namespaceObject.getGlobalEnableRsc)()) ? {
                         ...props,
                         rscPayload: props?.rscPayload
                     } : props, {
                         api: api,
+                        cache: routerCache,
                         createRoutes,
                         supportHtml5History,
                         selectBasePath,
                         basename
                     });
-                    const router = (0, external_react_namespaceObject.useMemo)(()=>{
-                        if (cachedRouter) return cachedRouter;
-                        cachedRouter = routerResult.router;
-                        return cachedRouter;
-                    }, []);
-                    const { routes } = routerResult;
+                    const { router, routes } = routerResult;
                     routesContainer.current = routes;
                     beforeCreateRouter = false;
                     const routerContent = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
@@ -155,20 +151,21 @@ function isSegmentPrefix(pathname, base) {
     return p === b || p.startsWith(`${b}/`);
 }
 function useRouterCreation(props, options) {
-    const { api, createRoutes, supportHtml5History, selectBasePath, basename } = options;
-    const runtimeContext = (0, external_react_namespaceObject.useContext)(index_js_namespaceObject.InternalRuntimeContext);
+    const { api, cache, createRoutes, supportHtml5History, selectBasePath, basename } = options;
+    const runtimeContext = (0, external_react_namespaceObject.useContext)(context_namespaceObject.InternalRuntimeContext);
     const baseUrl = selectBasePath(location.pathname).replace(/^\/*/, '/');
     const _basename = '/' === baseUrl ? (0, external_utils_js_namespaceObject.urlJoin)(baseUrl, runtimeContext._internalRouterBaseName || basename || '') : baseUrl;
     const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
-    const rscPayload = ("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, index_js_namespaceObject.getGlobalEnableRsc)()) && props?.rscPayload ? safeUse(props.rscPayload) : null;
-    let hydrationData = "u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA : true === (0, index_js_namespaceObject.getGlobalEnableRsc)() ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA;
-    return (0, external_react_namespaceObject.useMemo)(()=>{
+    const rscPayload = ("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, context_namespaceObject.getGlobalEnableRsc)()) && props?.rscPayload ? safeUse(props.rscPayload) : null;
+    let hydrationData = "u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA : true === (0, context_namespaceObject.getGlobalEnableRsc)() ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA;
+    const result = (0, external_react_namespaceObject.useRef)(cache.get(runtimeContext) ?? null);
+    if (null === result.current) {
         if (hydrationData?.errors) hydrationData = {
             ...hydrationData,
             errors: (0, external_utils_js_namespaceObject.deserializeErrors)(hydrationData.errors)
         };
         let routes = null;
-        routes = ("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, index_js_namespaceObject.getGlobalEnableRsc)()) && (0, index_js_namespaceObject.getGlobalIsRscClient)() ? createRoutes ? createRoutes() : (0, external_utils_js_namespaceObject.createRouteObjectsFromConfig)({
+        routes = ("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, context_namespaceObject.getGlobalEnableRsc)()) && (0, context_namespaceObject.getGlobalIsRscClient)() ? createRoutes ? createRoutes() : (0, external_utils_js_namespaceObject.createRouteObjectsFromConfig)({
             routesConfig: finalRouteConfig
         }) : createRoutes ? createRoutes() : (0, router_namespaceObject.createRoutesFromElements)((0, external_utils_js_namespaceObject.renderRoutes)({
             routesConfig: finalRouteConfig,
@@ -176,12 +173,14 @@ function useRouterCreation(props, options) {
         }));
         if (!routes) routes = [];
         const hooks = api.getHooks();
-        if (("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, index_js_namespaceObject.getGlobalEnableRsc)()) && rscPayload) try {
+        if (("u" > typeof __MODERN_ENABLE_RSC__ ? __MODERN_ENABLE_RSC__ : true === (0, context_namespaceObject.getGlobalEnableRsc)()) && rscPayload) try {
             const router = (0, external_rsc_router_js_namespaceObject.createClientRouterFromPayload)(rscPayload, routes, _basename);
-            return {
+            result.current = {
                 router,
                 routes: router.routes || []
             };
+            cache.set(runtimeContext, result.current);
+            return result.current;
         } catch (e) {
             console.error('Failed to create router from RSC payload:', e);
         }
@@ -230,17 +229,13 @@ function useRouterCreation(props, options) {
             };
             return originSubscribe(wrappedListener);
         };
-        return {
+        result.current = {
             router,
             routes: modifiedRoutes
         };
-    }, [
-        finalRouteConfig,
-        props,
-        _basename,
-        hydrationData,
-        getBlockNavState
-    ]);
+        cache.set(runtimeContext, result.current);
+    }
+    return result.current;
 }
 exports.beforeCreateRouter = __webpack_exports__.beforeCreateRouter;
 exports.finalRouteConfig = __webpack_exports__.finalRouteConfig;

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

@@ -41,13 +41,13 @@ __webpack_require__.d(__webpack_exports__, {
     routerPlugin: ()=>routerPlugin
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const context_namespaceObject = require("@modern-js/runtime/context");
 const merge_namespaceObject = require("@modern-js/runtime-utils/merge");
 const node_namespaceObject = require("@modern-js/runtime-utils/node");
 const router_namespaceObject = require("@modern-js/runtime-utils/router");
 const time_namespaceObject = require("@modern-js/runtime-utils/time");
 const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const external_react_namespaceObject = require("react");
-const index_js_namespaceObject = require("../../core/context/index.js");
 const index_server_js_namespaceObject = require("../../core/context/serverPayload/index.server.js");
 const external_DeferredDataScripts_node_js_namespaceObject = require("./DeferredDataScripts.node.js");
 var external_DeferredDataScripts_node_js_default = /*#__PURE__*/ __webpack_require__.n(external_DeferredDataScripts_node_js_namespaceObject);
@@ -58,11 +58,10 @@ const external_utils_js_namespaceObject = require("./utils.js");
 function createRemixRequest(request) {
     const method = 'GET';
     const { headers } = request;
-    const controller = new AbortController();
     return new Request(request.url, {
         method,
         headers,
-        signal: controller.signal
+        signal: request.signal
     });
 }
 const routerPlugin = (userConfig = {})=>({
@@ -81,12 +80,12 @@ const routerPlugin = (userConfig = {})=>({
                 const pluginConfig = api.getRuntimeConfig();
                 const { basename = '', routesConfig, createRoutes } = (0, merge_namespaceObject.merge)(pluginConfig.router || {}, userConfig);
                 finalRouteConfig = {
-                    routes: (0, index_js_namespaceObject.getGlobalRoutes)(),
-                    globalApp: (0, index_js_namespaceObject.getGlobalLayoutApp)(),
+                    routes: (0, context_namespaceObject.getGlobalRoutes)(),
+                    globalApp: (0, context_namespaceObject.getGlobalLayoutApp)(),
                     ...routesConfig
                 };
                 if (!finalRouteConfig.routes && !createRoutes) return;
-                const enableRsc = (0, index_js_namespaceObject.getGlobalEnableRsc)();
+                const enableRsc = (0, context_namespaceObject.getGlobalEnableRsc)();
                 if (enableRsc) await (0, external_rsc_router_js_namespaceObject.prepareRSCRoutes)(finalRouteConfig.routes);
                 const { request, mode: ssrMode, nonce, loaderFailureMode = 'errorBoundary', baseUrl } = context.ssrContext;
                 const _basename = '/' === baseUrl ? (0, external_utils_js_namespaceObject.urlJoin)(baseUrl, basename) : baseUrl;
@@ -154,9 +153,9 @@ const routerPlugin = (userConfig = {})=>({
             api.wrapRoot((App)=>{
                 if (!finalRouteConfig) return App;
                 const getRouteApp = ()=>{
-                    const enableRsc = (0, index_js_namespaceObject.getGlobalEnableRsc)();
+                    const enableRsc = (0, context_namespaceObject.getGlobalEnableRsc)();
                     return (props)=>{
-                        const context = (0, external_react_namespaceObject.useContext)(index_js_namespaceObject.InternalRuntimeContext);
+                        const context = (0, external_react_namespaceObject.useContext)(context_namespaceObject.InternalRuntimeContext);
                         const { routerContext, routes } = context;
                         const { basename } = routerContext;
                         if (enableRsc) return App ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(App, {
@@ -166,7 +165,7 @@ const routerPlugin = (userConfig = {})=>({
                         }) : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_rsc_router_js_namespaceObject.RSCStaticRouter, {
                             basename: basename
                         });
-                        {
+                        else {
                             const { nonce, mode, useJsonScript } = context.ssrContext;
                             const remixRouter = (0, router_namespaceObject.createStaticRouter)(routes, routerContext);
                             const routerWrapper = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {

package/dist/esm/cli/code.mjs

@@ -43,7 +43,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 entryName,
                 customEntry,
                 mountId,
-                enableRsc: config.server.rsc,
+                enableRsc: Boolean(config.server.rsc),
                 isNestedRouter: !!entrypoint.nestedRoutesEntry
             }) : __rspack_external__template_mjs_d1604447.entryForCSRWithRSC({
                 metaName,
@@ -86,7 +86,7 @@ requestHandler.catch(() => {});`, 'utf8');
                     mode: ssrMode,
                     customServerEntry,
                     srcDirectory,
-                    enableRsc: config.server.rsc
+                    enableRsc: Boolean(config.server.rsc)
                 });
                 const indexServerFile = path.resolve(internalDirectory, `./${entryName}/${SERVER_ENTRY_POINT_FILE_NAME}`);
                 await fs.outputFile(indexServerFile, indexServerCode, 'utf8');

package/dist/esm/cli/index.mjs

@@ -1,4 +1,3 @@
-import { cleanRequireCache } from "@modern-js/utils";
 import path_0 from "path";
 import { documentPlugin } from "../document/cli/index.mjs";
 import { getEntrypointRoutesDir, getEntrypointRoutesOwner, handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints, isRouteEntry, routerPlugin, updateNestedRoutesSpec } from "../router/cli/index.mjs";
@@ -70,12 +69,6 @@ const runtimePlugin = (params)=>({
                     }
                 };
             });
-            api.onBeforeRestart(()=>{
-                cleanRequireCache([
-                    require.resolve('../router/cli'),
-                    require.resolve('./ssr')
-                ]);
-            });
         }
     });
 const cli = runtimePlugin;

package/dist/esm/cli/ssr/loadable-bundler-plugin.mjs

@@ -2,6 +2,7 @@ import { fs } from "@modern-js/utils";
 import path_0 from "path";
 const normalizeChunkId = (id)=>'string' == typeof id && /^\d+$/.test(id) ? Number(id) : id;
 const DEFAULT_CHUNK_LOADING_GLOBAL = '__LOADABLE_LOADED_CHUNKS__';
+const normalizeStatsPublicPath = (publicPath)=>'auto' === publicPath || 'auto/' === publicPath ? '/' : publicPath;
 const normalizeChunkGroup = (group)=>({
         ...group,
         chunks: (group.chunks || []).map(normalizeChunkId)
@@ -44,6 +45,7 @@ class LoadablePlugin {
         for (const [name, ep] of Object.entries(stats.entrypoints || {}))entrypoints[name] = normalizeChunkGroup(ep);
         const output = {
             ...stats,
+            publicPath: normalizeStatsPublicPath(stats.publicPath),
             namedChunkGroups,
             entrypoints,
             generator: 'loadable-components',

package/dist/esm/cli/template.server.mjs

@@ -120,8 +120,7 @@ function genHandlerCode({ mode, metaName, customServerEntry, srcDirectory, inter
         return `
       export * from '${realEntryPath}';
       export { default as requestHandler } from '${realEntryPath}'`;
-    }
-    {
+    } else {
         const entrySource = enableRsc ? SERVER_ENTRY_RSC : SERVER_ENTRY;
         const serverEntry = transformServerEntry(entrySource, {
             metaName: metaName || 'modern-js',

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

@@ -29,7 +29,7 @@ function hydrate_hydrateRoot(App, context, ModernRender, ModernHydrate) {
     if ('stream' === renderMode) return streamSSRHydrate();
     function streamSSRHydrate() {
         if (renderLevel !== RenderLevel.SERVER_RENDER) return ModernRender(wrapRuntimeContextProvider(App, context));
-        {
+        else {
             const SSRApp = ()=>/*#__PURE__*/ jsx(WithCallback, {
                     callback: callback,
                     children: App
@@ -45,7 +45,7 @@ function hydrate_hydrateRoot(App, context, ModernRender, ModernHydrate) {
     return stringSSRHydrate();
     function stringSSRHydrate() {
         if (renderLevel === RenderLevel.CLIENT_RENDER) return ModernRender(wrapRuntimeContextProvider(App, context));
-        {
+        else {
             if (renderLevel === RenderLevel.SERVER_RENDER) return loadableReady(()=>void 0, loadableReadyOptions).then(()=>{
                 const SSRApp = ()=>/*#__PURE__*/ jsx(WithCallback, {
                         callback: callback,
@@ -53,13 +53,7 @@ function hydrate_hydrateRoot(App, context, ModernRender, ModernHydrate) {
                     });
                 return ModernHydrate(wrapRuntimeContextProvider(/*#__PURE__*/ jsx(SSRApp, {}), hydrateContext));
             });
-            const runtimeConsole = Reflect.get(globalThis, 'console');
-            if (null !== runtimeConsole && 'object' == typeof runtimeConsole) {
-                const warn = Reflect.get(runtimeConsole, 'warn');
-                if ('function' == typeof warn) Reflect.apply(warn, runtimeConsole, [
-                    `unknow render level: ${renderLevel}, execute render()`
-                ]);
-            }
+            console.warn(`unknow render level: ${renderLevel}, execute render()`);
             return ModernRender(wrapRuntimeContextProvider(App, context));
         }
     }

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

@@ -1,7 +1,6 @@
+import { getGlobalInternalRuntimeContext, getInitialContext } from "@modern-js/runtime/context";
 import { parseCookie } from "cookie";
 import { createRoot } from "react-dom/client";
-import { getGlobalInternalRuntimeContext } from "../context/index.mjs";
-import { getInitialContext } from "../context/runtime.mjs";
 import { wrapRuntimeContextProvider } from "../react/wrapper.mjs";
 import { hydrateRoot, hydrateWithReact } from "./hydrate.mjs";
 const IS_REACT18 = 'true' === process.env.IS_REACT18;

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

@@ -42,6 +42,6 @@ function getGlobalBasename() {
 }
 export { DefaultNotFound } from "../../router/runtime/DefaultNotFound.mjs";
 export { modifyRoutes, onAfterCreateRouter, onAfterHydrateRouter, onBeforeCreateRouter, onBeforeCreateRoutes, onBeforeHydrateRouter, routerProviderRegistryHooks } from "../../router/runtime/hooks.mjs";
-export { InternalRuntimeContext, RuntimeComponentResolverContext, RuntimeContext, getInitialContext } from "./runtime.mjs";
+export { InternalRuntimeContext, ReactRuntimeContext, RuntimeComponentResolverContext, RuntimeContext, getInitialContext, useRuntimeContext } from "./runtime.mjs";
 export { getServerPayload, setServerPayload } from "./serverPayload/index.mjs";
 export { getCurrentEntryName, getGlobalApp, getGlobalBasename, getGlobalEnableRsc, getGlobalInternalRuntimeContext, getGlobalIsRscClient, getGlobalLayoutApp, getGlobalRSCRoot, getGlobalRoutes, setGlobalContext, setGlobalInternalRuntimeContext };

package/dist/esm/core/context/public.mjs

@@ -1 +1 @@
-export { ReactRuntimeContext, RuntimeContext, useRuntimeContext } from "./runtime.mjs";
+export { ReactRuntimeContext, RuntimeContext, useRuntimeContext } from "@modern-js/runtime/context";