@bleedingdev/modern-js-runtime 3.2.0-ultramodern.85 → 3.2.0-ultramodern.87
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.
|
@@ -50,12 +50,12 @@ const external_utils_js_namespaceObject = require("../utils.js");
|
|
|
50
50
|
const external_loadable_js_namespaceObject = require("./loadable.js");
|
|
51
51
|
const external_ssrData_js_namespaceObject = require("./ssrData.js");
|
|
52
52
|
const renderString = async (request, serverRoot, options)=>{
|
|
53
|
-
const { resource, runtimeContext
|
|
53
|
+
const { resource, runtimeContext, config, onError, onTiming } = options;
|
|
54
54
|
const tracer = {
|
|
55
55
|
onError,
|
|
56
56
|
onTiming
|
|
57
57
|
};
|
|
58
|
-
const routerContext =
|
|
58
|
+
const routerContext = runtimeContext.routerContext;
|
|
59
59
|
const { htmlTemplate, entryName, loadableStats, routeManifest, moduleFederationCssAssets } = resource;
|
|
60
60
|
const ssrConfig = (0, external_utils_js_namespaceObject.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
|
|
61
61
|
const chunkSet = {
|
|
@@ -69,7 +69,7 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
69
69
|
stats: loadableStats,
|
|
70
70
|
nonce: config.nonce,
|
|
71
71
|
routeManifest,
|
|
72
|
-
runtimeContext
|
|
72
|
+
runtimeContext,
|
|
73
73
|
template: htmlTemplate,
|
|
74
74
|
entryName,
|
|
75
75
|
moduleFederationCssAssets,
|
|
@@ -77,10 +77,10 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
77
77
|
config
|
|
78
78
|
}),
|
|
79
79
|
new external_ssrData_js_namespaceObject.SSRDataCollector({
|
|
80
|
-
runtimeContext
|
|
80
|
+
runtimeContext,
|
|
81
81
|
request,
|
|
82
82
|
ssrConfig,
|
|
83
|
-
ssrContext:
|
|
83
|
+
ssrContext: runtimeContext.ssrContext,
|
|
84
84
|
chunkSet,
|
|
85
85
|
routerContext,
|
|
86
86
|
nonce: config.nonce,
|
|
@@ -93,13 +93,13 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
93
93
|
chunkSet
|
|
94
94
|
});
|
|
95
95
|
for (const c of extraCollectors)if (c) collectors.unshift(c);
|
|
96
|
-
const rootElement = (0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(serverRoot, Object.assign(
|
|
96
|
+
const rootElement = (0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(serverRoot, Object.assign(runtimeContext, {
|
|
97
97
|
ssr: true
|
|
98
98
|
}));
|
|
99
|
-
const html = await generateHtml(rootElement, htmlTemplate, chunkSet, collectors,
|
|
99
|
+
const html = await generateHtml(rootElement, htmlTemplate, chunkSet, collectors, runtimeContext.ssrContext?.htmlModifiers || [], runtimeContext, tracer);
|
|
100
100
|
return html;
|
|
101
101
|
};
|
|
102
|
-
async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, { onError, onTiming }) {
|
|
102
|
+
async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, runtimeContext, { onError, onTiming }) {
|
|
103
103
|
let html = '';
|
|
104
104
|
let helmetData;
|
|
105
105
|
const finalApp = collectors.reduce((pre, creator)=>creator.collect?.(pre) || pre, App);
|
|
@@ -12,12 +12,12 @@ import { getSSRConfigByEntry, safeReplace } from "../utils.mjs";
|
|
|
12
12
|
import { LoadableCollector } from "./loadable.mjs";
|
|
13
13
|
import { SSRDataCollector } from "./ssrData.mjs";
|
|
14
14
|
const renderString = async (request, serverRoot, options)=>{
|
|
15
|
-
const { resource, runtimeContext
|
|
15
|
+
const { resource, runtimeContext, config, onError, onTiming } = options;
|
|
16
16
|
const tracer = {
|
|
17
17
|
onError,
|
|
18
18
|
onTiming
|
|
19
19
|
};
|
|
20
|
-
const routerContext =
|
|
20
|
+
const routerContext = runtimeContext.routerContext;
|
|
21
21
|
const { htmlTemplate, entryName, loadableStats, routeManifest, moduleFederationCssAssets } = resource;
|
|
22
22
|
const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
|
|
23
23
|
const chunkSet = {
|
|
@@ -31,7 +31,7 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
31
31
|
stats: loadableStats,
|
|
32
32
|
nonce: config.nonce,
|
|
33
33
|
routeManifest,
|
|
34
|
-
runtimeContext
|
|
34
|
+
runtimeContext,
|
|
35
35
|
template: htmlTemplate,
|
|
36
36
|
entryName,
|
|
37
37
|
moduleFederationCssAssets,
|
|
@@ -39,10 +39,10 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
39
39
|
config
|
|
40
40
|
}),
|
|
41
41
|
new SSRDataCollector({
|
|
42
|
-
runtimeContext
|
|
42
|
+
runtimeContext,
|
|
43
43
|
request,
|
|
44
44
|
ssrConfig,
|
|
45
|
-
ssrContext:
|
|
45
|
+
ssrContext: runtimeContext.ssrContext,
|
|
46
46
|
chunkSet,
|
|
47
47
|
routerContext,
|
|
48
48
|
nonce: config.nonce,
|
|
@@ -55,13 +55,13 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
55
55
|
chunkSet
|
|
56
56
|
});
|
|
57
57
|
for (const c of extraCollectors)if (c) collectors.unshift(c);
|
|
58
|
-
const rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(
|
|
58
|
+
const rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(runtimeContext, {
|
|
59
59
|
ssr: true
|
|
60
60
|
}));
|
|
61
|
-
const html = await generateHtml(rootElement, htmlTemplate, chunkSet, collectors,
|
|
61
|
+
const html = await generateHtml(rootElement, htmlTemplate, chunkSet, collectors, runtimeContext.ssrContext?.htmlModifiers || [], runtimeContext, tracer);
|
|
62
62
|
return html;
|
|
63
63
|
};
|
|
64
|
-
async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, { onError, onTiming }) {
|
|
64
|
+
async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, runtimeContext, { onError, onTiming }) {
|
|
65
65
|
let html = '';
|
|
66
66
|
let helmetData;
|
|
67
67
|
const finalApp = collectors.reduce((pre, creator)=>creator.collect?.(pre) || pre, App);
|
|
@@ -13,12 +13,12 @@ import { getSSRConfigByEntry, safeReplace } from "../utils.mjs";
|
|
|
13
13
|
import { LoadableCollector } from "./loadable.mjs";
|
|
14
14
|
import { SSRDataCollector } from "./ssrData.mjs";
|
|
15
15
|
const renderString = async (request, serverRoot, options)=>{
|
|
16
|
-
const { resource, runtimeContext
|
|
16
|
+
const { resource, runtimeContext, config, onError, onTiming } = options;
|
|
17
17
|
const tracer = {
|
|
18
18
|
onError,
|
|
19
19
|
onTiming
|
|
20
20
|
};
|
|
21
|
-
const routerContext =
|
|
21
|
+
const routerContext = runtimeContext.routerContext;
|
|
22
22
|
const { htmlTemplate, entryName, loadableStats, routeManifest, moduleFederationCssAssets } = resource;
|
|
23
23
|
const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
|
|
24
24
|
const chunkSet = {
|
|
@@ -32,7 +32,7 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
32
32
|
stats: loadableStats,
|
|
33
33
|
nonce: config.nonce,
|
|
34
34
|
routeManifest,
|
|
35
|
-
runtimeContext
|
|
35
|
+
runtimeContext,
|
|
36
36
|
template: htmlTemplate,
|
|
37
37
|
entryName,
|
|
38
38
|
moduleFederationCssAssets,
|
|
@@ -40,10 +40,10 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
40
40
|
config
|
|
41
41
|
}),
|
|
42
42
|
new SSRDataCollector({
|
|
43
|
-
runtimeContext
|
|
43
|
+
runtimeContext,
|
|
44
44
|
request,
|
|
45
45
|
ssrConfig,
|
|
46
|
-
ssrContext:
|
|
46
|
+
ssrContext: runtimeContext.ssrContext,
|
|
47
47
|
chunkSet,
|
|
48
48
|
routerContext,
|
|
49
49
|
nonce: config.nonce,
|
|
@@ -56,13 +56,13 @@ const renderString = async (request, serverRoot, options)=>{
|
|
|
56
56
|
chunkSet
|
|
57
57
|
});
|
|
58
58
|
for (const c of extraCollectors)if (c) collectors.unshift(c);
|
|
59
|
-
const rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(
|
|
59
|
+
const rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(runtimeContext, {
|
|
60
60
|
ssr: true
|
|
61
61
|
}));
|
|
62
|
-
const html = await generateHtml(rootElement, htmlTemplate, chunkSet, collectors,
|
|
62
|
+
const html = await generateHtml(rootElement, htmlTemplate, chunkSet, collectors, runtimeContext.ssrContext?.htmlModifiers || [], runtimeContext, tracer);
|
|
63
63
|
return html;
|
|
64
64
|
};
|
|
65
|
-
async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, { onError, onTiming }) {
|
|
65
|
+
async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, runtimeContext, { onError, onTiming }) {
|
|
66
66
|
let html = '';
|
|
67
67
|
let helmetData;
|
|
68
68
|
const finalApp = collectors.reduce((pre, creator)=>creator.collect?.(pre) || pre, App);
|
package/package.json
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"modern",
|
|
18
18
|
"modern.js"
|
|
19
19
|
],
|
|
20
|
-
"version": "3.2.0-ultramodern.
|
|
20
|
+
"version": "3.2.0-ultramodern.87",
|
|
21
21
|
"engines": {
|
|
22
22
|
"node": ">=20"
|
|
23
23
|
},
|
|
@@ -233,12 +233,12 @@
|
|
|
233
233
|
"isbot": "5.1.40",
|
|
234
234
|
"react-helmet-async": "3.0.0",
|
|
235
235
|
"react-is": "^19.2.6",
|
|
236
|
-
"@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.
|
|
237
|
-
"@modern-js/
|
|
238
|
-
"@modern-js/
|
|
239
|
-
"@modern-js/
|
|
240
|
-
"@modern-js/
|
|
241
|
-
"@modern-js/
|
|
236
|
+
"@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.87",
|
|
237
|
+
"@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.87",
|
|
238
|
+
"@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.87",
|
|
239
|
+
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.87",
|
|
240
|
+
"@modern-js/render": "npm:@bleedingdev/modern-js-render@3.2.0-ultramodern.87",
|
|
241
|
+
"@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.87"
|
|
242
242
|
},
|
|
243
243
|
"peerDependencies": {
|
|
244
244
|
"react": "^19.2.6",
|
|
@@ -257,7 +257,7 @@
|
|
|
257
257
|
"@typescript/native-preview": "7.0.0-dev.20260527.2",
|
|
258
258
|
"react": "^19.2.6",
|
|
259
259
|
"react-dom": "^19.2.6",
|
|
260
|
-
"@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.
|
|
260
|
+
"@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.87",
|
|
261
261
|
"@scripts/rstest-config": "2.66.0"
|
|
262
262
|
},
|
|
263
263
|
"sideEffects": false,
|