@modern-js/runtime 3.1.1 → 3.1.3

package/dist/cjs/document/Html.js

@@ -31,12 +31,24 @@ require("react");
 const external_Body_js_namespaceObject = require("./Body.js");
 const external_DocumentStructureContext_js_namespaceObject = require("./DocumentStructureContext.js");
 const external_Head_js_namespaceObject = require("./Head.js");
+const external_Links_js_namespaceObject = require("./Links.js");
+const external_Root_js_namespaceObject = require("./Root.js");
+const external_Scripts_js_namespaceObject = require("./Scripts.js");
 function findTargetChildByName(tag, children) {
     return children.find((item)=>getEleType(item) === tag);
 }
 function findTargetChildByComponent(component, children) {
     return children.find((item)=>item?.type === component);
 }
+function findTargetElementByComponent(component, children) {
+    if (0 === children.length) return null;
+    let nextChildren = [];
+    for (const item of children){
+        if (item?.type === component) return item;
+        if (item?.props?.children) nextChildren = nextChildren.concat(item.props.children);
+    }
+    return findTargetElementByComponent(component, nextChildren);
+}
 function getEleType(ele) {
     return 'function' == typeof ele?.type ? ele.type.name : ele?.type;
 }
@@ -52,10 +64,10 @@ function findTargetElement(tag, children) {
 function Html(props) {
     const { children, ...rest } = props;
     const hasSetHead = Boolean(findTargetChildByComponent(external_Head_js_namespaceObject.Head, children) || findTargetChildByName('Head', children));
-    const hasSetScripts = Boolean(findTargetElement('Scripts', children));
-    const hasSetLinks = Boolean(findTargetElement('Links', children));
-    const hasSetBody = Boolean(findTargetChildByComponent(external_Body_js_namespaceObject.Body, children) || findTargetChildByName('Body', children));
-    const hasSetRoot = Boolean(findTargetElement('Root', children));
+    const hasSetScripts = Boolean(findTargetElementByComponent(external_Scripts_js_namespaceObject.Scripts, children) || findTargetChildByName('Scripts', children));
+    const hasSetLinks = Boolean(findTargetElementByComponent(external_Links_js_namespaceObject.Links, children) || findTargetChildByName('Links', children));
+    const hasSetBody = Boolean(findTargetElementByComponent(external_Body_js_namespaceObject.Body, children) || findTargetChildByName('Body', children));
+    const hasSetRoot = Boolean(findTargetElementByComponent(external_Root_js_namespaceObject.Root, children) || findTargetChildByName('Root', children));
     const hasSetTitle = Boolean(findTargetElement('title', children));
     const notMissMustChild = [
         hasSetHead,

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

@@ -81,7 +81,12 @@ const parseModule = async ({ source, filename })=>{
     if (utils_namespaceObject.JS_EXTENSIONS.some((ext)=>filename.endsWith(ext))) {
         const result = await (0, external_esbuild_namespaceObject.transform)(content, {
             loader: external_path_default().extname(filename).slice(1),
-            format: 'esm'
+            format: 'esm',
+            tsconfigRaw: {
+                compilerOptions: {
+                    experimentalDecorators: true
+                }
+            }
         });
         content = result.code;
     }

package/dist/esm/cli/code.mjs

@@ -2,8 +2,8 @@ import path from "path";
 import { fs } from "@modern-js/utils";
 import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants.mjs";
 import { resolveSSRMode } from "./ssr/mode.mjs";
-import { AppProxyForRSC, entryForCSRWithRSC, index, register, runtimeGlobalContext, runtimeGlobalContextForRSCClient, runtimeGlobalContextForRSCServer, runtimeRegister } from "./template.mjs";
-import { entryForCSRWithRSC as external_template_server_mjs_entryForCSRWithRSC, serverIndex } from "./template.server.mjs";
+import * as __rspack_external__template_mjs_d6ab8956 from "./template.mjs";
+import * as __rspack_external__template_server_mjs_38d6edb1 from "./template.server.mjs";
 const generateCode = async (entrypoints, appContext, config, hooks)=>{
     const { mountId } = config.html;
     const { enableAsyncEntry } = config.source;
@@ -21,7 +21,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 nestedRoutesEntry
             });
             let indexCode = '';
-            indexCode = ssrMode || !config.server.rsc || customEntry ? index({
+            indexCode = ssrMode || !config.server.rsc || customEntry ? __rspack_external__template_mjs_d6ab8956.index({
                 srcDirectory,
                 internalSrcAlias,
                 metaName,
@@ -31,7 +31,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 mountId,
                 enableRsc: config.server.rsc,
                 isNestedRouter: !!entrypoint.nestedRoutesEntry
-            }) : entryForCSRWithRSC({
+            }) : __rspack_external__template_mjs_d6ab8956.entryForCSRWithRSC({
                 metaName,
                 entryName,
                 mountId,
@@ -47,7 +47,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 if (ssrMode) await fs.outputFile(bootstrapServerFile, `export const requestHandler = import('./${SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, 'utf8');
             }
             if (ssrMode) {
-                const indexServerCode = serverIndex({
+                const indexServerCode = __rspack_external__template_server_mjs_38d6edb1.serverIndex({
                     entry,
                     entryName,
                     internalSrcAlias,
@@ -61,16 +61,16 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
             } else if (config.server.rsc) {
                 const indexServerFile = path.resolve(internalDirectory, `./${entryName}/${SERVER_ENTRY_POINT_FILE_NAME}`);
-                const indexServerCode = external_template_server_mjs_entryForCSRWithRSC({
+                const indexServerCode = __rspack_external__template_server_mjs_38d6edb1.entryForCSRWithRSC({
                     entryName,
                     metaName
                 });
                 await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
             }
-            const registerCode = register();
+            const registerCode = __rspack_external__template_mjs_d6ab8956.register();
             const registerFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_REGISTER_FILE_NAME}`);
             await fs.outputFile(registerFile, registerCode, 'utf8');
-            const registerRuntimeCode = runtimeRegister({
+            const registerRuntimeCode = __rspack_external__template_mjs_d6ab8956.runtimeRegister({
                 entryName,
                 srcDirectory,
                 internalSrcAlias,
@@ -84,7 +84,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
             if (!config.server.rsc || entrypoint.nestedRoutesEntry) {
                 const route = serverRoutes.find((r)=>r.entryName === entryName);
                 const basename = route?.urlPath || '/';
-                contextCode = runtimeGlobalContext({
+                contextCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContext({
                     entryName,
                     srcDirectory,
                     internalSrcAlias,
@@ -95,18 +95,18 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 });
             } else {
                 const AppProxyPath = path.join(internalDirectory, entryName, './AppProxy.jsx');
-                const appProxyCode = AppProxyForRSC({
+                const appProxyCode = __rspack_external__template_mjs_d6ab8956.AppProxyForRSC({
                     srcDirectory,
                     internalSrcAlias,
                     entry,
                     customEntry
                 });
                 await fs.outputFile(AppProxyPath, appProxyCode);
-                contextCode = runtimeGlobalContextForRSCClient({
+                contextCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContextForRSCClient({
                     metaName,
                     customEntry
                 });
-                const contextServerCode = runtimeGlobalContextForRSCServer({
+                const contextServerCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContextForRSCServer({
                     metaName
                 });
                 const contextFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.server.js`);

package/dist/esm/document/Html.mjs

@@ -3,12 +3,24 @@ import "react";
 import { Body } from "./Body.mjs";
 import { DocumentStructureContext } from "./DocumentStructureContext.mjs";
 import { Head } from "./Head.mjs";
+import { Links } from "./Links.mjs";
+import { Root } from "./Root.mjs";
+import { Scripts } from "./Scripts.mjs";
 function findTargetChildByName(tag, children) {
     return children.find((item)=>getEleType(item) === tag);
 }
 function findTargetChildByComponent(component, children) {
     return children.find((item)=>item?.type === component);
 }
+function findTargetElementByComponent(component, children) {
+    if (0 === children.length) return null;
+    let nextChildren = [];
+    for (const item of children){
+        if (item?.type === component) return item;
+        if (item?.props?.children) nextChildren = nextChildren.concat(item.props.children);
+    }
+    return findTargetElementByComponent(component, nextChildren);
+}
 function getEleType(ele) {
     return 'function' == typeof ele?.type ? ele.type.name : ele?.type;
 }
@@ -24,10 +36,10 @@ function findTargetElement(tag, children) {
 function Html(props) {
     const { children, ...rest } = props;
     const hasSetHead = Boolean(findTargetChildByComponent(Head, children) || findTargetChildByName('Head', children));
-    const hasSetScripts = Boolean(findTargetElement('Scripts', children));
-    const hasSetLinks = Boolean(findTargetElement('Links', children));
-    const hasSetBody = Boolean(findTargetChildByComponent(Body, children) || findTargetChildByName('Body', children));
-    const hasSetRoot = Boolean(findTargetElement('Root', children));
+    const hasSetScripts = Boolean(findTargetElementByComponent(Scripts, children) || findTargetChildByName('Scripts', children));
+    const hasSetLinks = Boolean(findTargetElementByComponent(Links, children) || findTargetChildByName('Links', children));
+    const hasSetBody = Boolean(findTargetElementByComponent(Body, children) || findTargetChildByName('Body', children));
+    const hasSetRoot = Boolean(findTargetElementByComponent(Root, children) || findTargetChildByName('Root', children));
     const hasSetTitle = Boolean(findTargetElement('title', children));
     const notMissMustChild = [
         hasSetHead,

package/dist/esm/exports/loadable.mjs

@@ -1,4 +1,4 @@
-export * from "@loadable/component";
 import component from "@loadable/component";
+export * from "@loadable/component";
 const loadable = component;
 export default loadable;

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

@@ -5,8 +5,8 @@ import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/const
 import { resolveSSRMode } from "../../../cli/ssr/mode.mjs";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants.mjs";
 import { walk } from "./nestedRoutes.mjs";
-import { fileSystemRoutes, routesForServer, ssrLoaderCombinedModule } from "./templates.mjs";
 import { getServerCombinedModuleFile, getServerLoadersFile } from "./utils.mjs";
+import * as __rspack_external__templates_mjs_4da4c6c8 from "./templates.mjs";
 async function generateRoutesForEntry(entrypoint, appContext) {
     const routes = [];
     if (entrypoint.nestedRoutesEntry) {
@@ -81,7 +81,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                 }
                 const { code } = await hooks.onBeforeGenerateRoutes.call({
                     entrypoint,
-                    code: await fileSystemRoutes({
+                    code: await __rspack_external__templates_mjs_4da4c6c8.fileSystemRoutes({
                         metaName,
                         routes: routes,
                         ssrMode: isUseRsc(config) ? 'stream' : ssrMode,
@@ -98,12 +98,12 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                     const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
                     const filtedRoutesForServer = filterRoutesForServer(routes);
                     const routesForServerLoaderMatches = filterRoutesLoader(routes);
-                    const code = routesForServer({
+                    const code = __rspack_external__templates_mjs_4da4c6c8.routesForServer({
                         routesForServerLoaderMatches
                     });
                     await fs.ensureFile(routesServerFile);
                     await fs.writeFile(routesServerFile, code);
-                    const serverRoutesCode = await fileSystemRoutes({
+                    const serverRoutesCode = await __rspack_external__templates_mjs_4da4c6c8.fileSystemRoutes({
                         metaName,
                         routes: filtedRoutesForServer,
                         ssrMode,
@@ -117,7 +117,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                     });
                     await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, 'utf8');
                 }
-                const serverLoaderCombined = ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
+                const serverLoaderCombined = __rspack_external__templates_mjs_4da4c6c8.ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
                 if (serverLoaderCombined) {
                     const serverLoaderFile = getServerCombinedModuleFile(internalDirectory, entryName);
                     await fs.outputFile(serverLoaderFile, serverLoaderCombined);

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

@@ -1,11 +1,11 @@
-import { extname as external_path_extname, join, relative, sep } from "path";
 import { JS_EXTENSIONS, fs, normalizeToPosixPath } from "@modern-js/utils";
 import { NESTED_ROUTE } from "../constants.mjs";
 import { getPathWithoutExt, hasAction, replaceWithAlias } from "./utils.mjs";
+import * as __rspack_external_path from "path";
 const conventionNames = Object.values(NESTED_ROUTE);
 const replaceDynamicPath = (routePath)=>routePath.replace(/\[(.*?)\]/g, ':$1');
 const getRouteId = (componentPath, routesDir, entryName, isMainEntry)=>{
-    const relativePath = normalizeToPosixPath(relative(routesDir, componentPath));
+    const relativePath = normalizeToPosixPath(__rspack_external_path.relative(routesDir, componentPath));
     const pathWithoutExt = getPathWithoutExt(relativePath);
     let id = "";
     id = isMainEntry ? pathWithoutExt : `${entryName}_${pathWithoutExt}`;
@@ -64,8 +64,8 @@ const walk = async (options)=>{
     if (!await fs.pathExists(dirname)) return null;
     const isDirectory = (await fs.stat(dirname)).isDirectory();
     if (!isDirectory) return null;
-    const relativeDir = relative(rootDir, dirname);
-    const pathSegments = relativeDir.split(sep);
+    const relativeDir = __rspack_external_path.relative(rootDir, dirname);
+    const pathSegments = relativeDir.split(__rspack_external_path.sep);
     const lastSegment = pathSegments[pathSegments.length - 1];
     const isRoot = '' === lastSegment;
     const isPathlessLayout = lastSegment.startsWith('__');
@@ -93,9 +93,9 @@ const walk = async (options)=>{
     let splatAction = '';
     const items = await fs.readdir(dirname);
     for (const item of items){
-        const itemPath = join(dirname, item);
+        const itemPath = __rspack_external_path.join(dirname, item);
         const itemPathWithAlias = alias ? getPathWithoutExt(replaceWithAlias(alias.basename, itemPath, alias.name)) : getPathWithoutExt(itemPath);
-        const extname = external_path_extname(item);
+        const extname = __rspack_external_path.extname(item);
         const itemWithoutExt = item.slice(0, -extname.length);
         const isDirectory = (await fs.stat(itemPath)).isDirectory();
         if (isDirectory) {
@@ -168,7 +168,7 @@ const walk = async (options)=>{
     let finalRoute = createRoute({
         ...route,
         origin: 'file-system'
-    }, rootDir, join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`), entryName, isMainEntry);
+    }, rootDir, __rspack_external_path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`), entryName, isMainEntry);
     if (isPathlessLayout) delete finalRoute.path;
     const childRoutes = finalRoute.children = finalRoute.children?.filter((childRoute)=>childRoute);
     if (childRoutes && 0 === childRoutes.length && !finalRoute.index && !finalRoute._component) return null;

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

@@ -34,7 +34,12 @@ const parseModule = async ({ source, filename })=>{
     if (JS_EXTENSIONS.some((ext)=>filename.endsWith(ext))) {
         const result = await transform(content, {
             loader: path.extname(filename).slice(1),
-            format: 'esm'
+            format: 'esm',
+            tsconfigRaw: {
+                compilerOptions: {
+                    experimentalDecorators: true
+                }
+            }
         });
         content = result.code;
     }

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

@@ -1,9 +1,9 @@
 import path from "path";
 import { getMeta } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { runtimeGlobalContext } from "./code/templates.mjs";
 import { isPageComponentFile } from "./code/utils.mjs";
 import { modifyEntrypoints } from "./entry.mjs";
+import * as __rspack_external__code_templates_mjs_5e908598 from "./code/templates.mjs";
 let originEntrypoints = [];
 async function handleModifyEntrypoints(entrypoints) {
     return modifyEntrypoints(entrypoints);
@@ -20,7 +20,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
         if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
             const route = appContext.serverRoutes.find((r)=>r.entryName === entrypoint.entryName);
             const basename = route?.urlPath || '/';
-            generatorRegisterCode(internalDirectory, entrypoint.entryName, await runtimeGlobalContext({
+            generatorRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_5e908598.runtimeGlobalContext({
                 entryName: entrypoint.entryName,
                 metaName: appContext.metaName,
                 srcDirectory: appContext.srcDirectory,
@@ -30,7 +30,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
                 rscType: enableRsc ? 'client' : void 0,
                 basename
             }));
-            if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await runtimeGlobalContext({
+            if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_5e908598.runtimeGlobalContext({
                 entryName: entrypoint.entryName,
                 metaName: appContext.metaName,
                 srcDirectory: appContext.srcDirectory,

package/dist/esm/router/runtime/index.mjs

@@ -1,6 +1,6 @@
+import { useRouteLoaderData } from "@modern-js/runtime-utils/router";
 export * from "@modern-js/runtime-utils/router";
 export * from "./withRouter.mjs";
-import { useRouteLoaderData } from "@modern-js/runtime-utils/router";
 const runtime_useRouteLoaderData = (routeId)=>{
     const realRouteId = routeId.replace(/\[(.*?)\]/g, '($1)');
     return useRouteLoaderData(realRouteId);

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

@@ -3,8 +3,8 @@ import path from "path";
 import { fs } from "@modern-js/utils";
 import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants.mjs";
 import { resolveSSRMode } from "./ssr/mode.mjs";
-import { AppProxyForRSC, entryForCSRWithRSC, index, register, runtimeGlobalContext, runtimeGlobalContextForRSCClient, runtimeGlobalContextForRSCServer, runtimeRegister } from "./template.mjs";
-import { entryForCSRWithRSC as external_template_server_mjs_entryForCSRWithRSC, serverIndex } from "./template.server.mjs";
+import * as __rspack_external__template_mjs_d6ab8956 from "./template.mjs";
+import * as __rspack_external__template_server_mjs_38d6edb1 from "./template.server.mjs";
 const generateCode = async (entrypoints, appContext, config, hooks)=>{
     const { mountId } = config.html;
     const { enableAsyncEntry } = config.source;
@@ -22,7 +22,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 nestedRoutesEntry
             });
             let indexCode = '';
-            indexCode = ssrMode || !config.server.rsc || customEntry ? index({
+            indexCode = ssrMode || !config.server.rsc || customEntry ? __rspack_external__template_mjs_d6ab8956.index({
                 srcDirectory,
                 internalSrcAlias,
                 metaName,
@@ -32,7 +32,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 mountId,
                 enableRsc: config.server.rsc,
                 isNestedRouter: !!entrypoint.nestedRoutesEntry
-            }) : entryForCSRWithRSC({
+            }) : __rspack_external__template_mjs_d6ab8956.entryForCSRWithRSC({
                 metaName,
                 entryName,
                 mountId,
@@ -48,7 +48,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 if (ssrMode) await fs.outputFile(bootstrapServerFile, `export const requestHandler = import('./${SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, 'utf8');
             }
             if (ssrMode) {
-                const indexServerCode = serverIndex({
+                const indexServerCode = __rspack_external__template_server_mjs_38d6edb1.serverIndex({
                     entry,
                     entryName,
                     internalSrcAlias,
@@ -62,16 +62,16 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
             } else if (config.server.rsc) {
                 const indexServerFile = path.resolve(internalDirectory, `./${entryName}/${SERVER_ENTRY_POINT_FILE_NAME}`);
-                const indexServerCode = external_template_server_mjs_entryForCSRWithRSC({
+                const indexServerCode = __rspack_external__template_server_mjs_38d6edb1.entryForCSRWithRSC({
                     entryName,
                     metaName
                 });
                 await fs.outputFile(indexServerFile, indexServerCode, 'utf8');
             }
-            const registerCode = register();
+            const registerCode = __rspack_external__template_mjs_d6ab8956.register();
             const registerFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_REGISTER_FILE_NAME}`);
             await fs.outputFile(registerFile, registerCode, 'utf8');
-            const registerRuntimeCode = runtimeRegister({
+            const registerRuntimeCode = __rspack_external__template_mjs_d6ab8956.runtimeRegister({
                 entryName,
                 srcDirectory,
                 internalSrcAlias,
@@ -85,7 +85,7 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
             if (!config.server.rsc || entrypoint.nestedRoutesEntry) {
                 const route = serverRoutes.find((r)=>r.entryName === entryName);
                 const basename = route?.urlPath || '/';
-                contextCode = runtimeGlobalContext({
+                contextCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContext({
                     entryName,
                     srcDirectory,
                     internalSrcAlias,
@@ -96,18 +96,18 @@ const generateCode = async (entrypoints, appContext, config, hooks)=>{
                 });
             } else {
                 const AppProxyPath = path.join(internalDirectory, entryName, './AppProxy.jsx');
-                const appProxyCode = AppProxyForRSC({
+                const appProxyCode = __rspack_external__template_mjs_d6ab8956.AppProxyForRSC({
                     srcDirectory,
                     internalSrcAlias,
                     entry,
                     customEntry
                 });
                 await fs.outputFile(AppProxyPath, appProxyCode);
-                contextCode = runtimeGlobalContextForRSCClient({
+                contextCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContextForRSCClient({
                     metaName,
                     customEntry
                 });
-                const contextServerCode = runtimeGlobalContextForRSCServer({
+                const contextServerCode = __rspack_external__template_mjs_d6ab8956.runtimeGlobalContextForRSCServer({
                     metaName
                 });
                 const contextFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}.server.js`);

package/dist/esm-node/core/server/stream/beforeTemplate.mjs

@@ -1,12 +1,12 @@
 import "node:module";
-import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
-import { dirname as __rspack_dirname } from "node:path";
 import { matchRoutes } from "@modern-js/runtime-utils/router";
 import react_helmet from "react-helmet";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants.mjs";
 import { createReplaceHelemt } from "../helmet.mjs";
 import { buildHtml } from "../shared.mjs";
 import { checkIsNode, safeReplace } from "../utils.mjs";
+import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
+import { dirname as __rspack_dirname } from "node:path";
 var beforeTemplate_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 const readAsset = async (chunk)=>{
     const fs = await import("fs/promises");

package/dist/esm-node/core/server/string/loadable.mjs

@@ -1,8 +1,8 @@
 import "node:module";
-import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
-import { dirname as __rspack_dirname } from "node:path";
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, checkIsNode } from "../utils.mjs";
+import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
+import { dirname as __rspack_dirname } from "node:path";
 var loadable_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 const extname = (uri)=>{
     if ('string' != typeof uri || !uri.includes('.')) return '';

package/dist/esm-node/document/Html.mjs

@@ -4,12 +4,24 @@ import "react";
 import { Body } from "./Body.mjs";
 import { DocumentStructureContext } from "./DocumentStructureContext.mjs";
 import { Head } from "./Head.mjs";
+import { Links } from "./Links.mjs";
+import { Root } from "./Root.mjs";
+import { Scripts } from "./Scripts.mjs";
 function findTargetChildByName(tag, children) {
     return children.find((item)=>getEleType(item) === tag);
 }
 function findTargetChildByComponent(component, children) {
     return children.find((item)=>item?.type === component);
 }
+function findTargetElementByComponent(component, children) {
+    if (0 === children.length) return null;
+    let nextChildren = [];
+    for (const item of children){
+        if (item?.type === component) return item;
+        if (item?.props?.children) nextChildren = nextChildren.concat(item.props.children);
+    }
+    return findTargetElementByComponent(component, nextChildren);
+}
 function getEleType(ele) {
     return 'function' == typeof ele?.type ? ele.type.name : ele?.type;
 }
@@ -25,10 +37,10 @@ function findTargetElement(tag, children) {
 function Html(props) {
     const { children, ...rest } = props;
     const hasSetHead = Boolean(findTargetChildByComponent(Head, children) || findTargetChildByName('Head', children));
-    const hasSetScripts = Boolean(findTargetElement('Scripts', children));
-    const hasSetLinks = Boolean(findTargetElement('Links', children));
-    const hasSetBody = Boolean(findTargetChildByComponent(Body, children) || findTargetChildByName('Body', children));
-    const hasSetRoot = Boolean(findTargetElement('Root', children));
+    const hasSetScripts = Boolean(findTargetElementByComponent(Scripts, children) || findTargetChildByName('Scripts', children));
+    const hasSetLinks = Boolean(findTargetElementByComponent(Links, children) || findTargetChildByName('Links', children));
+    const hasSetBody = Boolean(findTargetElementByComponent(Body, children) || findTargetChildByName('Body', children));
+    const hasSetRoot = Boolean(findTargetElementByComponent(Root, children) || findTargetChildByName('Root', children));
     const hasSetTitle = Boolean(findTargetElement('title', children));
     const notMissMustChild = [
         hasSetHead,

package/dist/esm-node/exports/loadable.mjs

@@ -1,5 +1,5 @@
 import "node:module";
-export * from "@loadable/component";
 import component from "@loadable/component";
+export * from "@loadable/component";
 const loadable = component;
 export default loadable;

package/dist/esm-node/router/cli/code/index.mjs

@@ -6,8 +6,8 @@ import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/const
 import { resolveSSRMode } from "../../../cli/ssr/mode.mjs";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants.mjs";
 import { walk } from "./nestedRoutes.mjs";
-import { fileSystemRoutes, routesForServer, ssrLoaderCombinedModule } from "./templates.mjs";
 import { getServerCombinedModuleFile, getServerLoadersFile } from "./utils.mjs";
+import * as __rspack_external__templates_mjs_4da4c6c8 from "./templates.mjs";
 async function generateRoutesForEntry(entrypoint, appContext) {
     const routes = [];
     if (entrypoint.nestedRoutesEntry) {
@@ -82,7 +82,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                 }
                 const { code } = await hooks.onBeforeGenerateRoutes.call({
                     entrypoint,
-                    code: await fileSystemRoutes({
+                    code: await __rspack_external__templates_mjs_4da4c6c8.fileSystemRoutes({
                         metaName,
                         routes: routes,
                         ssrMode: isUseRsc(config) ? 'stream' : ssrMode,
@@ -99,12 +99,12 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                     const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
                     const filtedRoutesForServer = filterRoutesForServer(routes);
                     const routesForServerLoaderMatches = filterRoutesLoader(routes);
-                    const code = routesForServer({
+                    const code = __rspack_external__templates_mjs_4da4c6c8.routesForServer({
                         routesForServerLoaderMatches
                     });
                     await fs.ensureFile(routesServerFile);
                     await fs.writeFile(routesServerFile, code);
-                    const serverRoutesCode = await fileSystemRoutes({
+                    const serverRoutesCode = await __rspack_external__templates_mjs_4da4c6c8.fileSystemRoutes({
                         metaName,
                         routes: filtedRoutesForServer,
                         ssrMode,
@@ -118,7 +118,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                     });
                     await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, 'utf8');
                 }
-                const serverLoaderCombined = ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
+                const serverLoaderCombined = __rspack_external__templates_mjs_4da4c6c8.ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
                 if (serverLoaderCombined) {
                     const serverLoaderFile = getServerCombinedModuleFile(internalDirectory, entryName);
                     await fs.outputFile(serverLoaderFile, serverLoaderCombined);

package/dist/esm-node/router/cli/code/nestedRoutes.mjs

@@ -1,12 +1,12 @@
 import "node:module";
-import { extname as external_path_extname, join, relative, sep } from "path";
 import { JS_EXTENSIONS, fs, normalizeToPosixPath } from "@modern-js/utils";
 import { NESTED_ROUTE } from "../constants.mjs";
 import { getPathWithoutExt, hasAction, replaceWithAlias } from "./utils.mjs";
+import * as __rspack_external_path from "path";
 const conventionNames = Object.values(NESTED_ROUTE);
 const replaceDynamicPath = (routePath)=>routePath.replace(/\[(.*?)\]/g, ':$1');
 const getRouteId = (componentPath, routesDir, entryName, isMainEntry)=>{
-    const relativePath = normalizeToPosixPath(relative(routesDir, componentPath));
+    const relativePath = normalizeToPosixPath(__rspack_external_path.relative(routesDir, componentPath));
     const pathWithoutExt = getPathWithoutExt(relativePath);
     let id = "";
     id = isMainEntry ? pathWithoutExt : `${entryName}_${pathWithoutExt}`;
@@ -65,8 +65,8 @@ const walk = async (options)=>{
     if (!await fs.pathExists(dirname)) return null;
     const isDirectory = (await fs.stat(dirname)).isDirectory();
     if (!isDirectory) return null;
-    const relativeDir = relative(rootDir, dirname);
-    const pathSegments = relativeDir.split(sep);
+    const relativeDir = __rspack_external_path.relative(rootDir, dirname);
+    const pathSegments = relativeDir.split(__rspack_external_path.sep);
     const lastSegment = pathSegments[pathSegments.length - 1];
     const isRoot = '' === lastSegment;
     const isPathlessLayout = lastSegment.startsWith('__');
@@ -94,9 +94,9 @@ const walk = async (options)=>{
     let splatAction = '';
     const items = await fs.readdir(dirname);
     for (const item of items){
-        const itemPath = join(dirname, item);
+        const itemPath = __rspack_external_path.join(dirname, item);
         const itemPathWithAlias = alias ? getPathWithoutExt(replaceWithAlias(alias.basename, itemPath, alias.name)) : getPathWithoutExt(itemPath);
-        const extname = external_path_extname(item);
+        const extname = __rspack_external_path.extname(item);
         const itemWithoutExt = item.slice(0, -extname.length);
         const isDirectory = (await fs.stat(itemPath)).isDirectory();
         if (isDirectory) {
@@ -169,7 +169,7 @@ const walk = async (options)=>{
     let finalRoute = createRoute({
         ...route,
         origin: 'file-system'
-    }, rootDir, join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`), entryName, isMainEntry);
+    }, rootDir, __rspack_external_path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`), entryName, isMainEntry);
     if (isPathlessLayout) delete finalRoute.path;
     const childRoutes = finalRoute.children = finalRoute.children?.filter((childRoute)=>childRoute);
     if (childRoutes && 0 === childRoutes.length && !finalRoute.index && !finalRoute._component) return null;

package/dist/esm-node/router/cli/code/utils.mjs

@@ -35,7 +35,12 @@ const parseModule = async ({ source, filename })=>{
     if (JS_EXTENSIONS.some((ext)=>filename.endsWith(ext))) {
         const result = await transform(content, {
             loader: path.extname(filename).slice(1),
-            format: 'esm'
+            format: 'esm',
+            tsconfigRaw: {
+                compilerOptions: {
+                    experimentalDecorators: true
+                }
+            }
         });
         content = result.code;
     }

package/dist/esm-node/router/cli/handler.mjs

@@ -2,9 +2,9 @@ import "node:module";
 import path from "path";
 import { getMeta } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { runtimeGlobalContext } from "./code/templates.mjs";
 import { isPageComponentFile } from "./code/utils.mjs";
 import { modifyEntrypoints } from "./entry.mjs";
+import * as __rspack_external__code_templates_mjs_5e908598 from "./code/templates.mjs";
 let originEntrypoints = [];
 async function handleModifyEntrypoints(entrypoints) {
     return modifyEntrypoints(entrypoints);
@@ -21,7 +21,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
         if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
             const route = appContext.serverRoutes.find((r)=>r.entryName === entrypoint.entryName);
             const basename = route?.urlPath || '/';
-            generatorRegisterCode(internalDirectory, entrypoint.entryName, await runtimeGlobalContext({
+            generatorRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_5e908598.runtimeGlobalContext({
                 entryName: entrypoint.entryName,
                 metaName: appContext.metaName,
                 srcDirectory: appContext.srcDirectory,
@@ -31,7 +31,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
                 rscType: enableRsc ? 'client' : void 0,
                 basename
             }));
-            if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await runtimeGlobalContext({
+            if (enableRsc) generatorServerRegisterCode(internalDirectory, entrypoint.entryName, await __rspack_external__code_templates_mjs_5e908598.runtimeGlobalContext({
                 entryName: entrypoint.entryName,
                 metaName: appContext.metaName,
                 srcDirectory: appContext.srcDirectory,

package/dist/esm-node/router/cli/index.mjs

@@ -1,10 +1,10 @@
 import "node:module";
-import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
-import { dirname as __rspack_dirname } from "node:path";
 import node_path from "node:path";
 import { NESTED_ROUTE_SPEC_FILE, filterRoutesForServer, fs } from "@modern-js/utils";
 import { isRouteEntry } from "./entry.mjs";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler.mjs";
+import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
+import { dirname as __rspack_dirname } from "node:path";
 var cli_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 const routerPlugin = ()=>({
         name: '@modern-js/plugin-router',

package/dist/esm-node/router/runtime/index.mjs

@@ -1,7 +1,7 @@
 import "node:module";
+import { useRouteLoaderData } from "@modern-js/runtime-utils/router";
 export * from "@modern-js/runtime-utils/router";
 export * from "./withRouter.mjs";
-import { useRouteLoaderData } from "@modern-js/runtime-utils/router";
 const runtime_useRouteLoaderData = (routeId)=>{
     const realRouteId = routeId.replace(/\[(.*?)\]/g, '($1)');
     return useRouteLoaderData(realRouteId);

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.1",
+  "version": "3.1.3",
   "engines": {
     "node": ">=20"
   },
@@ -215,12 +215,12 @@
     "isbot": "3.8.0",
     "react-helmet": "^6.1.0",
     "react-is": "^18.3.1",
-    "@modern-js/plugin-data-loader": "3.1.1",
-    "@modern-js/render": "3.1.1",
-    "@modern-js/plugin": "3.1.1",
-    "@modern-js/runtime-utils": "3.1.1",
-    "@modern-js/types": "3.1.1",
-    "@modern-js/utils": "3.1.1"
+    "@modern-js/plugin": "3.1.3",
+    "@modern-js/runtime-utils": "3.1.3",
+    "@modern-js/render": "3.1.3",
+    "@modern-js/plugin-data-loader": "3.1.3",
+    "@modern-js/utils": "3.1.3",
+    "@modern-js/types": "3.1.3"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -228,8 +228,8 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "2.0.0-beta.4",
-    "@rslib/core": "0.20.0",
+    "@rsbuild/core": "2.0.0-rc.0",
+    "@rslib/core": "0.21.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/cookie": "0.6.0",
@@ -240,9 +240,9 @@
     "react-dom": "^19.2.4",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/app-tools": "3.1.1",
-    "@scripts/rstest-config": "2.66.0",
-    "@modern-js/rslib": "2.68.10"
+    "@modern-js/app-tools": "3.1.3",
+    "@modern-js/rslib": "2.68.10",
+    "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {