Skip to content

Commit

Permalink
[Float][Fizz][Fiber] support type for ReactDOM.preload() options (#26239
Browse files Browse the repository at this point in the history
)

preloads often need to come with a type attribute which allows browsers
to decide if they support the preloading resource's type. If the type is
unsupported the preload will not be fetched by the Browser. This change
adds support for `type` in `ReactDOM.preload()` as a string option.

DiffTrain build for [6ff1733](6ff1733)
  • Loading branch information
gnoff committed Feb 25, 2023
1 parent 81e2051 commit 0657099
Show file tree
Hide file tree
Showing 30 changed files with 74 additions and 58 deletions.
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1173a17e6eea08599005e9f8e7d7a4245783edba
6ff1733e63fdb948ae973a713741b4526102c73c
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION_TRANSFORMS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1173a17e6eea08599005e9f8e7d7a4245783edba
6ff1733e63fdb948ae973a713741b4526102c73c
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (
}
"use strict";

var ReactVersion = "18.3.0-www-classic-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-classic-6ff1733e6-20230225";

// ATTENTION
// When adding new symbols to this file,
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (
}
"use strict";

var ReactVersion = "18.3.0-www-modern-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-modern-6ff1733e6-20230225";

// ATTENTION
// When adding new symbols to this file,
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,4 +646,4 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-classic-1173a17e6-20230225";
exports.version = "18.3.0-www-classic-6ff1733e6-20230225";
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -638,4 +638,4 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-modern-1173a17e6-20230225";
exports.version = "18.3.0-www-modern-6ff1733e6-20230225";
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-classic-1173a17e6-20230225";
exports.version = "18.3.0-www-classic-6ff1733e6-20230225";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-profiling.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ exports.useSyncExternalStore = function (
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-modern-1173a17e6-20230225";
exports.version = "18.3.0-www-modern-6ff1733e6-20230225";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactART-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
return self;
}

var ReactVersion = "18.3.0-www-classic-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-classic-6ff1733e6-20230225";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactART-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
return self;
}

var ReactVersion = "18.3.0-www-modern-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-modern-6ff1733e6-20230225";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down
4 changes: 2 additions & 2 deletions compiled/facebook-www/ReactART-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -9780,7 +9780,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-classic-1173a17e6-20230225",
version: "18.3.0-www-classic-6ff1733e6-20230225",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1300 = {
Expand Down Expand Up @@ -9811,7 +9811,7 @@ var internals$jscomp$inline_1300 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-1173a17e6-20230225"
reconcilerVersion: "18.3.0-next-6ff1733e6-20230225"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1301 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
4 changes: 2 additions & 2 deletions compiled/facebook-www/ReactART-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -9445,7 +9445,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-modern-1173a17e6-20230225",
version: "18.3.0-www-modern-6ff1733e6-20230225",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1280 = {
Expand Down Expand Up @@ -9476,7 +9476,7 @@ var internals$jscomp$inline_1280 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-1173a17e6-20230225"
reconcilerVersion: "18.3.0-next-6ff1733e6-20230225"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1281 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
5 changes: 3 additions & 2 deletions compiled/facebook-www/ReactDOM-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -9603,7 +9603,8 @@ function preloadPropsFromPreloadOptions(href, as, options) {
rel: "preload",
as: as,
crossOrigin: as === "font" ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
};
} // --------------------------------------
// ReactDOM.preinit
Expand Down Expand Up @@ -42101,7 +42102,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-classic-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-classic-6ff1733e6-20230225";

function createPortal$1(
children,
Expand Down
5 changes: 3 additions & 2 deletions compiled/facebook-www/ReactDOM-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -14254,7 +14254,8 @@ function preloadPropsFromPreloadOptions(href, as, options) {
rel: "preload",
as: as,
crossOrigin: as === "font" ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
};
} // --------------------------------------
// ReactDOM.preinit
Expand Down Expand Up @@ -41705,7 +41706,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-modern-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-modern-6ff1733e6-20230225";

function createPortal$1(
children,
Expand Down
9 changes: 5 additions & 4 deletions compiled/facebook-www/ReactDOM-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -2096,7 +2096,8 @@ function preload$1(href, options) {
rel: "preload",
as: as,
crossOrigin: "font" === as ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
}),
preloadPropsMap.set(key, href),
null === ownerDocument.querySelector(limitedEscapedHref) &&
Expand Down Expand Up @@ -15493,7 +15494,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1741 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-1173a17e6-20230225",
version: "18.3.0-www-classic-6ff1733e6-20230225",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2108 = {
Expand Down Expand Up @@ -15523,7 +15524,7 @@ var internals$jscomp$inline_2108 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-1173a17e6-20230225"
reconcilerVersion: "18.3.0-next-6ff1733e6-20230225"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2109 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -15779,4 +15780,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-1173a17e6-20230225";
exports.version = "18.3.0-next-6ff1733e6-20230225";
9 changes: 5 additions & 4 deletions compiled/facebook-www/ReactDOM-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -4380,7 +4380,8 @@ function preload$1(href, options) {
rel: "preload",
as: as,
crossOrigin: "font" === as ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
}),
preloadPropsMap.set(key, href),
null === ownerDocument.querySelector(limitedEscapedHref) &&
Expand Down Expand Up @@ -15022,7 +15023,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1700 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-1173a17e6-20230225",
version: "18.3.0-www-modern-6ff1733e6-20230225",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2072 = {
Expand Down Expand Up @@ -15053,7 +15054,7 @@ var internals$jscomp$inline_2072 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-1173a17e6-20230225"
reconcilerVersion: "18.3.0-next-6ff1733e6-20230225"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2073 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -15238,4 +15239,4 @@ exports.unstable_flushControlled = function (fn) {
}
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-1173a17e6-20230225";
exports.version = "18.3.0-next-6ff1733e6-20230225";
9 changes: 5 additions & 4 deletions compiled/facebook-www/ReactDOM-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,8 @@ function preload$1(href, options) {
rel: "preload",
as: as,
crossOrigin: "font" === as ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
}),
preloadPropsMap.set(key, href),
null === ownerDocument.querySelector(limitedEscapedHref) &&
Expand Down Expand Up @@ -16263,7 +16264,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1821 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-1173a17e6-20230225",
version: "18.3.0-www-classic-6ff1733e6-20230225",
rendererPackageName: "react-dom"
};
(function (internals) {
Expand Down Expand Up @@ -16307,7 +16308,7 @@ var devToolsConfig$jscomp$inline_1821 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-1173a17e6-20230225"
reconcilerVersion: "18.3.0-next-6ff1733e6-20230225"
});
assign(Internals, {
ReactBrowserEventEmitter: {
Expand Down Expand Up @@ -16550,7 +16551,7 @@ exports.unstable_renderSubtreeIntoContainer = function (
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-1173a17e6-20230225";
exports.version = "18.3.0-next-6ff1733e6-20230225";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
9 changes: 5 additions & 4 deletions compiled/facebook-www/ReactDOM-profiling.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -4524,7 +4524,8 @@ function preload$1(href, options) {
rel: "preload",
as: as,
crossOrigin: "font" === as ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
}),
preloadPropsMap.set(key, href),
null === ownerDocument.querySelector(limitedEscapedHref) &&
Expand Down Expand Up @@ -15782,7 +15783,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1780 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-1173a17e6-20230225",
version: "18.3.0-www-modern-6ff1733e6-20230225",
rendererPackageName: "react-dom"
};
(function (internals) {
Expand Down Expand Up @@ -15827,7 +15828,7 @@ var devToolsConfig$jscomp$inline_1780 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-1173a17e6-20230225"
reconcilerVersion: "18.3.0-next-6ff1733e6-20230225"
});
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals;
exports.createPortal = function (children, container) {
Expand Down Expand Up @@ -15999,7 +16000,7 @@ exports.unstable_flushControlled = function (fn) {
}
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-1173a17e6-20230225";
exports.version = "18.3.0-next-6ff1733e6-20230225";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
5 changes: 3 additions & 2 deletions compiled/facebook-www/ReactDOMServer-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (__DEV__) {
var React = require("react");
var ReactDOM = require("react-dom");

var ReactVersion = "18.3.0-www-classic-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-classic-6ff1733e6-20230225";

// This refers to a WWW module.
var warningWWW = require("warning");
Expand Down Expand Up @@ -7092,7 +7092,8 @@ function preloadPropsFromPreloadOptions(href, as, options) {
as: as,
href: href,
crossOrigin: as === "font" ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
};
}

Expand Down
5 changes: 3 additions & 2 deletions compiled/facebook-www/ReactDOMServer-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (__DEV__) {
var React = require("react");
var ReactDOM = require("react-dom");

var ReactVersion = "18.3.0-www-modern-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-modern-6ff1733e6-20230225";

// This refers to a WWW module.
var warningWWW = require("warning");
Expand Down Expand Up @@ -7092,7 +7092,8 @@ function preloadPropsFromPreloadOptions(href, as, options) {
as: as,
href: href,
crossOrigin: as === "font" ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
};
}

Expand Down
5 changes: 3 additions & 2 deletions compiled/facebook-www/ReactDOMServer-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,8 @@ function preload(href, options) {
as: as,
href: href,
crossOrigin: "font" === as ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
}
}),
resources.preloadsMap.set(key, resource),
Expand Down Expand Up @@ -3720,4 +3721,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 = "18.3.0-www-classic-1173a17e6-20230225";
exports.version = "18.3.0-www-classic-6ff1733e6-20230225";
5 changes: 3 additions & 2 deletions compiled/facebook-www/ReactDOMServer-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,8 @@ function preload(href, options) {
as: as,
href: href,
crossOrigin: "font" === as ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
}
}),
resources.preloadsMap.set(key, resource),
Expand Down Expand Up @@ -3618,4 +3619,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 = "18.3.0-www-modern-1173a17e6-20230225";
exports.version = "18.3.0-www-modern-6ff1733e6-20230225";
3 changes: 2 additions & 1 deletion compiled/facebook-www/ReactDOMServerStreaming-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -7099,7 +7099,8 @@ function preloadPropsFromPreloadOptions(href, as, options) {
as: as,
href: href,
crossOrigin: as === "font" ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
};
}

Expand Down
3 changes: 2 additions & 1 deletion compiled/facebook-www/ReactDOMServerStreaming-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -1825,7 +1825,8 @@ function preload(href, options) {
as: as,
href: href,
crossOrigin: "font" === as ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
}
}),
resources.preloadsMap.set(key, resource),
Expand Down
5 changes: 3 additions & 2 deletions compiled/facebook-www/ReactDOMTesting-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -31239,7 +31239,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-classic-1173a17e6-20230225";
var ReactVersion = "18.3.0-www-classic-6ff1733e6-20230225";

function createPortal$1(
children,
Expand Down Expand Up @@ -33387,7 +33387,8 @@ function preloadPropsFromPreloadOptions(href, as, options) {
rel: "preload",
as: as,
crossOrigin: as === "font" ? "" : options.crossOrigin,
integrity: options.integrity
integrity: options.integrity,
type: options.type
};
} // --------------------------------------
// ReactDOM.preinit
Expand Down
Loading

0 comments on commit 0657099

Please sign in to comment.