Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade React from 2d16326d-20240930 to 1460d67c-20241003 #70800

Closed
wants to merge 5 commits into from
Closed

Upgrade React from 2d16326d-20240930 to 1460d67c-20241003 #70800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e694d5e
Update `react@experimental`
vercel-release-bot Oct 4, 2024
fa555f8
Update `react@rc`
vercel-release-bot Oct 4, 2024
a195237
Updated peer dependency references
vercel-release-bot Oct 4, 2024
593bd69
Update lockfile
vercel-release-bot Oct 4, 2024
8677690
ncc-compiled
vercel-release-bot Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/reproduction-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
"dependencies": {
"next": "canary",
"react": "19.0.0-rc-2d16326d-20240930",
"react-dom": "19.0.0-rc-2d16326d-20240930"
"react": "19.0.0-rc-1460d67c-20241003",
"react-dom": "19.0.0-rc-1460d67c-20241003"
},
"devDependencies": {
"@types/node": "20.12.12",
Expand Down
34 changes: 17 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,19 +208,19 @@
"pretty-bytes": "5.3.0",
"pretty-ms": "7.0.0",
"random-seed": "0.3.0",
"react": "19.0.0-rc-2d16326d-20240930",
"react": "19.0.0-rc-1460d67c-20241003",
"react-17": "npm:[email protected]",
"react-builtin": "npm:[email protected]2d16326d-20240930",
"react-dom": "19.0.0-rc-2d16326d-20240930",
"react-builtin": "npm:[email protected]1460d67c-20241003",
"react-dom": "19.0.0-rc-1460d67c-20241003",
"react-dom-17": "npm:[email protected]",
"react-dom-builtin": "npm:[email protected]2d16326d-20240930",
"react-dom-experimental-builtin": "npm:[email protected]2d16326d-20240930",
"react-experimental-builtin": "npm:[email protected]2d16326d-20240930",
"react-is-builtin": "npm:[email protected]2d16326d-20240930",
"react-server-dom-turbopack": "19.0.0-rc-2d16326d-20240930",
"react-server-dom-turbopack-experimental": "npm:[email protected]2d16326d-20240930",
"react-server-dom-webpack": "19.0.0-rc-2d16326d-20240930",
"react-server-dom-webpack-experimental": "npm:[email protected]2d16326d-20240930",
"react-dom-builtin": "npm:[email protected]1460d67c-20241003",
"react-dom-experimental-builtin": "npm:[email protected]1460d67c-20241003",
"react-experimental-builtin": "npm:[email protected]1460d67c-20241003",
"react-is-builtin": "npm:[email protected]1460d67c-20241003",
"react-server-dom-turbopack": "19.0.0-rc-1460d67c-20241003",
"react-server-dom-turbopack-experimental": "npm:[email protected]1460d67c-20241003",
"react-server-dom-webpack": "19.0.0-rc-1460d67c-20241003",
"react-server-dom-webpack-experimental": "npm:[email protected]1460d67c-20241003",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand All @@ -230,8 +230,8 @@
"resolve-from": "5.0.0",
"sass": "1.54.0",
"satori": "0.10.9",
"scheduler-builtin": "npm:[email protected]2d16326d-20240930",
"scheduler-experimental-builtin": "npm:[email protected]2d16326d-20240930",
"scheduler-builtin": "npm:[email protected]1460d67c-20241003",
"scheduler-experimental-builtin": "npm:[email protected]1460d67c-20241003",
"seedrandom": "3.0.5",
"semver": "7.3.7",
"shell-quote": "1.7.3",
Expand Down Expand Up @@ -271,10 +271,10 @@
"@babel/traverse": "7.22.5",
"@types/react": "npm:[email protected]",
"@types/react-dom": "npm:[email protected]",
"react": "19.0.0-rc-2d16326d-20240930",
"react-dom": "19.0.0-rc-2d16326d-20240930",
"react-is": "19.0.0-rc-2d16326d-20240930",
"scheduler": "0.25.0-rc-2d16326d-20240930"
"react": "19.0.0-rc-1460d67c-20241003",
"react-dom": "19.0.0-rc-1460d67c-20241003",
"react-is": "19.0.0-rc-1460d67c-20241003",
"scheduler": "0.25.0-rc-1460d67c-20241003"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-next-app/templates/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { GetTemplateFileArgs, InstallTemplateArgs } from "./types";

// Do not rename or format. sync-react script relies on this line.
// prettier-ignore
const nextjsReactPeerVersion = "19.0.0-rc-2d16326d-20240930";
const nextjsReactPeerVersion = "19.0.0-rc-1460d67c-20241003";

/**
* Get the file path for a given file in a template, e.g. "next.config.js".
Expand Down
4 changes: 2 additions & 2 deletions packages/next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
"@opentelemetry/api": "^1.1.0",
"@playwright/test": "^1.41.2",
"babel-plugin-react-compiler": "*",
"react": "^18.2.0 || 19.0.0-rc-2d16326d-20240930",
"react-dom": "^18.2.0 || 19.0.0-rc-2d16326d-20240930",
"react": "^18.2.0 || 19.0.0-rc-1460d67c-20241003",
"react-dom": "^18.2.0 || 19.0.0-rc-1460d67c-20241003",
"sass": "^1.3.0"
},
"peerDependenciesMeta": {
Expand Down
425 changes: 205 additions & 220 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js
View file
Open in desktop

Large diffs are not rendered by default.

115 changes: 48 additions & 67 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,11 @@ function createLaneMap(initial) {
for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
return laneMap;
}
function markRootUpdated$1(root, updateLane) {
root.pendingLanes |= updateLane;
268435456 !== updateLane &&
((root.suspendedLanes = 0), (root.pingedLanes = 0), (root.warmLanes = 0));
}
function markRootFinished(
root,
finishedLanes,
Expand Down Expand Up @@ -2398,7 +2403,12 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, update, lane) {
(update.lane = lane | 536870912));
}
function getRootForUpdatedFiber(sourceFiber) {
throwIfInfiniteUpdateLoopDetected();
if (50 < nestedUpdateCount)
throw (
((nestedUpdateCount = 0),
(rootWithNestedUpdates = null),
Error(formatProdErrorMessage(185)))
);
for (var parent = sourceFiber.return; null !== parent; )
(sourceFiber = parent), (parent = sourceFiber.return);
return 3 === sourceFiber.tag ? sourceFiber.stateNode : null;
Expand Down Expand Up @@ -10334,7 +10344,6 @@ var DefaultAsyncDispatcher = {
workInProgressRootConcurrentErrors = null,
workInProgressRootRecoverableErrors = null,
workInProgressRootDidIncludeRecursiveRenderUpdate = !1,
didIncludeCommitPhaseUpdate = !1,
globalMostRecentFallbackTime = 0,
workInProgressRootRenderTargetTime = Infinity,
workInProgressTransitions = null,
Expand Down Expand Up @@ -10377,7 +10386,7 @@ function scheduleUpdateOnFiber(root, fiber, lane) {
workInProgressDeferredLane,
workInProgressRootDidSkipSuspendedSiblings
);
markRootUpdated(root, lane);
markRootUpdated$1(root, lane);
if (0 === (executionContext & 2) || root !== workInProgressRoot)
root === workInProgressRoot &&
(0 === (executionContext & 2) &&
Expand Down Expand Up @@ -10656,15 +10665,6 @@ function isRenderConsistentWithExternalStores(finishedWork) {
}
return !0;
}
function markRootUpdated(root, updatedLanes) {
root.pendingLanes |= updatedLanes;
268435456 !== updatedLanes &&
((root.suspendedLanes = 0), (root.pingedLanes = 0), (root.warmLanes = 0));
executionContext & 2
? (workInProgressRootDidIncludeRecursiveRenderUpdate = !0)
: executionContext & 4 && (didIncludeCommitPhaseUpdate = !0);
throwIfInfiniteUpdateLoopDetected();
}
function markRootSuspended(
root,
suspendedLanes,
Expand Down Expand Up @@ -11163,8 +11163,8 @@ function commitRootImpl(
do flushPassiveEffects();
while (null !== rootWithPendingPassiveEffects);
if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327));
var finishedWork = root.finishedWork,
lanes = root.finishedLanes;
var finishedWork = root.finishedWork;
didIncludeRenderPhaseUpdate = root.finishedLanes;
if (null === finishedWork) return null;
root.finishedWork = null;
root.finishedLanes = 0;
Expand All @@ -11176,13 +11176,12 @@ function commitRootImpl(
remainingLanes |= concurrentlyUpdatedLanes;
markRootFinished(
root,
lanes,
didIncludeRenderPhaseUpdate,
remainingLanes,
spawnedLane,
updatedLanes,
suspendedRetryLanes
);
didIncludeCommitPhaseUpdate = !1;
root === workInProgressRoot &&
((workInProgress = workInProgressRoot = null),
(workInProgressRootRenderLanes = 0));
Expand Down Expand Up @@ -11219,7 +11218,7 @@ function commitRootImpl(
rootDoesHavePassiveEffects
? ((rootDoesHavePassiveEffects = !1),
(rootWithPendingPassiveEffects = root),
(pendingPassiveEffectsLanes = lanes))
(pendingPassiveEffectsLanes = didIncludeRenderPhaseUpdate))
: releaseRootPooledCache(root, remainingLanes);
remainingLanes = root.pendingLanes;
0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
Expand All @@ -11237,9 +11236,7 @@ function commitRootImpl(
});
0 !== (pendingPassiveEffectsLanes & 3) && flushPassiveEffects();
remainingLanes = root.pendingLanes;
didIncludeRenderPhaseUpdate ||
didIncludeCommitPhaseUpdate ||
(0 !== (lanes & 4194218) && 0 !== (remainingLanes & 42))
0 !== (didIncludeRenderPhaseUpdate & 4194218) && 0 !== (remainingLanes & 42)
? root === rootWithNestedUpdates
? nestedUpdateCount++
: ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
Expand Down Expand Up @@ -11304,7 +11301,7 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
sourceFiber = createRootErrorUpdate(rootFiber.stateNode, sourceFiber, 2);
rootFiber = enqueueUpdate(rootFiber, sourceFiber, 2);
null !== rootFiber &&
(markRootUpdated(rootFiber, 2), ensureRootIsScheduled(rootFiber));
(markRootUpdated$1(rootFiber, 2), ensureRootIsScheduled(rootFiber));
}
function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
if (3 === sourceFiber.tag)
Expand Down Expand Up @@ -11337,7 +11334,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
nearestMountedAncestor,
sourceFiber
),
markRootUpdated(instance, 2),
markRootUpdated$1(instance, 2),
ensureRootIsScheduled(instance));
break;
}
Expand Down Expand Up @@ -11366,10 +11363,6 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
null !== pingCache && pingCache.delete(wakeable);
root.pingedLanes |= root.suspendedLanes & pingedLanes;
root.warmLanes &= ~pingedLanes;
executionContext & 2
? (workInProgressRootDidIncludeRecursiveRenderUpdate = !0)
: executionContext & 4 && (didIncludeCommitPhaseUpdate = !0);
throwIfInfiniteUpdateLoopDetected();
workInProgressRoot === root &&
(workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
(4 === workInProgressRootExitStatus ||
Expand All @@ -11387,7 +11380,7 @@ function retryTimedOutBoundary(boundaryFiber, retryLane) {
0 === retryLane && (retryLane = claimNextRetryLane());
boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane);
null !== boundaryFiber &&
(markRootUpdated(boundaryFiber, retryLane),
(markRootUpdated$1(boundaryFiber, retryLane),
ensureRootIsScheduled(boundaryFiber));
}
function retryDehydratedSuspenseBoundary(boundaryFiber) {
Expand Down Expand Up @@ -11416,18 +11409,6 @@ function resolveRetryWakeable(boundaryFiber, wakeable) {
null !== retryCache && retryCache.delete(wakeable);
retryTimedOutBoundary(boundaryFiber, retryLane);
}
function throwIfInfiniteUpdateLoopDetected() {
if (100 < nestedUpdateCount)
throw (
((nestedUpdateCount = 0),
(rootWithNestedUpdates = null),
executionContext & 2 &&
null !== workInProgressRoot &&
(workInProgressRoot.errorRecoveryDisabledLanes |=
workInProgressRootRenderLanes),
Error(formatProdErrorMessage(185)))
);
}
function scheduleCallback$1(priorityLevel, callback) {
return scheduleCallback$3(priorityLevel, callback);
}
Expand Down Expand Up @@ -11714,20 +11695,20 @@ function extractEvents$1(
}
}
for (
var i$jscomp$inline_1412 = 0;
i$jscomp$inline_1412 < simpleEventPluginEvents.length;
i$jscomp$inline_1412++
var i$jscomp$inline_1425 = 0;
i$jscomp$inline_1425 < simpleEventPluginEvents.length;
i$jscomp$inline_1425++
) {
var eventName$jscomp$inline_1413 =
simpleEventPluginEvents[i$jscomp$inline_1412],
domEventName$jscomp$inline_1414 =
eventName$jscomp$inline_1413.toLowerCase(),
capitalizedEvent$jscomp$inline_1415 =
eventName$jscomp$inline_1413[0].toUpperCase() +
eventName$jscomp$inline_1413.slice(1);
var eventName$jscomp$inline_1426 =
simpleEventPluginEvents[i$jscomp$inline_1425],
domEventName$jscomp$inline_1427 =
eventName$jscomp$inline_1426.toLowerCase(),
capitalizedEvent$jscomp$inline_1428 =
eventName$jscomp$inline_1426[0].toUpperCase() +
eventName$jscomp$inline_1426.slice(1);
registerSimpleEvent(
domEventName$jscomp$inline_1414,
"on" + capitalizedEvent$jscomp$inline_1415
domEventName$jscomp$inline_1427,
"on" + capitalizedEvent$jscomp$inline_1428
);
}
registerSimpleEvent(ANIMATION_END, "onAnimationEnd");
Expand Down Expand Up @@ -15168,16 +15149,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
0 === i && attemptExplicitHydrationTarget(target);
}
};
var isomorphicReactPackageVersion$jscomp$inline_1659 = React.version;
var isomorphicReactPackageVersion$jscomp$inline_1672 = React.version;
if (
"19.0.0-experimental-2d16326d-20240930" !==
isomorphicReactPackageVersion$jscomp$inline_1659
"19.0.0-experimental-1460d67c-20241003" !==
isomorphicReactPackageVersion$jscomp$inline_1672
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1659,
"19.0.0-experimental-2d16326d-20240930"
isomorphicReactPackageVersion$jscomp$inline_1672,
"19.0.0-experimental-1460d67c-20241003"
)
);
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
Expand All @@ -15197,25 +15178,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
null === componentOrElement ? null : componentOrElement.stateNode;
return componentOrElement;
};
var internals$jscomp$inline_2124 = {
var internals$jscomp$inline_2137 = {
bundleType: 0,
version: "19.0.0-experimental-2d16326d-20240930",
version: "19.0.0-experimental-1460d67c-20241003",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-experimental-2d16326d-20240930"
reconcilerVersion: "19.0.0-experimental-1460d67c-20241003"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2125 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_2138 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_2125.isDisabled &&
hook$jscomp$inline_2125.supportsFiber
!hook$jscomp$inline_2138.isDisabled &&
hook$jscomp$inline_2138.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_2125.inject(
internals$jscomp$inline_2124
(rendererID = hook$jscomp$inline_2138.inject(
internals$jscomp$inline_2137
)),
(injectedHook = hook$jscomp$inline_2125);
(injectedHook = hook$jscomp$inline_2138);
} catch (err) {}
}
exports.createRoot = function (container, options) {
Expand Down Expand Up @@ -15301,10 +15282,10 @@ exports.hydrateRoot = function (container, initialChildren, options) {
identifierPrefix.callback = null;
enqueueUpdate(options, identifierPrefix, isStrictMode);
initialChildren.current.lanes = isStrictMode;
markRootUpdated(initialChildren, isStrictMode);
markRootUpdated$1(initialChildren, isStrictMode);
ensureRootIsScheduled(initialChildren);
container[internalContainerInstanceKey] = initialChildren.current;
listenToAllSupportedEvents(container);
return new ReactDOMHydrationRoot(initialChildren);
};
exports.version = "19.0.0-experimental-2d16326d-20240930";
exports.version = "19.0.0-experimental-1460d67c-20241003";
Loading
Loading