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.

Sign up for GitHub

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

fix(next): add cross origin in react dom preload #67423

Merged
merged 5 commits into from
Jul 5, 2024
Merged

fix(next): add cross origin in react dom preload #67423

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6198214
fix(next): add cross origin in reactdom preload
syi0808 Jul 3, 2024
8d84220
test(next): add test for next script crossorigin in app dir
syi0808 Jul 3, 2024
baf199f
test: createNext to nextTestSetup with pnpm new-test command
syi0808 Jul 4, 2024
65034bd
refactor: clean up test
syi0808 Jul 4, 2024
83d55ed
Merge branch 'canary' into fix/preload-link-tag-missing-cross-origin
devjiwonchoi Jul 4, 2024
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
18 changes: 14 additions & 4 deletions packages/next/src/client/script.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,13 @@ function Script(props: ScriptProps): JSX.Element | null {
ReactDOM.preload(
src,
restProps.integrity
? { as: 'script', integrity: restProps.integrity, nonce }
: { as: 'script', nonce }
? {
as: 'script',
integrity: restProps.integrity,
nonce,
crossOrigin: restProps.crossOrigin,
}
: { as: 'script', nonce, crossOrigin: restProps.crossOrigin }
)
return (
<script
Expand All @@ -353,8 +358,13 @@ function Script(props: ScriptProps): JSX.Element | null {
ReactDOM.preload(
src,
restProps.integrity
? { as: 'script', integrity: restProps.integrity, nonce }
: { as: 'script', nonce }
? {
as: 'script',
integrity: restProps.integrity,
nonce,
crossOrigin: restProps.crossOrigin,
}
: { as: 'script', nonce, crossOrigin: restProps.crossOrigin }
)
}
}
Expand Down
8 changes: 8 additions & 0 deletions test/e2e/app-dir/next-script/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { ReactNode } from 'react'
export default function Root({ children }: { children: ReactNode }) {
return (
<html>
<body>{children}</body>
</html>
)
}
10 changes: 10 additions & 0 deletions test/e2e/app-dir/next-script/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import Script from 'next/script'

export default function Page() {
return (
<Script
src="https://code.jquery.com/jquery-3.7.1.min.js"
crossOrigin="use-credentials"
/>
)
}
26 changes: 26 additions & 0 deletions test/e2e/app-dir/next-script/next-script.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { nextTestSetup } from 'e2e-utils'
import { BrowserInterface } from '../../../lib/browsers/base'

describe('Script component with crossOrigin props', () => {
const { next } = nextTestSetup({
files: __dirname,
})

it('should be set crossOrigin also in preload link tag', async () => {
let browser: BrowserInterface

try {
browser = await next.browser('/')

expect(
await browser
.elementByCss(
'link[href="https://code.jquery.com/jquery-3.7.1.min.js"]'
)
.getAttribute('crossorigin')
).toBe('use-credentials')
} finally {
if (browser) await browser.close()
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let browser: BrowserInterface
try {
browser = await next.browser('/')
expect(
await browser
.elementByCss(
'link[href="https://code.jquery.com/jquery-3.7.1.min.js"]'
)
.getAttribute('crossorigin')
).toBe('use-credentials')
} finally {
if (browser) await browser.close()
}
const browser = await next.browser('/')
const crossOrigin = await browser
.elementByCss('link[href="https://code.jquery.com/jquery-3.7.1.min.js"]')
.getAttribute('crossorigin')
expect(crossOrigin).toBe('use-credentials')

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK you don't need manual close at the end!

Copy link
Contributor Author

@syi0808 syi0808 Jul 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it make sense more. Thank you! It reflected.

})
})
6 changes: 6 additions & 0 deletions test/e2e/app-dir/next-script/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {}

module.exports = nextConfig
Loading