Skip to content

[16.2.x] Don't drop FormData entries #94240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eps1lon merged 1 commit into from
May 31, 2026
Merged

[16.2.x] Don't drop FormData entries #94240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 70 additions & 33 deletions ...rver-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6573,20 +6573,58 @@
turbopackMap,
options
) {
var response = createResponse(
function flush() {
for (; null !== head; ) {
var current = head;
if (!current.complete) return;
try {
var response = response$jscomp$0,
key = current.name,
handle = current.file,
blob = new Blob(handle.chunks, { type: handle.mime }),
backingStore = response._formData;
response = key;
backingStore.data.append(response, blob, handle.filename);
var keys = backingStore.keys;
null === keys
? ((backingStore.keys = Array.from(backingStore.data.keys())),
(backingStore.keyPointer = 0))
: keys.push(response);
var queuedFields = current.queuedFields;
if (null !== queuedFields)
for (response = 0; response < queuedFields.length; response += 2)
resolveField(
response$jscomp$0,
queuedFields[response],
queuedFields[response + 1]
);
} catch (error) {
busboyStream.destroy(error);
return;
}
head = current.next;
}
tail = null;
bodyFinished && !closed && ((closed = !0), close(response$jscomp$0));
}
var response$jscomp$0 = createResponse(
turbopackMap,
"",
options ? options.temporaryReferences : void 0,
void 0,
options ? options.arraySizeLimit : void 0
),
pendingFiles = 0,
queuedFields = [];
head = null,
tail = null,
bodyFinished = !1,
closed = !1;
busboyStream.on("field", function (name, value) {
if (0 < pendingFiles) queuedFields.push(name, value);
if (null !== tail)
null === tail.queuedFields && (tail.queuedFields = []),
tail.queuedFields.push(name, value);
else
try {
resolveField(response, name, value);
resolveField(response$jscomp$0, name, value);
} catch (error) {
busboyStream.destroy(error);
}
Expand All @@ -6601,46 +6639,45 @@
)
);
else {
pendingFiles++;
var JSCompiler_object_inline_chunks_292 = [];
var file = { chunks: [], filename: filename, mime: mimeType },
pendingFile = {
name: name,
file: file,
complete: !1,
queuedFields: null,
next: null
};
null === tail ? (head = pendingFile) : (tail.next = pendingFile);
tail = pendingFile;
value.on("data", function (chunk) {
JSCompiler_object_inline_chunks_292.push(chunk);
});
value.on("end", function () {
try {
var blob = new Blob(JSCompiler_object_inline_chunks_292, {
type: mimeType
}),
backingStore = response._formData;
backingStore.data.append(name, blob, filename);
var keys = backingStore.keys;
null === keys
? ((backingStore.keys = Array.from(backingStore.data.keys())),
(backingStore.keyPointer = 0))
: keys.push(name);
pendingFiles--;
if (0 === pendingFiles) {
for (blob = 0; blob < queuedFields.length; blob += 2)
resolveField(
response,
queuedFields[blob],
queuedFields[blob + 1]
);
queuedFields.length = 0;
}
file.chunks.push(chunk);
} catch (error) {
busboyStream.destroy(error);
}
});
value.on("error", function (error) {
busboyStream.destroy(error);
});
value.on("end", function () {
pendingFile.complete = !0;
flush();
});
}
});
busboyStream.on("finish", function () {
close(response);
bodyFinished = !0;
flush();
closed ||
reportGlobalError(
response$jscomp$0,
Error("Reply finished with incomplete file part.")
);
});
busboyStream.on("error", function (err) {
reportGlobalError(response, err);
reportGlobalError(response$jscomp$0, err);
});
return getChunk(response, 0);
return getChunk(response$jscomp$0, 0);
};
exports.prerender = function (model, turbopackMap, options) {
return new Promise(function (resolve, reject) {
Expand Down
98 changes: 69 additions & 29 deletions ...erver-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3645,17 +3645,58 @@ exports.decodeReplyFromAsyncIterable = function (
return getChunk(response, 0);
};
exports.decodeReplyFromBusboy = function (busboyStream, turbopackMap, options) {
function flush() {
for (; null !== head; ) {
var current = head;
if (!current.complete) return;
try {
var key = current.name,
handle = current.file,
blob = new Blob(handle.chunks, { type: handle.mime }),
backingStore = response._formData,
key$jscomp$0 = key;
backingStore.data.append(key$jscomp$0, blob, handle.filename);
var keys = backingStore.keys;
null === keys
? ((backingStore.keys = Array.from(backingStore.data.keys())),
(backingStore.keyPointer = 0))
: keys.push(key$jscomp$0);
var queuedFields = current.queuedFields;
if (null !== queuedFields)
for (
key$jscomp$0 = 0;
key$jscomp$0 < queuedFields.length;
key$jscomp$0 += 2
)
resolveField(
response,
queuedFields[key$jscomp$0],
queuedFields[key$jscomp$0 + 1]
);
} catch (error) {
busboyStream.destroy(error);
return;
}
head = current.next;
}
tail = null;
bodyFinished && !closed && ((closed = !0), close(response));
}
var response = createResponse(
turbopackMap,
"",
options ? options.temporaryReferences : void 0,
void 0,
options ? options.arraySizeLimit : void 0
),
pendingFiles = 0,
queuedFields = [];
head = null,
tail = null,
bodyFinished = !1,
closed = !1;
busboyStream.on("field", function (name, value) {
if (0 < pendingFiles) queuedFields.push(name, value);
if (null !== tail)
null === tail.queuedFields && (tail.queuedFields = []),
tail.queuedFields.push(name, value);
else
try {
resolveField(response, name, value);
Expand All @@ -3673,41 +3714,40 @@ exports.decodeReplyFromBusboy = function (busboyStream, turbopackMap, options) {
)
);
else {
pendingFiles++;
var JSCompiler_object_inline_chunks_299 = [];
var file = { chunks: [], filename: filename, mime: mimeType },
pendingFile = {
name: name,
file: file,
complete: !1,
queuedFields: null,
next: null
};
null === tail ? (head = pendingFile) : (tail.next = pendingFile);
tail = pendingFile;
value.on("data", function (chunk) {
JSCompiler_object_inline_chunks_299.push(chunk);
});
value.on("end", function () {
try {
var blob = new Blob(JSCompiler_object_inline_chunks_299, {
type: mimeType
}),
backingStore = response._formData;
backingStore.data.append(name, blob, filename);
var keys = backingStore.keys;
null === keys
? ((backingStore.keys = Array.from(backingStore.data.keys())),
(backingStore.keyPointer = 0))
: keys.push(name);
pendingFiles--;
if (0 === pendingFiles) {
for (blob = 0; blob < queuedFields.length; blob += 2)
resolveField(
response,
queuedFields[blob],
queuedFields[blob + 1]
);
queuedFields.length = 0;
}
file.chunks.push(chunk);
} catch (error) {
busboyStream.destroy(error);
}
});
value.on("error", function (error) {
busboyStream.destroy(error);
});
value.on("end", function () {
pendingFile.complete = !0;
flush();
});
}
});
busboyStream.on("finish", function () {
close(response);
bodyFinished = !0;
flush();
closed ||
reportGlobalError(
response,
Error("Reply finished with incomplete file part.")
);
});
busboyStream.on("error", function (err) {
reportGlobalError(response, err);
Expand Down
Loading
Loading