@bleedingdev/modern-js-runtime 3.2.0-ultramodern.5 → 3.2.0-ultramodern.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (189) hide show
  1. package/dist/cjs/cli/ssr/index.js +3 -2
  2. package/dist/cjs/cli/template.server.js +1 -0
  3. package/dist/cjs/core/context/serverPayload/index.js +1 -1
  4. package/dist/cjs/core/plugin/index.js +3 -2
  5. package/dist/cjs/core/server/helmet.js +2 -2
  6. package/dist/cjs/core/server/stream/afterTemplate.js +9 -6
  7. package/dist/cjs/core/server/stream/beforeTemplate.js +6 -7
  8. package/dist/cjs/core/server/stream/beforeTemplate.worker.js +104 -0
  9. package/dist/cjs/core/server/stream/createReadableStream.worker.js +2 -1
  10. package/dist/cjs/core/server/stream/shared.js +1 -0
  11. package/dist/cjs/core/server/string/index.js +1 -0
  12. package/dist/cjs/core/server/string/loadable.js +16 -1
  13. package/dist/cjs/router/cli/code/tanstackTypes.js +20 -6
  14. package/dist/cjs/router/runtime/tanstack/plugin.js +2 -0
  15. package/dist/cjs/router/runtime/tanstack/routeTree.js +38 -2
  16. package/dist/cjs/rsc/server.worker.js +58 -0
  17. package/dist/esm/cli/ssr/index.mjs +3 -2
  18. package/dist/esm/cli/template.server.mjs +1 -0
  19. package/dist/esm/core/context/serverPayload/index.mjs +1 -1
  20. package/dist/esm/core/plugin/index.mjs +3 -2
  21. package/dist/esm/core/server/helmet.mjs +1 -1
  22. package/dist/esm/core/server/stream/afterTemplate.mjs +10 -7
  23. package/dist/esm/core/server/stream/beforeTemplate.mjs +6 -7
  24. package/dist/esm/core/server/stream/beforeTemplate.worker.mjs +60 -0
  25. package/dist/esm/core/server/stream/createReadableStream.worker.mjs +2 -1
  26. package/dist/esm/core/server/stream/shared.mjs +1 -0
  27. package/dist/esm/core/server/string/index.mjs +1 -0
  28. package/dist/esm/core/server/string/loadable.mjs +16 -1
  29. package/dist/esm/router/cli/code/tanstackTypes.mjs +20 -6
  30. package/dist/esm/router/runtime/tanstack/plugin.mjs +2 -0
  31. package/dist/esm/router/runtime/tanstack/routeTree.mjs +38 -2
  32. package/dist/esm/rsc/server.worker.mjs +1 -0
  33. package/dist/esm-node/cli/ssr/index.mjs +3 -2
  34. package/dist/esm-node/cli/template.server.mjs +1 -0
  35. package/dist/esm-node/core/context/serverPayload/index.mjs +1 -1
  36. package/dist/esm-node/core/plugin/index.mjs +3 -2
  37. package/dist/esm-node/core/server/helmet.mjs +1 -1
  38. package/dist/esm-node/core/server/stream/afterTemplate.mjs +10 -7
  39. package/dist/esm-node/core/server/stream/beforeTemplate.mjs +6 -7
  40. package/dist/esm-node/core/server/stream/beforeTemplate.worker.mjs +61 -0
  41. package/dist/esm-node/core/server/stream/createReadableStream.worker.mjs +2 -1
  42. package/dist/esm-node/core/server/stream/shared.mjs +1 -0
  43. package/dist/esm-node/core/server/string/index.mjs +1 -0
  44. package/dist/esm-node/core/server/string/loadable.mjs +16 -1
  45. package/dist/esm-node/router/cli/code/tanstackTypes.mjs +20 -6
  46. package/dist/esm-node/router/runtime/tanstack/plugin.mjs +2 -0
  47. package/dist/esm-node/router/runtime/tanstack/routeTree.mjs +38 -2
  48. package/dist/esm-node/rsc/server.worker.mjs +2 -0
  49. package/dist/types/cache/index.d.ts +1 -0
  50. package/dist/types/cli/alias.d.ts +7 -0
  51. package/dist/types/cli/code.d.ts +3 -0
  52. package/dist/types/cli/constants.d.ts +9 -0
  53. package/dist/types/cli/entry.d.ts +2 -0
  54. package/dist/types/cli/index.d.ts +11 -0
  55. package/dist/types/cli/ssr/index.d.ts +6 -0
  56. package/dist/types/cli/ssr/loadable-bundler-plugin.d.ts +31 -0
  57. package/dist/types/cli/ssr/mode.d.ts +15 -0
  58. package/dist/types/cli/template.d.ts +50 -0
  59. package/dist/types/cli/template.server.d.ts +20 -0
  60. package/dist/types/common.d.ts +8 -0
  61. package/dist/types/core/browser/hydrate.d.ts +5 -0
  62. package/dist/types/core/browser/index.d.ts +9 -0
  63. package/dist/types/core/browser/withCallback.d.ts +5 -0
  64. package/dist/types/core/compat/hooks.d.ts +4 -0
  65. package/dist/types/core/compat/index.d.ts +2 -0
  66. package/dist/types/core/compat/requestContext.d.ts +5 -0
  67. package/dist/types/core/config.d.ts +6 -0
  68. package/dist/types/core/constants.d.ts +6 -0
  69. package/dist/types/core/context/index.d.ts +50 -0
  70. package/dist/types/core/context/monitors/default.d.ts +2 -0
  71. package/dist/types/core/context/monitors/index.d.ts +1 -0
  72. package/dist/types/core/context/monitors/index.server.d.ts +2 -0
  73. package/dist/types/core/context/request/index.d.ts +1 -0
  74. package/dist/types/core/context/request/index.server.d.ts +1 -0
  75. package/dist/types/core/context/response/index.d.ts +4 -0
  76. package/dist/types/core/context/response/index.server.d.ts +4 -0
  77. package/dist/types/core/context/runtime.d.ts +42 -0
  78. package/dist/types/core/context/serverPayload/index.d.ts +4 -0
  79. package/dist/types/core/context/serverPayload/index.server.d.ts +31 -0
  80. package/dist/types/core/index.d.ts +5 -0
  81. package/dist/types/core/plugin/index.d.ts +5 -0
  82. package/dist/types/core/plugin/types.d.ts +10 -0
  83. package/dist/types/core/react/index.d.ts +2 -0
  84. package/dist/types/core/react/wrapper.d.ts +3 -0
  85. package/dist/types/core/server/constants.d.ts +4 -0
  86. package/dist/types/core/server/helmet.d.ts +3 -0
  87. package/dist/types/core/server/index.d.ts +4 -0
  88. package/dist/types/core/server/react/index.d.ts +2 -0
  89. package/dist/types/core/server/react/no-ssr-cache/index.d.ts +2 -0
  90. package/dist/types/core/server/react/nossr/index.d.ts +4 -0
  91. package/dist/types/core/server/requestHandler.d.ts +13 -0
  92. package/dist/types/core/server/server.d.ts +4 -0
  93. package/dist/types/core/server/shared.d.ts +8 -0
  94. package/dist/types/core/server/stream/afterTemplate.d.ts +13 -0
  95. package/dist/types/core/server/stream/beforeTemplate.d.ts +9 -0
  96. package/dist/types/core/server/stream/beforeTemplate.worker.d.ts +9 -0
  97. package/dist/types/core/server/stream/createReadableStream.d.ts +2 -0
  98. package/dist/types/core/server/stream/createReadableStream.worker.d.ts +2 -0
  99. package/dist/types/core/server/stream/deferredScript.d.ts +15 -0
  100. package/dist/types/core/server/stream/index.d.ts +1 -0
  101. package/dist/types/core/server/stream/shared.d.ts +40 -0
  102. package/dist/types/core/server/stream/template.d.ts +9 -0
  103. package/dist/types/core/server/string/index.d.ts +2 -0
  104. package/dist/types/core/server/string/loadable.d.ts +39 -0
  105. package/dist/types/core/server/string/ssrData.d.ts +20 -0
  106. package/dist/types/core/server/string/types.d.ts +12 -0
  107. package/dist/types/core/server/tracer.d.ts +17 -0
  108. package/dist/types/core/server/utils.d.ts +19 -0
  109. package/dist/types/core/types.d.ts +49 -0
  110. package/dist/types/document/Body.d.ts +2 -0
  111. package/dist/types/document/Comment.d.ts +5 -0
  112. package/dist/types/document/DocumentContext.d.ts +13 -0
  113. package/dist/types/document/DocumentStructureContext.d.ts +12 -0
  114. package/dist/types/document/Head.d.ts +5 -0
  115. package/dist/types/document/Html.d.ts +4 -0
  116. package/dist/types/document/Links.d.ts +2 -0
  117. package/dist/types/document/Root.d.ts +7 -0
  118. package/dist/types/document/Script.d.ts +4 -0
  119. package/dist/types/document/Scripts.d.ts +2 -0
  120. package/dist/types/document/Style.d.ts +5 -0
  121. package/dist/types/document/Title.d.ts +1 -0
  122. package/dist/types/document/cli/index.d.ts +5 -0
  123. package/dist/types/document/constants.d.ts +25 -0
  124. package/dist/types/document/index.d.ts +12 -0
  125. package/dist/types/exports/config-routes.d.ts +9 -0
  126. package/dist/types/exports/head.d.ts +4 -0
  127. package/dist/types/exports/loadable.d.ts +3 -0
  128. package/dist/types/exports/tanstack-router.d.ts +5 -0
  129. package/dist/types/index.d.ts +10 -0
  130. package/dist/types/internal.d.ts +2 -0
  131. package/dist/types/react-server.d.ts +3 -0
  132. package/dist/types/router/cli/code/getClientRoutes/getRoutes.d.ts +8 -0
  133. package/dist/types/router/cli/code/getClientRoutes/index.d.ts +1 -0
  134. package/dist/types/router/cli/code/getClientRoutes/utils.d.ts +4 -0
  135. package/dist/types/router/cli/code/index.d.ts +12 -0
  136. package/dist/types/router/cli/code/inspect.d.ts +22 -0
  137. package/dist/types/router/cli/code/makeLegalIdentifier.d.ts +1 -0
  138. package/dist/types/router/cli/code/nestedRoutes.d.ts +13 -0
  139. package/dist/types/router/cli/code/tanstackTypes.d.ts +10 -0
  140. package/dist/types/router/cli/code/templates.d.ts +28 -0
  141. package/dist/types/router/cli/code/utils.d.ts +12 -0
  142. package/dist/types/router/cli/config-routes/converter.d.ts +15 -0
  143. package/dist/types/router/cli/config-routes/parseRouteConfig.d.ts +32 -0
  144. package/dist/types/router/cli/constants.d.ts +31 -0
  145. package/dist/types/router/cli/entry.d.ts +18 -0
  146. package/dist/types/router/cli/handler.d.ts +28 -0
  147. package/dist/types/router/cli/index.d.ts +5 -0
  148. package/dist/types/router/index.d.ts +1 -0
  149. package/dist/types/router/internal.d.ts +2 -0
  150. package/dist/types/router/runtime/CSSLinks.d.ts +9 -0
  151. package/dist/types/router/runtime/DefaultNotFound.d.ts +2 -0
  152. package/dist/types/router/runtime/DeferredDataScripts.d.ts +2 -0
  153. package/dist/types/router/runtime/DeferredDataScripts.node.d.ts +11 -0
  154. package/dist/types/router/runtime/PrefetchLink.d.ts +27 -0
  155. package/dist/types/router/runtime/constants.d.ts +146 -0
  156. package/dist/types/router/runtime/hooks.d.ts +18 -0
  157. package/dist/types/router/runtime/index.d.ts +7 -0
  158. package/dist/types/router/runtime/internal.d.ts +11 -0
  159. package/dist/types/router/runtime/lifecycle.d.ts +25 -0
  160. package/dist/types/router/runtime/plugin.d.ts +9 -0
  161. package/dist/types/router/runtime/plugin.node.d.ts +7 -0
  162. package/dist/types/router/runtime/routerHelper.d.ts +5 -0
  163. package/dist/types/router/runtime/rsc-router.d.ts +20 -0
  164. package/dist/types/router/runtime/rsc.d.ts +1 -0
  165. package/dist/types/router/runtime/server.d.ts +1 -0
  166. package/dist/types/router/runtime/tanstack/basepathRewrite.d.ts +8 -0
  167. package/dist/types/router/runtime/tanstack/dataMutation.d.ts +29 -0
  168. package/dist/types/router/runtime/tanstack/plugin.d.ts +6 -0
  169. package/dist/types/router/runtime/tanstack/plugin.node.d.ts +6 -0
  170. package/dist/types/router/runtime/tanstack/prefetchLink.d.ts +11 -0
  171. package/dist/types/router/runtime/tanstack/routeTree.d.ts +8 -0
  172. package/dist/types/router/runtime/tanstack/rsc/ClientSlot.d.ts +5 -0
  173. package/dist/types/router/runtime/tanstack/rsc/CompositeComponent.d.ts +3 -0
  174. package/dist/types/router/runtime/tanstack/rsc/ReplayableStream.d.ts +24 -0
  175. package/dist/types/router/runtime/tanstack/rsc/RscNodeRenderer.d.ts +5 -0
  176. package/dist/types/router/runtime/tanstack/rsc/SlotContext.d.ts +11 -0
  177. package/dist/types/router/runtime/tanstack/rsc/client.d.ts +11 -0
  178. package/dist/types/router/runtime/tanstack/rsc/createRscProxy.d.ts +7 -0
  179. package/dist/types/router/runtime/tanstack/rsc/index.d.ts +2 -0
  180. package/dist/types/router/runtime/tanstack/rsc/server.d.ts +14 -0
  181. package/dist/types/router/runtime/tanstack/rsc/slotUsageSanitizer.d.ts +2 -0
  182. package/dist/types/router/runtime/tanstack/rsc/symbols.d.ts +46 -0
  183. package/dist/types/router/runtime/types.d.ts +119 -0
  184. package/dist/types/router/runtime/utils.d.ts +48 -0
  185. package/dist/types/router/runtime/withRouter.d.ts +10 -0
  186. package/dist/types/rsc/client.d.ts +2 -0
  187. package/dist/types/rsc/server.d.ts +1 -0
  188. package/dist/types/rsc/server.worker.d.ts +1 -0
  189. package/package.json +15 -15
@@ -32,28 +32,27 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
32
32
  const { routeManifest, routerContext, routes } = runtimeContext;
33
33
  if (!routeManifest) return '';
34
34
  const { routeAssets } = routeManifest;
35
- let matchedRouteManifests;
35
+ let matchedRouteManifests = [];
36
36
  const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext);
37
37
  if (matchedRouteIds?.length) matchedRouteManifests = matchedRouteIds.map((routeId)=>routeAssets[routeId]).filter(Boolean);
38
- else {
39
- if (!routerContext || !routes) return '';
38
+ else if (routerContext && routes) {
40
39
  const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
41
40
  matchedRouteManifests = matches?.map((match, index)=>{
42
41
  if (!index) return;
43
42
  const routeId = match.route.id;
44
43
  if (routeId) return routeAssets[routeId];
45
- }).filter(Boolean);
44
+ }).filter(Boolean) ?? [];
46
45
  }
47
46
  const asyncEntry = routeAssets[`async-${entryName}`];
48
- if (asyncEntry) matchedRouteManifests?.push(asyncEntry);
49
- const cssChunks = matchedRouteManifests ? matchedRouteManifests.reduce((chunks, routeManifest)=>{
47
+ if (asyncEntry) matchedRouteManifests.push(asyncEntry);
48
+ const cssChunks = matchedRouteManifests.reduce((chunks, routeManifest)=>{
50
49
  const { referenceCssAssets = [] } = routeManifest;
51
50
  const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !template.includes(asset));
52
51
  return [
53
52
  ...chunks,
54
53
  ..._cssChunks
55
54
  ];
56
- }, []) : [];
55
+ }, []);
57
56
  const { inlineStyles } = config;
58
57
  const styles = await Promise.all(cssChunks.map(async (chunk)=>{
59
58
  const link = `<link href="${chunk}" rel="stylesheet" />`;
@@ -0,0 +1,60 @@
1
+ import { matchRoutes } from "@modern-js/runtime-utils/router";
2
+ import react_helmet from "react-helmet";
3
+ import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
4
+ import { CHUNK_CSS_PLACEHOLDER } from "../constants.mjs";
5
+ import { createReplaceHelemt } from "../helmet.mjs";
6
+ import { buildHtml } from "../shared.mjs";
7
+ import { safeReplace } from "../utils.mjs";
8
+ const checkIsInline = (chunk, enableInline)=>{
9
+ if ('production' !== process.env.NODE_ENV) return false;
10
+ if (enableInline instanceof RegExp) return enableInline.test(chunk);
11
+ return Boolean(enableInline);
12
+ };
13
+ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
14
+ const { config, runtimeContext, styledComponentsStyleTags, entryName } = options;
15
+ const helmetData = react_helmet.renderStatic();
16
+ const callbacks = [
17
+ createReplaceHelemt(helmetData),
18
+ (template)=>injectCss(template, entryName, styledComponentsStyleTags)
19
+ ];
20
+ return buildHtml(beforeAppTemplate, callbacks);
21
+ async function injectCss(template, entryName, styledComponentsStyleTags) {
22
+ let css = await getCssChunks();
23
+ if (styledComponentsStyleTags) css += styledComponentsStyleTags;
24
+ return safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
25
+ async function getCssChunks() {
26
+ const { routeManifest, routerContext, routes } = runtimeContext;
27
+ if (!routeManifest) return '';
28
+ const { routeAssets } = routeManifest;
29
+ let matchedRouteManifests = [];
30
+ const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext);
31
+ if (matchedRouteIds?.length) matchedRouteManifests = matchedRouteIds.map((routeId)=>routeAssets[routeId]).filter(Boolean);
32
+ else if (routerContext && routes) {
33
+ const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
34
+ matchedRouteManifests = matches?.map((match, index)=>{
35
+ if (!index) return;
36
+ const routeId = match.route.id;
37
+ if (routeId) return routeAssets[routeId];
38
+ }).filter(Boolean) ?? [];
39
+ }
40
+ const asyncEntry = routeAssets[`async-${entryName}`];
41
+ if (asyncEntry) matchedRouteManifests.push(asyncEntry);
42
+ const cssChunks = matchedRouteManifests.reduce((chunks, routeManifest)=>{
43
+ const { referenceCssAssets = [] } = routeManifest;
44
+ const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !template.includes(asset));
45
+ return [
46
+ ...chunks,
47
+ ..._cssChunks
48
+ ];
49
+ }, []);
50
+ const { inlineStyles } = config;
51
+ const styles = cssChunks.map((chunk)=>{
52
+ const link = `<link href="${chunk}" rel="stylesheet" />`;
53
+ checkIsInline(chunk, inlineStyles);
54
+ return link;
55
+ });
56
+ return `${styles.join('')}`;
57
+ }
58
+ }
59
+ }
60
+ export { buildShellBeforeTemplate };
@@ -8,7 +8,7 @@ import { getTemplates } from "./template.mjs";
8
8
  const createReadableStreamFromElement = async (request, rootElement, options)=>{
9
9
  let shellChunkStatus = ShellChunkStatus.START;
10
10
  const chunkVec = [];
11
- const { htmlTemplate, runtimeContext, config, ssrConfig, entryName, rscRoot } = options;
11
+ const { htmlTemplate, runtimeContext, config, ssrConfig, entryName, rscManifest, rscRoot } = options;
12
12
  const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
13
13
  renderLevel: RenderLevel.SERVER_RENDER,
14
14
  runtimeContext,
@@ -21,6 +21,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
21
21
  const readableOriginal = await renderSSRStream(rootElement, {
22
22
  request,
23
23
  nonce: config.nonce,
24
+ rscManifest,
24
25
  rscRoot: rscRoot,
25
26
  routes: runtimeContext.routes,
26
27
  onError (error) {
@@ -86,6 +86,7 @@ function createRenderStreaming(createReadableStreamPromise) {
86
86
  rscClientManifest: options.rscClientManifest,
87
87
  rscSSRManifest: options.rscSSRManifest,
88
88
  rscServerManifest: options.rscServerManifest,
89
+ rscManifest: options.rscManifest,
89
90
  rscRoot: options.rscRoot,
90
91
  onShellReady () {
91
92
  const cost = end();
@@ -32,6 +32,7 @@ const renderString = async (request, serverRoot, options)=>{
32
32
  stats: loadableStats,
33
33
  nonce: config.nonce,
34
34
  routeManifest,
35
+ runtimeContext,
35
36
  template: htmlTemplate,
36
37
  entryName,
37
38
  chunkSet,
@@ -1,4 +1,5 @@
1
1
  import { ChunkExtractor } from "@loadable/server";
2
+ import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
2
3
  import { attributesToString, checkIsNode } from "../utils.mjs";
3
4
  const extname = (uri)=>{
4
5
  if ('string' != typeof uri || !uri.includes('.')) return '';
@@ -21,6 +22,20 @@ class LoadableCollector {
21
22
  const { routeManifest, entryName } = this.options;
22
23
  return routeManifest?.routeAssets?.[entryName]?.assets;
23
24
  }
25
+ getMatchedRouteChunks() {
26
+ const { routeManifest, runtimeContext } = this.options;
27
+ const routeAssets = routeManifest?.routeAssets;
28
+ if (!routeAssets) return [];
29
+ const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
30
+ return matchedRouteIds.flatMap((routeId)=>{
31
+ const routeAsset = routeAssets[routeId];
32
+ return (routeAsset?.assets ?? []).map((asset)=>({
33
+ filename: asset.replace(/^\//, ''),
34
+ path: asset,
35
+ url: asset
36
+ }));
37
+ });
38
+ }
24
39
  collect(comopnent) {
25
40
  const { stats, entryName } = this.options;
26
41
  if (!stats) return comopnent;
@@ -42,7 +57,7 @@ class LoadableCollector {
42
57
  `async-${entryName}`
43
58
  ]));
44
59
  } catch (e) {}
45
- const chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks));
60
+ const chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks)).concat(this.getMatchedRouteChunks());
46
61
  const scriptChunks = generateChunks(chunks, 'js');
47
62
  const styleChunks = generateChunks(chunks, 'css');
48
63
  this.emitLoadableScripts(extractor);
@@ -78,6 +78,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
78
78
  const imports = [];
79
79
  const statements = [];
80
80
  const loaderImportMap = new Map();
81
+ const usedRouteVarNames = new Set();
81
82
  let loaderIndex = 0;
82
83
  let routeIndex = 0;
83
84
  const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
@@ -111,10 +112,17 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
111
112
  actionName
112
113
  };
113
114
  };
115
+ const reserveRouteVarName = (preferred)=>{
116
+ let candidate = preferred;
117
+ let suffix = 1;
118
+ while(usedRouteVarNames.has(candidate))candidate = `${preferred}_${suffix++}`;
119
+ usedRouteVarNames.add(candidate);
120
+ return candidate;
121
+ };
114
122
  const createRouteVarName = (route)=>{
115
123
  const id = route.id;
116
124
  const base = id ? makeLegalIdentifier(id) : `r_${routeIndex++}`;
117
- return `route_${base}`;
125
+ return reserveRouteVarName(`route_${base}`);
118
126
  };
119
127
  const buildRoute = async (opts)=>{
120
128
  const { parentVar, route } = opts;
@@ -143,14 +151,16 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
143
151
  actionName
144
152
  });
145
153
  if (staticDataSnippet) routeOpts.push(staticDataSnippet);
146
- statements.push(`const ${varName} = createRoute({\n ${routeOpts.join('\n ')}\n});`);
147
154
  const children = route.children;
155
+ const hasChildren = Boolean(children && children.length > 0);
156
+ const routeCtorVarName = hasChildren ? reserveRouteVarName(`${varName}__base`) : varName;
157
+ statements.push(`const ${routeCtorVarName} = createRoute({\n ${routeOpts.join('\n ')}\n});`);
148
158
  if (children && children.length > 0) {
149
159
  const childVars = await Promise.all(children.map((child)=>buildRoute({
150
- parentVar: varName,
160
+ parentVar: routeCtorVarName,
151
161
  route: child
152
162
  })));
153
- statements.push(`${varName}.addChildren([${childVars.join(', ')}]);`);
163
+ statements.push(`const ${varName} = ${routeCtorVarName}.addChildren([${childVars.join(', ')}]);`);
154
164
  }
155
165
  return varName;
156
166
  };
@@ -223,7 +233,11 @@ function createRouteStaticData(opts: {
223
233
  modernRouteAction?: unknown;
224
234
  modernRouteLoader?: unknown;
225
235
  }) {
226
- const staticData: Record<string, unknown> = {};
236
+ const staticData: {
237
+ modernRouteId?: string;
238
+ modernRouteAction?: unknown;
239
+ modernRouteLoader?: unknown;
240
+ } = {};
227
241
 
228
242
  if (opts.modernRouteId) {
229
243
  staticData.modernRouteId = opts.modernRouteId;
@@ -237,7 +251,7 @@ function createRouteStaticData(opts: {
237
251
  staticData.modernRouteAction = opts.modernRouteAction;
238
252
  }
239
253
 
240
- return Object.keys(staticData).length > 0 ? staticData : undefined;
254
+ return staticData;
241
255
  }
242
256
 
243
257
  function modernLoaderToTanstack<TLoader extends (args: any) => any>(
@@ -8,6 +8,7 @@ import { onAfterCreateRouter, onAfterHydrateRouter, onBeforeCreateRouter, onBefo
8
8
  import { applyRouterRuntimeState } from "../lifecycle.mjs";
9
9
  import { createRouteObjectsFromConfig, urlJoin } from "../utils.mjs";
10
10
  import { createModernBasepathRewrite } from "./basepathRewrite.mjs";
11
+ import { Link } from "./prefetchLink.mjs";
11
12
  import { createRouteTreeFromRouteObjects } from "./routeTree.mjs";
12
13
  import { getTanstackRscSerializationAdapters } from "./rsc/client.mjs";
13
14
  import * as __rspack_external_react from "react";
@@ -70,6 +71,7 @@ const tanstackRouterPlugin = (userConfig = {})=>({
70
71
  }
71
72
  }
72
73
  context.router = {
74
+ Link: Link,
73
75
  useMatches: useMatches,
74
76
  useLocation: useLocation,
75
77
  useNavigate: useNavigate,
@@ -1,4 +1,5 @@
1
1
  import { createRootRoute, createRoute, notFound, redirect } from "@tanstack/react-router";
2
+ import { createElement } from "react";
2
3
  import { DefaultNotFound } from "../DefaultNotFound.mjs";
3
4
  function createTanstackRoute(options) {
4
5
  return createRoute(options);
@@ -43,6 +44,33 @@ function isModernDeferredData(value) {
43
44
  function normalizeModernLoaderResult(result) {
44
45
  return isModernDeferredData(result) ? result.data : result;
45
46
  }
47
+ function pickRouteModuleComponent(routeModule) {
48
+ if ('function' == typeof routeModule || routeModule && 'object' == typeof routeModule && '$$typeof' in routeModule) return routeModule;
49
+ if (!routeModule || 'object' != typeof routeModule) return;
50
+ const module = routeModule;
51
+ const component = module.default || module.Component;
52
+ if ('function' == typeof component || component && 'object' == typeof component && '$$typeof' in component) return component;
53
+ }
54
+ function createServerLazyImportComponent(lazyImport, fallbackComponent) {
55
+ if ("u" > typeof document) return fallbackComponent;
56
+ let resolvedComponent;
57
+ let pendingLoad;
58
+ const load = async ()=>{
59
+ if (resolvedComponent) return resolvedComponent;
60
+ const routeModule = await lazyImport();
61
+ const component = pickRouteModuleComponent(routeModule);
62
+ if (component) resolvedComponent = component;
63
+ return resolvedComponent;
64
+ };
65
+ const Component = (props)=>{
66
+ if (resolvedComponent) return createElement(resolvedComponent, props);
67
+ pendingLoad ||= load();
68
+ throw pendingLoad;
69
+ };
70
+ Component.load = load;
71
+ Component.preload = load;
72
+ return Component;
73
+ }
46
74
  function throwTanstackRedirect(location) {
47
75
  const target = location || '/';
48
76
  try {
@@ -209,10 +237,18 @@ function wrapRouteObjectLoader(route, revalidationState) {
209
237
  }
210
238
  function toRouteComponent(routeObject) {
211
239
  const route = routeObject;
240
+ const lazyImport = 'function' == typeof route.lazyImport ? route.lazyImport : void 0;
241
+ const fallbackComponent = route.Component ? route.Component : route.element ? ()=>route.element : void 0;
242
+ if (lazyImport && fallbackComponent) return createServerLazyImportComponent(lazyImport, fallbackComponent);
212
243
  if (route.Component) return route.Component;
213
244
  const element = route.element;
214
245
  if (element) return ()=>element;
215
246
  }
247
+ function toModernRouteComponent(route) {
248
+ const component = route.component || void 0;
249
+ if ('function' == typeof route.lazyImport && component) return createServerLazyImportComponent(route.lazyImport, component);
250
+ return component;
251
+ }
216
252
  function toErrorComponent(routeObject) {
217
253
  const route = routeObject;
218
254
  if (route.ErrorBoundary) return route.ErrorBoundary;
@@ -292,7 +328,7 @@ function createRouteFromModernRoute(opts) {
292
328
  const stableFallbackId = modernId || route._component || route.filename || route.data || ('function' == typeof route.loader ? route.id : void 0);
293
329
  const pendingComponent = route.loading || route.pendingComponent;
294
330
  const errorComponent = route.error || route.errorComponent;
295
- const component = route.component;
331
+ const component = toModernRouteComponent(route);
296
332
  const modernLoader = route.loader;
297
333
  const modernAction = route.action;
298
334
  const modernShouldRevalidate = route.shouldRevalidate;
@@ -338,7 +374,7 @@ function createRouteFromModernRoute(opts) {
338
374
  }
339
375
  function createRouteTreeFromModernRoutes(routes) {
340
376
  const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
341
- const rootComponent = rootModern?.component;
377
+ const rootComponent = rootModern ? toModernRouteComponent(rootModern) : void 0;
342
378
  const pendingComponent = rootModern?.loading;
343
379
  const errorComponent = rootModern?.error;
344
380
  const rootLoader = rootModern?.loader;
@@ -0,0 +1 @@
1
+ export * from "@modern-js/render/rsc-worker";
@@ -86,13 +86,14 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
86
86
  const hasServerRendering = hasServerRenderingConfig(userConfig);
87
87
  const hasModuleFederationRuntimeMarker = hasServerRendering && shouldUseModuleFederationNodeOutput(config);
88
88
  const hasExplicitMfSsrFlag = isModuleFederationAppSSREnabled(userConfig);
89
+ const isCloudflareWorkerSSR = 'workerSSR' === name && userConfig.deploy?.target === 'cloudflare';
89
90
  const requireExplicitMfSsrFlag = 'true' === process.env.MODERN_MF_APP_SSR_REQUIRE_EXPLICIT;
90
91
  if (hasServerRendering && hasModuleFederationRuntimeMarker && !hasExplicitMfSsrFlag) {
91
92
  const warningMessage = '[modernjs][mf-ssr] Module Federation SSR was auto-detected from runtime markers. Set server.ssr.moduleFederationAppSSR=true explicitly in host and remotes to avoid heuristic drift.';
92
93
  if (requireExplicitMfSsrFlag) throw new Error(`${warningMessage} (enforced by MODERN_MF_APP_SSR_REQUIRE_EXPLICIT=true)`);
93
94
  console.warn(warningMessage);
94
95
  }
95
- const isModuleFederationAppSSR = hasServerRendering && hasExplicitMfSsrFlag;
96
+ const isModuleFederationAppSSR = hasServerRendering && hasExplicitMfSsrFlag && !isCloudflareWorkerSSR;
96
97
  const useModuleFederationNodeOutput = hasServerRendering && isModuleFederationAppSSR && isNodeEnvironmentTarget(config.output.target);
97
98
  const ssrEnv = userConfig.deploy?.worker?.ssr || userConfig.server?.rsc ? 'edge' : 'node';
98
99
  const appContext = modernAPI.getAppContext();
@@ -109,7 +110,7 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
109
110
  } : void 0;
110
111
  const useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig, appDirectory, entrypoints);
111
112
  const outputConfig = {
112
- module: isServerEnvironment && !useModuleFederationNodeOutput && outputModule
113
+ module: isServerEnvironment && !useModuleFederationNodeOutput && (outputModule || 'workerSSR' === name && userConfig.deploy?.target === 'cloudflare')
113
114
  };
114
115
  const useLoadableComponents = isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig, appDirectory, entrypoints);
115
116
  return mergeEnvironmentConfig(config, {
@@ -36,6 +36,7 @@ const handleRequest = async (request, ServerRoot, options) => {
36
36
  </ServerRoot>,
37
37
  {
38
38
  ...options,
39
+ rscManifest: __rspack_rsc_manifest__,
39
40
  rscRoot: options.rscRoot,
40
41
  },
41
42
  );
@@ -1,4 +1,4 @@
1
1
  import "node:module";
2
- const getServerPayload = ()=>{};
2
+ const getServerPayload = ()=>void 0;
3
3
  const setServerPayload = (payload)=>{};
4
4
  export { getServerPayload, setServerPayload };
@@ -17,8 +17,9 @@ function registerPlugin(internalPlugins, runtimeConfig) {
17
17
  config: runtimeConfig || {},
18
18
  handleSetupResult: handleSetupResult
19
19
  });
20
- setGlobalInternalRuntimeContext(runtimeContext);
21
- return runtimeContext;
20
+ const internalRuntimeContext = runtimeContext;
21
+ setGlobalInternalRuntimeContext(internalRuntimeContext);
22
+ return internalRuntimeContext;
22
23
  }
23
24
  function mergeConfig(config, ...otherConfig) {
24
25
  return merge({}, config, ...otherConfig);
@@ -1,6 +1,6 @@
1
1
  import "node:module";
2
- import { EOL } from "os";
3
2
  import { safeReplace } from "./utils.mjs";
3
+ const EOL = '\n';
4
4
  const RE_HTML_ATTR = /<html[^>]*>/;
5
5
  const RE_BODY_ATTR = /<body[^>]*>/;
6
6
  const RE_LAST_IN_HEAD = /<\/head>/;
@@ -1,6 +1,6 @@
1
1
  import "node:module";
2
2
  import { serializeJson } from "@modern-js/runtime-utils/node";
3
- import { getRouterHydrationScripts } from "../../../router/runtime/lifecycle.mjs";
3
+ import { getRouterHydrationScripts, getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
4
4
  import { SSR_DATA_JSON_ID } from "../../constants.mjs";
5
5
  import { SSR_DATA_PLACEHOLDER } from "../constants.mjs";
6
6
  import { buildHtml } from "../shared.mjs";
@@ -23,12 +23,15 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
23
23
  if (!routeManifest) return template;
24
24
  const { routeAssets } = routeManifest;
25
25
  if (!routeAssets) return template;
26
- const asyncEntry = routeAssets[`async-${entryName}`];
27
- if (asyncEntry) {
28
- const { assets } = asyncEntry;
29
- const jsChunkStr = assets?.filter((asset)=>asset.endsWith('.js'))?.map((asset)=>`<script src=${asset} nonce="${nonce}"></script>`).join(' ');
30
- if (jsChunkStr) return safeReplace(template, '<!--<?- chunksMap.js ?>-->', jsChunkStr);
31
- }
26
+ const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
27
+ const assetEntries = [
28
+ ...matchedRouteIds.map((routeId)=>routeAssets[routeId]),
29
+ routeAssets[`async-${entryName}`]
30
+ ].filter(Boolean);
31
+ const jsAssets = Array.from(new Set(assetEntries.flatMap((entry)=>(entry.assets ?? []).filter((asset)=>asset.endsWith('.js')))));
32
+ const nonceAttr = nonce ? ` nonce="${nonce}"` : '';
33
+ const jsChunkStr = jsAssets.filter((asset)=>!template.includes(asset)).map((asset)=>`<script src=${asset}${nonceAttr}></script>`).join(' ');
34
+ if (jsChunkStr) return safeReplace(template, '<!--<?- chunksMap.js ?>-->', jsChunkStr);
32
35
  return template;
33
36
  }
34
37
  return buildHtml(afterAppTemplate, callbacks);
@@ -36,28 +36,27 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
36
36
  const { routeManifest, routerContext, routes } = runtimeContext;
37
37
  if (!routeManifest) return '';
38
38
  const { routeAssets } = routeManifest;
39
- let matchedRouteManifests;
39
+ let matchedRouteManifests = [];
40
40
  const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext);
41
41
  if (matchedRouteIds?.length) matchedRouteManifests = matchedRouteIds.map((routeId)=>routeAssets[routeId]).filter(Boolean);
42
- else {
43
- if (!routerContext || !routes) return '';
42
+ else if (routerContext && routes) {
44
43
  const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
45
44
  matchedRouteManifests = matches?.map((match, index)=>{
46
45
  if (!index) return;
47
46
  const routeId = match.route.id;
48
47
  if (routeId) return routeAssets[routeId];
49
- }).filter(Boolean);
48
+ }).filter(Boolean) ?? [];
50
49
  }
51
50
  const asyncEntry = routeAssets[`async-${entryName}`];
52
- if (asyncEntry) matchedRouteManifests?.push(asyncEntry);
53
- const cssChunks = matchedRouteManifests ? matchedRouteManifests.reduce((chunks, routeManifest)=>{
51
+ if (asyncEntry) matchedRouteManifests.push(asyncEntry);
52
+ const cssChunks = matchedRouteManifests.reduce((chunks, routeManifest)=>{
54
53
  const { referenceCssAssets = [] } = routeManifest;
55
54
  const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !template.includes(asset));
56
55
  return [
57
56
  ...chunks,
58
57
  ..._cssChunks
59
58
  ];
60
- }, []) : [];
59
+ }, []);
61
60
  const { inlineStyles } = config;
62
61
  const styles = await Promise.all(cssChunks.map(async (chunk)=>{
63
62
  const link = `<link href="${chunk}" rel="stylesheet" />`;
@@ -0,0 +1,61 @@
1
+ import "node:module";
2
+ import { matchRoutes } from "@modern-js/runtime-utils/router";
3
+ import react_helmet from "react-helmet";
4
+ import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
5
+ import { CHUNK_CSS_PLACEHOLDER } from "../constants.mjs";
6
+ import { createReplaceHelemt } from "../helmet.mjs";
7
+ import { buildHtml } from "../shared.mjs";
8
+ import { safeReplace } from "../utils.mjs";
9
+ const checkIsInline = (chunk, enableInline)=>{
10
+ if ('production' !== process.env.NODE_ENV) return false;
11
+ if (enableInline instanceof RegExp) return enableInline.test(chunk);
12
+ return Boolean(enableInline);
13
+ };
14
+ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
15
+ const { config, runtimeContext, styledComponentsStyleTags, entryName } = options;
16
+ const helmetData = react_helmet.renderStatic();
17
+ const callbacks = [
18
+ createReplaceHelemt(helmetData),
19
+ (template)=>injectCss(template, entryName, styledComponentsStyleTags)
20
+ ];
21
+ return buildHtml(beforeAppTemplate, callbacks);
22
+ async function injectCss(template, entryName, styledComponentsStyleTags) {
23
+ let css = await getCssChunks();
24
+ if (styledComponentsStyleTags) css += styledComponentsStyleTags;
25
+ return safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
26
+ async function getCssChunks() {
27
+ const { routeManifest, routerContext, routes } = runtimeContext;
28
+ if (!routeManifest) return '';
29
+ const { routeAssets } = routeManifest;
30
+ let matchedRouteManifests = [];
31
+ const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext);
32
+ if (matchedRouteIds?.length) matchedRouteManifests = matchedRouteIds.map((routeId)=>routeAssets[routeId]).filter(Boolean);
33
+ else if (routerContext && routes) {
34
+ const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
35
+ matchedRouteManifests = matches?.map((match, index)=>{
36
+ if (!index) return;
37
+ const routeId = match.route.id;
38
+ if (routeId) return routeAssets[routeId];
39
+ }).filter(Boolean) ?? [];
40
+ }
41
+ const asyncEntry = routeAssets[`async-${entryName}`];
42
+ if (asyncEntry) matchedRouteManifests.push(asyncEntry);
43
+ const cssChunks = matchedRouteManifests.reduce((chunks, routeManifest)=>{
44
+ const { referenceCssAssets = [] } = routeManifest;
45
+ const _cssChunks = referenceCssAssets.filter((asset)=>asset?.endsWith('.css') && !template.includes(asset));
46
+ return [
47
+ ...chunks,
48
+ ..._cssChunks
49
+ ];
50
+ }, []);
51
+ const { inlineStyles } = config;
52
+ const styles = cssChunks.map((chunk)=>{
53
+ const link = `<link href="${chunk}" rel="stylesheet" />`;
54
+ checkIsInline(chunk, inlineStyles);
55
+ return link;
56
+ });
57
+ return `${styles.join('')}`;
58
+ }
59
+ }
60
+ }
61
+ export { buildShellBeforeTemplate };
@@ -9,7 +9,7 @@ import { getTemplates } from "./template.mjs";
9
9
  const createReadableStreamFromElement = async (request, rootElement, options)=>{
10
10
  let shellChunkStatus = ShellChunkStatus.START;
11
11
  const chunkVec = [];
12
- const { htmlTemplate, runtimeContext, config, ssrConfig, entryName, rscRoot } = options;
12
+ const { htmlTemplate, runtimeContext, config, ssrConfig, entryName, rscManifest, rscRoot } = options;
13
13
  const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
14
14
  renderLevel: RenderLevel.SERVER_RENDER,
15
15
  runtimeContext,
@@ -22,6 +22,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
22
22
  const readableOriginal = await renderSSRStream(rootElement, {
23
23
  request,
24
24
  nonce: config.nonce,
25
+ rscManifest,
25
26
  rscRoot: rscRoot,
26
27
  routes: runtimeContext.routes,
27
28
  onError (error) {
@@ -87,6 +87,7 @@ function createRenderStreaming(createReadableStreamPromise) {
87
87
  rscClientManifest: options.rscClientManifest,
88
88
  rscSSRManifest: options.rscSSRManifest,
89
89
  rscServerManifest: options.rscServerManifest,
90
+ rscManifest: options.rscManifest,
90
91
  rscRoot: options.rscRoot,
91
92
  onShellReady () {
92
93
  const cost = end();
@@ -33,6 +33,7 @@ const renderString = async (request, serverRoot, options)=>{
33
33
  stats: loadableStats,
34
34
  nonce: config.nonce,
35
35
  routeManifest,
36
+ runtimeContext,
36
37
  template: htmlTemplate,
37
38
  entryName,
38
39
  chunkSet,
@@ -1,5 +1,6 @@
1
1
  import "node:module";
2
2
  import { ChunkExtractor } from "@loadable/server";
3
+ import { getRouterMatchedRouteIds } from "../../../router/runtime/lifecycle.mjs";
3
4
  import { attributesToString, checkIsNode } from "../utils.mjs";
4
5
  import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
5
6
  import { dirname as __rspack_dirname } from "node:path";
@@ -25,6 +26,20 @@ class LoadableCollector {
25
26
  const { routeManifest, entryName } = this.options;
26
27
  return routeManifest?.routeAssets?.[entryName]?.assets;
27
28
  }
29
+ getMatchedRouteChunks() {
30
+ const { routeManifest, runtimeContext } = this.options;
31
+ const routeAssets = routeManifest?.routeAssets;
32
+ if (!routeAssets) return [];
33
+ const matchedRouteIds = getRouterMatchedRouteIds(runtimeContext) ?? [];
34
+ return matchedRouteIds.flatMap((routeId)=>{
35
+ const routeAsset = routeAssets[routeId];
36
+ return (routeAsset?.assets ?? []).map((asset)=>({
37
+ filename: asset.replace(/^\//, ''),
38
+ path: asset,
39
+ url: asset
40
+ }));
41
+ });
42
+ }
28
43
  collect(comopnent) {
29
44
  const { stats, entryName } = this.options;
30
45
  if (!stats) return comopnent;
@@ -46,7 +61,7 @@ class LoadableCollector {
46
61
  `async-${entryName}`
47
62
  ]));
48
63
  } catch (e) {}
49
- const chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks));
64
+ const chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks)).concat(this.getMatchedRouteChunks());
50
65
  const scriptChunks = generateChunks(chunks, 'js');
51
66
  const styleChunks = generateChunks(chunks, 'css');
52
67
  this.emitLoadableScripts(extractor);