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
6 changes: 6 additions & 0 deletions .changeset/ripe-books-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Create a utility that implements `Promise.allSettled` with ES6/ES2015 compatibility.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "582.6kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "80kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "81kB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "96KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/core/clerk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
TelemetryCollector,
} from '@clerk/shared/telemetry';
import { addClerkPrefix, isAbsoluteUrl, stripScheme } from '@clerk/shared/url';
import { handleValueOrFn, noop } from '@clerk/shared/utils';
import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__experimental_CommerceNamespace,
__experimental_PricingTableProps,
Expand Down Expand Up @@ -2181,7 +2181,7 @@ export class Clerk implements ClerkInterface {
}
};

const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
const [envResult, clientResult] = await allSettled([initEnvironmentPromise, initClient()]);

if (clientResult.status === 'rejected') {
const e = clientResult.reason;
Expand Down
15 changes: 15 additions & 0 deletions packages/shared/src/utils/allSettled.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* A ES6 compatible utility that implements `Promise.allSettled`
* @internal
*/
export function allSettled<T>(
iterable: Iterable<Promise<T>>,
): Promise<({ status: 'fulfilled'; value: T } | { status: 'rejected'; reason: any })[]> {
const promises = Array.from(iterable).map(p =>
p.then(
value => ({ status: 'fulfilled', value }) as const,
reason => ({ status: 'rejected', reason }) as const,
),
);
return Promise.all(promises);
}
1 change: 1 addition & 0 deletions packages/shared/src/utils/createDeferredPromise.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ type Callback = (val?: any) => void;
/**
* Create a promise that can be resolved or rejected from
* outside the Promise constructor callback
* A ES6 compatible utility that implements `Promise.withResolvers`
* @internal
*/
export const createDeferredPromise = () => {
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from './createDeferredPromise';
export * from './allSettled';
export { isStaging } from './instance';
export { logErrorInDevMode } from './logErrorInDevMode';
export { noop } from './noop';
Expand Down