Skip to content

Commit 27692f0

Browse files
committed
Update React from 1df34bdf62 to 20b6f4c0e8
1 parent d7d5117 commit 27692f0

108 files changed

Lines changed: 5810 additions & 2854 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,18 @@
197197
"pretty-bytes": "5.3.0",
198198
"pretty-ms": "7.0.0",
199199
"random-seed": "0.3.0",
200-
"react": "19.0.0-rc-1df34bdf62-20240605",
200+
"react": "19.0.0-rc-20b6f4c0e8-20240607",
201201
"react-17": "npm:react@17.0.2",
202-
"react-builtin": "npm:react@19.0.0-rc-1df34bdf62-20240605",
203-
"react-dom": "19.0.0-rc-1df34bdf62-20240605",
202+
"react-builtin": "npm:react@19.0.0-rc-20b6f4c0e8-20240607",
203+
"react-dom": "19.0.0-rc-20b6f4c0e8-20240607",
204204
"react-dom-17": "npm:react-dom@17.0.2",
205-
"react-dom-builtin": "npm:react-dom@19.0.0-rc-1df34bdf62-20240605",
206-
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-1df34bdf62-20240605",
207-
"react-experimental-builtin": "npm:react@0.0.0-experimental-1df34bdf62-20240605",
208-
"react-server-dom-turbopack": "19.0.0-rc-1df34bdf62-20240605",
209-
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-1df34bdf62-20240605",
210-
"react-server-dom-webpack": "19.0.0-rc-1df34bdf62-20240605",
211-
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-1df34bdf62-20240605",
205+
"react-dom-builtin": "npm:react-dom@19.0.0-rc-20b6f4c0e8-20240607",
206+
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-20b6f4c0e8-20240607",
207+
"react-experimental-builtin": "npm:react@0.0.0-experimental-20b6f4c0e8-20240607",
208+
"react-server-dom-turbopack": "19.0.0-rc-20b6f4c0e8-20240607",
209+
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-20b6f4c0e8-20240607",
210+
"react-server-dom-webpack": "19.0.0-rc-20b6f4c0e8-20240607",
211+
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-20b6f4c0e8-20240607",
212212
"react-ssr-prepass": "1.0.8",
213213
"react-virtualized": "9.22.3",
214214
"relay-compiler": "13.0.2",
@@ -218,8 +218,8 @@
218218
"resolve-from": "5.0.0",
219219
"sass": "1.54.0",
220220
"satori": "0.10.9",
221-
"scheduler-builtin": "npm:scheduler@0.25.0-rc-1df34bdf62-20240605",
222-
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-1df34bdf62-20240605",
221+
"scheduler-builtin": "npm:scheduler@0.25.0-rc-20b6f4c0e8-20240607",
222+
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-20b6f4c0e8-20240607",
223223
"seedrandom": "3.0.5",
224224
"semver": "7.3.7",
225225
"shell-quote": "1.7.3",
@@ -253,10 +253,10 @@
253253
"@babel/traverse": "7.22.5",
254254
"@types/react": "npm:types-react@19.0.0-rc.0",
255255
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
256-
"react": "19.0.0-rc-1df34bdf62-20240605",
257-
"react-dom": "19.0.0-rc-1df34bdf62-20240605",
258-
"react-is": "19.0.0-rc-1df34bdf62-20240605",
259-
"scheduler": "0.25.0-rc-1df34bdf62-20240605"
256+
"react": "19.0.0-rc-20b6f4c0e8-20240607",
257+
"react-dom": "19.0.0-rc-20b6f4c0e8-20240607",
258+
"react-is": "19.0.0-rc-20b6f4c0e8-20240607",
259+
"scheduler": "0.25.0-rc-20b6f4c0e8-20240607"
260260
},
261261
"engines": {
262262
"node": ">=18.17.0",

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js

Lines changed: 75 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -11535,7 +11535,7 @@ var ownerHasKeyUseWarning;
1153511535
var ownerHasFunctionTypeWarning;
1153611536
var ownerHasSymbolTypeWarning;
1153711537

11538-
var warnForMissingKey = function (child, returnFiber) {};
11538+
var warnForMissingKey = function (returnFiber, workInProgress, child) {};
1153911539

1154011540
{
1154111541
didWarnAboutMaps = false;
@@ -11550,7 +11550,7 @@ var warnForMissingKey = function (child, returnFiber) {};
1155011550
ownerHasFunctionTypeWarning = {};
1155111551
ownerHasSymbolTypeWarning = {};
1155211552

11553-
warnForMissingKey = function (child, returnFiber) {
11553+
warnForMissingKey = function (returnFiber, workInProgress, child) {
1155411554
if (child === null || typeof child !== 'object') {
1155511555
return;
1155611556
}
@@ -11609,15 +11609,9 @@ var warnForMissingKey = function (child, returnFiber) {};
1160911609
// Give the component that originally created this child.
1161011610
childOwnerAppendix = " It was passed a child from " + ownerName + ".";
1161111611
}
11612-
} // We create a fake Fiber for the child to log the stack trace from.
11613-
// TODO: Refactor the warnForMissingKey calls to happen after fiber creation
11614-
// so that we can get access to the fiber that will eventually be created.
11615-
// That way the log can show up associated with the right instance in DevTools.
11616-
11612+
}
1161711613

11618-
var fiber = createFiberFromElement(child, returnFiber.mode, 0);
11619-
fiber.return = returnFiber;
11620-
runWithFiberInDEV(fiber, function () {
11614+
runWithFiberInDEV(workInProgress, function () {
1162111615
error('Each child in a list should have a unique "key" prop.' + '%s%s See https://react.dev/link/warning-keys for more information.', currentComponentErrorInfo, childOwnerAppendix);
1162211616
});
1162311617
};
@@ -12214,7 +12208,7 @@ function createChildReconciler(shouldTrackSideEffects) {
1221412208
*/
1221512209

1221612210

12217-
function warnOnInvalidKey(child, knownKeys, returnFiber) {
12211+
function warnOnInvalidKey(returnFiber, workInProgress, child, knownKeys) {
1221812212
{
1221912213
if (typeof child !== 'object' || child === null) {
1222012214
return knownKeys;
@@ -12223,7 +12217,7 @@ function createChildReconciler(shouldTrackSideEffects) {
1222312217
switch (child.$$typeof) {
1222412218
case REACT_ELEMENT_TYPE:
1222512219
case REACT_PORTAL_TYPE:
12226-
warnForMissingKey(child, returnFiber);
12220+
warnForMissingKey(returnFiber, workInProgress, child);
1222712221
var key = child.key;
1222812222

1222912223
if (typeof key !== 'string') {
@@ -12241,8 +12235,9 @@ function createChildReconciler(shouldTrackSideEffects) {
1224112235
break;
1224212236
}
1224312237

12244-
error('Encountered two children with the same key, `%s`. ' + 'Keys should be unique so that components maintain their identity ' + 'across updates. Non-unique keys may cause children to be ' + 'duplicated and/or omitted — the behavior is unsupported and ' + 'could change in a future version.', key);
12245-
12238+
runWithFiberInDEV(workInProgress, function () {
12239+
error('Encountered two children with the same key, `%s`. ' + 'Keys should be unique so that components maintain their identity ' + 'across updates. Non-unique keys may cause children to be ' + 'duplicated and/or omitted — the behavior is unsupported and ' + 'could change in a future version.', key);
12240+
});
1224612241
break;
1224712242

1224812243
case REACT_LAZY_TYPE:
@@ -12253,7 +12248,7 @@ function createChildReconciler(shouldTrackSideEffects) {
1225312248
resolvedChild = callLazyInitInDEV(child);
1225412249
}
1225512250

12256-
warnOnInvalidKey(resolvedChild, knownKeys, returnFiber);
12251+
warnOnInvalidKey(returnFiber, workInProgress, resolvedChild, knownKeys);
1225712252
break;
1225812253
}
1225912254
}
@@ -12278,16 +12273,7 @@ function createChildReconciler(shouldTrackSideEffects) {
1227812273
// (adding everything to a Map) in for every insert/move.
1227912274
// If you change this code, also update reconcileChildrenIterator() which
1228012275
// uses the same algorithm.
12281-
{
12282-
// First, validate keys.
12283-
var knownKeys = null;
12284-
12285-
for (var i = 0; i < newChildren.length; i++) {
12286-
var child = newChildren[i];
12287-
knownKeys = warnOnInvalidKey(child, knownKeys, returnFiber);
12288-
}
12289-
}
12290-
12276+
var knownKeys = null;
1229112277
var resultingFirstChild = null;
1229212278
var previousNewFiber = null;
1229312279
var oldFiber = currentFirstChild;
@@ -12317,6 +12303,10 @@ function createChildReconciler(shouldTrackSideEffects) {
1231712303
break;
1231812304
}
1231912305

12306+
{
12307+
knownKeys = warnOnInvalidKey(returnFiber, newFiber, newChildren[newIdx], knownKeys);
12308+
}
12309+
1232012310
if (shouldTrackSideEffects) {
1232112311
if (oldFiber && newFiber.alternate === null) {
1232212312
// We matched the slot, but we didn't reuse the existing fiber, so we
@@ -12364,6 +12354,10 @@ function createChildReconciler(shouldTrackSideEffects) {
1236412354
continue;
1236512355
}
1236612356

12357+
{
12358+
knownKeys = warnOnInvalidKey(returnFiber, _newFiber, newChildren[newIdx], knownKeys);
12359+
}
12360+
1236712361
lastPlacedIndex = placeChild(_newFiber, lastPlacedIndex, newIdx);
1236812362

1236912363
if (previousNewFiber === null) {
@@ -12391,6 +12385,10 @@ function createChildReconciler(shouldTrackSideEffects) {
1239112385
var _newFiber2 = updateFromMap(existingChildren, returnFiber, newIdx, newChildren[newIdx], lanes, debugInfo);
1239212386

1239312387
if (_newFiber2 !== null) {
12388+
{
12389+
knownKeys = warnOnInvalidKey(returnFiber, _newFiber2, newChildren[newIdx], knownKeys);
12390+
}
12391+
1239412392
if (shouldTrackSideEffects) {
1239512393
if (_newFiber2.alternate !== null) {
1239612394
// The new fiber is a work in progress, but if there exists a
@@ -12522,11 +12520,7 @@ function createChildReconciler(shouldTrackSideEffects) {
1252212520
var knownKeys = null;
1252312521
var step = newChildren.next();
1252412522

12525-
{
12526-
knownKeys = warnOnInvalidKey(step.value, knownKeys, returnFiber);
12527-
}
12528-
12529-
for (; oldFiber !== null && !step.done; newIdx++, step = newChildren.next(), knownKeys = warnOnInvalidKey(step.value, knownKeys, returnFiber) ) {
12523+
for (; oldFiber !== null && !step.done; newIdx++, step = newChildren.next()) {
1253012524
if (oldFiber.index > newIdx) {
1253112525
nextOldFiber = oldFiber;
1253212526
oldFiber = null;
@@ -12548,6 +12542,10 @@ function createChildReconciler(shouldTrackSideEffects) {
1254812542
break;
1254912543
}
1255012544

12545+
{
12546+
knownKeys = warnOnInvalidKey(returnFiber, newFiber, step.value, knownKeys);
12547+
}
12548+
1255112549
if (shouldTrackSideEffects) {
1255212550
if (oldFiber && newFiber.alternate === null) {
1255312551
// We matched the slot, but we didn't reuse the existing fiber, so we
@@ -12588,13 +12586,17 @@ function createChildReconciler(shouldTrackSideEffects) {
1258812586
if (oldFiber === null) {
1258912587
// If we don't have any more existing children we can choose a fast path
1259012588
// since the rest will all be insertions.
12591-
for (; !step.done; newIdx++, step = newChildren.next(), knownKeys = warnOnInvalidKey(step.value, knownKeys, returnFiber) ) {
12589+
for (; !step.done; newIdx++, step = newChildren.next()) {
1259212590
var _newFiber3 = createChild(returnFiber, step.value, lanes, debugInfo);
1259312591

1259412592
if (_newFiber3 === null) {
1259512593
continue;
1259612594
}
1259712595

12596+
{
12597+
knownKeys = warnOnInvalidKey(returnFiber, _newFiber3, step.value, knownKeys);
12598+
}
12599+
1259812600
lastPlacedIndex = placeChild(_newFiber3, lastPlacedIndex, newIdx);
1259912601

1260012602
if (previousNewFiber === null) {
@@ -12618,10 +12620,14 @@ function createChildReconciler(shouldTrackSideEffects) {
1261812620

1261912621
var existingChildren = mapRemainingChildren(oldFiber); // Keep scanning and use the map to restore deleted items as moves.
1262012622

12621-
for (; !step.done; newIdx++, step = newChildren.next(), knownKeys = warnOnInvalidKey(step.value, knownKeys, returnFiber) ) {
12623+
for (; !step.done; newIdx++, step = newChildren.next()) {
1262212624
var _newFiber4 = updateFromMap(existingChildren, returnFiber, newIdx, step.value, lanes, debugInfo);
1262312625

1262412626
if (_newFiber4 !== null) {
12627+
{
12628+
knownKeys = warnOnInvalidKey(returnFiber, _newFiber4, step.value, knownKeys);
12629+
}
12630+
1262512631
if (shouldTrackSideEffects) {
1262612632
if (_newFiber4.alternate !== null) {
1262712633
// The new fiber is a work in progress, but if there exists a
@@ -35848,8 +35854,25 @@ function getResource(type, currentProps, pendingProps, currentResource) {
3584835854

3584935855
_styles.set(_key, _resource);
3585035856

35857+
var instance = ownerDocument.querySelector(getStylesheetSelectorFromKey(_key));
35858+
35859+
if (instance) {
35860+
var loadingState = instance._p;
35861+
35862+
if (loadingState) ; else {
35863+
// This instance is already loaded
35864+
_resource.instance = instance;
35865+
_resource.state.loading = Loaded | Inserted;
35866+
}
35867+
}
35868+
3585135869
if (!preloadPropsMap.has(_key)) {
35852-
preloadStylesheet(ownerDocument, _key, preloadPropsFromStylesheet(qualifiedProps), _resource.state);
35870+
var preloadProps = preloadPropsFromStylesheet(qualifiedProps);
35871+
preloadPropsMap.set(_key, preloadProps);
35872+
35873+
if (!instance) {
35874+
preloadStylesheet(ownerDocument, _key, preloadProps, _resource.state);
35875+
}
3585335876
}
3585435877
}
3585535878

@@ -35996,31 +36019,24 @@ function stylesheetPropsFromRawProps(rawProps) {
3599636019
}
3599736020

3599836021
function preloadStylesheet(ownerDocument, key, preloadProps, state) {
35999-
preloadPropsMap.set(key, preloadProps);
36000-
36001-
if (!ownerDocument.querySelector(getStylesheetSelectorFromKey(key))) {
36002-
// There is no matching stylesheet instance in the Document.
36003-
// We will insert a preload now to kick off loading because
36004-
// we expect this stylesheet to commit
36005-
var preloadEl = ownerDocument.querySelector(getPreloadStylesheetSelectorFromKey(key));
36006-
36007-
if (preloadEl) {
36008-
// If we find a preload already it was SSR'd and we won't have an actual
36009-
// loading state to track. For now we will just assume it is loaded
36010-
state.loading = Loaded;
36011-
} else {
36012-
var instance = ownerDocument.createElement('link');
36013-
state.preload = instance;
36014-
instance.addEventListener('load', function () {
36015-
return state.loading |= Loaded;
36016-
});
36017-
instance.addEventListener('error', function () {
36018-
return state.loading |= Errored;
36019-
});
36020-
setInitialProperties(instance, 'link', preloadProps);
36021-
markNodeAsHoistable(instance);
36022-
ownerDocument.head.appendChild(instance);
36023-
}
36022+
var preloadEl = ownerDocument.querySelector(getPreloadStylesheetSelectorFromKey(key));
36023+
36024+
if (preloadEl) {
36025+
// If we find a preload already it was SSR'd and we won't have an actual
36026+
// loading state to track. For now we will just assume it is loaded
36027+
state.loading = Loaded;
36028+
} else {
36029+
var instance = ownerDocument.createElement('link');
36030+
state.preload = instance;
36031+
instance.addEventListener('load', function () {
36032+
return state.loading |= Loaded;
36033+
});
36034+
instance.addEventListener('error', function () {
36035+
return state.loading |= Errored;
36036+
});
36037+
setInitialProperties(instance, 'link', preloadProps);
36038+
markNodeAsHoistable(instance);
36039+
ownerDocument.head.appendChild(instance);
3602436040
}
3602536041
}
3602636042

@@ -36888,7 +36904,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
3688836904
return root;
3688936905
}
3689036906

36891-
var ReactVersion = '19.0.0-experimental-1df34bdf62-20240605';
36907+
var ReactVersion = '19.0.0-experimental-20b6f4c0e8-20240607';
3689236908

3689336909
// Might add PROFILE later.
3689436910

0 commit comments

Comments
 (0)