Skip to content

Commit a8a6526

Browse files
committed
Introduce bundle on bundlewatch
1 parent 4081f05 commit a8a6526

File tree

6 files changed

+14
-11
lines changed

6 files changed

+14
-11
lines changed

packages/clerk-js/bundlewatch.config.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
{ "path": "./dist/keylessPrompt*.js", "maxSize": "5.9KB" },
2222
{ "path": "./dist/pricingTable*.js", "maxSize": "5KB" },
2323
{ "path": "./dist/checkout*.js", "maxSize": "9KB" },
24-
{ "path": "./dist/up-billing-page*.js", "maxSize": "1KB" }
24+
{ "path": "./dist/up-billing-page*.js", "maxSize": "1KB" },
25+
{ "path": "./dist/session-tasks*.js", "maxSize": "1KB" }
2526
]
2627
}

packages/clerk-js/src/core/sessionTasks.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function navigateToTask(
2727
routeKey: keyof typeof SESSION_TASK_ROUTE_BY_KEY,
2828
{ componentNavigationContext, globalNavigate, options, environment }: NavigateToTaskOptions,
2929
) {
30-
const taskRoute = `/${SESSION_TASK_ROUTE_BY_KEY[routeKey]}`;
30+
const taskRoute = `/tasks/${SESSION_TASK_ROUTE_BY_KEY[routeKey]}`;
3131

3232
if (componentNavigationContext) {
3333
return componentNavigationContext.navigate(componentNavigationContext.indexPath + routeKey);

packages/clerk-js/src/ui/common/redirects.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { SessionTask } from '@clerk/types';
22

3-
import { SESSION_TASK_ROUTE_BY_KEY } from '../../core/sessionTasks';
43
import { buildURL } from '../../utils/url';
54
import type { SignInContextType, SignUpContextType, UserProfileContextType } from './../contexts';
65

@@ -45,7 +44,7 @@ export function buildSessionTaskRedirectUrl({
4544
routing,
4645
baseUrl,
4746
path,
48-
endpoint: `/${SESSION_TASK_ROUTE_BY_KEY[task.key]}`,
47+
endpoint: '/tasks',
4948
authQueryString: null,
5049
});
5150
}

packages/clerk-js/src/ui/components/SessionTasks/index.tsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useCallback, useEffect } from 'react';
66
import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
77
import { SessionTaskContext as SessionTaskContext } from '../../contexts/components/SessionTask';
88
import { Route, Switch, useRouter } from '../../router';
9-
import { LazyOrganizationSelectionTask } from './lazySessionTasks';
9+
import { LazyOrganizationSelectionTask } from './lazyTasks';
1010
import { usePreloadTasks } from './usePreloadTasks';
1111

1212
function SessionTaskRoutes(): JSX.Element {
@@ -24,18 +24,20 @@ function SessionTaskRoutes(): JSX.Element {
2424
*/
2525
export function SessionTask({ redirectUrlComplete }: { redirectUrlComplete: string }): JSX.Element {
2626
usePreloadTasks();
27+
2728
const { __experimental_nextTask, session, telemetry } = useClerk();
2829
const { navigate } = useRouter();
2930

30-
telemetry?.record(eventComponentMounted('SessionTask', { task: session?.currentTask?.key as string }));
31+
const task = session?.currentTask;
3132

3233
useEffect(() => {
33-
if (session?.currentTask) {
34+
if (task) {
35+
telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
3436
return;
3537
}
3638

3739
void navigate(redirectUrlComplete);
38-
}, [session?.currentTask, navigate, redirectUrlComplete]);
40+
}, [task, telemetry, navigate, redirectUrlComplete]);
3941

4042
const nextTask = useCallback(
4143
() => __experimental_nextTask({ redirectUrlComplete }),

packages/clerk-js/src/ui/components/SessionTasks/lazySessionTasks.ts packages/clerk-js/src/ui/components/SessionTasks/lazyTasks.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { lazy } from 'react';
22

33
export const preloadOrganizationSelectionTask = () =>
4-
import(/* webpackChunkName: "session-tasks"*/ './OrganizationSelectionTask');
4+
import(/* webpackChunkName: "session-tasks"*/ './OrganizationSelectionTask');
55

66
const LazyOrganizationSelectionTask = lazy(() =>
77
import(/* webpackChunkName: "session-tasks"*/ './OrganizationSelectionTask').then(module => ({
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { useEnvironment } from '../../../ui/contexts';
2-
import { preloadOrganizationSelectionTask } from './lazySessionTasks';
2+
import { useFetch } from '../../../ui/hooks';
3+
import { preloadOrganizationSelectionTask } from './lazyTasks';
34

45
/**
56
* Preloads tasks based on the environment settings
@@ -9,6 +10,6 @@ export function usePreloadTasks() {
910
const { organizationSettings } = useEnvironment();
1011

1112
if (organizationSettings.forceOrganizationSelection) {
12-
void preloadOrganizationSelectionTask();
13+
void useFetch(preloadOrganizationSelectionTask, 'preloadComponent', { staleTime: Infinity });
1314
}
1415
}

0 commit comments

Comments
 (0)