Skip to content

Commit

Permalink
Update React 1df34bdf62 to 6230622a1a
Browse files Browse the repository at this point in the history
  • Loading branch information
@ztanner
ztanner committed Jun 10, 2024
1 parent 78505fc commit 8396cfa
Show file tree
Hide file tree
Showing 59 changed files with 740 additions and 655 deletions.
32 changes: 16 additions & 16 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,18 @@
"pretty-bytes": "5.3.0",
"pretty-ms": "7.0.0",
"random-seed": "0.3.0",
"react": "19.0.0-rc-1df34bdf62-20240605",
"react": "19.0.0-rc-6230622a1a-20240610",
"react-17": "npm:[email protected]",
"react-builtin": "npm:[email protected]1df34bdf62-20240605",
"react-dom": "19.0.0-rc-1df34bdf62-20240605",
"react-builtin": "npm:[email protected]6230622a1a-20240610",
"react-dom": "19.0.0-rc-6230622a1a-20240610",
"react-dom-17": "npm:[email protected]",
"react-dom-builtin": "npm:[email protected]1df34bdf62-20240605",
"react-dom-experimental-builtin": "npm:[email protected]1df34bdf62-20240605",
"react-experimental-builtin": "npm:[email protected]1df34bdf62-20240605",
"react-server-dom-turbopack": "19.0.0-rc-1df34bdf62-20240605",
"react-server-dom-turbopack-experimental": "npm:[email protected]1df34bdf62-20240605",
"react-server-dom-webpack": "19.0.0-rc-1df34bdf62-20240605",
"react-server-dom-webpack-experimental": "npm:[email protected]1df34bdf62-20240605",
"react-dom-builtin": "npm:[email protected]6230622a1a-20240610",
"react-dom-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
"react-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
"react-server-dom-turbopack": "19.0.0-rc-6230622a1a-20240610",
"react-server-dom-turbopack-experimental": "npm:[email protected]6230622a1a-20240610",
"react-server-dom-webpack": "19.0.0-rc-6230622a1a-20240610",
"react-server-dom-webpack-experimental": "npm:[email protected]6230622a1a-20240610",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand All @@ -218,8 +218,8 @@
"resolve-from": "5.0.0",
"sass": "1.54.0",
"satori": "0.10.9",
"scheduler-builtin": "npm:[email protected]1df34bdf62-20240605",
"scheduler-experimental-builtin": "npm:[email protected]1df34bdf62-20240605",
"scheduler-builtin": "npm:[email protected]6230622a1a-20240610",
"scheduler-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
"seedrandom": "3.0.5",
"semver": "7.3.7",
"shell-quote": "1.7.3",
Expand Down Expand Up @@ -253,10 +253,10 @@
"@babel/traverse": "7.22.5",
"@types/react": "npm:[email protected]",
"@types/react-dom": "npm:[email protected]",
"react": "19.0.0-rc-1df34bdf62-20240605",
"react-dom": "19.0.0-rc-1df34bdf62-20240605",
"react-is": "19.0.0-rc-1df34bdf62-20240605",
"scheduler": "0.25.0-rc-1df34bdf62-20240605"
"react": "19.0.0-rc-6230622a1a-20240610",
"react-dom": "19.0.0-rc-6230622a1a-20240610",
"react-is": "19.0.0-rc-6230622a1a-20240610",
"scheduler": "0.25.0-rc-6230622a1a-20240610"
},
"engines": {
"node": ">=18.17.0",
Expand Down
64 changes: 37 additions & 27 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 @@ -35848,8 +35848,25 @@ function getResource(type, currentProps, pendingProps, currentResource) {

_styles.set(_key, _resource);

var instance = ownerDocument.querySelector(getStylesheetSelectorFromKey(_key));

if (instance) {
var loadingState = instance._p;

if (loadingState) ; else {
// This instance is already loaded
_resource.instance = instance;
_resource.state.loading = Loaded | Inserted;
}
}

if (!preloadPropsMap.has(_key)) {
preloadStylesheet(ownerDocument, _key, preloadPropsFromStylesheet(qualifiedProps), _resource.state);
var preloadProps = preloadPropsFromStylesheet(qualifiedProps);
preloadPropsMap.set(_key, preloadProps);

if (!instance) {
preloadStylesheet(ownerDocument, _key, preloadProps, _resource.state);
}
}
}

Expand Down Expand Up @@ -35996,31 +36013,24 @@ function stylesheetPropsFromRawProps(rawProps) {
}

function preloadStylesheet(ownerDocument, key, preloadProps, state) {
preloadPropsMap.set(key, preloadProps);

if (!ownerDocument.querySelector(getStylesheetSelectorFromKey(key))) {
// There is no matching stylesheet instance in the Document.
// We will insert a preload now to kick off loading because
// we expect this stylesheet to commit
var preloadEl = ownerDocument.querySelector(getPreloadStylesheetSelectorFromKey(key));

if (preloadEl) {
// If we find a preload already it was SSR'd and we won't have an actual
// loading state to track. For now we will just assume it is loaded
state.loading = Loaded;
} else {
var instance = ownerDocument.createElement('link');
state.preload = instance;
instance.addEventListener('load', function () {
return state.loading |= Loaded;
});
instance.addEventListener('error', function () {
return state.loading |= Errored;
});
setInitialProperties(instance, 'link', preloadProps);
markNodeAsHoistable(instance);
ownerDocument.head.appendChild(instance);
}
var preloadEl = ownerDocument.querySelector(getPreloadStylesheetSelectorFromKey(key));

if (preloadEl) {
// If we find a preload already it was SSR'd and we won't have an actual
// loading state to track. For now we will just assume it is loaded
state.loading = Loaded;
} else {
var instance = ownerDocument.createElement('link');
state.preload = instance;
instance.addEventListener('load', function () {
return state.loading |= Loaded;
});
instance.addEventListener('error', function () {
return state.loading |= Errored;
});
setInitialProperties(instance, 'link', preloadProps);
markNodeAsHoistable(instance);
ownerDocument.head.appendChild(instance);
}
}

Expand Down Expand Up @@ -36888,7 +36898,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
return root;
}

var ReactVersion = '19.0.0-experimental-1df34bdf62-20240605';
var ReactVersion = '19.0.0-experimental-6230622a1a-20240610';

// Might add PROFILE later.

Expand Down
105 changes: 56 additions & 49 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 @@ -13569,20 +13569,20 @@ function getResource(type, currentProps, pendingProps, currentResource) {
case "style":
return "string" === typeof pendingProps.precedence &&
"string" === typeof pendingProps.href
? ((pendingProps = getStyleKey(pendingProps.href)),
(JSCompiler_inline_result = getResourcesFromRoot(
? ((currentProps = getStyleKey(pendingProps.href)),
(pendingProps = getResourcesFromRoot(
JSCompiler_inline_result
).hoistableStyles),
(currentProps = JSCompiler_inline_result.get(pendingProps)),
currentProps ||
((currentProps = {
(currentResource = pendingProps.get(currentProps)),
currentResource ||
((currentResource = {
type: "style",
instance: null,
count: 0,
state: null
}),
JSCompiler_inline_result.set(pendingProps, currentProps)),
currentProps)
pendingProps.set(currentProps, currentResource)),
currentResource)
: { type: "void", instance: null, count: 0, state: null };
case "link":
if (
Expand All @@ -13605,22 +13605,31 @@ function getResource(type, currentProps, pendingProps, currentResource) {
state: { loading: 0, preload: null }
}),
styles$231.set(type, resource$232),
(styles$231 = JSCompiler_inline_result.querySelector(
getStylesheetSelectorFromKey(type)
)) &&
!styles$231._p &&
((resource$232.instance = styles$231),
(resource$232.state.loading = 5)),
preloadPropsMap.has(type) ||
preloadStylesheet(
JSCompiler_inline_result,
type,
{
rel: "preload",
as: "style",
href: pendingProps.href,
crossOrigin: pendingProps.crossOrigin,
integrity: pendingProps.integrity,
media: pendingProps.media,
hrefLang: pendingProps.hrefLang,
referrerPolicy: pendingProps.referrerPolicy
},
resource$232.state
));
((pendingProps = {
rel: "preload",
as: "style",
href: pendingProps.href,
crossOrigin: pendingProps.crossOrigin,
integrity: pendingProps.integrity,
media: pendingProps.media,
hrefLang: pendingProps.hrefLang,
referrerPolicy: pendingProps.referrerPolicy
}),
preloadPropsMap.set(type, pendingProps),
styles$231 ||
preloadStylesheet(
JSCompiler_inline_result,
type,
pendingProps,
resource$232.state
)));
if (currentProps && null === currentResource)
throw Error(formatProdErrorMessage(528, ""));
return resource$232;
Expand All @@ -13636,20 +13645,20 @@ function getResource(type, currentProps, pendingProps, currentResource) {
currentProps &&
"function" !== typeof currentProps &&
"symbol" !== typeof currentProps
? ((pendingProps = getScriptKey(pendingProps)),
(JSCompiler_inline_result = getResourcesFromRoot(
? ((currentProps = getScriptKey(pendingProps)),
(pendingProps = getResourcesFromRoot(
JSCompiler_inline_result
).hoistableScripts),
(currentProps = JSCompiler_inline_result.get(pendingProps)),
currentProps ||
((currentProps = {
(currentResource = pendingProps.get(currentProps)),
currentResource ||
((currentResource = {
type: "script",
instance: null,
count: 0,
state: null
}),
JSCompiler_inline_result.set(pendingProps, currentProps)),
currentProps)
pendingProps.set(currentProps, currentResource)),
currentResource)
: { type: "void", instance: null, count: 0, state: null }
);
default:
Expand All @@ -13669,21 +13678,19 @@ function stylesheetPropsFromRawProps(rawProps) {
});
}
function preloadStylesheet(ownerDocument, key, preloadProps, state) {
preloadPropsMap.set(key, preloadProps);
ownerDocument.querySelector(getStylesheetSelectorFromKey(key)) ||
(ownerDocument.querySelector('link[rel="preload"][as="style"][' + key + "]")
? (state.loading = 1)
: ((key = ownerDocument.createElement("link")),
(state.preload = key),
key.addEventListener("load", function () {
return (state.loading |= 1);
}),
key.addEventListener("error", function () {
return (state.loading |= 2);
}),
setInitialProperties(key, "link", preloadProps),
markNodeAsHoistable(key),
ownerDocument.head.appendChild(key)));
ownerDocument.querySelector('link[rel="preload"][as="style"][' + key + "]")
? (state.loading = 1)
: ((key = ownerDocument.createElement("link")),
(state.preload = key),
key.addEventListener("load", function () {
return (state.loading |= 1);
}),
key.addEventListener("error", function () {
return (state.loading |= 2);
}),
setInitialProperties(key, "link", preloadProps),
markNodeAsHoistable(key),
ownerDocument.head.appendChild(key));
}
function getScriptKey(src) {
return '[src="' + escapeSelectorAttributeValueInsideDoubleQuotes(src) + '"]';
Expand Down Expand Up @@ -14782,14 +14789,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
};
var isomorphicReactPackageVersion$jscomp$inline_1631 = React.version;
if (
"19.0.0-experimental-1df34bdf62-20240605" !==
"19.0.0-experimental-6230622a1a-20240610" !==
isomorphicReactPackageVersion$jscomp$inline_1631
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1631,
"19.0.0-experimental-1df34bdf62-20240605"
"19.0.0-experimental-6230622a1a-20240610"
)
);
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
Expand All @@ -14808,7 +14815,7 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
var devToolsConfig$jscomp$inline_1638 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "19.0.0-experimental-1df34bdf62-20240605",
version: "19.0.0-experimental-6230622a1a-20240610",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2016 = {
Expand Down Expand Up @@ -14838,7 +14845,7 @@ var internals$jscomp$inline_2016 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "19.0.0-experimental-1df34bdf62-20240605"
reconcilerVersion: "19.0.0-experimental-6230622a1a-20240610"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2017 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -14944,4 +14951,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
listenToAllSupportedEvents(container);
return new ReactDOMHydrationRoot(initialChildren);
};
exports.version = "19.0.0-experimental-1df34bdf62-20240605";
exports.version = "19.0.0-experimental-6230622a1a-20240610";
Loading

0 comments on commit 8396cfa

Please sign in to comment.