Skip to content

Commit cd781a4

Browse files
committed
Float: Add support for crossOrigin="anonymous"
1 parent d8f3067 commit cd781a4

File tree

4 files changed

+61
-19
lines changed

4 files changed

+61
-19
lines changed

packages/react-dom-bindings/src/shared/crossOriginStrings.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export opaque type CrossOriginString: string = string;
1111

1212
export function getCrossOriginString(input: ?string): ?CrossOriginString {
1313
if (typeof input === 'string') {
14-
return input === 'use-credentials' ? input : '';
14+
return input === 'use-credentials' || input === 'anonymous' ? input : '';
1515
}
1616
return undefined;
1717
}
@@ -24,7 +24,7 @@ export function getCrossOriginStringAs(
2424
return '';
2525
}
2626
if (typeof input === 'string') {
27-
return input === 'use-credentials' ? input : '';
27+
return input === 'use-credentials' || input === 'anonymous' ? input : '';
2828
}
2929
return undefined;
3030
}

packages/react-dom/src/__tests__/ReactDOMFizzStaticFloat-test.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,12 @@ describe('ReactDOMFizzStaticFloat', () => {
160160
crossorigin="use-credentials"
161161
integrity="module-hash"
162162
/>,
163-
<link rel="preload" as="style" href="style anon" crossorigin="" />,
163+
<link
164+
rel="preload"
165+
as="style"
166+
href="style anon"
167+
crossorigin="anonymous"
168+
/>,
164169
<link rel="preload" as="script" href="script anon" crossorigin="" />,
165170
<link
166171
rel="modulepreload"
@@ -207,7 +212,7 @@ describe('ReactDOMFizzStaticFloat', () => {
207212
rel="stylesheet"
208213
data-precedence="default"
209214
href="style anon"
210-
crossorigin=""
215+
crossorigin="anonymous"
211216
/>
212217
</head>
213218
<body>
@@ -231,7 +236,12 @@ describe('ReactDOMFizzStaticFloat', () => {
231236
crossorigin="use-credentials"
232237
integrity="module-hash"
233238
/>
234-
<link rel="preload" as="style" href="style anon" crossorigin="" />
239+
<link
240+
rel="preload"
241+
as="style"
242+
href="style anon"
243+
crossorigin="anonymous"
244+
/>
235245
<link rel="preload" as="script" href="script anon" crossorigin="" />
236246
<link
237247
rel="modulepreload"

packages/react-dom/src/__tests__/ReactDOMFloat-test.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3936,7 +3936,11 @@ body {
39363936
expect(getMeaningfulChildren(document)).toEqual(
39373937
<html>
39383938
<head>
3939-
<link rel="preload" as="image" crossorigin="" href="foo.png"></link>
3939+
<link
3940+
rel="preload"
3941+
as="image"
3942+
crossorigin="anonymous"
3943+
href="foo.png"></link>
39403944
<link rel="preload" as="image" crossorigin="" href="bar.png"></link>
39413945
</head>
39423946
<body>
@@ -3951,7 +3955,12 @@ body {
39513955
expect(getMeaningfulChildren(document)).toEqual(
39523956
<html>
39533957
<head>
3954-
<link rel="preload" as="image" crossorigin="" href="foo.png" />
3958+
<link
3959+
rel="preload"
3960+
as="image"
3961+
crossorigin="anonymous"
3962+
href="foo.png"
3963+
/>
39553964
<link rel="preload" as="image" crossorigin="" href="bar.png" />
39563965
</head>
39573966
<body>
@@ -5351,6 +5360,7 @@ body {
53515360
<link rel="preconnect" href="foo" />
53525361
<link rel="preconnect" href="foo" crossorigin="" />
53535362
<link rel="preconnect" href="foo" crossorigin="use-credentials" />
5363+
<link rel="preconnect" href="foo" crossorigin="anonymous" />
53545364
</head>
53555365
<body>hello world</body>
53565366
</html>,
@@ -5368,8 +5378,10 @@ body {
53685378
<link rel="preconnect" href="foo" />
53695379
<link rel="preconnect" href="foo" crossorigin="" />
53705380
<link rel="preconnect" href="foo" crossorigin="use-credentials" />
5381+
<link rel="preconnect" href="foo" crossorigin="anonymous" />
53715382
<link rel="preconnect" href="bar" />
53725383
<link rel="preconnect" href="bar" crossorigin="" />
5384+
<link rel="preconnect" href="bar" crossorigin="anonymous" />
53735385
<link rel="preconnect" href="bar" crossorigin="use-credentials" />
53745386
</head>
53755387
<body>hello world</body>

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,22 +1407,32 @@ describe('ReactFlightDOM', () => {
14071407
<head>
14081408
<link rel="dns-prefetch" href="d before" />
14091409
<link rel="preconnect" href="c before" />
1410-
<link rel="preconnect" href="c2 before" crossorigin="" />
1410+
<link rel="preconnect" href="c2 before" crossorigin="anonymous" />
14111411
<link rel="preload" as="style" href="l before" />
14121412
<link rel="modulepreload" href="lm before" />
1413-
<link rel="modulepreload" href="lm2 before" crossorigin="" />
1413+
<link rel="modulepreload" href="lm2 before" crossorigin="anonymous" />
14141414
<script async="" src="i before" />
14151415
<script type="module" async="" src="m before" />
1416-
<script type="module" async="" src="m2 before" crossorigin="" />
1416+
<script
1417+
type="module"
1418+
async=""
1419+
src="m2 before"
1420+
crossorigin="anonymous"
1421+
/>
14171422
<link rel="dns-prefetch" href="d after" />
14181423
<link rel="preconnect" href="c after" />
1419-
<link rel="preconnect" href="c2 after" crossorigin="" />
1424+
<link rel="preconnect" href="c2 after" crossorigin="anonymous" />
14201425
<link rel="preload" as="style" href="l after" />
14211426
<link rel="modulepreload" href="lm after" />
1422-
<link rel="modulepreload" href="lm2 after" crossorigin="" />
1427+
<link rel="modulepreload" href="lm2 after" crossorigin="anonymous" />
14231428
<script async="" src="i after" />
14241429
<script type="module" async="" src="m after" />
1425-
<script type="module" async="" src="m2 after" crossorigin="" />
1430+
<script
1431+
type="module"
1432+
async=""
1433+
src="m2 after"
1434+
crossorigin="anonymous"
1435+
/>
14261436
</head>
14271437
<body />
14281438
</html>,
@@ -1599,22 +1609,32 @@ describe('ReactFlightDOM', () => {
15991609
<head>
16001610
<link rel="dns-prefetch" href="d before" />
16011611
<link rel="preconnect" href="c before" />
1602-
<link rel="preconnect" href="c2 before" crossorigin="" />
1612+
<link rel="preconnect" href="c2 before" crossorigin="anonymous" />
16031613
<link rel="dns-prefetch" href="d after" />
16041614
<link rel="preconnect" href="c after" />
1605-
<link rel="preconnect" href="c2 after" crossorigin="" />
1615+
<link rel="preconnect" href="c2 after" crossorigin="anonymous" />
16061616
<script async="" src="i before" />
16071617
<script type="module" async="" src="m before" />
1608-
<script type="module" async="" src="m2 before" crossorigin="" />
1618+
<script
1619+
type="module"
1620+
async=""
1621+
src="m2 before"
1622+
crossorigin="anonymous"
1623+
/>
16091624
<script async="" src="i after" />
16101625
<script type="module" async="" src="m after" />
1611-
<script type="module" async="" src="m2 after" crossorigin="" />
1626+
<script
1627+
type="module"
1628+
async=""
1629+
src="m2 after"
1630+
crossorigin="anonymous"
1631+
/>
16121632
<link rel="preload" as="style" href="l before" />
16131633
<link rel="modulepreload" href="lm before" />
1614-
<link rel="modulepreload" href="lm2 before" crossorigin="" />
1634+
<link rel="modulepreload" href="lm2 before" crossorigin="anonymous" />
16151635
<link rel="preload" as="style" href="l after" />
16161636
<link rel="modulepreload" href="lm after" />
1617-
<link rel="modulepreload" href="lm2 after" crossorigin="" />
1637+
<link rel="modulepreload" href="lm2 after" crossorigin="anonymous" />
16181638
</head>
16191639
<body>
16201640
<p>hello world</p>

0 commit comments

Comments
 (0)