Skip to content

Commit e01d52a

Browse files
authored
Update React from 1df34bdf62 to 6230622a1a (#66726)
<details> <summary>React upstream changes</summary> - facebook/react#29835 </details>
1 parent 7b97f30 commit e01d52a

File tree

59 files changed

+740
-655
lines changed

Some content is hidden

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

59 files changed

+740
-655
lines changed

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-6230622a1a-20240610",
201201
"react-17": "npm:[email protected]",
202-
"react-builtin": "npm:[email protected]1df34bdf62-20240605",
203-
"react-dom": "19.0.0-rc-1df34bdf62-20240605",
202+
"react-builtin": "npm:[email protected]6230622a1a-20240610",
203+
"react-dom": "19.0.0-rc-6230622a1a-20240610",
204204
"react-dom-17": "npm:[email protected]",
205-
"react-dom-builtin": "npm:[email protected]1df34bdf62-20240605",
206-
"react-dom-experimental-builtin": "npm:[email protected]1df34bdf62-20240605",
207-
"react-experimental-builtin": "npm:[email protected]1df34bdf62-20240605",
208-
"react-server-dom-turbopack": "19.0.0-rc-1df34bdf62-20240605",
209-
"react-server-dom-turbopack-experimental": "npm:[email protected]1df34bdf62-20240605",
210-
"react-server-dom-webpack": "19.0.0-rc-1df34bdf62-20240605",
211-
"react-server-dom-webpack-experimental": "npm:[email protected]1df34bdf62-20240605",
205+
"react-dom-builtin": "npm:[email protected]6230622a1a-20240610",
206+
"react-dom-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
207+
"react-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
208+
"react-server-dom-turbopack": "19.0.0-rc-6230622a1a-20240610",
209+
"react-server-dom-turbopack-experimental": "npm:[email protected]6230622a1a-20240610",
210+
"react-server-dom-webpack": "19.0.0-rc-6230622a1a-20240610",
211+
"react-server-dom-webpack-experimental": "npm:[email protected]6230622a1a-20240610",
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:[email protected]1df34bdf62-20240605",
222-
"scheduler-experimental-builtin": "npm:[email protected]1df34bdf62-20240605",
221+
"scheduler-builtin": "npm:[email protected]6230622a1a-20240610",
222+
"scheduler-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
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:[email protected]",
255255
"@types/react-dom": "npm:[email protected]",
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-6230622a1a-20240610",
257+
"react-dom": "19.0.0-rc-6230622a1a-20240610",
258+
"react-is": "19.0.0-rc-6230622a1a-20240610",
259+
"scheduler": "0.25.0-rc-6230622a1a-20240610"
260260
},
261261
"engines": {
262262
"node": ">=18.17.0",

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

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35848,8 +35848,25 @@ function getResource(type, currentProps, pendingProps, currentResource) {
3584835848

3584935849
_styles.set(_key, _resource);
3585035850

35851+
var instance = ownerDocument.querySelector(getStylesheetSelectorFromKey(_key));
35852+
35853+
if (instance) {
35854+
var loadingState = instance._p;
35855+
35856+
if (loadingState) ; else {
35857+
// This instance is already loaded
35858+
_resource.instance = instance;
35859+
_resource.state.loading = Loaded | Inserted;
35860+
}
35861+
}
35862+
3585135863
if (!preloadPropsMap.has(_key)) {
35852-
preloadStylesheet(ownerDocument, _key, preloadPropsFromStylesheet(qualifiedProps), _resource.state);
35864+
var preloadProps = preloadPropsFromStylesheet(qualifiedProps);
35865+
preloadPropsMap.set(_key, preloadProps);
35866+
35867+
if (!instance) {
35868+
preloadStylesheet(ownerDocument, _key, preloadProps, _resource.state);
35869+
}
3585335870
}
3585435871
}
3585535872

@@ -35996,31 +36013,24 @@ function stylesheetPropsFromRawProps(rawProps) {
3599636013
}
3599736014

3599836015
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-
}
36016+
var preloadEl = ownerDocument.querySelector(getPreloadStylesheetSelectorFromKey(key));
36017+
36018+
if (preloadEl) {
36019+
// If we find a preload already it was SSR'd and we won't have an actual
36020+
// loading state to track. For now we will just assume it is loaded
36021+
state.loading = Loaded;
36022+
} else {
36023+
var instance = ownerDocument.createElement('link');
36024+
state.preload = instance;
36025+
instance.addEventListener('load', function () {
36026+
return state.loading |= Loaded;
36027+
});
36028+
instance.addEventListener('error', function () {
36029+
return state.loading |= Errored;
36030+
});
36031+
setInitialProperties(instance, 'link', preloadProps);
36032+
markNodeAsHoistable(instance);
36033+
ownerDocument.head.appendChild(instance);
3602436034
}
3602536035
}
3602636036

@@ -36888,7 +36898,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
3688836898
return root;
3688936899
}
3689036900

36891-
var ReactVersion = '19.0.0-experimental-1df34bdf62-20240605';
36901+
var ReactVersion = '19.0.0-experimental-6230622a1a-20240610';
3689236902

3689336903
// Might add PROFILE later.
3689436904

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

Lines changed: 56 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13569,20 +13569,20 @@ function getResource(type, currentProps, pendingProps, currentResource) {
1356913569
case "style":
1357013570
return "string" === typeof pendingProps.precedence &&
1357113571
"string" === typeof pendingProps.href
13572-
? ((pendingProps = getStyleKey(pendingProps.href)),
13573-
(JSCompiler_inline_result = getResourcesFromRoot(
13572+
? ((currentProps = getStyleKey(pendingProps.href)),
13573+
(pendingProps = getResourcesFromRoot(
1357413574
JSCompiler_inline_result
1357513575
).hoistableStyles),
13576-
(currentProps = JSCompiler_inline_result.get(pendingProps)),
13577-
currentProps ||
13578-
((currentProps = {
13576+
(currentResource = pendingProps.get(currentProps)),
13577+
currentResource ||
13578+
((currentResource = {
1357913579
type: "style",
1358013580
instance: null,
1358113581
count: 0,
1358213582
state: null
1358313583
}),
13584-
JSCompiler_inline_result.set(pendingProps, currentProps)),
13585-
currentProps)
13584+
pendingProps.set(currentProps, currentResource)),
13585+
currentResource)
1358613586
: { type: "void", instance: null, count: 0, state: null };
1358713587
case "link":
1358813588
if (
@@ -13605,22 +13605,31 @@ function getResource(type, currentProps, pendingProps, currentResource) {
1360513605
state: { loading: 0, preload: null }
1360613606
}),
1360713607
styles$231.set(type, resource$232),
13608+
(styles$231 = JSCompiler_inline_result.querySelector(
13609+
getStylesheetSelectorFromKey(type)
13610+
)) &&
13611+
!styles$231._p &&
13612+
((resource$232.instance = styles$231),
13613+
(resource$232.state.loading = 5)),
1360813614
preloadPropsMap.has(type) ||
13609-
preloadStylesheet(
13610-
JSCompiler_inline_result,
13611-
type,
13612-
{
13613-
rel: "preload",
13614-
as: "style",
13615-
href: pendingProps.href,
13616-
crossOrigin: pendingProps.crossOrigin,
13617-
integrity: pendingProps.integrity,
13618-
media: pendingProps.media,
13619-
hrefLang: pendingProps.hrefLang,
13620-
referrerPolicy: pendingProps.referrerPolicy
13621-
},
13622-
resource$232.state
13623-
));
13615+
((pendingProps = {
13616+
rel: "preload",
13617+
as: "style",
13618+
href: pendingProps.href,
13619+
crossOrigin: pendingProps.crossOrigin,
13620+
integrity: pendingProps.integrity,
13621+
media: pendingProps.media,
13622+
hrefLang: pendingProps.hrefLang,
13623+
referrerPolicy: pendingProps.referrerPolicy
13624+
}),
13625+
preloadPropsMap.set(type, pendingProps),
13626+
styles$231 ||
13627+
preloadStylesheet(
13628+
JSCompiler_inline_result,
13629+
type,
13630+
pendingProps,
13631+
resource$232.state
13632+
)));
1362413633
if (currentProps && null === currentResource)
1362513634
throw Error(formatProdErrorMessage(528, ""));
1362613635
return resource$232;
@@ -13636,20 +13645,20 @@ function getResource(type, currentProps, pendingProps, currentResource) {
1363613645
currentProps &&
1363713646
"function" !== typeof currentProps &&
1363813647
"symbol" !== typeof currentProps
13639-
? ((pendingProps = getScriptKey(pendingProps)),
13640-
(JSCompiler_inline_result = getResourcesFromRoot(
13648+
? ((currentProps = getScriptKey(pendingProps)),
13649+
(pendingProps = getResourcesFromRoot(
1364113650
JSCompiler_inline_result
1364213651
).hoistableScripts),
13643-
(currentProps = JSCompiler_inline_result.get(pendingProps)),
13644-
currentProps ||
13645-
((currentProps = {
13652+
(currentResource = pendingProps.get(currentProps)),
13653+
currentResource ||
13654+
((currentResource = {
1364613655
type: "script",
1364713656
instance: null,
1364813657
count: 0,
1364913658
state: null
1365013659
}),
13651-
JSCompiler_inline_result.set(pendingProps, currentProps)),
13652-
currentProps)
13660+
pendingProps.set(currentProps, currentResource)),
13661+
currentResource)
1365313662
: { type: "void", instance: null, count: 0, state: null }
1365413663
);
1365513664
default:
@@ -13669,21 +13678,19 @@ function stylesheetPropsFromRawProps(rawProps) {
1366913678
});
1367013679
}
1367113680
function preloadStylesheet(ownerDocument, key, preloadProps, state) {
13672-
preloadPropsMap.set(key, preloadProps);
13673-
ownerDocument.querySelector(getStylesheetSelectorFromKey(key)) ||
13674-
(ownerDocument.querySelector('link[rel="preload"][as="style"][' + key + "]")
13675-
? (state.loading = 1)
13676-
: ((key = ownerDocument.createElement("link")),
13677-
(state.preload = key),
13678-
key.addEventListener("load", function () {
13679-
return (state.loading |= 1);
13680-
}),
13681-
key.addEventListener("error", function () {
13682-
return (state.loading |= 2);
13683-
}),
13684-
setInitialProperties(key, "link", preloadProps),
13685-
markNodeAsHoistable(key),
13686-
ownerDocument.head.appendChild(key)));
13681+
ownerDocument.querySelector('link[rel="preload"][as="style"][' + key + "]")
13682+
? (state.loading = 1)
13683+
: ((key = ownerDocument.createElement("link")),
13684+
(state.preload = key),
13685+
key.addEventListener("load", function () {
13686+
return (state.loading |= 1);
13687+
}),
13688+
key.addEventListener("error", function () {
13689+
return (state.loading |= 2);
13690+
}),
13691+
setInitialProperties(key, "link", preloadProps),
13692+
markNodeAsHoistable(key),
13693+
ownerDocument.head.appendChild(key));
1368713694
}
1368813695
function getScriptKey(src) {
1368913696
return '[src="' + escapeSelectorAttributeValueInsideDoubleQuotes(src) + '"]';
@@ -14782,14 +14789,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1478214789
};
1478314790
var isomorphicReactPackageVersion$jscomp$inline_1631 = React.version;
1478414791
if (
14785-
"19.0.0-experimental-1df34bdf62-20240605" !==
14792+
"19.0.0-experimental-6230622a1a-20240610" !==
1478614793
isomorphicReactPackageVersion$jscomp$inline_1631
1478714794
)
1478814795
throw Error(
1478914796
formatProdErrorMessage(
1479014797
527,
1479114798
isomorphicReactPackageVersion$jscomp$inline_1631,
14792-
"19.0.0-experimental-1df34bdf62-20240605"
14799+
"19.0.0-experimental-6230622a1a-20240610"
1479314800
)
1479414801
);
1479514802
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -14808,7 +14815,7 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1480814815
var devToolsConfig$jscomp$inline_1638 = {
1480914816
findFiberByHostInstance: getClosestInstanceFromNode,
1481014817
bundleType: 0,
14811-
version: "19.0.0-experimental-1df34bdf62-20240605",
14818+
version: "19.0.0-experimental-6230622a1a-20240610",
1481214819
rendererPackageName: "react-dom"
1481314820
};
1481414821
var internals$jscomp$inline_2016 = {
@@ -14838,7 +14845,7 @@ var internals$jscomp$inline_2016 = {
1483814845
scheduleRoot: null,
1483914846
setRefreshHandler: null,
1484014847
getCurrentFiber: null,
14841-
reconcilerVersion: "19.0.0-experimental-1df34bdf62-20240605"
14848+
reconcilerVersion: "19.0.0-experimental-6230622a1a-20240610"
1484214849
};
1484314850
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1484414851
var hook$jscomp$inline_2017 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -14944,4 +14951,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1494414951
listenToAllSupportedEvents(container);
1494514952
return new ReactDOMHydrationRoot(initialChildren);
1494614953
};
14947-
exports.version = "19.0.0-experimental-1df34bdf62-20240605";
14954+
exports.version = "19.0.0-experimental-6230622a1a-20240610";

0 commit comments

Comments
 (0)