Unverified Commit 43393d53 authored by Janicklas Ralph's avatar Janicklas Ralph Committed by GitHub

Fix `next/script` unhandled promise rejection (#27903)



## Bug

- [x] fixes #27747
- [x] Integration tests added
parent eb871d30
...@@ -10,8 +10,8 @@ const LoadCache = new Set() ...@@ -10,8 +10,8 @@ const LoadCache = new Set()
export interface ScriptProps extends ScriptHTMLAttributes<HTMLScriptElement> { export interface ScriptProps extends ScriptHTMLAttributes<HTMLScriptElement> {
strategy?: 'afterInteractive' | 'lazyOnload' | 'beforeInteractive' strategy?: 'afterInteractive' | 'lazyOnload' | 'beforeInteractive'
id?: string id?: string
onLoad?: () => void onLoad?: (e: any) => void
onError?: () => void onError?: (e: any) => void
children?: React.ReactNode children?: React.ReactNode
} }
...@@ -56,19 +56,20 @@ const loadScript = (props: ScriptProps): void => { ...@@ -56,19 +56,20 @@ const loadScript = (props: ScriptProps): void => {
const el = document.createElement('script') const el = document.createElement('script')
const loadPromise = new Promise<void>((resolve, reject) => { const loadPromise = new Promise<void>((resolve, reject) => {
el.addEventListener('load', function () { el.addEventListener('load', function (e) {
resolve() resolve()
if (onLoad) { if (onLoad) {
onLoad.call(this) onLoad.call(this, e)
} }
}) })
el.addEventListener('error', function () { el.addEventListener('error', function (e) {
reject() reject(e)
})
}).catch(function (e) {
if (onError) { if (onError) {
onError() onError(e)
} }
}) })
})
if (src) { if (src) {
ScriptCache.set(src, loadPromise) ScriptCache.set(src, loadPromise)
......
...@@ -15,6 +15,14 @@ const Page = () => { ...@@ -15,6 +15,14 @@ const Page = () => {
src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.20/lodash.min.js?a=scriptLazyOnload" src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.20/lodash.min.js?a=scriptLazyOnload"
strategy="lazyOnload" strategy="lazyOnload"
></Script> ></Script>
<Script
src="https://example.com/doesntexist"
strategy="lazyOnload"
onError={(e) => {
console.log('error')
console.log(e)
}}
/>
<div>page3</div> <div>page3</div>
</div> </div>
) )
......
...@@ -69,6 +69,12 @@ describe('Script Loader', () => { ...@@ -69,6 +69,12 @@ describe('Script Loader', () => {
await browser.waitForElementByCss('#onload-div') await browser.waitForElementByCss('#onload-div')
await waitFor(1000) await waitFor(1000)
const logs = await browser.log('browser')
const filteredLogs = logs.filter(
(log) => !log.message.includes('Failed to load resource')
)
expect(filteredLogs.length).toBe(0)
async function test(id) { async function test(id) {
const script = await browser.elementById(id) const script = await browser.elementById(id)
const endScripts = await browser.elementsByCss( const endScripts = await browser.elementsByCss(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment