vike-react 0.6.0 → 0.6.1
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.
|
@@ -9,16 +9,29 @@ import { getHeadSetting } from './getHeadSetting.js';
|
|
|
9
9
|
import { getPageElement } from './getPageElement.js';
|
|
10
10
|
import { isReactElement } from '../utils/isReactElement.js';
|
|
11
11
|
import { getTagAttributesString } from '../utils/getTagAttributesString.js';
|
|
12
|
+
import { assert } from '../utils/assert.js';
|
|
12
13
|
import { callCumulativeHooks } from '../utils/callCumulativeHooks.js';
|
|
13
14
|
import { resolveReactOptions } from './resolveReactOptions.js';
|
|
14
15
|
addEcosystemStamp();
|
|
15
16
|
const onRenderHtml = async (pageContext) => {
|
|
16
|
-
|
|
17
|
+
await renderPageToHtml(pageContext);
|
|
17
18
|
const headHtml = getHeadHtml(pageContext);
|
|
18
19
|
const { bodyHtmlBegin, bodyHtmlEnd } = await getBodyHtmlBoundary(pageContext);
|
|
19
20
|
const { htmlAttributesString, bodyAttributesString } = getTagAttributes(pageContext);
|
|
20
21
|
// Not needed on the client-side, thus we remove it to save KBs sent to the client
|
|
21
22
|
delete pageContext._configFromHook;
|
|
23
|
+
// pageContext.{pageHtmlString,pageHtmlStream} is set by renderPageToHtml() and can be overridden by user at onAfterRenderHtml()
|
|
24
|
+
let pageHtmlStringOrStream =
|
|
25
|
+
// Set to empty string if SSR is disabled
|
|
26
|
+
'';
|
|
27
|
+
if (pageContext.pageHtmlString) {
|
|
28
|
+
assert(pageContext.pageHtmlStream === undefined);
|
|
29
|
+
pageHtmlStringOrStream = dangerouslySkipEscape(pageContext.pageHtmlString);
|
|
30
|
+
}
|
|
31
|
+
if (pageContext.pageHtmlStream) {
|
|
32
|
+
assert(pageContext.pageHtmlString === undefined);
|
|
33
|
+
pageHtmlStringOrStream = pageContext.pageHtmlStream;
|
|
34
|
+
}
|
|
22
35
|
return escapeInject `<!DOCTYPE html>
|
|
23
36
|
<html${dangerouslySkipEscape(htmlAttributesString)}>
|
|
24
37
|
<head>
|
|
@@ -27,24 +40,22 @@ const onRenderHtml = async (pageContext) => {
|
|
|
27
40
|
</head>
|
|
28
41
|
<body${dangerouslySkipEscape(bodyAttributesString)}>
|
|
29
42
|
${bodyHtmlBegin}
|
|
30
|
-
<div id="root">${
|
|
43
|
+
<div id="root">${pageHtmlStringOrStream}</div>
|
|
31
44
|
${bodyHtmlEnd}
|
|
32
45
|
</body>
|
|
33
46
|
</html>`;
|
|
34
47
|
};
|
|
35
|
-
async function
|
|
48
|
+
async function renderPageToHtml(pageContext) {
|
|
36
49
|
if (pageContext.Page)
|
|
37
50
|
pageContext.page = getPageElement(pageContext).page;
|
|
38
51
|
// https://github.com/vikejs/vike-react/issues/87#issuecomment-2488742744
|
|
39
52
|
await callCumulativeHooks(pageContext.config.onBeforeRenderHtml, pageContext);
|
|
40
53
|
const { renderToStringOptions } = resolveReactOptions(pageContext);
|
|
41
|
-
let pageHtml = '';
|
|
42
54
|
if (pageContext.page) {
|
|
43
55
|
const { stream, streamIsRequired } = pageContext.config;
|
|
44
56
|
if (!stream && !streamIsRequired) {
|
|
45
57
|
const pageHtmlString = renderToString(pageContext.page, renderToStringOptions);
|
|
46
58
|
pageContext.pageHtmlString = pageHtmlString;
|
|
47
|
-
pageHtml = dangerouslySkipEscape(pageHtmlString);
|
|
48
59
|
}
|
|
49
60
|
else {
|
|
50
61
|
const pageHtmlStream = await renderToStream(pageContext.page, {
|
|
@@ -56,12 +67,10 @@ async function getPageHtml(pageContext) {
|
|
|
56
67
|
disable: stream === false ? true : undefined,
|
|
57
68
|
});
|
|
58
69
|
pageContext.pageHtmlStream = pageHtmlStream;
|
|
59
|
-
pageHtml = pageHtmlStream;
|
|
60
70
|
}
|
|
61
71
|
}
|
|
62
72
|
// https://github.com/vikejs/vike/discussions/1804#discussioncomment-10394481
|
|
63
73
|
await callCumulativeHooks(pageContext.config.onAfterRenderHtml, pageContext);
|
|
64
|
-
return pageHtml;
|
|
65
74
|
}
|
|
66
75
|
function getHeadHtml(pageContext) {
|
|
67
76
|
pageContext._headAlreadySet = true;
|