web: migrate to lit 2

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

internal/outpost/ak/api_ws.go

@@ -128,6 +128,7 @@ func (ac *APIController) startWSHealth() {
 		if err != nil {
 			ac.logger.WithField("loop", "ws-health").WithError(err).Warning("ws write error, reconnecting")
 			ac.wsConn.CloseAndReconnect()
+			time.Sleep(time.Second * 5)
 			continue
 		} else {
 			ConnectionStatus.With(prometheus.Labels{

web/package-lock.json

@@ -46,8 +46,7 @@
                 "eslint-plugin-lit": "^1.5.1",
                 "flowchart.js": "^1.15.0",
                 "fuse.js": "^6.4.6",
-                "lit-element": "^3.0.0",
+                "lit": "^2.0.0",
-                "lit-html": "^2.0.0",
                 "moment": "^2.29.1",
                 "prettier": "^2.4.1",
                 "rapidoc": "^9.1.2",
@@ -5494,6 +5493,16 @@
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
             "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
         },
+        "node_modules/lit": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/lit/-/lit-2.0.0.tgz",
+            "integrity": "sha512-pqi5O/wVzQ9Bn4ERRoYQlt1EAUWyY5Wv888vzpoArbtChc+zfUv1XohRqSdtQZYCogl0eHKd+MQwymg2XJfECg==",
+            "dependencies": {
+                "@lit/reactive-element": "^1.0.0",
+                "lit-element": "^3.0.0",
+                "lit-html": "^2.0.0"
+            }
+        },
         "node_modules/lit-analyzer": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/lit-analyzer/-/lit-analyzer-1.2.1.tgz",
@@ -12483,6 +12492,16 @@
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
             "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
         },
+        "lit": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/lit/-/lit-2.0.0.tgz",
+            "integrity": "sha512-pqi5O/wVzQ9Bn4ERRoYQlt1EAUWyY5Wv888vzpoArbtChc+zfUv1XohRqSdtQZYCogl0eHKd+MQwymg2XJfECg==",
+            "requires": {
+                "@lit/reactive-element": "^1.0.0",
+                "lit-element": "^3.0.0",
+                "lit-html": "^2.0.0"
+            }
+        },
         "lit-analyzer": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/lit-analyzer/-/lit-analyzer-1.2.1.tgz",

web/package.json

@@ -78,8 +78,7 @@
         "eslint-plugin-lit": "^1.5.1",
         "flowchart.js": "^1.15.0",
         "fuse.js": "^6.4.6",
-        "lit-element": "^3.0.0",
+        "lit": "^2.0.0",
-        "lit-html": "^2.0.0",
         "moment": "^2.29.1",
         "prettier": "^2.4.1",
         "rapidoc": "^9.1.2",

web/poly.ts

@@ -2,3 +2,4 @@
 window["polymerSkipLoadingFontRoboto"] = true;
 import "construct-style-sheets-polyfill";
 import "@webcomponents/webcomponentsjs";
+import "lit/polyfill-support";

web/src/elements/CodeMirror.ts

@@ -1,12 +1,5 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 
 import CodeMirror from "codemirror";
 import "codemirror/addon/display/autorefresh";
@@ -22,7 +15,7 @@ import CodeMirrorStyle from "codemirror/lib/codemirror.css";
 import CodeMirrorTheme from "codemirror/theme/monokai.css";
 import CodeMirrorDialogStyle from "codemirror/addon/dialog/dialog.css";
 import CodeMirrorShowHintStyle from "codemirror/addon/hint/show-hint.css";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 import YAML from "yaml";
 
 @customElement("ak-codemirror")

web/src/elements/Divider.ts

@@ -1,6 +1,7 @@
-import { css, CSSResult, customElement, html, LitElement, TemplateResult } from "lit-element";
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import AKGlobal from "../authentik.css";
+import { customElement } from "lit/decorators";
 
 @customElement("ak-divider")
 export class Divider extends LitElement {

web/src/elements/EmptyState.ts

@@ -1,9 +1,9 @@
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
 import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFTitle from "@patternfly/patternfly/components/Title/title.css";
 import AKGlobal from "../authentik.css";
-
+import { customElement, property } from "lit/decorators";
 import { PFSize } from "./Spinner";
 
 @customElement("ak-empty-state")

web/src/elements/Expand.ts

@@ -1,6 +1,7 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
 import PFExpandableSection from "../../node_modules/@patternfly/patternfly/components/ExpandableSection/expandable-section.css";
+import { customElement, property } from "lit/decorators";
 
 @customElement("ak-expand")
 export class Expand extends LitElement {

web/src/elements/Label.ts

@@ -1,7 +1,8 @@
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFLabel from "@patternfly/patternfly/components/Label/label.css";
 import AKGlobal from "../authentik.css";
+import { customElement, property } from "lit/decorators";
 
 export enum PFColor {
     Green = "pf-m-green",

web/src/elements/LoadingOverlay.ts

@@ -1,14 +1,7 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import { PFSize } from "./Spinner";
+import { customElement, property } from "lit/decorators";
 
 @customElement("ak-loading-overlay")
 export class LoadingOverlay extends LitElement {

web/src/elements/PageHeader.ts

@@ -1,12 +1,5 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import AKGlobal from "../authentik.css";

web/src/elements/Spinner.ts

@@ -1,6 +1,7 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
 import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css";
+import { customElement, property } from "lit/decorators";
 
 export enum PFSize {
     Small = "pf-m-sm",

web/src/elements/Tabs.ts

@@ -1,13 +1,6 @@
-import {
+import { LitElement, html, CSSResult, TemplateResult, css } from "lit";
-    LitElement,
+import { customElement, property } from "lit/decorators";
-    html,
+import { ifDefined } from "lit/directives/if-defined";
-    customElement,
-    property,
-    CSSResult,
-    TemplateResult,
-    css,
-} from "lit-element";
-import { ifDefined } from "lit-html/directives/if-defined";
 import PFTabs from "@patternfly/patternfly/components/Tabs/tabs.css";
 import PFGlobal from "@patternfly/patternfly/patternfly-base.css";
 import AKGlobal from "../authentik.css";

web/src/elements/buttons/ActionButton.ts

@@ -1,4 +1,4 @@
-import { customElement, property } from "lit-element";
+import { customElement, property } from "lit/decorators";
 import { SpinnerButton } from "./SpinnerButton";
 import { showMessage } from "../messages/MessageContainer";
 import { MessageLevel } from "../messages/Message";

web/src/elements/buttons/Dropdown.ts

@@ -1,4 +1,5 @@
-import { customElement, html, LitElement, TemplateResult } from "lit-element";
+import { html, LitElement, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 
 @customElement("ak-dropdown")
 export class DropdownButton extends LitElement {

web/src/elements/buttons/ModalButton.ts

@@ -1,12 +1,5 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFModalBox from "@patternfly/patternfly/components/ModalBox/modal-box.css";

web/src/elements/buttons/SpinnerButton.ts

@@ -1,12 +1,5 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css";

web/src/elements/buttons/TokenCopyButton.ts

@@ -1,4 +1,4 @@
-import { customElement, property } from "lit-element";
+import { customElement, property } from "lit/decorators";
 import { CoreApi } from "@goauthentik/api";
 import { ERROR_CLASS, SECONDARY_CLASS, SUCCESS_CLASS } from "../../constants";
 import { DEFAULT_CONFIG } from "../../api/Config";

web/src/elements/cards/AggregateCard.ts

@@ -1,13 +1,6 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
+import { ifDefined } from "lit/directives/if-defined";
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
-import { ifDefined } from "lit-html/directives/if-defined";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css";

web/src/elements/cards/AggregatePromiseCard.ts

@@ -1,5 +1,6 @@
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
-import { until } from "lit-html/directives/until";
+import { customElement, property } from "lit/decorators";
+import { until } from "lit/directives/until";
 import { AggregateCard } from "./AggregateCard";
 import "../Spinner";
 import { PFSize } from "../Spinner";

web/src/elements/charts/AdminLoginsChart.ts

@@ -1,4 +1,4 @@
-import { customElement } from "lit-element";
+import { customElement } from "lit/decorators";
 import { ChartData } from "chart.js";
 import { AdminApi, LoginMetrics } from "@goauthentik/api";
 import { AKChart } from "./Chart";

web/src/elements/charts/ApplicationAuthorizeChart.ts

@@ -1,4 +1,4 @@
-import { customElement, property } from "lit-element";
+import { customElement, property } from "lit/decorators";
 import { Coordinate, CoreApi } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../api/Config";
 import { AKChart } from "./Chart";

web/src/elements/charts/Chart.ts

@@ -1,4 +1,5 @@
-import { css, CSSResult, html, LitElement, property, TemplateResult } from "lit-element";
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
+import { property } from "lit/decorators";
 import { Chart, Plugin, Tick, ChartConfiguration, ChartData, ChartOptions } from "chart.js";
 import { Legend, Tooltip } from "chart.js";
 import { DoughnutController, LineController, BarController } from "chart.js";

web/src/elements/charts/UserChart.ts

@@ -1,4 +1,4 @@
-import { customElement, property } from "lit-element";
+import { customElement, property } from "lit/decorators";
 import { CoreApi, UserMetrics } from "@goauthentik/api";
 import { AKChart } from "./Chart";
 import { DEFAULT_CONFIG } from "../../api/Config";

web/src/elements/chips/Chip.ts

@@ -1,4 +1,5 @@
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";

web/src/elements/chips/ChipGroup.ts

@@ -1,4 +1,5 @@
-import { CSSResult, customElement, html, LitElement, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFChip from "@patternfly/patternfly/components/Chip/chip.css";

web/src/elements/events/ObjectChangelog.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { AKResponse } from "../../api/Client";
 import { Table, TableColumn } from "../table/Table";
 import { Event, EventsApi } from "@goauthentik/api";

web/src/elements/events/UserEvents.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { AKResponse } from "../../api/Client";
 import { Table, TableColumn } from "../table/Table";
 import { Event, EventsApi } from "@goauthentik/api";

web/src/elements/forms/ConfirmationForm.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { EVENT_REFRESH } from "../../constants";
 import { ModalButton } from "../buttons/ModalButton";
 import "../buttons/SpinnerButton";

web/src/elements/forms/DeleteBulkForm.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { EVENT_REFRESH } from "../../constants";
 import { ModalButton } from "../buttons/ModalButton";
 import { MessageLevel } from "../messages/Message";
@@ -7,7 +8,7 @@ import { showMessage } from "../messages/MessageContainer";
 import "../buttons/SpinnerButton";
 import { UsedBy, UsedByActionEnum } from "@goauthentik/api";
 import PFList from "@patternfly/patternfly/components/List/list.css";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 import { Table, TableColumn } from "../table/Table";
 import { AKResponse } from "../../api/Client";
 import { PFSize } from "../Spinner";

web/src/elements/forms/DeleteForm.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { EVENT_REFRESH } from "../../constants";
 import { ModalButton } from "../buttons/ModalButton";
 import { MessageLevel } from "../messages/Message";
@@ -7,7 +8,7 @@ import { showMessage } from "../messages/MessageContainer";
 import "../buttons/SpinnerButton";
 import { UsedBy, UsedByActionEnum } from "@goauthentik/api";
 import PFList from "@patternfly/patternfly/components/List/list.css";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 
 @customElement("ak-forms-delete")
 export class DeleteForm extends ModalButton {

web/src/elements/forms/Form.ts

@@ -2,15 +2,8 @@ import "@polymer/paper-input/paper-input";
 import "@polymer/iron-form/iron-form";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
 import { showMessage } from "../../elements/messages/MessageContainer";
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";

web/src/elements/forms/FormElement.ts

@@ -1,5 +1,6 @@
-import { customElement, LitElement, CSSResult, property, css } from "lit-element";
+import { LitElement, CSSResult, css } from "lit";
-import { TemplateResult, html } from "lit-html";
+import { customElement, property } from "lit/decorators";
+import { TemplateResult, html } from "lit";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
 import { ErrorDetail } from "@goauthentik/api";

web/src/elements/forms/FormGroup.ts

@@ -1,12 +1,5 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/elements/forms/HorizontalFormElement.ts

@@ -1,5 +1,6 @@
-import { customElement, LitElement, CSSResult, property, css } from "lit-element";
+import { LitElement, CSSResult, css } from "lit";
-import { TemplateResult, html } from "lit-html";
+import { customElement, property } from "lit/decorators";
+import { TemplateResult, html } from "lit";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/elements/forms/ModalForm.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { EVENT_REFRESH } from "../../constants";
 import { ModalButton } from "../buttons/ModalButton";
 import { Form } from "./Form";

web/src/elements/forms/ModelForm.ts

@@ -1,4 +1,5 @@
-import { property, TemplateResult } from "lit-element";
+import { TemplateResult } from "lit";
+import { property } from "lit/decorators";
 import { EVENT_REFRESH } from "../../constants";
 import { Form } from "./Form";
 

web/src/elements/forms/ProxyForm.ts

@@ -1,4 +1,5 @@
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { Form } from "./Form";
 
 @customElement("ak-proxy-form")

web/src/elements/messages/Message.ts

@@ -1,4 +1,5 @@
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 
 import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css";
 import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";

web/src/elements/messages/MessageContainer.ts

@@ -1,12 +1,5 @@
-import {
+import { LitElement, html, TemplateResult, CSSResult, css } from "lit";
-    LitElement,
+import { customElement, property } from "lit/decorators";
-    html,
-    customElement,
-    TemplateResult,
-    property,
-    CSSResult,
-    css,
-} from "lit-element";
 import "./Message";
 import { APIMessage } from "./Message";
 import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css";

web/src/elements/notifications/APIDrawer.ts

@@ -1,13 +1,6 @@
 import { Middleware, ResponseContext } from "@goauthentik/api";
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFNotificationDrawer from "@patternfly/patternfly/components/NotificationDrawer/notification-drawer.css";
 import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css";

web/src/elements/notifications/NotificationDrawer.ts

@@ -1,13 +1,6 @@
 import { t } from "@lingui/macro";
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import { EventsApi, Notification } from "@goauthentik/api";
 import { AKResponse } from "../../api/Client";
 import { DEFAULT_CONFIG } from "../../api/Config";

web/src/elements/oauth/UserCodeList.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { AKResponse } from "../../api/Client";
 import { Table, TableColumn } from "../table/Table";
 

web/src/elements/oauth/UserRefreshList.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { AKResponse } from "../../api/Client";
 import { Table, TableColumn } from "../table/Table";
 import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css";

web/src/elements/router/Route.ts

@@ -1,4 +1,4 @@
-import { html, TemplateResult } from "lit-html";
+import { html, TemplateResult } from "lit";
 
 export const SLUG_REGEX = "[-a-zA-Z0-9_]+";
 export const ID_REGEX = "\\d+";

web/src/elements/router/RouteMatch.ts

@@ -1,4 +1,4 @@
-import { TemplateResult } from "lit-html";
+import { TemplateResult } from "lit";
 import { Route } from "./Route";
 
 export class RouteMatch {

web/src/elements/router/Router404.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css";
 import PFTitle from "@patternfly/patternfly/components/Title/title.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";

web/src/elements/router/RouterOutlet.ts

@@ -1,12 +1,5 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import { Route } from "./Route";
 import { RouteMatch } from "./RouteMatch";
 import AKGlobal from "../../authentik.css";

web/src/elements/sidebar/Sidebar.ts

@@ -1,4 +1,5 @@
-import { css, CSSResult, customElement, html, LitElement, TemplateResult } from "lit-element";
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFNav from "@patternfly/patternfly/components/Nav/nav.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";

web/src/elements/sidebar/SidebarBrand.ts

@@ -1,12 +1,5 @@
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFGlobal from "@patternfly/patternfly/patternfly-base.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";

web/src/elements/sidebar/SidebarItem.ts

@@ -1,10 +1,11 @@
-import { css, CSSResult, customElement, LitElement, property } from "lit-element";
+import { css, CSSResult, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFNav from "@patternfly/patternfly/components/Nav/nav.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import AKGlobal from "../../authentik.css";
-import { TemplateResult, html } from "lit-html";
+import { TemplateResult, html } from "lit";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 import { ROUTE_SEPARATOR } from "../../constants";
 
 @customElement("ak-sidebar-item")

web/src/elements/sidebar/SidebarUser.ts

@@ -1,11 +1,12 @@
-import { css, CSSResult, customElement, html, LitElement, TemplateResult } from "lit-element";
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFNav from "@patternfly/patternfly/components/Nav/nav.css";
 import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
 import { me } from "../../api/Users";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-sidebar-user")
 export class SidebarUser extends LitElement {

web/src/elements/table/Table.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
+import { property } from "lit/decorators";
 import { AKResponse } from "../../api/Client";
 
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
@@ -17,7 +18,7 @@ import "../EmptyState";
 import "../chips/Chip";
 import "../chips/ChipGroup";
 import { EVENT_REFRESH } from "../../constants";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 export class TableColumn {
     title: string;

web/src/elements/table/TableModal.ts

@@ -1,5 +1,6 @@
-import { CSSResult, LitElement, property } from "lit-element";
+import { CSSResult, LitElement } from "lit";
-import { html, TemplateResult } from "lit-html";
+import { property } from "lit/decorators";
+import { html, TemplateResult } from "lit";
 import { Table } from "./Table";
 import PFModalBox from "@patternfly/patternfly/components/ModalBox/modal-box.css";
 import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css";

web/src/elements/table/TablePage.ts

@@ -1,6 +1,6 @@
-import { CSSResult } from "lit-element";
+import { CSSResult } from "lit";
-import { html, TemplateResult } from "lit-html";
+import { html, TemplateResult } from "lit";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 import { Table } from "./Table";
 import "../../elements/PageHeader";
 import PFPage from "@patternfly/patternfly/components/Page/page.css";

web/src/elements/table/TablePagination.ts

@@ -1,4 +1,5 @@
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { AKPagination } from "../../api/Client";
 import { t } from "@lingui/macro";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";

web/src/elements/table/TableSearch.ts

@@ -1,5 +1,6 @@
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { customElement, property } from "lit/decorators";
+import { ifDefined } from "lit/directives/if-defined";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css";

web/src/elements/user/SessionList.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { AKResponse } from "../../api/Client";
 import { Table, TableColumn } from "../table/Table";
 

web/src/elements/user/UserConsentList.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, property, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { AKResponse } from "../../api/Client";
 import { Table, TableColumn } from "../table/Table";
 

web/src/flows/FlowExecutor.ts

@@ -1,14 +1,6 @@
 import { t } from "@lingui/macro";
-import {
+import { LitElement, html, TemplateResult, CSSResult, css } from "lit";
-    LitElement,
+import { customElement, property } from "lit/decorators";
-    html,
-    customElement,
-    property,
-    TemplateResult,
-    CSSResult,
-    css,
-} from "lit-element";
-
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFTitle from "@patternfly/patternfly/components/Title/title.css";
@@ -17,7 +9,7 @@ import PFList from "@patternfly/patternfly/components/List/list.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import AKGlobal from "../authentik.css";
 
-import { unsafeHTML } from "lit-html/directives/unsafe-html";
+import { unsafeHTML } from "lit/directives/unsafe-html";
 import "../elements/LoadingOverlay";
 import "./access_denied/FlowAccessDenied";
 import "./stages/authenticator_static/AuthenticatorStaticStage";
@@ -45,7 +37,7 @@ import {
     ShellChallenge,
 } from "@goauthentik/api";
 import { DEFAULT_CONFIG, tenant } from "../api/Config";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 import { TITLE_DEFAULT } from "../constants";
 import { configureSentry } from "../api/Sentry";
 import { WebsocketClient } from "../common/ws";

web/src/flows/FormStatic.ts

@@ -1,15 +1,8 @@
 import { t } from "@lingui/macro";
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-form-static")
 export class FormStatic extends LitElement {

web/src/flows/access_denied/FlowAccessDenied.ts

@@ -1,5 +1,6 @@
 import { AccessDeniedChallenge, FlowChallengeResponseRequest } from "@goauthentik/api";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import { BaseStage } from "../stages/base";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFTitle from "@patternfly/patternfly/components/Title/title.css";

web/src/flows/sources/plex/PlexLoginInit.ts

@@ -10,8 +10,9 @@ import PFTitle from "@patternfly/patternfly/components/Title/title.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import AKGlobal from "../../../authentik.css";
-import { CSSResult, customElement } from "lit-element";
+import { CSSResult } from "lit";
-import { html, TemplateResult } from "lit-html";
+import { customElement } from "lit/decorators";
+import { html, TemplateResult } from "lit";
 import { BaseStage } from "../../stages/base";
 import { PlexAPIClient, popupCenterScreen } from "./API";
 import { DEFAULT_CONFIG } from "../../../api/Config";

web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -17,7 +18,7 @@ import {
     StagesApi,
 } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-stage-authenticator-duo")
 export class AuthenticatorDuoStage extends BaseStage<

web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { css, CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { css, CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -15,7 +16,7 @@ import {
     AuthenticatorStaticChallenge,
     AuthenticatorStaticChallengeResponseRequest,
 } from "@goauthentik/api";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 export const STATIC_TOKEN_STYLE = css`
     /* Static OTP Tokens */

web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts

@@ -1,5 +1,7 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
+
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -18,7 +20,7 @@ import {
     AuthenticatorTOTPChallenge,
     AuthenticatorTOTPChallengeResponseRequest,
 } from "@goauthentik/api";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-stage-authenticator-totp")
 export class AuthenticatorTOTPStage extends BaseStage<

web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { css, CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { css, CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -18,7 +19,7 @@ import {
     AuthenticatorValidationChallengeResponseRequest,
     DeviceChallenge,
 } from "@goauthentik/api";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-stage-authenticator-validate-code")
 export class AuthenticatorValidateStageWebCode extends BaseStage<

web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -17,7 +18,7 @@ import {
     AuthenticatorValidationChallengeResponseRequest,
     DeviceChallenge,
 } from "@goauthentik/api";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-stage-authenticator-validate-duo")
 export class AuthenticatorValidateStageWebDuo extends BaseStage<

web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/flows/stages/autosubmit/AutosubmitStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/flows/stages/base.ts

@@ -1,5 +1,6 @@
 import { ErrorDetail } from "@goauthentik/api";
-import { html, LitElement, property, TemplateResult } from "lit-element";
+import { html, LitElement, TemplateResult } from "lit";
+import { property } from "lit/decorators";
 
 export interface StageHost {
     challenge?: unknown;

web/src/flows/stages/captcha/CaptchaStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -13,7 +14,7 @@ import "../../../elements/forms/FormElement";
 import "../../../elements/EmptyState";
 import "../../FormStatic";
 import { CaptchaChallenge, CaptchaChallengeResponseRequest } from "@goauthentik/api";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-stage-captcha")
 export class CaptchaStage extends BaseStage<CaptchaChallenge, CaptchaChallengeResponseRequest> {

web/src/flows/stages/consent/ConsentStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFList from "@patternfly/patternfly/components/List/list.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
@@ -13,7 +14,7 @@ import { BaseStage } from "../base";
 import "../../../elements/EmptyState";
 import "../../FormStatic";
 import { ConsentChallenge, ConsentChallengeResponseRequest } from "@goauthentik/api";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-stage-consent")
 export class ConsentStage extends BaseStage<ConsentChallenge, ConsentChallengeResponseRequest> {

web/src/flows/stages/dummy/DummyStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/flows/stages/email/EmailStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/flows/stages/identification/IdentificationStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { css, CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { css, CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import { BaseStage } from "../base";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";

web/src/flows/stages/password/PasswordStage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
@@ -13,7 +14,7 @@ import "../../../elements/EmptyState";
 import { PasswordManagerPrefill } from "../identification/IdentificationStage";
 import "../../FormStatic";
 import { PasswordChallenge, PasswordChallengeResponseRequest } from "@goauthentik/api";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-stage-password")
 export class PasswordStage extends BaseStage<PasswordChallenge, PasswordChallengeResponseRequest> {

web/src/flows/stages/prompt/PromptStage.ts

@@ -1,6 +1,7 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, TemplateResult } from "lit-element";
+import { CSSResult, html, TemplateResult } from "lit";
-import { unsafeHTML } from "lit-html/directives/unsafe-html";
+import { customElement } from "lit/decorators";
+import { unsafeHTML } from "lit/directives/unsafe-html";
 import PFLogin from "@patternfly/patternfly/components/Login/login.css";
 import PFForm from "@patternfly/patternfly/components/Form/form.css";
 import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";

web/src/interfaces/AdminInterface.ts

@@ -1,13 +1,6 @@
 import "../elements/messages/MessageContainer";
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import { me } from "../api/Users";
 import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "../elements/router/Route";
 import "./locale";
@@ -23,7 +16,7 @@ import "../elements/router/RouterOutlet";
 import "../elements/messages/MessageContainer";
 import "../elements/notifications/NotificationDrawer";
 import "../elements/sidebar/Sidebar";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 import {
     EVENT_API_DRAWER_TOGGLE,
     EVENT_NOTIFICATION_DRAWER_TOGGLE,

web/src/interfaces/UserInterface.ts

@@ -1,13 +1,6 @@
 import "../elements/messages/MessageContainer";
-import {
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-    css,
+import { customElement, property } from "lit/decorators";
-    CSSResult,
-    customElement,
-    html,
-    LitElement,
-    property,
-    TemplateResult,
-} from "lit-element";
 import { me } from "../api/Users";
 import "./locale";
 import "../elements/sidebar/SidebarItem";
@@ -37,7 +30,7 @@ import { WebsocketClient } from "../common/ws";
 import { ROUTES } from "../routesUser";
 import { first } from "../utils";
 import { DefaultTenant } from "../elements/sidebar/SidebarBrand";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 import { uiConfig } from "../user/config";
 
 @customElement("ak-interface-user")

web/src/pages/admin-overview/AdminOverviewPage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { css, CSSResult, customElement, html, LitElement, TemplateResult } from "lit-element";
+import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 
 import "../../elements/charts/AdminLoginsChart";
 import "../../elements/cards/AggregatePromiseCard";

web/src/pages/admin-overview/TopApplicationsTable.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { EventsApi, EventTopPerUser } from "@goauthentik/api";
 import PFTable from "@patternfly/patternfly/components/Table/table.css";
 import AKGlobal from "../../authentik.css";

web/src/pages/admin-overview/cards/AdminStatusCard.ts

@@ -1,5 +1,5 @@
-import { html, TemplateResult } from "lit-html";
+import { html, TemplateResult } from "lit";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 import { EVENT_REFRESH } from "../../../constants";
 import { AggregateCard } from "../../../elements/cards/AggregateCard";
 import { PFSize } from "../../../elements/Spinner";

web/src/pages/admin-overview/cards/BackupStatusCard.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import { AdminStatus, AdminStatusCard } from "./AdminStatusCard";
 import { AdminApi, StatusEnum, CapabilitiesEnum } from "@goauthentik/api";
 import { config, DEFAULT_CONFIG } from "../../../api/Config";

web/src/pages/admin-overview/cards/SystemStatusCard.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import { AdminApi, System } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import { AdminStatusCard, AdminStatus } from "./AdminStatusCard";

web/src/pages/admin-overview/cards/VersionStatusCard.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
+import { customElement } from "lit/decorators";
 import { AdminApi, Version } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import { AdminStatusCard, AdminStatus } from "./AdminStatusCard";

web/src/pages/admin-overview/cards/WorkerStatusCard.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { customElement, html } from "lit-element";
+import { html } from "lit";
+import { customElement } from "lit/decorators";
 import { AdminApi } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import { AdminStatus, AdminStatusCard } from "./AdminStatusCard";

web/src/pages/admin-overview/charts/FlowStatusChart.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { customElement } from "lit-element";
+import { customElement } from "lit/decorators";
 import { FlowsApi } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import "../../../elements/forms/ConfirmationForm";

web/src/pages/admin-overview/charts/GroupCountStatusChart.ts

@@ -1,4 +1,4 @@
-import { customElement } from "lit-element";
+import { customElement } from "lit/decorators";
 import { CoreApi } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import { AKChart } from "../../../elements/charts/Chart";

web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { customElement } from "lit-element";
+import { customElement } from "lit/decorators";
 import { SourcesApi, StatusEnum } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import "../../../elements/forms/ConfirmationForm";

web/src/pages/admin-overview/charts/OutpostStatusChart.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { customElement } from "lit-element";
+import { customElement } from "lit/decorators";
 import { OutpostsApi } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import "../../../elements/forms/ConfirmationForm";

web/src/pages/admin-overview/charts/PolicyStatusChart.ts

@@ -1,5 +1,5 @@
 import { t } from "@lingui/macro";
-import { customElement } from "lit-element";
+import { customElement } from "lit/decorators";
 import { PoliciesApi } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import "../../../elements/forms/ConfirmationForm";

web/src/pages/admin-overview/charts/UserCountStatusChart.ts

@@ -1,4 +1,4 @@
-import { customElement } from "lit-element";
+import { customElement } from "lit/decorators";
 import { CoreApi } from "@goauthentik/api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import { AKChart } from "../../../elements/charts/Chart";

web/src/pages/applications/ApplicationCheckAccessForm.ts

@@ -1,10 +1,10 @@
 import { Application, CoreApi, PolicyTestResult } from "@goauthentik/api";
 import { t } from "@lingui/macro";
-import { customElement, property } from "lit-element";
+import { customElement, property } from "lit/decorators";
-import { html, TemplateResult } from "lit-html";
+import { html, TemplateResult } from "lit";
 import { DEFAULT_CONFIG } from "../../api/Config";
 import { Form } from "../../elements/forms/Form";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
 import "../../elements/forms/HorizontalFormElement";
 
 @customElement("ak-application-check-access-form")

web/src/pages/applications/ApplicationForm.ts

@@ -7,11 +7,12 @@ import {
     CapabilitiesEnum,
 } from "@goauthentik/api";
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, property } from "lit-element";
+import { CSSResult } from "lit";
-import { html, TemplateResult } from "lit-html";
+import { customElement, property } from "lit/decorators";
+import { html, TemplateResult } from "lit";
 import { config, DEFAULT_CONFIG } from "../../api/Config";
-import { until } from "lit-html/directives/until";
+import { until } from "lit/directives/until";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 import "../../elements/buttons/Dropdown";
 import "../../elements/Spinner";
 import "../../elements/forms/ProxyForm";

web/src/pages/applications/ApplicationListPage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { css, CSSResult, customElement, html, property, TemplateResult } from "lit-element";
+import { css, CSSResult, html, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
 import { AKResponse } from "../../api/Client";
 import { TablePage } from "../../elements/table/TablePage";

web/src/pages/applications/ApplicationViewPage.ts

@@ -1,5 +1,6 @@
 import { t } from "@lingui/macro";
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { CSSResult, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 
 import "../../elements/Tabs";
 import "../../elements/charts/ApplicationAuthorizeChart";
@@ -20,7 +21,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import PFButton from "@patternfly/patternfly/components/Button/button.css";
 import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css";
 import AKGlobal from "../../authentik.css";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
 
 @customElement("ak-application-view")
 export class ApplicationViewPage extends LitElement {

web/src/pages/crypto/CertificateGenerateForm.ts

@@ -1,7 +1,7 @@
 import { CertificateGenerationRequest, CertificateKeyPair, CryptoApi } from "@goauthentik/api";
 import { t } from "@lingui/macro";
-import { customElement } from "lit-element";
+import { customElement } from "lit/decorators";
-import { html, TemplateResult } from "lit-html";
+import { html, TemplateResult } from "lit";
 import { DEFAULT_CONFIG } from "../../api/Config";
 import { Form } from "../../elements/forms/Form";
 import "../../elements/forms/HorizontalFormElement";