Skip to content

Commit 8109efd

Browse files
bpunssapphi-red
andauthored
perf(build): remove preload link listeners on settle (fix #23920) (#23922)
Co-authored-by: sapphi-red <[email protected]>
1 parent 175bbeb commit 8109efd

3 files changed

Lines changed: 37 additions & 6 deletions

File tree

‎packages/vite/src/node/plugins/importAnalysisBuild.ts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,17 @@ function preload(
310310
document.head.appendChild(link)
311311
if (isCss) {
312312
return new Promise((res, rej) => {
313-
link.addEventListener('load', res)
314-
link.addEventListener('error', () =>
315-
rej(new Error(`Unable to preload CSS for ${dep}`)),
316-
)
313+
const handleSettle = (e: Event) => {
314+
link.removeEventListener('load', handleSettle)
315+
link.removeEventListener('error', handleSettle)
316+
if (e.type === 'error') {
317+
rej(new Error(`Unable to preload CSS for ${dep}`))
318+
} else {
319+
res(e)
320+
}
321+
}
322+
link.addEventListener('load', handleSettle)
323+
link.addEventListener('error', handleSettle)
317324
})
318325
}
319326
})

‎playground/js-sourcemap/__tests__/js-sourcemap.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ describe.runIf(isBuild)('build tests', () => {
365365
SourceMap {
366366
content: {
367367
"debugId": "00000000-0000-0000-0000-000000000000",
368-
"mappings": ";g+CAAAA,MAAA,OAAO,qDAEP,QAAQ,IAAI,uBAAuB,E",
368+
"mappings": ";gkDAAAA,MAAA,OAAO,qDAEP,QAAQ,IAAI,uBAAuB,E",
369369
"names": [
370370
"__vitePreload",
371371
],
@@ -380,7 +380,7 @@ describe.runIf(isBuild)('build tests', () => {
380380
],
381381
"version": 3,
382382
},
383-
visualization: "https://evanw.github.io/source-map-visualization/#MTg3NQBjb25zdCBfX3ZpdGVfX21hcERlcHM9KGksbT1fX3ZpdGVfX21hcERlcHMsZD0obS5mfHwobS5mPVsiYXNzZXRzL2R5bmFtaWMtZm9vLUJ3aFpUa3RCLmpzIiwiYXNzZXRzL2R5bmFtaWMtZm9vLURzcUtSckV5LmNzcyJdKSkpPT5pLm1hcChpPT5kW2ldKTsKdmFyIGU9ZnVuY3Rpb24oZSl7cmV0dXJuYC9gK2V9LHQ9e30sbj1mdW5jdGlvbihlKXtyZXR1cm4gZS5wYXRobmFtZS5lbmRzV2l0aChgLmNzc2ApfSxyPWZ1bmN0aW9uKGUsdCxuKXtpZih0IGluIGUpcmV0dXJuIGVbdF07bGV0IHI9bigpO2lmKCFyKXtlW3RdPXZvaWQgMDtyZXR1cm59bGV0IGk9ci50aGVuKCgpPT57ZVt0XT12b2lkIDB9LG49Pnt0aHJvdyBlW3RdPXZvaWQgMCxufSk7cmV0dXJuIGVbdF09aSxpfSxpPWZ1bmN0aW9uKGksYSxvKXtsZXQgcz1Qcm9taXNlLnJlc29sdmUoKTtpZihhJiZhLmxlbmd0aD4wKXtsZXQgaSxjPWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYG1ldGFbcHJvcGVydHk9Y3NwLW5vbmNlXWApLGw9Yz8ubm9uY2V8fGM/LmdldEF0dHJpYnV0ZShgbm9uY2VgKTtmdW5jdGlvbiB1KGUpe3JldHVybiBQcm9taXNlLmFsbChlLm1hcChlPT5Qcm9taXNlLnJlc29sdmUoZSkudGhlbihlPT4oe3N0YXR1czpgZnVsZmlsbGVkYCx2YWx1ZTplfSksZT0+KHtzdGF0dXM6YHJlamVjdGVkYCxyZWFzb246ZX0pKSkpfWZ1bmN0aW9uIGQoZSl7cmV0dXJuIGltcG9ydC5tZXRhLnJlc29sdmU/bmV3IFVSTChpbXBvcnQubWV0YS5yZXNvbHZlKGUpKTpuZXcgVVJMKGUsaW1wb3J0Lm1ldGEudXJsKX1zPXUoYS5tYXAoYT0+e2E9ZShhLG8pO2xldCBzPWQoYSksYz1uKHMpO3JldHVybiByKHQscy5ocmVmLCgpPT57aWYoaT09PXZvaWQgMCl7aT17YWxsOm5ldyBTZXQsc3R5bGVzOm5ldyBTZXR9O2xldCBlPWRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKGBsaW5rYCk7Zm9yKGxldCB0PWUubGVuZ3RoLTE7dD49MDt0LS0pe2xldCBuPWVbdF07aS5hbGwuYWRkKG4uaHJlZiksbi5yZWw9PT1gc3R5bGVzaGVldGAmJmkuc3R5bGVzLmFkZChuLmhyZWYpfX1pZigoYz9pLnN0eWxlczppLmFsbCkuaGFzKHMuaHJlZikpcmV0dXJuO2xldCBlPWRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoYGxpbmtgKTtpZihlLnJlbD1jP2BzdHlsZXNoZWV0YDpgbW9kdWxlcHJlbG9hZGAsY3x8KGUuYXM9YHNjcmlwdGApLGUuY3Jvc3NPcmlnaW49YGAsZS5ocmVmPXMuaHJlZixsJiZlLnNldEF0dHJpYnV0ZShgbm9uY2VgLGwpLGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoZSksYylyZXR1cm4gbmV3IFByb21pc2UoKHQsbik9PntlLmFkZEV2ZW50TGlzdGVuZXIoYGxvYWRgLHQpLGUuYWRkRXZlbnRMaXN0ZW5lcihgZXJyb3JgLCgpPT5uKEVycm9yKGBVbmFibGUgdG8gcHJlbG9hZCBDU1MgZm9yICR7c31gKSkpfSl9KX0pLmZpbHRlcihlPT5lIT09dm9pZCAwKSl9ZnVuY3Rpb24gYyhlKXtsZXQgdD1uZXcgRXZlbnQoYHZpdGU6cHJlbG9hZEVycm9yYCx7Y2FuY2VsYWJsZTohMH0pO2lmKHQucGF5bG9hZD1lLHdpbmRvdy5kaXNwYXRjaEV2ZW50KHQpLCF0LmRlZmF1bHRQcmV2ZW50ZWQpdGhyb3cgZX1yZXR1cm4gcy50aGVuKGU9Pntmb3IobGV0IHQgb2YgZXx8W10pdC5zdGF0dXM9PT1gcmVqZWN0ZWRgJiZjKHQucmVhc29uKTtyZXR1cm4gaSgpLmNhdGNoKGMpfSl9O2koKCk9PmltcG9ydChgLi9keW5hbWljLWZvby1Cd2haVGt0Qi5qc2ApLF9fdml0ZV9fbWFwRGVwcyhbMCwxXSkpLGNvbnNvbGUubG9nKGBhZnRlciBwcmVsb2FkIGR5bmFtaWNgKTtleHBvcnR7aSBhcyB0fTsKLy8jIGRlYnVnSWQ9ZmM1MWIzY2EtMjdjNy00NWNhLTk4MDgtNzc0ODQ4YzM3ZTE2Ci8vIyBzb3VyY2VNYXBwaW5nVVJMPWFmdGVyLXByZWxvYWQtZHluYW1pYy1EOFViUEtKOC5qcy5tYXAyODUAeyJkZWJ1Z0lkIjoiMDAwMDAwMDAtMDAwMC0wMDAwLTAwMDAtMDAwMDAwMDAwMDAwIiwibWFwcGluZ3MiOiI7ZytDQUFBQSxNQUFBLE9BQU8scURBRVAsUUFBUSxJQUFJLHVCQUF1QixFIiwibmFtZXMiOlsiX192aXRlUHJlbG9hZCJdLCJzb3VyY2VzIjpbIi4uLy4uL2FmdGVyLXByZWxvYWQtZHluYW1pYy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQoJy4vZHluYW1pYy9keW5hbWljLWZvbycpXG5cbmNvbnNvbGUubG9nKCdhZnRlciBwcmVsb2FkIGR5bmFtaWMnKVxuIl0sInZlcnNpb24iOjN9"
383+
visualization: "https://evanw.github.io/source-map-visualization/#MTk3MQBjb25zdCBfX3ZpdGVfX21hcERlcHM9KGksbT1fX3ZpdGVfX21hcERlcHMsZD0obS5mfHwobS5mPVsiYXNzZXRzL2R5bmFtaWMtZm9vLUJ3aFpUa3RCLmpzIiwiYXNzZXRzL2R5bmFtaWMtZm9vLURzcUtSckV5LmNzcyJdKSkpPT5pLm1hcChpPT5kW2ldKTsKdmFyIGU9ZnVuY3Rpb24oZSl7cmV0dXJuYC9gK2V9LHQ9e30sbj1mdW5jdGlvbihlKXtyZXR1cm4gZS5wYXRobmFtZS5lbmRzV2l0aChgLmNzc2ApfSxyPWZ1bmN0aW9uKGUsdCxuKXtpZih0IGluIGUpcmV0dXJuIGVbdF07bGV0IHI9bigpO2lmKCFyKXtlW3RdPXZvaWQgMDtyZXR1cm59bGV0IGk9ci50aGVuKCgpPT57ZVt0XT12b2lkIDB9LG49Pnt0aHJvdyBlW3RdPXZvaWQgMCxufSk7cmV0dXJuIGVbdF09aSxpfSxpPWZ1bmN0aW9uKGksYSxvKXtsZXQgcz1Qcm9taXNlLnJlc29sdmUoKTtpZihhJiZhLmxlbmd0aD4wKXtsZXQgaSxjPWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYG1ldGFbcHJvcGVydHk9Y3NwLW5vbmNlXWApLGw9Yz8ubm9uY2V8fGM/LmdldEF0dHJpYnV0ZShgbm9uY2VgKTtmdW5jdGlvbiB1KGUpe3JldHVybiBQcm9taXNlLmFsbChlLm1hcChlPT5Qcm9taXNlLnJlc29sdmUoZSkudGhlbihlPT4oe3N0YXR1czpgZnVsZmlsbGVkYCx2YWx1ZTplfSksZT0+KHtzdGF0dXM6YHJlamVjdGVkYCxyZWFzb246ZX0pKSkpfWZ1bmN0aW9uIGQoZSl7cmV0dXJuIGltcG9ydC5tZXRhLnJlc29sdmU/bmV3IFVSTChpbXBvcnQubWV0YS5yZXNvbHZlKGUpKTpuZXcgVVJMKGUsaW1wb3J0Lm1ldGEudXJsKX1zPXUoYS5tYXAoYT0+e2E9ZShhLG8pO2xldCBzPWQoYSksYz1uKHMpO3JldHVybiByKHQscy5ocmVmLCgpPT57aWYoaT09PXZvaWQgMCl7aT17YWxsOm5ldyBTZXQsc3R5bGVzOm5ldyBTZXR9O2xldCBlPWRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKGBsaW5rYCk7Zm9yKGxldCB0PWUubGVuZ3RoLTE7dD49MDt0LS0pe2xldCBuPWVbdF07aS5hbGwuYWRkKG4uaHJlZiksbi5yZWw9PT1gc3R5bGVzaGVldGAmJmkuc3R5bGVzLmFkZChuLmhyZWYpfX1pZigoYz9pLnN0eWxlczppLmFsbCkuaGFzKHMuaHJlZikpcmV0dXJuO2xldCBlPWRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoYGxpbmtgKTtpZihlLnJlbD1jP2BzdHlsZXNoZWV0YDpgbW9kdWxlcHJlbG9hZGAsY3x8KGUuYXM9YHNjcmlwdGApLGUuY3Jvc3NPcmlnaW49YGAsZS5ocmVmPXMuaHJlZixsJiZlLnNldEF0dHJpYnV0ZShgbm9uY2VgLGwpLGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoZSksYylyZXR1cm4gbmV3IFByb21pc2UoKHQsbik9PntsZXQgcj1pPT57ZS5yZW1vdmVFdmVudExpc3RlbmVyKGBsb2FkYCxyKSxlLnJlbW92ZUV2ZW50TGlzdGVuZXIoYGVycm9yYCxyKSxpLnR5cGU9PT1gZXJyb3JgP24oRXJyb3IoYFVuYWJsZSB0byBwcmVsb2FkIENTUyBmb3IgJHtzfWApKTp0KGkpfTtlLmFkZEV2ZW50TGlzdGVuZXIoYGxvYWRgLHIpLGUuYWRkRXZlbnRMaXN0ZW5lcihgZXJyb3JgLHIpfSl9KX0pLmZpbHRlcihlPT5lIT09dm9pZCAwKSl9ZnVuY3Rpb24gYyhlKXtsZXQgdD1uZXcgRXZlbnQoYHZpdGU6cHJlbG9hZEVycm9yYCx7Y2FuY2VsYWJsZTohMH0pO2lmKHQucGF5bG9hZD1lLHdpbmRvdy5kaXNwYXRjaEV2ZW50KHQpLCF0LmRlZmF1bHRQcmV2ZW50ZWQpdGhyb3cgZX1yZXR1cm4gcy50aGVuKGU9Pntmb3IobGV0IHQgb2YgZXx8W10pdC5zdGF0dXM9PT1gcmVqZWN0ZWRgJiZjKHQucmVhc29uKTtyZXR1cm4gaSgpLmNhdGNoKGMpfSl9O2koKCk9PmltcG9ydChgLi9keW5hbWljLWZvby1Cd2haVGt0Qi5qc2ApLF9fdml0ZV9fbWFwRGVwcyhbMCwxXSkpLGNvbnNvbGUubG9nKGBhZnRlciBwcmVsb2FkIGR5bmFtaWNgKTtleHBvcnR7aSBhcyB0fTsKLy8jIGRlYnVnSWQ9MWM0YThlMTQtMTUwZi00NTIyLTlhYmQtYmEzYTBkZGIyOTg4Ci8vIyBzb3VyY2VNYXBwaW5nVVJMPWFmdGVyLXByZWxvYWQtZHluYW1pYy1jU280VUZRLS5qcy5tYXAyODUAeyJkZWJ1Z0lkIjoiMDAwMDAwMDAtMDAwMC0wMDAwLTAwMDAtMDAwMDAwMDAwMDAwIiwibWFwcGluZ3MiOiI7Z2tEQUFBQSxNQUFBLE9BQU8scURBRVAsUUFBUSxJQUFJLHVCQUF1QixFIiwibmFtZXMiOlsiX192aXRlUHJlbG9hZCJdLCJzb3VyY2VzIjpbIi4uLy4uL2FmdGVyLXByZWxvYWQtZHluYW1pYy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQoJy4vZHluYW1pYy9keW5hbWljLWZvbycpXG5cbmNvbnNvbGUubG9nKCdhZnRlciBwcmVsb2FkIGR5bmFtaWMnKVxuIl0sInZlcnNpb24iOjN9"
384384
}
385385
`)
386386
// verify sourcemap comment is preserved at the last line

‎playground/preload/__tests__/preload.spec.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,28 @@ describe.runIf(isBuild)('build', () => {
3939
await page.waitForSelector('#about output')
4040
expect(await chunkPreloads()).toHaveLength(1)
4141
})
42+
43+
test('removes load/error listeners once the preload link settles', async () => {
44+
await page.reload()
45+
await page.waitForSelector('#done')
46+
await page.click('#hello .load')
47+
await page.waitForSelector('#hello output')
48+
49+
const client = await page.context().newCDPSession(page)
50+
try {
51+
const { result: link } = await client.send('Runtime.evaluate', {
52+
expression: `document.querySelector('link[rel="stylesheet"][href*="/assets/hello-"]')`,
53+
})
54+
expect(link.subtype).toBe('node')
55+
56+
const { listeners } = await client.send('DOMDebugger.getEventListeners', {
57+
objectId: link.objectId!,
58+
})
59+
expect(
60+
listeners.filter(({ type }) => type === 'load' || type === 'error'),
61+
).toStrictEqual([])
62+
} finally {
63+
await client.detach()
64+
}
65+
})
4266
})

0 commit comments

Comments
 (0)