@bleedingdev/modern-js-runtime 3.8.3-ultramodern.6 → 3.9.0-ultramodern.10

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 (207) hide show
  1. package/dist/cjs/cli/code.js +3 -1
  2. package/dist/cjs/cli/ssr/index.js +2 -74
  3. package/dist/cjs/core/browser/hydrate.js +6 -1
  4. package/dist/cjs/core/context/index.js +4 -43
  5. package/dist/cjs/core/context/public.js +4 -7
  6. package/dist/cjs/core/context/runtime.js +17 -5
  7. package/dist/cjs/core/react/wrapper.js +22 -65
  8. package/dist/cjs/core/server/helmet.js +5 -4
  9. package/dist/cjs/core/server/requestResponse.js +4 -4
  10. package/dist/cjs/core/server/routerCleanup.js +2 -2
  11. package/dist/cjs/core/server/shared.js +171 -4
  12. package/dist/cjs/core/server/stream/afterTemplate.js +21 -16
  13. package/dist/cjs/core/server/stream/beforeTemplate.js +34 -25
  14. package/dist/cjs/core/server/stream/beforeTemplate.worker.js +28 -21
  15. package/dist/cjs/core/server/stream/createReadableStream.js +208 -123
  16. package/dist/cjs/core/server/stream/createReadableStream.worker.js +159 -90
  17. package/dist/cjs/core/server/stream/deferredScript.js +3 -3
  18. package/dist/cjs/core/server/stream/shared.js +2 -2
  19. package/dist/cjs/core/server/string/index.js +100 -64
  20. package/dist/cjs/core/server/string/loadable.js +34 -19
  21. package/dist/cjs/core/server/string/ssrData.js +5 -12
  22. package/dist/cjs/core/server/utils.js +1 -2
  23. package/dist/cjs/document/cli/index.js +1 -2
  24. package/dist/cjs/exports/head.js +7 -14
  25. package/dist/cjs/router/runtime/PrefetchLink.js +67 -123
  26. package/dist/cjs/router/runtime/hooks.js +13 -2
  27. package/dist/cjs/router/runtime/internal.js +7 -45
  28. package/dist/cjs/router/runtime/plugin.js +2 -8
  29. package/dist/cjs/router/runtime/plugin.node.js +2 -30
  30. package/dist/cjs/router/runtime/redirect.js +1 -1
  31. package/dist/esm/cli/code.mjs +3 -1
  32. package/dist/esm/cli/ssr/index.mjs +3 -72
  33. package/dist/esm/core/browser/hydrate.mjs +7 -2
  34. package/dist/esm/core/context/index.mjs +2 -5
  35. package/dist/esm/core/context/public.mjs +1 -5
  36. package/dist/esm/core/context/runtime.mjs +13 -4
  37. package/dist/esm/core/react/wrapper.mjs +21 -67
  38. package/dist/esm/core/server/helmet.mjs +5 -4
  39. package/dist/esm/core/server/requestResponse.mjs +3 -3
  40. package/dist/esm/core/server/routerCleanup.mjs +1 -1
  41. package/dist/esm/core/server/shared.mjs +153 -1
  42. package/dist/esm/core/server/stream/afterTemplate.mjs +23 -18
  43. package/dist/esm/core/server/stream/beforeTemplate.mjs +37 -28
  44. package/dist/esm/core/server/stream/beforeTemplate.worker.mjs +31 -24
  45. package/dist/esm/core/server/stream/createReadableStream.mjs +207 -122
  46. package/dist/esm/core/server/stream/createReadableStream.worker.mjs +149 -90
  47. package/dist/esm/core/server/stream/deferredScript.mjs +3 -3
  48. package/dist/esm/core/server/stream/shared.mjs +2 -2
  49. package/dist/esm/core/server/string/index.mjs +104 -68
  50. package/dist/esm/core/server/string/loadable.mjs +34 -19
  51. package/dist/esm/core/server/string/ssrData.mjs +5 -12
  52. package/dist/esm/core/server/utils.mjs +1 -2
  53. package/dist/esm/document/cli/index.mjs +2 -3
  54. package/dist/esm/exports/head.mjs +7 -14
  55. package/dist/esm/router/runtime/PrefetchLink.mjs +68 -124
  56. package/dist/esm/router/runtime/hooks.mjs +9 -1
  57. package/dist/esm/router/runtime/internal.mjs +2 -33
  58. package/dist/esm/router/runtime/plugin.mjs +1 -7
  59. package/dist/esm/router/runtime/plugin.node.mjs +1 -29
  60. package/dist/esm/router/runtime/redirect.mjs +1 -1
  61. package/dist/esm-node/cli/code.mjs +3 -1
  62. package/dist/esm-node/cli/ssr/index.mjs +3 -72
  63. package/dist/esm-node/core/browser/hydrate.mjs +7 -2
  64. package/dist/esm-node/core/context/index.mjs +2 -5
  65. package/dist/esm-node/core/context/public.mjs +1 -5
  66. package/dist/esm-node/core/context/runtime.mjs +13 -4
  67. package/dist/esm-node/core/react/wrapper.mjs +21 -67
  68. package/dist/esm-node/core/server/helmet.mjs +5 -4
  69. package/dist/esm-node/core/server/requestResponse.mjs +3 -3
  70. package/dist/esm-node/core/server/routerCleanup.mjs +1 -1
  71. package/dist/esm-node/core/server/shared.mjs +153 -1
  72. package/dist/esm-node/core/server/stream/afterTemplate.mjs +23 -18
  73. package/dist/esm-node/core/server/stream/beforeTemplate.mjs +37 -28
  74. package/dist/esm-node/core/server/stream/beforeTemplate.worker.mjs +31 -24
  75. package/dist/esm-node/core/server/stream/createReadableStream.mjs +207 -122
  76. package/dist/esm-node/core/server/stream/createReadableStream.worker.mjs +149 -90
  77. package/dist/esm-node/core/server/stream/deferredScript.mjs +3 -3
  78. package/dist/esm-node/core/server/stream/shared.mjs +2 -2
  79. package/dist/esm-node/core/server/string/index.mjs +104 -68
  80. package/dist/esm-node/core/server/string/loadable.mjs +34 -19
  81. package/dist/esm-node/core/server/string/ssrData.mjs +5 -12
  82. package/dist/esm-node/core/server/utils.mjs +1 -2
  83. package/dist/esm-node/document/cli/index.mjs +2 -3
  84. package/dist/esm-node/exports/head.mjs +7 -14
  85. package/dist/esm-node/router/runtime/PrefetchLink.mjs +68 -124
  86. package/dist/esm-node/router/runtime/hooks.mjs +9 -1
  87. package/dist/esm-node/router/runtime/internal.mjs +2 -33
  88. package/dist/esm-node/router/runtime/plugin.mjs +1 -7
  89. package/dist/esm-node/router/runtime/plugin.node.mjs +1 -29
  90. package/dist/esm-node/router/runtime/redirect.mjs +1 -1
  91. package/dist/types/cli/index.d.ts +7 -7
  92. package/dist/types/cli/ssr/index.d.ts +0 -3
  93. package/dist/types/core/browser/hydrate.d.ts +1 -1
  94. package/dist/types/core/browser/index.d.ts +1 -1
  95. package/dist/types/core/compat/hooks.d.ts +1 -1
  96. package/dist/types/core/compat/index.d.ts +1 -1
  97. package/dist/types/core/compat/requestContext.d.ts +3 -3
  98. package/dist/types/core/config.d.ts +1 -1
  99. package/dist/types/core/context/index.d.ts +8 -10
  100. package/dist/types/core/context/monitors/index.d.ts +1 -1
  101. package/dist/types/core/context/monitors/index.server.d.ts +1 -1
  102. package/dist/types/core/context/public.d.ts +1 -23
  103. package/dist/types/core/context/runtime.d.ts +27 -3
  104. package/dist/types/core/context/serverPayload/index.d.ts +1 -1
  105. package/dist/types/core/index.d.ts +5 -5
  106. package/dist/types/core/plugin/index.d.ts +1 -1
  107. package/dist/types/core/plugin/types.d.ts +2 -2
  108. package/dist/types/core/react/wrapper.d.ts +7 -1
  109. package/dist/types/core/server/helmet.d.ts +4 -5
  110. package/dist/types/core/server/index.d.ts +2 -2
  111. package/dist/types/core/server/react/index.d.ts +2 -2
  112. package/dist/types/core/server/requestHandler.d.ts +3 -3
  113. package/dist/types/core/server/requestResponse.d.ts +3 -3
  114. package/dist/types/core/server/routerCleanup.d.ts +2 -2
  115. package/dist/types/core/server/server.d.ts +4 -4
  116. package/dist/types/core/server/shared.d.ts +25 -2
  117. package/dist/types/core/server/stream/afterTemplate.d.ts +5 -4
  118. package/dist/types/core/server/stream/beforeTemplate.d.ts +6 -3
  119. package/dist/types/core/server/stream/beforeTemplate.worker.d.ts +6 -3
  120. package/dist/types/core/server/stream/createReadableStream.d.ts +1 -1
  121. package/dist/types/core/server/stream/createReadableStream.worker.d.ts +1 -1
  122. package/dist/types/core/server/stream/index.d.ts +1 -1
  123. package/dist/types/core/server/stream/shared.d.ts +5 -5
  124. package/dist/types/core/server/stream/template.d.ts +2 -2
  125. package/dist/types/core/server/string/index.d.ts +1 -1
  126. package/dist/types/core/server/string/loadable.d.ts +7 -4
  127. package/dist/types/core/server/string/ssrData.d.ts +5 -4
  128. package/dist/types/core/server/string/types.d.ts +2 -6
  129. package/dist/types/core/server/tracer.d.ts +1 -1
  130. package/dist/types/core/server/utils.d.ts +2 -2
  131. package/dist/types/core/types.d.ts +2 -3
  132. package/dist/types/document/index.d.ts +12 -12
  133. package/dist/types/exports/config-routes.d.ts +1 -1
  134. package/dist/types/exports/head.d.ts +2 -2
  135. package/dist/types/index.d.ts +9 -9
  136. package/dist/types/internal.d.ts +1 -1
  137. package/dist/types/react-server.d.ts +3 -3
  138. package/dist/types/router/cli/code/getClientRoutes/index.d.ts +1 -1
  139. package/dist/types/router/cli/handler.d.ts +1 -1
  140. package/dist/types/router/cli/index.d.ts +3 -3
  141. package/dist/types/router/index.d.ts +1 -1
  142. package/dist/types/router/internal.d.ts +2 -2
  143. package/dist/types/router/runtime/PrefetchLink.d.ts +27 -2
  144. package/dist/types/router/runtime/hooks.d.ts +19 -2
  145. package/dist/types/router/runtime/index.d.ts +4 -4
  146. package/dist/types/router/runtime/internal.d.ts +5 -22
  147. package/dist/types/router/runtime/plugin.d.ts +3 -3
  148. package/dist/types/router/runtime/plugin.node.d.ts +3 -3
  149. package/dist/types/router/runtime/rsc-router.d.ts +3 -3
  150. package/dist/types/router/runtime/types.d.ts +2 -43
  151. package/dist/types/router/runtime/utils.d.ts +1 -1
  152. package/package.json +19 -47
  153. package/rstest.config.mts +32 -2
  154. package/dist/cjs/boundary-debugger/index.js +0 -317
  155. package/dist/cjs/core/context/extensions.js +0 -74
  156. package/dist/cjs/core/context/helmetContext.js +0 -54
  157. package/dist/cjs/core/server/federatedCss.js +0 -58
  158. package/dist/cjs/core/server/scriptOrder.js +0 -140
  159. package/dist/cjs/module-federation/consume-surface.js +0 -199
  160. package/dist/cjs/module-federation/distributed-ssr.js +0 -135
  161. package/dist/cjs/module-federation/index.js +0 -316
  162. package/dist/cjs/module-federation/last-known-good.js +0 -157
  163. package/dist/cjs/module-federation/manifest-recovery-runtime-plugin.js +0 -129
  164. package/dist/cjs/module-federation/surface-resolution-types.js +0 -61
  165. package/dist/cjs/router/runtime/lifecycle.js +0 -167
  166. package/dist/cjs/router/runtime/provider.js +0 -153
  167. package/dist/esm/boundary-debugger/index.mjs +0 -277
  168. package/dist/esm/core/context/extensions.mjs +0 -33
  169. package/dist/esm/core/context/helmetContext.mjs +0 -13
  170. package/dist/esm/core/server/federatedCss.mjs +0 -20
  171. package/dist/esm/core/server/scriptOrder.mjs +0 -90
  172. package/dist/esm/module-federation/consume-surface.mjs +0 -158
  173. package/dist/esm/module-federation/distributed-ssr.mjs +0 -82
  174. package/dist/esm/module-federation/index.mjs +0 -115
  175. package/dist/esm/module-federation/last-known-good.mjs +0 -113
  176. package/dist/esm/module-federation/manifest-recovery-runtime-plugin.mjs +0 -89
  177. package/dist/esm/module-federation/surface-resolution-types.mjs +0 -8
  178. package/dist/esm/router/runtime/lifecycle.mjs +0 -105
  179. package/dist/esm/router/runtime/provider.mjs +0 -100
  180. package/dist/esm-node/boundary-debugger/index.mjs +0 -278
  181. package/dist/esm-node/core/context/extensions.mjs +0 -34
  182. package/dist/esm-node/core/context/helmetContext.mjs +0 -14
  183. package/dist/esm-node/core/server/federatedCss.mjs +0 -21
  184. package/dist/esm-node/core/server/scriptOrder.mjs +0 -91
  185. package/dist/esm-node/module-federation/consume-surface.mjs +0 -159
  186. package/dist/esm-node/module-federation/distributed-ssr.mjs +0 -83
  187. package/dist/esm-node/module-federation/index.mjs +0 -116
  188. package/dist/esm-node/module-federation/last-known-good.mjs +0 -114
  189. package/dist/esm-node/module-federation/manifest-recovery-runtime-plugin.mjs +0 -90
  190. package/dist/esm-node/module-federation/surface-resolution-types.mjs +0 -9
  191. package/dist/esm-node/router/runtime/lifecycle.mjs +0 -106
  192. package/dist/esm-node/router/runtime/provider.mjs +0 -101
  193. package/dist/types/boundary-debugger/index.d.ts +0 -28
  194. package/dist/types/core/context/extensions.d.ts +0 -35
  195. package/dist/types/core/context/helmetContext.d.ts +0 -10
  196. package/dist/types/core/server/federatedCss.d.ts +0 -5
  197. package/dist/types/core/server/scriptOrder.d.ts +0 -25
  198. package/dist/types/module-federation/consume-surface.d.ts +0 -104
  199. package/dist/types/module-federation/distributed-ssr.d.ts +0 -61
  200. package/dist/types/module-federation/index.d.ts +0 -71
  201. package/dist/types/module-federation/last-known-good.d.ts +0 -52
  202. package/dist/types/module-federation/manifest-recovery-runtime-plugin.d.ts +0 -25
  203. package/dist/types/module-federation/surface-resolution-types.d.ts +0 -23
  204. package/dist/types/router/runtime/lifecycle.d.ts +0 -27
  205. package/dist/types/router/runtime/provider.d.ts +0 -78
  206. /package/dist/esm/{rslib-runtime.mjs → rslib-runtime~1.mjs} +0 -0
  207. /package/dist/esm-node/{rslib-runtime.mjs → rslib-runtime~0.mjs} +0 -0
@@ -20,15 +20,11 @@ export type SingleRouteConfig = RouteProps & {
20
20
  */
21
21
  component?: React.ComponentType;
22
22
  };
23
- export type BuiltInRouterFramework = 'react-router' | 'tanstack';
24
- export type RouterFramework = BuiltInRouterFramework | (string & {});
25
23
  export type RouterConfig = {
26
24
  /**
27
- * Select the router implementation used by Modern.js conventional routing.
28
- * - `react-router` (default): React Router based integration
29
- * - `tanstack`: TanStack Router integration
25
+ * Router implementation identifier for integrations that provide selection.
30
26
  */
31
- framework?: RouterFramework;
27
+ framework?: string;
32
28
  routesConfig: {
33
29
  globalApp?: React.ComponentType<any>;
34
30
  routes?: ModernRoute[];
@@ -50,46 +46,9 @@ export type RouterConfig = {
50
46
  unstable_reloadOnURLMismatch?: boolean;
51
47
  };
52
48
  export type Routes = RouterConfig['routesConfig']['routes'];
53
- export interface RouterRouteMatchSnapshot {
54
- routeId: string;
55
- assetRouteId?: string;
56
- pathname?: string;
57
- params?: Record<string, string>;
58
- }
59
49
  export interface RouteManifest {
60
50
  routeAssets: RouteAssets;
61
51
  }
62
- export interface InternalRouterServerSnapshot {
63
- framework?: RouterFramework;
64
- basename?: string;
65
- statusCode?: number;
66
- errors?: Record<string, unknown>;
67
- routerData?: {
68
- loaderData?: Record<string, unknown>;
69
- errors?: Record<string, unknown>;
70
- };
71
- hydrationScript?: string;
72
- hydrationScripts?: string[];
73
- matchedRouteIds?: string[];
74
- matches?: RouterRouteMatchSnapshot[];
75
- }
76
- export interface InternalRouterRuntimeState {
77
- framework: RouterFramework;
78
- basename?: string;
79
- instance?: unknown;
80
- hydrationScript?: string;
81
- hydrationScripts?: string[];
82
- matchedRouteIds?: string[];
83
- matches?: RouterRouteMatchSnapshot[];
84
- serverSnapshot?: InternalRouterServerSnapshot;
85
- cleanup?: () => void | Promise<void>;
86
- }
87
- export interface RouterServerPrepareResult {
88
- state: InternalRouterRuntimeState;
89
- snapshot?: InternalRouterServerSnapshot;
90
- redirect?: Response;
91
- cleanup?: () => void | Promise<void>;
92
- }
93
52
  export interface RouteAssets {
94
53
  [routeId: string]: {
95
54
  chunkIds?: (string | number)[];
@@ -2,7 +2,7 @@ import type { DataRouter } from '@modern-js/runtime-utils/router';
2
2
  import { type RouteObject, type StaticHandlerContext } from '@modern-js/runtime-utils/router';
3
3
  import type { NestedRoute, PageRoute, SSRMode } from '@modern-js/types';
4
4
  import React from 'react';
5
- import type { RouterConfig } from './types';
5
+ import type { RouterConfig } from './types.js';
6
6
  export declare function getRouteComponents(routes: (NestedRoute | PageRoute)[], { globalApp, ssrMode, props, }: {
7
7
  globalApp?: React.ComponentType<GlobalAppProps>;
8
8
  ssrMode?: SSRMode;
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "modern",
18
18
  "modern.js"
19
19
  ],
20
- "version": "3.8.3-ultramodern.6",
20
+ "version": "3.9.0-ultramodern.10",
21
21
  "engines": {
22
22
  "node": ">=20"
23
23
  },
@@ -69,26 +69,6 @@
69
69
  "types": "./dist/types/exports/head.d.ts",
70
70
  "default": "./dist/esm/exports/head.mjs"
71
71
  },
72
- "./boundary-debugger": {
73
- "types": "./dist/types/boundary-debugger/index.d.ts",
74
- "default": "./dist/esm/boundary-debugger/index.mjs"
75
- },
76
- "./module-federation": {
77
- "types": "./dist/types/module-federation/index.d.ts",
78
- "default": "./dist/esm/module-federation/index.mjs"
79
- },
80
- "./module-federation/distributed-ssr": {
81
- "types": "./dist/types/module-federation/distributed-ssr.d.ts",
82
- "default": "./dist/esm/module-federation/distributed-ssr.mjs"
83
- },
84
- "./module-federation/manifest-recovery-runtime-plugin": {
85
- "types": "./dist/types/module-federation/manifest-recovery-runtime-plugin.d.ts",
86
- "node": {
87
- "import": "./dist/esm/module-federation/manifest-recovery-runtime-plugin.mjs",
88
- "require": "./dist/cjs/module-federation/manifest-recovery-runtime-plugin.js"
89
- },
90
- "default": "./dist/esm/module-federation/manifest-recovery-runtime-plugin.mjs"
91
- },
92
72
  "./ssr": {
93
73
  "types": "./dist/types/core/server/index.d.ts",
94
74
  "default": "./dist/esm/core/server/index.mjs"
@@ -196,15 +176,6 @@
196
176
  "head": [
197
177
  "./dist/types/exports/head.d.ts"
198
178
  ],
199
- "boundary-debugger": [
200
- "./dist/types/boundary-debugger/index.d.ts"
201
- ],
202
- "module-federation": [
203
- "./dist/types/module-federation/index.d.ts"
204
- ],
205
- "module-federation/manifest-recovery-runtime-plugin": [
206
- "./dist/types/module-federation/manifest-recovery-runtime-plugin.d.ts"
207
- ],
208
179
  "document": [
209
180
  "./dist/types/document/index.d.ts"
210
181
  ],
@@ -246,24 +217,25 @@
246
217
  "dependencies": {
247
218
  "@loadable/component": "5.16.7",
248
219
  "@loadable/server": "5.16.7",
249
- "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.3-ultramodern.6",
250
- "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.8.3-ultramodern.6",
251
- "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.8.3-ultramodern.6",
252
- "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.8.3-ultramodern.6",
253
- "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.3-ultramodern.6",
254
- "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.3-ultramodern.6",
255
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.3-ultramodern.6",
256
- "@swc/core": "1.15.43",
220
+ "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.10",
221
+ "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.10",
222
+ "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.9.0-ultramodern.10",
223
+ "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.10",
224
+ "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.10",
225
+ "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.10",
226
+ "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.10",
227
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.10",
228
+ "@swc/core": "1.16.2",
257
229
  "@swc/helpers": "^0.5.23",
258
- "@swc/plugin-loadable-components": "^12.0.0",
230
+ "@swc/plugin-loadable-components": "^13.0.0",
259
231
  "@types/loadable__component": "^5.13.10",
260
232
  "@types/react-helmet": "^6.1.11",
261
233
  "cookie": "2.0.1",
262
234
  "entities": "^8.0.0",
263
- "es-module-lexer": "^2.3.0",
264
- "esbuild": "^0.28.1",
235
+ "es-module-lexer": "^2.3.2",
236
+ "esbuild": "^0.28.2",
265
237
  "invariant": "^2.2.4",
266
- "isbot": "5.2.0",
238
+ "isbot": "5.2.2",
267
239
  "react-helmet": "^6.1.0",
268
240
  "react-helmet-async": "3.0.0",
269
241
  "react-is": "^19.2.8"
@@ -273,17 +245,17 @@
273
245
  "react-dom": "^19.2.8"
274
246
  },
275
247
  "devDependencies": {
276
- "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.3-ultramodern.6",
248
+ "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.10",
277
249
  "@remix-run/web-fetch": "^4.4.2",
278
- "@rsbuild/core": "2.2.0",
279
- "@rslib/core": "0.23.2",
250
+ "@rsbuild/core": "2.2.3",
251
+ "@rslib/core": "1.0.0",
280
252
  "@scripts/rstest-config": "2.66.0",
281
253
  "@testing-library/dom": "^10.4.1",
282
- "@testing-library/react": "^16.3.2",
254
+ "@testing-library/react": "^16.3.3",
283
255
  "@types/cookie": "0.6.0",
284
256
  "@types/invariant": "^2.2.37",
285
257
  "@types/loadable__server": "5.12.11",
286
- "@types/node": "^26.2.0",
258
+ "@types/node": "^26.4.1",
287
259
  "@typescript/native-preview": "7.0.0-dev.20260707.2",
288
260
  "react": "^19.2.8",
289
261
  "react-dom": "^19.2.8",
package/rstest.config.mts CHANGED
@@ -1,3 +1,4 @@
1
+ import path from 'node:path';
1
2
  import type { ProjectConfig } from '@rstest/core';
2
3
  import { withTestPreset } from '@scripts/rstest-config';
3
4
 
@@ -23,7 +24,7 @@ export default {
23
24
  name: 'plugin-runtime-node',
24
25
  testEnvironment: 'node',
25
26
  exclude: [
26
- 'tests/boundary-debugger/client.test.tsx',
27
+ 'tests/ssr/serverRender/workerLifecycle.test.tsx',
27
28
  'tests/router/plugin.client.test.tsx',
28
29
  'tests/router/prefetch.test.tsx',
29
30
  'tests/router/prefetch-realm-isolation.test.tsx',
@@ -48,11 +49,40 @@ export default {
48
49
  },
49
50
  ],
50
51
  }),
52
+ withTestPreset({
53
+ name: 'plugin-runtime-worker-lifecycle',
54
+ testEnvironment: 'node',
55
+ extends: commonConfig,
56
+ include: ['tests/ssr/serverRender/workerLifecycle.test.tsx'],
57
+ resolve: {
58
+ alias: {
59
+ '@modern-js/render/ssr': path.join(
60
+ __dirname,
61
+ '../render/src/server/ssr/index.ts',
62
+ ),
63
+ 'react-server-dom-rspack/client.browser': path.join(
64
+ __dirname,
65
+ 'tests/fixtures/rsc-client.ts',
66
+ ),
67
+ 'react-server-dom-rspack/client.edge': path.join(
68
+ __dirname,
69
+ 'tests/fixtures/rsc-client.ts',
70
+ ),
71
+ '@modern-js/render/rsc': path.join(
72
+ __dirname,
73
+ 'tests/fixtures/rsc-server.ts',
74
+ ),
75
+ '@modern-js/render/rsc-worker': path.join(
76
+ __dirname,
77
+ 'tests/fixtures/rsc-server.ts',
78
+ ),
79
+ },
80
+ },
81
+ }),
51
82
  withTestPreset({
52
83
  name: 'plugin-runtime-client',
53
84
  testEnvironment: 'happy-dom',
54
85
  include: [
55
- 'tests/boundary-debugger/client.test.tsx',
56
86
  'tests/router/plugin.client.test.tsx',
57
87
  'tests/router/prefetch.test.tsx',
58
88
  'tests/router/prefetch-realm-isolation.test.tsx',
@@ -1,317 +0,0 @@
1
- "use strict";
2
- var __webpack_require__ = {};
3
- (()=>{
4
- __webpack_require__.d = (exports1, getters, values)=>{
5
- var define = (defs, kind)=>{
6
- for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
- enumerable: true,
8
- [kind]: defs[key]
9
- });
10
- };
11
- define(getters, "get");
12
- define(values, "value");
13
- };
14
- })();
15
- (()=>{
16
- __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
17
- })();
18
- (()=>{
19
- __webpack_require__.r = (exports1)=>{
20
- if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
21
- value: 'Module'
22
- });
23
- Object.defineProperty(exports1, '__esModule', {
24
- value: true
25
- });
26
- };
27
- })();
28
- var __webpack_exports__ = {};
29
- __webpack_require__.r(__webpack_exports__);
30
- __webpack_require__.d(__webpack_exports__, {
31
- default: ()=>boundary_debugger,
32
- ultramodernBoundaryDebuggerPlugin: ()=>ultramodernBoundaryDebuggerPlugin
33
- });
34
- const jsx_runtime_namespaceObject = require("react/jsx-runtime");
35
- const external_react_namespaceObject = require("react");
36
- const defaultStorageKey = 'modernjs:boundary-debugger:enabled';
37
- const queryParamName = 'modern-boundaries';
38
- const boundarySelector = '[data-modern-boundary-id]';
39
- const defaultLabels = {
40
- cs: {
41
- toggle: 'zobrazit hranice týmů'
42
- },
43
- en: {
44
- toggle: 'show team boundaries'
45
- }
46
- };
47
- const palette = [
48
- '#ff5a5f',
49
- '#30e27a',
50
- '#f6cf45',
51
- '#7c8cff',
52
- '#29b6f6'
53
- ];
54
- const readStoredEnabled = (storageKey, fallback)=>{
55
- if ("u" < typeof window) return fallback;
56
- try {
57
- const stored = window.localStorage.getItem(storageKey);
58
- return null === stored ? fallback : 'true' === stored;
59
- } catch {
60
- return fallback;
61
- }
62
- };
63
- const writeStoredEnabled = (storageKey, enabled)=>{
64
- if ("u" < typeof window) return;
65
- try {
66
- window.localStorage.setItem(storageKey, String(enabled));
67
- } catch {}
68
- };
69
- const parseEnabledOverride = (value)=>{
70
- if (null === value) return;
71
- const normalized = value.toLowerCase();
72
- if ('1' === normalized || 'true' === normalized) return true;
73
- if ('0' === normalized || 'false' === normalized) return false;
74
- };
75
- const readQueryEnabledOverride = ()=>{
76
- if ("u" < typeof window) return;
77
- try {
78
- return parseEnabledOverride(new URLSearchParams(window.location.search).get(queryParamName));
79
- } catch {
80
- return;
81
- }
82
- };
83
- const detectLanguage = ()=>{
84
- if ("u" < typeof document) return 'en';
85
- const htmlLanguage = document.documentElement.lang;
86
- if ('' !== htmlLanguage) return htmlLanguage.split('-')[0] || 'en';
87
- if ("u" < typeof window) return 'en';
88
- return window.location.pathname.split('/').filter(Boolean)[0] || 'en';
89
- };
90
- const hashBoundaryId = (id)=>{
91
- let hash = 0;
92
- for(let index = 0; index < id.length; index++)hash = 31 * hash + id.charCodeAt(index) >>> 0;
93
- return hash;
94
- };
95
- const formatRectKey = (rect)=>[
96
- Math.round(100 * rect.left) / 100,
97
- Math.round(100 * rect.top) / 100,
98
- Math.round(100 * rect.width) / 100,
99
- Math.round(100 * rect.height) / 100
100
- ].join(':');
101
- const getBoundaryId = (element)=>element.dataset.modernBoundaryId ?? element.dataset.mfRemote ?? element.getAttribute('data-mf-remote') ?? void 0;
102
- const collectBoundaryElements = (legacySelector)=>{
103
- const elements = new Set();
104
- for (const element of document.querySelectorAll(boundarySelector))elements.add(element);
105
- if (void 0 === legacySelector || '' === legacySelector) return Array.from(elements);
106
- try {
107
- for (const element of document.querySelectorAll(legacySelector))elements.add(element);
108
- } catch {}
109
- return Array.from(elements);
110
- };
111
- function BoundaryDebugger({ controlMode = 'visible', enabledByDefault = false, labels = defaultLabels, legacySelector, metadata, storageKey = defaultStorageKey }) {
112
- const [mounted, setMounted] = (0, external_react_namespaceObject.useState)(false);
113
- const [enabled, setEnabled] = (0, external_react_namespaceObject.useState)(false);
114
- const [boxes, setBoxes] = (0, external_react_namespaceObject.useState)([]);
115
- const boundaries = (0, external_react_namespaceObject.useMemo)(()=>new Map(metadata.boundaries.map((entry, index)=>[
116
- entry.mfName,
117
- {
118
- ...entry,
119
- color: entry.color ?? palette[index % palette.length],
120
- label: entry.label ?? entry.appId
121
- }
122
- ])), [
123
- metadata
124
- ]);
125
- const language = mounted ? detectLanguage() : 'en';
126
- const toggleLabel = labels[language]?.toggle ?? labels.en?.toggle ?? defaultLabels.en?.toggle ?? 'show team boundaries';
127
- (0, external_react_namespaceObject.useEffect)(()=>{
128
- setMounted(true);
129
- const queryOverride = readQueryEnabledOverride();
130
- setEnabled(queryOverride ?? readStoredEnabled(storageKey, enabledByDefault));
131
- }, [
132
- enabledByDefault,
133
- storageKey
134
- ]);
135
- (0, external_react_namespaceObject.useEffect)(()=>{
136
- if (!mounted) return;
137
- writeStoredEnabled(storageKey, enabled);
138
- }, [
139
- enabled,
140
- mounted,
141
- storageKey
142
- ]);
143
- (0, external_react_namespaceObject.useEffect)(()=>{
144
- if (!enabled) return void setBoxes([]);
145
- let resizeObserver;
146
- const observedElements = new Set();
147
- const observeBoundaryElements = (elements)=>{
148
- if (void 0 === resizeObserver) return;
149
- for (const element of elements)if (!observedElements.has(element)) {
150
- observedElements.add(element);
151
- resizeObserver.observe(element);
152
- }
153
- };
154
- const readBoxes = ()=>{
155
- const elements = collectBoundaryElements(legacySelector);
156
- observeBoundaryElements(elements);
157
- const seenBoxes = new Set();
158
- const nextBoxes = elements.map((element)=>{
159
- const boundaryId = getBoundaryId(element);
160
- if (void 0 === boundaryId || '' === boundaryId) return;
161
- const rect = element.getBoundingClientRect();
162
- if (rect.width <= 0 || rect.height <= 0) return;
163
- const rectKey = formatRectKey(rect);
164
- const boxKey = `${boundaryId}:${rectKey}`;
165
- if (seenBoxes.has(boxKey)) return;
166
- seenBoxes.add(boxKey);
167
- const boundary = boundaries.get(boundaryId);
168
- const color = boundary?.color ?? palette[hashBoundaryId(boundaryId) % palette.length];
169
- const label = boundary?.label ?? boundary?.appId ?? boundaryId;
170
- const expose = element.dataset.modernMfExpose;
171
- const detail = void 0 !== expose && '' !== expose && expose !== label && expose !== boundaryId ? expose : void 0;
172
- const box = {
173
- color,
174
- height: rect.height,
175
- id: boxKey,
176
- label,
177
- left: rect.left,
178
- top: rect.top,
179
- width: rect.width
180
- };
181
- if (void 0 !== detail) box.detail = detail;
182
- return box;
183
- }).filter((box)=>void 0 !== box);
184
- setBoxes(nextBoxes);
185
- };
186
- resizeObserver = "u" < typeof ResizeObserver ? void 0 : new ResizeObserver(readBoxes);
187
- readBoxes();
188
- const mutationObserver = new MutationObserver(readBoxes);
189
- mutationObserver.observe(document.body, {
190
- childList: true,
191
- subtree: true
192
- });
193
- window.addEventListener('resize', readBoxes);
194
- window.addEventListener('scroll', readBoxes, true);
195
- return ()=>{
196
- mutationObserver.disconnect();
197
- resizeObserver?.disconnect();
198
- window.removeEventListener('resize', readBoxes);
199
- window.removeEventListener('scroll', readBoxes, true);
200
- };
201
- }, [
202
- boundaries,
203
- enabled,
204
- legacySelector
205
- ]);
206
- if (!mounted) return null;
207
- const shouldRenderToggle = 'visible' === controlMode || 'hidden-when-off' === controlMode && enabled;
208
- return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
209
- children: [
210
- shouldRenderToggle ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("label", {
211
- style: {
212
- alignItems: 'center',
213
- background: 'rgba(255, 255, 255, 0.96)',
214
- border: '1px solid rgba(0, 0, 0, 0.1)',
215
- borderRadius: 10,
216
- boxShadow: '0 10px 28px rgba(0, 0, 0, 0.14)',
217
- color: '#111827',
218
- display: 'flex',
219
- font: '600 13px/1.2 system-ui, sans-serif',
220
- gap: 8,
221
- left: 'max(12px, env(safe-area-inset-left))',
222
- maxWidth: 'calc(100vw - 24px)',
223
- padding: '9px 11px',
224
- position: 'fixed',
225
- top: 'max(12px, env(safe-area-inset-top))',
226
- zIndex: 2147483000
227
- },
228
- children: [
229
- /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("input", {
230
- checked: enabled,
231
- onChange: (event)=>setEnabled(event.currentTarget.checked),
232
- type: "checkbox"
233
- }),
234
- /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
235
- children: toggleLabel
236
- })
237
- ]
238
- }) : null,
239
- enabled ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
240
- "aria-hidden": "true",
241
- children: boxes.map((box)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
242
- "data-modern-boundary-overlay": "",
243
- "data-modern-boundary-overlay-id": box.id,
244
- "data-modern-boundary-overlay-label": box.label,
245
- style: {
246
- border: `2px solid ${box.color}`,
247
- borderRadius: 8,
248
- boxSizing: 'border-box',
249
- boxShadow: `0 0 0 1px rgba(255,255,255,.72), 0 6px 20px color-mix(in srgb, ${box.color} 20%, transparent)`,
250
- height: box.height,
251
- left: box.left,
252
- pointerEvents: 'none',
253
- position: 'fixed',
254
- top: box.top,
255
- width: box.width,
256
- zIndex: 2147482999
257
- },
258
- children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("span", {
259
- style: {
260
- background: box.color,
261
- borderRadius: 999,
262
- color: '#111827',
263
- display: 'grid',
264
- font: '800 11px/1.1 system-ui, sans-serif',
265
- gap: 3,
266
- maxWidth: 'min(280px, calc(100vw - 24px))',
267
- padding: '5px 8px',
268
- position: 'absolute',
269
- right: 4,
270
- top: 4,
271
- whiteSpace: 'nowrap'
272
- },
273
- children: [
274
- /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
275
- children: box.label
276
- }),
277
- void 0 !== box.detail && '' !== box.detail ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
278
- style: {
279
- font: '700 10px/1.1 system-ui, sans-serif',
280
- opacity: 0.82,
281
- overflow: 'hidden',
282
- textOverflow: 'ellipsis'
283
- },
284
- children: box.detail
285
- }) : null
286
- ]
287
- })
288
- }, box.id))
289
- }) : null
290
- ]
291
- });
292
- }
293
- const ultramodernBoundaryDebuggerPlugin = (options)=>({
294
- name: '@modern-js/runtime/boundary-debugger',
295
- setup: (api)=>{
296
- api.wrapRoot((App)=>(props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
297
- children: [
298
- /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(App, {
299
- ...props
300
- }),
301
- /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(BoundaryDebugger, {
302
- ...options
303
- })
304
- ]
305
- }));
306
- }
307
- });
308
- const boundary_debugger = ultramodernBoundaryDebuggerPlugin;
309
- exports["default"] = __webpack_exports__["default"];
310
- exports.ultramodernBoundaryDebuggerPlugin = __webpack_exports__.ultramodernBoundaryDebuggerPlugin;
311
- for(var __rspack_i in __webpack_exports__)if (-1 === [
312
- "default",
313
- "ultramodernBoundaryDebuggerPlugin"
314
- ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
315
- Object.defineProperty(exports, '__esModule', {
316
- value: true
317
- });
@@ -1,74 +0,0 @@
1
- "use strict";
2
- var __webpack_require__ = {};
3
- (()=>{
4
- __webpack_require__.d = (exports1, getters, values)=>{
5
- var define = (defs, kind)=>{
6
- for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
- enumerable: true,
8
- [kind]: defs[key]
9
- });
10
- };
11
- define(getters, "get");
12
- define(values, "value");
13
- };
14
- })();
15
- (()=>{
16
- __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
17
- })();
18
- (()=>{
19
- __webpack_require__.r = (exports1)=>{
20
- if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
21
- value: 'Module'
22
- });
23
- Object.defineProperty(exports1, '__esModule', {
24
- value: true
25
- });
26
- };
27
- })();
28
- var __webpack_exports__ = {};
29
- __webpack_require__.r(__webpack_exports__);
30
- const EXTENSIONS_SLOT = Symbol.for('@modern-js/runtime:context-extensions');
31
- function getStore(context) {
32
- return context[EXTENSIONS_SLOT];
33
- }
34
- function ensureStore(context) {
35
- const target = context;
36
- const store = target[EXTENSIONS_SLOT] ?? new Map();
37
- Object.defineProperty(target, EXTENSIONS_SLOT, {
38
- configurable: true,
39
- enumerable: true,
40
- value: store
41
- });
42
- return store;
43
- }
44
- function stripRuntimeContextExtensions(context) {
45
- delete context[EXTENSIONS_SLOT];
46
- }
47
- function createRuntimeContextExtension(id) {
48
- const key = Symbol.for(`@modern-js/runtime:context-extension:${id}`);
49
- return {
50
- key,
51
- get (context) {
52
- return getStore(context)?.get(key);
53
- },
54
- set (context, value) {
55
- ensureStore(context).set(key, value);
56
- },
57
- remove (context) {
58
- getStore(context)?.delete(key);
59
- }
60
- };
61
- }
62
- __webpack_require__.d(__webpack_exports__, {
63
- createRuntimeContextExtension: ()=>createRuntimeContextExtension,
64
- stripRuntimeContextExtensions: ()=>stripRuntimeContextExtensions
65
- });
66
- exports.createRuntimeContextExtension = __webpack_exports__.createRuntimeContextExtension;
67
- exports.stripRuntimeContextExtensions = __webpack_exports__.stripRuntimeContextExtensions;
68
- for(var __rspack_i in __webpack_exports__)if (-1 === [
69
- "createRuntimeContextExtension",
70
- "stripRuntimeContextExtensions"
71
- ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
72
- Object.defineProperty(exports, '__esModule', {
73
- value: true
74
- });