Sync DoS mitigations for React Flight

parent 43cb5460
...@@ -419,6 +419,11 @@ ...@@ -419,6 +419,11 @@
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
function resolveToJSON(key, value) { function resolveToJSON(key, value) {
"__proto__" === key &&
console.error(
"Expected not to serialize an object with own property `__proto__`. When parsed this property will be omitted.%s",
describeObjectForErrorMessage(this, key)
);
var originalValue = this[key]; var originalValue = this[key];
"object" !== typeof originalValue || "object" !== typeof originalValue ||
originalValue === value || originalValue === value ||
...@@ -663,17 +668,20 @@ ...@@ -663,17 +668,20 @@
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -1752,10 +1760,17 @@ ...@@ -1752,10 +1760,17 @@
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1900,7 +1915,7 @@ ...@@ -1900,7 +1915,7 @@
metaData.id, metaData.id,
metaData.bound metaData.bound
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && "" === key &&
null === handler.value && null === handler.value &&
(handler.value = resolvedValue); (handler.value = resolvedValue);
...@@ -2102,6 +2117,7 @@ ...@@ -2102,6 +2117,7 @@
Object.setPrototypeOf(parentObject, model.prototype); Object.setPrototypeOf(parentObject, model.prototype);
} }
function defineLazyGetter(response, chunk, parentObject, key) { function defineLazyGetter(response, chunk, parentObject, key) {
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
"resolved_model" === chunk.status && initializeModelChunk(chunk); "resolved_model" === chunk.status && initializeModelChunk(chunk);
...@@ -2300,6 +2316,7 @@ ...@@ -2300,6 +2316,7 @@
? ref.value ? ref.value
: defineLazyGetter(response, ref, parentObject, key); : defineLazyGetter(response, ref, parentObject, key);
} }
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects."; return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects.";
...@@ -3855,6 +3872,7 @@ ...@@ -3855,6 +3872,7 @@
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -3931,6 +3949,7 @@ ...@@ -3931,6 +3949,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function close(weakResponse) { function close(weakResponse) {
...@@ -4316,10 +4335,10 @@ ...@@ -4316,10 +4335,10 @@
return hook.checkDCE ? !0 : !1; return hook.checkDCE ? !0 : !1;
})({ })({
bundleType: 1, bundleType: 1,
version: "19.2.0-experimental-abb88194-20251211", version: "19.2.0-experimental-7072301b-20260123",
rendererPackageName: "react-server-dom-turbopack", rendererPackageName: "react-server-dom-turbopack",
currentDispatcherRef: ReactSharedInternals, currentDispatcherRef: ReactSharedInternals,
reconcilerVersion: "19.2.0-experimental-abb88194-20251211", reconcilerVersion: "19.2.0-experimental-7072301b-20260123",
getCurrentComponentInfo: function () { getCurrentComponentInfo: function () {
return currentOwnerInDEV; return currentOwnerInDEV;
} }
......
...@@ -433,17 +433,20 @@ function processReply( ...@@ -433,17 +433,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -830,10 +833,17 @@ function fulfillReference(reference, value) { ...@@ -830,10 +833,17 @@ function fulfillReference(reference, value) {
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -945,7 +955,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -945,7 +955,7 @@ function loadServerReference(response, metaData, parentObject, key) {
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs); resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
} }
registerBoundServerReference(resolvedValue, metaData.id, metaData.bound); registerBoundServerReference(resolvedValue, metaData.id, metaData.bound);
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1313,8 +1323,8 @@ function startReadableStream(response, id, type) { ...@@ -1313,8 +1323,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = new ReactPromise("pending", null, null); var chunk$53 = new ReactPromise("pending", null, null);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1322,10 +1332,10 @@ function startReadableStream(response, id, type) { ...@@ -1322,10 +1332,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(response, chunk$52, json); resolveModelChunk(response, chunk$53, json);
}); });
} }
}, },
...@@ -1481,8 +1491,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1481,8 +1491,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1670,6 +1680,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1670,6 +1680,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -1701,6 +1712,7 @@ function createFromJSONCallback(response) { ...@@ -1701,6 +1712,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function createResponseFromOptions(options) { function createResponseFromOptions(options) {
......
...@@ -444,6 +444,11 @@ ...@@ -444,6 +444,11 @@
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
function resolveToJSON(key, value) { function resolveToJSON(key, value) {
"__proto__" === key &&
console.error(
"Expected not to serialize an object with own property `__proto__`. When parsed this property will be omitted.%s",
describeObjectForErrorMessage(this, key)
);
var originalValue = this[key]; var originalValue = this[key];
"object" !== typeof originalValue || "object" !== typeof originalValue ||
originalValue === value || originalValue === value ||
...@@ -688,17 +693,20 @@ ...@@ -688,17 +693,20 @@
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -1964,10 +1972,17 @@ ...@@ -1964,10 +1972,17 @@
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -2118,7 +2133,7 @@ ...@@ -2118,7 +2133,7 @@
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && "" === key &&
null === handler.value && null === handler.value &&
(handler.value = resolvedValue); (handler.value = resolvedValue);
...@@ -2320,6 +2335,7 @@ ...@@ -2320,6 +2335,7 @@
Object.setPrototypeOf(parentObject, model.prototype); Object.setPrototypeOf(parentObject, model.prototype);
} }
function defineLazyGetter(response, chunk, parentObject, key) { function defineLazyGetter(response, chunk, parentObject, key) {
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
"resolved_model" === chunk.status && initializeModelChunk(chunk); "resolved_model" === chunk.status && initializeModelChunk(chunk);
...@@ -2518,6 +2534,7 @@ ...@@ -2518,6 +2534,7 @@
? ref.value ? ref.value
: defineLazyGetter(response, ref, parentObject, key); : defineLazyGetter(response, ref, parentObject, key);
} }
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects."; return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects.";
...@@ -3979,6 +3996,7 @@ ...@@ -3979,6 +3996,7 @@
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -4055,6 +4073,7 @@ ...@@ -4055,6 +4073,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -454,17 +454,20 @@ function processReply( ...@@ -454,17 +454,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -1000,10 +1003,17 @@ function fulfillReference(reference, value) { ...@@ -1000,10 +1003,17 @@ function fulfillReference(reference, value) {
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1129,7 +1139,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -1129,7 +1139,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1502,8 +1512,8 @@ function startReadableStream(response, id, type) { ...@@ -1502,8 +1512,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = new ReactPromise("pending", null, null); var chunk$53 = new ReactPromise("pending", null, null);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1511,10 +1521,10 @@ function startReadableStream(response, id, type) { ...@@ -1511,10 +1521,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(response, chunk$52, json); resolveModelChunk(response, chunk$53, json);
}); });
} }
}, },
...@@ -1670,8 +1680,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1670,8 +1680,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1859,6 +1869,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1859,6 +1869,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -1890,6 +1901,7 @@ function createFromJSONCallback(response) { ...@@ -1890,6 +1901,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -444,6 +444,11 @@ ...@@ -444,6 +444,11 @@
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
function resolveToJSON(key, value) { function resolveToJSON(key, value) {
"__proto__" === key &&
console.error(
"Expected not to serialize an object with own property `__proto__`. When parsed this property will be omitted.%s",
describeObjectForErrorMessage(this, key)
);
var originalValue = this[key]; var originalValue = this[key];
"object" !== typeof originalValue || "object" !== typeof originalValue ||
originalValue === value || originalValue === value ||
...@@ -688,17 +693,20 @@ ...@@ -688,17 +693,20 @@
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -1964,10 +1972,17 @@ ...@@ -1964,10 +1972,17 @@
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -2118,7 +2133,7 @@ ...@@ -2118,7 +2133,7 @@
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && "" === key &&
null === handler.value && null === handler.value &&
(handler.value = resolvedValue); (handler.value = resolvedValue);
...@@ -2320,6 +2335,7 @@ ...@@ -2320,6 +2335,7 @@
Object.setPrototypeOf(parentObject, model.prototype); Object.setPrototypeOf(parentObject, model.prototype);
} }
function defineLazyGetter(response, chunk, parentObject, key) { function defineLazyGetter(response, chunk, parentObject, key) {
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
"resolved_model" === chunk.status && initializeModelChunk(chunk); "resolved_model" === chunk.status && initializeModelChunk(chunk);
...@@ -2518,6 +2534,7 @@ ...@@ -2518,6 +2534,7 @@
? ref.value ? ref.value
: defineLazyGetter(response, ref, parentObject, key); : defineLazyGetter(response, ref, parentObject, key);
} }
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects."; return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects.";
...@@ -4078,6 +4095,7 @@ ...@@ -4078,6 +4095,7 @@
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -4154,6 +4172,7 @@ ...@@ -4154,6 +4172,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function close(weakResponse) { function close(weakResponse) {
......
...@@ -455,17 +455,20 @@ function processReply( ...@@ -455,17 +455,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -1001,10 +1004,17 @@ function fulfillReference(reference, value) { ...@@ -1001,10 +1004,17 @@ function fulfillReference(reference, value) {
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1130,7 +1140,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -1130,7 +1140,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1506,8 +1516,8 @@ function startReadableStream(response, id, type) { ...@@ -1506,8 +1516,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = new ReactPromise("pending", null, null); var chunk$53 = new ReactPromise("pending", null, null);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1515,10 +1525,10 @@ function startReadableStream(response, id, type) { ...@@ -1515,10 +1525,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(response, chunk$52, json); resolveModelChunk(response, chunk$53, json);
}); });
} }
}, },
...@@ -1674,8 +1684,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1674,8 +1684,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1943,6 +1953,7 @@ function processBinaryChunk(weakResponse, streamState, chunk) { ...@@ -1943,6 +1953,7 @@ function processBinaryChunk(weakResponse, streamState, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -1974,6 +1985,7 @@ function createFromJSONCallback(response) { ...@@ -1974,6 +1985,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function close(weakResponse) { function close(weakResponse) {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"neo-async": "^2.6.1" "neo-async": "^2.6.1"
}, },
"peerDependencies": { "peerDependencies": {
"react": "0.0.0-experimental-abb88194-20251211", "react": "0.0.0-experimental-7072301b-20260123",
"react-dom": "0.0.0-experimental-abb88194-20251211" "react-dom": "0.0.0-experimental-7072301b-20260123"
} }
} }
\ No newline at end of file
...@@ -417,6 +417,11 @@ ...@@ -417,6 +417,11 @@
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
function resolveToJSON(key, value) { function resolveToJSON(key, value) {
"__proto__" === key &&
console.error(
"Expected not to serialize an object with own property `__proto__`. When parsed this property will be omitted.%s",
describeObjectForErrorMessage(this, key)
);
var originalValue = this[key]; var originalValue = this[key];
"object" !== typeof originalValue || "object" !== typeof originalValue ||
originalValue === value || originalValue === value ||
...@@ -661,17 +666,20 @@ ...@@ -661,17 +666,20 @@
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -1296,10 +1304,17 @@ ...@@ -1296,10 +1304,17 @@
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1444,7 +1459,7 @@ ...@@ -1444,7 +1459,7 @@
metaData.id, metaData.id,
metaData.bound metaData.bound
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && "" === key &&
null === handler.value && null === handler.value &&
(handler.value = resolvedValue); (handler.value = resolvedValue);
...@@ -1643,6 +1658,7 @@ ...@@ -1643,6 +1658,7 @@
Object.setPrototypeOf(parentObject, model.prototype); Object.setPrototypeOf(parentObject, model.prototype);
} }
function defineLazyGetter(response, chunk, parentObject, key) { function defineLazyGetter(response, chunk, parentObject, key) {
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
"resolved_model" === chunk.status && initializeModelChunk(chunk); "resolved_model" === chunk.status && initializeModelChunk(chunk);
...@@ -1834,6 +1850,7 @@ ...@@ -1834,6 +1850,7 @@
? ref.value ? ref.value
: defineLazyGetter(response, ref, parentObject, key); : defineLazyGetter(response, ref, parentObject, key);
} }
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects."; return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects.";
...@@ -2791,6 +2808,7 @@ ...@@ -2791,6 +2808,7 @@
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -2867,6 +2885,7 @@ ...@@ -2867,6 +2885,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function close(weakResponse) { function close(weakResponse) {
...@@ -3226,10 +3245,10 @@ ...@@ -3226,10 +3245,10 @@
return hook.checkDCE ? !0 : !1; return hook.checkDCE ? !0 : !1;
})({ })({
bundleType: 1, bundleType: 1,
version: "19.2.0-canary-abb88194-20251211", version: "19.2.0-canary-7072301b-20260123",
rendererPackageName: "react-server-dom-turbopack", rendererPackageName: "react-server-dom-turbopack",
currentDispatcherRef: ReactSharedInternals, currentDispatcherRef: ReactSharedInternals,
reconcilerVersion: "19.2.0-canary-abb88194-20251211", reconcilerVersion: "19.2.0-canary-7072301b-20260123",
getCurrentComponentInfo: function () { getCurrentComponentInfo: function () {
return currentOwnerInDEV; return currentOwnerInDEV;
} }
......
...@@ -432,17 +432,20 @@ function processReply( ...@@ -432,17 +432,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -826,10 +829,17 @@ function fulfillReference(reference, value) { ...@@ -826,10 +829,17 @@ function fulfillReference(reference, value) {
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -941,7 +951,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -941,7 +951,7 @@ function loadServerReference(response, metaData, parentObject, key) {
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs); resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
} }
registerBoundServerReference(resolvedValue, metaData.id, metaData.bound); registerBoundServerReference(resolvedValue, metaData.id, metaData.bound);
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1309,8 +1319,8 @@ function startReadableStream(response, id, type) { ...@@ -1309,8 +1319,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = new ReactPromise("pending", null, null); var chunk$53 = new ReactPromise("pending", null, null);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1318,10 +1328,10 @@ function startReadableStream(response, id, type) { ...@@ -1318,10 +1328,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(response, chunk$52, json); resolveModelChunk(response, chunk$53, json);
}); });
} }
}, },
...@@ -1477,8 +1487,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1477,8 +1487,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1655,6 +1665,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1655,6 +1665,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -1686,6 +1697,7 @@ function createFromJSONCallback(response) { ...@@ -1686,6 +1697,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function createResponseFromOptions(options) { function createResponseFromOptions(options) {
......
...@@ -442,6 +442,11 @@ ...@@ -442,6 +442,11 @@
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
function resolveToJSON(key, value) { function resolveToJSON(key, value) {
"__proto__" === key &&
console.error(
"Expected not to serialize an object with own property `__proto__`. When parsed this property will be omitted.%s",
describeObjectForErrorMessage(this, key)
);
var originalValue = this[key]; var originalValue = this[key];
"object" !== typeof originalValue || "object" !== typeof originalValue ||
originalValue === value || originalValue === value ||
...@@ -686,17 +691,20 @@ ...@@ -686,17 +691,20 @@
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -1508,10 +1516,17 @@ ...@@ -1508,10 +1516,17 @@
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1662,7 +1677,7 @@ ...@@ -1662,7 +1677,7 @@
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && "" === key &&
null === handler.value && null === handler.value &&
(handler.value = resolvedValue); (handler.value = resolvedValue);
...@@ -1861,6 +1876,7 @@ ...@@ -1861,6 +1876,7 @@
Object.setPrototypeOf(parentObject, model.prototype); Object.setPrototypeOf(parentObject, model.prototype);
} }
function defineLazyGetter(response, chunk, parentObject, key) { function defineLazyGetter(response, chunk, parentObject, key) {
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
"resolved_model" === chunk.status && initializeModelChunk(chunk); "resolved_model" === chunk.status && initializeModelChunk(chunk);
...@@ -2052,6 +2068,7 @@ ...@@ -2052,6 +2068,7 @@
? ref.value ? ref.value
: defineLazyGetter(response, ref, parentObject, key); : defineLazyGetter(response, ref, parentObject, key);
} }
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects."; return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects.";
...@@ -2915,6 +2932,7 @@ ...@@ -2915,6 +2932,7 @@
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -2991,6 +3009,7 @@ ...@@ -2991,6 +3009,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -453,17 +453,20 @@ function processReply( ...@@ -453,17 +453,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -996,10 +999,17 @@ function fulfillReference(reference, value) { ...@@ -996,10 +999,17 @@ function fulfillReference(reference, value) {
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1125,7 +1135,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -1125,7 +1135,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1498,8 +1508,8 @@ function startReadableStream(response, id, type) { ...@@ -1498,8 +1508,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = new ReactPromise("pending", null, null); var chunk$53 = new ReactPromise("pending", null, null);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1507,10 +1517,10 @@ function startReadableStream(response, id, type) { ...@@ -1507,10 +1517,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(response, chunk$52, json); resolveModelChunk(response, chunk$53, json);
}); });
} }
}, },
...@@ -1666,8 +1676,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1666,8 +1676,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1844,6 +1854,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1844,6 +1854,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -1875,6 +1886,7 @@ function createFromJSONCallback(response) { ...@@ -1875,6 +1886,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -442,6 +442,11 @@ ...@@ -442,6 +442,11 @@
return "$" + (iterable ? "x" : "X") + streamId.toString(16); return "$" + (iterable ? "x" : "X") + streamId.toString(16);
} }
function resolveToJSON(key, value) { function resolveToJSON(key, value) {
"__proto__" === key &&
console.error(
"Expected not to serialize an object with own property `__proto__`. When parsed this property will be omitted.%s",
describeObjectForErrorMessage(this, key)
);
var originalValue = this[key]; var originalValue = this[key];
"object" !== typeof originalValue || "object" !== typeof originalValue ||
originalValue === value || originalValue === value ||
...@@ -686,17 +691,20 @@ ...@@ -686,17 +691,20 @@
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -1508,10 +1516,17 @@ ...@@ -1508,10 +1516,17 @@
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1662,7 +1677,7 @@ ...@@ -1662,7 +1677,7 @@
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && "" === key &&
null === handler.value && null === handler.value &&
(handler.value = resolvedValue); (handler.value = resolvedValue);
...@@ -1861,6 +1876,7 @@ ...@@ -1861,6 +1876,7 @@
Object.setPrototypeOf(parentObject, model.prototype); Object.setPrototypeOf(parentObject, model.prototype);
} }
function defineLazyGetter(response, chunk, parentObject, key) { function defineLazyGetter(response, chunk, parentObject, key) {
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
"resolved_model" === chunk.status && initializeModelChunk(chunk); "resolved_model" === chunk.status && initializeModelChunk(chunk);
...@@ -2052,6 +2068,7 @@ ...@@ -2052,6 +2068,7 @@
? ref.value ? ref.value
: defineLazyGetter(response, ref, parentObject, key); : defineLazyGetter(response, ref, parentObject, key);
} }
"__proto__" !== key &&
Object.defineProperty(parentObject, key, { Object.defineProperty(parentObject, key, {
get: function () { get: function () {
return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects."; return "This object has been omitted by React in the console log to avoid sending too much data from the server. Try logging smaller or more specific objects.";
...@@ -3014,6 +3031,7 @@ ...@@ -3014,6 +3031,7 @@
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -3090,6 +3108,7 @@ ...@@ -3090,6 +3108,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function close(weakResponse) { function close(weakResponse) {
......
...@@ -454,17 +454,20 @@ function processReply( ...@@ -454,17 +454,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined"; if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) { if ("function" === typeof value) {
parentReference = knownServerReferences.get(value); parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference) if (void 0 !== parentReference) {
return ( key = writtenObjects.get(value);
(key = JSON.stringify( if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound }, { id: parentReference.id, bound: parentReference.bound },
resolveToJSON resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
); );
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if ( if (
void 0 !== temporaryReferences && void 0 !== temporaryReferences &&
-1 === key.indexOf(":") && -1 === key.indexOf(":") &&
...@@ -997,10 +1000,17 @@ function fulfillReference(reference, value) { ...@@ -997,10 +1000,17 @@ function fulfillReference(reference, value) {
} }
} }
} }
value = value[path[i]]; var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
} }
var mappedValue = map(response, value, parentObject, key); var mappedValue = map(response, value, parentObject, key);
parentObject[key] = mappedValue; "__proto__" !== key && (parentObject[key] = mappedValue);
"" === key && null === handler.value && (handler.value = mappedValue); "" === key && null === handler.value && (handler.value = mappedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1126,7 +1136,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -1126,7 +1136,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound, metaData.bound,
response._encodeFormAction response._encodeFormAction
); );
parentObject[key] = resolvedValue; "__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue); "" === key && null === handler.value && (handler.value = resolvedValue);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1502,8 +1512,8 @@ function startReadableStream(response, id, type) { ...@@ -1502,8 +1512,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = new ReactPromise("pending", null, null); var chunk$53 = new ReactPromise("pending", null, null);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1511,10 +1521,10 @@ function startReadableStream(response, id, type) { ...@@ -1511,10 +1521,10 @@ function startReadableStream(response, id, type) {
return controller.error(e); return controller.error(e);
} }
); );
previousBlockedChunk = chunk$52; previousBlockedChunk = chunk$53;
chunk.then(function () { chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null); previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(response, chunk$52, json); resolveModelChunk(response, chunk$53, json);
}); });
} }
}, },
...@@ -1670,8 +1680,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1670,8 +1680,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++) for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength; byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength); byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) { for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$53]; var chunk = buffer[i$54];
byteLength.set(chunk, i); byteLength.set(chunk, i);
i += chunk.byteLength; i += chunk.byteLength;
} }
...@@ -1928,6 +1938,7 @@ function processBinaryChunk(weakResponse, streamState, chunk) { ...@@ -1928,6 +1938,7 @@ function processBinaryChunk(weakResponse, streamState, chunk) {
} }
function createFromJSONCallback(response) { function createFromJSONCallback(response) {
return function (key, value) { return function (key, value) {
if ("__proto__" !== key) {
if ("string" === typeof value) if ("string" === typeof value)
return parseModelString(response, this, key, value); return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) { if ("object" === typeof value && null !== value) {
...@@ -1959,6 +1970,7 @@ function createFromJSONCallback(response) { ...@@ -1959,6 +1970,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function close(weakResponse) { function close(weakResponse) {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"neo-async": "^2.6.1" "neo-async": "^2.6.1"
}, },
"peerDependencies": { "peerDependencies": {
"react": "19.2.0-canary-abb88194-20251211", "react": "19.2.0-canary-7072301b-20260123",
"react-dom": "19.2.0-canary-abb88194-20251211" "react-dom": "19.2.0-canary-7072301b-20260123"
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment