Skip to content

Commit 60de83c

Browse files
AbanoubGhadbanAbanoubGhadban
committed
ensure to send the rsc payload array initilization before the html chunk
1 parent c9c59f8 commit 60de83c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎node_package/src/injectRSCPayload.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ export default function injectRSCPayload(
114114
}
115115

116116
timeout = setTimeout(() => {
117-
writeHTMLChunks();
118117
if (!rscPromise) {
119118
rscPromise = startRSC();
120119
}
120+
writeHTMLChunks();
121121
timeout = null;
122122
}, 0);
123123
});
@@ -130,10 +130,10 @@ export default function injectRSCPayload(
130130
if (timeout) {
131131
clearTimeout(timeout);
132132
}
133-
writeHTMLChunks();
134133
if (!rscPromise) {
135134
rscPromise = startRSC();
136135
}
136+
writeHTMLChunks();
137137
rscPromise
138138
.then(() => {
139139
resultStream.end();

‎node_package/tests/injectRSCPayload.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ describe('injectRSCPayload', () => {
9191
const resultStr = await collectStreamData(result);
9292

9393
expect(resultStr).toEqual(
94-
'<html><body><div>Hello, world!</div></body></html>' +
94+
'<script>(self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]</script>' +
95+
'<html><body><div>Hello, world!</div></body></html>' +
9596
'<div>Next chunk</div>' +
96-
'<script>(self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]</script>' +
9797
'<script>((self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]).push("{\\"test\\": \\"data\\"}")</script>' +
9898
'<script>((self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]).push("{\\"test\\": \\"data2\\"}")</script>',
9999
);
@@ -111,8 +111,8 @@ describe('injectRSCPayload', () => {
111111
const resultStr = await collectStreamData(result);
112112

113113
expect(resultStr).toEqual(
114-
'<html><body><div>Hello, world!</div></body></html>' +
115-
'<script>(self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]</script>' +
114+
'<script>(self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]</script>' +
115+
'<html><body><div>Hello, world!</div></body></html>' +
116116
'<script>((self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]).push("{\\"test\\": \\"data\\"}")</script>' +
117117
'<script>((self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]).push("{\\"test\\": \\"data2\\"}")</script>' +
118118
'<div>Next chunk</div>',
@@ -134,9 +134,9 @@ describe('injectRSCPayload', () => {
134134
const resultStr = await collectStreamData(result);
135135

136136
expect(resultStr).toEqual(
137-
'<html><body><div>Hello, world!</div></body></html>' +
137+
'<script>(self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]</script>' +
138+
'<html><body><div>Hello, world!</div></body></html>' +
138139
'<div>Next chunk</div>' +
139-
'<script>(self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]</script>' +
140140
'<script>((self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]).push("{\\"test\\": \\"data\\"}")</script>' +
141141
'<script>((self.REACT_ON_RAILS_RSC_PAYLOADS||={})["test-{}-123"]||=[]).push("{\\"test\\": \\"data2\\"}")</script>' +
142142
'<div>Third chunk</div>',

0 commit comments

Comments
 (0)