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

Upgrade React from 1b1283ad-20241203 to de68d2f4-20241204 #73525

Merged
merged 6 commits into from
Dec 4, 2024
Merged

Upgrade React from 1b1283ad-20241203 to de68d2f4-20241204 #73525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc5675b
Update `react@experimental`
vercel-release-bot Dec 4, 2024
e3c79aa
Update `react@rc`
vercel-release-bot Dec 4, 2024
d465878
Updated peer dependency references in apps
vercel-release-bot Dec 4, 2024
31e182d
Updated peer dependency references in libraries
vercel-release-bot Dec 4, 2024
4523928
Update lockfile
vercel-release-bot Dec 4, 2024
e0f7ecc
ncc-compiled
vercel-release-bot Dec 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-1b1283ad-20241203",
"react-dom": "19.0.0-rc-1b1283ad-20241203"
"react": "19.0.0-rc-de68d2f4-20241204",
"react-dom": "19.0.0-rc-de68d2f4-20241204"
},
"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 @@ -206,19 +206,19 @@
"pretty-bytes": "5.3.0",
"pretty-ms": "7.0.0",
"random-seed": "0.3.0",
"react": "19.0.0-rc-1b1283ad-20241203",
"react": "19.0.0-rc-de68d2f4-20241204",
"react-17": "npm:react@17.0.2",
"react-builtin": "npm:react@19.0.0-rc-1b1283ad-20241203",
"react-dom": "19.0.0-rc-1b1283ad-20241203",
"react-builtin": "npm:react@19.0.0-rc-de68d2f4-20241204",
"react-dom": "19.0.0-rc-de68d2f4-20241204",
"react-dom-17": "npm:react-dom@17.0.2",
"react-dom-builtin": "npm:react-dom@19.0.0-rc-1b1283ad-20241203",
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-1b1283ad-20241203",
"react-experimental-builtin": "npm:react@0.0.0-experimental-1b1283ad-20241203",
"react-is-builtin": "npm:react-is@19.0.0-rc-1b1283ad-20241203",
"react-server-dom-turbopack": "19.0.0-rc-1b1283ad-20241203",
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-1b1283ad-20241203",
"react-server-dom-webpack": "19.0.0-rc-1b1283ad-20241203",
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-1b1283ad-20241203",
"react-dom-builtin": "npm:react-dom@19.0.0-rc-de68d2f4-20241204",
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-de68d2f4-20241204",
"react-experimental-builtin": "npm:react@0.0.0-experimental-de68d2f4-20241204",
"react-is-builtin": "npm:react-is@19.0.0-rc-de68d2f4-20241204",
"react-server-dom-turbopack": "19.0.0-rc-de68d2f4-20241204",
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-de68d2f4-20241204",
"react-server-dom-webpack": "19.0.0-rc-de68d2f4-20241204",
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-de68d2f4-20241204",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand All @@ -228,8 +228,8 @@
"resolve-from": "5.0.0",
"sass": "1.54.0",
"satori": "0.10.9",
"scheduler-builtin": "npm:scheduler@0.25.0-rc-1b1283ad-20241203",
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-1b1283ad-20241203",
"scheduler-builtin": "npm:scheduler@0.25.0-rc-de68d2f4-20241204",
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-de68d2f4-20241204",
"seedrandom": "3.0.5",
"semver": "7.3.7",
"shell-quote": "1.7.3",
Expand Down Expand Up @@ -269,10 +269,10 @@
"@babel/traverse": "7.22.5",
"@types/react": "npm:types-react@19.0.0-rc.0",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
"react": "19.0.0-rc-1b1283ad-20241203",
"react-dom": "19.0.0-rc-1b1283ad-20241203",
"react-is": "19.0.0-rc-1b1283ad-20241203",
"scheduler": "0.25.0-rc-1b1283ad-20241203"
"react": "19.0.0-rc-de68d2f4-20241204",
"react-dom": "19.0.0-rc-de68d2f4-20241204",
"react-is": "19.0.0-rc-de68d2f4-20241204",
"scheduler": "0.25.0-rc-de68d2f4-20241204"
},
"patchedDependencies": {
"webpack-sources@3.2.3": "patches/webpack-sources@3.2.3.patch"
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-1b1283ad-20241203";
const nextjsReactPeerVersion = "19.0.0-rc-de68d2f4-20241204";

/**
* 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 @@ -109,8 +109,8 @@
"@opentelemetry/api": "^1.1.0",
"@playwright/test": "^1.41.2",
"babel-plugin-react-compiler": "*",
"react": "^18.2.0 || 19.0.0-rc-1b1283ad-20241203",
"react-dom": "^18.2.0 || 19.0.0-rc-1b1283ad-20241203",
"react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204",
"react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204",
"sass": "^1.3.0"
},
"peerDependenciesMeta": {
Expand Down
364 changes: 195 additions & 169 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.

98 changes: 62 additions & 36 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 @@ -5129,7 +5129,9 @@ function findFirstSuspended(row) {
if (
null !== state &&
((state = state.dehydrated),
null === state || "$?" === state.data || "$!" === state.data)
null === state ||
"$?" === state.data ||
isSuspenseInstanceFallback(state))
)
return node;
} else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
Expand Down Expand Up @@ -6174,7 +6176,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
((nextInstance = nextInstance.dehydrated), null !== nextInstance)
)
return (
"$!" === nextInstance.data
isSuspenseInstanceFallback(nextInstance)
? (workInProgress.lanes = 16)
: (workInProgress.lanes = 536870912),
null
Expand Down Expand Up @@ -6281,7 +6283,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
(workInProgress = showFallback));
else if (
(pushPrimaryTreeSuspenseHandler(workInProgress),
"$!" === nextInstance.data)
isSuspenseInstanceFallback(nextInstance))
) {
JSCompiler_temp =
nextInstance.nextSibling && nextInstance.nextSibling.dataset;
Expand Down Expand Up @@ -6365,13 +6367,8 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
);
} else
"$?" === nextInstance.data
? ((workInProgress.flags |= 128),
? ((workInProgress.flags |= 192),
(workInProgress.child = current.child),
(workInProgress = retryDehydratedSuspenseBoundary.bind(
null,
current
)),
(nextInstance._reactRetry = workInProgress),
(workInProgress = null))
: ((current = JSCompiler_temp$jscomp$0.treeContext),
(nextHydratableInstance = getNextHydratable(
Expand Down Expand Up @@ -8121,6 +8118,16 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) {
case 13:
recursivelyTraverseLayoutEffects(finishedRoot, finishedWork);
flags & 4 && commitSuspenseHydrationCallbacks(finishedRoot, finishedWork);
flags & 64 &&
((flags = finishedWork.memoizedState),
null !== flags &&
((flags = flags.dehydrated),
null !== flags &&
((finishedWork = retryDehydratedSuspenseBoundary.bind(
null,
finishedWork
)),
registerSuspenseInstanceRetry(flags, finishedWork))));
break;
case 22:
prevProps =
Expand Down Expand Up @@ -11782,20 +11789,20 @@ function extractEvents$1(
}
}
for (
var i$jscomp$inline_1433 = 0;
i$jscomp$inline_1433 < simpleEventPluginEvents.length;
i$jscomp$inline_1433++
var i$jscomp$inline_1429 = 0;
i$jscomp$inline_1429 < simpleEventPluginEvents.length;
i$jscomp$inline_1429++
) {
var eventName$jscomp$inline_1434 =
simpleEventPluginEvents[i$jscomp$inline_1433],
domEventName$jscomp$inline_1435 =
eventName$jscomp$inline_1434.toLowerCase(),
capitalizedEvent$jscomp$inline_1436 =
eventName$jscomp$inline_1434[0].toUpperCase() +
eventName$jscomp$inline_1434.slice(1);
var eventName$jscomp$inline_1430 =
simpleEventPluginEvents[i$jscomp$inline_1429],
domEventName$jscomp$inline_1431 =
eventName$jscomp$inline_1430.toLowerCase(),
capitalizedEvent$jscomp$inline_1432 =
eventName$jscomp$inline_1430[0].toUpperCase() +
eventName$jscomp$inline_1430.slice(1);
registerSimpleEvent(
domEventName$jscomp$inline_1435,
"on" + capitalizedEvent$jscomp$inline_1436
domEventName$jscomp$inline_1431,
"on" + capitalizedEvent$jscomp$inline_1432
);
}
registerSimpleEvent(ANIMATION_END, "onAnimationEnd");
Expand Down Expand Up @@ -13684,6 +13691,25 @@ function canHydrateTextInstance(instance, text, inRootOrSingleton) {
}
return instance;
}
function isSuspenseInstanceFallback(instance) {
return (
"$!" === instance.data ||
("$?" === instance.data && "complete" === instance.ownerDocument.readyState)
);
}
function registerSuspenseInstanceRetry(instance, callback) {
var ownerDocument = instance.ownerDocument;
if ("$?" !== instance.data || "complete" === ownerDocument.readyState)
callback();
else {
var listener = function () {
callback();
ownerDocument.removeEventListener("DOMContentLoaded", listener);
};
ownerDocument.addEventListener("DOMContentLoaded", listener);
instance._reactRetry = listener;
}
}
function getNextHydratable(node) {
for (; null != node; node = node.nextSibling) {
var nodeType = node.nodeType;
Expand Down Expand Up @@ -15236,16 +15262,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
0 === i && attemptExplicitHydrationTarget(target);
}
};
var isomorphicReactPackageVersion$jscomp$inline_1680 = React.version;
var isomorphicReactPackageVersion$jscomp$inline_1676 = React.version;
if (
"19.0.0-experimental-1b1283ad-20241203" !==
isomorphicReactPackageVersion$jscomp$inline_1680
"19.0.0-experimental-de68d2f4-20241204" !==
isomorphicReactPackageVersion$jscomp$inline_1676
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1680,
"19.0.0-experimental-1b1283ad-20241203"
isomorphicReactPackageVersion$jscomp$inline_1676,
"19.0.0-experimental-de68d2f4-20241204"
)
);
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
Expand All @@ -15265,25 +15291,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
null === componentOrElement ? null : componentOrElement.stateNode;
return componentOrElement;
};
var internals$jscomp$inline_2153 = {
var internals$jscomp$inline_2146 = {
bundleType: 0,
version: "19.0.0-experimental-1b1283ad-20241203",
version: "19.0.0-experimental-de68d2f4-20241204",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-experimental-1b1283ad-20241203"
reconcilerVersion: "19.0.0-experimental-de68d2f4-20241204"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2154 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
var hook$jscomp$inline_2147 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
if (
!hook$jscomp$inline_2154.isDisabled &&
hook$jscomp$inline_2154.supportsFiber
!hook$jscomp$inline_2147.isDisabled &&
hook$jscomp$inline_2147.supportsFiber
)
try {
(rendererID = hook$jscomp$inline_2154.inject(
internals$jscomp$inline_2153
(rendererID = hook$jscomp$inline_2147.inject(
internals$jscomp$inline_2146
)),
(injectedHook = hook$jscomp$inline_2154);
(injectedHook = hook$jscomp$inline_2147);
} catch (err) {}
}
exports.createRoot = function (container, options) {
Expand Down Expand Up @@ -15375,4 +15401,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
listenToAllSupportedEvents(container);
return new ReactDOMHydrationRoot(initialChildren);
};
exports.version = "19.0.0-experimental-1b1283ad-20241203";
exports.version = "19.0.0-experimental-de68d2f4-20241204";
Loading
Loading