Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions packages/next/client/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,17 @@ window.__NEXT_P = []
const headManager: {
mountedInstances: Set<unknown>
updateHead: (head: JSX.Element[]) => void
getIsSsr?: () => boolean
} = initHeadManager()
const appElement: HTMLElement | null = document.getElementById('__next')

let lastRenderReject: (() => void) | null
let webpackHMR: any
export let router: Router
let CachedApp: AppComponent, onPerfEntry: (metric: any) => void
headManager.getIsSsr = () => {
return router.isSsr
}

class Container extends React.Component<{
fn: (err: Error, info?: any) => void
Expand Down
7 changes: 5 additions & 2 deletions packages/next/client/script.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ function Script(props: ScriptProps): JSX.Element | null {
} = props

// Context is available only during SSR
const { updateScripts, scripts } = useContext(HeadManagerContext)
const { updateScripts, scripts, getIsSsr } = useContext(HeadManagerContext)

useEffect(() => {
if (strategy === 'afterInteractive') {
Expand All @@ -161,7 +161,10 @@ function Script(props: ScriptProps): JSX.Element | null {
},
])
updateScripts(scripts)
} else {
} else if (getIsSsr && getIsSsr()) {
// Script has already loaded during SSR
LoadCache.add(restProps.id || src)
} else if (getIsSsr && !getIsSsr()) {
loadScript(props)
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/next/shared/lib/head-manager-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export const HeadManagerContext: React.Context<{
mountedInstances?: any
updateScripts?: (state: any) => void
scripts?: any
getIsSsr?: () => boolean
}> = React.createContext({})

if (process.env.NODE_ENV !== 'production') {
Expand Down
9 changes: 4 additions & 5 deletions test/integration/script-loader/pages/page3.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ const Page = () => {
return (
<div class="container">
<Script id="inline-script">
{`(window.onload = function () {
const newDiv = document.createElement('div')
newDiv.id = 'onload-div'
document.querySelector('body').appendChild(newDiv)
})`}
{`const newDiv = document.createElement('div')
newDiv.id = 'onload-div'
document.querySelector('body').appendChild(newDiv)
`}
</Script>
<Script
id="scriptLazyOnload"
Expand Down
13 changes: 12 additions & 1 deletion test/integration/script-loader/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,25 @@ describe('Script Loader', () => {
try {
browser = await webdriver(appPort, '/')

// beforeInteractive scripts should load once
let documentBIScripts = await browser.elementsByCss(
'[src$="documentBeforeInteractive"]'
)
expect(documentBIScripts.length).toBe(1)

await browser.waitForElementByCss('[href="/page1"]')
await browser.click('[href="/page1"]')

await browser.waitForElementByCss('.container')
await waitFor(1000)

const script = await browser.elementById('scriptBeforeInteractive')

// Ensure beforeInteractive script isn't duplicated on navigation
documentBIScripts = await browser.elementsByCss(
'[src$="documentBeforeInteractive"]'
)
expect(documentBIScripts.length).toBe(1)

// Renders script tag
expect(script).toBeDefined()
} finally {
Expand Down