From c72d56d02d1152b9dcc930683f50e94b936cf674 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Fri, 1 Jul 2022 16:56:23 +0200 Subject: [PATCH] web: use full import paths for dynamic imports Signed-off-by: Jens Langhammer --- web/src/flows/FlowExecutor.ts | 30 +++++++++++------- web/src/routesAdmin.ts | 58 +++++++++++++++++------------------ web/src/routesUser.ts | 2 +- 3 files changed, 49 insertions(+), 41 deletions(-) diff --git a/web/src/flows/FlowExecutor.ts b/web/src/flows/FlowExecutor.ts index ee7cba17d..c030b7c54 100644 --- a/web/src/flows/FlowExecutor.ts +++ b/web/src/flows/FlowExecutor.ts @@ -299,19 +299,19 @@ export class FlowExecutor extends LitElement implements StageHost { .challenge=${this.challenge} >`; case "ak-stage-consent": - await import("./stages/consent/ConsentStage"); + await import("@goauthentik/web/flows/stages/consent/ConsentStage"); return html``; case "ak-stage-dummy": - await import("./stages/dummy/DummyStage"); + await import("@goauthentik/web/flows/stages/dummy/DummyStage"); return html``; case "ak-stage-email": - await import("./stages/email/EmailStage"); + await import("@goauthentik/web/flows/stages/email/EmailStage"); return html``; case "ak-stage-prompt": - await import("./stages/prompt/PromptStage"); + await import("@goauthentik/web/flows/stages/prompt/PromptStage"); return html``; case "ak-stage-authenticator-totp": - await import("./stages/authenticator_totp/AuthenticatorTOTPStage"); + await import( + "@goauthentik/web/flows/stages/authenticator_totp/AuthenticatorTOTPStage" + ); return html``; case "ak-stage-authenticator-duo": - await import("./stages/authenticator_duo/AuthenticatorDuoStage"); + await import( + "@goauthentik/web/flows/stages/authenticator_duo/AuthenticatorDuoStage" + ); return html``; case "ak-stage-authenticator-static": - await import("./stages/authenticator_static/AuthenticatorStaticStage"); + await import( + "@goauthentik/web/flows/stages/authenticator_static/AuthenticatorStaticStage" + ); return html``; case "ak-stage-authenticator-sms": - await import("./stages/authenticator_sms/AuthenticatorSMSStage"); + await import( + "@goauthentik/web/flows/stages/authenticator_sms/AuthenticatorSMSStage" + ); return html``; case "ak-flow-sources-plex": - await import("./sources/plex/PlexLoginInit"); + await import("@goauthentik/web/flows/sources/plex/PlexLoginInit"); return html``; case "ak-flow-sources-oauth-apple": - await import("./sources/apple/AppleLoginInit"); + await import("@goauthentik/web/flows/sources/apple/AppleLoginInit"); return html``; diff --git a/web/src/routesAdmin.ts b/web/src/routesAdmin.ts index aeb227b6b..d7565f86a 100644 --- a/web/src/routesAdmin.ts +++ b/web/src/routesAdmin.ts @@ -14,119 +14,119 @@ export const ROUTES: Route[] = [ return html``; }), new Route(new RegExp("^/administration/dashboard/users$"), async () => { - await import("./pages/admin-overview/DashboardUserPage"); + await import("@goauthentik/web/pages/admin-overview/DashboardUserPage"); return html``; }), new Route(new RegExp("^/administration/system-tasks$"), async () => { - await import("./pages/system-tasks/SystemTaskListPage"); + await import("@goauthentik/web/pages/system-tasks/SystemTaskListPage"); return html``; }), new Route(new RegExp("^/core/providers$"), async () => { - await import("./pages/providers/ProviderListPage"); + await import("@goauthentik/web/pages/providers/ProviderListPage"); return html``; }), new Route(new RegExp(`^/core/providers/(?${ID_REGEX})$`), async (args) => { - await import("./pages/providers/ProviderViewPage"); + await import("@goauthentik/web/pages/providers/ProviderViewPage"); return html``; }), new Route(new RegExp("^/core/applications$"), async () => { - await import("./pages/applications/ApplicationListPage"); + await import("@goauthentik/web/pages/applications/ApplicationListPage"); return html``; }), new Route(new RegExp(`^/core/applications/(?${SLUG_REGEX})$`), async (args) => { - await import("./pages/applications/ApplicationViewPage"); + await import("@goauthentik/web/pages/applications/ApplicationViewPage"); return html``; }), new Route(new RegExp("^/core/sources$"), async () => { - await import("./pages/sources/SourceListPage"); + await import("@goauthentik/web/pages/sources/SourceListPage"); return html``; }), new Route(new RegExp(`^/core/sources/(?${SLUG_REGEX})$`), async (args) => { - await import("./pages/sources/SourceViewPage"); + await import("@goauthentik/web/pages/sources/SourceViewPage"); return html``; }), new Route(new RegExp("^/core/property-mappings$"), async () => { - await import("./pages/property-mappings/PropertyMappingListPage"); + await import("@goauthentik/web/pages/property-mappings/PropertyMappingListPage"); return html``; }), new Route(new RegExp("^/core/tokens$"), async () => { - await import("./pages/tokens/TokenListPage"); + await import("@goauthentik/web/pages/tokens/TokenListPage"); return html``; }), new Route(new RegExp("^/core/tenants$"), async () => { - await import("./pages/tenants/TenantListPage"); + await import("@goauthentik/web/pages/tenants/TenantListPage"); return html``; }), new Route(new RegExp("^/policy/policies$"), async () => { - await import("./pages/policies/PolicyListPage"); + await import("@goauthentik/web/pages/policies/PolicyListPage"); return html``; }), new Route(new RegExp("^/policy/reputation$"), async () => { - await import("./pages/policies/reputation/ReputationListPage"); + await import("@goauthentik/web/pages/policies/reputation/ReputationListPage"); return html``; }), new Route(new RegExp("^/identity/groups$"), async () => { - await import("./pages/groups/GroupListPage"); + await import("@goauthentik/web/pages/groups/GroupListPage"); return html``; }), new Route(new RegExp(`^/identity/groups/(?${UUID_REGEX})$`), async (args) => { - await import("./pages/groups/GroupViewPage"); + await import("@goauthentik/web/pages/groups/GroupViewPage"); return html``; }), new Route(new RegExp("^/identity/users$"), async () => { - await import("./pages/users/UserListPage"); + await import("@goauthentik/web/pages/users/UserListPage"); return html``; }), new Route(new RegExp(`^/identity/users/(?${ID_REGEX})$`), async (args) => { - await import("./pages/users/UserViewPage"); + await import("@goauthentik/web/pages/users/UserViewPage"); return html``; }), new Route(new RegExp("^/flow/stages/invitations$"), async () => { - await import("./pages/stages/invitation/InvitationListPage"); + await import("@goauthentik/web/pages/stages/invitation/InvitationListPage"); return html``; }), new Route(new RegExp("^/flow/stages/prompts$"), async () => { - await import("./pages/stages/prompt/PromptListPage"); + await import("@goauthentik/web/pages/stages/prompt/PromptListPage"); return html``; }), new Route(new RegExp("^/flow/stages$"), async () => { - await import("./pages/stages/StageListPage"); + await import("@goauthentik/web/pages/stages/StageListPage"); return html``; }), new Route(new RegExp("^/flow/flows$"), async () => { - await import("./pages/flows/FlowListPage"); + await import("@goauthentik/web/pages/flows/FlowListPage"); return html``; }), new Route(new RegExp(`^/flow/flows/(?${SLUG_REGEX})$`), async (args) => { - await import("./pages/flows/FlowViewPage"); + await import("@goauthentik/web/pages/flows/FlowViewPage"); return html``; }), new Route(new RegExp("^/events/log$"), async () => { - await import("./pages/events/EventListPage"); + await import("@goauthentik/web/pages/events/EventListPage"); return html``; }), new Route(new RegExp(`^/events/log/(?${UUID_REGEX})$`), async (args) => { - await import("./pages/events/EventInfoPage"); + await import("@goauthentik/web/pages/events/EventInfoPage"); return html``; }), new Route(new RegExp("^/events/transports$"), async () => { - await import("./pages/events/TransportListPage"); + await import("@goauthentik/web/pages/events/TransportListPage"); return html``; }), new Route(new RegExp("^/events/rules$"), async () => { - await import("./pages/events/RuleListPage"); + await import("@goauthentik/web/pages/events/RuleListPage"); return html``; }), new Route(new RegExp("^/outpost/outposts$"), async () => { - await import("./pages/outposts/OutpostListPage"); + await import("@goauthentik/web/pages/outposts/OutpostListPage"); return html``; }), new Route(new RegExp("^/outpost/integrations$"), async () => { - await import("./pages/outposts/ServiceConnectionListPage"); + await import("@goauthentik/web/pages/outposts/ServiceConnectionListPage"); return html``; }), new Route(new RegExp("^/crypto/certificates$"), async () => { - await import("./pages/crypto/CertificateKeyPairListPage"); + await import("@goauthentik/web/pages/crypto/CertificateKeyPairListPage"); return html``; }), ]; diff --git a/web/src/routesUser.ts b/web/src/routesUser.ts index 9e92f46dc..ee74ca9b6 100644 --- a/web/src/routesUser.ts +++ b/web/src/routesUser.ts @@ -9,7 +9,7 @@ export const ROUTES: Route[] = [ new Route(new RegExp("^#.*")).redirect("/library"), new Route(new RegExp("^/library$"), async () => html``), new Route(new RegExp("^/settings$"), async () => { - await import("./user/user-settings/UserSettingsPage"); + await import("@goauthentik/web/user/user-settings/UserSettingsPage"); return html``; }), ];