@bleedingdev/modern-js-runtime 3.5.0-ultramodern.3 → 3.5.0-ultramodern.31

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 (65) hide show
  1. package/dist/cjs/cli/ssr/index.js +1 -2
  2. package/dist/cjs/core/context/public.js +49 -0
  3. package/dist/cjs/core/context/runtime.js +6 -8
  4. package/dist/cjs/core/react/wrapper.js +57 -0
  5. package/dist/cjs/core/server/federatedCss.js +7 -3
  6. package/dist/cjs/core/server/requestHandler.js +15 -45
  7. package/dist/cjs/core/server/requestResponse.js +83 -0
  8. package/dist/cjs/core/server/routerCleanup.js +21 -0
  9. package/dist/cjs/core/server/scriptOrder.js +13 -7
  10. package/dist/cjs/core/server/string/loadable.js +3 -11
  11. package/dist/cjs/index.js +7 -6
  12. package/dist/cjs/router/cli/code/templates.js +3 -2
  13. package/dist/cjs/router/runtime/hooks.js +7 -6
  14. package/dist/cjs/router/runtime/provider.js +1 -1
  15. package/dist/esm/cli/ssr/index.mjs +1 -2
  16. package/dist/esm/core/context/public.mjs +5 -0
  17. package/dist/esm/core/context/runtime.mjs +4 -6
  18. package/dist/esm/core/react/wrapper.mjs +58 -1
  19. package/dist/esm/core/server/federatedCss.mjs +7 -3
  20. package/dist/esm/core/server/requestHandler.mjs +15 -45
  21. package/dist/esm/core/server/requestResponse.mjs +39 -0
  22. package/dist/esm/core/server/routerCleanup.mjs +16 -1
  23. package/dist/esm/core/server/scriptOrder.mjs +11 -8
  24. package/dist/esm/core/server/string/loadable.mjs +3 -8
  25. package/dist/esm/index.mjs +2 -1
  26. package/dist/esm/router/cli/code/templates.mjs +3 -2
  27. package/dist/esm/router/runtime/hooks.mjs +7 -6
  28. package/dist/esm/router/runtime/provider.mjs +1 -1
  29. package/dist/esm-node/cli/ssr/index.mjs +1 -2
  30. package/dist/esm-node/core/context/public.mjs +6 -0
  31. package/dist/esm-node/core/context/runtime.mjs +4 -6
  32. package/dist/esm-node/core/react/wrapper.mjs +58 -1
  33. package/dist/esm-node/core/server/federatedCss.mjs +7 -3
  34. package/dist/esm-node/core/server/requestHandler.mjs +15 -45
  35. package/dist/esm-node/core/server/requestResponse.mjs +40 -0
  36. package/dist/esm-node/core/server/routerCleanup.mjs +16 -1
  37. package/dist/esm-node/core/server/scriptOrder.mjs +11 -8
  38. package/dist/esm-node/core/server/string/loadable.mjs +3 -8
  39. package/dist/esm-node/index.mjs +2 -1
  40. package/dist/esm-node/router/cli/code/templates.mjs +3 -2
  41. package/dist/esm-node/router/runtime/hooks.mjs +7 -6
  42. package/dist/esm-node/router/runtime/provider.mjs +1 -1
  43. package/dist/types/boundary-debugger/index.d.ts +1 -1
  44. package/dist/types/common.d.ts +8 -1
  45. package/dist/types/core/context/index.d.ts +25 -9
  46. package/dist/types/core/context/monitors/default.d.ts +10 -2
  47. package/dist/types/core/context/monitors/index.d.ts +1 -1
  48. package/dist/types/core/context/monitors/index.server.d.ts +2 -2
  49. package/dist/types/core/context/public.d.ts +26 -0
  50. package/dist/types/core/context/runtime.d.ts +12 -22
  51. package/dist/types/core/react/index.d.ts +1 -1
  52. package/dist/types/core/server/requestResponse.d.ts +15 -0
  53. package/dist/types/core/server/routerCleanup.d.ts +2 -0
  54. package/dist/types/core/server/scriptOrder.d.ts +1 -0
  55. package/dist/types/core/server/stream/shared.d.ts +2 -2
  56. package/dist/types/core/server/string/loadable.d.ts +0 -2
  57. package/dist/types/index.d.ts +5 -5
  58. package/dist/types/internal.d.ts +0 -1
  59. package/dist/types/router/runtime/hooks.d.ts +10 -6
  60. package/dist/types/router/runtime/internal.d.ts +1 -1
  61. package/dist/types/router/runtime/plugin.d.ts +1 -1
  62. package/dist/types/router/runtime/plugin.node.d.ts +1 -1
  63. package/dist/types/router/runtime/provider.d.ts +1 -1
  64. package/dist/types/router/runtime/types.d.ts +27 -5
  65. package/package.json +8 -8
@@ -11,7 +11,7 @@
11
11
  * - `@modern-js/plugin-tanstack` registers the `tanstack` provider when its
12
12
  * runtime entry is imported.
13
13
  */
14
- import type { RuntimePlugin } from '../../core';
14
+ import type { RuntimePlugin } from '../../common';
15
15
  import type { RouterExtendsHooks } from './hooks';
16
16
  import type { RouterConfig } from './types';
17
17
  /**
@@ -1,6 +1,12 @@
1
- import type { RequestContext } from '@modern-js/runtime-utils/node';
2
1
  import type { Params, RouteObject, RouteProps } from '@modern-js/runtime-utils/router';
3
- import type { NestedRoute, PageRoute } from '@modern-js/types';
2
+ export type ModernRoute = {
3
+ type: 'nested' | 'page';
4
+ path?: string;
5
+ id?: string;
6
+ component?: React.ComponentType | string;
7
+ children?: ModernRoute[];
8
+ [key: string]: any;
9
+ };
4
10
  export type SingleRouteConfig = RouteProps & {
5
11
  redirect?: string;
6
12
  routes?: SingleRouteConfig[];
@@ -19,13 +25,13 @@ export type RouterFramework = BuiltInRouterFramework | (string & {});
19
25
  export type RouterConfig = {
20
26
  /**
21
27
  * Select the router implementation used by Modern.js conventional routing.
22
- * - `react-router` (default): React Router v7 based integration
28
+ * - `react-router` (default): React Router based integration
23
29
  * - `tanstack`: TanStack Router integration
24
30
  */
25
31
  framework?: RouterFramework;
26
32
  routesConfig: {
27
33
  globalApp?: React.ComponentType<any>;
28
- routes?: (NestedRoute | PageRoute)[];
34
+ routes?: ModernRoute[];
29
35
  };
30
36
  /**
31
37
  * You should not use it
@@ -108,12 +114,28 @@ export type ModernRouteObject = RouteObject & {
108
114
  component?: React.ComponentType | LazyComponentDescriptor;
109
115
  entryCssFiles?: string[];
110
116
  };
117
+ type LoaderContextKey<T = unknown> = {
118
+ symbol: symbol;
119
+ getDefaultValue: () => T;
120
+ };
121
+ interface LoaderRequestGet<P extends Record<string, unknown>> {
122
+ <Key extends keyof P>(key: Key): P[Key];
123
+ <T>(key: LoaderContextKey<T>): T;
124
+ }
125
+ interface LoaderRequestSet<P extends Record<string, unknown>> {
126
+ <Key extends keyof P>(key: Key, value: P[Key]): void;
127
+ <T>(key: LoaderContextKey<T>, value: T): void;
128
+ }
129
+ type LoaderRequestContext<P extends Record<string, unknown> = {}> = {
130
+ get: LoaderRequestGet<P & Record<string, unknown>>;
131
+ set: LoaderRequestSet<P & Record<string, unknown>>;
132
+ };
111
133
  interface DataFunctionArgs<D = any> {
112
134
  request: Request;
113
135
  params: Params;
114
136
  context?: D;
115
137
  }
116
- export type LoaderFunctionArgs<P extends Record<string, unknown> = Record<string, unknown>> = DataFunctionArgs<RequestContext<P>>;
138
+ export type LoaderFunctionArgs<P extends Record<string, unknown> = Record<string, unknown>> = DataFunctionArgs<LoaderRequestContext<P>>;
117
139
  declare type DataFunctionValue = Response | NonNullable<unknown> | null;
118
140
  export type LoaderFunction = <P extends Record<string, unknown> = Record<string, unknown>>(args: LoaderFunctionArgs<P>) => Promise<DataFunctionValue> | DataFunctionValue;
119
141
  export {};
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "modern",
18
18
  "modern.js"
19
19
  ],
20
- "version": "3.5.0-ultramodern.3",
20
+ "version": "3.5.0-ultramodern.31",
21
21
  "engines": {
22
22
  "node": ">=20"
23
23
  },
@@ -240,12 +240,12 @@
240
240
  "react-helmet": "^6.1.0",
241
241
  "react-helmet-async": "3.0.0",
242
242
  "react-is": "^19.2.7",
243
- "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.3",
244
- "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.3",
245
- "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.5.0-ultramodern.3",
246
- "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.3",
247
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.3",
248
- "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.3"
243
+ "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.31",
244
+ "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.31",
245
+ "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.5.0-ultramodern.31",
246
+ "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.31",
247
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.31",
248
+ "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.31"
249
249
  },
250
250
  "peerDependencies": {
251
251
  "react": "^19.2.7",
@@ -265,7 +265,7 @@
265
265
  "react-dom": "^19.2.7",
266
266
  "ts-node": "^10.9.2",
267
267
  "typescript": "^6.0.3",
268
- "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.3",
268
+ "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.31",
269
269
  "@scripts/rstest-config": "2.66.0"
270
270
  },
271
271
  "sideEffects": false,