Skip to content

fix: avoid using Promise.allSettled in preload function #19805

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

Merged
merged 7 commits into from
Apr 16, 2025
Merged

fix: avoid using Promise.allSettled in preload function #19805

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
164d783
fix(allsetttled-polyfill): add polyfill of Promise.allSettled
novlan1 Apr 7, 2025
15c799a
test: update test case
novlan1 Apr 7, 2025
e4f9eb3
chore: update polyfill of promise.allSettled
novlan1 Apr 7, 2025
40688c5
chore: update polyfill of promise.allSettled
novlan1 Apr 7, 2025
1c7cbc7
chore: update test case
novlan1 Apr 7, 2025
0afcdea
refactor: inline functions and add comment why this is needed
sapphi-red Apr 8, 2025
504cb11
test: update snapshot
sapphi-red Apr 8, 2025
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
16 changes: 15 additions & 1 deletion packages/vite/src/node/plugins/importAnalysisBuild.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,21 @@ function preload(
// in that case fallback to getAttribute
const cspNonce = cspNonceMeta?.nonce || cspNonceMeta?.getAttribute('nonce')

promise = Promise.allSettled(
// Promise.allSettled is not supported by Chrome 64-75, Firefox 67-70, Safari 11.1-12.1
function allSettled<T>(
promises: Array<T | PromiseLike<T>>,
): Promise<PromiseSettledResult<T>[]> {
return Promise.all(
promises.map((p) =>
Promise.resolve(p).then(
(value: T) => ({ status: 'fulfilled' as const, value }),
(reason: unknown) => ({ status: 'rejected' as const, reason }),
),
),
)
}

promise = allSettled(
deps.map((dep) => {
// @ts-expect-error assetsURL is declared before preload.toString()
dep = assetsURL(dep, importerUrl)
Expand Down
2 changes: 1 addition & 1 deletion playground/js-sourcemap/__tests__/js-sourcemap.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ describe.runIf(isBuild)('build tests', () => {
{
"debugId": "00000000-0000-0000-0000-000000000000",
"ignoreList": [],
"mappings": ";+8BAAA,OAAO,2BAAuB,0BAE9B,QAAQ,IAAI,uBAAuB",
"mappings": ";4kCAAA,OAAO,2BAAuB,0BAE9B,QAAQ,IAAI,uBAAuB",
"sources": [
"../../after-preload-dynamic.js",
],
Expand Down