Skip to content

Commit

Permalink
Merge branch 'canary' into patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
@miki-tebe
miki-tebe authored Dec 18, 2024
2 parents 6a2cd98 + 5870091 commit 7b4e654
Show file tree
Hide file tree
Showing 100 changed files with 2,188 additions and 2,181 deletions.
30 changes: 15 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,16 @@
"pretty-ms": "7.0.0",
"random-seed": "0.3.0",
"react": "19.0.0",
"react-builtin": "npm:[email protected]7283a213-20241206",
"react-builtin": "npm:[email protected]372ec00c-20241209",
"react-dom": "19.0.0",
"react-dom-builtin": "npm:[email protected]7283a213-20241206",
"react-dom-experimental-builtin": "npm:[email protected]7283a213-20241206",
"react-experimental-builtin": "npm:[email protected]7283a213-20241206",
"react-is-builtin": "npm:[email protected]7283a213-20241206",
"react-server-dom-turbopack": "19.0.0-rc-7283a213-20241206",
"react-server-dom-turbopack-experimental": "npm:[email protected]7283a213-20241206",
"react-server-dom-webpack": "19.0.0-rc-7283a213-20241206",
"react-server-dom-webpack-experimental": "npm:[email protected]7283a213-20241206",
"react-dom-builtin": "npm:[email protected]372ec00c-20241209",
"react-dom-experimental-builtin": "npm:[email protected]372ec00c-20241209",
"react-experimental-builtin": "npm:[email protected]372ec00c-20241209",
"react-is-builtin": "npm:[email protected]372ec00c-20241209",
"react-server-dom-turbopack": "19.0.0-rc-372ec00c-20241209",
"react-server-dom-turbopack-experimental": "npm:[email protected]372ec00c-20241209",
"react-server-dom-webpack": "19.0.0-rc-372ec00c-20241209",
"react-server-dom-webpack-experimental": "npm:[email protected]372ec00c-20241209",
"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]7283a213-20241206",
"scheduler-experimental-builtin": "npm:[email protected]7283a213-20241206",
"scheduler-builtin": "npm:[email protected]372ec00c-20241209",
"scheduler-experimental-builtin": "npm:[email protected]372ec00c-20241209",
"seedrandom": "3.0.5",
"semver": "7.3.7",
"shell-quote": "1.7.3",
Expand Down Expand Up @@ -272,10 +272,10 @@
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"jest-snapshot": "30.0.0-alpha.6",
"react": "19.0.0-rc-7283a213-20241206",
"react-dom": "19.0.0-rc-7283a213-20241206",
"react-is": "19.0.0-rc-7283a213-20241206",
"scheduler": "0.25.0-rc-7283a213-20241206"
"react": "19.0.0-rc-372ec00c-20241209",
"react-dom": "19.0.0-rc-372ec00c-20241209",
"react-is": "19.0.0-rc-372ec00c-20241209",
"scheduler": "0.25.0-rc-372ec00c-20241209"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
Expand Down
10 changes: 5 additions & 5 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25291,11 +25291,11 @@
};
(function () {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-experimental-7283a213-20241206" !== isomorphicReactPackageVersion)
if ("19.0.0-experimental-372ec00c-20241209" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-experimental-7283a213-20241206\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-experimental-372ec00c-20241209\nLearn more: https://react.dev/warnings/version-mismatch")
);
})();
("function" === typeof Map &&
Expand Down Expand Up @@ -25332,11 +25332,11 @@
!(function () {
var internals = {
bundleType: 1,
version: "19.0.0-experimental-7283a213-20241206",
version: "19.0.0-experimental-372ec00c-20241209",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-experimental-7283a213-20241206"
reconcilerVersion: "19.0.0-experimental-372ec00c-20241209"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -25478,7 +25478,7 @@
listenToAllSupportedEvents(container);
return new ReactDOMHydrationRoot(initialChildren);
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
10 changes: 5 additions & 5 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15264,14 +15264,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
};
var isomorphicReactPackageVersion$jscomp$inline_1676 = React.version;
if (
"19.0.0-experimental-7283a213-20241206" !==
"19.0.0-experimental-372ec00c-20241209" !==
isomorphicReactPackageVersion$jscomp$inline_1676
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1676,
"19.0.0-experimental-7283a213-20241206"
"19.0.0-experimental-372ec00c-20241209"
)
);
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
Expand All @@ -15293,11 +15293,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
};
var internals$jscomp$inline_2146 = {
bundleType: 0,
version: "19.0.0-experimental-7283a213-20241206",
version: "19.0.0-experimental-372ec00c-20241209",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-experimental-7283a213-20241206"
reconcilerVersion: "19.0.0-experimental-372ec00c-20241209"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2147 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -15401,4 +15401,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
listenToAllSupportedEvents(container);
return new ReactDOMHydrationRoot(initialChildren);
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
10 changes: 5 additions & 5 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25348,11 +25348,11 @@
};
(function () {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-experimental-7283a213-20241206" !== isomorphicReactPackageVersion)
if ("19.0.0-experimental-372ec00c-20241209" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-experimental-7283a213-20241206\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-experimental-372ec00c-20241209\nLearn more: https://react.dev/warnings/version-mismatch")
);
})();
("function" === typeof Map &&
Expand Down Expand Up @@ -25389,11 +25389,11 @@
!(function () {
var internals = {
bundleType: 1,
version: "19.0.0-experimental-7283a213-20241206",
version: "19.0.0-experimental-372ec00c-20241209",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-experimental-7283a213-20241206"
reconcilerVersion: "19.0.0-experimental-372ec00c-20241209"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -25865,7 +25865,7 @@
exports.useFormStatus = function () {
return resolveDispatcher().useHostTransitionStatus();
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
10 changes: 5 additions & 5 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16382,14 +16382,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
};
var isomorphicReactPackageVersion$jscomp$inline_1783 = React.version;
if (
"19.0.0-experimental-7283a213-20241206" !==
"19.0.0-experimental-372ec00c-20241209" !==
isomorphicReactPackageVersion$jscomp$inline_1783
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1783,
"19.0.0-experimental-7283a213-20241206"
"19.0.0-experimental-372ec00c-20241209"
)
);
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
Expand All @@ -16411,11 +16411,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
};
var internals$jscomp$inline_2225 = {
bundleType: 0,
version: "19.0.0-experimental-7283a213-20241206",
version: "19.0.0-experimental-372ec00c-20241209",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-experimental-7283a213-20241206"
reconcilerVersion: "19.0.0-experimental-372ec00c-20241209"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2226 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -16680,7 +16680,7 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactSharedInternals.H.useHostTransitionStatus();
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
2 changes: 1 addition & 1 deletion ...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9295,5 +9295,5 @@
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server'
);
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
})();
2 changes: 1 addition & 1 deletion ...ext/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6060,4 +6060,4 @@ exports.renderToString = function (children, options) {
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server'
);
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
2 changes: 1 addition & 1 deletion .../next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9295,5 +9295,5 @@
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server'
);
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
})();
2 changes: 1 addition & 1 deletion ...s/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6152,4 +6152,4 @@ exports.renderToString = function (children, options) {
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server'
);
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
6 changes: 3 additions & 3 deletions ...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8193,11 +8193,11 @@
}
function ensureCorrectIsomorphicReactVersion() {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-experimental-7283a213-20241206" !== isomorphicReactPackageVersion)
if ("19.0.0-experimental-372ec00c-20241209" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-experimental-7283a213-20241206\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-experimental-372ec00c-20241209\nLearn more: https://react.dev/warnings/version-mismatch")
);
}
var React = require("next/dist/compiled/react-experimental"),
Expand Down Expand Up @@ -9977,5 +9977,5 @@
startWork(request);
});
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
})();
6 changes: 3 additions & 3 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6589,12 +6589,12 @@ function getPostponedState(request) {
}
function ensureCorrectIsomorphicReactVersion() {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-experimental-7283a213-20241206" !== isomorphicReactPackageVersion)
if ("19.0.0-experimental-372ec00c-20241209" !== isomorphicReactPackageVersion)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion,
"19.0.0-experimental-7283a213-20241206"
"19.0.0-experimental-372ec00c-20241209"
)
);
}
Expand Down Expand Up @@ -6849,4 +6849,4 @@ exports.resumeAndPrerender = function (children, postponedState, options) {
startWork(request);
});
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
6 changes: 3 additions & 3 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6071,13 +6071,13 @@ function addToReplayParent(node, parentKeyPath, trackedPostpones) {
}
var isomorphicReactPackageVersion$jscomp$inline_779 = React.version;
if (
"19.0.0-experimental-7283a213-20241206" !==
"19.0.0-experimental-372ec00c-20241209" !==
isomorphicReactPackageVersion$jscomp$inline_779
)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion$jscomp$inline_779 +
"\n - react-dom: 19.0.0-experimental-7283a213-20241206\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-experimental-372ec00c-20241209\nLearn more: https://react.dev/warnings/version-mismatch")
);
exports.renderToReadableStream = function (children, options) {
return new Promise(function (resolve, reject) {
Expand Down Expand Up @@ -6168,4 +6168,4 @@ exports.renderToReadableStream = function (children, options) {
startWork(request);
});
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
6 changes: 3 additions & 3 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8216,11 +8216,11 @@
}
function ensureCorrectIsomorphicReactVersion() {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-experimental-7283a213-20241206" !== isomorphicReactPackageVersion)
if ("19.0.0-experimental-372ec00c-20241209" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-experimental-7283a213-20241206\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-experimental-372ec00c-20241209\nLearn more: https://react.dev/warnings/version-mismatch")
);
}
var React = require("next/dist/compiled/react-experimental"),
Expand Down Expand Up @@ -10007,5 +10007,5 @@ const setTimeoutOrImmediate =
? globalThis['set' + 'Immediate']
: setTimeout;

exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
})();
6 changes: 3 additions & 3 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6696,11 +6696,11 @@ function getPostponedState(request) {
}
function ensureCorrectIsomorphicReactVersion() {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-experimental-7283a213-20241206" !== isomorphicReactPackageVersion)
if ("19.0.0-experimental-372ec00c-20241209" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-experimental-7283a213-20241206\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-experimental-372ec00c-20241209\nLearn more: https://react.dev/warnings/version-mismatch")
);
}
ensureCorrectIsomorphicReactVersion();
Expand Down Expand Up @@ -6965,4 +6965,4 @@ const setTimeoutOrImmediate =
? globalThis['set' + 'Immediate']
: setTimeout;

exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
6 changes: 3 additions & 3 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8080,11 +8080,11 @@
}
function ensureCorrectIsomorphicReactVersion() {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-experimental-7283a213-20241206" !== isomorphicReactPackageVersion)
if ("19.0.0-experimental-372ec00c-20241209" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-experimental-7283a213-20241206\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-experimental-372ec00c-20241209\nLearn more: https://react.dev/warnings/version-mismatch")
);
}
function createDrainHandler(destination, request) {
Expand Down Expand Up @@ -9857,5 +9857,5 @@
}
};
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
})();
6 changes: 3 additions & 3 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6575,11 +6575,11 @@ function getPostponedState(request) {
}
function ensureCorrectIsomorphicReactVersion() {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-experimental-7283a213-20241206" !== isomorphicReactPackageVersion)
if ("19.0.0-experimental-372ec00c-20241209" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-experimental-7283a213-20241206\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-experimental-372ec00c-20241209\nLearn more: https://react.dev/warnings/version-mismatch")
);
}
ensureCorrectIsomorphicReactVersion();
Expand Down Expand Up @@ -6830,4 +6830,4 @@ exports.resumeToPipeableStream = function (children, postponedState, options) {
}
};
};
exports.version = "19.0.0-experimental-7283a213-20241206";
exports.version = "19.0.0-experimental-372ec00c-20241209";
Loading

0 comments on commit 7b4e654

Please sign in to comment.