@bleedingdev/modern-js-render 3.2.0-ultramodern.17 → 3.2.0-ultramodern.22
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/dist/esm/client.mjs
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export { ElementsContext, RSCServerSlot, ResetRootContext, RscClientRoot, ServerElementsProvider, callServer, createFromFetch, createFromReadableStream, createServerReference, rscStream, setServerCallback } from "./
|
|
1
|
+
export { ElementsContext, RSCServerSlot, ResetRootContext, RscClientRoot, ServerElementsProvider, callServer, createFromFetch, createFromReadableStream, createServerReference, rscStream, setServerCallback } from "./712.mjs";
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
import { renderToReadableStream } from "react-server-dom-rspack/server.node";
|
|
2
|
+
import { decodeReply as server_edge_decodeReply, loadServerAction as server_edge_loadServerAction, registerClientReference, registerServerReference, renderToReadableStream as server_edge_renderToReadableStream } from "react-server-dom-rspack/server.edge";
|
|
3
|
+
const server_encoder = new TextEncoder();
|
|
4
|
+
const closingTagsPattern = /<\/body>\s*<\/html>\s*$/i;
|
|
5
|
+
function injectRSCPayload(rscStream, { injectClosingTags = true }) {
|
|
6
|
+
const decoder = new TextDecoder();
|
|
7
|
+
let resolveFlightDataPromise;
|
|
8
|
+
const flightDataPromise = new Promise((resolve)=>resolveFlightDataPromise = resolve);
|
|
9
|
+
let startedRSC = false;
|
|
10
|
+
const buffered = [];
|
|
11
|
+
let timeout = null;
|
|
12
|
+
function flushBufferedChunks(controller) {
|
|
13
|
+
for (const chunk of buffered){
|
|
14
|
+
let buf = decoder.decode(chunk);
|
|
15
|
+
if (closingTagsPattern.test(buf)) buf = buf.replace(closingTagsPattern, '');
|
|
16
|
+
controller.enqueue(server_encoder.encode(buf));
|
|
17
|
+
}
|
|
18
|
+
buffered.length = 0;
|
|
19
|
+
timeout = null;
|
|
20
|
+
}
|
|
21
|
+
return new TransformStream({
|
|
22
|
+
transform (chunk, controller) {
|
|
23
|
+
buffered.push(chunk);
|
|
24
|
+
if (timeout) return;
|
|
25
|
+
timeout = setTimeout(async ()=>{
|
|
26
|
+
flushBufferedChunks(controller);
|
|
27
|
+
if (!startedRSC) {
|
|
28
|
+
startedRSC = true;
|
|
29
|
+
writeRSCStream(rscStream, controller).catch((err)=>controller.error(err)).then(()=>resolveFlightDataPromise());
|
|
30
|
+
}
|
|
31
|
+
}, 0);
|
|
32
|
+
},
|
|
33
|
+
async flush (controller) {
|
|
34
|
+
await flightDataPromise;
|
|
35
|
+
if (timeout) {
|
|
36
|
+
clearTimeout(timeout);
|
|
37
|
+
flushBufferedChunks(controller);
|
|
38
|
+
}
|
|
39
|
+
if (injectClosingTags) controller.enqueue(server_encoder.encode('</body></html>'));
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
async function writeRSCStream(rscStream, controller) {
|
|
44
|
+
const decoder = new TextDecoder('utf-8', {
|
|
45
|
+
fatal: true
|
|
46
|
+
});
|
|
47
|
+
for await (const chunk of rscStream)try {
|
|
48
|
+
writeChunk(JSON.stringify(decoder.decode(chunk, {
|
|
49
|
+
stream: true
|
|
50
|
+
})), controller);
|
|
51
|
+
} catch (err) {
|
|
52
|
+
const base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
|
|
53
|
+
writeChunk(`Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`, controller);
|
|
54
|
+
}
|
|
55
|
+
const remaining = decoder.decode();
|
|
56
|
+
if (remaining.length) writeChunk(JSON.stringify(remaining), controller);
|
|
57
|
+
}
|
|
58
|
+
function writeChunk(chunk, controller) {
|
|
59
|
+
controller.enqueue(server_encoder.encode(`<script>${escapeScript(`(self.__FLIGHT_DATA||=[]).push(${chunk})`)}</script>`));
|
|
60
|
+
}
|
|
61
|
+
function escapeScript(script) {
|
|
62
|
+
return script.replace(/<!--/g, '<\\!--').replace(/<\/(script)/gi, '</\\$1');
|
|
63
|
+
}
|
|
64
|
+
function injectCSS(cssFiles, { injectClosingTags = true } = {}) {
|
|
65
|
+
if (0 === cssFiles.length) return new TransformStream({
|
|
66
|
+
transform (chunk, controller) {
|
|
67
|
+
controller.enqueue(chunk);
|
|
68
|
+
},
|
|
69
|
+
flush (controller) {
|
|
70
|
+
if (injectClosingTags) controller.enqueue(server_encoder.encode('</body></html>'));
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
const decoder = new TextDecoder();
|
|
74
|
+
const headTrailer = '</head>';
|
|
75
|
+
const buffered = [];
|
|
76
|
+
let timeout = null;
|
|
77
|
+
let cssInjected = false;
|
|
78
|
+
const cssLinks = cssFiles.map((css)=>`<link href="${css}" rel="stylesheet" />`).join('');
|
|
79
|
+
function flushBufferedChunks(controller) {
|
|
80
|
+
for (const chunk of buffered){
|
|
81
|
+
let buf = decoder.decode(chunk);
|
|
82
|
+
if (!cssInjected && buf.includes(headTrailer)) {
|
|
83
|
+
buf = buf.replace(headTrailer, `${cssLinks}${headTrailer}`);
|
|
84
|
+
cssInjected = true;
|
|
85
|
+
}
|
|
86
|
+
controller.enqueue(server_encoder.encode(buf));
|
|
87
|
+
}
|
|
88
|
+
buffered.length = 0;
|
|
89
|
+
timeout = null;
|
|
90
|
+
}
|
|
91
|
+
return new TransformStream({
|
|
92
|
+
transform (chunk, controller) {
|
|
93
|
+
buffered.push(chunk);
|
|
94
|
+
if (timeout) return;
|
|
95
|
+
timeout = setTimeout(()=>{
|
|
96
|
+
flushBufferedChunks(controller);
|
|
97
|
+
}, 0);
|
|
98
|
+
},
|
|
99
|
+
async flush (controller) {
|
|
100
|
+
if (timeout) {
|
|
101
|
+
clearTimeout(timeout);
|
|
102
|
+
flushBufferedChunks(controller);
|
|
103
|
+
}
|
|
104
|
+
if (!cssInjected) controller.enqueue(server_encoder.encode(cssLinks));
|
|
105
|
+
if (injectClosingTags) controller.enqueue(server_encoder.encode('</body></html>'));
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
const renderRsc = (options)=>{
|
|
110
|
+
const readable = renderToReadableStream(options.element);
|
|
111
|
+
return readable;
|
|
112
|
+
};
|
|
113
|
+
async function renderCSRWithRSC(options) {
|
|
114
|
+
const entryCssFiles = __webpack_require__.rscM?.entryCssFiles;
|
|
115
|
+
const cssFiles = entryCssFiles ? Object.values(entryCssFiles).flat() : [];
|
|
116
|
+
const rscPayloadStream = renderRsc({
|
|
117
|
+
element: options.rscRoot
|
|
118
|
+
});
|
|
119
|
+
const htmlStream = new ReadableStream({
|
|
120
|
+
start (controller) {
|
|
121
|
+
const encoder = new TextEncoder();
|
|
122
|
+
controller.enqueue(encoder.encode(options.html));
|
|
123
|
+
controller.close();
|
|
124
|
+
}
|
|
125
|
+
});
|
|
126
|
+
const stream = htmlStream.pipeThrough(injectCSS(cssFiles, {
|
|
127
|
+
injectClosingTags: false
|
|
128
|
+
})).pipeThrough(injectRSCPayload(rscPayloadStream, {
|
|
129
|
+
injectClosingTags: true
|
|
130
|
+
}));
|
|
131
|
+
return new Response(stream, {
|
|
132
|
+
status: 200,
|
|
133
|
+
headers: new Headers({
|
|
134
|
+
'content-type': 'text/html; charset=UTF-8'
|
|
135
|
+
})
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
const rsc_worker_renderRsc = (options)=>{
|
|
139
|
+
const readable = server_edge_renderToReadableStream(options.element);
|
|
140
|
+
return readable;
|
|
141
|
+
};
|
|
142
|
+
const rsc_worker_handleAction = async (req)=>{
|
|
143
|
+
try {
|
|
144
|
+
const serverReference = req.headers.get('x-rsc-action');
|
|
145
|
+
if (!serverReference) return new Response('Cannot find server reference', {
|
|
146
|
+
status: 404
|
|
147
|
+
});
|
|
148
|
+
const action = server_edge_loadServerAction(serverReference);
|
|
149
|
+
if ('function' != typeof action) {
|
|
150
|
+
console.error('[RSC] Invalid action: server reference is not a function, serverReference:', serverReference);
|
|
151
|
+
return new Response('Invalid action', {
|
|
152
|
+
status: 400
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
const contentType = req.headers.get('content-type');
|
|
156
|
+
let args;
|
|
157
|
+
try {
|
|
158
|
+
if (contentType?.includes('multipart/form-data')) {
|
|
159
|
+
const formData = await req.formData();
|
|
160
|
+
args = await server_edge_decodeReply(formData);
|
|
161
|
+
} else {
|
|
162
|
+
const text = await req.text();
|
|
163
|
+
args = await server_edge_decodeReply(text);
|
|
164
|
+
}
|
|
165
|
+
} catch (error) {
|
|
166
|
+
console.error('[RSC] Failed to decode request arguments, error:', error instanceof Error ? error.message : String(error), 'contentType:', contentType || 'unknown');
|
|
167
|
+
return new Response('Failed to decode request arguments', {
|
|
168
|
+
status: 400
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
const result = await Promise.resolve(action.apply(null, args));
|
|
172
|
+
const stream = rsc_worker_renderRsc({
|
|
173
|
+
element: result
|
|
174
|
+
});
|
|
175
|
+
const response = new Response(stream, {
|
|
176
|
+
status: 200,
|
|
177
|
+
headers: {
|
|
178
|
+
'Content-Type': 'text/html'
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
return response;
|
|
182
|
+
} catch (error) {
|
|
183
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
184
|
+
const errorStack = error instanceof Error ? error.stack : void 0;
|
|
185
|
+
console.error('[RSC] Error handling server action, error:', errorMessage, errorStack ? `\n${errorStack}` : '');
|
|
186
|
+
return new Response('Internal server error', {
|
|
187
|
+
status: 500
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
};
|
|
191
|
+
export { createFromReadableStream } from "react-server-dom-rspack/client.edge";
|
|
192
|
+
export { registerClientReference, registerServerReference, renderCSRWithRSC, rsc_worker_handleAction as handleAction, rsc_worker_renderRsc as renderRsc, server_edge_renderToReadableStream as renderToReadableStream };
|
package/dist/esm/ssr.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
|
|
2
2
|
import react from "react";
|
|
3
3
|
import { renderToReadableStream } from "react-dom/server.edge";
|
|
4
|
-
import { ServerElementsProvider } from "./
|
|
4
|
+
import { ServerElementsProvider } from "./712.mjs";
|
|
5
5
|
function CSSLinks({ cssFiles }) {
|
|
6
6
|
if (0 === cssFiles.length) return null;
|
|
7
7
|
return /*#__PURE__*/ react.createElement(react.Fragment, null, cssFiles.map((css)=>/*#__PURE__*/ react.createElement("link", {
|
|
@@ -26,8 +26,13 @@ const renderSSRStream = async (children, options)=>{
|
|
|
26
26
|
identifierPrefix: SSR_HYDRATION_ID_PREFIX
|
|
27
27
|
});
|
|
28
28
|
try {
|
|
29
|
+
const rscRuntime = 'edge' === process.env.MODERN_SSR_ENV ? Promise.resolve().then(function() {
|
|
30
|
+
var e = new Error("Cannot find module '@modern-js/render/rsc-worker'");
|
|
31
|
+
e.code = 'MODULE_NOT_FOUND';
|
|
32
|
+
throw e;
|
|
33
|
+
}) : import("@modern-js/render/rsc");
|
|
29
34
|
const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] = await Promise.all([
|
|
30
|
-
|
|
35
|
+
rscRuntime,
|
|
31
36
|
import("react-server-dom-rspack/client.edge"),
|
|
32
37
|
import("./0~server.mjs")
|
|
33
38
|
]);
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export { renderToReadableStream } from 'react-server-dom-rspack/server.edge';
|
|
2
|
+
export { createFromReadableStream } from 'react-server-dom-rspack/client.edge';
|
|
3
|
+
export { registerClientReference, registerServerReference, } from 'react-server-dom-rspack/server.edge';
|
|
4
|
+
type RenderRscOptions = {
|
|
5
|
+
element: React.ReactElement;
|
|
6
|
+
};
|
|
7
|
+
export declare const renderRsc: (options: RenderRscOptions) => ReadableStream<Uint8Array<ArrayBufferLike>>;
|
|
8
|
+
export declare const handleAction: (req: Request) => Promise<Response>;
|
package/package.json
CHANGED
|
@@ -17,26 +17,26 @@
|
|
|
17
17
|
"modern",
|
|
18
18
|
"modern.js"
|
|
19
19
|
],
|
|
20
|
-
"version": "3.2.0-ultramodern.
|
|
20
|
+
"version": "3.2.0-ultramodern.22",
|
|
21
21
|
"files": [
|
|
22
22
|
"dist",
|
|
23
23
|
"hook.d.ts"
|
|
24
24
|
],
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@swc/helpers": "^0.5.21",
|
|
27
|
-
"@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.
|
|
28
|
-
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.
|
|
27
|
+
"@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.22",
|
|
28
|
+
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.22"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@rslib/core": "0.21.5",
|
|
32
|
-
"@types/react": "^19.2.
|
|
32
|
+
"@types/react": "^19.2.15",
|
|
33
33
|
"@types/react-dom": "^19.2.3",
|
|
34
|
-
"@typescript/native-preview": "7.0.0-dev.
|
|
34
|
+
"@typescript/native-preview": "7.0.0-dev.20260526.1",
|
|
35
35
|
"react": "^19.2.6",
|
|
36
36
|
"react-dom": "^19.2.6",
|
|
37
37
|
"react-server-dom-rspack": "0.0.2",
|
|
38
|
-
"@
|
|
39
|
-
"@
|
|
38
|
+
"@scripts/rstest-config": "2.66.0",
|
|
39
|
+
"@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.22"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
42
|
"react": "^19.2.6",
|
|
@@ -52,6 +52,10 @@
|
|
|
52
52
|
"types": "./dist/types/server/rsc/index.d.ts",
|
|
53
53
|
"default": "./dist/esm/rsc.mjs"
|
|
54
54
|
},
|
|
55
|
+
"./rsc-worker": {
|
|
56
|
+
"types": "./dist/types/rsc.worker.d.ts",
|
|
57
|
+
"default": "./dist/esm/rscWorker.mjs"
|
|
58
|
+
},
|
|
55
59
|
"./client": {
|
|
56
60
|
"types": "./dist/types/client/index.d.ts",
|
|
57
61
|
"default": "./dist/esm/client.mjs"
|
|
@@ -65,6 +69,9 @@
|
|
|
65
69
|
"rsc": [
|
|
66
70
|
"./dist/types/server/rsc/index.d.ts"
|
|
67
71
|
],
|
|
72
|
+
"rsc-worker": [
|
|
73
|
+
"./dist/types/rsc.worker.d.ts"
|
|
74
|
+
],
|
|
68
75
|
"client": [
|
|
69
76
|
"./dist/types/client/index.d.ts"
|
|
70
77
|
]
|
|
File without changes
|