Sync DoS mitigations for React Flight

parent fc3b7c50
...@@ -433,6 +433,11 @@ ...@@ -433,6 +433,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 ||
...@@ -677,14 +682,17 @@ ...@@ -677,14 +682,17 @@
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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -1146,10 +1154,17 @@ ...@@ -1146,10 +1154,17 @@
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1260,7 +1275,7 @@ ...@@ -1260,7 +1275,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);
...@@ -1534,6 +1549,7 @@ ...@@ -1534,6 +1549,7 @@
} }
case "Y": case "Y":
return ( return (
"__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.";
...@@ -2494,6 +2510,7 @@ ...@@ -2494,6 +2510,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) {
...@@ -2574,11 +2591,17 @@ ...@@ -2574,11 +2591,17 @@
owner: value._owner owner: value._owner
}), }),
(stack.debugStack = value._debugStack), (stack.debugStack = value._debugStack),
supportsCreateTask && (stack.debugTask = value._debugTask), supportsCreateTask &&
(stack.debugTask = value._debugTask),
(key._debugInfo = [stack]), (key._debugInfo = [stack]),
(value = createLazyChunkWrapper(key))) (value = createLazyChunkWrapper(key)))
: 0 < stack.deps && : 0 < stack.deps &&
((key = new ReactPromise("blocked", null, null, response)), ((key = new ReactPromise(
"blocked",
null,
null,
response
)),
(stack.value = value), (stack.value = value),
(stack.chunk = key), (stack.chunk = key),
(value = Object.freeze.bind(Object, value.props)), (value = Object.freeze.bind(Object, value.props)),
...@@ -2589,6 +2612,7 @@ ...@@ -2589,6 +2612,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function createResponseFromOptions(options) { function createResponseFromOptions(options) {
...@@ -2914,10 +2938,10 @@ ...@@ -2914,10 +2938,10 @@
return hook.checkDCE ? !0 : !1; return hook.checkDCE ? !0 : !1;
})({ })({
bundleType: 1, bundleType: 1,
version: "19.1.0-experimental-7a835f3c-20251211", version: "19.1.0-experimental-ff76fc6a-20260126",
rendererPackageName: "react-server-dom-turbopack", rendererPackageName: "react-server-dom-turbopack",
currentDispatcherRef: ReactSharedInternals, currentDispatcherRef: ReactSharedInternals,
reconcilerVersion: "19.1.0-experimental-7a835f3c-20251211", reconcilerVersion: "19.1.0-experimental-ff76fc6a-20260126",
getCurrentComponentInfo: function () { getCurrentComponentInfo: function () {
return currentOwnerInDEV; return currentOwnerInDEV;
} }
......
...@@ -433,14 +433,17 @@ function processReply( ...@@ -433,14 +433,17 @@ 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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -727,10 +730,17 @@ function waitForReference( ...@@ -727,10 +730,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -812,7 +822,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -812,7 +822,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 &&
...@@ -1129,8 +1139,8 @@ function startReadableStream(response, id, type) { ...@@ -1129,8 +1139,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1138,10 +1148,10 @@ function startReadableStream(response, id, type) { ...@@ -1138,10 +1148,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(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1276,8 +1286,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1276,8 +1286,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;
} }
...@@ -1467,6 +1477,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1467,6 +1477,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) {
...@@ -1503,6 +1514,7 @@ function createFromJSONCallback(response) { ...@@ -1503,6 +1514,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function createResponseFromOptions(options) { function createResponseFromOptions(options) {
......
...@@ -458,6 +458,11 @@ ...@@ -458,6 +458,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 ||
...@@ -702,14 +707,17 @@ ...@@ -702,14 +707,17 @@
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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -1353,10 +1361,17 @@ ...@@ -1353,10 +1361,17 @@
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1474,7 +1489,7 @@ ...@@ -1474,7 +1489,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);
...@@ -1748,6 +1763,7 @@ ...@@ -1748,6 +1763,7 @@
} }
case "Y": case "Y":
return ( return (
"__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.";
...@@ -2713,6 +2729,7 @@ ...@@ -2713,6 +2729,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) {
...@@ -2793,11 +2810,17 @@ ...@@ -2793,11 +2810,17 @@
owner: value._owner owner: value._owner
}), }),
(stack.debugStack = value._debugStack), (stack.debugStack = value._debugStack),
supportsCreateTask && (stack.debugTask = value._debugTask), supportsCreateTask &&
(stack.debugTask = value._debugTask),
(key._debugInfo = [stack]), (key._debugInfo = [stack]),
(value = createLazyChunkWrapper(key))) (value = createLazyChunkWrapper(key)))
: 0 < stack.deps && : 0 < stack.deps &&
((key = new ReactPromise("blocked", null, null, response)), ((key = new ReactPromise(
"blocked",
null,
null,
response
)),
(stack.value = value), (stack.value = value),
(stack.chunk = key), (stack.chunk = key),
(value = Object.freeze.bind(Object, value.props)), (value = Object.freeze.bind(Object, value.props)),
...@@ -2808,6 +2831,7 @@ ...@@ -2808,6 +2831,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -454,14 +454,17 @@ function processReply( ...@@ -454,14 +454,17 @@ 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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -895,10 +898,17 @@ function waitForReference( ...@@ -895,10 +898,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -995,7 +1005,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -995,7 +1005,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 &&
...@@ -1317,8 +1327,8 @@ function startReadableStream(response, id, type) { ...@@ -1317,8 +1327,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1326,10 +1336,10 @@ function startReadableStream(response, id, type) { ...@@ -1326,10 +1336,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(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1464,8 +1474,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1464,8 +1474,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) {
...@@ -1691,6 +1702,7 @@ function createFromJSONCallback(response) { ...@@ -1691,6 +1702,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -458,6 +458,11 @@ ...@@ -458,6 +458,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 ||
...@@ -702,14 +707,17 @@ ...@@ -702,14 +707,17 @@
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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -1353,10 +1361,17 @@ ...@@ -1353,10 +1361,17 @@
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1474,7 +1489,7 @@ ...@@ -1474,7 +1489,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);
...@@ -1748,6 +1763,7 @@ ...@@ -1748,6 +1763,7 @@
} }
case "Y": case "Y":
return ( return (
"__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.";
...@@ -2713,6 +2729,7 @@ ...@@ -2713,6 +2729,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) {
...@@ -2793,11 +2810,17 @@ ...@@ -2793,11 +2810,17 @@
owner: value._owner owner: value._owner
}), }),
(stack.debugStack = value._debugStack), (stack.debugStack = value._debugStack),
supportsCreateTask && (stack.debugTask = value._debugTask), supportsCreateTask &&
(stack.debugTask = value._debugTask),
(key._debugInfo = [stack]), (key._debugInfo = [stack]),
(value = createLazyChunkWrapper(key))) (value = createLazyChunkWrapper(key)))
: 0 < stack.deps && : 0 < stack.deps &&
((key = new ReactPromise("blocked", null, null, response)), ((key = new ReactPromise(
"blocked",
null,
null,
response
)),
(stack.value = value), (stack.value = value),
(stack.chunk = key), (stack.chunk = key),
(value = Object.freeze.bind(Object, value.props)), (value = Object.freeze.bind(Object, value.props)),
...@@ -2808,6 +2831,7 @@ ...@@ -2808,6 +2831,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -455,14 +455,17 @@ function processReply( ...@@ -455,14 +455,17 @@ 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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -896,10 +899,17 @@ function waitForReference( ...@@ -896,10 +899,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -996,7 +1006,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -996,7 +1006,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 &&
...@@ -1318,8 +1328,8 @@ function startReadableStream(response, id, type) { ...@@ -1318,8 +1328,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1327,10 +1337,10 @@ function startReadableStream(response, id, type) { ...@@ -1327,10 +1337,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(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1465,8 +1475,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1465,8 +1475,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;
} }
...@@ -1656,6 +1666,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1656,6 +1666,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) {
...@@ -1692,6 +1703,7 @@ function createFromJSONCallback(response) { ...@@ -1692,6 +1703,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -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-7a835f3c-20251211", "react": "0.0.0-experimental-ff76fc6a-20260126",
"react-dom": "0.0.0-experimental-7a835f3c-20251211" "react-dom": "0.0.0-experimental-ff76fc6a-20260126"
} }
} }
\ No newline at end of file
...@@ -431,6 +431,11 @@ ...@@ -431,6 +431,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 ||
...@@ -675,14 +680,17 @@ ...@@ -675,14 +680,17 @@
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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -1127,10 +1135,17 @@ ...@@ -1127,10 +1135,17 @@
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1241,7 +1256,7 @@ ...@@ -1241,7 +1256,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);
...@@ -1505,6 +1520,7 @@ ...@@ -1505,6 +1520,7 @@
} }
case "Y": case "Y":
return ( return (
"__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.";
...@@ -2270,6 +2286,7 @@ ...@@ -2270,6 +2286,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) {
...@@ -2355,11 +2372,17 @@ ...@@ -2355,11 +2372,17 @@
owner: value._owner owner: value._owner
}), }),
(stack.debugStack = value._debugStack), (stack.debugStack = value._debugStack),
supportsCreateTask && (stack.debugTask = value._debugTask), supportsCreateTask &&
(stack.debugTask = value._debugTask),
(key._debugInfo = [stack]), (key._debugInfo = [stack]),
(value = createLazyChunkWrapper(key))) (value = createLazyChunkWrapper(key)))
: 0 < stack.deps && : 0 < stack.deps &&
((key = new ReactPromise("blocked", null, null, response)), ((key = new ReactPromise(
"blocked",
null,
null,
response
)),
(stack.value = value), (stack.value = value),
(stack.chunk = key), (stack.chunk = key),
(value = Object.freeze.bind(Object, value.props)), (value = Object.freeze.bind(Object, value.props)),
...@@ -2370,6 +2393,7 @@ ...@@ -2370,6 +2393,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function createResponseFromOptions(options) { function createResponseFromOptions(options) {
...@@ -2665,10 +2689,10 @@ ...@@ -2665,10 +2689,10 @@
return hook.checkDCE ? !0 : !1; return hook.checkDCE ? !0 : !1;
})({ })({
bundleType: 1, bundleType: 1,
version: "19.1.0-canary-7a835f3c-20251211", version: "19.1.0-canary-ff76fc6a-20260126",
rendererPackageName: "react-server-dom-turbopack", rendererPackageName: "react-server-dom-turbopack",
currentDispatcherRef: ReactSharedInternals, currentDispatcherRef: ReactSharedInternals,
reconcilerVersion: "19.1.0-canary-7a835f3c-20251211", reconcilerVersion: "19.1.0-canary-ff76fc6a-20260126",
getCurrentComponentInfo: function () { getCurrentComponentInfo: function () {
return currentOwnerInDEV; return currentOwnerInDEV;
} }
......
...@@ -432,14 +432,17 @@ function processReply( ...@@ -432,14 +432,17 @@ 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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -723,10 +726,17 @@ function waitForReference( ...@@ -723,10 +726,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -808,7 +818,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -808,7 +818,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 &&
...@@ -1125,8 +1135,8 @@ function startReadableStream(response, id, type) { ...@@ -1125,8 +1135,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1134,10 +1144,10 @@ function startReadableStream(response, id, type) { ...@@ -1134,10 +1144,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(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1272,8 +1282,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1272,8 +1282,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;
} }
...@@ -1452,6 +1462,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1452,6 +1462,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) {
...@@ -1488,6 +1499,7 @@ function createFromJSONCallback(response) { ...@@ -1488,6 +1499,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function createResponseFromOptions(options) { function createResponseFromOptions(options) {
......
...@@ -456,6 +456,11 @@ ...@@ -456,6 +456,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 ||
...@@ -700,14 +705,17 @@ ...@@ -700,14 +705,17 @@
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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -1334,10 +1342,17 @@ ...@@ -1334,10 +1342,17 @@
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1455,7 +1470,7 @@ ...@@ -1455,7 +1470,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);
...@@ -1719,6 +1734,7 @@ ...@@ -1719,6 +1734,7 @@
} }
case "Y": case "Y":
return ( return (
"__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.";
...@@ -2489,6 +2505,7 @@ ...@@ -2489,6 +2505,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) {
...@@ -2574,11 +2591,17 @@ ...@@ -2574,11 +2591,17 @@
owner: value._owner owner: value._owner
}), }),
(stack.debugStack = value._debugStack), (stack.debugStack = value._debugStack),
supportsCreateTask && (stack.debugTask = value._debugTask), supportsCreateTask &&
(stack.debugTask = value._debugTask),
(key._debugInfo = [stack]), (key._debugInfo = [stack]),
(value = createLazyChunkWrapper(key))) (value = createLazyChunkWrapper(key)))
: 0 < stack.deps && : 0 < stack.deps &&
((key = new ReactPromise("blocked", null, null, response)), ((key = new ReactPromise(
"blocked",
null,
null,
response
)),
(stack.value = value), (stack.value = value),
(stack.chunk = key), (stack.chunk = key),
(value = Object.freeze.bind(Object, value.props)), (value = Object.freeze.bind(Object, value.props)),
...@@ -2589,6 +2612,7 @@ ...@@ -2589,6 +2612,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -453,14 +453,17 @@ function processReply( ...@@ -453,14 +453,17 @@ 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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -891,10 +894,17 @@ function waitForReference( ...@@ -891,10 +894,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -991,7 +1001,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -991,7 +1001,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 &&
...@@ -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 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
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(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1460,8 +1470,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1460,8 +1470,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;
} }
...@@ -1640,6 +1650,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1640,6 +1650,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) {
...@@ -1676,6 +1687,7 @@ function createFromJSONCallback(response) { ...@@ -1676,6 +1687,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -456,6 +456,11 @@ ...@@ -456,6 +456,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 ||
...@@ -700,14 +705,17 @@ ...@@ -700,14 +705,17 @@
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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -1334,10 +1342,17 @@ ...@@ -1334,10 +1342,17 @@
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -1455,7 +1470,7 @@ ...@@ -1455,7 +1470,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);
...@@ -1719,6 +1734,7 @@ ...@@ -1719,6 +1734,7 @@
} }
case "Y": case "Y":
return ( return (
"__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.";
...@@ -2489,6 +2505,7 @@ ...@@ -2489,6 +2505,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) {
...@@ -2574,11 +2591,17 @@ ...@@ -2574,11 +2591,17 @@
owner: value._owner owner: value._owner
}), }),
(stack.debugStack = value._debugStack), (stack.debugStack = value._debugStack),
supportsCreateTask && (stack.debugTask = value._debugTask), supportsCreateTask &&
(stack.debugTask = value._debugTask),
(key._debugInfo = [stack]), (key._debugInfo = [stack]),
(value = createLazyChunkWrapper(key))) (value = createLazyChunkWrapper(key)))
: 0 < stack.deps && : 0 < stack.deps &&
((key = new ReactPromise("blocked", null, null, response)), ((key = new ReactPromise(
"blocked",
null,
null,
response
)),
(stack.value = value), (stack.value = value),
(stack.chunk = key), (stack.chunk = key),
(value = Object.freeze.bind(Object, value.props)), (value = Object.freeze.bind(Object, value.props)),
...@@ -2589,6 +2612,7 @@ ...@@ -2589,6 +2612,7 @@
return value; return value;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -454,14 +454,17 @@ function processReply( ...@@ -454,14 +454,17 @@ 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(parentReference, resolveToJSON)), if (void 0 !== key) return key;
null === formData && (formData = new FormData()), key = JSON.stringify(parentReference, resolveToJSON);
(parentReference = nextPartId++), null === formData && (formData = new FormData());
formData.set(formFieldPrefix + parentReference, key), parentReference = nextPartId++;
"$h" + parentReference.toString(16) 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(":") &&
...@@ -892,10 +895,17 @@ function waitForReference( ...@@ -892,10 +895,17 @@ function waitForReference(
value.then(fulfill, reject); value.then(fulfill, reject);
return; return;
} }
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.");
} }
i = map(response, value, parentObject, key); i = map(response, value, parentObject, key);
parentObject[key] = i; "__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i); "" === key && null === handler.value && (handler.value = i);
if ( if (
parentObject[0] === REACT_ELEMENT_TYPE && parentObject[0] === REACT_ELEMENT_TYPE &&
...@@ -992,7 +1002,7 @@ function loadServerReference(response, metaData, parentObject, key) { ...@@ -992,7 +1002,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 &&
...@@ -1314,8 +1324,8 @@ function startReadableStream(response, id, type) { ...@@ -1314,8 +1324,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk)); (previousBlockedChunk = chunk));
} else { } else {
chunk = previousBlockedChunk; chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response); var chunk$53 = createPendingChunk(response);
chunk$52.then( chunk$53.then(
function (v) { function (v) {
return controller.enqueue(v); return controller.enqueue(v);
}, },
...@@ -1323,10 +1333,10 @@ function startReadableStream(response, id, type) { ...@@ -1323,10 +1333,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(chunk$52, json); resolveModelChunk(chunk$53, json);
}); });
} }
}, },
...@@ -1461,8 +1471,8 @@ function mergeBuffer(buffer, lastChunk) { ...@@ -1461,8 +1471,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;
} }
...@@ -1641,6 +1651,7 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) { ...@@ -1641,6 +1651,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) {
...@@ -1677,6 +1688,7 @@ function createFromJSONCallback(response) { ...@@ -1677,6 +1688,7 @@ function createFromJSONCallback(response) {
return key; return key;
} }
return value; return value;
}
}; };
} }
function noServerCall() { function noServerCall() {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"neo-async": "^2.6.1" "neo-async": "^2.6.1"
}, },
"peerDependencies": { "peerDependencies": {
"react": "19.1.0-canary-7a835f3c-20251211", "react": "19.1.0-canary-ff76fc6a-20260126",
"react-dom": "19.1.0-canary-7a835f3c-20251211" "react-dom": "19.1.0-canary-ff76fc6a-20260126"
} }
} }
\ 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