Skip to content

Commit e87aeb7

Browse files
sandhosesandhose
committed
Use automatic route code splitting
1 parent e5ebb84 commit e87aeb7

22 files changed

+920
-1035
lines changed

‎frontend/src/gql/gql.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ type Documents = {
5555
"\n query OAuth2Client($id: ID!) {\n oauth2Client(id: $id) {\n ...OAuth2Client_detail\n }\n }\n": typeof types.OAuth2ClientDocument,
5656
"\n query CurrentViewer {\n viewer {\n __typename\n ... on Node {\n id\n }\n }\n }\n": typeof types.CurrentViewerDocument,
5757
"\n query DeviceRedirect($deviceId: String!, $userId: ID!) {\n session(deviceId: $deviceId, userId: $userId) {\n __typename\n ... on Node {\n id\n }\n }\n }\n": typeof types.DeviceRedirectDocument,
58+
"\n query VerifyEmail($id: ID!) {\n userEmailAuthentication(id: $id) {\n id\n email\n completedAt\n }\n }\n": typeof types.VerifyEmailDocument,
5859
"\n mutation DoVerifyEmail($id: ID!, $code: String!) {\n completeEmailAuthentication(input: { id: $id, code: $code }) {\n status\n }\n }\n": typeof types.DoVerifyEmailDocument,
5960
"\n mutation ResendEmailAuthenticationCode($id: ID!, $language: String!) {\n resendEmailAuthenticationCode(input: { id: $id, language: $language }) {\n status\n }\n }\n": typeof types.ResendEmailAuthenticationCodeDocument,
60-
"\n query VerifyEmail($id: ID!) {\n userEmailAuthentication(id: $id) {\n id\n email\n completedAt\n }\n }\n": typeof types.VerifyEmailDocument,
6161
"\n mutation ChangePassword(\n $userId: ID!\n $oldPassword: String!\n $newPassword: String!\n ) {\n setPassword(\n input: {\n userId: $userId\n currentPassword: $oldPassword\n newPassword: $newPassword\n }\n ) {\n status\n }\n }\n": typeof types.ChangePasswordDocument,
6262
"\n query PasswordChange {\n viewer {\n __typename\n ... on Node {\n id\n }\n }\n\n siteConfig {\n ...PasswordCreationDoubleInput_siteConfig\n }\n }\n": typeof types.PasswordChangeDocument,
6363
"\n mutation RecoverPassword($ticket: String!, $newPassword: String!) {\n setPasswordByRecovery(\n input: { ticket: $ticket, newPassword: $newPassword }\n ) {\n status\n }\n }\n": typeof types.RecoverPasswordDocument,
@@ -109,9 +109,9 @@ const documents: Documents = {
109109
"\n query OAuth2Client($id: ID!) {\n oauth2Client(id: $id) {\n ...OAuth2Client_detail\n }\n }\n": types.OAuth2ClientDocument,
110110
"\n query CurrentViewer {\n viewer {\n __typename\n ... on Node {\n id\n }\n }\n }\n": types.CurrentViewerDocument,
111111
"\n query DeviceRedirect($deviceId: String!, $userId: ID!) {\n session(deviceId: $deviceId, userId: $userId) {\n __typename\n ... on Node {\n id\n }\n }\n }\n": types.DeviceRedirectDocument,
112+
"\n query VerifyEmail($id: ID!) {\n userEmailAuthentication(id: $id) {\n id\n email\n completedAt\n }\n }\n": types.VerifyEmailDocument,
112113
"\n mutation DoVerifyEmail($id: ID!, $code: String!) {\n completeEmailAuthentication(input: { id: $id, code: $code }) {\n status\n }\n }\n": types.DoVerifyEmailDocument,
113114
"\n mutation ResendEmailAuthenticationCode($id: ID!, $language: String!) {\n resendEmailAuthenticationCode(input: { id: $id, language: $language }) {\n status\n }\n }\n": types.ResendEmailAuthenticationCodeDocument,
114-
"\n query VerifyEmail($id: ID!) {\n userEmailAuthentication(id: $id) {\n id\n email\n completedAt\n }\n }\n": types.VerifyEmailDocument,
115115
"\n mutation ChangePassword(\n $userId: ID!\n $oldPassword: String!\n $newPassword: String!\n ) {\n setPassword(\n input: {\n userId: $userId\n currentPassword: $oldPassword\n newPassword: $newPassword\n }\n ) {\n status\n }\n }\n": types.ChangePasswordDocument,
116116
"\n query PasswordChange {\n viewer {\n __typename\n ... on Node {\n id\n }\n }\n\n siteConfig {\n ...PasswordCreationDoubleInput_siteConfig\n }\n }\n": types.PasswordChangeDocument,
117117
"\n mutation RecoverPassword($ticket: String!, $newPassword: String!) {\n setPasswordByRecovery(\n input: { ticket: $ticket, newPassword: $newPassword }\n ) {\n status\n }\n }\n": types.RecoverPasswordDocument,
@@ -286,15 +286,15 @@ export function graphql(source: "\n query DeviceRedirect($deviceId: String!, $u
286286
/**
287287
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
288288
*/
289-
export function graphql(source: "\n mutation DoVerifyEmail($id: ID!, $code: String!) {\n completeEmailAuthentication(input: { id: $id, code: $code }) {\n status\n }\n }\n"): typeof import('./graphql').DoVerifyEmailDocument;
289+
export function graphql(source: "\n query VerifyEmail($id: ID!) {\n userEmailAuthentication(id: $id) {\n id\n email\n completedAt\n }\n }\n"): typeof import('./graphql').VerifyEmailDocument;
290290
/**
291291
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
292292
*/
293-
export function graphql(source: "\n mutation ResendEmailAuthenticationCode($id: ID!, $language: String!) {\n resendEmailAuthenticationCode(input: { id: $id, language: $language }) {\n status\n }\n }\n"): typeof import('./graphql').ResendEmailAuthenticationCodeDocument;
293+
export function graphql(source: "\n mutation DoVerifyEmail($id: ID!, $code: String!) {\n completeEmailAuthentication(input: { id: $id, code: $code }) {\n status\n }\n }\n"): typeof import('./graphql').DoVerifyEmailDocument;
294294
/**
295295
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
296296
*/
297-
export function graphql(source: "\n query VerifyEmail($id: ID!) {\n userEmailAuthentication(id: $id) {\n id\n email\n completedAt\n }\n }\n"): typeof import('./graphql').VerifyEmailDocument;
297+
export function graphql(source: "\n mutation ResendEmailAuthenticationCode($id: ID!, $language: String!) {\n resendEmailAuthenticationCode(input: { id: $id, language: $language }) {\n status\n }\n }\n"): typeof import('./graphql').ResendEmailAuthenticationCodeDocument;
298298
/**
299299
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
300300
*/

‎frontend/src/gql/graphql.ts‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,6 +1849,13 @@ export type DeviceRedirectQueryVariables = Exact<{
18491849

18501850
export type DeviceRedirectQuery = { __typename?: 'Query', session?: { __typename: 'CompatSession', id: string } | { __typename: 'Oauth2Session', id: string } | null };
18511851

1852+
export type VerifyEmailQueryVariables = Exact<{
1853+
id: Scalars['ID']['input'];
1854+
}>;
1855+
1856+
1857+
export type VerifyEmailQuery = { __typename?: 'Query', userEmailAuthentication?: { __typename?: 'UserEmailAuthentication', id: string, email: string, completedAt?: string | null } | null };
1858+
18521859
export type DoVerifyEmailMutationVariables = Exact<{
18531860
id: Scalars['ID']['input'];
18541861
code: Scalars['String']['input'];
@@ -1865,13 +1872,6 @@ export type ResendEmailAuthenticationCodeMutationVariables = Exact<{
18651872

18661873
export type ResendEmailAuthenticationCodeMutation = { __typename?: 'Mutation', resendEmailAuthenticationCode: { __typename?: 'ResendEmailAuthenticationCodePayload', status: ResendEmailAuthenticationCodeStatus } };
18671874

1868-
export type VerifyEmailQueryVariables = Exact<{
1869-
id: Scalars['ID']['input'];
1870-
}>;
1871-
1872-
1873-
export type VerifyEmailQuery = { __typename?: 'Query', userEmailAuthentication?: { __typename?: 'UserEmailAuthentication', id: string, email: string, completedAt?: string | null } | null };
1874-
18751875
export type ChangePasswordMutationVariables = Exact<{
18761876
userId: Scalars['ID']['input'];
18771877
oldPassword: Scalars['String']['input'];
@@ -2705,6 +2705,15 @@ export const DeviceRedirectDocument = new TypedDocumentString(`
27052705
}
27062706
}
27072707
`) as unknown as TypedDocumentString<DeviceRedirectQuery, DeviceRedirectQueryVariables>;
2708+
export const VerifyEmailDocument = new TypedDocumentString(`
2709+
query VerifyEmail($id: ID!) {
2710+
userEmailAuthentication(id: $id) {
2711+
id
2712+
email
2713+
completedAt
2714+
}
2715+
}
2716+
`) as unknown as TypedDocumentString<VerifyEmailQuery, VerifyEmailQueryVariables>;
27082717
export const DoVerifyEmailDocument = new TypedDocumentString(`
27092718
mutation DoVerifyEmail($id: ID!, $code: String!) {
27102719
completeEmailAuthentication(input: {id: $id, code: $code}) {
@@ -2719,15 +2728,6 @@ export const ResendEmailAuthenticationCodeDocument = new TypedDocumentString(`
27192728
}
27202729
}
27212730
`) as unknown as TypedDocumentString<ResendEmailAuthenticationCodeMutation, ResendEmailAuthenticationCodeMutationVariables>;
2722-
export const VerifyEmailDocument = new TypedDocumentString(`
2723-
query VerifyEmail($id: ID!) {
2724-
userEmailAuthentication(id: $id) {
2725-
id
2726-
email
2727-
completedAt
2728-
}
2729-
}
2730-
`) as unknown as TypedDocumentString<VerifyEmailQuery, VerifyEmailQueryVariables>;
27312731
export const ChangePasswordDocument = new TypedDocumentString(`
27322732
mutation ChangePassword($userId: ID!, $oldPassword: String!, $newPassword: String!) {
27332733
setPassword(
@@ -3285,19 +3285,19 @@ export const mockDeviceRedirectQuery = (resolver: GraphQLResponseResolver<Device
32853285
* @param options Options object to customize the behavior of the mock. ([see more](https://mswjs.io/docs/api/graphql#handler-options))
32863286
* @see https://mswjs.io/docs/basics/response-resolver
32873287
* @example
3288-
* mockDoVerifyEmailMutation(
3288+
* mockVerifyEmailQuery(
32893289
* ({ query, variables }) => {
3290-
* const { id, code } = variables;
3290+
* const { id } = variables;
32913291
* return HttpResponse.json({
3292-
* data: { completeEmailAuthentication }
3292+
* data: { userEmailAuthentication }
32933293
* })
32943294
* },
32953295
* requestOptions
32963296
* )
32973297
*/
3298-
export const mockDoVerifyEmailMutation = (resolver: GraphQLResponseResolver<DoVerifyEmailMutation, DoVerifyEmailMutationVariables>, options?: RequestHandlerOptions) =>
3299-
graphql.mutation<DoVerifyEmailMutation, DoVerifyEmailMutationVariables>(
3300-
'DoVerifyEmail',
3298+
export const mockVerifyEmailQuery = (resolver: GraphQLResponseResolver<VerifyEmailQuery, VerifyEmailQueryVariables>, options?: RequestHandlerOptions) =>
3299+
graphql.query<VerifyEmailQuery, VerifyEmailQueryVariables>(
3300+
'VerifyEmail',
33013301
resolver,
33023302
options
33033303
)
@@ -3307,19 +3307,19 @@ export const mockDoVerifyEmailMutation = (resolver: GraphQLResponseResolver<DoVe
33073307
* @param options Options object to customize the behavior of the mock. ([see more](https://mswjs.io/docs/api/graphql#handler-options))
33083308
* @see https://mswjs.io/docs/basics/response-resolver
33093309
* @example
3310-
* mockResendEmailAuthenticationCodeMutation(
3310+
* mockDoVerifyEmailMutation(
33113311
* ({ query, variables }) => {
3312-
* const { id, language } = variables;
3312+
* const { id, code } = variables;
33133313
* return HttpResponse.json({
3314-
* data: { resendEmailAuthenticationCode }
3314+
* data: { completeEmailAuthentication }
33153315
* })
33163316
* },
33173317
* requestOptions
33183318
* )
33193319
*/
3320-
export const mockResendEmailAuthenticationCodeMutation = (resolver: GraphQLResponseResolver<ResendEmailAuthenticationCodeMutation, ResendEmailAuthenticationCodeMutationVariables>, options?: RequestHandlerOptions) =>
3321-
graphql.mutation<ResendEmailAuthenticationCodeMutation, ResendEmailAuthenticationCodeMutationVariables>(
3322-
'ResendEmailAuthenticationCode',
3320+
export const mockDoVerifyEmailMutation = (resolver: GraphQLResponseResolver<DoVerifyEmailMutation, DoVerifyEmailMutationVariables>, options?: RequestHandlerOptions) =>
3321+
graphql.mutation<DoVerifyEmailMutation, DoVerifyEmailMutationVariables>(
3322+
'DoVerifyEmail',
33233323
resolver,
33243324
options
33253325
)
@@ -3329,19 +3329,19 @@ export const mockResendEmailAuthenticationCodeMutation = (resolver: GraphQLRespo
33293329
* @param options Options object to customize the behavior of the mock. ([see more](https://mswjs.io/docs/api/graphql#handler-options))
33303330
* @see https://mswjs.io/docs/basics/response-resolver
33313331
* @example
3332-
* mockVerifyEmailQuery(
3332+
* mockResendEmailAuthenticationCodeMutation(
33333333
* ({ query, variables }) => {
3334-
* const { id } = variables;
3334+
* const { id, language } = variables;
33353335
* return HttpResponse.json({
3336-
* data: { userEmailAuthentication }
3336+
* data: { resendEmailAuthenticationCode }
33373337
* })
33383338
* },
33393339
* requestOptions
33403340
* )
33413341
*/
3342-
export const mockVerifyEmailQuery = (resolver: GraphQLResponseResolver<VerifyEmailQuery, VerifyEmailQueryVariables>, options?: RequestHandlerOptions) =>
3343-
graphql.query<VerifyEmailQuery, VerifyEmailQueryVariables>(
3344-
'VerifyEmail',
3342+
export const mockResendEmailAuthenticationCodeMutation = (resolver: GraphQLResponseResolver<ResendEmailAuthenticationCodeMutation, ResendEmailAuthenticationCodeMutationVariables>, options?: RequestHandlerOptions) =>
3343+
graphql.mutation<ResendEmailAuthenticationCodeMutation, ResendEmailAuthenticationCodeMutationVariables>(
3344+
'ResendEmailAuthenticationCode',
33453345
resolver,
33463346
options
33473347
)

‎frontend/src/routeTree.gen.ts‎

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// You should NOT make any changes in this file as it will be overwritten.
99
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
1010

11-
import { createFileRoute } from '@tanstack/react-router'
12-
1311
// Import Routes
1412

1513
import { Route as rootRoute } from './routes/__root'
@@ -25,16 +23,11 @@ import { Route as ClientsIdImport } from './routes/clients.$id'
2523
import { Route as PasswordRecoveryIndexImport } from './routes/password.recovery.index'
2624
import { Route as PasswordChangeIndexImport } from './routes/password.change.index'
2725
import { Route as AccountSessionsIndexImport } from './routes/_account.sessions.index'
26+
import { Route as PasswordChangeSuccessImport } from './routes/password.change.success'
2827
import { Route as EmailsIdVerifyImport } from './routes/emails.$id.verify'
2928
import { Route as EmailsIdInUseImport } from './routes/emails.$id.in-use'
3029
import { Route as AccountSessionsBrowsersImport } from './routes/_account.sessions.browsers'
3130

32-
// Create Virtual Routes
33-
34-
const PasswordChangeSuccessLazyImport = createFileRoute(
35-
'/password/change/success',
36-
)()
37-
3831
// Create/Update Routes
3932

4033
const ResetCrossSigningRoute = ResetCrossSigningImport.update({
@@ -46,7 +39,7 @@ const ResetCrossSigningRoute = ResetCrossSigningImport.update({
4639
const AccountRoute = AccountImport.update({
4740
id: '/_account',
4841
getParentRoute: () => rootRoute,
49-
} as any).lazy(() => import('./routes/_account.lazy').then((d) => d.Route))
42+
} as any)
5043

5144
const ResetCrossSigningIndexRoute = ResetCrossSigningIndexImport.update({
5245
id: '/',
@@ -58,15 +51,13 @@ const AccountIndexRoute = AccountIndexImport.update({
5851
id: '/',
5952
path: '/',
6053
getParentRoute: () => AccountRoute,
61-
} as any).lazy(() =>
62-
import('./routes/_account.index.lazy').then((d) => d.Route),
63-
)
54+
} as any)
6455

6556
const SessionsIdRoute = SessionsIdImport.update({
6657
id: '/sessions/$id',
6758
path: '/sessions/$id',
6859
getParentRoute: () => rootRoute,
69-
} as any).lazy(() => import('./routes/sessions.$id.lazy').then((d) => d.Route))
60+
} as any)
7061

7162
const ResetCrossSigningSuccessRoute = ResetCrossSigningSuccessImport.update({
7263
id: '/success',
@@ -92,7 +83,7 @@ const ClientsIdRoute = ClientsIdImport.update({
9283
id: '/clients/$id',
9384
path: '/clients/$id',
9485
getParentRoute: () => rootRoute,
95-
} as any).lazy(() => import('./routes/clients.$id.lazy').then((d) => d.Route))
86+
} as any)
9687

9788
const PasswordRecoveryIndexRoute = PasswordRecoveryIndexImport.update({
9889
id: '/password/recovery/',
@@ -106,33 +97,25 @@ const PasswordChangeIndexRoute = PasswordChangeIndexImport.update({
10697
id: '/password/change/',
10798
path: '/password/change/',
10899
getParentRoute: () => rootRoute,
109-
} as any).lazy(() =>
110-
import('./routes/password.change.index.lazy').then((d) => d.Route),
111-
)
100+
} as any)
112101

113102
const AccountSessionsIndexRoute = AccountSessionsIndexImport.update({
114103
id: '/sessions/',
115104
path: '/sessions/',
116105
getParentRoute: () => AccountRoute,
117-
} as any).lazy(() =>
118-
import('./routes/_account.sessions.index.lazy').then((d) => d.Route),
119-
)
106+
} as any)
120107

121-
const PasswordChangeSuccessLazyRoute = PasswordChangeSuccessLazyImport.update({
108+
const PasswordChangeSuccessRoute = PasswordChangeSuccessImport.update({
122109
id: '/password/change/success',
123110
path: '/password/change/success',
124111
getParentRoute: () => rootRoute,
125-
} as any).lazy(() =>
126-
import('./routes/password.change.success.lazy').then((d) => d.Route),
127-
)
112+
} as any)
128113

129114
const EmailsIdVerifyRoute = EmailsIdVerifyImport.update({
130115
id: '/emails/$id/verify',
131116
path: '/emails/$id/verify',
132117
getParentRoute: () => rootRoute,
133-
} as any).lazy(() =>
134-
import('./routes/emails.$id.verify.lazy').then((d) => d.Route),
135-
)
118+
} as any)
136119

137120
const EmailsIdInUseRoute = EmailsIdInUseImport.update({
138121
id: '/emails/$id/in-use',
@@ -144,9 +127,7 @@ const AccountSessionsBrowsersRoute = AccountSessionsBrowsersImport.update({
144127
id: '/sessions/browsers',
145128
path: '/sessions/browsers',
146129
getParentRoute: () => AccountRoute,
147-
} as any).lazy(() =>
148-
import('./routes/_account.sessions.browsers.lazy').then((d) => d.Route),
149-
)
130+
} as any)
150131

151132
// Populate the FileRoutesByPath interface
152133

@@ -240,7 +221,7 @@ declare module '@tanstack/react-router' {
240221
id: '/password/change/success'
241222
path: '/password/change/success'
242223
fullPath: '/password/change/success'
243-
preLoaderRoute: typeof PasswordChangeSuccessLazyImport
224+
preLoaderRoute: typeof PasswordChangeSuccessImport
244225
parentRoute: typeof rootRoute
245226
}
246227
'/_account/sessions/': {
@@ -312,7 +293,7 @@ export interface FileRoutesByFullPath {
312293
'/sessions/browsers': typeof AccountSessionsBrowsersRoute
313294
'/emails/$id/in-use': typeof EmailsIdInUseRoute
314295
'/emails/$id/verify': typeof EmailsIdVerifyRoute
315-
'/password/change/success': typeof PasswordChangeSuccessLazyRoute
296+
'/password/change/success': typeof PasswordChangeSuccessRoute
316297
'/sessions': typeof AccountSessionsIndexRoute
317298
'/password/change': typeof PasswordChangeIndexRoute
318299
'/password/recovery': typeof PasswordRecoveryIndexRoute
@@ -329,7 +310,7 @@ export interface FileRoutesByTo {
329310
'/sessions/browsers': typeof AccountSessionsBrowsersRoute
330311
'/emails/$id/in-use': typeof EmailsIdInUseRoute
331312
'/emails/$id/verify': typeof EmailsIdVerifyRoute
332-
'/password/change/success': typeof PasswordChangeSuccessLazyRoute
313+
'/password/change/success': typeof PasswordChangeSuccessRoute
333314
'/sessions': typeof AccountSessionsIndexRoute
334315
'/password/change': typeof PasswordChangeIndexRoute
335316
'/password/recovery': typeof PasswordRecoveryIndexRoute
@@ -349,7 +330,7 @@ export interface FileRoutesById {
349330
'/_account/sessions/browsers': typeof AccountSessionsBrowsersRoute
350331
'/emails/$id/in-use': typeof EmailsIdInUseRoute
351332
'/emails/$id/verify': typeof EmailsIdVerifyRoute
352-
'/password/change/success': typeof PasswordChangeSuccessLazyRoute
333+
'/password/change/success': typeof PasswordChangeSuccessRoute
353334
'/_account/sessions/': typeof AccountSessionsIndexRoute
354335
'/password/change/': typeof PasswordChangeIndexRoute
355336
'/password/recovery/': typeof PasswordRecoveryIndexRoute
@@ -419,7 +400,7 @@ export interface RootRouteChildren {
419400
SessionsIdRoute: typeof SessionsIdRoute
420401
EmailsIdInUseRoute: typeof EmailsIdInUseRoute
421402
EmailsIdVerifyRoute: typeof EmailsIdVerifyRoute
422-
PasswordChangeSuccessLazyRoute: typeof PasswordChangeSuccessLazyRoute
403+
PasswordChangeSuccessRoute: typeof PasswordChangeSuccessRoute
423404
PasswordChangeIndexRoute: typeof PasswordChangeIndexRoute
424405
PasswordRecoveryIndexRoute: typeof PasswordRecoveryIndexRoute
425406
}
@@ -432,7 +413,7 @@ const rootRouteChildren: RootRouteChildren = {
432413
SessionsIdRoute: SessionsIdRoute,
433414
EmailsIdInUseRoute: EmailsIdInUseRoute,
434415
EmailsIdVerifyRoute: EmailsIdVerifyRoute,
435-
PasswordChangeSuccessLazyRoute: PasswordChangeSuccessLazyRoute,
416+
PasswordChangeSuccessRoute: PasswordChangeSuccessRoute,
436417
PasswordChangeIndexRoute: PasswordChangeIndexRoute,
437418
PasswordRecoveryIndexRoute: PasswordRecoveryIndexRoute,
438419
}
@@ -511,7 +492,7 @@ export const routeTree = rootRoute
511492
"filePath": "emails.$id.verify.tsx"
512493
},
513494
"/password/change/success": {
514-
"filePath": "password.change.success.lazy.tsx"
495+
"filePath": "password.change.success.tsx"
515496
},
516497
"/_account/sessions/": {
517498
"filePath": "_account.sessions.index.tsx",

0 commit comments

Comments
 (0)