dinou 1.7.1 → 1.7.2
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.
- package/dinou/get-ssg-jsx-or-jsx.js +5 -4
- package/dinou/render-html.js +6 -4
- package/dinou/server.js +1 -1
- package/package.json +1 -1
- package/webpack.config.js +1 -1
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
const getJSX = require("./get-jsx.js");
|
|
2
2
|
const getSSGJSX = require("./get-ssg-jsx.js");
|
|
3
3
|
|
|
4
|
-
async function getSSGJSXOrJSX(reqPath, query) {
|
|
5
|
-
const result =
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
async function getSSGJSXOrJSX(reqPath, query, isDevelopment = false) {
|
|
5
|
+
const result =
|
|
6
|
+
Object.keys(query).length || isDevelopment
|
|
7
|
+
? await getJSX(reqPath, query)
|
|
8
|
+
: getSSGJSX(reqPath) ?? (await getJSX(reqPath, query));
|
|
8
9
|
return result;
|
|
9
10
|
}
|
|
10
11
|
|
package/dinou/render-html.js
CHANGED
|
@@ -28,6 +28,7 @@ const getJSX = require("./get-jsx");
|
|
|
28
28
|
const getSSGJSX = require("./get-ssg-jsx.js");
|
|
29
29
|
const { getErrorJSX } = require("./get-error-jsx");
|
|
30
30
|
const { renderJSXToClientJSX } = require("./render-jsx-to-client-jsx");
|
|
31
|
+
const isDevelopment = process.env.NODE_ENV !== "production";
|
|
31
32
|
|
|
32
33
|
function formatErrorHtml(error) {
|
|
33
34
|
const message = error.message || "Unknown error";
|
|
@@ -112,10 +113,11 @@ function formatErrorHtmlProduction(error) {
|
|
|
112
113
|
|
|
113
114
|
async function renderToStream(reqPath, query) {
|
|
114
115
|
try {
|
|
115
|
-
const jsx =
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
116
|
+
const jsx =
|
|
117
|
+
Object.keys(query).length || isDevelopment
|
|
118
|
+
? renderJSXToClientJSX(await getJSX(reqPath, query))
|
|
119
|
+
: getSSGJSX(reqPath) ??
|
|
120
|
+
renderJSXToClientJSX(await getJSX(reqPath, query));
|
|
119
121
|
|
|
120
122
|
const stream = renderToPipeableStream(jsx, {
|
|
121
123
|
onError(error) {
|
package/dinou/server.js
CHANGED
|
@@ -70,7 +70,7 @@ app.get(/^\/____rsc_payload____\/.*\/?$/, async (req, res) => {
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
-
const jsx = await getSSGJSXOrJSX(reqPath, { ...req.query });
|
|
73
|
+
const jsx = await getSSGJSXOrJSX(reqPath, { ...req.query }, isDevelopment);
|
|
74
74
|
|
|
75
75
|
const manifest = JSON.parse(
|
|
76
76
|
readFileSync(
|
package/package.json
CHANGED