Skip to content

Commit e6f6b3e

Browse files
authored
feat(build): avoid settling seen preload dependencies for performance (#23446)
1 parent 5bce8ca commit e6f6b3e

2 files changed

Lines changed: 42 additions & 39 deletions

File tree

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

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -157,45 +157,48 @@ function preload(
157157
}
158158

159159
promise = allSettled(
160-
deps.map((dep) => {
161-
// @ts-expect-error assetsURL is declared before preload.toString()
162-
dep = assetsURL(dep, importerUrl)
163-
dep = importMetaResolve(dep)
164-
if (dep in seen) return
165-
seen[dep] = true
166-
const isCss = dep.endsWith('.css')
167-
168-
// check if the file is already preloaded by SSR markup
169-
// `dep` is already converted to an absolute URL by the `assetsURL` function
170-
for (let i = links.length - 1; i >= 0; i--) {
171-
const link = links[i]
172-
// The `links[i].href` is an absolute URL thanks to browser doing the work
173-
// for us. See https://html.spec.whatwg.org/multipage/common-dom-interfaces.html#reflecting-content-attributes-in-idl-attributes:idl-domstring-5
174-
if (link.href === dep && (!isCss || link.rel === 'stylesheet')) {
175-
return
160+
deps
161+
.map((dep) => {
162+
// @ts-expect-error assetsURL is declared before preload.toString()
163+
dep = assetsURL(dep, importerUrl)
164+
dep = importMetaResolve(dep)
165+
if (dep in seen) return
166+
seen[dep] = true
167+
const isCss = dep.endsWith('.css')
168+
169+
// check if the file is already preloaded by SSR markup
170+
// `dep` is already converted to an absolute URL by the `assetsURL` function
171+
for (let i = links.length - 1; i >= 0; i--) {
172+
const link = links[i]
173+
// The `links[i].href` is an absolute URL thanks to browser doing the work
174+
// for us. See https://html.spec.whatwg.org/multipage/common-dom-interfaces.html#reflecting-content-attributes-in-idl-attributes:idl-domstring-5
175+
if (link.href === dep && (!isCss || link.rel === 'stylesheet')) {
176+
return
177+
}
176178
}
177-
}
178179

179-
const link = document.createElement('link')
180-
link.rel = isCss ? 'stylesheet' : scriptRel
181-
if (!isCss) {
182-
link.as = 'script'
183-
}
184-
link.crossOrigin = ''
185-
link.href = dep
186-
if (cspNonce) {
187-
link.setAttribute('nonce', cspNonce)
188-
}
189-
document.head.appendChild(link)
190-
if (isCss) {
191-
return new Promise((res, rej) => {
192-
link.addEventListener('load', res)
193-
link.addEventListener('error', () =>
194-
rej(new Error(`Unable to preload CSS for ${dep}`)),
195-
)
196-
})
197-
}
198-
}),
180+
const link = document.createElement('link')
181+
link.rel = isCss ? 'stylesheet' : scriptRel
182+
if (!isCss) {
183+
link.as = 'script'
184+
}
185+
link.crossOrigin = ''
186+
link.href = dep
187+
if (cspNonce) {
188+
link.setAttribute('nonce', cspNonce)
189+
}
190+
document.head.appendChild(link)
191+
if (isCss) {
192+
return new Promise((res, rej) => {
193+
link.addEventListener('load', res)
194+
link.addEventListener('error', () =>
195+
rej(new Error(`Unable to preload CSS for ${dep}`)),
196+
)
197+
})
198+
}
199+
})
200+
// skip undefined to be converted to Promise.resolve for performance
201+
.filter((p) => p !== undefined),
199202
)
200203
}
201204

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ describe.runIf(isBuild)('build tests', () => {
361361
SourceMap {
362362
content: {
363363
"debugId": "00000000-0000-0000-0000-000000000000",
364-
"mappings": ";6pCAAA,aAAO,qDAEP,QAAQ,IAAI,uBAAuB",
364+
"mappings": ";mrCAAA,aAAO,qDAEP,QAAQ,IAAI,uBAAuB",
365365
"sources": [
366366
"../../after-preload-dynamic.js",
367367
],
@@ -373,7 +373,7 @@ describe.runIf(isBuild)('build tests', () => {
373373
],
374374
"version": 3,
375375
},
376-
visualization: "https://evanw.github.io/source-map-visualization/#MTU1MgBjb25zdCBfX3ZpdGVfX21hcERlcHM9KGksbT1fX3ZpdGVfX21hcERlcHMsZD0obS5mfHwobS5mPVsiYXNzZXRzL2R5bmFtaWMtZm9vLUJ3aFpUa3RCLmpzIiwiYXNzZXRzL2R5bmFtaWMtZm9vLURzcUtSckV5LmNzcyJdKSkpPT5pLm1hcChpPT5kW2ldKTsKdmFyIGU9ZnVuY3Rpb24oZSl7cmV0dXJuYC9gK2V9LHQ9e30sbj1mdW5jdGlvbihuLHIsaSl7bGV0IGE9UHJvbWlzZS5yZXNvbHZlKCk7aWYociYmci5sZW5ndGg+MCl7bGV0IG49ZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoYGxpbmtgKSxvPWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYG1ldGFbcHJvcGVydHk9Y3NwLW5vbmNlXWApLHM9bz8ubm9uY2V8fG8/LmdldEF0dHJpYnV0ZShgbm9uY2VgKTtmdW5jdGlvbiBjKGUpe3JldHVybiBQcm9taXNlLmFsbChlLm1hcChlPT5Qcm9taXNlLnJlc29sdmUoZSkudGhlbihlPT4oe3N0YXR1czpgZnVsZmlsbGVkYCx2YWx1ZTplfSksZT0+KHtzdGF0dXM6YHJlamVjdGVkYCxyZWFzb246ZX0pKSkpfWZ1bmN0aW9uIGwoZSl7cmV0dXJuIGltcG9ydC5tZXRhLnJlc29sdmU/aW1wb3J0Lm1ldGEucmVzb2x2ZShlKTpuZXcgVVJMKGUsaW1wb3J0Lm1ldGEudXJsKS5ocmVmfWE9YyhyLm1hcChyPT57aWYocj1lKHIsaSkscj1sKHIpLHIgaW4gdClyZXR1cm47dFtyXT0hMDtsZXQgYT1yLmVuZHNXaXRoKGAuY3NzYCk7Zm9yKGxldCBlPW4ubGVuZ3RoLTE7ZT49MDtlLS0pe2xldCB0PW5bZV07aWYodC5ocmVmPT09ciYmKCFhfHx0LnJlbD09PWBzdHlsZXNoZWV0YCkpcmV0dXJufWxldCBvPWRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoYGxpbmtgKTtpZihvLnJlbD1hP2BzdHlsZXNoZWV0YDpgbW9kdWxlcHJlbG9hZGAsYXx8KG8uYXM9YHNjcmlwdGApLG8uY3Jvc3NPcmlnaW49YGAsby5ocmVmPXIscyYmby5zZXRBdHRyaWJ1dGUoYG5vbmNlYCxzKSxkb2N1bWVudC5oZWFkLmFwcGVuZENoaWxkKG8pLGEpcmV0dXJuIG5ldyBQcm9taXNlKChlLHQpPT57by5hZGRFdmVudExpc3RlbmVyKGBsb2FkYCxlKSxvLmFkZEV2ZW50TGlzdGVuZXIoYGVycm9yYCwoKT0+dChFcnJvcihgVW5hYmxlIHRvIHByZWxvYWQgQ1NTIGZvciAke3J9YCkpKX0pfSkpfWZ1bmN0aW9uIG8oZSl7bGV0IHQ9bmV3IEV2ZW50KGB2aXRlOnByZWxvYWRFcnJvcmAse2NhbmNlbGFibGU6ITB9KTtpZih0LnBheWxvYWQ9ZSx3aW5kb3cuZGlzcGF0Y2hFdmVudCh0KSwhdC5kZWZhdWx0UHJldmVudGVkKXRocm93IGV9cmV0dXJuIGEudGhlbihlPT57Zm9yKGxldCB0IG9mIGV8fFtdKXQuc3RhdHVzPT09YHJlamVjdGVkYCYmbyh0LnJlYXNvbik7cmV0dXJuIG4oKS5jYXRjaChvKX0pfTtuKCgpPT5pbXBvcnQoYC4vZHluYW1pYy1mb28tQndoWlRrdEIuanNgKSxfX3ZpdGVfX21hcERlcHMoWzAsMV0pKSxjb25zb2xlLmxvZyhgYWZ0ZXIgcHJlbG9hZCBkeW5hbWljYCk7ZXhwb3J0e24gYXMgdH07Ci8vIyBkZWJ1Z0lkPTM3MTI5NGZhLWUxOTQtNDQ5OS05NmE4LWVlN2JiYThjZDY5NgovLyMgc291cmNlTWFwcGluZ1VSTD1hZnRlci1wcmVsb2FkLWR5bmFtaWMtM0VwVDY0WlEuanMubWFwMjUxAHsiZGVidWdJZCI6IjAwMDAwMDAwLTAwMDAtMDAwMC0wMDAwLTAwMDAwMDAwMDAwMCIsIm1hcHBpbmdzIjoiOzZwQ0FBQSxhQUFPLHFEQUVQLFFBQVEsSUFBSSx1QkFBdUIiLCJzb3VyY2VzIjpbIi4uLy4uL2FmdGVyLXByZWxvYWQtZHluYW1pYy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQoJy4vZHluYW1pYy9keW5hbWljLWZvbycpXG5cbmNvbnNvbGUubG9nKCdhZnRlciBwcmVsb2FkIGR5bmFtaWMnKVxuIl0sInZlcnNpb24iOjN9"
376+
visualization: "https://evanw.github.io/source-map-visualization/#MTU3NABjb25zdCBfX3ZpdGVfX21hcERlcHM9KGksbT1fX3ZpdGVfX21hcERlcHMsZD0obS5mfHwobS5mPVsiYXNzZXRzL2R5bmFtaWMtZm9vLUJ3aFpUa3RCLmpzIiwiYXNzZXRzL2R5bmFtaWMtZm9vLURzcUtSckV5LmNzcyJdKSkpPT5pLm1hcChpPT5kW2ldKTsKdmFyIGU9ZnVuY3Rpb24oZSl7cmV0dXJuYC9gK2V9LHQ9e30sbj1mdW5jdGlvbihuLHIsaSl7bGV0IGE9UHJvbWlzZS5yZXNvbHZlKCk7aWYociYmci5sZW5ndGg+MCl7bGV0IG49ZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoYGxpbmtgKSxvPWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYG1ldGFbcHJvcGVydHk9Y3NwLW5vbmNlXWApLHM9bz8ubm9uY2V8fG8/LmdldEF0dHJpYnV0ZShgbm9uY2VgKTtmdW5jdGlvbiBjKGUpe3JldHVybiBQcm9taXNlLmFsbChlLm1hcChlPT5Qcm9taXNlLnJlc29sdmUoZSkudGhlbihlPT4oe3N0YXR1czpgZnVsZmlsbGVkYCx2YWx1ZTplfSksZT0+KHtzdGF0dXM6YHJlamVjdGVkYCxyZWFzb246ZX0pKSkpfWZ1bmN0aW9uIGwoZSl7cmV0dXJuIGltcG9ydC5tZXRhLnJlc29sdmU/aW1wb3J0Lm1ldGEucmVzb2x2ZShlKTpuZXcgVVJMKGUsaW1wb3J0Lm1ldGEudXJsKS5ocmVmfWE9YyhyLm1hcChyPT57aWYocj1lKHIsaSkscj1sKHIpLHIgaW4gdClyZXR1cm47dFtyXT0hMDtsZXQgYT1yLmVuZHNXaXRoKGAuY3NzYCk7Zm9yKGxldCBlPW4ubGVuZ3RoLTE7ZT49MDtlLS0pe2xldCB0PW5bZV07aWYodC5ocmVmPT09ciYmKCFhfHx0LnJlbD09PWBzdHlsZXNoZWV0YCkpcmV0dXJufWxldCBvPWRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoYGxpbmtgKTtpZihvLnJlbD1hP2BzdHlsZXNoZWV0YDpgbW9kdWxlcHJlbG9hZGAsYXx8KG8uYXM9YHNjcmlwdGApLG8uY3Jvc3NPcmlnaW49YGAsby5ocmVmPXIscyYmby5zZXRBdHRyaWJ1dGUoYG5vbmNlYCxzKSxkb2N1bWVudC5oZWFkLmFwcGVuZENoaWxkKG8pLGEpcmV0dXJuIG5ldyBQcm9taXNlKChlLHQpPT57by5hZGRFdmVudExpc3RlbmVyKGBsb2FkYCxlKSxvLmFkZEV2ZW50TGlzdGVuZXIoYGVycm9yYCwoKT0+dChFcnJvcihgVW5hYmxlIHRvIHByZWxvYWQgQ1NTIGZvciAke3J9YCkpKX0pfSkuZmlsdGVyKGU9PmUhPT12b2lkIDApKX1mdW5jdGlvbiBvKGUpe2xldCB0PW5ldyBFdmVudChgdml0ZTpwcmVsb2FkRXJyb3JgLHtjYW5jZWxhYmxlOiEwfSk7aWYodC5wYXlsb2FkPWUsd2luZG93LmRpc3BhdGNoRXZlbnQodCksIXQuZGVmYXVsdFByZXZlbnRlZCl0aHJvdyBlfXJldHVybiBhLnRoZW4oZT0+e2ZvcihsZXQgdCBvZiBlfHxbXSl0LnN0YXR1cz09PWByZWplY3RlZGAmJm8odC5yZWFzb24pO3JldHVybiBuKCkuY2F0Y2gobyl9KX07bigoKT0+aW1wb3J0KGAuL2R5bmFtaWMtZm9vLUJ3aFpUa3RCLmpzYCksX192aXRlX19tYXBEZXBzKFswLDFdKSksY29uc29sZS5sb2coYGFmdGVyIHByZWxvYWQgZHluYW1pY2ApO2V4cG9ydHtuIGFzIHR9OwovLyMgZGVidWdJZD04OGVlZDVlNC01MDM5LTQzYTYtYjA3NC1iMTRhZGFlYTM0ZWQKLy8jIHNvdXJjZU1hcHBpbmdVUkw9YWZ0ZXItcHJlbG9hZC1keW5hbWljLUNJN3RYa1VELmpzLm1hcDI1MQB7ImRlYnVnSWQiOiIwMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC0wMDAwMDAwMDAwMDAiLCJtYXBwaW5ncyI6IjttckNBQUEsYUFBTyxxREFFUCxRQUFRLElBQUksdUJBQXVCIiwic291cmNlcyI6WyIuLi8uLi9hZnRlci1wcmVsb2FkLWR5bmFtaWMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0KCcuL2R5bmFtaWMvZHluYW1pYy1mb28nKVxuXG5jb25zb2xlLmxvZygnYWZ0ZXIgcHJlbG9hZCBkeW5hbWljJylcbiJdLCJ2ZXJzaW9uIjozfQ=="
377377
}
378378
`)
379379
// verify sourcemap comment is preserved at the last line

0 commit comments

Comments
 (0)