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.

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

[Float][Fizz] add crossOrigin support for preloading bootstrap scripts and bootstrap modules #26942

Merged
merged 1 commit into from
Jun 13, 2023
Merged
Changes from all commits
Commits
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
The recently merged support for crossorigin in bootstrap scripts did …
…not implement the functionality for preloading. This adds it
gnoff committed Jun 13, 2023
commit d7ef27d8e65da13910d75e5c527143c50ddb8c33
8 changes: 6 additions & 2 deletions packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js
Original file line number Diff line number Diff line change
@@ -281,7 +281,7 @@ export function createResponseState(
? 'use-credentials'
: '';

preloadBootstrapScript(resources, src, nonce, integrity);
preloadBootstrapScript(resources, src, nonce, integrity, crossOrigin);

bootstrapChunks.push(
startScriptSrc,
@@ -322,7 +322,7 @@ export function createResponseState(
? 'use-credentials'
: '';

preloadBootstrapModule(resources, src, nonce, integrity);
preloadBootstrapModule(resources, src, nonce, integrity, crossOrigin);

bootstrapChunks.push(
startModuleSrc,
@@ -5425,6 +5425,7 @@ function preloadBootstrapScript(
src: string,
nonce: ?string,
integrity: ?string,
crossOrigin: ?string,
): void {
const key = getResourceKey('script', src);
if (__DEV__) {
@@ -5444,6 +5445,7 @@ function preloadBootstrapScript(
as: 'script',
nonce,
integrity,
crossOrigin,
};
const resource: PreloadResource = {
type: 'preload',
@@ -5465,6 +5467,7 @@ function preloadBootstrapModule(
src: string,
nonce: ?string,
integrity: ?string,
crossOrigin: ?string,
): void {
const key = getResourceKey('script', src);
if (__DEV__) {
@@ -5483,6 +5486,7 @@ function preloadBootstrapModule(
href: src,
nonce,
integrity,
crossOrigin,
};
const resource: PreloadResource = {
type: 'preload',
14 changes: 13 additions & 1 deletion packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js
Original file line number Diff line number Diff line change
@@ -3865,7 +3865,19 @@ describe('ReactDOMFizzServer', () => {

expect(getVisibleChildren(document)).toEqual(
<html>
<head />
<head>
<link rel="preload" href="foo" as="script" />
<link rel="preload" href="bar" as="script" />
<link rel="preload" href="baz" as="script" crossorigin="" />
<link rel="preload" href="qux" as="script" crossorigin="" />
<link rel="modulepreload" href="quux" />
<link rel="modulepreload" href="corge" />
<link
rel="modulepreload"
href="grault"
crossorigin="use-credentials"
/>
</head>
<body>
<div>hello world</div>
</body>