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

Jump to bottom

Add script to script loader when strategy prop is undefined #65585

Merged
merged 7 commits into from
May 15, 2024
Merged

Add script to script loader when strategy prop is undefined #65585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8aed03
fix(next/script): Add to script loader even when strategy prop is und…
hwangstar156 May 9, 2024
f0d689f
Merge branch 'canary' into fix-next-script-empty-strategy-prop
hwangstar156 May 10, 2024
a99bb57
Merge branch 'canary' into fix-next-script-empty-strategy-prop
hwangstar156 May 10, 2024
cf162fe
Merge branch 'canary' into fix-next-script-empty-strategy-prop
hwangstar156 May 11, 2024
c534a1c
fix(next/script): Add empty prop script in document test
hwangstar156 May 14, 2024
7d88b99
Merge branch 'canary' into fix-next-script-empty-strategy-prop
hwangstar156 May 14, 2024
07f4610
Merge branch 'canary' into fix-next-script-empty-strategy-prop
ijjk May 15, 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
3 changes: 3 additions & 0 deletions packages/next/src/pages/_document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,9 @@ function handleDocumentScriptLoaderItems(
) {
scriptLoaderItems.push(child.props)
return
} else if (typeof child.props.strategy === 'undefined') {
scriptLoaderItems.push({ ...child.props, strategy: 'afterInteractive' })
return
}
}
})
Expand Down
119 changes: 119 additions & 0 deletions test/e2e/next-script/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,125 @@ describe('beforeInteractive in document body', () => {
}
})
})

describe('empty strategy in document Head', () => {
let next: NextInstance

beforeAll(async () => {
next = await createNext({
files: {
'pages/_document.js': `
import { Html, Head, Main, NextScript } from 'next/document'
import Script from 'next/script'

export default function Document() {
return (
<Html>
<Head>
<Script
src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.20/lodash.min.js"
></Script>
</Head>
<body>
<Main />
<NextScript />
</body>
</Html>
)
}
`,
'pages/index.js': `
export default function Home() {
return (
<>
<p>Home page</p>
</>
)
}
`,
},
dependencies: {
react: '19.0.0-beta-4508873393-20240430',
'react-dom': '19.0.0-beta-4508873393-20240430',
},
})
})
afterAll(() => next.destroy())

it('Script is injected server-side', async () => {
let browser: BrowserInterface

try {
browser = await webdriver(next.url, '/')

const script = await browser.eval(
`document.querySelector('script[data-nscript="afterInteractive"]')`
)
expect(script).not.toBeNull()
} finally {
if (browser) await browser.close()
}
})
})

describe('empty strategy in document body', () => {
let next: NextInstance

beforeAll(async () => {
next = await createNext({
files: {
'pages/_document.js': `
import { Html, Head, Main, NextScript } from 'next/document'
import Script from 'next/script'

export default function Document() {
return (
<Html>
<Head/>
<body>
<Main />
<NextScript />
<Script
src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.20/lodash.min.js"
/>
</body>
</Html>
)
}
`,
'pages/index.js': `
export default function Home() {
return (
<>
<p>Home page</p>
</>
)
}
`,
},
dependencies: {
react: '19.0.0-beta-4508873393-20240430',
'react-dom': '19.0.0-beta-4508873393-20240430',
},
})
})
afterAll(() => next.destroy())

it('Script is injected server-side', async () => {
let browser: BrowserInterface

try {
browser = await webdriver(next.url, '/')

const script = await browser.eval(
`document.querySelector('script[data-nscript="afterInteractive"]')`
)
expect(script).not.toBeNull()
} finally {
if (browser) await browser.close()
}
})
})
;(process.env.TURBOPACK ? describe.skip : describe)(
'experimental.nextScriptWorkers',
() => {
Expand Down
Loading